From 891e8aaad3b2ce6980fd44d1cf49192dca1c3c66 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 十一月 2022 14:30:30 +0800
Subject: [PATCH] 2022-11-23
---
src/menu/components/chart/antv-G6/chartcompile/index.jsx | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/chart/antv-G6/chartcompile/index.jsx b/src/menu/components/chart/antv-G6/chartcompile/index.jsx
index 6a24679..4396a49 100644
--- a/src/menu/components/chart/antv-G6/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-G6/chartcompile/index.jsx
@@ -33,7 +33,7 @@
visible: true,
view: 'normal',
plot: fromJS(config.plot).toJS(),
- baseFormlist: getBaseForm(config.plot),
+ baseFormlist: getBaseForm(config.plot, config.columns),
formlist: getOptionForm(config.plot, config.columns)
})
}
@@ -46,6 +46,35 @@
this.norRef.handleConfirm().then(res => {
let _plot = {...plot, ...res}
+ if (_plot.click !== 'menus') {
+ delete _plot.menus
+ }
+ if (_plot.click !== 'menu') {
+ delete _plot.menu
+ delete _plot.MenuID
+ delete _plot.MenuName
+ delete _plot.MenuNo
+ delete _plot.tabType
+ } else if (sessionStorage.getItem('appType') === '' && _plot.menu) {
+ let list = null
+ try {
+ list = JSON.parse(sessionStorage.getItem('thdMenuList')) || []
+ } catch (e) {
+ list = []
+ }
+
+ let id = _plot.menu[_plot.menu.length - 1]
+
+ list.forEach(item => {
+ if (item.MenuID === id) {
+ _plot.MenuID = id
+ _plot.MenuName = item.MenuName
+ _plot.MenuNo = item.MenuNo
+ _plot.tabType = item.type
+ }
+ })
+ }
+
this.setState({
plot: _plot,
visible: false
@@ -57,6 +86,35 @@
this.baseRef.handleConfirm().then(res => {
let _plot = {...plot, ...res}
+ if (_plot.click !== 'menus') {
+ delete _plot.menus
+ }
+ if (_plot.click !== 'menu') {
+ delete _plot.menu
+ delete _plot.MenuID
+ delete _plot.MenuName
+ delete _plot.MenuNo
+ delete _plot.tabType
+ } else if (sessionStorage.getItem('appType') === '' && _plot.menu) {
+ let list = null
+ try {
+ list = JSON.parse(sessionStorage.getItem('thdMenuList')) || []
+ } catch (e) {
+ list = []
+ }
+
+ let id = _plot.menu[_plot.menu.length - 1]
+
+ list.forEach(item => {
+ if (item.MenuID === id) {
+ _plot.MenuID = id
+ _plot.MenuName = item.MenuName
+ _plot.MenuNo = item.MenuNo
+ _plot.tabType = item.type
+ }
+ })
+ }
+
this.setState({
plot: _plot,
visible: false
--
Gitblit v1.8.0