From 89f85223ff7b1b5ee3931ae01efa3dd17d5524fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:03:27 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/mob/components/tabs/antv-tabs/index.jsx | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/src/mob/components/tabs/antv-tabs/index.jsx b/src/mob/components/tabs/antv-tabs/index.jsx
index dc73a22..45181e1 100644
--- a/src/mob/components/tabs/antv-tabs/index.jsx
+++ b/src/mob/components/tabs/antv-tabs/index.jsx
@@ -9,7 +9,6 @@
import asyncIconComponent from '@/utils/asyncIconComponent'
import DraggableTabs from './dragabletabs'
import { resetStyle } from '@/utils/utils-custom.js'
-import MenuUtils from '@/utils/utils-custom.js'
import Utils from '@/utils/utils.js'
import { getTabForm, getTabsSetForm } from './options'
import MkIcon from '@/components/mk-icon'
@@ -89,7 +88,7 @@
changeStyle = () => {
const { tabs } = this.state
- MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow'], tabs.style, this.getStyle)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear'], tabs.style, this.getStyle)
}
changeTabStyle = () => {
@@ -174,18 +173,12 @@
tabs.subtabs = tabs.subtabs.filter(t => t.uuid !== tab.uuid)
- let uuids = MenuUtils.getDelButtonIds({...tab, type: 'group'})
-
confirm({
title: '纭畾鍒犻櫎鏍囩锛�',
content: '',
onOk() {
_this.setState({tabs})
_this.props.updateConfig(tabs)
-
- if (uuids.length === 0) return
-
- MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
@@ -257,7 +250,6 @@
editab.label = res.label
editab.icon = res.icon
- // editab.hasSearch = res.hasSearch || ''
editab.hide = res.hide || 'false'
editab.backgroundColor = res.backgroundColor
editab.controlVal = res.controlVal || ''
--
Gitblit v1.8.0