From e9e8b1c7b481415714fff9a0d83099fd5a7d6ff0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 五月 2023 17:25:11 +0800
Subject: [PATCH] 2023-05-18
---
src/templates/comtableconfig/updatetable/index.jsx | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx
index 0523a29..e2a7d87 100644
--- a/src/templates/comtableconfig/updatetable/index.jsx
+++ b/src/templates/comtableconfig/updatetable/index.jsx
@@ -279,8 +279,9 @@
}
})
tab.components[0].cols.forEach(col => {
- if (col.type !== 'action') return
+ if (col.type !== 'custom') return
col.elements.forEach(btn => {
+ if (btn.eleType !== 'button') return
if (btn.OpenType === 'popview') {
if (menus[btn.uuid]) {
let mainTb = {name: '涓昏〃', uuid: Utils.getuuid(), useMSearch: 'false'}
@@ -330,8 +331,9 @@
}
})
item.cols.forEach(col => {
- if (col.type !== 'action') return
+ if (col.type !== 'custom') return
col.elements.forEach(btn => {
+ if (btn.eleType !== 'button') return
if (btn.OpenType === 'popview') {
if (menus[btn.uuid]) {
let mainTb = {name: '涓昏〃', uuid: Utils.getuuid(), useMSearch: 'false'}
@@ -450,8 +452,9 @@
}
})
tab.components[0].cols.forEach(col => {
- if (col.type !== 'action') return
+ if (col.type !== 'custom') return
col.elements.forEach(btn => {
+ if (btn.eleType !== 'button') return
if (btn.OpenType === 'popview' && btn.config && btn.config.components[0]) {
this.setTbForm(btn.config.components[0], menus, errors, tab.components[0].name + '-' + btn.label)
} else if (btn.OpenType === 'pop' || (btn.OpenType === 'funcbutton' && btn.funcType === 'print' && btn.execMode === 'pop')) {
@@ -487,8 +490,9 @@
}
})
item.cols.forEach(col => {
- if (col.type !== 'action') return
+ if (col.type !== 'custom') return
col.elements.forEach(btn => {
+ if (btn.eleType !== 'button') return
if (btn.OpenType === 'popview' && btn.config && btn.config.components[0]) {
this.setTbForm(btn.config.components[0], menus, errors, item.name + '-' + btn.label)
} else if (btn.OpenType === 'pop' || (btn.OpenType === 'funcbutton' && btn.funcType === 'print' && btn.execMode === 'pop')) {
@@ -531,8 +535,9 @@
}
})
item.cols.forEach(col => {
- if (col.type !== 'action') return
+ if (col.type !== 'custom') return
col.elements.forEach(btn => {
+ if (btn.eleType !== 'button') return
if (btn.OpenType === 'pop' || (btn.OpenType === 'funcbutton' && btn.funcType === 'print' && btn.execMode === 'pop')) {
if (menus[btn.uuid]) {
btn.modal = {
@@ -580,8 +585,9 @@
}
})
tab.components[0].cols.forEach(col => {
- if (col.type !== 'action') return
+ if (col.type !== 'custom') return
col.elements.forEach(btn => {
+ if (btn.eleType !== 'button') return
if (btn.OpenType === 'popview' && btn.config) {
btn.config.$tables = getTables(btn.config.components[0])
}
@@ -597,8 +603,9 @@
}
})
item.cols.forEach(col => {
- if (col.type !== 'action') return
+ if (col.type !== 'custom') return
col.elements.forEach(btn => {
+ if (btn.eleType !== 'button') return
if (btn.OpenType === 'popview' && btn.config) {
btn.config.$tables = getTables(btn.config.components[0])
}
@@ -1169,7 +1176,7 @@
marks: [],
isSub: false,
uuid: Utils.getuuid(),
- type: 'action',
+ type: 'custom',
Width: 120,
elements: colbtns,
style: {paddingTop: '12px', paddingLeft: '8px', paddingBottom: '12px', paddingRight: '8px'}
@@ -1237,10 +1244,10 @@
})
_card.cols.forEach(col => {
- if (col.type !== 'action') return
+ if (col.type !== 'custom') return
col.elements.forEach(cell => {
- if (cell.hidden === 'true') return
+ if (cell.hidden === 'true' || cell.eleType !== 'button') return
if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
if (!cell.modal || cell.modal.fields.length === 0) {
_card.errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
--
Gitblit v1.8.0