From bde2916433c7830e2879e6524e32b9f6c8bd0bab Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 02 一月 2022 16:31:32 +0800 Subject: [PATCH] 2022-01-02 --- src/tabviews/zshare/normalTable/index.jsx | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx index af5f86d..88e69c8 100644 --- a/src/tabviews/zshare/normalTable/index.jsx +++ b/src/tabviews/zshare/normalTable/index.jsx @@ -3,10 +3,11 @@ import md5 from 'md5' import { connect } from 'react-redux' import { is, fromJS } from 'immutable' -import { Table, Affix, Typography, Icon } from 'antd' +import { Table, Affix, Typography } from 'antd' import asyncComponent from '@/utils/asyncComponent' import MKEmitter from '@/utils/events.js' +import MkIcon from '@/components/mk-icon' import '@/assets/css/table.scss' import './index.scss' @@ -268,7 +269,7 @@ if (id !== this.props.MenuID) return if (this.props.data.length > 0) { - this.changeRow(null, 0) + this.changeRow(this.props.data[0], 0) } } @@ -280,7 +281,7 @@ let i = index - (pageIndex - 1) * pageSize - 1 if (this.props.data[i]) { - this.changeRow(null, i) + this.changeRow(this.props.data[i], i) MKEmitter.emit('autoTransSelectData', this.props.MenuID, this.props.data[i]) } else { MKEmitter.emit('autoMaticOver', this.props.MenuID) @@ -428,7 +429,7 @@ if (mark.position === 'front') { position = 'front' } - icon = <Icon className={'font ' + className} type={mark.icon} /> + icon = <MkIcon className={'font ' + className} type={mark.icon} /> className = '' } @@ -480,7 +481,7 @@ content = md5(content) } - if (item.linkThdMenu || item.linkurl) { + if (!record.$disabled && (item.linkThdMenu || item.linkurl)) { if (item.rowspan === 'true') { return { children: ( @@ -579,7 +580,7 @@ content = md5(content) } - if (item.linkThdMenu || item.linkurl) { + if (!record.$disabled && (item.linkThdMenu || item.linkurl)) { if (item.rowspan === 'true') { return { children: ( @@ -724,6 +725,7 @@ key={btn.uuid} btn={btn} BID={record.$$BID} + disabled={record.$disabled} selectedData={[record]} BData={this.props.BData} setting={this.props.setting} @@ -737,6 +739,7 @@ key={btn.uuid} btn={btn} BID={record.$$BID} + disabled={record.$disabled} selectedData={[record]} BData={this.props.BData} setting={this.props.setting} @@ -747,7 +750,9 @@ <TabButton key={btn.uuid} btn={btn} + disabled={record.$disabled} selectedData={[record]} + BData={this.props.BData} MenuID={this.props.MenuID} setting={this.props.setting} /> @@ -757,7 +762,9 @@ <NewPageButton key={btn.uuid} btn={btn} + disabled={record.$disabled} selectedData={[record]} + BData={this.props.BData} setting={this.props.setting} /> ) @@ -1026,7 +1033,7 @@ this.setState({ selectedRowKeys, activeIndex: _activeIndex }) - let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index)) + let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled) this.props.chgSelectData(selects) } @@ -1036,6 +1043,7 @@ */ changeRow = (record, index) => { if (!this.props.setting.tableType || this.props.pickup) return + if (record.$disabled) return let newkeys = fromJS(this.state.selectedRowKeys).toJS() @@ -1168,6 +1176,7 @@ const { setting } = this.props if (!setting.doubleClick) return + if (record.$disabled) return MKEmitter.emit('triggerBtnId', setting.doubleClick, [record]) } @@ -1278,7 +1287,9 @@ dataSource={_data} rowClassName={(record) => { let className = '' - if ((setting.tableType === 'checkbox' || setting.tableType === 'radio') && record.key === activeIndex) { + if (record.$disabled) { + className = 'mk-disabled ' + } else if ((setting.tableType === 'checkbox' || setting.tableType === 'radio') && record.key === activeIndex) { className = 'mk-row-active ' } -- Gitblit v1.8.0