From d0764c7facff9abf00af6f3ff06a26260d1d8770 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 五月 2025 16:34:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/index.jsx | 678 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 492 insertions(+), 186 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 9d84902..b83a387 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -1,14 +1,13 @@
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 { StopOutlined, CheckCircleOutlined, EditOutlined, SwapOutlined, DeleteOutlined, CopyOutlined, BorderOutlined, SnippetsOutlined } from '@ant-design/icons'
+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'
-import md5 from 'md5'
import Api from '@/api'
import Utils from '@/utils/utils.js'
-
+import { formatSearch, joinMainSearchkey } from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
import ColForm from './columnform'
import CustomScriptsForm from './customscript'
@@ -22,7 +21,9 @@
const { TabPane } = Tabs
const { Paragraph } = Typography
const { Search } = Input
+const { confirm } = Modal
+const ExcelOut = asyncComponent(() => import('./excelout'))
const CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror'))
const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
@@ -39,24 +40,30 @@
subColumns: [],
activeKey: 'setting',
loading: false,
+ skip: false,
+ colLoading: false,
searchKey: '',
- initsql: '', // sql楠岃瘉鏃跺彉閲忓０鏄庡強璧嬪��
usefulfields: '',
- defaultsql: '', // 榛樿Sql
- defaultSearch: '',
+ defaultsql: '',
systemScripts: [],
median: {},
visible: false,
+ editLineId: '',
pvisible: false,
reload: false,
script: null,
+ oriConfig: null,
scriptValue: '',
+ cols: null,
+ hasMainSearch: false,
colColumns: [
{
title: '鍚嶇О',
dataIndex: 'label',
inputType: 'input',
editable: true,
+ searchable: true,
+ copy: true,
width: '28%'
},
{
@@ -66,6 +73,7 @@
editable: true,
unique: true,
strict: true,
+ searchable: true,
copy: true,
rules: [{
pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
@@ -86,6 +94,7 @@
{ value: 'Nvarchar(512)', text: 'Nvarchar(512)' },
{ value: 'Nvarchar(1024)', text: 'Nvarchar(1024)' },
{ value: 'Nvarchar(2048)', text: 'Nvarchar(2048)' },
+ { value: 'Nvarchar(4000)', text: 'Nvarchar(4000)' },
{ value: 'Nvarchar(max)', text: 'Nvarchar(max)' },
{ value: 'Int', text: 'Int' },
{ value: 'Decimal(18,0)', text: 'Decimal(18,0)' },
@@ -111,6 +120,7 @@
{ value: 'datetime', text: 'datetime' },
],
editable: true,
+ copy: true,
width: '25%',
}
],
@@ -178,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锛屾墍鏈夊瓧娈典笉瑕佺敤..鏉ョ渷鐣ワ紝涓嶈澧炲姞杩囧鐨勫洖杞︽敼鍙樺師鏈夋牸寮忥紝杩欐牱浼氬奖鍝嶄唬鐮佺殑鍙鎬э紝濡傛灉浠ｇ爜澶暱涓�鏉″洖澶嶄笉瀹岋紝灏卞洖澶嶅鏉′俊鎭畬鎴怽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>)
}
]
@@ -195,28 +220,46 @@
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$`)
- })
- })
- }
+ // 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 : ''
let columns = config.columns ? fromJS(config.columns).toJS() : []
let subColumns = config.subColumns ? fromJS(config.subColumns).toJS() : []
- columns.reverse()
+ if (!config.fixedCol) {
+ columns.reverse()
+ }
subColumns.reverse()
+
+ columns.forEach(col => {
+ if (!col.datatype) return
+ if (/^nvarchar/.test(col.datatype)) {
+ col.datatype = col.datatype.replace(/^nvarchar/, 'Nvarchar')
+ } else if (/^decimal/.test(col.datatype)) {
+ col.datatype = col.datatype.replace(/^decimal/, 'Decimal')
+ } else if (/^int/.test(col.datatype)) {
+ col.datatype = col.datatype.replace(/^int/, 'Int')
+ }
+ })
+ subColumns.forEach(col => {
+ if (!col.datatype) return
+ if (/^nvarchar/.test(col.datatype)) {
+ col.datatype = col.datatype.replace(/^nvarchar/, 'Nvarchar')
+ } else if (/^decimal/.test(col.datatype)) {
+ col.datatype = col.datatype.replace(/^decimal/, 'Decimal')
+ } else if (/^int/.test(col.datatype)) {
+ col.datatype = col.datatype.replace(/^int/, 'Int')
+ }
+ })
this.setState({
scripts,
@@ -224,10 +267,16 @@
subColumns: subColumns,
setting: _setting,
median: _setting,
- searches: search,
- defaultSearch: _search,
+ searches: formatSearch(search),
searchKey: '',
- debugId: _setting.debugId || ''
+ debugId: _setting.debugId || '',
+ hasMainSearch: mainSearch && mainSearch.length > 0,
+ oriConfig: fromJS({
+ scripts,
+ columns: columns,
+ subColumns: subColumns,
+ setting: _setting
+ }).toJS()
})
this.getsysScript()
@@ -243,18 +292,18 @@
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)
+ _scriptSql = Utils.formatOptions(_scriptSql, 'x')
let _sParam = {
func: 'sPC_Get_SelectedList',
LText: _scriptSql,
obj_name: 'data',
- arr_field: 'funcname,longparam'
+ arr_field: 'funcname,longparam',
+ exec_type: 'x'
}
_sParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)
-
+ _sParam.secretkey = Utils.encrypt('', _sParam.timestamp)
_sParam.open_key = Utils.encryptOpenKey(_sParam.secretkey, _sParam.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getCloudConfig(_sParam).then(res => {
@@ -372,6 +421,7 @@
if (values.uuid) {
scripts = scripts.map(item => {
if (item.uuid === values.uuid) {
+ values.$index = item.$index || ''
return values
} else {
return item
@@ -382,7 +432,7 @@
}
return new Promise((resolve, reject) => {
- this.sqlverify(resolve, reject, false, scripts)
+ this.sqlverify(resolve, reject, 'script', scripts)
})
}
@@ -423,15 +473,8 @@
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,
+ searches: formatSearch(search),
setting: res
}, () => {
this.sqlverify(() => { // 楠岃瘉鎴愬姛
@@ -446,7 +489,7 @@
loading: false
})
this.getdefaultSql()
- }, true)
+ }, 'change')
})
}, () => {
this.setState({loading: false})
@@ -510,9 +553,11 @@
}
getdefaultSql = () => {
- const { columns, setting, defaultSearch } = this.state
+ const { columns, setting, searches } = this.state
let defaultsql = ''
let arr_field = columns.map(col => col.field).join(',')
+
+ let _search = joinMainSearchkey(searches)
if (setting.dataresource) {
let _dataresource = setting.dataresource
@@ -521,64 +566,15 @@
_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`
+ defaultsql = `select top @pageSize@ ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by @orderBy@) as rows from ${_dataresource} ${_search}) 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, subColumns, scripts } = this.state
+ const { activeKey, setting, columns, subColumns, scripts, cols, median, searches } = this.state
if (config.subtype === 'dualdatacard') {
let arr = columns.map(col => col.field.toLowerCase())
@@ -597,6 +593,42 @@
})
return Promise.reject()
}
+ } else if (config.subtype === 'editable') {
+ let _arr = []
+ columns.forEach(col => {
+ let key = col.field.toLowerCase()
+ if (['jskey', 'data_type', 'bid'].includes(key)) {
+ _arr.push(col.field)
+ }
+ })
+
+ if (_arr.length > 0) {
+ notification.warning({
+ top: 92,
+ message: '瀛楁闆嗕腑涓嶅彲浣跨敤' + _arr.join('銆�') + '锛佹敞锛氭瀛楁涓烘彁浜ゆ椂鐨勭郴缁熷瓧娈点��',
+ duration: 5
+ })
+ return Promise.reject()
+ }
+ }
+
+ if (median.interType === 'system') {
+ let _loading = false
+ if (this.scriptsForm && this.scriptsForm.state.editItem) {
+ _loading = true
+ } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
+ _loading = true
+ }
+
+ if (_loading) {
+ notification.warning({
+ top: 92,
+ message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
+ duration: 5
+ })
+ this.setState({activeKey: 'scripts'})
+ return Promise.reject()
+ }
}
return new Promise((resolve, reject) => {
@@ -607,19 +639,13 @@
if (res.useMSearch === 'true') { // 浣跨敤涓绘悳绱㈡潯浠�
search = [...search, ...mainSearch]
}
-
- let _search = this.formatSearch(search)
- _search = Utils.joinMainSearchkey(_search)
-
- _search = _search.replace(/@\$@/ig, '')
- _search = _search ? 'where ' + _search : ''
+ let _searches = formatSearch(search)
this.setState({
- searches: search,
- defaultSearch: _search,
+ searches: _searches,
setting: res
}, () => {
- this.sqlverify(() => { resolve({setting: res, columns, subColumns, scripts }) }, reject, false)
+ this.sqlverify(() => { resolve({setting: res, columns, subColumns, scripts, cols, searches: _searches }) }, reject, 'submit')
})
}, () => {
reject()
@@ -634,7 +660,7 @@
reject()
return
}
- this.sqlverify(() => { resolve({setting, columns, subColumns, scripts }) }, reject, false)
+ this.sqlverify(() => { resolve({setting, columns, subColumns, scripts, cols, searches }) }, reject, 'submit')
} else if (activeKey === 'subcolumns') {
if (this.subdatasource && this.subdatasource.state.editingKey) {
notification.warning({
@@ -645,40 +671,49 @@
reject()
return
}
- this.sqlverify(() => { resolve({setting, columns, subColumns, scripts }) }, reject, false)
+ this.sqlverify(() => { resolve({setting, columns, subColumns, scripts, cols, searches }) }, reject, 'submit')
} 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') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
- _loading = true
- }
-
- if (_loading) {
- notification.warning({
- top: 92,
- message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
- duration: 5
- })
- reject()
- return
- }
-
- this.sqlverify(() => { resolve({setting, columns, subColumns, scripts }) }, reject, false)
+ this.sqlverify(() => { resolve({setting, columns, subColumns, scripts, cols, searches }) }, reject, 'submit')
}
})
}
- sqlverify = (resolve, reject, change = false, testScripts) => {
+ closeDataSource = (callback) => {
+ const { setting, columns, subColumns, scripts, oriConfig } = this.state
+
+ let line = scripts.map(item => item.sql).join('')
+ line += columns.map(item => item.field + item.datatype).join('')
+ line += subColumns.map(item => item.field + item.datatype).join('')
+ line += setting.interType + (setting.dataresource || '') + (setting.order || '') + (setting.primaryKey || '')
+
+ let _line = oriConfig.scripts.map(item => item.sql).join('')
+ _line += oriConfig.columns.map(item => item.field + item.datatype).join('')
+ _line += oriConfig.subColumns.map(item => item.field + item.datatype).join('')
+ _line += oriConfig.setting.interType + (oriConfig.setting.dataresource || '') + (oriConfig.setting.order || '') + (oriConfig.setting.primaryKey || '')
+
+ if (line !== _line) {
+ confirm({
+ content: '鏁版嵁婧愬凡淇敼锛岀‘瀹氬彇娑堝悧锛�',
+ onOk() {
+ callback()
+ },
+ onCancel() {}
+ })
+ } else {
+ callback()
+ }
+ }
+
+ sqlverify = (resolve, reject, type, testScripts) => {
const { config } = this.props
- const { columns, setting, scripts, searches, defaultSearch, debugId } = this.state
+ const { columns, setting, scripts, searches, debugId, subColumns } = this.state
let _scripts = scripts.filter(item => item.status !== 'false')
if (testScripts) {
_scripts = testScripts.filter(item => item.status !== 'false')
}
- if (!change && setting.interType === 'system' && setting.execute === 'false' && _scripts.length === 0) {
+ if (type !== 'change' && setting.interType === 'system' && setting.execute === 'false' && _scripts.length === 0) {
notification.warning({
top: 92,
message: '涓嶆墽琛岄粯璁ql鏃讹紝璇锋坊鍔犺嚜瀹氫箟鑴氭湰锛�',
@@ -688,18 +723,69 @@
return
}
- if (change && columns.length === 0) {
+ 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
}
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, config.type, '2023-04-20 15:29:37')
+ let _columns = columns
+ if (config.subtype === 'dualdatacard' && setting.subdata !== 'sub_data_string') {
+ _columns = [...columns, ...subColumns]
+ }
- let _debugId = md5(r.sql)
+ let r = SettingUtils.getDebugSql(setting, _scripts, _columns, searches, config.subtype, config.hasExtend)
- if (debugId === _debugId) {
+ 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') {
+ 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()
+ }
+ })
+ return
+ } else {
+ notification.warning({
+ top: 92,
+ message: '鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤鑷畾涔夊垎椤垫帓搴忔椂锛岃鍦ㄦ樉绀哄垪涓坊鍔� mk_total銆�',
+ duration: 5
+ })
+ }
+ }
+
+ if (debugId === r.debugId) {
resolve()
return
}
@@ -712,52 +798,82 @@
})
}
- let param = {
- func: 's_debug_sql',
- exec_type: 'y',
- LText: r.sql
- }
- param.LText = Utils.formatOptions(param.LText)
- param.timestamp = timestamp
- param.secretkey = Utils.encrypt('', timestamp)
+ Api.sDebug(r.sql).then(result => {
+ if (result.status || result.ErrCode === '-2') {
+ this.setState({debugId: r.debugId}, () => {
+ resolve()
+ })
+ } else {
+ if (/鍒楀悕\s*'[a-zA-Z0-9_-]+'\s*鏃犳晥/.test(result.message)) {
+ let tail = ''
+ let type = ''
+ if (setting.execute !== 'false' && setting.queryType !== 'statistics') {
+ searches.forEach(item => {
+ if (item.forbid) return
+ item.key.split(',').forEach(field => {
+ if (new RegExp(`'${field}'`).test(result.message)) {
+ tail = field
+ type = '鎼滅储鏉′欢'
+ }
+ })
+ })
+ }
- 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.genericInterface(param).then(result => {
- if (result.status) {
- if (sumParam) {
- Api.genericInterface(sumParam).then(res => {
- if (res.status) {
- this.setState({debugId: _debugId}, () => {
- resolve()
+ if (!tail && setting.order) {
+ let keys = setting.order.replace(/\s+(asc|desc)/ig, '').replace(/\s+/g, '')
+ keys.split(',').forEach(field => {
+ if (new RegExp(`'${field}'`).test(result.message)) {
+ tail = field
+ type = '鎺掑簭'
+ }
+ })
+ }
+
+ if (!tail) {
+ columns.forEach(item => {
+ if (new RegExp(`'${item.field}'`).test(result.message)) {
+ tail = item.field
+ if (config.subtype === 'basetable') {
+ type = '鏄剧ず鍒�'
+ } else {
+ type = '瀛楁闆�'
+ }
+ }
+ })
+ if (!tail && config.subtype === 'dualdatacard') {
+ subColumns.forEach(item => {
+ if (new RegExp(`'${item.field}'`).test(result.message)) {
+ tail = item.field
+ type = '瀛愯〃瀛楁闆�'
+ }
})
- } else {
+ }
+ }
+
+ if (tail) {
+ result.message = result.message.replace(/ROLLBACK TRANSACTION 璇锋眰娌℃湁瀵瑰簲鐨� BEGIN TRANSACTION銆�/, '')
+ result.message = <>{result.message}<span style={{color: 'red'}}>娉細{type}涓瓨鍦ㄥ瓧娈祘tail}</span></>
+ }
+ }
+ if (type === 'submit') {
+ Modal.confirm({
+ title: result.message,
+ okText: '鐭ラ亾浜�',
+ cancelText: '寮哄埗淇濆瓨',
+ onOk: () => {
reject()
- Modal.error({
- title: res.message
- })
+ },
+ onCancel() {
+ resolve()
}
})
} else {
- this.setState({debugId: _debugId}, () => {
- resolve()
+ reject()
+ Modal.error({
+ title: result.message,
+ okText: '鐭ラ亾浜�'
})
}
- } else {
- reject()
- Modal.error({
- title: result.message
- })
}
})
} else {
@@ -766,7 +882,7 @@
}
triggerConfirm = () => {
- const { script, scriptValue, scripts } = this.state
+ const { script, scriptValue, scripts, skip } = this.state
let _scripts = fromJS(scripts).toJS()
if (!scriptValue) {
@@ -778,7 +894,9 @@
return
}
+ let editLineId = ''
if (script) {
+ editLineId = script.uuid
_scripts = _scripts.map(item => {
if (script.uuid === item.uuid) {
item.sql = scriptValue
@@ -793,12 +911,17 @@
status: 'true'
}
+ editLineId = _script.uuid
_scripts.push(_script)
}
- this.setState({loading: true})
+ 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})}, false, _scripts)
+ this.sqlverify(() => {this.setState({scripts: _scripts, script: null, scriptValue: '', loading: false})}, () => {this.setState({loading: false})}, 'script', _scripts)
+ }
}
updatefields = (columns) => {
@@ -923,18 +1046,89 @@
}
copyColumns = () => {
- const { columns } = this.state
+ const { config } = this.props
+ const { columns, subColumns, setting } = this.state
+
+ let _columns = columns
let m = []
let n = []
+ let s = []
- columns.forEach(col => {
- m.push(`${col.field} ${col.datatype}`)
- n.push(col.field)
+ if (subColumns && subColumns.length) {
+ _columns = [...columns, ...subColumns]
+ }
+
+ _columns.forEach(col => {
+ m.unshift(`${col.field} ${col.datatype}`)
+ n.unshift(col.field)
+ if (/decimal|int/ig.test(col.datatype)) {
+ s.unshift(`${Math.round(Math.random() * 10)} as ${col.field}`)
+ } else if (/datetime/.test(col.datatype)) {
+ s.unshift(`'${moment().format('YYYY-MM-DD HH:mm:ss')}' as ${col.field}`)
+ } else if (/date/.test(col.datatype)) {
+ s.unshift(`'${moment().format('YYYY-MM-DD')}' as ${col.field}`)
+ } else {
+ s.unshift(`'${col.label}' as ${col.field}`)
+ }
})
+ if (window.debugger) {
+ window.mkInfo('select ' + s.join(', '))
+ }
+
+ let extend = ''
+ if (config.hasExtend) {
+ extend = []
+ let mapCol = (cols) => {
+ cols.forEach(col => {
+ if (col.type === 'extend') {
+ let datatype = 'Nvarchar(50)'
+ _columns.forEach(c => {
+ if (c.field === col.field) {
+ datatype = c.datatype
+ }
+ })
+ for (let i = 1; i < col.quota; i++) {
+ extend.push(`${col.field}${i} ${datatype}`)
+ }
+ } else if (col.type === 'colspan' && col.subcols) {
+ mapCol(col.subcols)
+ }
+ })
+ }
+ mapCol(config.cols)
+ extend = `
+ /* 鎵╁睍鍒楀瓧娈� */
+ /* ${extend.join(',')} */
+ `
+ }
+
let oInput = document.createElement('input')
- oInput.value = `/*${m.join(',')}*/
- ${n.join(',')}`
+ oInput.value = `create table #${setting.tableName || 'tb'}
+ (${m.join(',')},sort_id INT IDENTITY(1,1))
+ insert into #${setting.tableName || 'tb'}
+ (${n.join(',')})
+ select ${n.join(',')}
+ from ${setting.dataresource ? `(${setting.dataresource.replace(/\n/g, ' ')}) tb` : setting.tableName || 'tb'}
+ order by @orderBy@
+
+ declare @mk_total int
+ set @mk_total = 0
+
+ select @mk_total = count(1) from #${setting.tableName || 'tb'}
+ declare @pageIndex_top int
+ set @pageIndex_top=(@pageIndex@-1)*@pageSize@
+
+ if @mk_total > @pageIndex@*@pageSize@
+ delete #${setting.tableName || 'tb'} where sort_id > @pageIndex@*@pageSize@
+
+ if @pageIndex_top > 0
+ delete #${setting.tableName || 'tb'} where sort_id <= @pageIndex_top
+
+ 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()
document.execCommand('Copy')
@@ -964,6 +1158,94 @@
message.success('澶嶅埗鎴愬姛銆�')
}
+ addProcess = () => {
+ const { config } = this.props
+ const { columns } = this.state
+
+ let fields = []
+ let cols = []
+ let _cols = columns.map(item => item.field.toLowerCase())
+
+ if (!_cols.includes('remark_w')) {
+ fields.push({ uuid: Utils.getuuid(), label: '澶囨敞', field: 'remark_w', datatype: 'Nvarchar(50)', fieldlength: 50, type: 'text' })
+ cols.push({ uuid: Utils.getuuid(), Width: 120, label: '澶囨敞', field: 'remark_w', type: 'text', Hide: 'false', IsSort: 'false', fieldlength: 50 })
+ }
+ 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' })
+ cols.push({ uuid: Utils.getuuid(), Width: 120, label: '娴佺▼鍙傛暟', field: 'works_flow_param', type: 'text', Hide: 'true', IsSort: 'false', fieldlength: 512 })
+ }
+
+ if (fields.length === 0) return
+
+ const that = this
+
+ if (config.subtype !== 'basetable') {
+ cols = null
+ }
+
+ confirm({
+ content: cols ? '鏄剧ず鍒椾腑鏄惁娣诲姞宸ヤ綔娴佸瓧娈碉紵' : '瀛楁闆嗕腑鏄惁娣诲姞宸ヤ綔娴佸瓧娈碉紵',
+ onOk() {
+ that.setState({
+ cols: cols,
+ columns: [...fields, ...columns]
+ })
+ },
+ onCancel() {}
+ })
+ }
+
+ updateColumns = (tableName) => {
+ const { config } = this.props
+ const { colLoading, columns } = this.state
+
+ if (colLoading || columns.length > 0) return
+
+ if (config.subtype === 'basetable') return
+
+ let param = {func: 'sPC_Get_FieldName', TBName: tableName}
+ if (window.GLOB.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧�
+ param.rduri = window.GLOB.cloudServiceApi
+ param.userid = sessionStorage.getItem('CloudUserID') || ''
+ param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+ }
+
+ this.setState({colLoading: true})
+
+ Api.getSystemCacheConfig(param).then(result => {
+ this.setState({colLoading: false})
+ if (!result.status) return
+
+ let fields = []
+ result.FDName.forEach(item => {
+ if (item.f_type !== 0) return
+
+ if (/nvarchar|int|decimal/ig.test(item.FieldType) || item.FieldType === 'date' || item.FieldType === 'datetime') {
+ fields.unshift({
+ uuid: Utils.getuuid(),
+ label: item.FieldDec,
+ field: item.FieldName,
+ datatype: item.FieldType.toLowerCase()
+ })
+ }
+ })
+
+ if (fields.length === 0) return
+
+ this.setState({columns: fields})
+ }, () => {
+ this.setState({colLoading: false})
+ })
+ }
+
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
*/
@@ -975,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 } = 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">
@@ -993,11 +1275,14 @@
subColumns={subColumns}
setting={setting}
scripts={scripts}
+ hasMainSearch={hasMainSearch}
updateStatus={this.updateStatus}
+ updateColumns={this.updateColumns}
+ addProcess={this.addProcess}
wrappedComponentRef={(inst) => this.settingForm = inst}
/> : null}
</TabPane>
- {config.subtype !== 'basetable' ? <TabPane tab={
+ {!['basetable', 'invoice', 'invTable'].includes(config.subtype) ? <TabPane tab={
<span>
瀛楁闆�
{columns.length ? <span className="count-tip">{columns.length}</span> : null}
@@ -1009,8 +1294,18 @@
type="fields"
updatefield={this.updatefields}
/>
+ <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> : null}
+ </TabPane> : <TabPane tab={
+ <span>
+ 瀛楁闆�<TableOutlined style={{marginLeft: '5px', fontSize: '12px'}} />
+ {columns.length ? <span className="count-tip">{columns.length}</span> : null}
+ </span>
+ } key="columns">
+ <div className="base-table-columns"></div>
+ <ExcelOut data={columns} setting={setting}/>
+ <EditTable actions={[]} searchKey={searchKey} type="datasourcefield" data={columns} columns={colColumns}/>
+ </TabPane>}
{config.subtype === 'dualdatacard' ? <TabPane tab={
<span>
瀛愯〃瀛楁闆�
@@ -1023,14 +1318,15 @@
type="fields"
updatefield={this.updateSubfields}
/>
+ <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}
<TabPane tab={
<span>
鑷畾涔夎剼鏈�
{scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
- {config.type !== 'interface' && activeKey === 'setting' ? <CopyOutlined title="澶嶅埗鏁版嵁婧�" className="mk-copy-datasource" onClick={(e) => {e.stopPropagation();this.copyDatasource()}}/> : null}
- {config.type !== 'interface' && activeKey === 'setting' ? <SnippetsOutlined title="瀵煎叆鏁版嵁婧�" className="mk-paste-datasource" onClick={(e) => {e.stopPropagation();this.setState({pvisible: true})}}/> : null}
+ {activeKey === 'setting' ? <CopyOutlined title="澶嶅埗鏁版嵁婧�" className="mk-copy-datasource" onClick={(e) => {e.stopPropagation();this.copyDatasource()}}/> : null}
+ {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}
@@ -1045,18 +1341,18 @@
})
return
}
- this.setState({visible: true, script: null, scriptValue: ''})
+ this.setState({visible: true, skip: false, script: null, scriptValue: '', editLineId: ''})
}}/> : null}
<CustomScriptsForm
type={config.type}
+ hasExtend={config.hasExtend}
setting={setting}
searches={searches}
defaultsql={defaultsql}
- initsql={this.state.initsql}
- customScripts={scripts}
systemScripts={this.state.systemScripts}
scriptsChange={this.scriptsChange}
scriptSubmit={this.scriptSubmit}
+ addProcess={this.addProcess}
wrappedComponentRef={(inst) => this.scriptsForm = inst}
/>
<EditTable actions={['move']} data={scripts} columns={scriptsColumns} onChange={this.changeScripts}/>
@@ -1094,8 +1390,14 @@
</div>
)
} else {
+ let sign = ''
+ if (script && script.uuid === item.uuid) {
+ sign = 'active'
+ } else if (editLineId === item.uuid) {
+ sign = 'edited'
+ }
return (
- <div className={'script-item ' + (script && script.uuid === item.uuid ? 'active' : '') } key={item.uuid}>
+ <div className={'script-item ' + sign} key={item.uuid}>
<div style={{cursor: 'pointer'}} onClick={() => {
this.setState({script: item, scriptValue: item.sql})
}}>
@@ -1130,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