From e8edfdadb561cd83bf6e1c3e00d55b8cc2aee6d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 十月 2022 17:57:34 +0800
Subject: [PATCH] 2022-10-17
---
src/menu/components/group/groupcomponents/index.jsx | 53 +++++++++++------------------------------------------
1 files changed, 11 insertions(+), 42 deletions(-)
diff --git a/src/menu/components/group/groupcomponents/index.jsx b/src/menu/components/group/groupcomponents/index.jsx
index b35112f..63e02b1 100644
--- a/src/menu/components/group/groupcomponents/index.jsx
+++ b/src/menu/components/group/groupcomponents/index.jsx
@@ -6,6 +6,7 @@
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
+import MenuUtils from '@/utils/utils-custom.js'
import Card from './card'
import './index.scss'
@@ -38,49 +39,16 @@
const deleteCard = (id) => {
const { card } = findCard(id)
- let uuids = []
- if (card.action && card.action.length) {
- card.action.forEach(act => {
- if (!act.origin) {
- uuids.push(act.uuid)
- }
- })
- }
- if (card.type === 'card') {
- card.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 (card.type === 'table' && card.subtype === 'tablecard') {
- card.subcards.forEach(_card => {
- _card.elements && _card.elements.forEach(cell => {
- if (cell.eleType === 'button') {
- uuids.push(cell.uuid)
- }
- })
- })
- } else if (card.type === 'table' && card.subtype === 'normaltable') {
- card.cols && card.cols.forEach(col => {
- if (col.type !== 'action') return
- col.elements && col.elements.forEach(cell => {
- uuids.push(cell.uuid)
- })
- })
- }
+ let uuids = MenuUtils.getDelButtonIds(card)
confirm({
title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
onOk() {
- MKEmitter.emit('delButtons', uuids)
handleList({...config, components: cards.filter(item => item.uuid !== card.uuid)})
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
@@ -91,7 +59,7 @@
drop(item) {
if (item.hasOwnProperty('originalIndex') || item.added) {
return
- } else if (item.component === 'tabs' || item.component === 'search' || item.component === 'group') { // 鍒嗙粍涓笉鍙坊鍔犳爣绛鹃〉鎴栨悳绱�
+ } else if (['login', 'navbar', 'topbar', 'tabs', 'search', 'group', 'menubar'].includes(item.component)) {
return
}
@@ -99,7 +67,8 @@
let name = ''
let names = {
- bbar: '鏌辩姸鍥�',
+ bar: '鏌辩姸鍥�',
+ chart: '鍥捐〃',
line: '鎶樼嚎鍥�',
tabs: '鏍囩缁�',
pie: '楗煎浘',
@@ -113,6 +82,8 @@
dashboard: '浠〃鐩�',
scatter: '鏁ｇ偣鍥�',
tree: '鏍戝舰鍒楄〃',
+ balcony: '娴姩鍗�',
+ timeline: '鏃堕棿杞�',
card: '鍗＄墖'
}
let i = 1
@@ -133,9 +104,7 @@
subtype: item.subtype,
config: item.config,
width: item.width || 24,
- dataName: Utils.getdataName(),
name: name,
- floor: config.floor || 1, // 缁勪欢鐨勫眰绾�
isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
}
--
Gitblit v1.8.0