From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/utils/utils-custom.js | 398 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 278 insertions(+), 120 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index c07d64c..be4f888 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -19,6 +19,8 @@
} else if (item.type === 'tabs') {
if (item.subtype === 'tabletabs') {
item.subtabs.forEach(tab => {
+ if (tab.components[0].uuid === selfId) return
+
modules.push({
value: tab.components[0].uuid,
label: tab.label,
@@ -517,73 +519,44 @@
})
}
} else if (item.type === 'table' && item.cols) {
- let loopCol = (col) => {
- col.subcols = col.subcols.map(c => {
- c.uuid = md5(commonId + c.uuid)
-
- if (c.type === 'colspan' && c.subcols) {
- c = loopCol(c)
- } else if (c.type === 'custom' && c.elements) {
- c.elements = c.elements.map(cell => {
- cell.uuid = this.getuuid()
+ let loopCol = (cols) => {
+ return cols.map(col => {
+ if (col.type === 'action') {
+ col.type = 'custom'
+ }
- return cell
- })
- } else if (c.type === 'action' && c.elements) {
- c.elements = c.elements.map(cell => {
+ col.uuid = md5(commonId + col.uuid)
+
+ if (col.type === 'colspan' && col.subcols) {
+ col.subcols = loopCol(col.subcols)
+ } else if (col.type === 'custom' && col.elements) {
+ col.elements = col.elements.map(cell => {
cell.uuid = md5(commonId + cell.uuid)
- if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
- cell.pageTemplate = ''
- cell.linkmenu = ''
- }
+ if (cell.eleType === 'button') {
+ if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
+ cell.pageTemplate = ''
+ cell.linkmenu = ''
+ }
- this.resetBtn(cell, commonId)
+ this.resetBtn(cell, commonId)
+ }
return cell
})
+ } else if (col.editable === 'true' && col.enter && col.enter !== '$next' && col.enter !== '$sub') {
+ if (/\$next_/.test(col.enter)) {
+ col.enter = '$next_' + md5(commonId + col.enter.split('_')[1])
+ } else {
+ col.enter = md5(commonId + col.enter)
+ }
}
- return c
- })
-
- return col
- }
- item.cols = item.cols.map(col => {
- col.uuid = md5(commonId + col.uuid)
-
- if (col.type === 'colspan' && col.subcols) {
- col = loopCol(col)
- } else if (col.type === 'custom' && col.elements) {
- col.elements = col.elements.map(cell => {
- cell.uuid = this.getuuid()
- return cell
- })
- } else if (col.type === 'action' && col.elements) {
- col.elements = col.elements.map(cell => {
- cell.uuid = md5(commonId + cell.uuid)
- this.resetBtn(cell, commonId)
- return cell
- })
- }
- return col
- })
-
- if (item.subtype === 'editable') {
- item.cols = item.cols.map(col => {
- if (col.editable === 'true' && col.enter) {
- col.enter = md5(commonId + col.enter)
- } else if (col.type === 'colspan' && col.subcols) {
- col.subcols = col.subcols.map(c => {
- if (c.editable === 'true' && c.enter) {
- c.enter = md5(commonId + c.enter)
- }
- return c
- })
- }
return col
})
}
+
+ item.cols = loopCol(item.cols)
} else if (item.type === 'form') {
item.subcards = item.subcards.map(cell => {
cell.uuid = this.getuuid()
@@ -688,7 +661,12 @@
if (btn.anchors && btn.anchors.length > 0) {
btn.anchors = btn.anchors.map(m => md5(commonId + m))
}
- if (btn.syncComponent && btn.syncComponent.length > 0) {
+ if (btn.syncComponent && btn.syncComponent[0] === 'multiComponent' && btn.syncComponents) {
+ btn.syncComponents = btn.syncComponents.map(m => {
+ m.syncComId = m.syncComId.map(n => md5(commonId + n))
+ return m
+ })
+ } else if (btn.syncComponent && btn.syncComponent.length > 0) {
btn.syncComponent = btn.syncComponent.map(m => md5(commonId + m))
}
}
@@ -709,7 +687,7 @@
* @description 閲嶇疆缁勪欢閰嶇疆
* @return {String} item 缁勪欢淇℃伅
*/
- static resetComponentConfig = (item) => {
+ static resetComponentConfig = (item, appType) => {
if (item.type === 'navbar') {
return item
}
@@ -742,6 +720,16 @@
} else if (['card', 'carousel', 'timeline'].includes(item.type)) {
if (item.wrap.autoExec) {
item.wrap.autoExec = md5(commonId + item.wrap.autoExec)
+ }
+
+ if (appType !== 'mob') {
+ if (item.wrap.pagestyle === 'slide') {
+ item.wrap.pagestyle = 'page'
+ }
+ } else {
+ if (item.wrap.pagestyle === 'switch') {
+ item.wrap.pagestyle = 'page'
+ }
}
item.subcards.forEach(card => {
@@ -821,63 +809,47 @@
})
}
} else if (item.type === 'table' && item.cols) {
- let loopCol = (col) => {
- col.subcols = col.subcols.map(c => {
- c.uuid = this.getuuid()
+ let loopCol = (cols) => {
+ return cols.map(col => {
+ if (col.type === 'action') {
+ col.type = 'custom'
+ }
- if (c.type === 'colspan' && c.subcols) {
- c = loopCol(c)
- } else if (c.type === 'custom' && c.elements) {
- c.elements = c.elements.map(cell => {
- cell.uuid = this.getuuid()
+ col.uuid = md5(commonId + col.uuid)
+
+ if (col.type === 'colspan' && col.subcols) {
+ col.subcols = loopCol(col.subcols)
+ } else if (col.type === 'custom' && col.elements) {
+ if (sessionStorage.getItem('editMenuType') === 'popview') {
+ col.elements = col.elements.filter(c => c.eleType !== 'button' || (c.OpenType !== 'popview' && c.OpenType !== 'funcbutton'))
+ }
+ col.elements = col.elements.map(cell => {
+ cell.uuid = md5(commonId + cell.uuid)
+ if (cell.eleType === 'button') {
+ if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
+ if (cell.modal && cell.modal.fields.length > 0) {
+ cell.modal.fields = cell.modal.fields.map(m => {
+ m.uuid = this.getuuid()
+ return m
+ })
+ }
+ }
+ }
return cell
})
- }
- return c
- })
-
- return col
- }
-
- item.cols = item.cols.map(col => {
- col.uuid = md5(commonId + col.uuid)
-
- if (col.type === 'colspan' && col.subcols) {
- col = loopCol(col)
- } else if (col.type === 'custom' && col.elements) {
- col.elements = col.elements.map(cell => {
- cell.uuid = this.getuuid()
- return cell
- })
- } else if (col.type === 'action' && col.elements) {
- if (sessionStorage.getItem('editMenuType') === 'popview') {
- col.elements = col.elements.filter(c => c.OpenType !== 'popview' && c.OpenType !== 'funcbutton')
- }
- col.elements = col.elements.map(cell => {
- cell.uuid = md5(commonId + cell.uuid)
- if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
- if (cell.modal && cell.modal.fields.length > 0) {
- cell.modal.fields = cell.modal.fields.map(m => {
- m.uuid = this.getuuid()
- return m
- })
- }
+ } else if (col.editable === 'true' && col.enter && col.enter !== '$next' && col.enter !== '$sub') { // 鍙紪杈戣〃
+ if (/\$next_/.test(col.enter)) {
+ col.enter = '$next_' + md5(commonId + col.enter.split('_')[1])
+ } else {
+ col.enter = md5(commonId + col.enter)
}
-
- return cell
- })
- }
- return col
- })
-
- if (item.subtype === 'editable') {
- item.cols = item.cols.map(col => {
- if (col.editable === 'true' && col.enter) {
- col.enter = md5(commonId + col.enter)
}
+
return col
})
}
+
+ item.cols = loopCol(item.cols)
} else if (item.type === 'form') {
item.subcards = item.subcards.map(cell => {
cell.uuid = this.getuuid()
@@ -1084,23 +1056,31 @@
})
}
- config.cols && config.cols.forEach(col => {
- if (col.type === 'action') {
- 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})
- } else if (cell.config && cell.config.$tables) {
- tables.push(...cell.config.$tables)
- }
+ if (config.cols) {
+ let loopCol = (cols) => {
+ cols.forEach(col => {
+ if (col.type === 'colspan') {
+ loopCol(col.subcols)
+ } else if (col.type === 'custom') {
+ col.elements.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) {
+ pops.push({...cell, parentId: config.uuid})
+ } else if (cell.config && cell.config.$tables) {
+ tables.push(...cell.config.$tables)
+ }
+ }
+ })
}
})
}
- })
+ loopCol(config.cols)
+ }
config.elements && config.elements.forEach(cell => {
if (cell.eleType !== 'button') return
@@ -1240,4 +1220,182 @@
tables = Array.from(new Set(tables))
return tables
+}
+
+/**
+ * @description 妫�娴嬬粍浠跺唴瀹�
+ */
+export function checkComponent (card) {
+ let errors = []
+ let columns = []
+
+ if (card.$c_ds) {
+ columns = card.columns.map(c => c.field)
+ if (card.setting.interType === 'system' && card.setting.execute !== 'false' && !card.setting.dataresource) {
+ errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
+ } else if (card.setting.interType === 'system' && card.setting.execute === 'false' && card.scripts.filter(script => script.status !== 'false').length === 0) {
+ errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
+ } else if (!card.setting.primaryKey) {
+ errors.push({ level: 0, detail: '鏈缃富閿紒'})
+ } else if (!columns.includes(card.setting.primaryKey)) {
+ errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
+ } else if (card.subtype === 'dualdatacard') { // 鍙岄噸鍗�
+ if (!card.setting.subKey) {
+ errors.push({ level: 0, detail: '鏈缃瓙琛ㄤ富閿紒'})
+ } else if (!card.setting.subBID) {
+ errors.push({ level: 0, detail: '鏈缃瓙琛˙ID锛�'})
+ } else if (!card.setting.supModule) {
+ errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
+ }
+ } else if (card.type === 'card' && card.subtype === 'datacard') { // 鏁版嵁鍗★紝鍙兘鏈夊涓婄骇
+ if (card.wrap.supType !== 'multi' && !card.setting.supModule) {
+ errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
+ }
+ } else if (card.type !== 'balcony' && !card.setting.supModule) { // 鎮诞妗嗕笂绾х粍浠堕渶鍗曠嫭璁剧疆
+ errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
+ }
+ } else if ((card.type === 'balcony' || card.type === 'card') && card.wrap.datatype === 'public') {
+ columns = card.columns.map(c => c.field)
+ }
+
+ let doubleClick = ''
+ if (card.type === 'table') {
+ doubleClick = card.wrap.doubleClick || ''
+ }
+
+ if (card.$c_ac) {
+ card.action.forEach(cell => {
+ if (cell.hidden === 'true' || cell.origin) return
+ // if (cell.OpenType === 'popview') {
+ // if (!cell.config) {
+ // errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑寮圭獥鏍囩灏氭湭璁剧疆`})
+ // } else if (!cell.config.enabled) {
+ // errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑寮圭獥鏍囩鏈惎鐢╜})
+ // }
+ // }
+ if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
+ 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 === 'excelOut' && (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0)) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楁湭璁剧疆锛乣})
+ }
+ if (doubleClick === cell.uuid) {
+ doubleClick = ''
+ }
+ })
+ }
+
+ if (card.$c_sc) {
+ card.subcards.forEach((item, i) => {
+ let linkbtn = item.setting.linkbtn || ''
+ item.elements.forEach(cell => {
+ if (cell.eleType === 'button') {
+ if (cell.hidden === 'true') return
+ if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
+ 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 === 'excelOut' && (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0)) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楁湭璁剧疆锛乣})
+ }
+ if (linkbtn && linkbtn === cell.uuid) {
+ linkbtn = ''
+ }
+ } else if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
+ errors.push({ level: 1, detail: `鍗＄墖涓姩鎬佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
+ }
+ })
+
+ if (card.subtype === 'dualdatacard' || (item.setting.type === 'multi' && item.backElements && sessionStorage.getItem('appType') !== 'mob')) {
+ item.backElements.forEach(cell => {
+ if (cell.eleType === 'button') {
+ if (cell.hidden === 'true') return
+ if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
+ 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 === 'excelOut' && (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0)) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楁湭璁剧疆锛乣})
+ }
+ if (linkbtn && linkbtn === cell.uuid) {
+ linkbtn = ''
+ }
+ } else if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
+ errors.push({ level: 1, detail: `鍗＄墖涓姩鎬佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
+ }
+ })
+ }
+
+ if (linkbtn) {
+ errors.push({ level: 1, detail: `绗�${i + 1}寮犲崱鐗囦腑缁戝畾鎸夐挳宸插垹闄})
+ }
+ })
+
+ if (card.subcards.length === 0) {
+ errors.push({ level: 0, detail: '鍗＄墖涓嶅彲涓虹┖锛�'})
+ }
+ }
+
+ if (card.$c_el) {
+ card.elements.forEach(cell => {
+ if (cell.eleType === 'button') {
+ if (cell.hidden === 'true') return
+ if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
+ 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 === 'excelOut' && (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0)) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楁湭璁剧疆锛乣})
+ }
+ } else if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
+ errors.push({ level: 1, detail: `鍗＄墖涓姩鎬佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
+ }
+ })
+ }
+
+ if (card.$c_cl) {
+ card.cols.forEach(col => {
+ if (col.type === 'custom') {
+ col.elements.forEach(cell => {
+ if (cell.eleType === 'button') {
+ if (cell.hidden === 'true') return
+ if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
+ 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 === 'excelOut' && (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0)) {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑瀵煎嚭鍒楁湭璁剧疆锛乣})
+ }
+
+ if (doubleClick === cell.uuid) {
+ doubleClick = ''
+ }
+ } else {
+ if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
+ errors.push({ level: 1, detail: `鏄剧ず鍒椻��${col.label}鈥濅腑鍔ㄦ�佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
+ }
+ }
+ })
+ } else if (col.field && !columns.includes(col.field)) {
+ errors.push({ level: 1, detail: `鏄剧ず鍒椻��${col.label}鈥濅腑瀛楁鈥�${col.field}鈥濇棤鏁坄})
+ }
+ })
+
+ if (doubleClick) {
+ errors.push({ level: 1, detail: `缁戝畾鐨勫弻鍑绘寜閽凡鍒犻櫎`})
+ }
+ }
+
+ return errors
}
\ No newline at end of file
--
Gitblit v1.8.0