From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/data-card/index.jsx | 191 +++++++++++++++++++++++------------------------
1 files changed, 94 insertions(+), 97 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 7e95542..8861386 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -123,12 +123,12 @@
_config.wrap.selected = 'false'
}
- _config.wrap.selStyle = _config.wrap.selStyle || 'active'
+ _config.wrap.selStyle = _config.wrap.selStyle || 'none'
_config.wrap.pagestyle = _config.wrap.pagestyle || 'page'
_config.wrap.scale = _config.wrap.scale === 'true' ? 'scale' : ''
_config.wrap.layout = (_config.wrap.layout || 'grid') + '-layout float-' + (_config.wrap.cardFloat || 'left')
- _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale} ${config.wrap.hover === 'true' ? 'mk-hover' : ''}`
+ _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale} ${config.wrap.hover === 'true' ? 'mk-hover' : ''} ${config.wrap.empSign === 'hidden' ? 'mk-empty-hide' : ''}`
if (_config.wrap.shifting === 'true') {
_config.wrap.shifting = 'shifting'
@@ -186,15 +186,21 @@
window.GLOB.SyncData.delete(_config.dataName)
}
+ } else if (_config.setting.supModule && !BID && _config.wrap.supKey !== 'false') {
+ _config.setting.onload = 'false'
}
if (_config.wrap.zHeight) {
+ _config.wrap.zoomStyle = {}
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'
}
if (_config.style) {
@@ -202,7 +208,7 @@
}
_config.wrap.layout += ' fix-height'
} else {
- _config.wrap.zHeight = 'none'
+ _config.wrap.zoomStyle = null
}
this.setState({
@@ -410,9 +416,7 @@
if (config.$searchId !== searchId) return
- this.setState({pageIndex: 1}, () => {
- this.loadData()
- })
+ this.reloadIndex()
}
/**
@@ -426,6 +430,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]
@@ -439,43 +444,41 @@
}, i * 10)
})
} else {
- if ((position === 'line' || position === 'line_grid') && lines && lines.length === 1 && !config.forbidLine) {
- this.loadLinedata(lines[0].$$uuid, position)
+ if (position === 'line' || position === 'line_grid') {
+ if (lines && lines.length === 1) {
+ if (config.forbidLine) {
+ this.loadData(lines[0].$$uuid, 'repage')
+ } else {
+ this.loadLinedata(lines[0].$$uuid, position)
+ }
+ } else {
+ this.loadData(_id, 'repage')
+ }
} else if (btn.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData(id)
- })
+ this.reloadIndex()
} else {
- this.loadData(id)
+ this.loadData(_id, 'repage')
}
}
} else {
let supModule = config.setting.supModule
if (position === 'line' || position === 'line_grid') {
- if (lines && lines.length === 1 && !config.forbidLine) {
- this.loadLinedata(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].$$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.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData(id)
- })
+ this.reloadIndex()
} else {
- this.loadData(id)
+ this.loadData(_id, 'repage')
}
}
}
@@ -497,13 +500,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') {
@@ -511,59 +522,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: [],
@@ -576,16 +567,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)
}
}
@@ -683,7 +676,9 @@
if (config.uuid !== menuId) return
if (!id) {
- this.loadData()
+ this.reloadIndex()
+ } else if (config.forbidLine) {
+ this.loadData(id, 'repage')
} else {
this.loadLinedata(id)
}
@@ -806,6 +801,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
@@ -816,7 +816,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, '', '')
@@ -904,15 +904,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) || []
@@ -934,7 +925,7 @@
let result = await Api.genericInterface(param)
if (result.status) {
if (position === 'line_grid' && (!result.data || !result.data[0])) {
- this.loadData()
+ this.reloadIndex()
return
}
@@ -948,6 +939,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) {
@@ -1094,7 +1091,7 @@
if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') {
notification.warning({
top: 92,
- message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ message: config.setting.supModTip || window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
this.setState({
@@ -1241,7 +1238,7 @@
{config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren={window.GLOB.dict['open'] || '寮�'} unCheckedChildren={window.GLOB.dict['shut'] || '鍏�'} checked={pickup} onChange={this.pickupChange} /></div> : null}
<div className={`data-zoom ${config.wrap.wrapClass}`}>
{switchable ? <div className={'prev-page ' + (pageIndex === 1 ? 'disabled' : '')} onClick={this.prevPage}><div><div><img src={preImg} alt=""/></div></div></div> : null}
- <Row className={'card-row-list ' + config.wrap.layout} style={{maxHeight: config.wrap.zHeight}}>
+ <Row className={'card-row-list ' + config.wrap.layout} style={config.wrap.zoomStyle}>
{precards.map((item, index) => (
<Col key={'pre' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}>
{item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
--
Gitblit v1.8.0