主题库功能bug

 Source/UBCS-WEB/src/components/Tree/attrCrud.vue

@@ -7,7 +7,7 @@
      <!--        全屏编辑-->
      <el-button v-if=" attrEditVisible == false && attrFlagChiledren==false" size="small" @click="fullscreenHandle" icon="el-icon-full-screen">全屏编辑</el-button>
      <!--        验证规则-->
      <el-button icon="el-icon-info" size="small" @click="rulesVisible=true">验证规则</el-button>
      <el-button icon="el-icon-info" size="small" @click="ruleAddHandler">验证规则</el-button>
      <!--        属性分组-->
      <el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">属性分组</el-button>
      </el-button-group>
@@ -64,7 +64,7 @@
        </div>
      </el-dialog>
      <!--        枚举注入-->
      <el-dialog :visible.sync="enumVisible" append-to-body title="枚举注入">
      <el-dialog :visible.sync="enumVisible" append-to-body title="枚举注入" :before-close="this.enumBeforeClose">
        <!-- 渲染表格及按钮 -->
        <!-- 渲染表格及按钮 -->
        <div>
@@ -103,7 +103,7 @@
          <template>
            <div style="display: flex;justify-content: right;margin-top: 15px">
              <el-button size="small" type="primary" @click="enumAddHandle">保存</el-button>
              <el-button size="small" @click="enumVisible=false">取消</el-button>
              <el-button size="small" @click="enumCancell">取消</el-button>
            </div>
          </template>
        </div>
@@ -208,6 +208,7 @@
                      :thisSceneTableData="thisSceneTableData"
                      :visible.sync="isShowformulaEdit"
                      @updateFormulaContent="updataFormlaContent"
                      :componentRuleText="componentRuleText"
      ></formula-editor>
      <!--    新增  -->
      <el-dialog :visible.sync="addVisible" append-to-body title="从业务类型中选择属性">
@@ -292,7 +293,7 @@
          <el-button
            size="small"
            type="text"
            @click.native.prevent="CrudRowDel(scope.row)">
            @click.native.prevent="CrudRowDel(scope.$index)">
            移除
          </el-button>
        </template>
@@ -782,7 +783,8 @@
      // 属性验证输入框
      RulesForm: {
        expressionText: "",
        TestContent: ""
        TestContent: "",
        ruleRowBds:""
      },
      //属性验证规则配置
      rulesOption: {
@@ -1323,6 +1325,8 @@
      },
      //时间格式下拉框
      codeDataFlag:false,
    //  组合规单元格编辑回填
      componentRuleText:""
    }
  },
  computed:{
@@ -1403,7 +1407,12 @@
    },
    //属性分组提交
    attrHandle() {
      this.$set(this.attrRow, 'attributeGroup', this.attrModel)
      console.log(this.attrSelectList)
      // this.$set(this.attrRow, 'attributeGroup', this.attrModel)
      // this.attrSelectList.attributeGroup=this.attrModel
      this.attrSelectList.forEach(item=>{
        item.attributeGroup=this.attrModel
      })
      this.attrModel = "";
      this.attrVisible = false;
    },
@@ -1501,7 +1510,11 @@
    CascadeAddHandle() {
      let CascadeString = "";
      CascadeString = this.selectRowArr.id + (this.selectRowArr.name);
      this.$set(this.attrRow, 'parentCode', CascadeString)
      if(this.CurrentCell){
        this.$set(this.CurrentCell, 'parentCode', CascadeString)
      }else {
        this.$set(this.attrSelectList[0], 'parentCode', CascadeString)
      }
      this.CascadeVisible = false;
    },
    //级联属性清除
@@ -1540,7 +1553,6 @@
        this.editingRows = row;
        this.editShows = column.property;
        this.rowOid = row.oid;
      console.log(row,column)
      this.CurrentCell=row;
      if(column.property == 'referConfig' ){
        this.$refs.referConfigFormDialog.isShowReferConfigForm = true;
@@ -1548,11 +1560,27 @@
      }else if(column.property == 'classifyInvokeLevelName'){
        this.injectVisible=true;
      }else if(column.property == 'componentRule'){

        if(this.CurrentCell){
          this.CurrentCell.componentRule=this.componentRuleText;
        }
        this.isShowformulaEdit = true;
      }else if(column.property == 'enumString'){
        this.enumVisible=true;
      }else if(column.property == 'parentCode'){
        gridCodeClassifyTemplateAttr({
          'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
          'conditionMap[oid_notequal]': this.CurrentCell.oid
        }).then(res => {
          console.log(res)
          this.CascadeData = res.data.data;
        })
        this.CascadeVisible=true;
      }else if(column.property == 'verifyRule'){
        this.RulesForm.expressionTextt=this.CurrentCell.verifyRule;
        this.rulesVisible=true;
        console.log(this.CurrentCell.verifyRule)
        console.log(this.RulesForm.expressionText)
      }
    },
    saveRows() {
@@ -1585,6 +1613,14 @@
        this.enumVisible = true;
      }
    },
    enumBeforeClose(done){
      this.tableData=[]
      done()
    },
    enumCancell(){
      this.tableData=[]
      this.enumVisible=false;
    },
    //枚举注入多选框
    handleSelectionChange(row) {
      this.enumRow = JSON.parse(JSON.stringify(row));
@@ -1598,7 +1634,8 @@
          this.$set(this.CurrentCell, 'enumString', JSON.stringify(this.enumRow));
          this.enumVisible = false;
        }else {
          this.$set(this.attrRow, 'enumString', JSON.stringify(this.enumRow));
          this.$set(this.attrSelectList[0], 'enumString', JSON.stringify(this.enumRow));
          this.tableData=[]
          this.enumVisible = false;
        }
      }
