From 8e74e4263f60118587aae65eee4009438892dc19 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 11:27:22 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/comtableconfig/updatetable/index.jsx | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 53 insertions(+), 46 deletions(-)
diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx
index e2a7d87..82d0052 100644
--- a/src/templates/comtableconfig/updatetable/index.jsx
+++ b/src/templates/comtableconfig/updatetable/index.jsx
@@ -694,6 +694,38 @@
})
}
+ checkBtns = (card) => {
+ card.action.forEach(cell => {
+ if (cell.hidden === 'true') 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}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
+ }
+ } else if (cell.OpenType === 'excelIn' && (!cell.verify || !cell.verify.sheet || !cell.verify.columns || cell.verify.columns.length === 0)) {
+ card.errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎叆鍒楁湭璁剧疆锛乣})
+ } else if (cell.OpenType === 'excelOut' && (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0)) {
+ card.errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楁湭璁剧疆锛乣})
+ }
+ })
+
+ card.cols.forEach(col => {
+ if (col.type !== 'custom') return
+
+ col.elements.forEach(cell => {
+ 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}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
+ }
+ } else if (cell.OpenType === 'excelIn' && (!cell.verify || !cell.verify.sheet || !cell.verify.columns || cell.verify.columns.length === 0)) {
+ card.errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎叆鍒楁湭璁剧疆锛乣})
+ } else if (cell.OpenType === 'excelOut' && (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0)) {
+ card.errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楁湭璁剧疆锛乣})
+ }
+ })
+ })
+ }
+
submitConfig = (_resolve, config) => {
let tbs = []
config.components.forEach(item => {
@@ -702,11 +734,14 @@
if (tab.components[0].$tables) {
tbs.push(...tab.components[0].$tables)
}
+
+ this.checkBtns(tab.components[0])
})
} else {
if (item.$tables) {
tbs.push(...item.$tables)
}
+ this.checkBtns(item)
}
})
@@ -1118,27 +1153,29 @@
popActions.push({origin: btn.uuid, linkTab: btn.linkTab || '', uuid: _btn.uuid, name: newCon.name, label: btn.label})
} else if (_btn.OpenType === 'tab') {
if (btn.tabTemplate === 'FormTab') {
- if (newCon.isMain !== true) {
- errors.push(newCon.name + '涓寜閽��' + btn.label + '銆嬩笉鍦ㄦ敮鎸�')
- return
- }
+ errors.push(newCon.name + '涓寜閽��' + btn.label + '銆嬩笉鍦ㄦ敮鎸�')
+ return
+ // if (newCon.isMain !== true) {
+ // errors.push(newCon.name + '涓寜閽��' + btn.label + '銆嬩笉鍦ㄦ敮鎸�')
+ // return
+ // }
- delete _btn.tabTemplate
+ // delete _btn.tabTemplate
- _btn.MenuID = 'tab' + md5(btn.uuid).substr(3)
- _btn.MenuName = this.baseMsg.MenuName + '-' + btn.label
- _btn.MenuNo = this.baseMsg.MenuNo + '_' + _btn.MenuID.substr(-4).toUpperCase()
- _btn.hidden = _btn.hidden || 'false'
- _btn.tabType = 'CustomPage'
- _btn.linkmenu = [this.baseMsg.fstMenuId, this.baseMsg.parentId, _btn.MenuID]
+ // _btn.MenuID = 'tab' + md5(btn.uuid).substr(3)
+ // _btn.MenuName = this.baseMsg.MenuName + '-' + btn.label
+ // _btn.MenuNo = this.baseMsg.MenuNo + '_' + _btn.MenuID.substr(-4).toUpperCase()
+ // _btn.hidden = _btn.hidden || 'false'
+ // _btn.tabType = 'CustomPage'
+ // _btn.linkmenu = [this.baseMsg.fstMenuId, this.baseMsg.parentId, _btn.MenuID]
- let _tab = {...btn}
+ // let _tab = {...btn}
- _tab.MenuID = _btn.MenuID
- _tab.MenuNo = _btn.MenuNo
- _tab.MenuName = _btn.MenuName
+ // _tab.MenuID = _btn.MenuID
+ // _tab.MenuNo = _btn.MenuNo
+ // _tab.MenuName = _btn.MenuName
- formTabs.push(_tab)
+ // formTabs.push(_tab)
} else if (!btn.linkmenu || btn.linkmenu.length !== 3) {
errors.push(newCon.name + '涓寜閽��' + btn.label + '銆嬩笉鍦ㄦ敮鎸�')
@@ -1229,36 +1266,6 @@
} else if (!_card.setting.supModule) {
_card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
}
-
- _card.action.forEach(cell => {
- if (cell.hidden === 'true') 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}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
- }
- } else if (cell.OpenType === 'excelIn' && (!cell.verify || !cell.verify.sheet || !cell.verify.columns || cell.verify.columns.length === 0)) {
- _card.errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎叆鍒楁湭璁剧疆锛乣})
- } else if (cell.OpenType === 'excelOut' && (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0)) {
- _card.errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楁湭璁剧疆锛乣})
- }
- })
-
- _card.cols.forEach(col => {
- if (col.type !== 'custom') return
-
- col.elements.forEach(cell => {
- 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}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
- }
- } else if (cell.OpenType === 'excelIn' && (!cell.verify || !cell.verify.sheet || !cell.verify.columns || cell.verify.columns.length === 0)) {
- _card.errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎叆鍒楁湭璁剧疆锛乣})
- } else if (cell.OpenType === 'excelOut' && (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0)) {
- _card.errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楁湭璁剧疆锛乣})
- }
- })
- })
return _card
}
--
Gitblit v1.8.0