From d0764c7facff9abf00af6f3ff06a26260d1d8770 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 五月 2025 16:34:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 284 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 163 insertions(+), 121 deletions(-)
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index a3c0682..4fac5cc 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Spin, Empty, Row, Col, Pagination, Switch } from 'antd'
+import { Spin, Empty, Row, Col, Pagination, Switch, notification } from 'antd'
import { DownOutlined, UpOutlined, PlusSquareOutlined, MinusSquareOutlined } from '@ant-design/icons'
import Api from '@/api'
@@ -116,6 +116,12 @@
})
_config.subcards = null
+
+ if (!_config.wrap.cardType) {
+ _config.wrap.selStyle = 'none'
+ _config.wrap.selected = 'false'
+ _config.wrap.pickup = 'false'
+ }
let selected = 'false'
if (_config.wrap.selected === 'always' || _config.wrap.selected === 'init' || _config.wrap.selected === 'sign') {
@@ -124,26 +130,29 @@
_config.wrap.selected = 'false'
}
- _config.wrap.selStyle = _config.wrap.selStyle || 'active'
+ _config.wrap.selStyle = _config.wrap.selStyle || 'check'
_config.wrap.pagestyle = _config.wrap.pagestyle || 'page'
- _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''}`
+ _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${config.wrap.empSign === 'hidden' ? 'mk-empty-hide' : ''}`
if (_config.wrap.zHeight || _config.wrap.minWidth) {
+ _config.wrap.zoomStyle = {
+ maxHeight: 'none',
+ '--mk-data-zoom-width': _config.wrap.minWidth ? _config.wrap.minWidth + 'px' : '100%'
+ }
+
if (_config.wrap.zHeight) {
if (_config.wrap.zHeight <= 100) {
if (_config.wrap.zHeight < 0) {
- _config.wrap.zHeight = `calc(100vh - ${-_config.wrap.zHeight}px)`
+ _config.wrap.zoomStyle.maxHeight = `calc(100vh - ${-_config.wrap.zHeight}px)`
+ _config.wrap.zoomStyle.minHeight = '100px'
} else {
- _config.wrap.zHeight = _config.wrap.zHeight + 'vh'
+ _config.wrap.zoomStyle.maxHeight = _config.wrap.zHeight + 'vh'
}
+ } else {
+ _config.wrap.zoomStyle.maxHeight = _config.wrap.zHeight + 'px'
}
_config.wrap.wrapClass += ' fix-height'
- }
- _config.wrap.minWidth = _config.wrap.minWidth ? _config.wrap.minWidth + 'px' : '100%'
- _config.wrap.zoomStyle = {
- maxHeight: _config.wrap.zHeight || 'none',
- '--mk-data-zoom-width': _config.wrap.minWidth
}
} else {
_config.wrap.zoomStyle = null
@@ -175,8 +184,10 @@
})
}
- _config.setting.sub_field = subconfig.columns.map(col => col.field).join(',')
- _config.setting.all_field = _config.setting.arr_field + ',' + _config.setting.sub_field
+ if (_config.setting.subdata !== 'sub_data_string') {
+ _config.setting.sub_field = subconfig.columns.map(col => col.field).join(',')
+ _config.setting.all_field = _config.setting.arr_field + ',' + _config.setting.sub_field
+ }
let pageOptions = ['10', '25', '50', '100', '500', '1000']
@@ -193,6 +204,10 @@
if (_config.wrap.maxPageSize) {
pageOptions = pageOptions.filter(item => item <= _config.wrap.maxPageSize)
}
+ }
+
+ if (_config.setting.supModule && !BID && _config.wrap.supKey !== 'false') {
+ _config.setting.onload = 'false'
}
this.setState({
@@ -267,13 +282,18 @@
if (config.$cache) {
let getData = (res) => {
return res.map((item, index) => {
+ let _children = item[config.setting.subdata]
+
+ delete item[config.setting.subdata]
+ if (config.setting.subdata === 'sub_data_string') {
+ _children = this.parseSubData(_children)
+ } else if (item.sub_data_string) {
+ _children = this.parseSubData(item.sub_data_string)
+ }
+
let children = []
- if (item[config.setting.subdata]) {
- let _children = item[config.setting.subdata]
-
- delete item[config.setting.subdata]
-
+ if (_children) {
_children.forEach((cell, i) => {
cell.key = i
cell.$$uuid = cell[config.setting.subKey] || ''
@@ -334,6 +354,21 @@
}
}
+ parseSubData = (data) => {
+ try {
+ data = JSON.parse(data)
+ if (typeof(data) !== 'object') {
+ data = []
+ } else if (!Array.isArray(data)) {
+ data = [data]
+ }
+ } catch(e) {
+ console.warn('Data parsing error.')
+ data = []
+ }
+ return data
+ }
+
autoExec = (times) => {
const { config } = this.state
@@ -358,9 +393,7 @@
if (config.$searchId !== searchId) return
- this.setState({pageIndex: 1}, () => {
- this.loadData()
- })
+ this.reloadIndex()
}
/**
@@ -373,28 +406,23 @@
let supModule = config.setting.supModule
+ let _id = config.wrap.selected === 'always' ? id : ''
if (position === 'line' || position === 'line_grid') {
- if (lines && lines.length === 1 && !config.forbidLine) {
- this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid, position)
- } else if (btn.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData(id)
- })
+ if (lines && lines.length === 1) {
+ if (config.forbidLine) {
+ this.loadData(lines[0].$$parentId || lines[0].$$uuid, 'repage')
+ } else {
+ this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid, position)
+ }
} else {
- this.loadData(id)
+ this.loadData(_id, 'repage')
}
} else if (['mainline', 'maingrid', 'popclose'].includes(position) && supModule) {
MKEmitter.emit('reloadData', supModule, position === 'maingrid' ? '' : BID)
} else if (btn.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData(id)
- })
+ this.reloadIndex()
} else {
- this.loadData(id)
+ this.loadData(_id, 'repage')
}
}
@@ -420,64 +448,40 @@
})
}
- checkTopLine = (id) => {
- const { config, data, selected, card } = this.state
+ checkTopLine = (id, selected) => {
+ const { config, data, card } = this.state
let _opens = [...this.state.opens]
- if (data.length === 0) {
- this.setState({
- activeKey: '',
- selectKeys: [],
- selectedData: []
- })
-
- MKEmitter.emit('resetSelectLine', config.uuid, '', '')
- return
- }
+ let index = -1
+ let keys = []
+ let items = []
- if (selected === 'sign') {
- let index = ''
- let keys = []
- let items = []
- let last = ''
-
- if (card.setting.display === 'collapse') {
- _opens = []
+ if (data.length > 0) {
+ if (id) {
+ index = data.findIndex(item => item.$$uuid === id && !item.$disabled)
}
- data.forEach((item, i) => {
- if (!item.$disabled && item.selected === 'true') {
- items.push(item)
- keys.push(i)
- index = i
- last = item
-
- if (card.setting.display === 'collapse') {
- _opens.push(i)
+ if (index !== -1) {
+ keys = [index]
+ items = [data[index]]
+ } else if (selected === 'sign') {
+ data.forEach((item, i) => {
+ if (!item.$disabled && item.selected === 'true') {
+ items.push(item)
+ keys.push(i)
+ index = i
}
+ })
+ } else if (selected !== 'false') {
+ if (!data[0].$disabled) {
+ index = 0
+ keys = [index]
+ items = [data[index]]
}
- })
-
- this.setState({
- opens: _opens,
- activeKey: index,
- selectKeys: keys,
- selectedData: items
- })
-
- MKEmitter.emit('resetSelectLine', config.uuid, last ? last.$$uuid : '', last)
- return
- }
-
- let index = 0
- if (id) {
- index = data.findIndex(item => item.$$uuid === id)
- if (index === -1) {
- index = 0
}
}
- if (data[index].$disabled) {
+ if (index === -1) {
this.setState({
activeKey: '',
selectKeys: [],
@@ -489,17 +493,19 @@
}
if (card.setting.display === 'collapse') {
- _opens = [index]
+ _opens = keys
}
+
+ let item = items[items.length - 1]
this.setState({
opens: _opens,
activeKey: index,
- selectKeys: [index],
- selectedData: [data[index]]
+ selectKeys: keys,
+ selectedData: items
})
- MKEmitter.emit('resetSelectLine', config.uuid, data[index].$$uuid, data[index])
+ MKEmitter.emit('resetSelectLine', config.uuid, item.$$uuid, item)
}
checkAll = () => {
@@ -547,7 +553,9 @@
if (config.uuid !== menuId) return
if (!id) {
- this.loadData()
+ this.reloadIndex()
+ } else if (config.forbidLine) {
+ this.loadData(id, 'repage')
} else {
this.loadLinedata(id)
}
@@ -643,6 +651,11 @@
if (result.status) {
if (result.$requestId && this.requestId !== result.$requestId) return
+ if (type === 'repage' && result.data.length === 0 && pageIndex > 1) {
+ this.reloadIndex()
+ return
+ }
+
let start = 1
if (config.setting.laypage) {
start = pageSize * (pageIndex - 1) + 1
@@ -653,13 +666,10 @@
Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
- if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
+ if (selected !== 'false' || id) {
setTimeout(() => {
- this.checkTopLine(id)
+ this.checkTopLine(id, selected)
}, 10)
- if (selected === 'init') {
- this.setState({selected: 'false'})
- }
} else {
MKEmitter.emit('resetSelectLine', config.uuid, '', '')
}
@@ -670,12 +680,17 @@
if (type === 'plus') {
let _data = (this.state.data || []).concat(result.data || [])
data = _data.map((item, index) => {
- if (item[config.setting.subdata]) {
- let children = []
- let _children = item[config.setting.subdata]
+ let _children = item[config.setting.subdata]
+
+ delete item[config.setting.subdata]
+ if (config.setting.subdata === 'sub_data_string') {
+ _children = this.parseSubData(_children)
+ } else if (item.sub_data_string) {
+ _children = this.parseSubData(item.sub_data_string)
+ }
- delete item[config.setting.subdata]
-
+ let children = []
+ if (_children) {
_children.forEach((cell, i) => {
cell.key = i
cell.$$uuid = cell[config.setting.subKey] || ''
@@ -688,10 +703,9 @@
children.push(cell)
}
})
- item.children = children
- } else if (!item.children) {
- item.children = []
}
+
+ item.children = children
item.key = index
item.$$uuid = item[config.setting.primaryKey] || ''
@@ -709,13 +723,18 @@
})
} else {
data = result.data.map((item, index) => {
+ let _children = item[config.setting.subdata]
+
+ delete item[config.setting.subdata]
+ if (config.setting.subdata === 'sub_data_string') {
+ _children = this.parseSubData(_children)
+ } else if (item.sub_data_string) {
+ _children = this.parseSubData(item.sub_data_string)
+ }
+
let children = []
- if (item[config.setting.subdata]) {
- let _children = item[config.setting.subdata]
-
- delete item[config.setting.subdata]
-
+ if (_children) {
_children.forEach((cell, i) => {
cell.key = i
cell.$$uuid = cell[config.setting.subKey] || ''
@@ -769,6 +788,10 @@
loading: false
})
+ if (selected === 'init') {
+ this.setState({selected: 'false'})
+ }
+
if (config.timer && config.clearField && result.data && result.data[0]) {
let vals = (config.clearValue || '').split(',')
if (vals.includes(result.data[0][config.clearField])) {
@@ -793,15 +816,6 @@
async loadLinedata (id, position) {
const { config, pageIndex, pageSize, search, BID, BData, orderBy } = this.state
- if (config.forbidLine) {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData()
- })
- return
- }
-
let searches = fromJS(search).toJS()
if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
@@ -823,7 +837,7 @@
let result = await Api.genericInterface(param)
if (result.status) {
if (position === 'line_grid' && (!result.data || !result.data[0])) {
- this.loadData()
+ this.reloadIndex()
return
}
@@ -840,13 +854,19 @@
data = data.map(item => {
if (item.$$uuid === _data.$$uuid) {
+ let _children = _data[config.setting.subdata]
+
+ delete _data[config.setting.subdata]
+
+ if (config.setting.subdata === 'sub_data_string') {
+ _children = this.parseSubData(_children)
+ } else if (_data.sub_data_string) {
+ _children = this.parseSubData(_data.sub_data_string)
+ }
+
let children = []
- if (_data[config.setting.subdata]) {
- let _children = _data[config.setting.subdata]
-
- delete _data[config.setting.subdata]
-
+ if (_children) {
_children.forEach((cell, i) => {
cell.key = i
cell.$$uuid = cell[config.setting.subKey] || ''
@@ -946,6 +966,14 @@
}
}
+ reloadIndex = () => {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData()
+ })
+ }
+
loadMore = () => {
const { total, pageIndex, pageSize, loading } = this.state
@@ -969,6 +997,20 @@
}
refreshSearch = (list) => {
+ const { config, BID } = this.state
+
+ if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') {
+ notification.warning({
+ top: 92,
+ message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ duration: 5
+ })
+ this.setState({
+ search: list
+ })
+ return
+ }
+
this.setState({
search: list,
pageIndex: 1
--
Gitblit v1.8.0