@@ -1607,8 +1644,20 @@
    saveRow() {
      this.editingRow = null;
    },
    //验证规则按钮
    ruleAddHandler(){
      if(this.attrSelectList.length>1){
        this.$message.warning('只能选择一条数据')
      }else if(this.attrSelectList.length<1){
        this.$message.warning('请选择一提模板属性')
      }else if(this.attrSelectList.length === 1){
        this.rulesVisible=true
      }

    },
    //规则校验，双击表单事件
    handleRulesRowDBLClick(row) {
      this.ruleRowBds=row.bds
      this.RulesForm.expressionText = row.bds
    },
    // 验证规则清除内容
@@ -1618,11 +1667,20 @@
    },
    // 验证规则确定
    rulesHandle() {
     if(this.CurrentCell.length>0){
       this.$set(this.CurrentCell,'verifyRule',this.RulesForm.expressionText)
     }else {
       console.log(this.attrSelectList)
       this.$set(this.attrSelectList[0],'verifyRule',this.RulesForm.expressionText)
       this.rulesremove()
     }
      this.rulesVisible = false
    },
    //验证规则检查
    rulesExamine() {
      if (this.RulesForm.expressionText.test(this.RulesForm.TestContent)) {
      console.log(this.RulesForm.expressionText)
      const regex = new RegExp(this.rulesData.ruleRowBds);
      if(regex.test(this.RulesForm.TestContent)){
        this.$message.success('校验成功')
      }
    },
@@ -1633,7 +1691,8 @@
      } else if (this.attrSelectList.length < 1) {
        this.$message.warning('请选择一条模板数据')
      } else if (this.attrSelectList.length === 1) {
        this.injectVisible = true
        this.injectVisible = true;

      }
    },
    //分类注入保存
@@ -1648,8 +1707,8 @@
        this.$set(this.CurrentCell, "classifyInvokeLevelName", data);
        this.$set(this.CurrentCell, "classifyInvokeLevel", JSON.stringify(this.injectOption));
      }else {
        this.$set(this.attrRow, 'classifyInvokeLevelName', data);
        this.$set(this.attrRow, 'classifyInvokeLevel', JSON.stringify(this.injectOption));
        this.$set(this.attrSelectList[0], 'classifyInvokeLevelName', data);
        this.$set(this.attrSelectList[0], 'classifyInvokeLevel', JSON.stringify(this.injectOption));
      }
      this.injectVisible = false
    },
@@ -1666,13 +1725,14 @@
    },
    //属性模板表格单元格点击事件
    //表格操作栏删除
    CrudRowDel(row) {
      this.ProData.splice(row.$index, 1)
    CrudRowDel(index) {
      this.ProData.splice(index, 1)
    },
    //表格删除
    CrudRemove() {
      this.attrSelectList.forEach((item)=>{
        this.ProData.splice(item.$index, 1)
        const index = this.ProData.indexOf(item);
        this.ProData.splice(index, 1)
      })
    },
    //表格重置

 Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue

@@ -348,6 +348,10 @@
        type: "Boolean",
        default: false,
    },
    componentRuleText:{
      type:String,
      default: ""
    },
    //本场景变量
    thisSceneTableData: {
      type: Array,
@@ -650,6 +654,9 @@
          this.isShowformulaEdit = this.visible;
      }
  },
  mounted() {
    this.formulaContent=this.componentRuleText
  },
  methods: {

    //双击添加公式内容

 Source/UBCS-WEB/vue.config.js

@@ -26,10 +26,10 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        target: 'http://localhost:37000',
        // target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        // target: 'http://192.168.1.46:37000',
        // target: 'http://dev.vci-tech.com:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',
        // target: 'http://192.168.1.104:37000',
        // target: 'http://192.168.1.63:37000',