From 46773828b8c46e450a67eb1fc5e6124d87d97ab6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 23 九月 2023 19:51:11 +0800
Subject: [PATCH] 2023-09-23
---
src/menu/datasource/verifycard/settingform/index.scss | 29
src/menu/debug/index.scss | 109 ++
src/menu/datasource/verifycard/utils.jsx | 7
src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx | 25
src/menu/datasource/verifycard/customscript/index.jsx | 19
src/utils/utils-custom.js | 2
src/templates/zshare/verifycard/customscript/index.jsx | 62 +
src/menu/datasource/index.jsx | 16
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 2
src/tabviews/custom/popview/index.jsx | 2
src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx | 1
src/tabviews/basetable/index.jsx | 1
src/templates/sharecomponent/tablecomponent/index.jsx | 2
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 1
src/views/mobdesign/index.jsx | 2
src/templates/sharecomponent/settingcomponent/settingform/utils.jsx | 9
src/views/menudesign/index.jsx | 2
src/menu/datasource/verifycard/index.jsx | 54 +
src/utils/utils.js | 129 ++
src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx | 1
src/views/pcdesign/index.jsx | 2
src/menu/datasource/verifycard/settingform/index.jsx | 76 +
src/tabviews/custom/components/chart/antv-X6/index.jsx | 64 +
src/tabviews/custom/index.jsx | 2
src/menu/debug/index.jsx | 1997 +++++++++++++++++++++++++++++++++++++++++---
src/menu/components/table/normal-table/index.jsx | 2
26 files changed, 2,377 insertions(+), 241 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index 613f54c..4b011c7 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -381,7 +381,7 @@
} trigger="hover">
<ToolOutlined />
</Popover>
- <SearchComponent config={card} updatesearch={this.updateComponent}/>
+ {appType !== 'mob' ? <SearchComponent config={card} updatesearch={this.updateComponent}/> : null}
<ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
<ColumnComponent config={card} updatecolumn={this.updateComponent}/>
<div className="component-name">
diff --git a/src/menu/datasource/index.jsx b/src/menu/datasource/index.jsx
index eda176e..759e84e 100644
--- a/src/menu/datasource/index.jsx
+++ b/src/menu/datasource/index.jsx
@@ -6,6 +6,7 @@
import VerifyCard from './verifycard'
import CreateFunc from '@/templates/zshare/createfunc'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
class DataSource extends Component {
@@ -146,6 +147,14 @@
res.setting.supModule = ['empty']
}
+ if (!res.setting.primaryKey && res.columns && res.columns.length > 0) {
+ res.columns.forEach(col => {
+ if (col.field.toLowerCase() === 'id') {
+ res.setting.primaryKey = col.field
+ }
+ })
+ }
+
if (res.columns) {
res.columns = res.columns.map(item => {
@@ -226,8 +235,13 @@
} else {
delete res.cols
}
-
this.props.updateConfig({...config, ...res})
+
+ if (res.setting && res.setting.tableName && config.setting && !config.setting.tableName) {
+ setTimeout(() => {
+ MKEmitter.emit('publicTableChange', res.setting.tableName, 'init')
+ }, 150)
+ }
}, () => {
this.setState({loading: false})
})
diff --git a/src/menu/datasource/verifycard/customscript/index.jsx b/src/menu/datasource/verifycard/customscript/index.jsx
index aee86c2..adb3ad7 100644
--- a/src/menu/datasource/verifycard/customscript/index.jsx
+++ b/src/menu/datasource/verifycard/customscript/index.jsx
@@ -197,6 +197,8 @@
}
selectScript = (value, option) => {
+ const { setting } = this.props
+
let _sql = this.props.form.getFieldValue('sql')
if (_sql === ' ') {
_sql = ''
@@ -208,8 +210,17 @@
if (value === 'defaultsql') {
value = this.props.defaultsql
- } else if (value === 'flowsql') {
- value = `/* select a.*,w.remark as remark_w,w.statusname as statusname_w,w.status as status_w,w.works_flow_param from (鏁版嵁婧�) a inner join (select * from s_my_works_flow where works_flow_code=@works_flow_code@ and status=0 and deleted=0) w on a.id=w.works_flow_id */`
+ } else if (value === 'flowstart') {
+ value = `/* select a.*, w.remark as remark_w, w.statusname as statusname_w,w.status as status_w,w.works_flow_param,w.modifydate as modifydate_w from (select * from ${setting.tableName} where status=0 and deleted=0 $@ and createuserid=@userid@ @$) a
+ inner join (select * from s_my_works_flow where works_flow_code=@works_flow_code@ and status=0 and deleted=0) w on a.id=w.works_flow_id */`
+ this.props.addProcess()
+ } else if (value === 'flowcheck') {
+ value = `/* select a.*, w.remark as remark_w, w.statusname as statusname_w,w.status as status_w,w.works_flow_param,w.modifydate as modifydate_w
+ from (select * from ${setting.tableName} where status=0 and deleted=0 ) a
+ inner join (select * from s_my_works_flow where works_flow_code=@works_flow_code@ and status>0 and status<888 and deleted=0) w
+ on a.id=w.works_flow_id
+ $@ inner join (select works_flow_id from s_my_works_flow_role where userid=@userid@ and works_flow_code=@works_flow_code@ and deleted=0 ) r
+ on r.works_flow_id=w.works_flow_id @$ */`
this.props.addProcess()
}
@@ -305,6 +316,7 @@
<Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'绯荤粺鍙橀噺锛岀郴缁熶細瀹氫箟鍙橀噺骞惰祴鍊笺��'}><span style={{color: '#fa8c16'}}>UserName, FullName, RoleID, mk_departmentcode, mk_organization, mk_user_type, mk_nation, mk_province, mk_city, mk_district, mk_address</span></Tooltip>,
<Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鎺掑簭銆佸垎椤典互鍙婃悳绱㈡潯浠跺彉閲忥紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆備娇鐢ˊpageSize@鎴朄orderBy@浠ｈ〃鑷畾涔夊垎椤碉紝鎬绘暟璇蜂互mk_total杩斿洖銆�'}>orderBy, pageSize, pageIndex{usefulFields ? ', ' + usefulFields : ''}{type === 'calendar' ? ', mk_year' : ''}</Tooltip>
<Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'url鍙橀噺锛岃鎸夌収@xxx@鏍煎紡浣跨敤銆�'}>{urlFields ? ', ' : ''}<span style={{color: '#13c2c2'}}>{urlFields}</span></Tooltip>
+ {window.GLOB.process ? <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'宸ヤ綔娴佸彉閲忥紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆�'}>, <span style={{color: 'purple'}}>works_flow_code</span></Tooltip> : null}
</Form.Item>
</Col>
<Col span={8} style={{whiteSpace: 'nowrap'}}>
@@ -332,7 +344,8 @@
onSelect={this.selectScript}
>
<Select.Option style={{whiteSpace: 'normal'}} key="default" value="defaultsql">榛樿sql</Select.Option>
- {window.GLOB.process ? <Select.Option style={{whiteSpace: 'normal'}} key="default" value="flowsql">榛樿sql锛堝伐浣滄祦锛�</Select.Option> : null}
+ {window.GLOB.process ? <Select.Option style={{whiteSpace: 'normal'}} key="flowstart" value="flowstart">榛樿sql锛堝伐浣滄祦-鍙戣捣锛�</Select.Option> : null}
+ {window.GLOB.process ? <Select.Option style={{whiteSpace: 'normal'}} key="flowcheck" value="flowcheck">榛樿sql锛堝伐浣滄祦-瀹℃牳锛�</Select.Option> : null}
<Select.Option key="debugger" value={`z_debug: select @ErrorCode='E',@retmsg='娴嬭瘯鏂偣' goto aaa`}>
娴嬭瘯鏂偣
</Select.Option>
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 97016ce..9554a5b 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -40,6 +40,7 @@
subColumns: [],
activeKey: 'setting',
loading: false,
+ colLoading: false,
searchKey: '',
initsql: '', // sql楠岃瘉鏃跺彉閲忓０鏄庡強璧嬪��
usefulfields: '',
@@ -504,7 +505,6 @@
let arr_field = columns.map(col => col.field).join(',')
let _search = joinMainSearchkey(searches)
- _search = _search ? 'where ' + _search : ''
if (setting.dataresource) {
let _dataresource = setting.dataresource
@@ -607,7 +607,7 @@
sqlverify = (resolve, reject, type, testScripts) => {
const { config } = this.props
- const { columns, setting, scripts, searches, debugId } = this.state
+ const { columns, setting, scripts, searches, debugId, subColumns } = this.state
let _scripts = scripts.filter(item => item.status !== 'false')
@@ -630,7 +630,11 @@
}
if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
- let r = SettingUtils.getDebugSql(setting, _scripts, columns, searches, config.type)
+ let _columns = columns
+ if (config.subtype === 'dualdatacard') {
+ _columns = [...columns, ...subColumns]
+ }
+ let r = SettingUtils.getDebugSql(setting, _scripts, _columns, searches, config.type)
let _debugId = md5(r.sql)
@@ -921,6 +925,49 @@
})
}
+ 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.push({
+ 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鏇存柊
*/
@@ -951,6 +998,7 @@
setting={setting}
scripts={scripts}
updateStatus={this.updateStatus}
+ updateColumns={this.updateColumns}
addProcess={this.addProcess}
wrappedComponentRef={(inst) => this.settingForm = inst}
/> : null}
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 612259d..805305e 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -1,8 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Radio, Tooltip, notification, Select, InputNumber, Cascader } from 'antd'
-import { QuestionCircleOutlined } from '@ant-design/icons'
+import { Form, Row, Col, Input, Radio, Tooltip, notification, Select, InputNumber, Cascader, Modal, Button } from 'antd'
+import { QuestionCircleOutlined, PlusOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
@@ -16,6 +16,7 @@
class SettingForm extends Component {
static propTpyes = {
updateStatus: PropTypes.func,
+ updateColumns: PropTypes.func,
addProcess: PropTypes.func,
config: PropTypes.object, // 缁勪欢閰嶇疆
setting: PropTypes.object, // 鏁版嵁婧愰厤缃�
@@ -29,7 +30,8 @@
innerRules: [],
innertip: '',
MenuType: sessionStorage.getItem('MenuType') || '',
- ismain: false
+ ismain: false,
+ visible: false
}
UNSAFE_componentWillMount () {
@@ -182,21 +184,61 @@
}
addProcess = () => {
- let _sql = this.props.form.getFieldValue('dataresource')
+ this.setState({visible: true})
+ }
- _sql = _sql + `\n/* select a.*,w.remark as remark_w,w.statusname as statusname_w,w.status as status_w,w.works_flow_param from (鏁版嵁婧�) a inner join (select * from s_my_works_flow where works_flow_code=@works_flow_code@ and status=0 and deleted=0) w on a.id=w.works_flow_id */`
+ execAddProcess = (type) => {
+ let _sql = this.props.form.getFieldValue('dataresource')
+ let tableName = this.props.form.getFieldValue('tableName') || '琛ㄥ悕'
+
+ if (type === 'flowstart') {
+ _sql = _sql + `\n/* select a.*, w.remark as remark_w, w.statusname as statusname_w,w.status as status_w,w.works_flow_param,w.modifydate as modifydate_w from (select * from ${tableName} where status=0 and deleted=0 $@ and createuserid=@userid@ @$) a
+ inner join (select * from s_my_works_flow where works_flow_code=@works_flow_code@ and status=0 and deleted=0) w on a.id=w.works_flow_id */`
+ } else if (type === 'flowcheck') {
+ _sql = _sql + `\n/* select a.*, w.remark as remark_w, w.statusname as statusname_w,w.status as status_w,w.works_flow_param,w.modifydate as modifydate_w
+ from (select * from ${tableName} where status=0 and deleted=0 ) a
+ inner join (select * from s_my_works_flow where works_flow_code=@works_flow_code@ and status>0 and status<888 and deleted=0) w
+ on a.id=w.works_flow_id
+ $@ inner join (select works_flow_id from s_my_works_flow_role where userid=@userid@ and works_flow_code=@works_flow_code@ and deleted=0 ) r
+ on r.works_flow_id=w.works_flow_id @$ */`
+ }
this.props.form.setFieldsValue({
dataresource: _sql
})
+ this.setState({visible: false})
+
this.props.addProcess()
+ }
+
+ addSql = () => {
+ let tableName = this.props.form.getFieldValue('tableName')
+
+ if (!tableName) {
+ notification.warning({
+ top: 92,
+ message: '璇锋坊鍔犺〃鍚嶃��',
+ duration: 5
+ })
+ return
+ }
+
+ let _sql = this.props.form.getFieldValue('dataresource')
+
+ if (/^\s*$/.test(_sql)) {
+ this.props.form.setFieldsValue({
+ dataresource: `select * from ${tableName} where deleted=0`
+ })
+ }
+
+ this.props.updateColumns(tableName)
}
render() {
const { columns, config } = this.props
const { getFieldDecorator } = this.props.form
- const { setting, modules, innerRules, innertip, MenuType } = this.state
+ const { setting, modules, innerRules, innertip, MenuType, visible } = this.state
const formItemLayout = {
labelCol: {
@@ -223,7 +265,7 @@
message: '璇疯緭鍏ユ暟鎹簮鍚嶇О!'
}
]
- })(<Input placeholder={''} autoComplete="off" />)}
+ })(<Input placeholder="" autoComplete="off" />)}
</Form.Item>
</Col> : null}
<Col span={8}>
@@ -244,7 +286,11 @@
message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝銆佹暟瀛椾互鍙奯'
}
]
- })(<Input placeholder={''} autoComplete="off" />)}
+ })(
+ setting.interType === 'system' && ((columns.length === 0 && config.subtype !== 'basetable') || !setting.dataresource) ?
+ <Input placeholder="" autoComplete="off" addonAfter={<PlusOutlined onClick={this.addSql} />}/> :
+ <Input placeholder="" autoComplete="off"/>
+ )}
</Form.Item>
</Col>
<Col span={8}>
@@ -672,6 +718,20 @@
</Col> : null}
</Row>
</Form>
+ <Modal
+ wrapClassName="mk-flow-type"
+ visible={visible}
+ width={400}
+ maskClosable={false}
+ closable={false}
+ footer={[
+ <Button key="cancel" className="mk-green" onClick={() => this.execAddProcess('flowstart')}>鍙戣捣</Button>,
+ <Button key="confirm" className="mk-primary" onClick={() => this.execAddProcess('flowcheck')}>瀹℃壒</Button>
+ ]}
+ destroyOnClose
+ >
+ 璇烽�夋嫨宸ヤ綔娴佺被鍨嬨��
+ </Modal>
</div>
)
}
diff --git a/src/menu/datasource/verifycard/settingform/index.scss b/src/menu/datasource/verifycard/settingform/index.scss
index bc66156..bdd6da1 100644
--- a/src/menu/datasource/verifycard/settingform/index.scss
+++ b/src/menu/datasource/verifycard/settingform/index.scss
@@ -34,4 +34,33 @@
color: #1890ff;
cursor: pointer;
}
+ .ant-input-group-addon {
+ padding: 0;
+ .anticon-plus {
+ cursor: pointer;
+ padding: 7px 9px;
+ }
+ }
+ .ant-form-item-control.has-error {
+ .ant-input-group-addon {
+ display: none;
+ }
+ }
+}
+.mk-flow-type {
+ .ant-modal-body {
+ font-size: 16px;
+ color: rgba(0, 0, 0, 0.85);
+ text-align: center;
+ padding: 40px 0 20px;
+ }
+ .ant-modal-footer {
+ border: 0;
+ text-align: center;
+ padding: 25px 16px;
+
+ button + button {
+ margin-left: 15px;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index cea7779..d2d224a 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -101,9 +101,14 @@
let _regoptions = getSearchRegs(searches)
let _search = joinMainSearchkey(searches)
- _search = _search ? 'where ' + _search : ''
_regoptions.push({
+ reg: new RegExp('@userName@', 'ig'),
+ value: `'mk'`
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: `'mk'`
+ }, {
reg: new RegExp('@orderBy@', 'ig'),
value: setting.order || ''
}, {
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index 8e5849c..68dea66 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -1,11 +1,12 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-// import { fromJS } from 'immutable'
-import { Modal, Button } from 'antd'
-// import moment from 'moment'
+import { fromJS } from 'immutable'
+import { Modal, Button, Drawer, Tooltip } from 'antd'
+import { ClockCircleOutlined, CheckCircleOutlined, CloseCircleOutlined, LoadingOutlined } from '@ant-design/icons'
-// import Api from '@/api'
-// import Utils from '@/utils/utils.js'
+import Api from '@/api'
+import Utils from '@/utils/utils.js'
+import { formatSearch, joinMainSearchkey, getSearchRegs } from '@/utils/utils-custom.js'
import './index.scss'
class DebugSql extends Component {
@@ -15,186 +16,1874 @@
state = {
visible: false,
- confirming: false,
+ sqlList: [],
+ status: '',
+ successIds: [],
+ errorIds: [],
+ errorMsg: {},
+ execId: ''
}
+
+ sqlList = []
+ verSqls = []
trigger = () => {
- // const { config } = this.props
+ let config = fromJS(this.props.config).toJS()
- // let list = []
- // let mainSearch = []
+ let error = ''
+
+ let check = (components) => {
+ components.forEach(item => {
+ if (error) return
+
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ check(tab.components)
+ })
+ return
+ } else if (item.type === 'group') {
+ check(item.components)
+ return
+ } else if (!item.errors || item.errors.length === 0) {
+ return
+ }
+
+ item.errors.forEach(err => {
+ if (err.level !== 0 || error) return
+ error = `缁勪欢銆�${item.name}銆�${err.detail}`
+ })
+ })
+ }
+
+ check(config.components)
+
+ if (error) {
+ Modal.warning({
+ title: error,
+ okText: '鐭ラ亾浜�'
+ })
+ return
+ }
+
+ this.sqlList = []
+
+ let regs = [
+ { reg: /@userName@/ig, value: `'User_Name'` },
+ { reg: /@fullName@/ig, value: `'Full_Name'` },
+ { reg: /\$@/ig, value: '' },
+ { reg: /@\$/ig, value: '' },
+ { reg: /@datam@/ig, value: `''` },
+ ]
+
+ if (window.GLOB.externalDatabase !== null) {
+ regs.push({
+ reg: /@db@/ig,
+ value: window.GLOB.externalDatabase
+ })
+ }
+ if (config.urlFields) {
+ config.urlFields.forEach(field => {
+ regs.push({
+ reg: new RegExp('@' + field + '@', 'ig'),
+ value: `'mk'`
+ })
+ })
+ }
+
+ let process = config.process === 'true'
+ if (process) {
+ regs.push({ reg: /@works_flow_code@/ig, value: `'1949-10-01 15:00:00'` })
+ }
+
+ if (config.interfaces && config.interfaces.length > 0) {
+ config.interfaces.forEach(m => {
+ if (m.status !== 'true' || m.setting.interType !== 'system') return false
+
+ let sql = this.formatDataSource(m, regs)
+
+ this.sqlList.push({label: m.setting.name, children: [{label: '鏁版嵁婧�', sql: sql}]})
+ })
+ }
+
+ this.filterComponent(config.components, [], regs, process)
+
+ let sqls = []
+ let foreachSql = (list, name, tabName = '', supName = '') => {
+ list.forEach(item => {
+ if (item.children) {
+ if (item.tabName) {
+ item.children.forEach(cell => {
+ if (cell.children) {
+ foreachSql(cell.children, cell.label, item.tabName, name)
+ }
+ })
+ } else {
+ foreachSql(item.children, name, tabName, supName)
+ }
+ } else if (item.sql) {
+ sqls.push({uuid: Utils.getuuid() ,label: item.label, name: name, tabName: tabName, supName: supName, sql: item.sql})
+ }
+ })
+ }
+
+ this.sqlList.forEach(item => {
+ if (item.children) {
+ foreachSql(item.children, item.label)
+ }
+ })
+
+ if (sqls.length === 0) {
+ Modal.warning({
+ title: '褰撳墠鑿滃崟鏃犲彲楠岃瘉鑴氭湰銆�',
+ okText: '鐭ラ亾浜�'
+ })
+ return
+ }
+
+ this.verSqls = sqls
+ let that = this
+
+ Modal.confirm({
+ content: `褰撳墠鑿滃崟鍏�${this.sqlList.length}涓粍浠讹紝${sqls.length}椤硅剼鏈渶瑕佹楠�${sqls.length > 20 ? '锛屾椂闂村ぇ姒傞渶瑕�' + parseInt(sqls.length / 2) + '绉�' : ''}銆俙,
+ onOk() {
+ that.setState({visible: true, status: 'loading', sqlList: fromJS(sqls).toJS(), successIds: [], errorIds: [], errorMsg: {}, execId: ''}, () => {
+ that.roopSql()
+ })
+ },
+ onCancel() {}
+ })
+
+ this.sqlList = []
}
- // formatSearch (config) {
- // if (!config.search) return []
+ filterComponent = (components, mainSearch, regs, process, ispop = false) => {
+ let appType = sessionStorage.getItem('appType')
+ let _mainSearch = mainSearch || []
- // let values = []
+ if (appType === 'mob') {
+ let search = []
+ let ms = null
+ components.forEach(item => {
+ if (item.type === 'topbar' && item.wrap.type !== 'navbar' && item.search) {
+ ms = item.search
+ } else if (item.type === 'search' && item.wrap.field) {
+ search.push({
+ type: 'text',
+ label: item.wrap.label,
+ field: item.wrap.field,
+ match: item.wrap.match,
+ required: item.wrap.required,
+ value: item.wrap.initval || ''
+ })
+ }
+ })
- // config.search.forEach(item => {
- // item.hidden = item.Hide === 'true'
- // item.required = !item.hidden && item.required === 'true'
- // item.advanced = item.advanced === 'true'
- // item.$forbid = item.query === 'false'
- // item.precision = item.precision || 'day'
+ if (ms) {
+ if (ms.setting.type === 'search') {
+ search.push({
+ type: 'text',
+ label: '鎼滅储鏍�',
+ field: ms.setting.field,
+ match: ms.setting.match,
+ required: ms.setting.required,
+ value: ms.setting.initval || ''
+ })
+ }
+ search.push(...ms.fields)
- // if (item.type === 'date') { // 鏃堕棿鎼滅储
- // let format = 'YYYY-MM-DD'
- // if (item.precision === 'day') {
+ ms.groups.forEach(group => {
+ if (group.setting.type === 'search') {
+ search.push({
+ type: 'text',
+ label: group.wrap.name,
+ field: group.setting.field,
+ match: group.setting.match,
+ required: group.setting.required,
+ value: group.setting.initval || ''
+ })
+ }
+ search.push(...group.fields)
+ })
+ }
- // } else if (item.precision === 'hour') {
- // format = 'YYYY-MM-DD HH'
- // } else if (item.precision === 'minute') {
- // format = 'YYYY-MM-DD HH:mm'
- // } else if (item.precision === 'second') {
- // format = 'YYYY-MM-DD HH:mm:ss'
- // }
+ if (search.length > 0) {
+ _mainSearch = search
+ }
+ } else {
+ components.forEach(component => {
+ if (component.type !== 'search') return
+
+ _mainSearch = component.search || []
+ })
+ }
- // item.initval = item.initval ? moment().subtract(item.initval, 'days').format(format) : ''
- // } else if (item.type === 'datemonth') {
- // item.initval = item.initval ? moment().subtract(item.initval, 'month').format('YYYY-MM') : ''
- // } else if (item.type === 'dateweek') {
- // item.initval = item.initval ? moment().subtract(item.initval * 7, 'days').format('YYYY-MM-DD') : ''
- // } else if (item.type === 'daterange') {
- // let format = 'YYYY-MM-DD'
- // if (item.precision === 'day') {
+ components.forEach(item => {
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ this.filterComponent(tab.components, _mainSearch, regs, process)
+ })
+ } else if (item.type === 'group') {
+ this.filterComponent(item.components, _mainSearch, regs, process)
+ } else {
+ let children = []
+ if (item.wrap && item.setting) {
+ if (item.wrap.datatype === 'public' || item.wrap.datatype === 'static') {
+ item.setting.interType = 'other'
+ }
+ }
- // } else if (item.precision === 'hour') {
- // format = 'YYYY-MM-DD HH'
- // } else if (item.precision === 'minute') {
- // format = 'YYYY-MM-DD HH:mm'
- // } else if (item.precision === 'second') {
- // format = 'YYYY-MM-DD HH:mm:ss'
- // }
- // if (item.initval === 'week') {
- // item.initval = [moment().startOf('week').format(format), moment().endOf('week').format(format)].join(',')
- // } else if (item.initval === 'month') {
- // item.initval = [moment().startOf('month').format(format), moment().endOf('month').format(format)].join(',')
- // } else if (item.initval === 'lastMonth') {
- // item.initval = [moment().subtract(1, 'months').startOf('month').format(format), moment().subtract(1, 'months').endOf('month').format(format)].join(',')
- // } else if (item.initval) {
- // try {
- // let _initval = JSON.parse(item.initval)
- // let _vals = [moment().subtract(_initval[0], 'days').format(format), moment().subtract(_initval[1], 'days').format(format)]
- // item.initval = _vals.join(',')
- // } catch (e) {
- // item.initval = ''
- // }
- // }
- // } else if (item.type === 'group') {
- // if (item.initval && item.initval[0]) {
- // let _type = item.initval[0]
- // let _val = item.initval[1]
- // let _dateRange = ''
+ if (appType === 'mob' && item.type !== 'search' && item.type !== 'topbar' && item.search && item.search.length > 0) {
+ item.search = []
+ }
+
+ if (item.subtype === 'tablecard') { // 鍏煎
+ item.type = 'card'
+ }
+
+ if (item.setting && item.setting.interType === 'system') {
+ let sql = this.formatDataSource(item, regs, _mainSearch)
+
+ children.push({label: '鏁版嵁婧�', sql: sql})
+ } else if (item.setting && item.setting.useMSearch === 'true') {
+ let searches = item.search || []
+ if (_mainSearch.length > 0) {
+ searches = [...searches, ..._mainSearch]
+ }
+ item.$searches = fromJS(searches).toJS()
+ }
+
+ item.action && item.action.forEach(cell => {
+ if (cell.hidden === 'true') return false
+ let sql = this.resetButton(item, cell, process)
+
+ if (sql) {
+ if (typeof(sql) === 'string') {
+ children.push({label: cell.label, sql: sql})
+ } else {
+ children.push({label: cell.label, tabName: cell.label, sql: '', children: sql})
+ }
+ }
+ })
+
+ if (item.type === 'table') {
+ let getCols = (cols) => {
+ cols.forEach(col => {
+ if (col.type === 'action') {
+ col.type = 'custom'
+ }
+ if (col.type === 'colspan') {
+ getCols(col.subcols || [])
+ } else if (col.type === 'custom') {
+ col.elements.forEach(cell => {
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ let sql = this.resetButton(item, cell, process)
+
+ if (sql) {
+ if (typeof(sql) === 'string') {
+ children.push({label: cell.label, sql: sql})
+ } else {
+ children.push({label: cell.label, tabName: cell.label, sql: '', children: sql})
+ }
+ }
+ })
+ }
+ })
+ }
+
+ getCols(item.cols)
+
+ if (item.subtype === 'editable' && item.submit.intertype === 'system') {
+ let sql = this.getEditTableSql(item.submit, item.cols, item.columns)
+ children.push({label: '鎻愪氦', sql: sql})
+ }
+ } else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
+ item.subcards && item.subcards.forEach(card => {
+ card.elements && card.elements.forEach(cell => {
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ let sql = this.resetButton(item, cell, process)
+
+ if (sql) {
+ if (typeof(sql) === 'string') {
+ children.push({label: cell.label, sql: sql})
+ } else {
+ children.push({label: cell.label, tabName: cell.label, sql: '', children: sql})
+ }
+ }
+ })
+
+ if (!card.backElements || card.backElements.length === 0) return
+
+ card.backElements.forEach(cell => {
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ let sql = this.resetButton(item, cell, process)
+
+ if (sql) {
+ if (typeof(sql) === 'string') {
+ children.push({label: cell.label, sql: sql})
+ } else {
+ children.push({label: cell.label, tabName: cell.label, sql: '', children: sql})
+ }
+ }
+ })
+ })
+ } else if (item.type === 'balcony') {
+ item.elements.forEach(cell => {
+ if (cell.eleType !== 'button' || cell.hidden === 'true') return
+ let sql = this.resetButton(item, cell, process)
+
+ if (sql) {
+ if (typeof(sql) === 'string') {
+ children.push({label: cell.label, sql: sql})
+ } else {
+ children.push({label: cell.label, tabName: cell.label, sql: '', children: sql})
+ }
+ }
+ })
+ } else if (item.type === 'form') {
+ item.subcards.forEach(group => {
+ group.subButton.OpenType = 'formSubmit'
+ if (!group.subButton.Ot) {
+ group.subButton.Ot = item.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
+ }
+ let sql = this.resetButton(item, group.subButton, process, group)
+
+ if (sql) {
+ children.push({label: group.subButton.label, sql: sql})
+ }
+ })
+ }
+
+ if (children.length) {
+ if (ispop) {
+ this.sqlPopList.push({label: item.name, children: children})
+ } else {
+ this.sqlList.push({label: item.name, children: children})
+ }
+ }
+ }
+ })
+ }
+
+ resetButton = (item, cell, process, group) => {
+ let sql = ''
+ if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) {
+ if (cell.intertype === 'system' || cell.procMode === 'system') { // 绯荤粺鎺ュ彛
+ sql = this.getSysDefaultSql(cell, item, process, group)
+ }
+ } else if (cell.OpenType === 'excelIn') {
+ if (cell.intertype === 'system') {
+ sql = this.getExcelInSql(cell)
+ }
+ } else if (cell.OpenType === 'excelOut') {
+ if (cell.intertype === 'system' && cell.verify && cell.verify.dataType === 'custom') {
+ sql = this.getExcelOutSql(cell, item)
+ }
+ } else if (cell.OpenType === 'funcbutton') {
+ if (cell.funcType === 'print') {
+
+ }
+ } else if (cell.OpenType === 'popview') {
+ if (cell.config && cell.config.components) {
+ this.sqlPopList = []
+ let regs = [
+ { reg: /@userName@/ig, value: `'User_Name'` },
+ { reg: /@fullName@/ig, value: `'Full_Name'` },
+ { reg: /\$@/ig, value: '' },
+ { reg: /@\$/ig, value: '' },
+ { reg: /@datam@/ig, value: `''` },
+ ]
+
+ if (window.GLOB.externalDatabase !== null) {
+ regs.push({
+ reg: /@db@/ig,
+ value: window.GLOB.externalDatabase
+ })
+ }
- // if (_type === 'day') {
- // _dateRange = [moment().subtract(_val, 'days').format('YYYY-MM-DD'),
- // moment().subtract(_val, 'days').format('YYYY-MM-DD')]
- // } else if (_type === 'week') {
- // _dateRange = [moment().subtract(_val * 7, 'days').startOf('week').format('YYYY-MM-DD'),
- // moment().subtract(_val * 7, 'days').endOf('week').format('YYYY-MM-DD')]
- // } else if (_type === 'month') {
- // _dateRange = [moment().subtract(_val, 'month').startOf('month').format('YYYY-MM-DD'),
- // moment().subtract(_val, 'month').endOf('month').format('YYYY-MM-DD')]
- // } else if (_type === 'quarter') {
- // let _differ = parseInt(moment().format('MM')) % 3
- // let _pdiffer = 0
- // let _ndiffer = 0
-
- // // 宸�艰绠�
- // switch(_differ) {
- // case 0:
- // _pdiffer = 2
- // _ndiffer = 0
- // break
- // case 1:
- // _pdiffer = 0
- // _ndiffer = -2
- // break
- // case 2:
- // _pdiffer = 1
- // _ndiffer = -1
- // break
- // default:
- // }
- // _dateRange = [moment().subtract(_pdiffer + _val * 3, 'month').startOf('month').format('YYYY-MM-DD'),
- // moment().subtract(_ndiffer + _val * 3, 'month').endOf('month').format('YYYY-MM-DD')]
- // } else if (_type === 'year') {
- // let _year = parseInt(moment().format('YYYY')) - _val
- // _dateRange = [_year + '-01-01', _year + '-12-31']
- // } else if (_type === 'customized') {
- // try {
- // _val = JSON.parse(_val)
- // } catch (e) {
- // _val = [0, 0]
- // }
- // _dateRange = [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'),
- // moment().subtract(_val[1], 'days').format('YYYY-MM-DD')]
- // }
+ if (process) {
+ regs.push({ reg: /@works_flow_code@/ig, value: `'1949-10-01 15:00:00'` })
+ }
+ this.filterComponent(cell.config.components, [], regs, process, true)
- // item.initval = _dateRange.join(',')
- // item.initType = _type
- // } else {
- // item.initval = ''
- // item.initType = ''
- // }
- // }
+ if (this.sqlPopList.length) {
+ sql = fromJS(this.sqlPopList).toJS()
+ }
+ }
+ }
+
+ return sql
+ }
+
+ getSysDefaultSql = (btn, component, process, group) => {
+ let primaryId = 'id'
+ let BID = 'bid'
+ let verify = btn.verify || {}
+ let _actionType = null
+ let setting = component.setting
+ let columns = component.columns || []
+
+ if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
+ _actionType = btn.sqlType
+ }
+
+ let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
+ let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
+ let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+
+ verify.scripts && verify.scripts.forEach(item => {
+ if (item.status === 'false') return
+
+ if (item.position === 'init') {
+ _initCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${item.sql}
+ `
+ } else if (item.position === 'front') {
+ _prevCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${item.sql}
+ `
+ } else {
+ _backCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${item.sql}
+ `
+ }
+ })
+
+ // 闇�瑕佸０鏄庣殑鍙橀噺闆�
+ let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'mk_deleted', 'bid']
+
+ // 涓婚敭瀛楁
+ let primaryKey = setting.primaryKey || 'id'
+
+ // sql璇彞
+ let _sql = ''
+
+ let _initvars = [] // 宸茶祴鍊煎瓧娈甸泦
+ let _initFormfields = []
+ let _initColfields = []
+ let _declarefields = []
+
+ let formdata = null
+ if (btn.OpenType === 'pop') {
+ formdata = []
+ if (btn.modal && btn.modal.fields) {
+ btn.modal.fields.forEach(item => {
+ if (!item.field) return
+
+ let _item = {
+ key: item.field,
+ fieldlen: item.fieldlength || 50,
+ writein: item.writein !== 'false',
+ type: item.type
+ }
+
+ if (_item.type === 'datemonth') {
+ _item.type = 'text'
+ } else if (_item.type === 'number' || _item.type === 'rate') {
+ _item.fieldlen = item.decimal || 0
+ } else if (_item.type === 'date') {
+ _item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
+ }
+
+ formdata.push(_item)
+ })
+ }
+ } else if (btn.OpenType === 'form') {
+ formdata = []
+
+ let item = {
+ type: 'text',
+ readin: true,
+ writein: true,
+ fieldlen: 50,
+ key: btn.field
+ }
+ if (btn.formType === 'counter') {
+ item.type = 'number'
+ item.fieldlen = 0
+ } else if (btn.formType === 'switch' || btn.formType === 'radio') {
+ if (typeof(btn.openVal) === 'number') {
+ item.type = 'number'
+ item.fieldlen = 0
+ }
+ }
+ formdata.push(item)
+ } else if (btn.OpenType === 'formSubmit') {
+ formdata = []
+ if (group.fields) {
+ group.fields.forEach(item => {
+ if (!item.field) return
+
+ let _item = {
+ key: item.field,
+ fieldlen: item.fieldlength || 50,
+ writein: item.writein !== 'false',
+ type: item.type
+ }
+
+ if (_item.type === 'datemonth') {
+ _item.type = 'text'
+ } else if (_item.type === 'number' || _item.type === 'rate') {
+ _item.fieldlen = item.decimal || 0
+ } else if (_item.type === 'date') {
+ _item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
+ }
+
+ formdata.push(_item)
+ })
+ }
+ }
+ // 鑾峰彇瀛楁閿�煎
+ formdata && formdata.forEach(form => {
+ let _key = form.key.toLowerCase()
+ if (!_initvars.includes(_key)) {
+ _initvars.push(_key)
+ if (form.type === 'number' || form.type === 'rate') {
+ _initFormfields.push(`@${_key}=1`)
+ } else if (form.type === 'date') {
+ _initFormfields.push(`@${_key}='1949-10-01'`)
+ } else if (form.type === 'select' || form.type === 'link' || form.type === 'radio') {
+ _initFormfields.push(`@${_key}='1'`)
+ } else {
+ _initFormfields.push(`@${_key}='mk'`)
+ }
+ }
- // item.oriInitval = item.initval
+ if (!_vars.includes(_key)) {
+ _vars.push(_key)
+
+ if (form.fieldlen && form.fieldlen > 4000) {
+ form.fieldlen = 'max'
+ }
+
+ let _type = `nvarchar(${form.fieldlen})`
+
+ if (form.type.match(/date/ig)) {
+ _type = 'datetime'
+ } else if (form.type === 'number') {
+ _type = `decimal(18,${form.fieldlen})`
+ } else if (form.type === 'rate') {
+ _type = `decimal(18,2)`
+ }
+
+ _declarefields.push(`@${_key} ${_type}`)
+ }
+ })
+
+ // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
+ if (btn.Ot !== 'notRequired' && columns && columns.length > 0) {
+ const setField = (col) => {
+ if (!col.field) return
+ let _key = col.field.toLowerCase()
+
+ if (!_initvars.includes(_key)) {
+ _initvars.push(_key)
+
+ if (col.datatype && /^date/ig.test(col.datatype)) {
+ _initColfields.push(`@${_key}='1949-10-01'`)
+ } else if (col.type === 'number') {
+ _initColfields.push(`@${_key}=1`)
+ } else {
+ _initColfields.push(`@${_key}='mk'`)
+ }
+ }
+
+ if (!_vars.includes(_key)) {
+ _vars.push(_key)
+
+ if (col.datatype) {
+ _declarefields.push(`@${_key} ${col.datatype}`)
+ } else {
+ if (col.fieldlength && col.fieldlength > 4000) {
+ col.fieldlength = 'max'
+ }
+
+ let _type = `nvarchar(${col.fieldlength || 50})`
+
+ if (col.type === 'number') {
+ let _length = col.decimal ? col.decimal : 0
+ _type = `decimal(18,${_length})`
+ } else if (col.type === 'picture' || col.type === 'textarea') {
+ _type = `nvarchar(${col.fieldlength || 512})`
+ }
+
+ _declarefields.push(`@${_key} ${_type}`)
+ }
+ }
+ }
+
+ columns.forEach(col => {
+ if (col.field === 'works_flow_param') return
+
+ if (col.type === 'colspan' || col.type === 'old_colspan') {
+ col.subcols.forEach(cell => {
+ setField(cell)
+ })
+ } else {
+ setField(col)
+ }
+ })
+ }
+
+ // 鍙橀噺澹版槑
+ _declarefields = _declarefields.join(',')
+ if (_declarefields) {
+ _declarefields = ',' + _declarefields
+ }
+ _sql = `Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@mk_deleted int,@bid nvarchar(50)${_declarefields}
+ `
+
+ let userName = 'User_Name'
+ let fullName = 'Full_Name'
+ let RoleID = 'role_id'
+ let departmentcode = 'departmentcode'
+ let organization = 'organization'
+ let mk_user_type = 'mk_user_type'
+ let nation = 'nation'
+ let province = 'province'
+ let city = 'city'
+ let district = 'district'
+ let address = 'address'
+
+ // 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
+ _sql += `
+ /* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
+ select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @mk_deleted=1, @bid='${BID}', @BillCode='', @ModularDetailCode=''
+ `
+
+ // 琛ㄥ崟鍙橀噺璧嬪��
+ if (_initFormfields.length > 0) {
+ _sql += `
+ /* 琛ㄥ崟鍙橀噺璧嬪�� */
+ select ${_initFormfields.join(',')}
+ `
+ }
+ // 鏄剧ず鍒楀彉閲忚祴鍊�
+ if (_initColfields.length > 0) {
+ _sql += `
+ /* 鏄剧ず鍒楀彉閲忚祴鍊� */
+ select ${_initColfields.join(',')}
+ `
+ }
+
+ // 鍘婚櫎绂佺敤鐨勯獙璇�
+ if (verify.contrasts) {
+ verify.contrasts = verify.contrasts.filter(item => item.status !== 'false')
+ }
+ if (verify.uniques) {
+ verify.uniques = verify.uniques.filter(item => item.status !== 'false')
+ }
+ if (verify.customverifys) {
+ verify.customverifys = verify.customverifys.filter(item => item.status !== 'false')
+ }
+ if (verify.billcodes) {
+ verify.billcodes = verify.billcodes.filter(item => item.status !== 'false')
+ }
+
+ if (_initCustomScript) {
+ _sql += _initCustomScript
+ }
+
+ // 鍚敤璐︽湡楠岃瘉
+ if (verify.accountdate === 'true') {
+ let orgcode = `''`
+ let date = `''`
+ if (verify.accountfield && _initvars.includes(verify.accountfield.toLowerCase())) {
+ orgcode = '@' + verify.accountfield
+ }
+ if (verify.voucherdate && _initvars.includes(verify.voucherdate.toLowerCase())) {
+ date = '@' + verify.voucherdate
+ }
+
+ _sql += `
+ /* 璐︽湡楠岃瘉 */
+ exec s_FIBVoucherDateCheck @OrgCode=${orgcode},@FIBVoucherDate=${date},@ErrorCode=@ErrorCode OUTPUT,@retmsg=@retmsg OUTPUT
+ if @ErrorCode!=''
+ GOTO aaa
+ `
+ }
+
+ // 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
+ if (btn.sqlType !== 'insert' && btn.Ot !== 'notRequired' && verify.invalid === 'true' && setting.dataresource) {
+ let datasource = setting.dataresource
+ let customScript = setting.customScript || ''
+ let orderBy = setting.order
- // if (values) {
- // item.initval = values[item.field] || ''
- // }
+ if (setting.queryType === 'statistics' || customScript) {
+ let searches = formatSearch(component.$searches || [])
+ let regoptions = getSearchRegs(searches)
+
+ regoptions.push({
+ reg: new RegExp('@userName@', 'ig'),
+ value: `'${userName}'`
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: `'${fullName}'`
+ }, {
+ reg: new RegExp('@orderBy@', 'ig'),
+ value: orderBy
+ }, {
+ reg: new RegExp('@pageSize@', 'ig'),
+ value: 999999
+ }, {
+ reg: new RegExp('@pageIndex@', 'ig'),
+ value: 1
+ })
+
+ regoptions.forEach(item => {
+ datasource = datasource.replace(item.reg, item.value)
+ customScript = customScript.replace(item.reg, item.value)
+ })
+ }
+
+ if (customScript) {
+ _sql += `
+ /* 鏁版嵁婧愯嚜瀹氫箟鑴氭湰锛岃娉ㄦ剰鍙橀噺瀹氫箟鏄惁閲嶅 */
+ ${customScript}
+ `
+ }
+
+ if (btn.Ot === 'requiredOnce') {
+ _sql += `
+ /* 澶辨晥楠岃瘉 */
+ select @tbid='', @ErrorCode='',@retmsg=''
+ select @tbid='X' from ${datasource} right join (select ID from dbo.SplitComma(@ID@)) sp
+ on tb.${primaryKey} =sp.id where tb.${primaryKey} is null
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='E',@retmsg='鏁版嵁宸插け鏁�'
+ goto aaa
+ end
+ `
+ } else {
+ _sql += `
+ /* 澶辨晥楠岃瘉 */
+ select @tbid='', @ErrorCode='',@retmsg=''
+ select @tbid=${primaryKey} from ${datasource} where ${primaryKey}=@ID@
+ If @tbid=''
+ Begin
+ select @ErrorCode='E',@retmsg='鏁版嵁宸插け鏁�'
+ goto aaa
+ end
+ `
+ }
+ }
+
+ // 姣旇緝楠岃瘉
+ if (verify.contrasts && verify.contrasts.length > 0) {
+ verify.contrasts.forEach(item => {
+ _sql += `
+ /* 姣旇緝楠岃瘉 */
+ If ${item.frontfield} ${item.operator} ${item.backfield}
+ Begin
+ select @ErrorCode='${item.errorCode}',@retmsg='${item.errmsg}'
+ goto aaa
+ end
+ `
+ })
+ }
+
+ // 鑷畾涔夐獙璇�
+ verify.customverifys && verify.customverifys.forEach(item => {
+ _sql += `
+ /* 鑷畾涔夐獙璇� */
+ select @tbid='', @ErrorCode='',@retmsg=''
+ select top 1 @tbid='X' from (${item.sql}) a
+ If @tbid ${item.result === 'true' ? '!=' : '='}''
+ Begin
+ select @ErrorCode='${item.errorCode}',@retmsg='${item.errmsg}'
+ goto aaa
+ end
+ `
+ })
+
+ // 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽０鏄庡彉閲忥紙妫�楠岋級
+ let _billcodesSql = ''
+ if (formdata && verify.billcodes && verify.billcodes.length > 0) {
+ let keys = formdata.map(item => item.key.toLowerCase()) // 琛ㄥ崟瀛楁
+
+ verify.billcodes.forEach(item => {
+ let _key = item.field.toLowerCase()
+ let _linkKey = item.linkField ? item.linkField.toLowerCase() : ''
+
+ if (!keys.includes(_key)) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈�
+
+ let _ModularDetailCode = ''
+ let _lpline = ''
+ if (item.TypeCharOne === 'Lp') {
+ if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)`
+ } else {
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${_linkKey},48)`
+ }
+ _ModularDetailCode = '@ModularDetailCode'
+ } else if (item.TypeCharOne === 'BN') {
+ let _val = ''
+ if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
+ _val = BID
+ } else {
+ _val = 0
+ }
+ _ModularDetailCode = `'${item.TypeCharOne + _val}'`
+ } else {
+ _ModularDetailCode = `'${item.ModularDetailCode}'`
+ }
+
+ let _declare = ''
+
+ if (!_vars.includes(_key)) {
+ _declare = `Declare @${_key} nvarchar(50)`
+ _vars.push(_key)
+ }
+
+ _billcodesSql += `
+ /* 鍗曞彿鐢熸垚 */
+ ${_declare}
+ select @BillCode='', @${_key}='', @ModularDetailCode=''
+ ${_lpline}
+ exec s_get_BillCode
+ @ModularDetailCode=${_ModularDetailCode},
+ @Type=${item.Type},
+ @TypeCharOne='${item.TypeCharOne}',
+ @TypeCharTwo ='${item.TypeCharTwo}',
+ @BillCode =@BillCode output,
+ @ErrorCode =@ErrorCode output,
+ @retmsg=@retmsg output
+ if @ErrorCode!=''
+ goto aaa
+ set @${_key}=@BillCode
+ `
+ })
+
+ if (_actionType !== 'insertOrUpdate') {
+ _sql += _billcodesSql
+ }
+ }
+
+ // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧愶紝澶氳鎷兼帴鏃朵笉鍙敤
+ if (formdata && verify.uniques && verify.uniques.length > 0 && btn.Ot !== 'requiredOnce') {
+ verify.uniques.forEach(item => {
+ let _fieldValue = [] // 琛ㄥ崟閿�煎field=value
+ let _value = [] // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
+ let _labels = item.fieldlabel.split(',') // 琛ㄥ崟鎻愮ず鏂囧瓧
+ let arr = [] // 楠岃瘉涓婚敭
+
+ item.field.split(',').forEach((_field, index) => {
+ let _key = _field.toLowerCase()
+ let _val = ''
+ let _fval = `'${_val}'`
+
+ if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+ _fval = '@BID@'
+ }
- // if (item.blacklist && item.blacklist.length > 0 && !item.hidden) {
- // if (item.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- // item.hidden = true
- // item.required = false
- // }
- // }
+ arr.push(_key)
+ _fieldValue.push(`${_key}=${_fval}`)
+
+ _value.push(`${_labels[index] || ''}锛�${_val || ''}`)
+ })
+
+ let _verifyType = ''
+ if (item.verifyType === 'logic') {
+ _verifyType = ' and deleted=0'
+ }
+
+ if (!arr.includes(primaryKey.toLowerCase())) {
+ _fieldValue.push(`${primaryKey} !='${primaryId}'`)
+ }
+
+ _sql += `
+ /* 鍞竴鎬ч獙璇� */
+ select @tbid='', @ErrorCode='',@retmsg=''
+ select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${_verifyType}
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
+ goto aaa
+ end
+ `
+ })
+ } else if (verify.uniques && verify.uniques.length > 0 && btn.Ot === 'requiredOnce' && setting.dataresource) {
+ let datasource = setting.dataresource
+ if (/\s/.test(datasource)) { // 鎷兼帴鍒悕
+ if (!/tb$/.test(datasource)) {
+ datasource = '(' + datasource + ') tb'
+ }
+ } else {
+ datasource = datasource + ' tb'
+ }
+
+ if (setting.customScript) {
+ _sql += `
+ /* 鏁版嵁婧愯嚜瀹氫箟鑴氭湰锛岃娉ㄦ剰鍙橀噺瀹氫箟鏄惁閲嶅 */
+ ${setting.customScript}
+ `
+ }
+
+ verify.uniques.forEach(item => {
+ _sql += `
+ /* 鍚岀被鏁版嵁楠岃瘉 */
+ Set @tbid=''
+
+ Select top 1 @tbid='X' from (select distinct ${item.field},1 as n from ${datasource} inner join (select ID from dbo.SplitComma(@ID@)) sp on tb.${primaryKey}=sp.ID ) a having sum(n)>1
+
+ If @tbid!=''
+ Begin
+ Set @ErrorCode='E' Set @retmsg='${item.fieldlabel} 鍊间笉鍞竴'
+ goto aaa
+ end
+ `
+ })
+ }
+
+ let hasvoucher = false
+
+ // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
+ if (verify.voucher && verify.voucher.enabled && btn.Ot !== 'requiredOnce') {
+ let _voucher = verify.voucher
+
+ hasvoucher = true
+
+ _sql += `
+ /* 鍒涘缓鍑瘉 */
+ exec s_BVoucher_Create
+ @Bill ='0',
+ @BVoucherType ='${_voucher.BVoucherType}',
+ @VoucherTypeOne ='${_voucher.VoucherTypeOne}',
+ @VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
+ @Type =${_voucher.Type},
+ @UserID=@UserID@,
+ @Username=@Username,
+ @FullName=@FullName,
+ @BVoucher =@BVoucher OUTPUT ,
+ @FIBVoucherDate =@FIBVoucherDate OUTPUT ,
+ @FiYear =@FiYear OUTPUT ,
+ @ErrorCode =@ErrorCode OUTPUT,
+ @retmsg=@retmsg OUTPUT
+ if @ErrorCode!=''
+ GOTO aaa
+ `
+ }
+
+ let _insertsql = ''
+ if (_actionType === 'insert' || _actionType === 'insertOrUpdate') { // 娣诲姞璇彞
+ let keys = []
+ let values = []
+
+ formdata.forEach(item => {
+ if (item.writein === false) return
+ let _key = item.key.toLowerCase()
+
+ keys.push(_key)
+ values.push('@' + _key)
+ })
+
+ if (!keys.includes(primaryKey.toLowerCase())) {
+ keys.push(primaryKey.toLowerCase())
+ values.push('\'' + primaryId + '\'')
+ }
+ if (!keys.includes('createuserid')) {
+ keys.push('createuserid')
+ values.push('@userid@')
+ }
+ if (!keys.includes('createuser')) {
+ keys.push('createuser')
+ values.push('@username')
+ }
+ if (!keys.includes('createstaff')) {
+ keys.push('createstaff')
+ values.push('@fullname')
+ }
+ if (!keys.includes('bid')) {
+ keys.push('bid')
+ values.push('@BID@')
+ }
+
+ if (!keys.includes('typename')) {
+ keys.push('typename')
+ values.push('@typename@')
+ }
+
+ keys = keys.join(',')
+ values = values.join(',')
+ _insertsql = `insert into ${btn.sql} (${keys}) select ${values};`
+ }
+
+ let _updatesql = ''
+ if (_actionType === 'update' || _actionType === 'audit' || _actionType === 'insertOrUpdate') { // 淇敼璇彞
+ let _form = []
+ let _arr = []
+
+ formdata.forEach(item => {
+ if (item.writein === false) return
+ let _key = item.key.toLowerCase()
+
+ _arr.push(_key)
+ _form.push(_key + '=@' + _key)
+ })
+
+ if (_actionType === 'audit') {
+ if (!_arr.includes('submitdate')) {
+ _form.push('submitdate=getdate()')
+ }
+ if (!_arr.includes('submituser')) {
+ _form.push('submituser=@username')
+ }
+ if (!_arr.includes('submitstaff')) {
+ _form.push('submitstaff=@fullname')
+ }
+ if (!_arr.includes('submituserid')) {
+ _form.push('submituserid=@userid@')
+ }
+ } else {
+ if (!_arr.includes('modifydate')) {
+ _form.push('modifydate=getdate()')
+ }
+ if (!_arr.includes('modifyuser')) {
+ _form.push('modifyuser=@username')
+ }
+ if (!_arr.includes('modifystaff')) {
+ _form.push('modifystaff=@fullname')
+ }
+ if (!_arr.includes('modifyuserid')) {
+ _form.push('modifyuserid=@userid@')
+ }
+ }
+
+ if (hasvoucher) {
+ if (!_arr.includes('bvoucher')) {
+ _form.push('BVoucher=@BVoucher')
+ }
+ if (!_arr.includes('fibvoucherdate')) {
+ _form.push('FIBVoucherDate=@FIBVoucherDate')
+ }
+ if (!_arr.includes('fiyear')) {
+ _form.push('FiYear=@FiYear')
+ }
+ }
+ if (!_arr.includes('typename')) {
+ _form.push('typename=@typename@')
+ }
+ _form = _form.join(',')
+
+ let _ID = '=@ID@'
+ if (btn.Ot === 'requiredOnce') {
+ _ID = ' in (select ID from dbo.SplitComma(@ID@))'
+ }
+
+ _updatesql = `update ${btn.sql} set ${_form} where ${primaryKey}${_ID};`
+ }
+
+ if (_prevCustomScript) {
+ _sql += _prevCustomScript
+ }
+
+ // 娣诲姞銆佷慨鏀广�侀�昏緫鍒犻櫎銆佺墿鐞嗗垹闄�
+ if (_actionType === 'insert') {
+ _sql += `
+ /* 榛樿sql */
+ ${_insertsql}`
+ } else if (_actionType === 'update' || _actionType === 'audit') {
+ _sql += `
+ /* 榛樿sql */
+ ${_updatesql}`
+ } else if (_actionType === 'LogicDelete') { // 閫昏緫鍒犻櫎
+ let _ID = '=@ID@'
+ if (btn.Ot === 'requiredOnce') {
+ _ID = ' in (select ID from dbo.SplitComma(@ID@))'
+ }
+
+ _sql += `
+ /* 榛樿sql */
+ update ${btn.sql} set deleted=@mk_deleted,modifydate=getdate(),modifyuser=@username,modifystaff=@fullname,modifyuserid=@userid@ where ${primaryKey}${_ID};`
+
+ } else if (_actionType === 'delete') { // 鐗╃悊鍒犻櫎
+ let _msg = ''
+ if (columns && columns.length > 0 && btn.Ot !== 'notRequired') {
+ let _index = 0
+ columns.forEach(col => {
+ if (!col.field || col.Hide === 'true' || _index >= 4) return
+ _msg += col.label + '=0,'
+ _index++
+ })
+ }
+
+ let _ID = '=@ID@'
+ if (btn.Ot === 'requiredOnce') {
+ _ID = ' in (select ID from dbo.SplitComma(@ID@))'
+ }
+
+ _sql += `
+ /* 榛樿sql */
+ insert into snote (remark,createuserid,CreateUser,CreateStaff,typename) select left('鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@ID@,200),@userid@,@username,@fullname,@typename@
+ delete ${btn.sql} where ${primaryKey}${_ID};`
+ } else if (_actionType === 'insertOrUpdate') {
+ _sql += `
+ /* 榛樿sql */
+ select @tbid=''
+ select @tbid='X' from ${btn.sql} where ${primaryKey}=@ID@
+ if @tbid=''
+ begin
+ ${_billcodesSql}
+ ${_insertsql}
+ end
+ else
+ begin
+ ${_updatesql}
+ end
+ `
+ }
+
+ if (verify.workFlow === 'true' && process) {
+ let status = 888
+ let statusName = '缁撴潫'
+ let detailId = '0'
+
+ if (verify.flowSql === 'true') {
+ _sql += `
+ /* 宸ヤ綔娴侀粯璁ql */
+ insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@
+ insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@
+ `
+ }
+
+ _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
+ _sql = _sql.replace(/@check_type@/ig, `'瀹℃牳'`)
+ _sql = _sql.replace(/@notice_type@/ig, `'鎶勯��'`)
+ _sql = _sql.replace(/@check_userids@/ig, `''`)
+ _sql = _sql.replace(/@notice_userids@/ig, `''`)
+ _sql = _sql.replace(/@works_flow_code@/ig, `'mk'`)
+ _sql = _sql.replace(/@works_flow_name@/ig, `'mk'`)
+ _sql = _sql.replace(/@works_flow_param@/ig, `''`)
+ _sql = _sql.replace(/@works_flow_detail_id@/ig, `'${detailId}'`)
+ _sql = _sql.replace(/@status@/ig, `'${status}'`)
+ _sql = _sql.replace(/@statusname@/ig, `'${statusName}'`)
+ _sql = _sql.replace(/@work_group@/ig, `'mk'`)
+ _sql = _sql.replace(/@work_grade@/ig, `'0'`)
+ }
+
+ if (_backCustomScript) {
+ _sql += _backCustomScript
+ }
+
+ if (btn.procMode === 'system') {
+ _sql += `
+ aaa: if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@`
+ } else if (btn.output) {
+ _sql += `
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id`
+ } else {
+ _sql += `
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+ }
+
+ _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
+ _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
+ _sql = _sql.replace(/@LoginUID@/ig, `'LoginUID'`)
+ _sql = _sql.replace(/@SessionUid@/ig, `'SessionUid'`)
+ _sql = _sql.replace(/@UserID@/ig, `'UserID'`)
+ _sql = _sql.replace(/@Appkey@/ig, `'appkey'`)
+ _sql = _sql.replace(/@typename@/ig, `'typename'`)
+ _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, `''`)
+
+ return _sql
+ }
- // if (item.required) {
- // required = true
- // }
+ getExcelInSql = (item) => {
+ let btn = item.verify
+ let userName = 'User_Name'
+ let fullName = 'Full_Name'
+ let RoleID = 'role_id'
+ let departmentcode = 'departmentcode'
+ let organization = 'organization'
+ let mk_user_type = 'mk_user_type'
+ let nation = 'nation'
+ let province = 'province'
+ let city = 'city'
+ let district = 'district'
+ let address = 'address'
+ let _sheet = item.sheet
+
+ if (window.GLOB.externalDatabase !== null) {
+ _sheet = _sheet.replace(/@db@/ig, window.GLOB.externalDatabase)
+ }
+
+ let database = _sheet.match(/(.*)\.(.*)\./ig)
+ let sheet = _sheet.replace(/(.*)\.(.*)\./ig, '')
+
+ database = database ? (database[0] || '') : ''
+
+ let getuuid = () => {
+ let uuid = []
+ let timestamp = new Date().getTime()
+ let _options = '0123456789abcdefghigklmnopqrstuv'
+ for (let i = 0; i < 19; i++) {
+ uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
+ }
+ uuid = timestamp + uuid.join('')
+ return uuid
+ }
- // if (item.type === 'text' || item.type === 'select') {
- // if (/,/.test(item.field)) {
- // item.field.split(',').forEach(field => {
- // keys.push(field.toLowerCase())
- // })
- // } else {
- // keys.push(item.field.toLowerCase())
- // }
- // } else if (item.type === 'group') {
- // keys.push(item.field.toLowerCase())
- // keys.push(item.datefield.toLowerCase())
- // }
+ let upId = getuuid()
+
+ let vals = []
+ btn.columns.forEach(col => {
+ if (col.import === 'false') return
- // return item
- // })
+ let val = ''
+ if (col.import === 'init') {
+ if (/^Nvarchar/ig.test(col.type)) {
+ val = ''
+ } else if (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type)) {
+ val = 0
+ } else if (col.type === 'date') {
+ val = '1949-10-01'
+ } else if (col.type === 'datetime') {
+ val = '1949-10-01 00:00:00'
+ }
+ } else if (/^Nvarchar/ig.test(col.type)) {
+ val = 'mk'
+ } else if (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type)) {
+ val = 1
+ } else if (col.type === 'date') {
+ val = '1949-10-01'
+ } else if (col.type === 'datetime') {
+ val = '1949-10-01 00:00:00'
+ }
- // config.$s_keys = keys
- // config.$s_req = required
- // }
+ vals.push(`'${val}'`)
+ })
+ vals.push(`'${upId}000010'`)
+ vals.push(`'bid'`)
+
+ vals = `Select ${vals.join(',')}`
+
+ let sql = ''
+
+ let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
+ let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
+ let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+ let regs = [
+ {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: ` #${sheet} `},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: ` #${sheet}(`},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: ` #${sheet})`},
+ {reg: /@ID@/ig, value: `'id'`},
+ {reg: /@BID@/ig, value: `'bid'`},
+ {reg: /@LoginUID@/ig, value: `'LoginUID'`},
+ {reg: /@SessionUid@/ig, value: `'SessionUid'`},
+ {reg: /@UserID@/ig, value: `'UserID'`},
+ {reg: /@Appkey@/ig, value: `'appkey'`},
+ {reg: /@typename@/ig, value: `'admin'`},
+ {reg: /\$@/ig, value: ''},
+ {reg: /@\$/ig, value: ''},
+ {reg: /@datam@/ig, value: `''`},
+ ]
+
+ if (window.GLOB.externalDatabase !== null) {
+ regs.push({reg: /@db@/ig, value: window.GLOB.externalDatabase})
+ }
+
+ btn.scripts && btn.scripts.forEach(script => {
+ if (script.status === 'false') return
+
+ let _sql = script.sql
+
+ regs.forEach(item => {
+ _sql = _sql.replace(item.reg, item.value)
+ })
+
+ if (script.position === 'init') {
+ _initCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${_sql}
+ `
+ } else if (script.position === 'front') {
+ _prevCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${_sql}
+ `
+ } else {
+ _backCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${_sql}
+ `
+ }
+ })
+
+ let _uniquesql = ''
+ if (btn.uniques && btn.uniques.length > 0) {
+ btn.uniques.forEach(unique => {
+ if (unique.status === 'false' || !unique.verifyType) return
+
+ let _fields = unique.field.split(',')
+ let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
+ let _afields = _fields.map(_field => `a.${_field}`)
+ _fields_ = _fields_.join(' and ')
+
+ if (unique.verifyType === 'logic' || unique.verifyType === 'logic_temp') {
+ _fields_ += ' and b.deleted=0'
+ }
+
+ _uniquesql += `
+ /* 閲嶅鎬ч獙璇� */
+ Set @tbid=''
+ Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from #${sheet} ) a group by ${unique.field} having sum(n)>1
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 閲嶅'
+ goto aaa
+ end
+
+ ${unique.verifyType.indexOf('temp') === -1 ? `Set @tbid=''
+ Select top 1 @tbid=${_afields.join('+\' \'+')} from #${sheet} a Inner join ${sheet} b on ${_fields_}
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 涓庡凡鏈夋暟鎹噸澶�'
+ goto aaa
+ end` : ''}
+ `
+ })
+ }
+
+ let declarefields = []
+ let fields = []
+
+ btn.columns.forEach(col => {
+ if (col.import === 'false') return
+
+ if (col.type === 'date') {
+ declarefields.push(`${col.Column} Nvarchar(50)`)
+ } else {
+ declarefields.push(`${col.Column} ${col.type}`)
+ }
+ fields.push(col.Column)
+ })
+
+ fields = fields.join(',')
+
+ let _insert = ''
+ if (btn.default !== 'false') {
+ _insert = `
+ /* 榛樿sql */
+ Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid)
+ Select ${fields},'${sessionStorage.getItem('UserID') || ''}',@username,@fullname,'bid' From #${sheet}
+ `
+ }
+
+ sql = `create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50) )
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+
+ Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
+ ${_initCustomScript}
+
+ Insert into #${sheet} (${fields},jskey,BID)
+
+ /* excel鏁版嵁*/
+ ${vals}
+
+ ${_uniquesql}
+ ${_prevCustomScript}
+ ${_insert}
+ ${_backCustomScript}
+
+ drop table #${sheet}
+
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+
+ return sql
+ }
+
+ getEditTableSql = (verify, cols, columns) => {
+ let btn = verify
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let RoleID = sessionStorage.getItem('role_id') || ''
+ let departmentcode = sessionStorage.getItem('departmentcode') || ''
+ let organization = sessionStorage.getItem('organization') || ''
+ let mk_user_type = sessionStorage.getItem('mk_user_type') || ''
+ let nation = sessionStorage.getItem('nation') || ''
+ let province = sessionStorage.getItem('province') || ''
+ let city = sessionStorage.getItem('city') || ''
+ let district = sessionStorage.getItem('district') || ''
+ let address = sessionStorage.getItem('address') || ''
+
+ let _sheet = btn.sheet
+ let BID = 'bid'
+
+ if (window.GLOB.externalDatabase !== null) {
+ _sheet = _sheet.replace(/@db@/ig, window.GLOB.externalDatabase)
+ }
+
+ let database = _sheet.match(/(.*)\.(.*)\./ig)
+ let sheet = _sheet.replace(/(.*)\.(.*)\./ig, '')
+
+ database = database ? (database[0] || '') : ''
+
+ let vals = []
+ let forms = []
+ let _fields = {}
+
+ columns.forEach(col => {
+ _fields[col.field] = col.datatype
+ })
+
+ let getColumns = (cols) => {
+ cols.forEach(item => {
+ if (item.type === 'colspan') {
+ getColumns(item.subcols)
+ } else if (item.editable === 'true') {
+ forms.push({
+ field: item.field,
+ type: item.type,
+ datatype: _fields[item.field] || 'nvarchar(50)'
+ })
+ }
+ })
+ }
+
+ getColumns(cols)
+
+ forms.forEach(col => {
+ if (col.type === 'number') {
+ vals.push(`1`)
+ } else {
+ vals.push(`'mk'`)
+ }
+ })
+
+ vals.push(`'uuid'`)
+ vals.push(`'upt'`)
+ vals.push(`'${BID}'`)
+
+ vals = `Select ${vals.join(',')}`
+
+ let sql = ''
+
+ let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
+ let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
+ let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+ let isDM = sessionStorage.getItem('dataM') === 'true'
+ let regs = [
+ {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: ` #${sheet} `},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: ` #${sheet}(`},
+ {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: ` #${sheet})`},
+ {reg: /@BID@/ig, value: `'${BID}'`},
+ {reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
+ {reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
+ {reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
+ {reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ {reg: /@typename@/ig, value: `'admin'`},
+ {reg: /\$@/ig, value: isDM ? '/*' : ''},
+ {reg: /@\$/ig, value: isDM ? '*/' : ''},
+ {reg: /@datam@/ig, value: isDM ? `'Y'` : `''`},
+ ]
+
+ if (window.GLOB.externalDatabase !== null) {
+ regs.push({reg: /@db@/ig, value: window.GLOB.externalDatabase})
+ }
+
+ btn.scripts && btn.scripts.forEach(script => {
+ if (script.status === 'false') return
+
+ let _sql = script.sql
+
+ regs.forEach(item => {
+ _sql = _sql.replace(item.reg, item.value)
+ })
+
+ if (script.position === 'init') {
+ _initCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${_sql}
+ `
+ } else if (script.position === 'front') {
+ _prevCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${_sql}
+ `
+ } else {
+ _backCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${_sql}
+ `
+ }
+ })
+
+ let _uniquesql = ''
+ if (btn.uniques && btn.uniques.length > 0) {
+ btn.uniques.forEach(unique => {
+ if (unique.status === 'false' || !unique.verifyType) return
+
+ let _fields = unique.field.split(',')
+ let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
+ let _afields = _fields.map(_field => `a.${_field}`)
+ _fields_ = _fields_.join(' and ')
+
+ if (unique.verifyType === 'logic' || unique.verifyType === 'logic_temp') {
+ _fields_ += ' and b.deleted=0'
+ }
+
+ _uniquesql += `
+ /* 閲嶅鎬ч獙璇� */
+ Set @tbid=''
+ Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from #${sheet} ) a group by ${unique.field} having sum(n)>1
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 閲嶅'
+ goto aaa
+ end
+
+ ${unique.verifyType.indexOf('temp') === -1 ? `Set @tbid=''
+ Select top 1 @tbid=${_afields.join('+\' \'+')} from #${sheet} a Inner join ${sheet} b on ${_fields_}
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 涓庡凡鏈夋暟鎹噸澶�'
+ goto aaa
+ end` : ''}
+ `
+ })
+ }
+
+ let declarefields = []
+ let fields = []
+
+ forms.forEach(col => {
+ let key = col.field.toLowerCase()
+ if (key === 'jskey' || key === 'bid' || key === 'data_type') return
+
+ declarefields.push(`${col.field} ${col.datatype}`)
+ fields.push(col.field)
+ })
+
+ fields = fields.join(',')
+
+ let _insert = ''
+ if (btn.default !== 'false') {
+ _insert = `
+ /* 榛樿sql */
+ Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid)
+ Select ${fields},'${sessionStorage.getItem('UserID') || ''}',@username,@fullname,'${BID}' From #${sheet}
+ `
+ }
+
+ sql = `create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(50) )
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+
+ Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
+ ${_initCustomScript}
+ Insert into #${sheet} (${fields},jskey,data_type,BID)
+
+ /* excel鏁版嵁*/
+ ${vals}
+
+ ${_uniquesql}
+ ${_prevCustomScript}
+ ${_insert}
+ ${_backCustomScript}
+
+ drop table #${sheet}
+
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+
+ return sql
+ }
+
+ getExcelOutSql = (btn, component) => {
+ let item = {setting: {}, columns: [], search: []}
+
+ btn.verify.columns.forEach(col => {
+ if (col.Column && col.Column !== '$Index') {
+ item.columns.push({
+ field: col.Column
+ })
+ }
+ })
+
+ if (btn.verify.useSearch !== 'false') {
+ item.search = component.$searches
+ }
+
+ item.setting.interType = 'system'
+ item.setting.execute = btn.verify.defaultSql || 'true'
+ item.setting.dataresource = btn.verify.dataresource || ''
+ item.setting.primaryKey = btn.verify.primaryKey || component.setting.primaryKey || 'ID'
+ item.setting.queryType = btn.verify.queryType
+ item.setting.laypage = btn.pagination
+ item.setting.order = btn.verify.order || ''
+
+ item.scripts = btn.verify.scripts || []
+
+ let regs = [
+ { reg: /\$@/ig, value: '' },
+ { reg: /@\$/ig, value: '' },
+ { reg: /@datam@/ig, value: `''` },
+ ]
+
+ if (window.GLOB.externalDatabase !== null) {
+ regs.push({
+ reg: /@db@/ig,
+ value: window.GLOB.externalDatabase
+ })
+ }
+
+ let sql = this.formatDataSource(item, regs)
+
+ return sql
+ }
+
+ formatDataSource = (item, regs, mainSearch = []) => {
+ if (!item.setting || item.setting.interType !== 'system') return false
+
+ let searches = item.search || []
+ if (item.setting.useMSearch === 'true' && mainSearch.length > 0) {
+ searches = [...searches, ...mainSearch]
+ }
+ item.$searches = fromJS(searches).toJS()
+ searches = formatSearch(searches)
+
+ let _columns = item.columns || []
+ if (item.subtype === 'dualdatacard') {
+ _columns = [...item.columns, ...item.subColumns]
+ }
+
+ let arr_field = _columns.map(col => col.field).join(',')
+
+ let _customScript = ''
+ let _tailScript = ''
+ let _dataresource = ''
+ item.scripts && item.scripts.forEach(script => {
+ if (script.status === 'false') return
+ if (script.position !== 'back') {
+ _customScript += `
+ ${script.sql}
+ `
+ } else {
+ _tailScript += `
+ ${script.sql}
+ `
+ }
+ })
+
+ if (item.setting.execute !== 'false') {
+ _dataresource = item.setting.dataresource || ''
+ }
+
+ let _search = joinMainSearchkey(searches)
+ if (item.setting.queryType === 'statistics') {
+ _search = ''
+ }
+
+ if (/\s/.test(_dataresource)) {
+ _dataresource = '(' + _dataresource + ') tb'
+ }
+
+ item.setting.dataresource = _dataresource
+ item.setting.customScript = _customScript
+
+ let custompage = /@pageSize@|@orderBy@/i.test(_dataresource + _customScript)
+
+ if (_dataresource) {
+ if (custompage) {
+ _dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search} `
+ } else if (item.setting.laypage === 'true' && item.setting.order) {
+ _dataresource = `/*system_query*/select top 10 ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${item.setting.order}) as rows from ${_dataresource} ${_search}) tmptable where rows > 0 order by tmptable.rows `
+ } else if (item.setting.order) {
+ _dataresource = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${item.setting.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
+ } else {
+ _dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search} `
+ }
+ }
+
+ let sql = ''
+ if (_customScript) {
+ sql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg =''
+ ${_customScript}
+ ${_dataresource}
+ ${_tailScript}
+ aaa:
+ if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '1949-10-01 15:00:00',@ErrorCode, @retmsg,'1949-10-01 15:00:00'
+ `
+ } else if (_tailScript) {
+ sql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg =''
+ ${_dataresource}
+ ${_tailScript}
+ aaa:
+ if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '1949-10-01 15:00:00',@ErrorCode, @retmsg,'1949-10-01 15:00:00'
+ `
+ } else {
+ sql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg =''
+ ${_dataresource}`
+ }
+
+ regs.forEach(cell => {
+ sql = sql.replace(cell.reg, cell.value)
+ })
+
+ let regoptions = getSearchRegs(searches)
+ regoptions.push(
+ { reg: /@orderBy@/ig, value: item.setting.order || '' },
+ { reg: /@pageSize@/ig, value: 9999 },
+ { reg: /@pageIndex@/ig, value: 1},
+ { reg: /@ID@/ig, value: `''`},
+ { reg: /@BID@/ig, value: `''`},
+ { reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
+ { reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
+ { reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
+ { reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ { reg: /@typename@/ig, value: `'admin'`},
+ )
+
+ if (item.type === 'calendar') {
+ regoptions.push({ reg: /@mk_year@/ig, value: '2023' })
+ }
+
+ regoptions.forEach(cell => {
+ sql = sql.replace(cell.reg, cell.value)
+ })
+
+ return sql
+ }
+
+ continue = () => {
+ this.setState({status: 'continue'}, () => {
+ this.roopSql()
+ })
+ }
+
+ roopSql = () => {
+ if (this.verSqls.length === 0) {
+ this.setState({status: 'over'})
+ return
+ }
+
+ if (this.state.status === 'stop') return
+
+ let item = this.verSqls.shift()
+
+ this.setState({status: this.verSqls.length > 0 ? 'loading' : 'over', execId: item.uuid})
+
+ console.info(`/* 缁勪欢锛�${item.name} 妫�楠岄」锛�${item.label} */`)
+
+ Api.sDebug(item.sql).then(result => {
+ if (result.status || result.ErrCode === '-2') {
+ this.setState({successIds: [...this.state.successIds, item.uuid], execId: ''})
+ if (this.verSqls.length > 0) {
+ setTimeout(() => {
+ this.roopSql()
+ }, 100)
+ }
+ } else {
+ let errorMsg = fromJS(this.state.errorMsg).toJS()
+ errorMsg[item.uuid] = result.message
+
+ this.setState({
+ execId: '',
+ status: this.verSqls.length > 0 ? 'error' : 'over',
+ errorIds: [...this.state.errorIds, item.uuid],
+ errorMsg: errorMsg
+ })
+
+ Modal.error({
+ title: result.message
+ })
+ }
+ })
+ }
+
+ stop = () => {
+ this.setState({status: 'stop'})
+ }
+
+ over = () => {
+ this.verSqls = []
+ this.setState({status: 'over', visible: false})
+ }
render() {
- const { visible, confirming } = this.state
+ const { visible, sqlList, status, successIds, errorIds, execId, errorMsg } = this.state
return (
<>
<Button className="mk-border-yellow" icon="bug" onClick={this.trigger}>璋冭瘯</Button>
- <Modal
- title="SQL楠岃瘉"
- wrapClassName="debug-modal"
- visible={visible}
+ <Drawer
+ className="debug-modal"
width={600}
- maskClosable={false}
- onOk={this.submit}
- onCancel={() => { this.setState({ visible: false })}}
- confirmLoading={confirming}
+ visible={visible}
+ closable={false}
+ placement="left"
destroyOnClose
>
- </Modal>
+ <div className="mk-sql-wrap">
+ {/* <div className="header">
+ <div className="sql-item">
+ <div className="sql-1">缁勪欢</div>
+ <div className="sql-2">妫�楠岄」</div>
+ <div className="sql-3">鍏朵粬</div>
+ <div className="sql-4">鐘舵��</div>
+ </div>
+ </div> */}
+ <div className="body">
+ {sqlList.map(item => {
+ let other = ''
+ if (item.supName) {
+ other = `涓婄骇锛�${item.supName}-${item.tabName}`
+ }
+
+ let status = <ClockCircleOutlined />
+
+ if (successIds.includes(item.uuid)) {
+ status = <CheckCircleOutlined />
+ } else if (errorIds.includes(item.uuid)) {
+ if (errorMsg[item.uuid]) {
+ status = <Tooltip placement="topLeft" title={errorMsg[item.uuid]}>
+ <CloseCircleOutlined />
+ </Tooltip>
+ } else {
+ status = <CloseCircleOutlined />
+ }
+ } else if (item.uuid === execId) {
+ status = <LoadingOutlined />
+ }
+
+ return <div className="sql-item" key={item.uuid}>
+ <div className="sql-1" title={item.name}><div>{item.name}</div></div>
+ <div className="sql-2" title={item.label}><div>{item.label}</div></div>
+ <div className="sql-3" title={other}><div>{other}</div></div>
+ <div className="sql-4">{status}</div>
+ </div>
+ })}
+ </div>
+ </div>
+ <div className="mk-footer">
+ {status === 'error' ? <Button key="skip" className="mk-border-green" onClick={this.roopSql}>
+ 璺宠繃
+ </Button> : null}
+ {status === 'loading' ? <Button key="stop" className="mk-border-orange" onClick={this.stop}>
+ 鏆傚仠
+ </Button> : null}
+ {status === 'stop' ? <Button key="continue" className="mk-border-orange" onClick={this.continue}>
+ 缁х画
+ </Button> : null}
+ <Button key="colse" className="mk-border-danger" onClick={this.over}>
+ 鍏抽棴
+ </Button>
+ </div>
+ </Drawer>
</>
)
}
diff --git a/src/menu/debug/index.scss b/src/menu/debug/index.scss
index de57aff..9e9bb25 100644
--- a/src/menu/debug/index.scss
+++ b/src/menu/debug/index.scss
@@ -1,9 +1,106 @@
-.replace-field-modal {
- .ant-modal {
- top: 70px;
+.debug-modal {
+ .ant-drawer-body {
+ position: relative;
+ height: 100vh;
+ padding: 0 0 50px 0;
+ overflow: hidden;
+ color: rgba(0, 0, 0, 0.85);
+
+ .mk-sql-wrap {
+ padding: 10px;
+
+ .sql-item {
+ display: flex;
+ min-height: 30px;
+
+ .sql-1, .sql-2 {
+ flex: 1;
+ width: 25%;
+ max-width: 25%;
+ display: flex;
+ align-items: center;
+
+ div {
+ overflow: hidden;
+ word-break: break-word;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+ .sql-3 {
+ flex: 1;
+ width: 30%;
+ max-width: 30%;
+ display: flex;
+ align-items: center;
+
+ div {
+ overflow: hidden;
+ word-break: break-word;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+ .sql-4 {
+ flex: 1;
+ width: 20%;
+ max-width: 20%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .anticon {
+ font-size: 16px;
+ }
+ .anticon-clock-circle {
+ color: #c8c8c8;
+ }
+ .anticon-check-circle {
+ color: #26C281;
+ }
+ .anticon-close-circle {
+ color: red;
+ }
+ .anticon-loading {
+ color: orange;
+ }
+ }
+ }
+ .header {
+ border-bottom: 1px solid #e8e8e8;
+ }
+ .body {
+ max-height: calc(100vh - 60px);
+ overflow-y: auto;
+ }
+ }
+
+ .mk-sql-wrap .body::-webkit-scrollbar {
+ width: 7px;
+ }
+ .mk-sql-wrap .body::-webkit-scrollbar-thumb {
+ border-radius: 5px;
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.13);
+ background: rgba(0, 0, 0, 0.13);
+ }
+ .mk-sql-wrap .body::-webkit-scrollbar-track {
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
+ border-radius: 3px;
+ border: 1px solid rgba(0, 0, 0, 0.07);
+ background: rgba(0, 0, 0, 0);
+ }
}
- .ant-modal-body {
- min-height: 150px;
- padding-top: 40px;
+ .mk-footer {
+ position: absolute;
+ bottom: 0px;
+ width: 100%;
+ height: 45px;
+ line-height: 50px;
+ border-top: 1px solid #e8e8e8;
+ text-align: right;
+ padding-right: 20px;
+ .ant-btn:not(:first-child) {
+ margin-left: 15px;
+ }
}
}
\ No newline at end of file
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index ce12936..ecaae08 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -112,7 +112,6 @@
config.flow_code = result.works_flow_code
config.flow_name = result.works_flow_name
unset = false
-
window.GLOB.UserCacheMap.set('flow' + MenuID, flowConfig)
} catch (e) {
unset = true
diff --git a/src/tabviews/custom/components/chart/antv-X6/index.jsx b/src/tabviews/custom/components/chart/antv-X6/index.jsx
index 3b654c5..97525bc 100644
--- a/src/tabviews/custom/components/chart/antv-X6/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/index.jsx
@@ -1003,8 +1003,16 @@
if (!isNew) return
let target = edge.getTargetCell()
- let mkdata = target ? target.prop('mkdata') : null
+ if (!target) return
+
+ let mkdata = target.prop('mkdata')
+
+ if (target.prop('mknode') === 'end') {
+ edge.prop('mknode', 'endEdge')
+ } else if (target.prop('mknode') === 'start') {
+ edge.prop('mknode', 'startEdge')
+ }
if (mkdata) {
edge.prop('mkdata', {status: mkdata.status, statusName: mkdata.statusName})
}
@@ -1550,10 +1558,23 @@
let _status = status
if (plot.subtype === 'xflow' && status === 10) {
- let start_num = nodes.cells.filter(cell => cell.mknode === 'start').length
- let end_num = nodes.cells.filter(cell => cell.mknode === 'end').length
+ let start_num = 0
+ let end_num = 0
+ let unvalid = false
- if (start_num !== 1 || end_num !== 1) {
+ nodes.cells.forEach(item => {
+ if (item.mknode === 'start') {
+ start_num++
+ } else if (item.mknode === 'end') {
+ end_num++
+ } else if (item.shape === 'edge' && item.mknode !== 'endEdge' && item.mknode !== 'startEdge') {
+ if (!item.mkdata.members || item.mkdata.members.length === 0) {
+ unvalid = true
+ }
+ }
+
+ })
+ if (start_num !== 1 || end_num !== 1 || unvalid) {
_status = 0
}
}
@@ -1968,8 +1989,22 @@
if (plot.subtype === 'xflow' && _status === 10) {
let nodes = this.mkGraph.toJSON()
- let start_num = nodes.cells.filter(cell => cell.mknode === 'start').length
- let end_num = nodes.cells.filter(cell => cell.mknode === 'end').length
+
+ let start_num = 0
+ let end_num = 0
+ let unvalidId = ''
+
+ nodes.cells.forEach(item => {
+ if (item.mknode === 'start') {
+ start_num++
+ } else if (item.mknode === 'end') {
+ end_num++
+ } else if (item.shape === 'edge' && item.mknode !== 'endEdge' && item.mknode !== 'startEdge') {
+ if (!item.mkdata.members || item.mkdata.members.length === 0) {
+ unvalidId = item.id
+ }
+ }
+ })
if (start_num === 0) {
notification.warning({
@@ -1995,6 +2030,23 @@
message: '缁撴潫鑺傜偣涓嶅彲娣诲姞澶氫釜锛�',
duration: 2
})
+ } else if (unvalidId) {
+ let edge = this.mkGraph.getCellById(unvalidId)
+
+ let node = edge.getTargetCell()
+
+ let title = ''
+ if (node.attrs && node.attrs.text) {
+ title = node.attrs.text.text + ''
+ } else if (node.mkdata) {
+ title = '鐘舵�侊細' + node.mkdata.status + ' - ' + node.mkdata.statusName
+ }
+
+ notification.warning({
+ top: 92,
+ message: '杩炴帴锛�' + title + '锛夌殑绾挎湭璁剧疆瀹℃壒浜猴紒',
+ duration: 2
+ })
} else {
this.setState({status: _status})
}
diff --git a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
index 22c8d18..bf50398 100644
--- a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
@@ -474,6 +474,7 @@
{mkdata ? <div className="mk-data">
<div>鐘舵�侊細{mkdata.status}<span style={{float: 'right'}}>{mkdata.statusName}</span></div>
{mknode.shape !== 'edge' && !mknode.mknode ? <div>鏍囪锛歿mkdata.sign || ''}</div> : null}
+ {mknode.shape === 'edge' && mkdata.flowType ? <div>鎿嶄綔锛歿mkdata.flowType === 'reject' ? '椹冲洖' : '瀹℃壒'}</div> : null}
{mkdata.members && mkdata.members.length ? <div>瀹℃壒浜猴細{mkdata.members.map(item => item.workername).join('銆�')}</div> : null}
{mkdata.copys && mkdata.copys.length ? <div>鎶勯�佷汉锛歿mkdata.copys.map(item => item.workername).join('銆�')}</div> : null}
<div>澶囨敞锛歿mkdata.remark || ''}</div>
diff --git a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx
index e155c71..4d6fc81 100644
--- a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx
@@ -13,7 +13,9 @@
orgs: PropTypes.array
}
- state = {}
+ state = {
+ flowType: this.props.data.flowType || 'approval'
+ }
handleConfirm = () => {
return new Promise((resolve, reject) => {
@@ -30,6 +32,7 @@
render() {
const { node, orgs } = this.props
const { getFieldDecorator } = this.props.form
+ const { flowType } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -46,6 +49,10 @@
nodetype = 'start'
} else if (node.mknode === 'end') {
nodetype = 'end'
+ } else if (node.mknode === 'endEdge') {
+ nodetype = 'endEdge'
+ } else if (node.mknode === 'startEdge') {
+ nodetype = 'startEdge'
}
return (
@@ -62,7 +69,7 @@
}
]
})(
- <InputNumber precision={0}/>
+ <InputNumber readOnly={nodetype !== 'node' && nodetype !== 'edge'} precision={0}/>
)}
</Form.Item>
</Col>
@@ -90,6 +97,18 @@
</Form.Item>
</Col> : null}
{nodetype === 'edge' ? <Col span={12}>
+ <Form.Item label="鎿嶄綔绫诲瀷">
+ {getFieldDecorator('flowType', {
+ initialValue: flowType
+ })(
+ <Radio.Group onChange={(e) => this.setState({flowType: e.target.value})}>
+ <Radio value="approval">瀹℃壒</Radio>
+ <Radio value="reject">椹冲洖</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col> : null}
+ {nodetype === 'edge' ? <Col span={12}>
<Form.Item label="璁剧疆瀹℃壒浜�">
{getFieldDecorator('approver', {
initialValue: data.approver || 'member'
@@ -102,7 +121,7 @@
)}
</Form.Item>
</Col> : null}
- {nodetype === 'edge' ? <Col span={12}>
+ {nodetype === 'edge' && flowType !== 'reject' ? <Col span={12}>
<Form.Item label="瀹℃壒鏂瑰紡">
{getFieldDecorator('approvalMethod', {
initialValue: data.approvalMethod || 'orsign'
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 7eb85d2..2c61e4c 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -278,7 +278,7 @@
config.components = this.formatSetting(config.components, params, inherit, regs, balMap)
- if ([...balMap.keys()].length > 0) {
+ if (balMap.size > 0) {
config.components = this.filterBalcony(config.components, balMap)
}
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 2c36b13..0048ca1 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -158,7 +158,7 @@
config.components = this.formatSetting(config.components, params, regs, balMap)
- if ([...balMap.keys()].length > 0) {
+ if (balMap.size > 0) {
config.components = this.filterBalcony(config.components, balMap)
}
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index be84eac..15a050e 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -766,7 +766,7 @@
_setting.arr_field = _setting.arr_field.join(',')
_setting.execute = btn.verify.defaultSql !== 'false'
_setting.dataresource = btn.verify.dataresource || ''
- _setting.primaryKey = _setting.primaryKey || setting.primaryKey || 'ID'
+ _setting.primaryKey = btn.verify.primaryKey || setting.primaryKey || 'ID'
if (!_setting.execute) {
_setting.dataresource = ''
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
index e3b1342..04b1446 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
@@ -12,7 +12,6 @@
let regoptions = getSearchRegs(_search)
_search = joinMainSearchkey(_search)
- _search = _search ? 'where ' + _search : ''
let arr_field = []
verify.columns.forEach(item => {
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index 3c65cb8..8c0ab17 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -222,7 +222,6 @@
let _dataresource = res.dataresource
let _search = joinMainSearchkey(searches)
- _search = _search ? 'where ' + _search : ''
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index 4f1413c..c728c2b 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -54,7 +54,6 @@
let _regoptions = getSearchRegs(searches)
let _search = joinMainSearchkey(searches)
- _search = _search ? 'where ' + _search : ''
// 姝ｅ垯鏇挎崲
if (urlFields && urlFields.length > 0) {
@@ -67,8 +66,14 @@
}
_regoptions.push({
+ reg: new RegExp('@userName@', 'ig'),
+ value: `'mk'`
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: `'mk'`
+ }, {
reg: new RegExp('@orderBy@', 'ig'),
- value: setting.order
+ value: setting.order || ''
}, {
reg: new RegExp('@pageSize@', 'ig'),
value: 10
diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index 69e7a3b..0b533e8 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -51,6 +51,8 @@
this.onTableChange(table)
} else if (type === 'del') {
this.deleteTable(table)
+ } else if (type === 'init' && window.GLOB.publicTables.length === 0) {
+ this.onTableChange(table)
}
}
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index bf078be..465c68d 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -44,7 +44,7 @@
}
handleConfirm = () => {
- const { type, workFlow } = this.props
+ const { type, workFlow, flowType } = this.props
const { editItem, skip } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
@@ -185,14 +185,22 @@
sql = sql.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'1949-10-01 15:00:00'`)
if (window.GLOB.process && workFlow === 'true') {
- sql = sql.replace(/@works_flow_code@/ig, `'1949-10-01 15:00:00'`)
- sql = sql.replace(/@works_flow_name@/ig, `'1949-10-01 15:00:00'`)
- sql = sql.replace(/@works_flow_param@/ig, `'1949-10-01 15:00:00'`)
- sql = sql.replace(/@works_flow_detail_id@/ig, `'1949-10-01 15:00:00'`)
- sql = sql.replace(/@status@/ig, `'1949-10-01 15:00:00'`)
- sql = sql.replace(/@statusname@/ig, `'1949-10-01 15:00:00'`)
- sql = sql.replace(/@work_group@/ig, `'1949-10-01 15:00:00'`)
- sql = sql.replace(/@work_grade@/ig, `'1949-10-01 15:00:00'`)
+ sql = sql.replace(/@works_flow_code@/ig, `'works_flow_code'`)
+ sql = sql.replace(/@works_flow_name@/ig, `'works_flow_name'`)
+ sql = sql.replace(/@works_flow_param@/ig, `'works_flow_param'`)
+ sql = sql.replace(/@works_flow_detail_id@/ig, `'works_flow_detail_id'`)
+ sql = sql.replace(/@status@/ig, `0`)
+ sql = sql.replace(/@statusname@/ig, `'寮�濮�'`)
+ sql = sql.replace(/@work_group@/ig, `'work_group'`)
+ sql = sql.replace(/@work_grade@/ig, '0')
+ sql = sql.replace(/@start_type@/ig, `'寮�濮�'`)
+ sql = sql.replace(/@check_type@/ig, `'瀹℃牳'`)
+ sql = sql.replace(/@notice_type@/ig, `'鎶勯��'`)
+
+ if (flowType !== 'start') {
+ sql = sql.replace(/@check_userids@/ig, `'checkuserids'`)
+ sql = sql.replace(/@notice_userids@/ig, `'noticeuserids'`)
+ }
}
if (skip) {
@@ -258,15 +266,34 @@
if (value === 'flowSql') {
if (flowType === 'start') {
- value = `insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
- select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName
- insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade)
- select @works_flow_id@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@`
+ value = `insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@
+ insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@`
} else {
- value = `insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
- select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName
- insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade)
- select @works_flow_id@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@`
+ value = `update s_my_works_flow set status=@status@,statusname=@statusname@,modifydate=getdate(),modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@
+ if @check_userids@ != ''
+ begin
+ delete s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+ insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,ID,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@)
+ insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@check_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@)
+ end
+ if @notice_userids@ != ''
+ begin
+ delete n
+ from (select * from s_my_works_flow_notice where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0) n
+ inner join (select ID from dbo.SplitComma(@notice_userids@)) s
+ on n.userid = s.id
+ insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@notice_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@notice_userids@)
+ end`
}
value = value.replace(/\n\s{8}/g, '\n')
@@ -321,6 +348,7 @@
<Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'绯荤粺鍙橀噺锛岀郴缁熶細瀹氫箟鍙橀噺骞惰祴鍊笺��'}><span style={{color: '#fa8c16'}}>UserName, FullName, RoleID, mk_departmentcode, mk_organization, mk_user_type, mk_nation, mk_province, mk_city, mk_district, mk_address, mk_deleted</span></Tooltip>,
<Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'绯荤粺鍙橀噺锛岀郴缁熶細瀹氫箟鍙橀噺骞跺湪鍗曞彿鐢熸垚鎴栧垱寤哄嚟璇佹椂浣跨敤銆�'}><span style={{color: '#13c2c2'}}>BillCode, BVoucher, FIBVoucherDate, FiYear, ModularDetailCode</span></Tooltip>
{usefulfields ? <span>, {usefulfields}</span> : ''}
+ {window.GLOB.process && workFlow === 'true' ? <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'宸ヤ綔娴佸彉閲忥紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆傛敞锛歝heck_userids銆乶otice_userids 鍦ㄥ鎵规垨椹冲洖鏃舵湁鏁堛��'}>,<span style={{color: 'purple'}}> works_flow_code, works_flow_name, works_flow_param, works_flow_detail_id, status, statusname, work_group, work_grade, start_type, check_type, notice_type, check_userids, notice_userids</span></Tooltip> : null}
</Form.Item>
</Col> : null}
{!_type ? <Col span={8} style={{whiteSpace: 'nowrap'}}>
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 9ad1446..59816a5 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -1034,7 +1034,7 @@
}
})
- return searchText.join(' AND ')
+ return searchText.length > 0 ? 'where ' + searchText.join(' AND ') : ''
}
/**
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 86577d3..54ed1de 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -138,7 +138,7 @@
]
if (type === 'customscript') {
- chars = chars.filter(char => !['insert', 'delete', 'update', 'set', 'if', 'exec'].includes(char.key))
+ chars = chars.filter(char => !['create', 'insert', 'delete', 'update', 'set', 'drop', 'if', 'exec'].includes(char.key))
}
let error = ''
@@ -2114,38 +2114,111 @@
let statusName = ''
let detailId = ''
- if (verify.flowSql === 'true') {
- if (verify.flowType === 'start') {
- target = flow.cells.filter(cell => cell.mknode === 'start')[0]
-
- if (target) {
- detailId = target.id
- status = target.mkdata.status
- statusName = target.mkdata.statusName
- }
- } else if (_data.works_flow_param) {
- node = JSON.parse(window.decodeURIComponent(window.atob(_data.works_flow_param)))
-
- if (node) {
- line = flow.cells.filter(cell => cell.shape === 'edge' && cell.source.cell === node.id)[0]
- }
-
- if (line) {
- target = flow.cells.filter(cell => cell.id === line.target.cell)[0]
- }
- }
+ if (verify.flowType === 'start') {
+ target = flow.cells.filter(cell => cell.mknode === 'start')[0]
if (target) {
- _sql += `
- /* 宸ヤ綔娴侀粯璁ql */
- insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
- select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName
- insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade)
- select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@
- `
+ detailId = target.id
+ status = target.mkdata.status
+ statusName = target.mkdata.statusName
+ }
+ } else if (_data.works_flow_param) {
+ node = JSON.parse(window.decodeURIComponent(window.atob(_data.works_flow_param)))
+
+ if (node) {
+ let lines = flow.cells.filter(cell => cell.shape === 'edge' && cell.source.cell === node.id)
+ if (verify.flowType === 'reject') {
+ line = lines.filter(cell => cell.mkdata.flowType === 'reject')[0]
+ } else {
+ line = lines.filter(cell => cell.mkdata.flowType !== 'reject')[0]
+ }
+ }
+
+ if (line) {
+ detailId = line.id
+ status = line.mkdata.status
+ statusName = line.mkdata.statusName
+ target = flow.cells.filter(cell => cell.id === line.target.cell)[0]
}
}
+ if (verify.flowSql === 'true' && target) {
+ if (verify.flowType === 'start') {
+ _sql += `
+ /* 宸ヤ綔娴侀粯璁ql */
+ insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@
+ insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@
+ `
+ } else {
+ _sql += `
+ /* 宸ヤ綔娴侀粯璁ql */
+ update s_my_works_flow set status=@status@,statusname=@statusname@,modifydate=getdate(),modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@
+ if @check_userids@ != ''
+ begin
+ delete s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+ insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,ID,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@)
+ insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@check_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@)
+ end
+ if @notice_userids@ != ''
+ begin
+ delete n
+ from (select * from s_my_works_flow_notice where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0) n
+ inner join (select ID from dbo.SplitComma(@notice_userids@)) s
+ on n.userid = s.id
+ insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@notice_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@notice_userids@)
+ end
+ `
+ }
+ } else if (verify.flowSql === 'true') {
+ target = flow.cells.filter(cell => cell.mknode === 'start')[0]
+
+ if (target) {
+ detailId = target.id
+ }
+
+ status = 0
+ statusName = '寮傚父'
+ _sql += `
+ /* 宸ヤ綔娴佸紓甯竤ql */
+ update s_my_works_flow set status=@status@,statusname=@statusname@,modifydate=getdate(),modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@
+ `
+ }
+
+ if (verify.flowType !== 'start') {
+ if (line) {
+ let checkIds = []
+ let noticeIds = []
+ line.mkdata.members && line.mkdata.members.forEach(item => {
+ checkIds.push(item.worker_id)
+ })
+ line.mkdata.copys && line.mkdata.copys.forEach(item => {
+ noticeIds.push(item.worker_id)
+ })
+ _sql = _sql.replace(/@check_userids@/ig, `'${checkIds.join(',')}'`)
+ _sql = _sql.replace(/@notice_userids@/ig, `'${noticeIds.join(',')}'`)
+ } else {
+ _sql = _sql.replace(/@check_userids@/ig, `''`)
+ _sql = _sql.replace(/@notice_userids@/ig, `''`)
+ }
+ }
+
+ _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
+ _sql = _sql.replace(/@check_type@/ig, verify.flowType === 'reject' ? `'椹冲洖'` : `'瀹℃牳'`)
+ _sql = _sql.replace(/@notice_type@/ig, `'鎶勯��'`)
+
_sql = _sql.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
_sql = _sql.replace(/@works_flow_name@/ig, `'${flow.flow_name}'`)
if (target) {
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 292a3cc..455baa1 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -1162,7 +1162,7 @@
<div className={'menu-view' + (menuloading ? ' saving' : '') + (eyeopen ? ' eye-open' : '')}>
<Card bordered={false} extra={
<div className="mk-opeartion-list">
- <Debug config={config}/>
+ {config ? <Debug config={config}/> : null}
<Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
<Versions MenuId={MenuId} open_edition={config ? config.open_edition : ''}/>
<TableNodes config={config} />
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 072814b..4946716 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -23,6 +23,7 @@
const { Paragraph } = Typography
const Header = asyncComponent(() => import('@/mob/header'))
+const Debug = asyncComponent(() => import('@/menu/debug'))
const MenuForm = asyncComponent(() => import('./menuform'))
const MobShell = asyncComponent(() => import('@/mob/mobshell'))
const CreateView = asyncComponent(() => import('@/pc/createview'))
@@ -2115,6 +2116,7 @@
<Button type="primary" className={needUpdate ? 'update-tip' : ''} onClick={this.submitConfig} id="save-config" loading={menuloading}>淇濆瓨</Button>
{config ? <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} /> : null}
<ArrowLeftOutlined title="鍚庨��" className="back-view" onClick={this.backView}/>
+ {config ? <Debug config={config}/> : null}
<Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
<CreateView resetmenu={this.getAppMenus} />
<PasteController insert={this.insert} />
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index e4239db..51d198e 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -24,6 +24,7 @@
const { Paragraph } = Typography
const MenuForm = asyncComponent(() => import('./menuform'))
+const Debug = asyncComponent(() => import('@/menu/debug'))
const Header = asyncComponent(() => import('@/menu/header'))
const PopView = asyncComponent(() => import('@/views/menudesign/popview'))
const Transfer = asyncComponent(() => import('@/pc/transfer'))
@@ -1727,6 +1728,7 @@
<Button type="primary" className={needUpdate ? 'update-tip' : ''} id="save-config" onClick={this.submitConfig} loading={menuloading}>淇濆瓨</Button>
{config ? <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} /> : null}
<ArrowLeftOutlined title="鍚庨��" className="back-view" onClick={this.backView}/>
+ {config ? <Debug config={config}/> : null}
<Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
<CreateView resetmenu={this.getAppMenus} />
<PasteController insert={this.insert} />
--
Gitblit v1.8.0