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/mob/components/tabs/tabcomponents/index.jsx | 51 +++++++++++++++++++++------------------------------
1 files changed, 21 insertions(+), 30 deletions(-)
diff --git a/src/mob/components/tabs/tabcomponents/index.jsx b/src/mob/components/tabs/tabcomponents/index.jsx
index 84ee423..1d146b5 100644
--- a/src/mob/components/tabs/tabcomponents/index.jsx
+++ b/src/mob/components/tabs/tabcomponents/index.jsx
@@ -2,11 +2,9 @@
import { useDrop } from 'react-dnd'
import { is, fromJS } from 'immutable'
import update from 'immutability-helper'
-import { Empty, notification, Modal } from 'antd'
+import { Empty, Modal } from 'antd'
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'
@@ -36,6 +34,25 @@
handleList({...config, components: cards.map(item => item.uuid === element.uuid ? element : item)})
}
+ const unGroup = (id) => {
+ let { card, index } = findCard(`${id}`)
+ let components = [...card.components].map(item => {
+ if (item.wrap) {
+ item.wrap.width = card.width
+ item.width = card.width
+ } else if (item.plot) {
+ item.plot.width = card.width
+ item.width = card.width
+ }
+ return item
+ })
+ card.components = []
+
+ const _cards = update(cards, { $splice: [[index, 1, card, ...components]] })
+
+ handleList({...config, components: _cards})
+ }
+
const deleteCard = (id) => {
const { card } = findCard(id)
@@ -48,17 +65,11 @@
})
}
- let uuids = MenuUtils.getDelButtonIds(card)
-
confirm({
title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
onOk() {
handleList({...config, components: cards.filter(item => item.uuid !== card.uuid)})
-
- if (uuids.length === 0) return
-
- MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
@@ -76,26 +87,8 @@
item.added = true
if (item.component === 'search') { // 绉诲姩绔爣绛鹃〉涓笉鍙坊鍔犳悳绱�
- // if (cards.filter(card => card.type === 'search').length > 0) {
- // notification.warning({
- // top: 92,
- // message: '鎼滅储鏉′欢涓嶅彲閲嶅娣诲姞锛�',
- // duration: 5
- // })
- // return
- // }
item.added = false
return
- } else if (item.component === 'tabs') {
- let floor = MenuUtils.getFloor(config.parentId)
- if (floor >= 3 ) {
- notification.warning({
- top: 92,
- message: '鏍囩椤垫渶澶氫负涓夐噸缁撴瀯锛�',
- duration: 5
- })
- return
- }
}
let name = ''
@@ -131,13 +124,10 @@
let newcard = {
uuid: Utils.getuuid(),
- tabId: config.uuid,
- parentId: config.parentId,
type: item.component,
subtype: item.subtype,
config: item.config,
width: item.width || 24,
- dataName: Utils.getdataName(),
name: name,
isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
}
@@ -168,6 +158,7 @@
card={card}
moveCard={moveCard}
delCard={deleteCard}
+ unGroup={unGroup}
findCard={findCard}
updateConfig={updateConfig}
/>
--
Gitblit v1.8.0