From 102be577a7f8df2ae30045d55a1a5fc584f90363 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 十二月 2022 18:31:38 +0800
Subject: [PATCH] 2022-12-19
---
src/utils/utils-custom.js | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index a7a4398..35123de 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -943,6 +943,8 @@
if (cell.eleType !== 'button') return
if (['form', 'pop', 'prompt', 'exec', 'excelIn', 'excelOut'].includes(cell.OpenType)) {
action.push(cell)
+ } else if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) {
+ action.push(cell)
} else if (cell.OpenType === 'popview') {
if (pops) {
pops.push({...cell, parentId: config.uuid})
@@ -956,6 +958,8 @@
item.backElements.forEach(cell => {
if (cell.eleType !== 'button') return
if (['form', 'pop', 'prompt', 'exec', 'excelIn', 'excelOut'].includes(cell.OpenType)) {
+ action.push(cell)
+ } else if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) {
action.push(cell)
} else if (cell.OpenType === 'popview') {
if (pops) {
@@ -974,6 +978,8 @@
col.elements.forEach(cell => {
if (['form', 'pop', 'prompt', 'exec', 'excelIn', 'excelOut'].includes(cell.OpenType)) {
action.push(cell)
+ } else if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) {
+ action.push(cell)
} else if (cell.OpenType === 'popview') {
if (pops) {
pops.push({...cell, parentId: config.uuid})
@@ -989,6 +995,8 @@
if (cell.eleType !== 'button') return
if (['form', 'pop', 'prompt', 'exec', 'excelIn', 'excelOut'].includes(cell.OpenType)) {
action.push(cell)
+ } else if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) {
+ action.push(cell)
} else if (cell.OpenType === 'popview') {
if (pops) {
pops.push({...cell, parentId: config.uuid})
@@ -1000,6 +1008,8 @@
config.action && config.action.forEach(cell => {
if (['pop', 'prompt', 'exec', 'excelIn', 'excelOut'].includes(cell.OpenType)) {
+ action.push(cell)
+ } else if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) {
action.push(cell)
} else if (cell.OpenType === 'popview') {
if (pops) {
@@ -1026,6 +1036,19 @@
tbs && cuts.push(...tbs)
})
}
+ } else if (btn.OpenType === 'funcbutton') {
+ if (btn.intertype !== 'system' || !btn.verify || !btn.verify.setting) return
+ if (btn.verify.dataType === 'custom') {
+ if (btn.verify.setting.defaultSql !== 'false') {
+ let tbs = btn.verify.setting.dataresource.match(cutreg)
+ tbs && cuts.push(...tbs)
+ }
+ btn.verify.scripts && btn.verify.scripts.forEach(script => {
+ if (script.status === 'false') return
+ let tbs = script.sql.match(cutreg)
+ tbs && cuts.push(...tbs)
+ })
+ }
} else if (btn.OpenType === 'excelOut') {
if (btn.intertype !== 'system' || !btn.verify) return
if (btn.verify.dataType === 'custom') {
--
Gitblit v1.8.0