From c7aece35a62b6e91fd98a625bf0e53f64bfbd18d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 八月 2023 16:22:15 +0800
Subject: [PATCH] 2023-08-17
---
src/utils/utils-custom.js | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 2fde239..9f42868 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,
@@ -542,8 +544,12 @@
return cell
})
- } else if (col.editable === 'true' && col.enter) {
- col.enter = md5(commonId + col.enter)
+ } 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 col
@@ -655,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))
}
}
@@ -691,13 +702,13 @@
// 閲嶇疆缁勪欢鍚嶇О
let sign = this.getSignName()
if (item.plot) { // 鍥捐〃
- item.plot.name = item.plot.name + sign
+ item.plot.name = (item.plot.name || '') + sign
item.name = item.plot.name
} else if (item.wrap) { // 閫氱敤
- item.wrap.name = item.wrap.name + sign
+ item.wrap.name = (item.wrap.name || '') + sign
item.name = item.wrap.name
} else if (item.setting) { // 鍒嗙粍銆佹爣绛鹃〉绛�
- item.setting.name = item.setting.name + sign
+ item.setting.name = (item.setting.name || '') + sign
item.name = item.setting.name
}
@@ -826,8 +837,12 @@
}
return cell
})
- } else if (col.editable === 'true' && col.enter) { // 鍙紪杈戣〃
- col.enter = md5(commonId + col.enter)
+ } 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 col
--
Gitblit v1.8.0