From 6bccfd2132c8523b5ebeffa772a8fa0e784d8165 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 01 八月 2023 10:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue |   45 +++++++++++++--------------------------------
 1 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 3f35190..34a0cec 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -414,7 +414,6 @@
       }
     },
     'injectOption.classifyInvokeAttr': function(newVal) {
-      console.log('newVal',newVal)
       if (newVal === "name") {
         this.injectOption.classifyInvokeAttrName='鍒嗙被鍚嶇О'
       } else if (newVal === "id") {
@@ -1485,9 +1484,6 @@
     })
   },
   methods: {
-    formAttr(row, column) {
-      console.log(row,column)
-    },
     //鏂板鎼滅储
     AddFindHandler(){
       if(this.SelectValue == 'id'){
@@ -1508,7 +1504,6 @@
     },
     //鍙傜収閰嶇疆瀛愮粍浠�
     echoReferConfig(val){
-      console.log('val--',val)
       this.referObject=val
       this.$set(this.CurrentCell,'referConfig',JSON.stringify(val))
 
@@ -1529,12 +1524,10 @@
         this.$message.warning('璇烽�夋嫨妯℃澘灞炴��')
       } else  {
         this.attrVisible = true;
-       console.log(this.attrSelectList)
       }
     },
     //灞炴�у垎缁勬彁浜�
     attrHandle() {
-      console.log(this.attrSelectList)
       this.attrSelectList.forEach(item=>{
         item.attributeGroup=this.attrModel
       })
@@ -1611,7 +1604,6 @@
     //涓氬姟绫诲瀷閫夋嫨
     businessSelect(selection, row) {
       this.busineSelectList = selection;
-      console.log(selection)
     },
     // 浠庝笟鍔＄被鍨嬩腑閫夋嫨鏁版嵁寮圭獥
     busineHandle() {
@@ -1670,7 +1662,6 @@
     selectHandle(selection, row) {
       this.attrOid = row.oid;
       this.attrRow = row;
-      console.log(row)
     },
     //琛ㄦ牸閫夋嫨
     selectionChange(list) {
@@ -1712,10 +1703,19 @@
                referConfig:'',
              }
            }
-           console.log('--',this.referConfigOption)
            // this.$refs.referConfigFormDialog.onloadAttrData();
          }else if(column.property == 'classifyInvokeText'){
-           this.injectVisible=true;
+           if (this.CurrentCell.classifyInvokeAttr != '') {
+             this.injectOption = {
+               classifyInvokeAttr: this.CurrentCell.classifyInvokeAttr,
+               classifyInvokeAttrName: this.CurrentCell.classifyInvokeAttrName,
+               classifyInvokeEditFlag: this.CurrentCell.classifyInvokeEditFlag,
+               classifyInvokeLevel: this.CurrentCell.classifyInvokeLevel == 'min' ? 'min' : 'max',
+               classifyNumber: this.CurrentCell.classifyInvokeLevel == 'min' ? '' : this.CurrentCell.classifyInvokeLevel
+             };
+           } else {
+             this.injectHandleReset();
+           }
          }else if(column.property == 'componentRule'){
            if(this.CurrentCell){
              this.CurrentCell.componentRule=this.componentRuleText;
@@ -1733,7 +1733,6 @@
              'conditionMap[oid_notequal]': this.CurrentCell.oid,
              limit:-1
            }).then(res => {
-             console.log(res)
              this.CascadeData = res.data.data;
            })
            this.CascadeVisible=true;
@@ -1854,7 +1853,6 @@
     },
     //楠岃瘉瑙勫垯妫�鏌�
     rulesExamine() {
-      console.log(this.RulesForm.expressionText)
       const regex = new RegExp(this.rulesData.ruleRowBds);
       if(regex.test(this.RulesForm.TestContent)){
         this.$message.success('鏍￠獙鎴愬姛')
@@ -1879,23 +1877,6 @@
         "灞傜骇璁剧疆": this.injectOption.classifyInvokeLevel=='max'?this.injectOption.classifyNumber :'min',
         "鏄惁鍙慨鏀�": this.injectOption.classifyInvokeEditFlag
       }
-      //鍗曞厓鏍肩紪杈戣祴鍊间竴閬�
-      // noinspection JSCheckFunctionSignatures
-      if(this.CurrentCell){
-        //濡傛灉鏄寚瀹氬眰璧嬪�间负鏁板瓧
-        if(this.injectOption.classifyInvokeLevel!== 'min'){
-          this.CurrentCell.classifyInvokeLevel=this.injectOption.classifyNumber
-        }else {
-          this.CurrentCell.classifyInvokeLevel='min'
-        }
-        //鍏朵綑姝ｅ父璧嬪��
-        this.CurrentCell.classifyInvokeAttr=this.injectOption.classifyInvokeAttr,
-        this.CurrentCell.classifyInvokeAttrName=this.injectOption.classifyInvokeAttrName,
-        this.CurrentCell.classifyInvokeEditFlag=this.injectOption.classifyInvokeEditFlag,
-        // this.$set(this.CurrentCell, 'classifyInvokeText', data)
-          this.CurrentCell.classifyInvokeText = data;
-        this.injectHandleReset()
-      }else {
         //鍕鹃�夋搷浣�
         for (const key in this.injectOption) {
           this.attrSelectList[0][key] = this.injectOption[key];
@@ -1908,7 +1889,6 @@
           this.$set(this.attrSelectList[0],'classifyInvokeText',data)
         }
         this.injectHandleReset()
-      }
       if(this.injectOption.classifyInvokeLevel !== 'min'){
         this.injectOption.classifyInvokeLevel=this.injectOption.classifyNumber;
       }else  {
@@ -1927,7 +1907,8 @@
     },
     // 鍒嗙被娉ㄥ叆鍙栨秷
     injectRemove() {
-      this.injectVisible = false
+      this.injectVisible = false;
+      this.injectHandleReset()
     },
     //灞炴�фā鏉胯〃鏍煎崟鍏冩牸鐐瑰嚮浜嬩欢
     //琛ㄦ牸鎿嶄綔鏍忓垹闄�

--
Gitblit v1.9.3