From 46849dea63f8a3e5e4a758c9c065479e116b8095 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 31 七月 2023 13:22:47 +0800
Subject: [PATCH] 2023-07-31
---
src/tabviews/custom/components/form/tab-form/index.jsx | 34 ++++++-----
src/tabviews/custom/components/chart/antv-scatter/index.jsx | 6 -
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 6 -
src/tabviews/custom/components/chart/antv-dashboard/index.jsx | 6 -
src/tabviews/custom/components/form/step-form/index.jsx | 24 +++++--
src/tabviews/custom/components/form/simple-form/index.jsx | 24 +++++--
src/tabviews/custom/components/iframe/index.jsx | 22 +++++--
src/tabviews/custom/components/chart/antv-pie/index.jsx | 6 -
8 files changed, 74 insertions(+), 54 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index 48e1382..429eeca 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -457,10 +457,8 @@
Api.writeCacheConfig(config.uuid, fromJS(_data).toJS())
}
- if (!is(fromJS(this.data), fromJS(_data))) {
- this.data = _data
- this.handleData()
- }
+ this.data = _data
+ this.handleData()
this.loaded = true
diff --git a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
index 3bcdc9c..ead534b 100644
--- a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
@@ -250,10 +250,8 @@
_data.value = _data[config.plot.valueField] || 0
}
- if (!is(fromJS(this.data), fromJS(_data))) {
- this.data = _data
- this.handleData()
- }
+ this.data = _data
+ this.handleData()
this.loaded = true
diff --git a/src/tabviews/custom/components/chart/antv-pie/index.jsx b/src/tabviews/custom/components/chart/antv-pie/index.jsx
index a8756ad..430d840 100644
--- a/src/tabviews/custom/components/chart/antv-pie/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-pie/index.jsx
@@ -199,10 +199,8 @@
Api.writeCacheConfig(config.uuid, fromJS(_data).toJS())
}
- if (!is(fromJS(this.data), fromJS(_data))) {
- this.data = _data
- this.handleData()
- }
+ this.data = _data
+ this.handleData()
this.loaded = true
diff --git a/src/tabviews/custom/components/chart/antv-scatter/index.jsx b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
index 5eeef74..200143e 100644
--- a/src/tabviews/custom/components/chart/antv-scatter/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
@@ -199,10 +199,8 @@
Api.writeCacheConfig(config.uuid, fromJS(_data).toJS())
}
- if (!is(fromJS(this.data), fromJS(_data))) {
- this.data = _data
- this.handleData()
- }
+ this.data = _data
+ this.handleData()
this.setState({empty: _data.length === 0})
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index a92f2cf..bd481d5 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -46,7 +46,9 @@
BID = BData.$BID || ''
}
- if (_config.wrap.datatype !== 'static') {
+ if (_config.wrap.datatype === 'dynamic') {
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+
if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
_data = window.GLOB.SyncData.get(_config.dataName) || []
_data = _data[0] || {$$empty: true}
@@ -73,13 +75,7 @@
BID: BID || '',
BData: BData || '',
config: _config,
- arr_field: _config.columns.map(col => col.field).join(','),
- }, () => {
- if (config.wrap.datatype !== 'static' && config.setting.sync !== 'true' && config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, config.setting.delay || 0)
- }
+ arr_field: _config.columns.map(col => col.field).join(',')
})
}
@@ -98,6 +94,8 @@
if (config.setting.sync === 'true') {
MKEmitter.addListener('transferSyncData', this.transferSyncData)
}
+
+ this.initExec()
}
shouldComponentUpdate (nextProps, nextState) {
@@ -116,6 +114,16 @@
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
+ initExec = () => {
+ const { config } = this.state
+
+ if (config.wrap.datatype === 'dynamic' && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+ }
+
transferSyncData = (syncId) => {
const { config } = this.state
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 7f3bb27..6ce4ec2 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -45,7 +45,9 @@
BID = BData.$BID || ''
}
- if (_config.wrap.datatype !== 'static') {
+ if (_config.wrap.datatype === 'dynamic') {
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+
if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
_data = window.GLOB.SyncData.get(_config.dataName) || []
_data = _data[0] || {$$empty: true}
@@ -113,13 +115,7 @@
BID: BID || '',
BData: BData || '',
config: _config,
- arr_field: _config.columns.map(col => col.field).join(','),
- }, () => {
- if (_config.wrap.datatype !== 'static' && config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- }
+ arr_field: _config.columns.map(col => col.field).join(',')
})
}
@@ -138,6 +134,8 @@
if (config.setting.sync === 'true') {
MKEmitter.addListener('transferSyncData', this.transferSyncData)
}
+
+ this.initExec()
}
shouldComponentUpdate (nextProps, nextState) {
@@ -156,6 +154,16 @@
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
+ initExec = () => {
+ const { config } = this.state
+
+ if (config.wrap.datatype === 'dynamic' && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+ }
+
transferSyncData = (syncId) => {
const { config, group } = this.state
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index 92a5018..90e0224 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -24,7 +24,7 @@
loading: false, // 鏁版嵁鍔犺浇鐘舵��
data: null,
BData: '',
- group: null,
+ group: null
}
UNSAFE_componentWillMount () {
@@ -44,7 +44,9 @@
BID = BData.$BID || ''
}
- if (_config.wrap.datatype !== 'static') {
+ if (_config.wrap.datatype === 'dynamic') {
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+
if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
_data = window.GLOB.SyncData.get(_config.dataName) || []
_data = _data[0] || {$$empty: true}
@@ -87,13 +89,7 @@
BID: BID || '',
BData: BData || '',
config: _config,
- arr_field: _config.columns.map(col => col.field).join(','),
- }, () => {
- if (_config.wrap.datatype !== 'static' && config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- }
+ arr_field: _config.columns.map(col => col.field).join(',')
})
}
@@ -112,6 +108,8 @@
if (config.setting.sync === 'true') {
MKEmitter.addListener('transferSyncData', this.transferSyncData)
}
+
+ this.initExec()
}
shouldComponentUpdate (nextProps, nextState) {
@@ -130,8 +128,18 @@
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
+ initExec = () => {
+ const { config } = this.state
+
+ if (config.wrap.datatype === 'dynamic' && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+ }
+
transferSyncData = (syncId) => {
- const { config, group } = this.state
+ const { config } = this.state
if (config.$syncId !== syncId) return
@@ -139,11 +147,7 @@
_data = _data[0] || {$$empty: true}
_data.$$uuid = _data[config.setting.primaryKey] || ''
- let _group = group
-
- this.setState({data: _data, group: null}, () => {
- this.setState({group: _group})
- })
+ this.setState({data: _data})
window.GLOB.SyncData.delete(config.dataName)
diff --git a/src/tabviews/custom/components/iframe/index.jsx b/src/tabviews/custom/components/iframe/index.jsx
index 02c9a4d..ff983aa 100644
--- a/src/tabviews/custom/components/iframe/index.jsx
+++ b/src/tabviews/custom/components/iframe/index.jsx
@@ -43,6 +43,8 @@
}
if (_config.wrap.datatype === 'dynamic') {
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+
if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
_data = window.GLOB.SyncData.get(_config.dataName) || []
_data = _data[0] || {$$empty: true}
@@ -68,13 +70,7 @@
data: _data,
BID: BID || '',
config: _config,
- arr_field: _config.columns.map(col => col.field).join(','),
- }, () => {
- if (_config.wrap.datatype === 'dynamic' && config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- }
+ arr_field: _config.columns.map(col => col.field).join(',')
})
}
@@ -98,6 +94,8 @@
node && node.select && node.select()
}, 200)
}
+
+ this.initExec()
}
shouldComponentUpdate (nextProps, nextState) {
@@ -118,6 +116,16 @@
MKEmitter.removeListener('transferSyncData', this.transferSyncData)
}
+ initExec = () => {
+ const { config } = this.state
+
+ if (config.wrap.datatype === 'dynamic' && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+ }
+
transferSyncData = (syncId) => {
const { config } = this.state
--
Gitblit v1.8.0