From eb7d8402b8c23bbdb06f3199a114592f0a5d94e8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 11 五月 2022 13:23:25 +0800
Subject: [PATCH] 2022-05-11
---
src/menu/components/chart/antv-pie/index.jsx | 2 +-
src/menu/components/chart/antv-bar/index.jsx | 2 +-
src/menu/components/chart/antv-scatter/index.jsx | 2 +-
src/menu/components/chart/antv-dashboard/index.jsx | 4 ++--
src/views/menudesign/index.scss | 15 +++++++++++++++
src/menu/components/card/prop-card/index.jsx | 1 +
src/views/menudesign/index.jsx | 11 +++++++++--
src/menu/components/chart/chart-custom/index.jsx | 2 +-
src/menu/components/card/data-card/index.jsx | 1 +
9 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index 7b10cf3..a63e8c1 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -674,6 +674,7 @@
<div style={{clear: 'both'}}></div>
{card.wrap.pagestyle === 'page' && card.setting.laypage === 'true' && appType !== 'mob' ? <Pagination total={85} size="small" showTotal={total => `鍏� ${total} 鏉} pageSize={20} defaultCurrent={1}/> : null}
{card.wrap.pagestyle === 'page' && card.setting.laypage === 'true' && appType === 'mob' ? <MobPagination /> : null}
+ {/* <div className="component-name"><div className="center">{card.name}</div></div> */}
</div>
)
}
diff --git a/src/menu/components/card/prop-card/index.jsx b/src/menu/components/card/prop-card/index.jsx
index b42cc9a..c54918c 100644
--- a/src/menu/components/card/prop-card/index.jsx
+++ b/src/menu/components/card/prop-card/index.jsx
@@ -494,6 +494,7 @@
<div className={(card.wrap.layout || 'grid') + '-layout float-' + (card.wrap.cardFloat || 'left')}>
{card.subcards.map(subcard => (<CardComponent key={subcard.uuid} cards={card} card={subcard} move={this.move} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
</div>
+ {/* <div className="component-name"><div className="center">{card.name}</div></div> */}
</div>
)
}
diff --git a/src/menu/components/chart/antv-bar/index.jsx b/src/menu/components/chart/antv-bar/index.jsx
index 704fe48..4948e1f 100644
--- a/src/menu/components/chart/antv-bar/index.jsx
+++ b/src/menu/components/chart/antv-bar/index.jsx
@@ -151,7 +151,7 @@
handleTabsChange = (parentId) => {
const { card } = this.state
- if (parentId === card.parentId) {
+ if (parentId === card.parentId || parentId === 'all') {
let _element = document.getElementById(card.uuid + 'canvas')
if (_element) {
_element.innerHTML = ''
diff --git a/src/menu/components/chart/antv-dashboard/index.jsx b/src/menu/components/chart/antv-dashboard/index.jsx
index 03305f3..1ec5ba6 100644
--- a/src/menu/components/chart/antv-dashboard/index.jsx
+++ b/src/menu/components/chart/antv-dashboard/index.jsx
@@ -186,8 +186,8 @@
handleTabsChange = (parentId) => {
const { card } = this.state
- if (parentId === card.parentId) {
- let _element = document.getElementById(card.uuid + 'canvas')
+ if (parentId === card.parentId || parentId === 'all') {
+ let _element = document.getElementById(card.uuid + 'dashboard')
if (_element) {
_element.innerHTML = ''
}
diff --git a/src/menu/components/chart/antv-pie/index.jsx b/src/menu/components/chart/antv-pie/index.jsx
index 6029781..b37c320 100644
--- a/src/menu/components/chart/antv-pie/index.jsx
+++ b/src/menu/components/chart/antv-pie/index.jsx
@@ -141,7 +141,7 @@
handleTabsChange = (parentId) => {
const { card } = this.state
- if (parentId === card.parentId) {
+ if (parentId === card.parentId || parentId === 'all') {
let _element = document.getElementById(card.uuid + 'canvas')
if (_element) {
_element.innerHTML = ''
diff --git a/src/menu/components/chart/antv-scatter/index.jsx b/src/menu/components/chart/antv-scatter/index.jsx
index e8b381e..8049740 100644
--- a/src/menu/components/chart/antv-scatter/index.jsx
+++ b/src/menu/components/chart/antv-scatter/index.jsx
@@ -139,7 +139,7 @@
handleTabsChange = (parentId) => {
const { card } = this.state
- if (parentId === card.parentId) {
+ if (parentId === card.parentId || parentId === 'all') {
let _element = document.getElementById(card.uuid + 'canvas')
if (_element) {
_element.innerHTML = ''
diff --git a/src/menu/components/chart/chart-custom/index.jsx b/src/menu/components/chart/chart-custom/index.jsx
index 924baa8..070caa0 100644
--- a/src/menu/components/chart/chart-custom/index.jsx
+++ b/src/menu/components/chart/chart-custom/index.jsx
@@ -127,7 +127,7 @@
handleTabsChange = (parentId) => {
const { card } = this.state
- if (parentId === card.parentId) {
+ if (parentId === card.parentId || parentId === 'all') {
let _element = document.getElementById(card.uuid + 'canvas')
if (_element) {
_element.innerHTML = ''
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 1150a86..e261287 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -1093,6 +1093,14 @@
})
}
+ changeSetting = () => {
+ this.setState({settingshow: !this.state.settingshow})
+
+ setTimeout(() => {
+ MKEmitter.emit('tabsChange', 'all')
+ }, 400)
+ }
+
render () {
const { activeKey, comloading, MenuType, popBtn, visible, dict, MenuId, config, settingshow, ParentId, MenuName, MenuNo, menuloading, customComponents } = this.state
@@ -1104,8 +1112,7 @@
<div className="menu-body">
<div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}>
<div className="draw">
- {settingshow ? <DoubleLeftOutlined onClick={() => this.setState({settingshow: false})}/> : null}
- {!settingshow ? <DoubleRightOutlined onClick={() => this.setState({settingshow: true})}/> : null}
+ {settingshow ? <DoubleLeftOutlined onClick={this.changeSetting}/> : <DoubleRightOutlined onClick={this.changeSetting}/>}
</div>
<Collapse accordion activeKey={activeKey} bordered={false} onChange={(key) => this.setState({activeKey: key})}>
{/* 鍩烘湰淇℃伅 */}
diff --git a/src/views/menudesign/index.scss b/src/views/menudesign/index.scss
index b676532..99361bd 100644
--- a/src/views/menudesign/index.scss
+++ b/src/views/menudesign/index.scss
@@ -10,6 +10,21 @@
text-decoration: line-through!important;
}
}
+ // .component-name {
+ // position: absolute;
+ // z-index: 10;
+ // left: 0;
+ // right: 0;
+ // top: 0;
+ // bottom: 0;
+ // background: rgba(255, 255, 255, 0.8);
+ // .center {
+ // position: absolute;
+ // left: 50%;
+ // top: 50%;
+ // transform: translate(-50%, -50%);
+ // }
+ // }
>.menu-body {
width: 100vw;
height: 100vh;
--
Gitblit v1.8.0