Source/ProjectWeb/src/views/base/UIContentArea.vue

@@ -22,9 +22,12 @@
        </el-collapse>
        <div v-else class="componentVO">
          <compoent-index :key="areasName+'componentVO-'+areaItem.componentVOs[0].oid"
                          :uiBtmType="uiBtmType"
                          :uiContext="uiContext"
                          :inDialog="inDialog"
                          :componentVO="areaItem.componentVOs[0]"
                          :sourceData="newSourceData"
                          :sourceBtmType="sourceBtmType"
                          :dataStore="dataStore"
                          :areasName="areasName"
                          :paramVOS="paramVOS"
@@ -41,9 +44,12 @@
          </template>
          <div class="componentVO">
            <compoent-index :key="areasName+'componentVO-'+componentVO.oid"
                            :uiBtmType="uiBtmType"
                            :uiContext="uiContext"
                            :inDialog="inDialog"
                            :componentVO="componentVO"
                            :sourceData="newSourceData"
                            :sourceBtmType="sourceBtmType"
                            :dataStore="dataStore"
                            :areasName="areasName"
                            :paramVOS="paramVOS"
@@ -54,9 +60,12 @@
      </el-collapse>
      <div v-else class="componentVO">
        <compoent-index :key="areasName+'componentVO-'+newAreasData[0].componentVOs[0].oid"
                        :uiBtmType="uiBtmType"
                        :uiContext="uiContext"
                        :inDialog="inDialog"
                        :componentVO="newAreasData[0].componentVOs[0]"
                        :sourceData="newSourceData"
                        :sourceBtmType="sourceBtmType"
                        :dataStore="dataStore"
                        :areasName="areasName"
                        :paramVOS="paramVOS"
@@ -104,6 +113,14 @@
  name: "UIContentArea",
  components:{compoentIndex},
  props:{
    //ui上下文的业务类型（或链接类型）
    uiBtmType: {
      type: String
    },
    //ui上下文
    uiContext:{
      type: String
    },
    inDialog: {
      type: Boolean,
      default: false
@@ -120,6 +137,10 @@
      //菜单源数据或者弹窗时按钮所属区域的上一区域选中数据
      type:Object,
      default: {}
    },
    //上一区域业务类型
    sourceBtmType:{
      type: String
    },
    dataStore:{
      //弹窗时按钮所属区域选中数据
@@ -179,6 +200,8 @@
      let newDisplayExpressionStr=displayExpressionStr.replace(/"\s*and\s*"/g,'" && "').replace(/"\s*AND\s*"/g,'" && "').replace(/"\s*or\s*"/g,'" || "').replace(/"\s*OR\s*"/g,'" || "');
      newDisplayExpressionStr=newDisplayExpressionStr.replace(/"\s*<>\s*"/g,'" != "').replace(/"\s*=\s*"/g,'" == "');
      newDisplayExpressionStr=newDisplayExpressionStr.replace(/"\$\{/g,'this.newSourceData.').replace(/\}"/g,'')

      const sandbox = {};
      if(eval('('+newDisplayExpressionStr+')')){
        checkdisplay=true;
      }