From f4b9504cad034ddcdef21c2081d14a4984fcd2d3 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 15 七月 2024 17:14:48 +0800 Subject: [PATCH] 2024-07-15 --- src/tabviews/custom/components/table/normal-table/index.jsx | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx index fd31261..be55ae8 100644 --- a/src/tabviews/custom/components/table/normal-table/index.jsx +++ b/src/tabviews/custom/components/table/normal-table/index.jsx @@ -1,7 +1,7 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' -import { Collapse } from 'antd' +import { Collapse, notification } from 'antd' import moment from 'moment' import Api from '@/api' @@ -530,6 +530,10 @@ if (setting.$hasSyncModule) { MKEmitter.emit('syncBalconyData', config.uuid, [], false) } + if (config.$hasTopModule) { + window.GLOB.CacheData.set(config.uuid + 'tb', { $$empty: true, $$uuid: '' }) + MKEmitter.emit('mkPublicData', config.uuid + 'tb', { $$empty: true, $$uuid: '' }) + } this.loaded = true this.requestId = '' @@ -653,6 +657,11 @@ loading: false }) + if (config.$hasTopModule) { + window.GLOB.CacheData.set(config.uuid + 'tb', data[0] || { $$empty: true, $$uuid: '' }) + MKEmitter.emit('mkPublicData', config.uuid + 'tb', data[0] || { $$empty: true, $$uuid: '' }) + } + if (config.timer && config.clearField && result.data && result.data[0]) { let vals = (config.clearValue || '').split(',') if (vals.includes(result.data[0][config.clearField])) { @@ -803,6 +812,20 @@ * 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃� */ refreshbysearch = (searches) => { + const { setting, BID } = this.state + + if (setting.supModule && !BID && setting.supKey !== 'false') { + notification.warning({ + top: 92, + message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒', + duration: 5 + }) + this.setState({ + search: searches + }) + return + } + this.setState({ pageIndex: 1, search: searches @@ -951,7 +974,7 @@ }) } else { if (position === 'line' || position === 'line_grid') { - if (lines && lines.length === 1) { + if (lines && lines.length === 1 && !config.forbidLine) { this.loadLinedata(lines[0].$$uuid, position) } else { this.reloadtable(btn, id) @@ -962,7 +985,7 @@ } } else { if (position === 'line' || position === 'line_grid') { - if (lines && lines.length === 1) { + if (lines && lines.length === 1 && !config.forbidLine) { this.loadLinedata(lines[0].$$uuid, position) } else { this.reloadtable(btn, id) -- Gitblit v1.8.0