From 90b6945445ee97109a57f26c83788d24729a098e Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 25 十二月 2024 16:52:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue |   32 ++++++++++++--------------------
 1 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
index 45dd5fc..0f567a7 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
@@ -35,7 +35,7 @@
 
                 <span style="display: flex;align-items: center; margin-right: 5px;">
                  <p class="tableTopLabel">鏌ヨ妯℃澘鍚嶇О锛�</p>
-                  <el-select v-model="form.itemQtName" placeholder="璇烽�夋嫨鏌ヨ妯℃澘" size="mini">
+                  <el-select v-model="topForm.itemQtName" placeholder="璇烽�夋嫨鏌ヨ妯℃澘" size="mini">
                     <el-option v-for="(item,index) in searchQtNameList" :key="index" :label="item.qtName"
                                :value="item.qtName"></el-option>
                   </el-select>
@@ -410,6 +410,7 @@
     </el-container>
 
     <!-- 娣诲姞鑷畾涔夌粍浠� -->
+
     <el-dialog
       v-dialogDrag
       v-loading="customLoading"
@@ -795,7 +796,7 @@
           <avue-tree :key="refresh" ref="authTree" v-model="treeAuthForm" :data="treeAuthData" :option="treeAuthOption"
                      @check-change="treeAuthCheckChange">
               <span slot-scope="{ node, data }" class="el-tree-node__label">
-           <span style="font-size: 15px">
+           <span>
               <i class="el-icon-s-promotion"></i>
                 {{ (node || {}).label }}
             </span>
@@ -852,7 +853,6 @@
           children: 'childNodes',
         },
         treeLoad: (node, resolve) => {
-          // console.log(node);
           const params = {
             'conditionMap[dataType]': node.data.data,
             'conditionMap[parentId]': node.data.data,
@@ -1027,6 +1027,7 @@
       ],
       form: {},
       topForm: {
+        itemQtName: '',
         columnNumber: 8,
         showColumn: '3',
         viName: '',
@@ -1065,7 +1066,6 @@
       const types = ['radio', 'checkbox', 'select'];
       return types.includes(this.form.itemType); // 灞曠ず
     },
-
     itemStyleTypeStatus() {
       const types = ['hidden', 'webeditor', 'radio', 'checkbox'];
       return !types.includes(this.form.itemType); // 涓嶅睍绀�
@@ -1245,7 +1245,6 @@
     // 閫夐」琛ㄦ牸琛岀偣鍑�
     optionTableClick(row) {
       this.optionRow = row;
-      console.log(row);
     },
 
     customOptionTableClick(row) {
@@ -1289,11 +1288,10 @@
 
     // 閫夐」鍒犻櫎
     optionDeleteClickHandler(val) {
-      // console.log(this.optionRow);
       if (val === 'dialog') {
-        this.customForm.itemKeyValueList.splice(this.customOptionRow.index,1);
+        this.customForm.itemKeyValueList.splice(this.customOptionRow.index, 1);
       } else {
-        this.form.itemKeyValueList.splice(this.optionRow.index,1);
+        this.form.itemKeyValueList.splice(this.optionRow.index, 1);
       }
     },
 
@@ -1315,7 +1313,7 @@
       this.formList = this.formList.map(item => {
         return {
           ...item,
-          itemField: item.text // 灏唅temField璧嬪�间负text锛屽洜涓哄繕璁扮埗缁勪欢涓轰粈涔堝湪缂栬緫鍥炲～鏃舵妸itemField璧嬪�间负text浜�
+          itemField: item.text // 灏唅temField閲嶆柊璧嬪�间负text锛屽洜涓哄繕璁板綋鏃跺湪鐖剁粍浠剁紪杈戝洖濉柟娉曢噷涓轰粈涔堟妸itemField璧嬪�间负text浜�
         };
       });
       const params = {
@@ -1327,7 +1325,7 @@
         viType: 1, // 瑙嗗浘绫诲瀷
         viTypeText: "琛ㄥ崟", // 瑙嗗浘涓枃鍚嶇О
         prm: {
-          formQtName: this.form.qtName, // 鏌ヨ妯℃澘鍚嶇О
+          formQtName: this.topForm.itemQtName, // 鏌ヨ妯℃澘鍚嶇О
           showCols: this.topForm.showColumn,
           prmItemList: this.formList
         },
@@ -1416,8 +1414,6 @@
         const data = res.data.data;
         this.customAttrData = data;
         this.customAttrLoading = false;
-      }).catch(err => {
-        this.$message.error(err)
       });
     },
 
@@ -1427,7 +1423,6 @@
         this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹繘琛屼繚瀛�');
         return;
       }
-      // console.log(this.customAttrRow)
       this.customForm.text = this.customAttrRow.id;
       this.customAttrVisible = false;
     },
@@ -1439,11 +1434,9 @@
         return;
       }
 
-
       this.formList = this.formList.map(item =>
         item.text === this.form.text ? this.form : item
       );
-      console.log(this.formList);
 
       this.$message.success('搴旂敤鎴愬姛');
     },
@@ -1501,13 +1494,11 @@
         return `${key}=${oids.join(',')}`; // 鐢� , 杩炴帴鍚屼竴绫诲瀷鐨� oid
       }).join('&&'); // 鏈�鍚庣敤 && 杩炴帴涓嶅悓绫诲瀷
 
-      // console.log(resultString);
       if (this.authType === 'attr') {
         this.customForm.itemRight = resultString;
       } else {
         this.form.itemRight = resultString;
       }
-      // this.form.itemRight = resultString;
       this.authDialogClose();
     }
 
@@ -1549,8 +1540,9 @@
   font-size: 14px
 }
 
-.formItemMargin {
-  margin: 10px 0 10px 0;
-}
+//.formItemMargin {
+//  margin: 10px 0 10px 0;
+//}
 
 </style>
+

--
Gitblit v1.9.3