From 8655012ffbd51a6550ffcc1882f6f5044cceac2e Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期三, 04 十二月 2024 16:20:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue | 45 ++++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 15 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 26cf5bf..1c735fa 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 @@ -613,7 +613,8 @@ :show-header="false" border stripe - style="width: 100%"> + style="width: 100%" + @row-click="customOptionTableClick"> <el-table-column align="center" label="鍚嶇О" @@ -636,7 +637,9 @@ <el-button plain size="mini" style="margin-right: 5px" type="success" @click="optionAddClickHandler('dialog')">娣诲姞 </el-button> - <el-button plain size="mini" style="margin-left: 5px" type="danger">鍒犻櫎</el-button> + <el-button plain size="mini" style="margin-left: 5px" type="danger" + @click="optionDeleteClickHandler('dialog')">鍒犻櫎 + </el-button> </div> </el-form-item> </el-col> @@ -1050,7 +1053,11 @@ children: 'children', }, }, - treeData: [] + treeData: [], + optionRow: {}, + customOptionRow: {}, + optionCurrentIndex: 0, + customOptionCurrentIndex: 0 } }, computed: { @@ -1058,7 +1065,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); // 涓嶅睍绀� @@ -1117,10 +1123,9 @@ itemType: 'text', itemName: data.data.name, itemCols: "1", - itemIsEditable:"0", - itemIsRequired:"0", + itemIsEditable: "0", + itemIsRequired: "0", } - console.log(data); const isDuplicate = this.formList.some(item => item.text === data.text); if (isDuplicate) { @@ -1137,7 +1142,6 @@ this.form = {...item}; this.topForm.position = index += 1; // this.$forceUpdate(); - console.log(this.form); }, // 璁剧疆鏄剧ず琛屾暟 @@ -1239,7 +1243,12 @@ // 閫夐」琛ㄦ牸琛岀偣鍑� optionTableClick(row) { + this.optionRow = row; console.log(row); + }, + + customOptionTableClick(row) { + this.customOptionRow = row; }, // 閫夐」娣诲姞 @@ -1270,15 +1279,21 @@ const params = { key: optionObj.optionName, - value: optionObj.optionValue + value: optionObj.optionValue, + index: val === 'dialog' ? this.customOptionCurrentIndex++ : this.optionCurrentIndex++ }; itemKeyValueList.push(params); }, // 閫夐」鍒犻櫎 - optionDeleteClickHandler() { - + optionDeleteClickHandler(val) { + // console.log(this.optionRow); + if (val === 'dialog') { + this.customForm.itemKeyValueList.splice(this.customOptionRow.index,1); + } else { + this.form.itemKeyValueList.splice(this.optionRow.index,1); + } }, // 娣诲姞鑷畾涔夌粍浠� @@ -1299,7 +1314,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 = { @@ -1533,8 +1548,8 @@ font-size: 14px } -.formItemMargin { - margin: 10px 0 10px 0; -} +//.formItemMargin { +// margin: 10px 0 10px 0; +//} </style> -- Gitblit v1.9.3