From 32ef02ddda2def2c8e42267f40c19b775224ce4b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 20 十月 2022 17:13:02 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils-custom.js | 64 ++++++-------------------------
1 files changed, 13 insertions(+), 51 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index fa7a65b..cbd1923 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -438,20 +438,10 @@
item.subtabs.forEach(tab => {
uuids[tab.uuid] = this.getuuid()
tab.uuid = uuids[tab.uuid]
- tab.parentId = item.uuid
-
- tab.components = tab.components.map(cell => {
- cell.tabId = tab.uuid
- cell.parentId = item.uuid
- return cell
- })
+
tab.components = this.resetConfig(tab.components, uuids, clear)
})
} else if (item.type === 'group') {
- item.components = item.components.map(cell => {
- cell.parentId = item.uuid
- return cell
- })
item.components = this.resetConfig(item.components, uuids, clear)
} else if (item.type === 'menubar') {
item.subMenus = item.subMenus.map(cell => {
@@ -463,6 +453,10 @@
return cell
})
} else if (['card', 'carousel', 'timeline'].includes(item.type) || (item.type === 'table' && item.subtype === 'tablecard')) {
+ if (item.wrap.datatype === 'public' && uuids[item.wrap.publicId]) {
+ item.wrap.publicId = uuids[item.wrap.publicId]
+ }
+
item.subcards.forEach(card => {
card.uuid = this.getuuid()
@@ -503,6 +497,9 @@
}
})
} else if (item.type === 'balcony') {
+ if (item.wrap.datatype === 'public' && uuids[item.wrap.publicId]) {
+ item.wrap.publicId = uuids[item.wrap.publicId]
+ }
if (item.elements) {
item.elements = item.elements.map(cell => {
cell.uuid = this.getuuid()
@@ -664,46 +661,15 @@
}
/**
- * @description 閲嶇疆鑿滃崟閰嶇疆锛岄〉闈㈡暣浣撳鍒�
- * @return {String} components 閰嶇疆淇℃伅
+ * @description 缁勪欢鍚嶅姞鍚庣紑
*/
- static getFloor = (id) => {
- let floor = 1
- let finish = false
-
- let reCheck = (components, f) => {
- components.forEach(item => {
- if (finish) return
- if (item.type === 'tabs') {
- if (item.uuid === id) {
- floor = f
- finish = true
- } else {
- item.subtabs.forEach(tab => {
- reCheck(tab.components, f + 1)
- })
- }
- }
- })
- }
-
- reCheck(window.GLOB.customMenu.components, 1)
-
- return floor
- }
-
- /**
- * @description 鏁版嵁婧愬悕绉帮紝鐢ㄤ簬缁熶竴鏌ヨ
- * @return {String} name
- */
- static getdataName () {
+ static getSignName () {
let name = []
let _options = 'abcdefghigklmnopqrstuvwxyz'
- for (let i = 0; i < 6; i++) {
+ for (let i = 0; i < 3; i++) {
name.push(_options.substr(Math.floor(Math.random() * 26), 1))
}
- name.splice(3, 0, new Date().getTime())
- return name.join('')
+ return (Math.floor(Math.random()*10) + name.join('')).toUpperCase()
}
/**
@@ -721,12 +687,8 @@
item.uuid = _uuid
- if (item.dataName) {
- item.dataName = this.getdataName()
- }
-
// 閲嶇疆缁勪欢鍚嶇О
- let sign = this.getdataName().toUpperCase().substr(-4)
+ let sign = this.getSignName()
if (item.plot) { // 鍥捐〃
item.plot.name = item.plot.name + sign
item.name = item.plot.name
--
Gitblit v1.8.0