From 8f394e7ef20cc0abba3f47c23a63b069e9dd0e45 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 19 十月 2022 15:09:30 +0800 Subject: [PATCH] 2022-10-19 --- src/utils/utils-custom.js | 57 ++++++--------------------------------------------------- 1 files changed, 6 insertions(+), 51 deletions(-) diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js index d021b1a..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 => { @@ -671,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() } /** @@ -728,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