From b084e3303fe6e24d6a5b41118958b7cec06af474 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 八月 2024 16:23:08 +0800
Subject: [PATCH] 2024-08-14
---
src/utils/utils-custom.js | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 6823cc6..6d4c7f8 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
})
@@ -2069,7 +2074,7 @@
list.forEach(str => {
str = str.replace(/^\s/, '')
let strs = str.match(/(\s|=)[a-z0-9_]+\./ig)
- if (strs.length === 2 && (strs[0].replace(/\s|\./g, '') === strs[1].replace(/\s|\./g, ''))) {
+ if (strs.length === 2 && (strs[0].replace(/\s|\.|=/g, '') === strs[1].replace(/\s|\.|=/g, ''))) {
errors.push(str)
}
})
--
Gitblit v1.8.0