From 4c538565bd930279c9e32234617aa25804b19dee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 四月 2023 13:15:40 +0800
Subject: [PATCH] 2023-04-05
---
src/menu/datasource/verifycard/index.jsx | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index dcb2c3d..814c6df 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Tabs, Popconfirm, notification, Modal, Typography, Spin, message, Button } from 'antd'
+import { Form, Tabs, Popconfirm, notification, Modal, Typography, Spin, message, Button, Input } from 'antd'
import { StopOutlined, CheckCircleOutlined, EditOutlined, SwapOutlined, DeleteOutlined, CopyOutlined, BorderOutlined, SnippetsOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -20,6 +20,7 @@
const { TabPane } = Tabs
const { Paragraph } = Typography
+const { Search } = Input
const CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror'))
const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
@@ -35,6 +36,7 @@
subColumns: [],
activeKey: 'setting',
loading: false,
+ searchKey: '',
initsql: '', // sql楠岃瘉鏃跺彉閲忓０鏄庡強璧嬪��
usefulfields: '',
defaultsql: '', // 榛樿Sql
@@ -194,15 +196,21 @@
_search = _search.replace(/@\$@/ig, '')
_search = _search ? 'where ' + _search : ''
+ let columns = config.columns ? fromJS(config.columns).toJS() : []
+ let subColumns = config.subColumns ? fromJS(config.subColumns).toJS() : []
+
+ columns.reverse()
+ subColumns.reverse()
this.setState({
scripts,
- columns: config.columns ? fromJS(config.columns).toJS() : [],
- subColumns: config.subColumns ? fromJS(config.subColumns).toJS() : [],
+ columns: columns,
+ subColumns: subColumns,
setting: _setting,
median: _setting,
searches: search,
- defaultSearch: _search
+ defaultSearch: _search,
+ searchKey: ''
})
this.getsysScript()
@@ -273,7 +281,7 @@
values.uuid = Utils.getuuid()
- this.setState({ columns: [...columns, values] })
+ this.setState({ columns: [values, ...columns] })
}
subColumnChange = (values, resolve) => {
@@ -293,7 +301,7 @@
values.uuid = Utils.getuuid()
- this.setState({ subColumns: [...subColumns, values] })
+ this.setState({ subColumns: [values, ...subColumns] })
}
deleteScript = (record) => {
@@ -931,7 +939,7 @@
render() {
const { config } = this.props
- const { columns, subColumns, median, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue } = this.state
+ const { columns, subColumns, median, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue, searchKey } = this.state
return (
<div className="model-data-source-wrap">
@@ -965,7 +973,7 @@
type="fields"
updatefield={this.updatefields}
/>
- <EditTable actions={['edit', 'move', 'copy', 'del', 'clear']} type="datasourcefield" wrappedComponentRef={(inst) => this.datasource = inst} data={columns} columns={colColumns} onChange={(columns) => this.setState({columns})}/>
+ <EditTable actions={['edit', 'move', 'copy', 'del', 'clear']} searchKey={searchKey} type="datasourcefield" wrappedComponentRef={(inst) => this.datasource = inst} data={columns} columns={colColumns} onChange={(columns) => this.setState({columns})}/>
</TabPane> : null}
{config.subtype === 'dualdatacard' ? <TabPane tab={
<span>
@@ -979,7 +987,7 @@
type="fields"
updatefield={this.updateSubfields}
/>
- <EditTable actions={['edit', 'move', 'copy', 'del', 'clear']} type="datasourcefield" wrappedComponentRef={(inst) => this.subdatasource = inst} data={subColumns} columns={colColumns} onChange={(subColumns) => this.setState({subColumns})}/>
+ <EditTable actions={['edit', 'move', 'copy', 'del', 'clear']} searchKey={searchKey} type="datasourcefield" wrappedComponentRef={(inst) => this.subdatasource = inst} data={subColumns} columns={colColumns} onChange={(subColumns) => this.setState({subColumns})}/>
</TabPane> : null}
<TabPane tab={
<span>
@@ -989,6 +997,7 @@
{config.type !== 'interface' && activeKey === 'setting' ? <SnippetsOutlined title="瀵煎叆鏁版嵁婧�" className="mk-paste-datasource" onClick={(e) => {e.stopPropagation();this.setState({pvisible: true})}}/> : null}
{activeKey === 'columns' ? <CopyOutlined title="浠ラ�楀彿鎷兼帴褰㈠紡澶嶅埗瀛楁" className="mk-copy-fields" onClick={(e) => {e.stopPropagation();this.copyColumns()}}/> : null}
{activeKey === 'subcolumns' ? <CopyOutlined title="浠ラ�楀彿鎷兼帴褰㈠紡澶嶅埗瀛楁" className="mk-copy-fields" onClick={(e) => {e.stopPropagation();this.copySubColumns()}}/> : null}
+ {activeKey === 'subcolumns' || 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="scripts" disabled={median.interType !== 'system'} id="mk-scripts-tabpane">
{scripts.length ? <BorderOutlined className="full-scripts" onClick={() => {
--
Gitblit v1.8.0