From 4de5be49a7d128118def405c5ce24771526cc188 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 05 一月 2021 21:34:55 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/group/normal-group/index.jsx | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/menu/components/group/normal-group/index.jsx b/src/menu/components/group/normal-group/index.jsx
index 5fb24c3..a135ab4 100644
--- a/src/menu/components/group/normal-group/index.jsx
+++ b/src/menu/components/group/normal-group/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
-import { Icon, Popover } from 'antd'
+import { Icon, Popover, Button } from 'antd'
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
@@ -12,10 +12,10 @@
import enUS from '@/locales/en-US/model.js'
import './index.scss'
-const SettingComponent = asyncIconComponent(() => import('../tabsetting'))
+const SettingComponent = asyncIconComponent(() => import('../groupsetting'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteController = asyncIconComponent(() => import('@/menu/pastecontroller'))
-const TabComponents = asyncComponent(() => import('../tabcomponents'))
+const GroupComponents = asyncComponent(() => import('../groupcomponents'))
class NormalGroup extends Component {
static propTpyes = {
@@ -123,14 +123,10 @@
this.props.updateConfig(component)
}
- insert = (item, cell) => {
+ insert = (item) => {
let group = fromJS(this.state.group).toJS()
- group.components.forEach(stab => {
- if (stab.uuid === cell.uuid) {
- stab.components.push(item)
- }
- })
+ group.components.push(item)
this.setState({group})
this.props.updateConfig(group)
@@ -152,8 +148,8 @@
} trigger="hover">
<Icon type="tool" />
</Popover>
- <TabComponents config={group} handleList={this.updateComponent} deleteCard={this.deleteCard} />
-
+ {group.setting && group.setting.print === 'true' ? <Button className="print-button" icon="printer" onClick={this.print}></Button> : null}
+ <GroupComponents config={group} handleList={this.updateComponent} deleteCard={this.deleteCard} />
</div>
)
}
--
Gitblit v1.8.0