From 2c6ca0658f23ce8e893a81400ddb9dd9595f335f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 05 十二月 2024 11:30:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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..a658870 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>
@@ -1065,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); // 涓嶅睍绀�
@@ -1315,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 = {
@@ -1327,7 +1326,7 @@
viType: 1, // 瑙嗗浘绫诲瀷
viTypeText: "琛ㄥ崟", // 瑙嗗浘涓枃鍚嶇О
prm: {
- formQtName: this.form.qtName, // 鏌ヨ妯℃澘鍚嶇О
+ formQtName: this.topForm.itemQtName, // 鏌ヨ妯℃澘鍚嶇О
showCols: this.topForm.showColumn,
prmItemList: this.formList
},
@@ -1549,8 +1548,8 @@
font-size: 14px
}
-.formItemMargin {
- margin: 10px 0 10px 0;
-}
+//.formItemMargin {
+// margin: 10px 0 10px 0;
+//}
</style>
--
Gitblit v1.9.3