From 2ccd33975abf91f9a7929ca8ed6fc03d74ee424d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 08 十月 2022 10:10:07 +0800 Subject: [PATCH] 2022-10-08 --- src/menu/datasource/verifycard/index.jsx | 629 +++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 473 insertions(+), 156 deletions(-) diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx index 99a1ff7..52a036f 100644 --- a/src/menu/datasource/verifycard/index.jsx +++ b/src/menu/datasource/verifycard/index.jsx @@ -1,7 +1,8 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { fromJS } from 'immutable' -import { Form, Tabs, Table, Popconfirm, Icon, notification, Modal, Typography, Spin } from 'antd' +import { Tabs, Popconfirm, notification, Modal, Typography, Spin, message, Button } from 'antd' +import { StopOutlined, CheckCircleOutlined, EditOutlined, SwapOutlined, DeleteOutlined, CopyOutlined, BorderOutlined } from '@ant-design/icons' import moment from 'moment' import Api from '@/api' @@ -12,17 +13,19 @@ import CustomScriptsForm from './customscript' import SettingForm from './settingform' import SettingUtils from './utils' +import MinView from '@/assets/img/minview.png' import './index.scss' const { TabPane } = Tabs const { Paragraph } = Typography +const CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror')) const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent')) +const EditTable = asyncComponent(() => import('@/templates/zshare/editTable')) class VerifyCard extends Component { static propTpyes = { dict: PropTypes.object, // 瀛楀吀椤� - menu: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅 config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅 } @@ -32,89 +35,125 @@ loading: false, initsql: '', // sql楠岃瘉鏃跺彉閲忓0鏄庡強璧嬪�� usefulfields: '', - defaultsql: '', // 榛樿Sql - systemScripts: [{ - name: '榛樿sql', - value: '' - }], + defaultsql: '', // 榛樿Sql + defaultSearch: '', + systemScripts: [], + visible: false, + script: null, + scriptValue: '', colColumns: [ { title: '鍚嶇О', dataIndex: 'label', - width: '25%' + inputType: 'input', + editable: true, + width: '28%' }, { title: '瀛楁', dataIndex: 'field', - width: '25%' + inputType: 'input', + editable: true, + unique: true, + copy: true, + rules: [{ + pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig, + message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯' + }], + width: '28%' }, { title: '鏁版嵁绫诲瀷', dataIndex: 'datatype', + inputType: 'select', + options: [ + { value: 'Nvarchar(10)', text: 'Nvarchar(10)' }, + { value: 'Nvarchar(20)', text: 'Nvarchar(20)' }, + { value: 'Nvarchar(50)', text: 'Nvarchar(50)' }, + { value: 'Nvarchar(100)', text: 'Nvarchar(100)' }, + { value: 'Nvarchar(256)', text: 'Nvarchar(256)' }, + { value: 'Nvarchar(512)', text: 'Nvarchar(512)' }, + { value: 'Nvarchar(1024)', text: 'Nvarchar(1024)' }, + { value: 'Nvarchar(2048)', text: 'Nvarchar(2048)' }, + { value: 'Nvarchar(max)', text: 'Nvarchar(max)' }, + { value: 'Int', text: 'Int' }, + { value: 'Decimal(18,0)', text: 'Decimal(18,0)' }, + { value: 'Decimal(18,1)', text: 'Decimal(18,1)' }, + { value: 'Decimal(18,2)', text: 'Decimal(18,2)' }, + { value: 'Decimal(18,3)', text: 'Decimal(18,3)' }, + { value: 'Decimal(18,4)', text: 'Decimal(18,4)' }, + { value: 'Decimal(18,5)', text: 'Decimal(18,5)' }, + { value: 'Decimal(18,6)', text: 'Decimal(18,6)' }, + { value: 'Decimal(18,7)', text: 'Decimal(18,7)' }, + { value: 'Decimal(18,8)', text: 'Decimal(18,8)' }, + { value: 'Decimal(18,9)', text: 'Decimal(18,9)' }, + { value: 'Decimal(18,10)', text: 'Decimal(18,10)' }, + { value: 'Decimal(18,11)', text: 'Decimal(18,11)' }, + { value: 'Decimal(18,12)', text: 'Decimal(18,12)' }, + { value: 'Decimal(18,13)', text: 'Decimal(18,13)' }, + { value: 'Decimal(18,14)', text: 'Decimal(18,14)' }, + { value: 'Decimal(18,15)', text: 'Decimal(18,15)' }, + { value: 'Decimal(18,16)', text: 'Decimal(18,16)' }, + { value: 'Decimal(18,17)', text: 'Decimal(18,17)' }, + { value: 'Decimal(18,18)', text: 'Decimal(18,18)' }, + { value: 'date', text: 'date' }, + { value: 'datetime', text: 'datetime' }, + ], + editable: true, width: '25%', - }, - { - title: '鎿嶄綔', - align: 'center', - width: '25%', - dataIndex: 'operation', - render: (text, record) => - (<div> - <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'columns')} style={{color: '#1890ff'}}><Icon type="edit" /></span> - <Popconfirm - overlayClassName="popover-confirm" - title={this.props.dict['model.query.delete']} - onConfirm={() => this.deleteColumn(record) - }> - <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span> - </Popconfirm> - </div>) } ], scriptsColumns: [ { title: 'SQL', dataIndex: 'sql', - width: '65%', - render: (text) => ( - <Paragraph copyable ellipsis={{ rows: 4, expandable: true }}>{text}</Paragraph> - ) + width: '72%', + render: (text) => { + let title = text.match(/^\s*\/\*.+\*\//) + title = title && title[0] ? title[0] : '' + let _text = title ? text.replace(title, '') : text + + return ( + <div> + {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null} + <Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph> + </div> + ) + } }, { title: '鐘舵��', dataIndex: 'status', - width: '15%', + width: '13%', render: (text, record) => record.status === 'false' ? ( - <div> - {this.props.dict['model.status.forbidden']} - <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" /> + <div style={{color: '#ff4d4f'}}> + 绂佺敤 + <StopOutlined style={{marginLeft: '5px'}} /> </div> ) : ( - <div> - {this.props.dict['model.status.open']} - <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" /> + <div style={{color: '#26C281'}}> + 鍚敤 + <CheckCircleOutlined style={{marginLeft: '5px'}}/> </div> ) }, { title: '鎿嶄綔', align: 'center', - width: '20%', + width: '15%', dataIndex: 'operation', render: (text, record) => - (<div> - <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'scripts')} style={{color: '#1890ff'}}><Icon type="edit" /></span> - <span className="operation-btn" onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span> - <span className="operation-btn" onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span> - <span className="operation-btn" title={this.props.dict['model.status.change']} onClick={() => this.handleStatus(record)} style={{color: '#8E44AD'}}><Icon type="swap" /></span> + (<div style={{textAlign: 'center'}}> + <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record)} style={{color: '#1890ff'}}><EditOutlined /></span> + <span className="operation-btn" title={this.props.dict['model.status.change']} onClick={() => this.handleStatus(record)} style={{color: '#8E44AD'}}><SwapOutlined /></span> <Popconfirm overlayClassName="popover-confirm" title={this.props.dict['model.query.delete']} onConfirm={() => this.deleteScript(record) }> - <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span> + <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span> </Popconfirm> </div>) } @@ -122,18 +161,54 @@ } UNSAFE_componentWillMount() { - const { config } = this.props + const { config, mainSearch } = this.props + + let search = config.search || [] + + if (config.setting.useMSearch === 'true') { // 浣跨敤涓绘悳绱㈡潯浠� + search = [...search, ...mainSearch] + } + + let _setting = fromJS(config.setting).toJS() + let scripts = config.scripts ? fromJS(config.scripts).toJS() : [] + + if (window.GLOB.funcs && window.GLOB.funcs.length > 0) { + window.GLOB.funcs.forEach(m => { + let reg = new RegExp(`\\/\\*\\$ex@${m.func_code}-begin\\*\\/[\\s\\S]+\\/\\*@ex\\$-end\\*\\/`, 'ig') + if (_setting.dataresource) { + _setting.dataresource = _setting.dataresource.replace(reg, `$ex@${m.func_code}@ex$`) + } + scripts && scripts.forEach(item => { + item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`) + }) + }) + } + + let _search = this.formatSearch(search) + _search = Utils.joinMainSearchkey(_search) + + _search = _search.replace(/@\$@/ig, '') + _search = _search ? 'where ' + _search : '' this.setState({ - columns: fromJS(config.columns).toJS(), - setting: fromJS(config.setting).toJS(), - scripts: fromJS(config.scripts).toJS() + scripts, + columns: config.columns ? fromJS(config.columns).toJS() : [], + setting: _setting, + searches: search, + defaultSearch: _search }) this.getsysScript() } getsysScript = () => { + if (sessionStorage.getItem('mk_sys_scripts')) { + this.setState({ + systemScripts: JSON.parse(sessionStorage.getItem('mk_sys_scripts')) + }) + return + } + let _scriptSql = `Select distinct func+Remark as funcname,longparam, s.Sort from聽 s_custom_script s inner join (select OpenID from sapp where ID=@Appkey@) p on s.openid = case when s.appkey='' then s.openid else p.OpenID end order by s.Sort` _scriptSql = Utils.formatOptions(_scriptSql) @@ -152,19 +227,17 @@ Api.getSystemConfig(_sParam).then(res => { if (res.status) { - let _scripts = [] - - res.data.forEach(item => { - let _item = { + let _scripts = res.data.map(item => { + return { name: item.funcname, - value: Utils.UnformatOptions(item.longparam) + value: window.decodeURIComponent(window.atob(item.longparam)) } - - _scripts.push(_item) }) + sessionStorage.setItem('mk_sys_scripts', JSON.stringify(_scripts)) + this.setState({ - systemScripts: [...this.state.systemScripts, ..._scripts] + systemScripts: _scripts }) } else { notification.warning({ @@ -176,41 +249,41 @@ }) } - columnChange = (values) => { - let columns = fromJS(this.state.columns).toJS() + columnChange = (values, resolve) => { + const { columns } = this.state - if (values.uuid) { - columns = columns.map(item => { - if (item.uuid === values.uuid) { - return values - } else { - return item - } + let fields = columns.map(item => item.field.toLowerCase()) + if (fields.includes(values.field.toLowerCase())) { + notification.warning({ + top: 92, + message: '瀛楁宸插瓨鍦紒', + duration: 5 }) - } else { - values.uuid = Utils.getuuid() - columns.push(values) + return } - this.setState({ columns }) - } + resolve() - deleteColumn = (record) => { - this.setState({ columns: this.state.columns.filter(item => item.uuid !== record.uuid) }) + values.uuid = Utils.getuuid() + + this.setState({ columns: [...columns, values] }) } deleteScript = (record) => { - this.setState({ scripts: this.state.scripts.filter(item => item.uuid !== record.uuid) }) + const { script, scripts } = this.state + + if (script && script.uuid === record.uuid) { + this.setState({script: null}) + } + + this.setState({ scripts: scripts.filter(item => item.uuid !== record.uuid) }) } - handleEdit = (record, type) => { - if (type === 'scripts') { - this.scriptsForm.edit(record) - } else if (type === 'columns') { - this.contrastForm.edit(record) - } - - let node = document.getElementById('model-verify-card-box-tab').parentNode + handleEdit = (record) => { + this.scriptsForm.edit(record) + + // let node = document.getElementById('mk-scripts-tabpane').parentNode + let node = document.getElementById('mk-scripts-tabpane') if (node && node.scrollTop) { let inter = Math.ceil(node.scrollTop / 10) @@ -241,30 +314,6 @@ this.setState({ scripts }) } - handleUpDown = (record, direction) => { - let scripts = fromJS(this.state.scripts).toJS() - let index = 0 - - scripts = scripts.filter((item, i) => { - if (item.uuid === record.uuid) { - index = i - } - - return item.uuid !== record.uuid - }) - if ((index === 0 && direction === 'up') || (index === scripts.length && direction === 'down')) { - return - } - - if (direction === 'up') { - scripts.splice(index - 1, 0, record) - } else { - scripts.splice(index + 1, 0, record) - } - - this.setState({ scripts }) - } - scriptsChange = (values) => { let scripts = fromJS(this.state.scripts).toJS() @@ -283,6 +332,10 @@ return new Promise((resolve, reject) => { this.sqlverify(resolve, reject, false, scripts) }) + } + + changeScripts = (scripts) => { + this.setState({ scripts }) } scriptSubmit = (values) => { @@ -305,12 +358,27 @@ } changeTab = (val) => { + const { config, mainSearch } = this.props const { activeKey } = this.state this.setState({loading: true}) if (activeKey === 'setting') { this.settingForm.handleConfirm().then(res => { + let search = config.search || [] + + if (res.useMSearch === 'true') { // 浣跨敤涓绘悳绱㈡潯浠� + search = [...search, ...mainSearch] + } + + let _search = this.formatSearch(search) + _search = Utils.joinMainSearchkey(_search) + + _search = _search.replace(/@\$@/ig, '') + _search = _search ? 'where ' + _search : '' + this.setState({ + searches: search, + defaultSearch: _search, setting: res }, () => { this.sqlverify(() => { // 楠岃瘉鎴愬姛 @@ -318,25 +386,41 @@ activeKey: val, loading: false }) + this.getdefaultSql() }, () => { // 楠岃瘉澶辫触 this.setState({ + activeKey: val, loading: false }) + this.getdefaultSql() }, true) }) }, () => { this.setState({loading: false}) }) } else if (activeKey === 'columns') { + if (this.datasource && this.datasource.state.editingKey) { + notification.warning({ + top: 92, + message: '瀛楁鏈繚瀛橈紝璇蜂繚瀛樺悗鍒囨崲锛�', + duration: 5 + }) + this.setState({ + loading: false + }) + return + } + this.setState({ activeKey: val, loading: false }) + this.getdefaultSql() } else if (activeKey === 'scripts') { let _loading = false if (this.scriptsForm && this.scriptsForm.state.editItem) { _loading = true - } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) { + } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) { _loading = true } @@ -356,27 +440,98 @@ activeKey: val, loading: false }) - - // this.sqlverify(() => { // 楠岃瘉鎴愬姛 - // this.setState({ - // activeKey: val, - // loading: false - // }) - // }, () => { // 楠岃瘉澶辫触 - // this.setState({ - // loading: false - // }) - // }, true) } } + getdefaultSql = () => { + const { columns, setting, defaultSearch } = this.state + let defaultsql = '' + let arr_field = columns.map(col => col.field).join(',') + + if (setting.dataresource) { + let _dataresource = setting.dataresource + + if (/\s/.test(_dataresource)) { + _dataresource = '(' + _dataresource + ') tb' + } + + defaultsql = `select top @pageSize@ ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by @orderBy@) as rows from ${_dataresource} ${defaultSearch}) tmptable where rows > (@pageSize@ * (@pageIndex@ - 1)) order by tmptable.rows` + } + + this.setState({defaultsql}) + } + + /** + * @description 鑾峰彇鍏ㄩ儴鎼滅储鏉′欢 + * @param {Array} searches 鎼滅储鏉′欢鏁扮粍 + */ + formatSearch (searches) { + if (!searches) return [] + + let newsearches = [] + searches.forEach(search => { + if (!search.field) return + + let item = { + key: search.field, + match: search.match, + type: search.type, + label: search.label, + value: search.initval, + required: search.required === 'true' + } + if (item.type === 'group') { + item.key = search.datefield + item.type = 'daterange' + item.match = 'between' + item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',') + + newsearches.push(item) + return + } else if (item.type === 'date') { + item.value = moment().format('YYYY-MM-DD') + } else if (item.type === 'datemonth') { + item.value = moment().format('YYYY-MM') + } else if (item.type === 'dateweek') { + item.value = moment().format('YYYY-MM-DD') + } else if (item.type === 'daterange') { + item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',') + } else if (item.type === 'range') { + + } else if (item.type === 'multiselect' || (item.type === 'checkcard' && search.multiple === 'true')) { + item.type = 'multi' + item.value = '@$@' + } else { + item.value = '@$@' + } + newsearches.push(item) + }) + + return newsearches + } + submitDataSource = () => { + const { config, mainSearch } = this.props const { activeKey, setting, columns, scripts } = this.state return new Promise((resolve, reject) => { if (activeKey === 'setting') { this.settingForm.handleConfirm().then(res => { + let search = config.search || [] + + if (res.useMSearch === 'true') { // 浣跨敤涓绘悳绱㈡潯浠� + search = [...search, ...mainSearch] + } + + let _search = this.formatSearch(search) + _search = Utils.joinMainSearchkey(_search) + + _search = _search.replace(/@\$@/ig, '') + _search = _search ? 'where ' + _search : '' + this.setState({ + searches: search, + defaultSearch: _search, setting: res }, () => { this.sqlverify(() => { resolve({setting: res, columns, scripts }) }, reject, false) @@ -385,12 +540,21 @@ reject() }) } else if (activeKey === 'columns') { + if (this.datasource && this.datasource.state.editingKey) { + notification.warning({ + top: 92, + message: '瀛楁鏈繚瀛橈紝璇蜂繚瀛樺悗鎻愪氦锛�', + duration: 5 + }) + reject() + return + } this.sqlverify(() => { resolve({setting, columns, scripts }) }, reject, false) } else if (activeKey === 'scripts') { let _loading = false if (this.scriptsForm && this.scriptsForm.state.editItem) { _loading = true - } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) { + } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) { _loading = true } @@ -410,8 +574,7 @@ } sqlverify = (resolve, reject, change = false, testScripts) => { - const { config } = this.props - const { columns, setting, scripts } = this.state + const { columns, setting, scripts, searches, defaultSearch } = this.state let _scripts = scripts.filter(item => item.status !== 'false') @@ -429,17 +592,54 @@ } if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) { + let timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + let r = SettingUtils.getDebugSql(setting, _scripts, columns, searches, defaultSearch, timestamp) + + if (r.errors) { + notification.warning({ + top: 92, + message: r.errors, + duration: 5 + }) + } + let param = { func: 's_debug_sql', - LText: SettingUtils.getDebugSql(setting, _scripts, columns, config.search) + exec_type: 'y', + LText: r.sql } param.LText = Utils.formatOptions(param.LText) - param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') - param.secretkey = Utils.encrypt(param.LText, param.timestamp) + param.timestamp = timestamp + param.secretkey = Utils.encrypt('', timestamp) + + let sumParam = null + if (r.sumSql) { + sumParam = { + func: 's_debug_sql', + exec_type: 'y', + LText: r.sumSql + } + sumParam.LText = Utils.formatOptions(sumParam.LText) + sumParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + sumParam.secretkey = Utils.encrypt('', sumParam.timestamp) + } - Api.getLocalConfig(param).then(result => { + Api.genericInterface(param).then(result => { if (result.status) { - resolve() + if (sumParam) { + Api.genericInterface(sumParam).then(res => { + if (res.status) { + resolve() + } else { + reject() + Modal.error({ + title: res.message + }) + } + }) + } else { + resolve() + } } else { reject() Modal.error({ @@ -452,10 +652,67 @@ } } + triggerConfirm = () => { + const { script, scriptValue, scripts } = this.state + let _scripts = fromJS(scripts).toJS() + + if (!scriptValue) { + notification.warning({ + top: 92, + message: '璇疯緭鍏ql!', + duration: 5 + }) + return + } + + if (script) { + _scripts = _scripts.map(item => { + if (script.uuid === item.uuid) { + item.sql = scriptValue + } + return item + }) + } else { + let _script = { + uuid: Utils.getuuid(), + sql: scriptValue, + $index: _scripts.length + 1, + status: 'true' + } + + _scripts.push(_script) + } + + this.setState({loading: true}) + + this.sqlverify(() => {this.setState({scripts: _scripts, script: null, scriptValue: '', loading: false})}, () => {this.setState({loading: false})}, false, _scripts) + } + updatefields = (columns) => { this.setState({ columns: columns }) + } + + copyColumns = () => { + const { columns } = this.state + let m = [] + let n = [] + + columns.forEach(col => { + m.push(`${col.field}(${col.label})`) + n.push(col.field) + }) + + let oInput = document.createElement('input') + oInput.value = `/*${m.join(',')}*/ + ${n.join(',')}` + document.body.appendChild(oInput) + oInput.select() + document.execCommand('Copy') + document.body.removeChild(oInput) + + message.success('澶嶅埗鎴愬姛銆�') } /** @@ -468,16 +725,16 @@ } render() { - const { menu, config } = this.props - const { columns, setting, scripts, colColumns, scriptsColumns, activeKey, loading } = this.state + const { config } = this.props + const { columns, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, script, scriptValue } = this.state return ( - <div id="model-verify-card-box-tab"> + <div className="model-data-source-wrap"> + {config.name ? <div className="mk-com-name">{config.name} - 鏁版嵁婧�</div> : null} {loading && <Spin size="large" />} - <Tabs activeKey={activeKey} className="verify-card-box" onChange={this.changeTab}> + <Tabs activeKey={activeKey} className="data-source-card-box" onChange={this.changeTab}> <TabPane tab="鏁版嵁婧�" key="setting"> <SettingForm - menu={menu} dict={this.props.dict} config={config} columns={columns} @@ -486,31 +743,41 @@ wrappedComponentRef={(inst) => this.settingForm = inst} /> </TabPane> - <TabPane tab="瀛楁闆�" key="columns"> - <ColForm - dict={this.props.dict} - columnChange={this.columnChange} - wrappedComponentRef={(inst) => this.contrastForm = inst} - /> + <TabPane tab={ + <span> + 瀛楁闆� + <CopyOutlined title="浠ラ�楀彿鎷兼帴褰㈠紡澶嶅埗瀛楁" className="mk-copy-fields" onClick={this.copyColumns}/> + </span> + } key="columns"> + <ColForm dict={this.props.dict} columnChange={this.columnChange}/> <FieldsComponent config={{...config, columns}} type="fields" - tableFields={menu.tableFields} updatefield={this.updatefields} /> - <Table - bordered - rowKey="uuid" - className="custom-table" - dataSource={columns} - columns={colColumns} - pagination={false} - /> + <EditTable actions={['edit', 'move', 'copy', 'del', 'clear']} type="datasourcefield" wrappedComponentRef={(inst) => this.datasource = inst} data={columns} columns={colColumns} onChange={(columns) => this.setState({columns})}/> </TabPane> - <TabPane tab="鑷畾涔夎剼鏈�" key="scripts"> + <TabPane tab={ + <span> + 鑷畾涔夎剼鏈� + {scripts.length ? <span className="count-tip">{scripts.length}</span> : null} + </span> + } key="scripts" id="mk-scripts-tabpane"> + {scripts.length ? <BorderOutlined className="full-scripts" onClick={() => { + if (this.scriptsForm && (this.scriptsForm.state.editItem || (this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))))) { + notification.warning({ + top: 92, + message: '璇蜂繚瀛樿嚜瀹氫箟鑴氭湰锛�', + duration: 5 + }) + return + } + this.setState({visible: true, script: null, scriptValue: ''}) + }}/> : null} <CustomScriptsForm setting={setting} - searches={config.search} + searches={searches} + defaultsql={defaultsql} initsql={this.state.initsql} dict={this.props.dict} customScripts={scripts} @@ -519,19 +786,69 @@ scriptSubmit={this.scriptSubmit} wrappedComponentRef={(inst) => this.scriptsForm = inst} /> - <Table - bordered - rowKey="uuid" - className="custom-table" - dataSource={scripts} - columns={scriptsColumns} - pagination={false} - /> + <EditTable actions={['move']} data={scripts} columns={scriptsColumns} onChange={this.changeScripts}/> </TabPane> </Tabs> + <Modal + wrapClassName="model-custom-view-scripts-modal" + title="鑷畾涔夎剼鏈�" + visible={visible} + width={'95vw'} + maskClosable={false} + destroyOnClose + > + <img className="unfull-scripts" src={MinView} onClick={() => this.setState({visible: false, script: null})} alt=""/> + <div className="script-table-wrap"> + {scripts.map(item => { + let title = item.sql.match(/^\s*\/\*.+\*\//) + title = title && title[0] ? title[0] : '' + let _text = title ? item.sql.replace(title, '') : item.sql + + return ( + <div className={'script-item ' + (script && script.uuid === item.uuid ? 'active' : '') } key={item.uuid}> + <div style={{cursor: 'pointer'}} onClick={() => { + this.setState({script: item, scriptValue: item.sql}) + }}> + {title ? <div style={{color: '#a50', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis'}}>{title}</div> : null} + <Paragraph copyable={{ text: item.sql }} ellipsis={{ rows: 4 }}>{_text}</Paragraph> + <div>{item.status === 'false' ? + <span style={{color: '#ff4d4f', marginLeft: '20px'}}> + 绂佺敤 + <StopOutlined style={{marginLeft: '5px'}} /> + </span> : + <span style={{color: '#26C281', marginLeft: '20px'}}> + 鍚敤 + <CheckCircleOutlined style={{marginLeft: '5px'}}/> + </span>} + </div> + </div> + <div style={{textAlign: 'right'}}> + <span className="operation-btn" onClick={() => this.handleStatus(item)} style={{color: '#8E44AD'}}><SwapOutlined /></span> + <Popconfirm + overlayClassName="popover-confirm" + title={this.props.dict['model.query.delete']} + onConfirm={() => this.deleteScript(item) + }> + <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span> + </Popconfirm> + </div> + </div> + ) + })} + </div> + <div className="script-button"> + <Button onClick={this.triggerConfirm} loading={this.state.loading} className="mk-green" style={{marginBottom: 15, marginLeft: 40}}> + {script ? '淇濆瓨' : '娣诲姞'} + </Button> + <Button onClick={() => {this.setState({script: null, scriptValue: ''})}} style={{marginBottom: 15, marginLeft: 10}}> + 鍙栨秷 + </Button> + </div> + <CodeMirror value={scriptValue} onChange={(val) => {this.setState({scriptValue: val})}}></CodeMirror> + </Modal> </div> ) } } -export default Form.create()(VerifyCard) \ No newline at end of file +export default VerifyCard \ No newline at end of file -- Gitblit v1.8.0