From 0ff8244ef43a22ba839beb985431cd043b56b403 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 22 十一月 2024 11:09:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
index e1b47da..e08b4b6 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
@@ -66,7 +66,7 @@
</avue-crud>
</basic-container>
</el-main>
- <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :editRow="editRow" :treeRadio="treeRadio"></form-dialog>
+ <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :editRow="editRow" :treeRadio="treeRadio" @updataTable="getRightPortalVIDatas"></form-dialog>
<table-dialog ref="tableDialog" :TreeNodeRow="this.nodeRow" :treeRadio="treeRadio"
@updataTable="getRightPortalVIDatas"></table-dialog>
<!-- 瀵煎叆 -->
@@ -204,8 +204,9 @@
this.$refs.formDialog.getTreeList();
} else {
this.$refs.tableDialog.visible = true;
- this.$refs.tableDialog.getDbList();
- this.$refs.tableDialog.getSearchSelectList();
+ this.$refs.tableDialog.getDbList(); // 鍙屽嚮鎿嶄綔涓嬫媺鎺ュ彛
+ this.$refs.tableDialog.getSearchSelectList(); // 閫夋嫨琛ㄥ崟涓嬫媺鎺ュ彛
+ this.$refs.tableDialog.getFormSelect(); // 鏌ヨ妯℃澘涓嬫媺鎺ュ彛
}
},
@@ -329,14 +330,18 @@
// 鏇存柊琛ㄥ崟
this.$refs.tableDialog.form = {
...prmItem,
+ itemFieldWidthList:prmItem.itemFieldWidthList.map(item => {
+ return{
+ ...item,
+ $cellEdit: true,
+ }
+ }),
viName: res.data.obj.viName,
editNodeId: row.id,
- itemOutFieldList: (prmItem.itemOutFieldList || []).map(item => ({id: item})),
+ itemOutFieldList: (prmItem.itemOutFieldList || []),
itemSearchFieldList: (prmItem.itemSearchFieldList || []).map(item => ({id: item})),
- itemKeyFieldList: (prmItem.itemKeyFieldList || []).map(item => ({id: item})),
- searchLabel: prmItem.itemSeniorQueryCols || '',
- searchNumber: prmItem.itemSeniorQueryColsCounts || '1',
- searchSql: prmItem.itemQuerySql || '',
+ itemKeyFieldList: (prmItem.itemKeyFieldList || []),
+ searchNumber: '1',
itemFileWidthSelect: (prmItem.itemFieldWidthList && prmItem.itemFieldWidthList.length > 0) ? prmItem.itemFieldWidthList[0].key : '',
itemWidth: (prmItem.itemFieldWidthList && prmItem.itemFieldWidthList.length > 0) ? prmItem.itemFieldWidthList[0].value : '250'
};
@@ -345,9 +350,6 @@
const [width = '0', height = '0'] = (prmItem.itemImgWH || '0,0').split(',');
this.$refs.tableDialog.itemImgWidth = width;
this.$refs.tableDialog.itemImgHeight = height;
-
- // 鍙屽嚮鎿嶄綔鑾峰彇鏁版嵁鏂规硶
- this.$refs.tableDialog.getDbList();
// 鏄剧ず瀵硅瘽妗�
this.$refs.tableDialog.visible = true;
--
Gitblit v1.9.3