From 7adf0212cd71a8ec604f65ba2c2e9bdfc5dec22d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 13 一月 2023 10:31:38 +0800 Subject: [PATCH] 2023-01-13 --- src/tabviews/custom/components/share/normalTable/index.jsx | 38 ++++++++++++++++++++++++++++++-------- 1 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx index 7cb3013..5c7df59 100644 --- a/src/tabviews/custom/components/share/normalTable/index.jsx +++ b/src/tabviews/custom/components/share/normalTable/index.jsx @@ -8,10 +8,7 @@ import { getMark } from '@/utils/utils.js' import MkIcon from '@/components/mk-icon' import MKEmitter from '@/utils/events.js' -import zhCN from '@/locales/zh-CN/main.js' -import enUS from '@/locales/en-US/main.js' import Encrypts from '@/components/encrypts' -import '@/assets/css/table.scss' import './index.scss' const { Paragraph } = Typography @@ -416,7 +413,6 @@ } state = { - dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, tableId: '', // 琛ㄦ牸ID selectedRowKeys: [], // 琛ㄦ牸涓�変腑琛� pageIndex: 1, // 鍒濆椤甸潰绱㈠紩 @@ -618,10 +614,32 @@ this.props.refreshdata({pageIndex}) } - mkCheckTopLine = (menuId, id) => { + mkCheckTopLine = (menuId, id, type) => { const { MenuID, data, setting } = this.props if (MenuID !== menuId || !data || data.length === 0) return + + if (type === 'sign') { + let index = '' + let keys = [] + let items = [] + data.forEach((item, i) => { + if (!item.$disabled && item.selected === 'true') { + items.push(item) + keys.push(i) + index = i + } + }) + + this.changedata(index) + this.setState({ selectedRowKeys: keys, activeIndex: index }) + this.props.chgSelectData(items) + + if (setting.$hasSyncModule) { + MKEmitter.emit('syncBalconyData', MenuID, items, data.length === keys.length) + } + return + } let index = 0 if (id) { @@ -720,7 +738,7 @@ /** * */ - onSelectChange = selectedRowKeys => { + onSelectChange = (selectedRowKeys, e) => { const { setting, MenuID, data } = this.props let index = '' @@ -950,7 +968,7 @@ pageSizeOptions: pageOptions, showSizeChanger: true, total: this.props.total || 0, - showTotal: (total, range) => `${range[0]}-${range[1]} ${this.state.dict['main.pagination.of']} ${total} ${this.state.dict['main.pagination.items']}` + showTotal: (total, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉 } } @@ -961,6 +979,10 @@ } let height = setting.height || false + let loading = this.props.loading + if (setting.mask === 'hidden') { + loading = false + } return ( <div className={`normal-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || ''}`} id={tableId}> @@ -974,7 +996,7 @@ rowSelection={rowSelection} columns={this.state.columns} dataSource={_data} - loading={this.props.loading} + loading={loading} scroll={{ x: '100%', y: height }} onRow={(record, index) => { return { -- Gitblit v1.8.0