From 0eb129a9beddbb86ae74d7106a8e60823206b8d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 十二月 2023 11:29:15 +0800
Subject: [PATCH] 2023-12-14
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 6555fcc..fb05456 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Tabs, Row, Col, Button, notification, Modal, message, InputNumber, Spin, Typography, Popconfirm } from 'antd'
+import { Form, Tabs, Row, Col, Button, Input, notification, Modal, message, InputNumber, Spin, Typography, Popconfirm } from 'antd'
import { EditOutlined, StopOutlined, CheckCircleOutlined, SwapOutlined, DeleteOutlined } from '@ant-design/icons'
import md5 from 'md5'
@@ -16,6 +16,7 @@
const { TabPane } = Tabs
const { confirm } = Modal
+const { Search } = Input
const { Paragraph } = Typography
const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
@@ -29,6 +30,7 @@
verify: {},
debugId: '',
activeKey: 'setting',
+ searchKey: '',
excelColumns: [
{
title: '瀛楁',
@@ -36,6 +38,8 @@
inputType: 'input',
editable: true,
unique: true,
+ searchable: true,
+ copy: true,
width: '16%'
},
{
@@ -43,6 +47,7 @@
dataIndex: 'Text',
inputType: 'input',
editable: true,
+ searchable: true,
unique: true,
width: '16%'
},
@@ -354,6 +359,7 @@
}
this.setState({
+ searchKey: '',
verify: _verify,
searches: searches,
activeKey: card.intertype === 'system' && _verify.dataType === 'custom' ? 'setting' : 'columns'
@@ -501,6 +507,7 @@
}
handleConfirm = () => {
+ const { card, config } = this.props
const { activeKey, verify } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
@@ -516,6 +523,24 @@
})
return
+ }
+
+ if (card.intertype === 'system' && verify.dataType !== 'custom' && verify.columns.length > 0 && config.$c_ds && config.setting.interType === 'system' && config.columns && config.columns.length > 0) {
+ let cols = []
+ let columns = config.columns.map(c => c.field)
+ verify.columns.forEach(col => {
+ if (col.output === 'false' || col.Column === '$Index') return
+ if (!columns.includes(col.Column)) {
+ cols.push(col.Column)
+ }
+ })
+ if (cols.length) {
+ notification.warning({
+ top: 92,
+ message: `瀵煎嚭鍒楋紙${cols.join('銆�')}锛夊湪瀛楁闆嗕腑涓嶅瓨鍦紒`,
+ duration: 5
+ })
+ }
}
if (activeKey === 'setting') {
@@ -937,7 +962,7 @@
render() {
const { card } = this.props
- const { verify, excelColumns, scriptsColumns, activeKey, loading, searches } = this.state
+ const { verify, excelColumns, scriptsColumns, activeKey, loading, searches, searchKey } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -965,13 +990,13 @@
} key="columns">
<ColumnForm columnChange={this.columnChange}/>
<Button className="excel-col-add mk-green" title="娣诲姞鏄剧ず鍒楀瓧娈�" onClick={this.columnFieldInput}>
- 鍚屾鏄剧ず鍒�
+ 鍚屾瀛楁闆�
</Button>
<Button className="excel-col-add mk-red" title="娓呯┖Excel鍒�" onClick={this.clearField}>
娓呯┖Excel鍒�
</Button>
<div style={{color: '#959595', fontSize: '13px', paddingLeft: '10px'}}>濡傞渶瀵煎嚭搴忓彿锛岃浣跨敤瀛楁 $Index锛涙暟鍊肩被鍨嬪鍑烘椂鍙彇缁濆鍊间互鍙婅缃皬鏁颁綅锛涘鍑轰负鍚︽椂锛屼笉浣跨敤琛屼俊鎭紱绾㈣壊鏍囬瀵煎嚭鏃跺垪澶存枃瀛椾负绾㈣壊銆�</div>
- <EditTable actions={['edit', 'move', 'copy', 'del']} type="excelcolumn" wrappedComponentRef={(inst) => this.columnRef = inst} data={verify.columns} columns={excelColumns} onChange={this.changeColumns}/>
+ <EditTable actions={['edit', 'move', 'copy', 'del']} type="excelcolumn" searchKey={searchKey} wrappedComponentRef={(inst) => this.columnRef = inst} data={verify.columns} columns={excelColumns} onChange={this.changeColumns}/>
</TabPane>
{card.intertype === 'system' ? <TabPane tab={
<span>
@@ -988,7 +1013,12 @@
/>
<EditTable actions={['move']} data={verify.scripts} columns={scriptsColumns} onChange={(scripts) => {this.setState({verify: {...verify, scripts}})}}/>
</TabPane> : null}
- <TabPane tab="淇℃伅鎻愮ず" key="message">
+ <TabPane tab={
+ <span>
+ 淇℃伅鎻愮ず
+ {activeKey === 'columns' ? <span onClick={(e) => {e.stopPropagation()}}><Search className="mk-search-fields" defaultValue={searchKey} allowClear onSearch={(val, e) => {e.stopPropagation();this.setState({searchKey: val})}} /></span> : null}
+ </span>
+ } key="message">
<Form {...formItemLayout}>
<Row gutter={24}>
<Col offset={6} span={6}>
--
Gitblit v1.8.0