From 8e003c1a94d26cc4d477e7aa03593ccb4d7e6c61 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 11 十月 2024 17:47:40 +0800 Subject: [PATCH] 2024-10-11 --- src/tabviews/custom/components/card/data-card/index.jsx | 179 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 93 insertions(+), 86 deletions(-) diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx index b442a83..2682bca 100644 --- a/src/tabviews/custom/components/card/data-card/index.jsx +++ b/src/tabviews/custom/components/card/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, message, Row, Col, Pagination, Switch } from 'antd' +import { Spin, Empty, message, Row, Col, Pagination, Switch, notification } from 'antd' import { DownOutlined } from '@ant-design/icons' import Api from '@/api' @@ -410,9 +410,7 @@ if (config.$searchId !== searchId) return - this.setState({pageIndex: 1}, () => { - this.loadData() - }) + this.reloadIndex() } /** @@ -426,6 +424,7 @@ if (config.uuid !== menuId) return + let _id = config.wrap.selected === 'always' ? id : '' if (config.supNodes) { if (['mainline', 'maingrid', 'popclose'].includes(position)) { let supNode = this.supModules[this.supModules.length - 1] @@ -441,18 +440,18 @@ } else { if (position === 'line' || position === 'line_grid') { if (lines && lines.length === 1) { - this.loadLinedata(lines[0].$$uuid, position) + if (config.forbidLine) { + this.loadData(lines[0].$$uuid, 'repage') + } else { + this.loadLinedata(lines[0].$$uuid, position) + } } else { - this.loadData(id) + this.loadData(_id, 'repage') } - } else if (!btn || btn.resetPageIndex !== 'false') { - this.setState({ - pageIndex: 1 - }, () => { - this.loadData(id) - }) + } else if (btn.resetPageIndex !== 'false') { + this.reloadIndex() } else { - this.loadData(id) + this.loadData(_id, 'repage') } } } else { @@ -460,20 +459,20 @@ if (position === 'line' || position === 'line_grid') { if (lines && lines.length === 1) { - this.loadLinedata(lines[0].$$uuid, position) + if (config.forbidLine) { + this.loadData(lines[0].$$uuid, 'repage') + } else { + this.loadLinedata(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 || btn.resetPageIndex !== 'false') { - this.setState({ - pageIndex: 1 - }, () => { - this.loadData(id) - }) + } else if (btn.resetPageIndex !== 'false') { + this.reloadIndex() } else { - this.loadData(id) + this.loadData(_id, 'repage') } } } @@ -495,13 +494,21 @@ }) } + reloadIndex = () => { + this.setState({ + pageIndex: 1 + }, () => { + this.loadData() + }) + } + prevCheck = (id) => { const { selected } = this.state if (selected === 'false' && !id) return setTimeout(() => { - this.checkTopLine(id) + this.checkTopLine(id, selected) }, 10) if (selected === 'init') { @@ -509,59 +516,39 @@ } } - checkTopLine = (id) => { - const { config, data, selected } = this.state + checkTopLine = (id, selected) => { + const { config, data } = this.state - if (data.length === 0) { - this.setState({ - activeKey: '', - selectKeys: [], - selectedData: [] - }) - - MKEmitter.emit('resetSelectLine', config.uuid, '', '') - if (config.setting.$hasSyncModule) { - MKEmitter.emit('syncBalconyData', config.uuid, [], false) + let index = -1 + let keys = [] + let items = [] + + if (data.length > 0) { + if (id) { + index = data.findIndex(item => item.$$uuid === id && !item.$disabled) } - return - } - - if (selected === 'sign') { - let index = '' - let keys = [] - let items = [] - let last = '' - data.forEach((item, i) => { - if (!item.$disabled && item.selected === 'true') { - items.push(item) - keys.push(i) - index = i - last = item + + 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({ - activeKey: index, - selectKeys: keys, - selectedData: items - }) - - MKEmitter.emit('resetSelectLine', config.uuid, last ? last.$$uuid : '', last) - if (config.setting.$hasSyncModule) { - MKEmitter.emit('syncBalconyData', config.uuid, items, data.length === keys.length) - } - 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: [], @@ -574,16 +561,18 @@ } return } + + let item = items[items.length - 1] this.setState({ 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) if (config.setting.$hasSyncModule) { - MKEmitter.emit('syncBalconyData', config.uuid, [data[index]], data.length === 1) + MKEmitter.emit('syncBalconyData', config.uuid, items, data.length === keys.length) } } @@ -681,7 +670,9 @@ if (config.uuid !== menuId) return if (!id) { - this.loadData() + this.reloadIndex() + } else if (config.forbidLine) { + this.loadData(id, 'repage') } else { this.loadLinedata(id) } @@ -804,6 +795,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 @@ -814,7 +810,7 @@ Api.writeCacheConfig(config.uuid, result.data || [], BID) } - if (selected !== 'false' || (id && config.wrap.selected !== 'false')) { + if (selected !== 'false' || id) { this.prevCheck(id) } else { MKEmitter.emit('resetSelectLine', config.uuid, '', '') @@ -902,15 +898,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) || [] @@ -932,7 +919,7 @@ let result = await Api.genericInterface(param) if (result.status) { if (position === 'line_grid' && (!result.data || !result.data[0])) { - this.loadData() + this.reloadIndex() return } @@ -946,6 +933,12 @@ _data.$$uuid = _data[config.setting.primaryKey] || '' _data.$$BID = BID || '' _data.$$BData = BData || '' + + if (config.wrap.controlField) { + if (config.wrap.controlVal.includes(_data[config.wrap.controlField] + '')) { + _data.$disabled = true + } + } data = data.map(item => { if (item.$$uuid === _data.$$uuid) { @@ -1087,6 +1080,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