From 52faefc67ffef29e3d208d2233c2547fc0ee47d3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 04 三月 2023 21:11:41 +0800
Subject: [PATCH] 2023-03-04
---
src/utils/utils-custom.js | 207 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 131 insertions(+), 76 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 35123de..3d8f378 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -1,3 +1,5 @@
+import md5 from 'md5'
+
export default class MenuUtils {
/**
* @description 鑾峰彇涓嬬骇妯″潡
@@ -394,7 +396,7 @@
* @description 閲嶇疆鑿滃崟閰嶇疆锛岄〉闈㈡暣浣撳鍒�
* @return {String} components 閰嶇疆淇℃伅
*/
- static resetConfig = (components, uuids = {}, clear = false) => {
+ static resetConfig = (components, commonId, clear = false) => {
return components.map(item => {
if (item.type === 'navbar') {
return item
@@ -404,18 +406,16 @@
item.type = 'card'
}
- uuids[item.uuid] = this.getuuid()
- item.uuid = uuids[item.uuid]
+ item.uuid = md5(commonId + item.uuid)
if (item.type === 'tabs') {
item.subtabs.forEach(tab => {
- uuids[tab.uuid] = this.getuuid()
- tab.uuid = uuids[tab.uuid]
+ tab.uuid = md5(commonId + tab.uuid)
- tab.components = this.resetConfig(tab.components, uuids, clear)
+ tab.components = this.resetConfig(tab.components, commonId, clear)
})
} else if (item.type === 'group') {
- item.components = this.resetConfig(item.components, uuids, clear)
+ item.components = this.resetConfig(item.components, commonId, clear)
} else if (item.type === 'menubar') {
item.subMenus = item.subMenus.map(cell => {
cell.uuid = this.getuuid()
@@ -426,8 +426,17 @@
return cell
})
} else if (['card', 'carousel', 'timeline'].includes(item.type)) {
- if (item.wrap.datatype === 'public' && uuids[item.wrap.publicId]) {
- item.wrap.publicId = uuids[item.wrap.publicId]
+ if (item.wrap.datatype === 'public' && item.wrap.publicId) {
+ item.wrap.publicId = md5(commonId + item.wrap.publicId)
+ }
+
+ if (item.supNodes && item.supNodes.length > 0) {
+ item.supNodes = item.supNodes.map(cell => {
+ cell.nodes = cell.nodes.map(n => md5(commonId + n))
+ cell.componentId = cell.nodes[cell.nodes.length - 1]
+
+ return cell
+ })
}
item.subcards.forEach(card => {
@@ -444,13 +453,21 @@
}
}
+ if (card.setting.click === 'button' && card.setting.linkbtn) {
+ card.setting.linkbtn = md5(commonId + card.setting.linkbtn)
+ }
+
if (card.elements) {
card.elements = card.elements.map(cell => {
- cell.uuid = this.getuuid()
-
- if (clear && cell.eleType === 'button' && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
- cell.pageTemplate = ''
- cell.linkmenu = ''
+ if (cell.eleType === 'button') {
+ cell.uuid = md5(commonId + cell.uuid)
+ if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
+ cell.pageTemplate = ''
+ cell.linkmenu = ''
+ }
+ this.resetBtn(cell, commonId)
+ } else {
+ cell.uuid = this.getuuid()
}
return cell
@@ -458,11 +475,15 @@
}
if (card.backElements) {
card.backElements = card.backElements.map(cell => {
- cell.uuid = this.getuuid()
-
- if (clear && cell.eleType === 'button' && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
- cell.pageTemplate = ''
- cell.linkmenu = ''
+ if (cell.eleType === 'button') {
+ cell.uuid = md5(commonId + cell.uuid)
+ if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
+ cell.pageTemplate = ''
+ cell.linkmenu = ''
+ }
+ this.resetBtn(cell, commonId)
+ } else {
+ cell.uuid = this.getuuid()
}
return cell
@@ -470,16 +491,23 @@
}
})
} else if (item.type === 'balcony') {
- if (item.wrap.datatype === 'public' && uuids[item.wrap.publicId]) {
- item.wrap.publicId = uuids[item.wrap.publicId]
+ if (item.wrap.datatype === 'public' && item.wrap.publicId) {
+ item.wrap.publicId = md5(commonId + item.wrap.publicId)
+ }
+ if (item.wrap.linkbtn) {
+ item.wrap.linkbtn = md5(commonId + item.wrap.linkbtn)
}
if (item.elements) {
item.elements = item.elements.map(cell => {
- cell.uuid = this.getuuid()
-
- if (clear && cell.eleType === 'button' && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
- cell.pageTemplate = ''
- cell.linkmenu = ''
+ if (cell.eleType === 'button') {
+ cell.uuid = md5(commonId + cell.uuid)
+ if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
+ cell.pageTemplate = ''
+ cell.linkmenu = ''
+ }
+ this.resetBtn(cell, commonId)
+ } else {
+ cell.uuid = this.getuuid()
}
return cell
@@ -488,7 +516,7 @@
} else if (item.type === 'table' && item.cols) {
let loopCol = (col) => {
col.subcols = col.subcols.map(c => {
- c.uuid = this.getuuid()
+ c.uuid = md5(commonId + c.uuid)
if (c.type === 'colspan' && c.subcols) {
c = loopCol(c)
@@ -500,12 +528,14 @@
})
} else if (c.type === 'action' && c.elements) {
c.elements = c.elements.map(cell => {
- cell.uuid = this.getuuid()
+ cell.uuid = md5(commonId + cell.uuid)
if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
cell.pageTemplate = ''
cell.linkmenu = ''
}
+
+ this.resetBtn(cell, commonId)
return cell
})
@@ -515,12 +545,9 @@
return col
}
- let _uuids = {}
- item.cols = item.cols.map(col => {
- let uuid = this.getuuid()
- _uuids[col.uuid] = uuid
- col.uuid = uuid
+ item.cols = item.cols.map(col => {
+ col.uuid = md5(commonId + col.uuid)
if (col.type === 'colspan' && col.subcols) {
col = loopCol(col)
@@ -531,7 +558,8 @@
})
} else if (col.type === 'action' && col.elements) {
col.elements = col.elements.map(cell => {
- cell.uuid = this.getuuid()
+ cell.uuid = md5(commonId + cell.uuid)
+ this.resetBtn(cell, commonId)
return cell
})
}
@@ -540,8 +568,15 @@
if (item.subtype === 'editable') {
item.cols = item.cols.map(col => {
- if (col.editable === 'true' && col.enter && _uuids[col.enter]) {
- col.enter = _uuids[col.enter]
+ 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
})
@@ -555,6 +590,11 @@
return m
})
+
+ if (cell.subButton) {
+ this.resetBtn(cell.subButton, commonId)
+ }
+
return cell
})
}
@@ -563,18 +603,16 @@
item.btnlog = null
}
- let oriUids = {}
if (item.action) {
item.action = item.action.map(cell => {
- let _uuid = this.getuuid()
-
- oriUids[cell.uuid] = _uuid
- cell.uuid = _uuid
+ cell.uuid = md5(commonId + cell.uuid)
if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
cell.pageTemplate = ''
cell.linkmenu = ''
}
+
+ this.resetBtn(cell, commonId)
return cell
})
@@ -613,27 +651,35 @@
}
if (item.setting && item.setting.supModule && item.setting.supModule[0] !== 'empty') {
- let em = false
item.setting.supModule = item.setting.supModule.map(c => {
- if (!uuids[c]) {
- em = true
- }
- return uuids[c] || ''
+ return md5(commonId + c)
})
- if (em) {
- item.setting.supModule = ''
- }
if (item.wrap && item.wrap.supModule) {
item.wrap.supModule = item.setting.supModule
}
}
if (item.wrap && item.wrap.doubleClick) {
- item.wrap.doubleClick = oriUids[item.wrap.doubleClick] || ''
+ item.wrap.doubleClick = md5(commonId + item.wrap.doubleClick)
}
return item
})
+ }
+
+ /**
+ * @description 鎸夐挳閲嶇疆
+ */
+ static resetBtn (btn, commonId) {
+ if (btn.switchTab && btn.switchTab.length > 0) {
+ btn.switchTab = btn.switchTab.map(m => md5(commonId + m))
+ }
+ if (btn.anchors && btn.anchors.length > 0) {
+ btn.anchors = btn.anchors.map(m => md5(commonId + m))
+ }
+ if (btn.syncComponent && btn.syncComponent.length > 0) {
+ btn.syncComponent = btn.syncComponent.map(m => md5(commonId + m))
+ }
}
/**
@@ -652,7 +698,7 @@
* @description 閲嶇疆缁勪欢閰嶇疆
* @return {String} item 缁勪欢淇℃伅
*/
- static resetComponentConfig = (item, uuids = {}) => {
+ static resetComponentConfig = (item) => {
if (item.type === 'navbar') {
return item
}
@@ -661,11 +707,8 @@
item.type = 'card'
}
- let _uuid = this.getuuid()
-
- uuids[item.uuid] = _uuid
-
- item.uuid = _uuid
+ item.uuid = this.getuuid()
+ let commonId = this.getuuid()
// 閲嶇疆缁勪欢鍚嶇О
let sign = this.getSignName()
@@ -688,12 +731,21 @@
} else if (['card', 'carousel', 'timeline'].includes(item.type)) {
item.subcards.forEach(card => {
card.uuid = this.getuuid()
+
+ if (card.setting.click === 'button' && card.setting.linkbtn) {
+ card.setting.linkbtn = md5(commonId + card.setting.linkbtn)
+ }
+
if (card.elements) {
if (sessionStorage.getItem('editMenuType') === 'popview') {
card.elements = card.elements.filter(b => b.OpenType !== 'popview' && b.OpenType !== 'funcbutton')
}
card.elements = card.elements.map(cell => {
- cell.uuid = this.getuuid()
+ if (cell.eleType === 'button') {
+ cell.uuid = md5(commonId + cell.uuid)
+ } else {
+ cell.uuid = this.getuuid()
+ }
return cell
})
}
@@ -702,7 +754,11 @@
card.elements = card.elements.filter(b => b.OpenType !== 'popview' && b.OpenType !== 'funcbutton')
}
card.backElements = card.backElements.map(cell => {
- cell.uuid = this.getuuid()
+ if (cell.eleType === 'button') {
+ cell.uuid = md5(commonId + cell.uuid)
+ } else {
+ cell.uuid = this.getuuid()
+ }
return cell
})
}
@@ -712,8 +768,15 @@
if (sessionStorage.getItem('editMenuType') === 'popview') {
item.elements = item.elements.filter(b => b.OpenType !== 'popview' && b.OpenType !== 'funcbutton')
}
+ if (item.wrap.linkbtn) {
+ item.wrap.linkbtn = md5(commonId + item.wrap.linkbtn)
+ }
item.elements = item.elements.map(cell => {
- cell.uuid = this.getuuid()
+ if (cell.eleType === 'button') {
+ cell.uuid = md5(commonId + cell.uuid)
+ } else {
+ cell.uuid = this.getuuid()
+ }
return cell
})
}
@@ -736,12 +799,8 @@
return col
}
- let _uuids = {}
item.cols = item.cols.map(col => {
- let uuid = this.getuuid()
-
- _uuids[col.uuid] = uuid
- col.uuid = uuid
+ col.uuid = md5(commonId + col.uuid)
if (col.type === 'colspan' && col.subcols) {
col = loopCol(col)
@@ -755,7 +814,8 @@
col.elements = col.elements.filter(c => c.OpenType !== 'popview' && c.OpenType !== 'funcbutton')
}
col.elements = col.elements.map(cell => {
- cell.uuid = this.getuuid()
+ cell.uuid = md5(commonId + cell.uuid)
+
return cell
})
}
@@ -764,8 +824,8 @@
if (item.subtype === 'editable') {
item.cols = item.cols.map(col => {
- if (col.editable === 'true' && col.enter && _uuids[col.enter]) {
- col.enter = _uuids[col.enter]
+ if (col.editable === 'true' && col.enter) {
+ col.enter = md5(commonId + col.enter)
}
return col
})
@@ -785,17 +845,12 @@
delete item.btnlog
- let oriUids = {}
if (item.action) {
if (sessionStorage.getItem('editMenuType') === 'popview') {
item.action = item.action.filter(c => c.OpenType !== 'popview' && c.OpenType !== 'funcbutton')
}
item.action = item.action.map(cell => {
- let _uuid = this.getuuid()
-
- oriUids[cell.uuid] = _uuid
-
- cell.uuid = _uuid
+ cell.uuid = md5(commonId + cell.uuid)
return cell
})
@@ -840,7 +895,7 @@
}
if (item.wrap && item.wrap.doubleClick) {
- item.wrap.doubleClick = oriUids[item.wrap.doubleClick] || ''
+ item.wrap.doubleClick = md5(commonId + item.wrap.doubleClick)
}
return item
@@ -896,7 +951,7 @@
export function getTables (config, pops) {
let tables = []
let cuts = []
- let cutreg = /(from|update|insert\s+into)\s+(@db@)?[a-z_]+/ig
+ let cutreg = /(from|update|insert\s+into)\s+(@db@)?[a-z0-9_]+/ig
let trimreg = /(from|update|insert\s+into)\s+(@db@)?/ig
if (config.setting && (!config.wrap || !config.wrap.datatype || config.wrap.datatype === 'dynamic')) {
@@ -1125,7 +1180,7 @@
cuts = cuts.map(item => item.replace(trimreg, ''))
tables.push(...cuts)
- tables = tables.filter(Boolean)
+ tables = tables.filter(tb => tb && tb !== 'dbo' && tb.length > 1)
tables = Array.from(new Set(tables))
return tables
--
Gitblit v1.8.0