From 644a84c3aa37c7a702a6714418ab5296f79e027a Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 08 一月 2025 17:49:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue | 46 ++++++++++++++++++----------------------------
1 files changed, 18 insertions(+), 28 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..4059ca0 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
@@ -9,11 +9,10 @@
width="100%"
@close="closeDialog"
>
- <el-container>
- <div style="height: 79vh;display: flex;width: 100%;">
+ <el-container style="height: 700px">
<el-aside width="17%">
<basic-container>
- <div style="height:650px;">
+ <div style="height:620px;">
<avue-tree
:data="treeData"
:loading="treeLoading"
@@ -26,7 +25,7 @@
<el-main>
<basic-container>
- <div style="height: 645px;overflow-y: auto;padding-right: 5px" @drop="drop" @dragover.prevent>
+ <div style="height: 610px;overflow-y: auto;padding-right: 5px" @drop="drop" @dragover.prevent>
<div style="display: flex;justify-content: center">
<span style="display: flex;align-items: center; margin-right: 5px;">
<p class="tableTopLabel">鍚嶇О锛�</p>
@@ -35,7 +34,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>
@@ -122,7 +121,7 @@
</el-row>
</el-form>
</div>
- <div style="display: flex;justify-content: center;margin-top: 15px">
+ <div style="display: flex;justify-content: center;margin-top: 15px;">
<el-button icon="el-icon-check" size="small" type="primary" @click="saveClickHandler">淇濆瓨</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="emptyClickHandler">娓呯┖
</el-button>
@@ -138,7 +137,7 @@
<el-aside width="25%">
<basic-container>
- <div style="height: 660px; overflow-y: auto;padding-right: 10px">
+ <div style="height: 600px; overflow-y: auto;padding-right: 10px">
<h3>璁剧疆</h3>
<h4 style="color: red">灞炴�ц缃俊鎭悗闇�鍗曞嚮鍙充笅瑙掑簲鐢ㄦ寜閽繘琛屽簲鐢�</h4>
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="85px">
@@ -401,15 +400,15 @@
</el-form>
</div>
<div style="display: flex;justify-content: right">
- <el-button plain size="mini" style="margin-top: 10px" type="success" @click="asideFormHandler">搴旂敤
+ <el-button plain size="mini" style="margin-top: 30px" type="success" @click="asideFormHandler">搴旂敤
</el-button>
</div>
</basic-container>
</el-aside>
- </div>
</el-container>
<!-- 娣诲姞鑷畾涔夌粍浠� -->
+
<el-dialog
v-dialogDrag
v-loading="customLoading"
@@ -795,7 +794,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 +851,6 @@
children: 'childNodes',
},
treeLoad: (node, resolve) => {
- // console.log(node);
const params = {
'conditionMap[dataType]': node.data.data,
'conditionMap[parentId]': node.data.data,
@@ -1027,6 +1025,7 @@
],
form: {},
topForm: {
+ itemQtName: '',
columnNumber: 8,
showColumn: '3',
viName: '',
@@ -1065,7 +1064,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 +1243,6 @@
// 閫夐」琛ㄦ牸琛岀偣鍑�
optionTableClick(row) {
this.optionRow = row;
- console.log(row);
},
customOptionTableClick(row) {
@@ -1289,11 +1286,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 +1311,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 +1323,7 @@
viType: 1, // 瑙嗗浘绫诲瀷
viTypeText: "琛ㄥ崟", // 瑙嗗浘涓枃鍚嶇О
prm: {
- formQtName: this.form.qtName, // 鏌ヨ妯℃澘鍚嶇О
+ formQtName: this.topForm.itemQtName, // 鏌ヨ妯℃澘鍚嶇О
showCols: this.topForm.showColumn,
prmItemList: this.formList
},
@@ -1416,8 +1412,6 @@
const data = res.data.data;
this.customAttrData = data;
this.customAttrLoading = false;
- }).catch(err => {
- this.$message.error(err)
});
},
@@ -1427,7 +1421,6 @@
this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹繘琛屼繚瀛�');
return;
}
- // console.log(this.customAttrRow)
this.customForm.text = this.customAttrRow.id;
this.customAttrVisible = false;
},
@@ -1439,11 +1432,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 +1492,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 +1538,9 @@
font-size: 14px
}
-.formItemMargin {
- margin: 10px 0 10px 0;
-}
+//.formItemMargin {
+// margin: 10px 0 10px 0;
+//}
</style>
+
--
Gitblit v1.9.3