From 2292d1826e69e21c8a411c217faef635fe57d458 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 一月 2021 10:48:49 +0800
Subject: [PATCH] Merge branch 'bms' of ssh://39.106.218.81:29418/~jinfei/pc-plat into bms
---
src/menu/components/tabs/tabcomponents/index.jsx | 61 +-----------------------------
1 files changed, 3 insertions(+), 58 deletions(-)
diff --git a/src/menu/components/tabs/tabcomponents/index.jsx b/src/menu/components/tabs/tabcomponents/index.jsx
index 4891671..ece6a40 100644
--- a/src/menu/components/tabs/tabcomponents/index.jsx
+++ b/src/menu/components/tabs/tabcomponents/index.jsx
@@ -6,6 +6,7 @@
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
+import MenuUtils from '@/menu/utils/menuUtils.js'
import Card from './card'
import './index.scss'
@@ -47,55 +48,7 @@
})
}
- let uuids = []
- const getUuids = (item) => {
- if (item.type === 'tabs') {
- item.subtabs.forEach(tab => {
- tab.components.forEach(c => {
- getUuids(c)
- })
- })
- } else {
- if (item.action && item.action.length) {
- item.action.forEach(act => {
- if (!act.origin) {
- uuids.push(act.uuid)
- }
- })
- }
- if (item.type === 'card') {
- item.subcards.forEach(_card => {
- _card.elements && _card.elements.forEach(cell => {
- if (cell.eleType === 'button') {
- uuids.push(cell.uuid)
- }
- })
- _card.backElements && _card.backElements.forEach(cell => {
- if (cell.eleType === 'button') {
- uuids.push(cell.uuid)
- }
- })
- })
- } else if (item.type === 'table' && item.subtype === 'tablecard') {
- item.subcards.forEach(_card => {
- _card.elements && _card.elements.forEach(cell => {
- if (cell.eleType === 'button') {
- uuids.push(cell.uuid)
- }
- })
- })
- } else if (item.type === 'table' && item.subtype === 'normaltable') {
- item.cols && item.cols.forEach(col => {
- if (col.type !== 'action') return
- col.elements && col.elements.forEach(cell => {
- uuids.push(cell.uuid)
- })
- })
- }
- }
- }
-
- getUuids(card)
+ let uuids = MenuUtils.getDelButtonIds(card)
confirm({
title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
@@ -154,14 +107,6 @@
}
i++
}
-
- let dataName = ''
- while (!dataName) {
- let _dataName = Utils.getdataName()
- if (config.components.filter(com => com.dataName === _dataName).length === 0) {
- dataName = _dataName
- }
- }
let newcard = {
uuid: Utils.getuuid(),
@@ -171,7 +116,7 @@
subtype: item.subtype,
config: item.config,
width: item.width || 24,
- dataName: dataName,
+ dataName: Utils.getdataName(),
name: name,
floor: config.floor ? (config.floor + 1) : 2, // 缁勪欢鐨勫眰绾�
isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
--
Gitblit v1.8.0