From 1a176e4bdba485301385caac1a29102e598d25cc Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 13 五月 2025 11:32:02 +0800 Subject: [PATCH] 2025-05-13 --- src/menu/datasource/verifycard/index.jsx | 115 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 75 insertions(+), 40 deletions(-) diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx index 500966b..b83a387 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, Input } from 'antd' +import { Form, Tabs, Popconfirm, notification, Modal, Typography, Spin, message, Button, Input, Switch } from 'antd' import { StopOutlined, CheckCircleOutlined, TableOutlined, EditOutlined, SwapOutlined, DeleteOutlined, CopyOutlined, BorderOutlined, SnippetsOutlined } from '@ant-design/icons' import moment from 'moment' @@ -40,6 +40,7 @@ subColumns: [], activeKey: 'setting', loading: false, + skip: false, colLoading: false, searchKey: '', usefulfields: '', @@ -54,6 +55,7 @@ oriConfig: null, scriptValue: '', cols: null, + hasMainSearch: false, colColumns: [ { title: '鍚嶇О', @@ -61,6 +63,7 @@ inputType: 'input', editable: true, searchable: true, + copy: true, width: '28%' }, { @@ -117,6 +120,7 @@ { value: 'datetime', text: 'datetime' }, ], editable: true, + copy: true, width: '25%', } ], @@ -184,6 +188,21 @@ }> <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span> </Popconfirm> + <span className="anticon operation-btn" style={{color: '#4D6BFE'}} onClick={() => { + if (record.sql) { + sessionStorage.setItem('deepseek_sql', `瀵逛互涓媠ql server鑴氭湰锛岀紪鍐欐敞閲婏紝涓嶈兘鐢�--锛屽彧鑳界敤/**/ 锛孈bid@鏄笂绾х粍浠秈d,@id@鏄綋鍓嶈鏁版嵁id锛孈userid@涓哄綋鍓嶇櫥褰曠敤鎴穒d锛屾墍鏈夊瓧娈典笉瑕佺敤..鏉ョ渷鐣ワ紝涓嶈澧炲姞杩囧鐨勫洖杞︽敼鍙樺師鏈夋牸寮忥紝杩欐牱浼氬奖鍝嶄唬鐮佺殑鍙鎬э紝濡傛灉浠g爜澶暱涓�鏉″洖澶嶄笉瀹岋紝灏卞洖澶嶅鏉′俊鎭畬鎴怽n${record.sql}`) + + window.open('#/ai') + + setTimeout(() => { + sessionStorage.removeItem('deepseek_sql') + }, 0) + } + }}> + <svg viewBox="0 0 1391 1024" width="20px" fill="currentColor"> + <path d="M1361.92 83.136c-14.272-7.04-20.416 6.272-28.736 12.992-2.816 2.24-5.248 5.12-7.68 7.68-20.8 22.336-45.056 36.864-76.8 35.136-46.464-2.56-86.08 12.032-121.152 47.616-7.552-43.904-32.256-70.08-69.888-86.912-19.712-8.768-39.68-17.472-53.376-36.48-9.664-13.44-12.288-28.48-17.216-43.264-3.008-8.96-6.08-18.112-16.32-19.712-11.2-1.728-15.552 7.68-19.968 15.424-17.536 32.128-24.32 67.52-23.68 103.296 1.6 80.448 35.52 144.576 103.04 190.144 7.68 5.312 9.6 10.56 7.168 18.176-4.608 15.68-10.048 30.976-14.912 46.592-3.072 10.112-7.68 12.352-18.304 8a308.224 308.224 0 0 1-97.28-66.176c-48-46.4-91.392-97.664-145.472-137.792a655.36 655.36 0 0 0-38.528-26.432c-55.232-53.76 7.232-97.792 21.632-103.04 15.104-5.376 5.312-24.128-43.52-23.936C652.032 24.704 607.36 41.024 550.4 62.72a156.8 156.8 0 0 1-26.048 7.68 542.016 542.016 0 0 0-161.408-5.696c-105.6 11.904-189.888 61.824-251.904 147.2C36.608 314.24 19.072 430.848 40.512 552.32c22.528 128 87.808 234.048 188.16 316.992 104 85.888 223.808 128 360.512 120 82.944-4.864 175.424-16 279.68-104.32 26.368 13.056 53.888 18.24 99.712 22.272 35.2 3.328 69.184-1.792 95.424-7.232 41.216-8.704 38.4-46.848 23.424-53.888-120.576-56.32-94.208-33.408-118.272-51.84 61.376-72.768 153.792-148.224 189.952-392.768 2.816-19.392 0.384-31.552 0-47.36-0.256-9.536 1.92-13.312 12.8-14.4a231.04 231.04 0 0 0 86.592-26.56c78.272-42.88 109.696-113.024 117.184-197.184 1.088-12.928-0.256-26.24-13.76-32.96z m-681.408 757.76c-116.928-92.096-173.696-122.368-197.12-120.96-21.888 1.152-17.984 26.304-13.184 42.624 5.12 16.128 11.648 27.328 20.8 41.408 6.464 9.408 10.752 23.424-6.272 33.92-37.76 23.424-103.232-7.872-106.24-9.472-76.288-44.8-140.032-104.192-184.96-185.344-43.264-78.08-68.48-161.92-72.576-251.328-1.152-21.632 5.184-29.312 26.688-33.152a265.6 265.6 0 0 1 85.696-2.24c119.296 17.472 220.928 71.04 306.048 155.52 48.768 48.32 85.504 105.92 123.392 162.176 40.256 59.776 83.648 116.672 138.88 163.392 19.392 16.32 35.072 28.8 49.92 37.952-44.928 5.056-119.872 6.08-171.008-34.496z m56.064-361.024a17.152 17.152 0 1 1 2.752 9.6 16.896 16.896 0 0 1-2.752-9.664z m174.08 89.472a102.72 102.72 0 0 1-33.024 8.96 70.528 70.528 0 0 1-44.736-14.272c-15.296-12.8-26.176-19.968-30.848-42.496a99.264 99.264 0 0 1 0.832-32.96c4.032-18.368-0.384-30.08-13.248-40.768-10.624-8.768-23.872-11.072-38.592-11.072a31.168 31.168 0 0 1-14.272-4.416c-6.144-3.072-11.136-10.752-6.336-20.16 1.536-3.008 8.96-10.304 10.752-11.712 19.84-11.328 42.88-7.68 64.192 0.896 19.712 8.064 34.56 22.848 56 43.776 21.952 25.28 25.792 32.384 38.4 51.328 9.856 14.848 18.816 30.208 24.96 47.616 3.776 10.88-1.152 19.776-14.08 25.28z"></path> + </svg> + </span> </div>) } ] @@ -251,6 +270,7 @@ searches: formatSearch(search), searchKey: '', debugId: _setting.debugId || '', + hasMainSearch: mainSearch && mainSearch.length > 0, oriConfig: fromJS({ scripts, columns: columns, @@ -703,6 +723,16 @@ return } + if (type === 'submit' && config.subtype === 'dualdatacard' && setting.subdata === 'sub_data_string' && !columns.find(col => col.field === 'sub_data_string')) { + notification.warning({ + top: 92, + message: '涓昏〃瀛楁闆嗕腑闇�娣诲姞 sub_data_string 瀛楁锛�', + duration: 5 + }) + reject() + return + } + if (type === 'change' && columns.length === 0) { reject() return @@ -710,18 +740,38 @@ if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) { let _columns = columns - if (config.subtype === 'dualdatacard') { + if (config.subtype === 'dualdatacard' && setting.subdata !== 'sub_data_string') { _columns = [...columns, ...subColumns] } let r = SettingUtils.getDebugSql(setting, _scripts, _columns, searches, config.subtype, config.hasExtend) + if (type === 'submit' && r.custompage && setting.queryType !== 'statistics') { + Modal.info({ + title: '鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤浜嗚嚜瀹氫箟鍒嗛〉锛屾煡璇㈢被鍨嬭浣跨敤缁熻锛�', + }) + reject() + return + } if (r.custompage && setting.laypage === 'true' && _columns.findIndex(col => col.field === 'mk_total') === -1) { if (config.subtype !== 'basetable') { - Modal.warning({ - title: `鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤鑷畾涔夊垎椤垫帓搴忔椂锛岃鍦ㄥ瓧娈甸泦涓坊鍔� mk_total銆俙, + const that = this + Modal.confirm({ + title: `鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤鑷畾涔夊垎椤垫帓搴忔椂锛屽瓧娈甸泦涓渶瑕佹坊鍔� mk_total銆俙, okText: '鐭ラ亾浜�', + cancelText: '娣诲姞', onOk: () => { + reject() + }, + onCancel() { + let item = { + field: 'mk_total', + label: 'mk_total', + datatype: 'Int', + uuid: Utils.getuuid() + } + + that.setState({ columns: [item, ...columns] }) reject() } }) @@ -832,7 +882,7 @@ } triggerConfirm = () => { - const { script, scriptValue, scripts } = this.state + const { script, scriptValue, scripts, skip } = this.state let _scripts = fromJS(scripts).toJS() if (!scriptValue) { @@ -865,9 +915,13 @@ _scripts.push(_script) } - this.setState({loading: true, editLineId}) + if (skip) { + this.setState({scripts: _scripts, script: null, scriptValue: '', editLineId}) + } else { + this.setState({loading: true, editLineId}) - this.sqlverify(() => {this.setState({scripts: _scripts, script: null, scriptValue: '', loading: false})}, () => {this.setState({loading: false})}, 'script', _scripts) + this.sqlverify(() => {this.setState({scripts: _scripts, script: null, scriptValue: '', loading: false})}, () => {this.setState({loading: false})}, 'script', _scripts) + } } updatefields = (columns) => { @@ -1071,7 +1125,9 @@ if @pageIndex_top > 0 delete #${setting.tableName || 'tb'} where sort_id <= @pageIndex_top - drop table #${setting.tableName || 'tb'}${extend}` + drop table #${setting.tableName || 'tb'}${extend} + + select top 99999 @mk_total as mk_total, * from #${setting.tableName || 'tb'} order by sort_id` document.body.appendChild(oInput) oInput.select() @@ -1117,6 +1173,10 @@ if (!_cols.includes('statusname_w')) { fields.push({ uuid: Utils.getuuid(), label: '鐘舵��', field: 'statusname_w', datatype: 'Nvarchar(50)', fieldlength: 50, type: 'text' }) cols.push({ uuid: Utils.getuuid(), Width: 120, label: '鐘舵��', field: 'statusname_w', type: 'text', Hide: 'false', IsSort: 'false', fieldlength: 50 }) + } + if (!_cols.includes('works_flow_detail_id')) { + fields.push({ uuid: Utils.getuuid(), label: '娴佺▼鑺傜偣ID', field: 'works_flow_detail_id', datatype: 'Nvarchar(50)', fieldlength: 50, type: 'text' }) + cols.push({ uuid: Utils.getuuid(), Width: 120, label: '娴佺▼鑺傜偣ID', field: 'works_flow_detail_id', type: 'text', Hide: 'false', IsSort: 'false', fieldlength: 50 }) } if (!_cols.includes('works_flow_param')) { fields.push({ uuid: Utils.getuuid(), label: '娴佺▼鍙傛暟', field: 'works_flow_param', datatype: 'Nvarchar(512)', fieldlength: 512, type: 'text' }) @@ -1186,33 +1246,6 @@ }) } - tolowercase = (type) => { - const that = this - confirm({ - content: type === 'sub' ? '纭畾灏嗗瓙琛ㄥ瓧娈佃浆涓哄皬鍐欏悧锛�' : '纭畾灏嗗瓧娈佃浆涓哄皬鍐欏悧锛�', - onOk() { - that.execlowercase(type) - }, - onCancel() {} - }) - } - - execlowercase = (type) => { - const { subColumns, columns } = this.state - - if (type === 'sub') { - this.setState({subColumns: fromJS(subColumns).toJS().map(col => { - col.field = col.field.toLowerCase() - return col - })}) - } else { - this.setState({columns: fromJS(columns).toJS().map(col => { - col.field = col.field.toLowerCase() - return col - })}) - } - } - /** * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊 */ @@ -1224,7 +1257,7 @@ render() { const { config } = this.props - const { columns, subColumns, median, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue, searchKey, editLineId } = this.state + const { columns, subColumns, median, skip, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue, searchKey, editLineId, hasMainSearch } = this.state return ( <div className="model-data-source-wrap"> @@ -1242,6 +1275,7 @@ subColumns={subColumns} setting={setting} scripts={scripts} + hasMainSearch={hasMainSearch} updateStatus={this.updateStatus} updateColumns={this.updateColumns} addProcess={this.addProcess} @@ -1260,7 +1294,6 @@ type="fields" updatefield={this.updatefields} /> - <SwapOutlined className="columns-lowercase" title="杞皬鍐�" onClick={() => this.tolowercase()}/> <ExcelOut data={columns} setting={setting}/> <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> : <TabPane tab={ @@ -1285,7 +1318,6 @@ type="fields" updatefield={this.updateSubfields} /> - <SwapOutlined className="columns-lowercase" title="杞皬鍐�" onClick={() => this.tolowercase('sub')}/> <ExcelOut data={subColumns} setting={setting}/> <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} @@ -1309,7 +1341,7 @@ }) return } - this.setState({visible: true, script: null, scriptValue: '', editLineId: ''}) + this.setState({visible: true, skip: false, script: null, scriptValue: '', editLineId: ''}) }}/> : null} <CustomScriptsForm type={config.type} @@ -1317,7 +1349,6 @@ setting={setting} searches={searches} defaultsql={defaultsql} - customScripts={scripts} systemScripts={this.state.systemScripts} scriptsChange={this.scriptsChange} scriptSubmit={this.scriptSubmit} @@ -1401,6 +1432,10 @@ <Button onClick={() => {this.setState({script: null, scriptValue: ''})}} style={{marginBottom: 15, marginLeft: 10}}> 鍙栨秷 </Button> + <span style={{paddingLeft: '20px', fontSize: '12px'}}> + 寮哄埗淇濆瓨锛� + <Switch checked={skip} size="small" onChange={() => this.setState({skip: !skip})}/> + </span> </div> <CodeMirror value={scriptValue} onChange={(val) => {this.setState({scriptValue: val})}}></CodeMirror> </Modal> -- Gitblit v1.8.0