From 89a58758f2045daf62383dc993178d857f3bbc39 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 七月 2023 15:07:50 +0800
Subject: [PATCH] 2023-07-10
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 2 ++
src/tabviews/custom/components/share/tabtransfer/index.jsx | 2 ++
src/menu/stylecontroller/index.jsx | 1 +
src/tabviews/custom/components/group/normal-group/index.jsx | 2 ++
src/pc/menushell/card.jsx | 2 ++
src/menu/components/card/cardcellcomponent/dragaction/action.jsx | 2 ++
src/mob/components/tabs/tabcomponents/card.jsx | 2 ++
src/menu/components/group/groupcomponents/card.jsx | 2 ++
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 2 ++
src/tabviews/custom/popview/index.jsx | 2 ++
src/tabviews/custom/components/chart/antv-X6/index.jsx | 14 +++++++++-----
src/tabviews/custom/index.jsx | 2 ++
src/views/billprint/index.jsx | 2 ++
src/menu/menushell/card.jsx | 2 ++
src/menu/components/tabs/tabcomponents/card.jsx | 2 ++
src/mob/mobshell/card.jsx | 2 ++
src/tabviews/custom/components/card/tableHeader/index.jsx | 2 ++
17 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
index 9f0deab..14b00e5 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
@@ -75,6 +75,8 @@
if (card.style && card.style.clear === 'left') {
_style_ = {clear: 'left'}
+ } else if (card.style && card.style.clear === 'right') {
+ _style_ = {float: 'right'}
}
let className = card.width || ''
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index 7435fd8..34fbe37 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -215,6 +215,8 @@
if (card.style && card.style.clear === 'left') {
_style_ = {clear: 'left'}
+ } else if (card.style && card.style.clear === 'right') {
+ _style_ = {float: 'right'}
}
let tableHCell = false
diff --git a/src/menu/components/group/groupcomponents/card.jsx b/src/menu/components/group/groupcomponents/card.jsx
index ca3302b..dd706fd 100644
--- a/src/menu/components/group/groupcomponents/card.jsx
+++ b/src/menu/components/group/groupcomponents/card.jsx
@@ -64,6 +64,8 @@
if (card.style && card.style.clear === 'left') {
style.clear = 'left'
+ } else if (card.style && card.style.clear === 'right') {
+ style.float = 'right'
}
const getCardComponent = () => {
diff --git a/src/menu/components/tabs/tabcomponents/card.jsx b/src/menu/components/tabs/tabcomponents/card.jsx
index 248e0a7..6552008 100644
--- a/src/menu/components/tabs/tabcomponents/card.jsx
+++ b/src/menu/components/tabs/tabcomponents/card.jsx
@@ -67,6 +67,8 @@
if (card.style && card.style.clear === 'left') {
style.clear = 'left'
+ } else if (card.style && card.style.clear === 'right') {
+ style.float = 'right'
}
const getCardComponent = () => {
diff --git a/src/menu/menushell/card.jsx b/src/menu/menushell/card.jsx
index 8333084..b56942a 100644
--- a/src/menu/menushell/card.jsx
+++ b/src/menu/menushell/card.jsx
@@ -70,6 +70,8 @@
if (card.style && card.style.clear === 'left') {
style.clear = 'left'
+ } else if (card.style && card.style.clear === 'right') {
+ style.float = 'right'
}
const getCardComponent = () => {
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index bf7ce71..163a7c6 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -953,6 +953,7 @@
<Radio.Group style={{whiteSpace: 'nowrap'}} defaultValue={card.clear || 'none'} onChange={(e) => this.changeNormalStyle(e.target.value, 'clear')}>
<Radio value="none">宸︽诞鍔�</Radio>
<Radio value="left">涓嶆诞鍔�</Radio>
+ <Radio value="right">鍙虫诞鍔�</Radio>
</Radio.Group>
</Form.Item>
</Col>
diff --git a/src/mob/components/tabs/tabcomponents/card.jsx b/src/mob/components/tabs/tabcomponents/card.jsx
index 24dc025..f150bd4 100644
--- a/src/mob/components/tabs/tabcomponents/card.jsx
+++ b/src/mob/components/tabs/tabcomponents/card.jsx
@@ -63,6 +63,8 @@
if (card.style && card.style.clear === 'left') {
style.clear = 'left'
+ } else if (card.style && card.style.clear === 'right') {
+ style.float = 'right'
}
const getCardComponent = () => {
diff --git a/src/mob/mobshell/card.jsx b/src/mob/mobshell/card.jsx
index fdca2fd..ca91322 100644
--- a/src/mob/mobshell/card.jsx
+++ b/src/mob/mobshell/card.jsx
@@ -70,6 +70,8 @@
if (card.style && card.style.clear === 'left') {
style.clear = 'left'
+ } else if (card.style && card.style.clear === 'right') {
+ style.float = 'right'
}
let col = 'ant-col-' + (card.width || 24)
diff --git a/src/pc/menushell/card.jsx b/src/pc/menushell/card.jsx
index 7cdc671..037187a 100644
--- a/src/pc/menushell/card.jsx
+++ b/src/pc/menushell/card.jsx
@@ -69,6 +69,8 @@
if (card.style && card.style.clear === 'left') {
style.clear = 'left'
+ } else if (card.style && card.style.clear === 'right') {
+ style.float = 'right'
}
let col = ' ant-col ant-col-' + (card.width || 24)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 85b86b8..1a1c2c6 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -266,6 +266,8 @@
if (card.style && card.style.clear === 'left') {
_style_ = {clear: 'left'}
+ } else if (card.style && card.style.clear === 'right') {
+ _style_ = {float: 'right'}
}
if (card.eleType === 'sequence') {
diff --git a/src/tabviews/custom/components/card/tableHeader/index.jsx b/src/tabviews/custom/components/card/tableHeader/index.jsx
index c3e229f..ee5030f 100644
--- a/src/tabviews/custom/components/card/tableHeader/index.jsx
+++ b/src/tabviews/custom/components/card/tableHeader/index.jsx
@@ -70,6 +70,8 @@
if (item.style && item.style.clear === 'left') {
_style_ = {clear: 'left'}
+ } else if (item.style && item.style.clear === 'right') {
+ _style_ = {float: 'right'}
}
let val = ''
diff --git a/src/tabviews/custom/components/chart/antv-X6/index.jsx b/src/tabviews/custom/components/chart/antv-X6/index.jsx
index 2f4c57b..71aed16 100644
--- a/src/tabviews/custom/components/chart/antv-X6/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/index.jsx
@@ -491,6 +491,7 @@
this.cells = []
this.handleData()
}
+ this.setState({empty: true})
return
}
@@ -505,9 +506,6 @@
let result = await Api.genericInterface(param)
if (result.status) {
- this.setState({
- loading: false
- })
let item = result.data && result.data[0] ? result.data[0] : null
let cells = []
@@ -518,6 +516,10 @@
this.cells = cells
this.handleData()
+
+ this.setState({
+ loading: false
+ })
if (result.message) {
if (result.ErrCode === 'Y') {
@@ -1740,11 +1742,13 @@
if (config.plot.function === 'show') {
if (config.plot.empty === 'hidden' && this.cells.length === 0) {
- style.display = 'none'
+ style.position = 'absolute'
+ style.width = '100%'
+ style.zIndex = -1
}
return (
- <div className="custom-x6-plot-box" id={'anchor' + config.uuid} style={config.style}>
+ <div className="custom-x6-plot-box" id={'anchor' + config.uuid} style={style}>
{loading ?
<div className="loading-mask">
<div className="ant-spin-blur"></div>
diff --git a/src/tabviews/custom/components/group/normal-group/index.jsx b/src/tabviews/custom/components/group/normal-group/index.jsx
index 0b147bf..52a33a1 100644
--- a/src/tabviews/custom/components/group/normal-group/index.jsx
+++ b/src/tabviews/custom/components/group/normal-group/index.jsx
@@ -158,6 +158,8 @@
if (item.style && item.style.clear === 'left') {
style = {clear: 'left'}
+ } else if (item.style && item.style.clear === 'right') {
+ style = {float: 'right'}
}
if (item.type === 'card' && item.subtype === 'datacard') {
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index ec4a65c..2e26fb1 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -184,6 +184,8 @@
if (item.style && item.style.clear === 'left') {
style = {clear: 'left'}
+ } else if (item.style && item.style.clear === 'right') {
+ style = {float: 'right'}
}
if (item.type === 'card' && item.subtype === 'datacard') {
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index be64acf..08d35b5 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -1289,6 +1289,8 @@
if (item.style && item.style.clear === 'left') {
style = {clear: 'left'}
+ } else if (item.style && item.style.clear === 'right') {
+ style = {float: 'right'}
}
if (item.type === 'card' && item.subtype === 'datacard') {
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 8bad71b..4c74eee 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -917,6 +917,8 @@
if (item.style && item.style.clear === 'left') {
style = {clear: 'left'}
+ } else if (item.style && item.style.clear === 'right') {
+ style = {float: 'right'}
}
if (item.type === 'card' && item.subtype === 'datacard') {
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index a7be0ab..3e8f53f 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -876,6 +876,8 @@
if (item.style && item.style.clear === 'left') {
style = {clear: 'left'}
+ } else if (item.style && item.style.clear === 'right') {
+ style = {float: 'right'}
}
if (item.type === 'bar' || item.type === 'line') {
--
Gitblit v1.8.0