From 6c919b7a55f15af56b212d059f1a5ea44d1ed5b8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 十一月 2022 17:05:46 +0800
Subject: [PATCH] 2022-11-04
---
src/templates/comtableconfig/updatetable/index.jsx | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx
index 8092a09..d810c7d 100644
--- a/src/templates/comtableconfig/updatetable/index.jsx
+++ b/src/templates/comtableconfig/updatetable/index.jsx
@@ -74,8 +74,9 @@
let uuids = {}
let formActions = []
let popActions = []
+ let errors = []
- let tbl = this.getTable(config, uuids, formActions, popActions)
+ let tbl = this.getTable(config, uuids, errors, formActions, popActions, '涓昏〃')
if (config.autoMatic && config.autoMatic.enable === 'true' && uuids[config.autoMatic.action]) {
_config.autoMatic = {...config.autoMatic}
@@ -86,6 +87,10 @@
_config.components.push(tbl)
+ if (config.tabgroups && config.tabgroups.length > 0) {
+
+ }
+
console.log(config)
console.log(_config)
@@ -94,10 +99,11 @@
}, 5000)
}
- getTable = (config, uuids, formActions, popActions) => {
+ getTable = (config, uuids, errors, formActions, popActions, name) => {
let _card = {
uuid: Utils.getuuid(),
type: 'table',
+ name: name,
format: 'array',
pageable: true,
switchable: true,
@@ -325,12 +331,14 @@
if (btn.OpenType === 'pop' || (btn.OpenType === 'funcbutton' && btn.funcType === 'print' && btn.execMode === 'pop')) {
- formActions.push({origin: btn.uuid, uuid: _btn.uuid})
+ formActions.push({origin: btn.uuid, uuid: _btn.uuid, name: name, label: btn.label})
} else if (btn.OpenType === 'popview') {
- popActions.push({origin: btn.uuid, linkTab: btn.linkTab || '', uuid: _btn.uuid})
+ popActions.push({origin: btn.uuid, linkTab: btn.linkTab || '', uuid: _btn.uuid, name: name, label: btn.label})
} else if (btn.OpenType === 'tab') {
if (btn.tabTemplate === 'FormTab' || !btn.linkmenu || btn.linkmenu.length !== 3) {
+
+ errors.push(name + '涓寜閽��' + btn.label + '銆嬩笉鍦ㄦ敮鎸�')
return
}
}
@@ -371,7 +379,7 @@
let sets = ['tableName', 'interType', 'sysInterface', 'innerFunc', 'interface', 'proInterface', 'outerFunc', 'dataresource', ['queryType', 'query'], 'primaryKey', 'order', 'execute', ['laypage', 'true'], ['pageSize', 10], ['onload', 'true']]
let wraps = ['tableType', ['bordered', 'true'], 'actionfixed', ['size', 'middle'], ['selected', 'false'], ['tableMode', 'compatible'], ['mask', 'show'], ['borderColor', '#e8e8e8'], 'height', 'controlField', 'controlVal']
// useMSearch supModule
- _card.scripts = config.setting.scripts
+ _card.scripts = config.setting.scripts || []
sets.forEach(n => {
if (n === 'interType' && !['system', 'inner', 'outer'].includes(config.setting.interType)) {
--
Gitblit v1.8.0