From dc258e4600bea2fba1e25054d163a2f4b1326a85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 八月 2023 10:23:38 +0800
Subject: [PATCH] 2023-08-08
---
src/tabviews/custom/components/card/data-card/index.jsx | 283 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 201 insertions(+), 82 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 5b58e10..f629d61 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -32,12 +32,12 @@
pageSize: 10,
orderBy: '',
pageOptions: [],
- activeKey: '', // 閫変腑鍗�
- selectKeys: [], // 澶氶�夋椂閫変腑鍗＄墖
- selectedData: [], // 閫変腑鏁版嵁锛岀敤浜庡伐鍏锋爮鎸夐挳
- loading: false, // 鏁版嵁鍔犺浇鐘舵��
- card: null, // 鍗＄墖璁剧疆
- data: null, // 鏁版嵁
+ activeKey: '',
+ selectKeys: [],
+ selectedData: [],
+ loading: false,
+ card: null,
+ data: null,
total: null,
precards: [],
nextcards: [],
@@ -150,33 +150,37 @@
}
let _data = null
- if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
- _data = window.GLOB.SyncData.get(_config.dataName) || []
+ if (_config.setting.sync === 'true') {
+ _config.setting.onload = 'false'
- if (_config.$cache) {
- Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS())
- }
-
- _config.setting.sync = 'false'
-
- _data = _data.map((item, index) => {
- item.key = index
- item.$$uuid = item[_config.setting.primaryKey] || ''
- item.$$BID = BID || ''
- item.$$BData = BData || ''
- item.$Index = index + 1 + ''
-
- if (_config.wrap.controlField) {
- if (_config.wrap.controlVal.includes(item[_config.wrap.controlField] + '')) {
- item.$disabled = true
- }
+ if (window.GLOB.SyncData.has(_config.dataName)) {
+ _data = window.GLOB.SyncData.get(_config.dataName) || []
+
+ if (_config.$cache) {
+ Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS())
}
- return item
- })
-
- this.loaded = true
-
- window.GLOB.SyncData.delete(_config.dataName)
+
+ _config.setting.sync = 'false'
+
+ _data = _data.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[_config.setting.primaryKey] || ''
+ item.$$BID = BID || ''
+ item.$$BData = BData || ''
+ item.$Index = index + 1 + ''
+
+ if (_config.wrap.controlField) {
+ if (_config.wrap.controlVal.includes(item[_config.wrap.controlField] + '')) {
+ item.$disabled = true
+ }
+ }
+ return item
+ })
+
+ this.loaded = true
+
+ window.GLOB.SyncData.delete(_config.dataName)
+ }
}
this.setState({
@@ -192,15 +196,7 @@
config: _config,
card: _card,
search: _config.$searches,
- arr_field: _config.columns.map(col => col.field).join(','),
- }, () => {
- if (config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- }
-
- this.loaded && this.prevCheck()
+ arr_field: _config.columns.map(col => col.field).join(',')
})
}
@@ -233,26 +229,7 @@
})
}
- if (config.$cache && !this.loaded) {
- Api.getLCacheConfig(config.uuid).then(res => {
- if (!res || this.loaded) return
- let _data = res.map((item, index) => {
- item.key = index
- item.$$uuid = item[config.setting.primaryKey] || ''
- item.$Index = index + 1 + ''
-
- if (config.wrap.controlField) {
- if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
- item.$disabled = true
- }
- }
-
- return item
- })
-
- this.setState({data: _data})
- })
- }
+ this.initExec()
}
shouldComponentUpdate (nextProps, nextState) {
@@ -273,6 +250,76 @@
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
this.timer && this.timer.stop()
+ }
+
+ initExec = () => {
+ const { config } = this.state
+
+ this.loaded && this.prevCheck()
+
+ if (config.$cache) {
+ if (config.$time && !config.setting.laypage) {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, config.$time).then(res => {
+ if (!res.valid && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+
+ if (!res.data || this.loaded) return
+
+ let _data = res.data.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[config.setting.primaryKey] || ''
+ item.$Index = index + 1 + ''
+
+ if (config.wrap.controlField) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
+ item.$disabled = true
+ }
+ }
+
+ return item
+ })
+
+ this.setState({data: _data})
+ })
+ }
+ } else {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, 0).then(res => {
+ if (!res.data || this.loaded) return
+
+ let _data = res.data.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[config.setting.primaryKey] || ''
+ item.$Index = index + 1 + ''
+
+ if (config.wrap.controlField) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
+ item.$disabled = true
+ }
+ }
+
+ return item
+ })
+
+ this.setState({data: _data})
+ })
+ }
+
+ if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+ }
+ } else if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
}
transferSyncData = (syncId) => {
@@ -412,7 +459,7 @@
setTimeout(() => {
this.checkTopLine(id)
- }, 200)
+ }, 10)
if (selected === 'init') {
this.setState({selected: 'false'})
@@ -765,12 +812,17 @@
})
}
+ let total = result.total || 0
+ if (config.setting.custompage && data.length) {
+ total = data[data.length - 1].mk_total || 0
+ }
+
this.setState({
activeKey: '',
selectKeys: [],
selectedData: [],
data: data,
- total: result.total,
+ total: total,
loading: false
})
@@ -841,33 +893,99 @@
let result = await Api.genericInterface(param)
if (result.status) {
let data = fromJS(this.state.data).toJS()
+ let selectedData = fromJS(this.state.selectedData).toJS()
+ let selectKeys = fromJS(this.state.selectKeys).toJS()
+ let activeKey = this.state.activeKey
+
if (result.data && result.data[0]) {
let _data = result.data[0]
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
- try {
- data = data.map(item => {
- if (item[config.setting.primaryKey] === _data[config.setting.primaryKey]) {
- _data.key = item.key
- _data.$$uuid = _data[config.setting.primaryKey] || ''
- _data.$$BID = BID || ''
- _data.$$BData = BData || ''
- _data.$Index = item.$Index
- return _data
- } else {
- return item
- }
+ data = data.map(item => {
+ if (item.$$uuid === _data.$$uuid) {
+ _data.key = item.key
+ _data.$Index = item.$Index
+ return _data
+ }
+ return item
+ })
+
+ if (!_data.$Index) {
+ this.setState({
+ loading: false
})
- } catch (e) {
- console.warn('鏁版嵁鏌ヨ閿欒')
+ return
}
- MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
- }
+ selectedData = selectedData.map(item => {
+ if (item.$$uuid === _data.$$uuid) {
+ return _data
+ }
+ return item
+ })
- this.setState({
- data: data,
- loading: false
- })
+ this.setState({
+ data: data,
+ selectedData: selectedData,
+ loading: false
+ })
+
+ if (_data.key === activeKey) {
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
+ }
+ if (config.setting.$hasSyncModule) {
+ MKEmitter.emit('syncBalconyData', config.uuid, selectedData, data.length === selectedData.length)
+ }
+ } else {
+ let index = data.findIndex(item => item.$$uuid === id)
+
+ if (index === -1) {
+ this.setState({
+ loading: false
+ })
+ return
+ }
+
+ data = data.filter(item => item.$$uuid !== id)
+ data = data.map((item, i) => {
+ item.key = i
+ return item
+ })
+
+ let trans = activeKey === index
+ let _item = null
+
+ if (config.wrap.cardType) {
+ selectKeys = selectKeys.filter(key => key !== index)
+ selectKeys = selectKeys.map(key => key > index ? key - 1 : key)
+
+ selectedData = selectKeys.map(key => data[key]).filter(Boolean)
+
+ activeKey = selectKeys.length ? selectKeys[selectKeys.length - 1] : ''
+
+ if (trans && selectedData.length) {
+ _item = selectedData[selectedData.length - 1]
+ }
+ }
+
+ this.setState({
+ data: data,
+ activeKey: activeKey,
+ selectKeys: selectKeys,
+ selectedData: selectedData,
+ loading: false
+ })
+
+ if (trans) {
+ MKEmitter.emit('resetSelectLine', config.uuid, (_item ? _item.$$uuid : ''), _item)
+ }
+
+ if (config.setting.$hasSyncModule) {
+ MKEmitter.emit('syncBalconyData', config.uuid, selectedData, data.length === selectedData.length)
+ }
+ }
} else {
this.setState({
loading: false
@@ -975,6 +1093,7 @@
if (activeKey === index) return
_selectedData = [item]
+ _selectKeys = [index]
_activeKey = index
}
--
Gitblit v1.8.0