From f4b9504cad034ddcdef21c2081d14a4984fcd2d3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 七月 2024 17:14:48 +0800
Subject: [PATCH] 2024-07-15
---
src/utils/utils-custom.js | 102 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 77 insertions(+), 25 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 68420fa..c64fdea 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -703,10 +703,6 @@
* @return {String} item 缁勪欢淇℃伅
*/
static resetComponentConfig = (item, appType, commonId) => {
- if (item.type === 'navbar') {
- return item
- }
-
if (item.subtype === 'tablecard') { // 鍏煎
item.type = 'card'
}
@@ -724,7 +720,22 @@
item.name = item.setting.name
}
- if (item.type === 'menubar') {
+ if (item.columns) {
+ item.columns = item.columns.map(cell => {
+ cell.uuid = this.getuuid()
+ return cell
+ })
+ }
+
+ if (item.type === 'navbar') {
+ if (appType === 'mob') {
+ item.menus.forEach(menu => {
+ menu.MenuID = this.getuuid()
+ })
+ item.wrap.MenuNo = item.wrap.MenuNo + sign
+ }
+ return item
+ } else if (item.type === 'menubar') {
item.subMenus = item.subMenus.map(cell => {
cell.uuid = this.getuuid()
return cell
@@ -923,12 +934,6 @@
}
} else if (item.search) {
item.search = item.search.map(cell => {
- cell.uuid = this.getuuid()
- return cell
- })
- }
- if (item.columns) {
- item.columns = item.columns.map(cell => {
cell.uuid = this.getuuid()
return cell
})
@@ -1799,23 +1804,31 @@
if (!cell.modal || cell.modal.fields.length === 0) {
errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
}
- } else if (cell.OpenType === 'excelIn' && (!cell.verify || !cell.verify.sheet || !cell.verify.columns || cell.verify.columns.length === 0)) {
- errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎叆鍒楁湭璁剧疆锛乣})
+ } else if (cell.OpenType === 'excelIn') {
+ if (!cell.verify || !cell.verify.sheet || !cell.verify.columns || cell.verify.columns.length === 0) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎叆鍒楁湭璁剧疆锛乣})
+ }
} else if (cell.OpenType === 'excelOut') {
if (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0) {
errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楁湭璁剧疆锛乣})
- } else if (cell.intertype === 'system' && cell.verify.dataType !== 'custom' && card.$c_ds && columns.length > 0) {
- let cols = []
- cell.verify.columns.forEach(col => {
- if (col.output === 'false' || col.Column === '$Index') return
- if (!columns.includes(col.Column)) {
- cols.push(col.Column)
+ } else if (cell.intertype === 'system' && cell.verify.dataType !== 'custom') {
+ if (!card.setting || card.setting.interType !== 'system') {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濋渶鑷畾涔夊鍑烘暟鎹簮锛乣})
+ } else if (card.type === 'balcony' || card.subtype === 'propcard') {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濋渶鑷畾涔夊鍑烘暟鎹簮锛乣})
+ } else if (card.$c_ds && columns.length > 0) {
+ let cols = []
+ cell.verify.columns.forEach(col => {
+ if (col.output === 'false' || col.Column === '$Index') return
+ if (!columns.includes(col.Column)) {
+ cols.push(col.Column)
+ }
+ })
+ if (cols.length) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楋紙${cols.join('銆�')}锛夊湪瀛楁闆嗕腑涓嶅瓨鍦紒`})
}
- })
- if (cols.length) {
- errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楋紙${cols.join('銆�')}锛夊湪瀛楁闆嗕腑涓嶅瓨鍦紒`})
}
- }
+ }
}
if (['pop', 'prompt', 'exec'].includes(cell.OpenType) && cell.verify && !cell.output) {
@@ -1823,6 +1836,38 @@
errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊肩煭淇″彂閫佹棤鏁堬紒`})
} else if (cell.verify.emailEnable === 'true') {
errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
+
+ if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) {
+ if (cell.OpenType === 'form' && cell.formType === 'count_line') return
+
+ if (cell.intertype === 'system') {
+ if (cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`})
+ }
+ } else if (cell.intertype === 'custom' || cell.intertype === 'outer') {
+ if (cell.callbackType === 'script' && (!cell.verify || !cell.verify.cbScripts || cell.verify.cbScripts.filter(item => item.status !== 'false').length === 0)) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鑷畾涔夎剼鏈洖璋冿紝鍥炶皟鑴氭湰涓嶅彲涓虹┖锛乣})
+ } else if (cell.procMode === 'system' && cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`})
+ }
+ }
+ } else if (cell.OpenType === 'funcbutton') {
+ if (cell.funcType === 'print') {
+ if (!cell.verify || !cell.verify.printMode) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濊瀹屽杽楠岃瘉淇℃伅锛乣})
+ } else if (cell.intertype === 'system' && cell.verify.dataType === 'custom' && (!cell.verify.setting || cell.verify.columns.length === 0)) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鑷畾涔夋墦鍗版暟鎹紝璇疯缃暟鎹簮锛乣})
+ }
+ } else if ((cell.funcType === 'refund' || cell.funcType === 'pay') && cell.payMode === 'system' && (!cell.verify || !cell.verify.scripts || cell.verify.scripts.filter(item => item.status !== 'false').length === 0)) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濋渶娣诲姞鑷畾涔夎剼鏈紒`})
+ }
+ } else if (cell.OpenType === 'innerpage' || cell.OpenType === 'outerpage') {
+ if (!cell.pageTemplate) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濋〉闈㈢被鍨嬭缃敊璇紒`})
+ } else if (cell.pageTemplate === 'pay' && cell.payMode === 'system' && (!cell.verify || !cell.verify.scripts || cell.verify.scripts.filter(item => item.status !== 'false').length === 0)) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濋渶娣诲姞鑷畾涔夎剼鏈紒`})
}
}
}
@@ -2013,6 +2058,13 @@
notification.warning({
top: 92,
message: `end 鍚庝笉鍙揣璺� begin銆俙,
+ duration: 5
+ })
+ return false
+ } else if (/\sdecimal\(8,/ig.test(sql)) {
+ notification.warning({
+ top: 92,
+ message: `涓嶅彲浣跨敤 decimal(8`,
duration: 5
})
return false
@@ -2601,13 +2653,13 @@
if (item.wrap.click === 'menu') {
resetMenu(item.wrap)
} else if (item.wrap.click === 'menus') {
- resetMenus(config.wrap)
+ resetMenus(item.wrap)
}
} else if (item.plot && (item.plot.click === 'menu' || item.plot.click === 'menus')) {
if (item.plot.click === 'menu') {
resetMenu(item.plot)
} else if (item.plot.click === 'menus') {
- resetMenus(config.plot)
+ resetMenus(item.plot)
}
}
if (item.setting && (!item.wrap || !item.wrap.datatype || item.wrap.datatype === 'dynamic')) {
--
Gitblit v1.8.0