显示表达式

 Source/ProjectWeb/src/App.vue

@@ -76,4 +76,8 @@
.el-form-item--mini.el-form-item, .el-form-item--small.el-form-item{
  margin-bottom: 10px;
}

.tree-buttons .el-button{
  margin: 0 5px 5px 0;
}
</style>

 Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue

@@ -375,3 +375,4 @@
<style scoped>

</style>


 Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue

@@ -114,7 +114,7 @@
        height: '100%',
        calcHeight: 15,
        indexFixed: false,
        menuFixed: 'right',
        menuFixed: this.areasName === 'westArea' ? false : 'right',
        searchMenuSpan:12,
        searchShow:false,
        column: [],

 Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue

@@ -2,7 +2,7 @@
  <div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
    <dynamic-button v-if="componentVO.buttons && componentVO.buttons.length>0" :componentVO="componentVO"
                    :butttonList="componentVO.buttons" :dataStore="checkDatas"
                    :sourceData="sourceData" type="tree" style="margin-bottom: 10px;"></dynamic-button>
                    :sourceData="sourceData" type="tree" style="margin-bottom: 5px;"></dynamic-button>
    <el-input
      placeholder="输入关键字进行过滤"
      v-model="filterText">

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

@@ -84,16 +84,7 @@
        description="该区域没有配置显示的内容">
      </el-alert>
      <el-alert
        v-else-if="Object.keys(newSourceData).length === 0"
        class="alert"
        :closable="false"
        title="源数据为空"
        type="error"
        show-icon
        description="不满足显示表达式条件，没有可显示的内容">
      </el-alert>
      <el-alert
        v-else
        v-else-if="Object.keys(newSourceData).length> 0"
        class="alert"
        :closable="false"
        title=""
@@ -101,7 +92,6 @@
        show-icon
        description="不满足显示表达式条件，没有可显示的内容。">
      </el-alert>
      {{newSourceData}}
    </div>
  </basic-container>
</template>
@@ -156,24 +146,11 @@
  data(){
    return{
      activeName:this.areasName+'-Tab-0',
      collapseActiveNames:[this.areasName+'-collapse-0']
      collapseActiveNames:[this.areasName+'-collapse-0'],
      newAreasData:[]
    }
  },
  computed:{
    newAreasData(){
      let newAreasData = [];
      this.areasData.forEach(areaData => {
        //验证显式表达式
        if (!validatenull(areaData.displayExpression)) {
          if (this.checkDisplayExpression(areaData.displayExpression)) {
            newAreasData.push(areaData)
          }
        } else {
          newAreasData.push(areaData)
        }
      })
     return newAreasData;
    },
    newSourceData(){
      if(this.sourceData.attributes && this.sourceData.parentId!=undefined && this.sourceData.parentId !=null){
        //源数据是树节点
@@ -182,29 +159,63 @@
      return this.sourceData;
    }
  },
  watch: {
    'newSourceData':{
      handler(newval) {
        this.getNewAreasData();
      }
    }
  },
  created() {

    this.getNewAreasData();
  },
  mounted() {
    // console.log(this.areasData);
  },
  methods:{
    checkDisplayExpression(displayExpressionStr){
    getNewAreasData(){
      if(Object.keys(this.newSourceData).length> 0){
        let newAreasData = [];
        this.areasData.forEach(areaData => {
          //验证显式表达式
          if (!validatenull(areaData.displayExpression)) {
            if (this.checkDisplayExpression(areaData.displayExpression)) {
              newAreasData.push(areaData)
            }
          } else {
            newAreasData.push(areaData)
          }
        })
        this.newAreasData = newAreasData;
      }else {
        this.newAreasData=this.areasData;
      }
    },
    checkDisplayExpression(displayExpressionStr) {
      //"${folderbusinesstype}"<>"workunit" and "${folderbusinesstype}"<>"part"  and "${folderbusinesstype}"<>"Terminology" and  "${folderbusinesstype}"<>"AssMaterial" and  "${folderbusinesstype}"<>"resourcelib" and  "${folderbusinesstype}"<>"material"  and "${folderbusinesstype}"<>"machine"
      // "${folderbusinesstype}"="AssMaterial" or "${folderbusinesstype}"="assmaterial"
      //"${folderbusinesstype}"="material"
      //("${btmname}"="产品型号" and "${producttype}"<>"试验件") or "${btmname}"="ppart"or "${btmname}"="工艺零件"or "${btmname}"="part"or "${btmname}"="零件"
      //${folderbusinesstype}为源数据中的属性

      let checkdisplay=false;
      let checkdisplay = false;
      //替换and和or
      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,'')
      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*and\s*"/g, ') && "').replace(/\)\s*AND\s*"/g, ') && "').replace(/\)\s*or\s*"/g, ') || "').replace(/\)\s*OR\s*"/g, ') || "');
      newDisplayExpressionStr = newDisplayExpressionStr.replace(/"\s*and\s*\(/g, '" && (').replace(/"\s*AND\s*\(/g, '" && (').replace(/"\s*or\s*\(/g, '" || (').replace(/"\s*OR\s*\(/g, '" || (');
      newDisplayExpressionStr = newDisplayExpressionStr.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;
      try {
        if (eval('(' + newDisplayExpressionStr + ')')) {
          checkdisplay = true;
        }
      }catch (e) {
        console.log(displayExpressionStr);
      }

      return checkdisplay;
    },
    tabHandleClick(tab, event) {