From 4cc738e535d1a20701d206e12cf9de8cc5a01170 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 01 六月 2024 15:24:12 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 138 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 122 insertions(+), 16 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index c58226f..be7041f 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -205,6 +205,89 @@
</div>
)
},
+ {
+ dataIndex: 'sqlRender',
+ render: (record) => {
+ let columns = this.state.verify.columns
+
+ let textFields = []
+ let numberFields = []
+ let dateFields = []
+ columns.forEach((col) => {
+ if (/Nvarchar/ig.test(col.type)) {
+ textFields.push(col.Column)
+ } else if (/Decimal|int/ig.test(col.type)) {
+ numberFields.push(col.Column)
+ } else if (/date/ig.test(col.type)) {
+ dateFields.push(col.Column)
+ }
+ })
+
+ let _fields = record.field.split(',')
+ let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
+ _fields_ = _fields_.join(' and ')
+
+ let _where = []
+ _fields.forEach(f => {
+ if (textFields.includes(f)) {
+ _where.push(`${f}!=''`)
+ } else if (numberFields.includes(f)) {
+ _where.push(`${f}!=0`)
+ } else if (dateFields.includes(f)) {
+ _where.push(`${f}>'1949-10-01'`)
+ }
+ })
+ _where = _where.length ? `where ${_where.join(' and ')} ` : ''
+
+ if (record.verifyType === 'logic' || record.verifyType === 'logic_temp') {
+ _fields_ += ' and b.deleted=0'
+ }
+
+ let _afields = []
+ _fields = _fields.map(f => {
+ if (numberFields.includes(f)) {
+ _afields.push(`cast(a.${f} as nvarchar(50))`)
+ return `cast(${f} as nvarchar(50))`
+ } else if (dateFields.includes(f)) {
+ _afields.push(`CONVERT(nvarchar(50), a.${f}, 21)`)
+ return `CONVERT(nvarchar(50), ${f}, 21)`
+ }
+ _afields.push(`a.${f}`)
+
+ return f
+ })
+
+ let _sheet = this.props.card.sheet
+
+ let database = _sheet.match(/(.*)\.(.*)\.|@db@/ig) || ''
+ let sheet = _sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')
+
+ database = database ? (database[0] || '') : ''
+
+ let sql = `
+ /* 閲嶅鎬ч獙璇� */
+ Set @tbid=''
+ Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${record.field} from #${sheet} ${_where}) a group by ${record.field} having sum(n)>1
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${record.errorCode}',@retmsg=@tbid+' 閲嶅'
+ goto aaa
+ end
+
+ ${record.verifyType.indexOf('temp') === -1 ? `Set @tbid=''
+ Select top 1 @tbid=${_afields.join('+\' \'+')} from ${_where ? `(select * from #${sheet} ${_where})` : `#${sheet}`} a Inner join ${database}${sheet} b on ${_fields_}
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${record.errorCode}',@retmsg=@tbid+' 涓庡凡鏈夋暟鎹噸澶�'
+ goto aaa
+ end` : ''}
+ `
+
+ return sql.split(/\n\s{10}/ig).map(n => n.replace(/^\s{2}/ig, ' '))
+ }
+ }
],
scriptsColumns: [
{
@@ -316,6 +399,16 @@
_verify.columns = _columns
_verify.scripts = _verify.scripts || []
_verify.uniques = _verify.uniques || []
+
+ if (window.GLOB.process && card.intertype === 'system') {
+ _verify.workFlow = _verify.workFlow || 'false'
+ _verify.flowType = 'start'
+ _verify.flowSql = _verify.flowSql || 'true'
+ } else {
+ delete _verify.workFlow
+ delete _verify.flowType
+ delete _verify.flowSql
+ }
this.setState({
searchKey: '',
@@ -792,21 +885,11 @@
})
}
- onOptionChange = (e) => {
+ onOptionChange = (value, key) => {
const { verify } = this.state
- let value = e.target.value
this.setState({
- verify: {...verify, default: value}
- })
- }
-
- onHandleChange = (e) => {
- const { verify } = this.state
- let value = e.target.value
-
- this.setState({
- verify: {...verify, excelHandle: value}
+ verify: {...verify, [key]: value}
})
}
@@ -888,8 +971,8 @@
<Form {...formItemLayout}>
<Row gutter={24}>
{card.intertype === 'system' ? <Col span={8}>
- <Form.Item label={'榛樿sql'}>
- <Radio.Group value={verify.default} onChange={this.onOptionChange}>
+ <Form.Item label="榛樿sql">
+ <Radio.Group value={verify.default} onChange={(e) => this.onOptionChange(e.target.value, 'default')}>
<Radio value="true">鎵ц</Radio>
<Radio value="false">涓嶆墽琛�</Radio>
</Radio.Group>
@@ -905,7 +988,7 @@
{getFieldDecorator('excelHandle', {
initialValue: verify.excelHandle
})(
- <Radio.Group onChange={this.onHandleChange}>
+ <Radio.Group onChange={(e) => this.onOptionChange(e.target.value, 'excelHandle')}>
<Radio value="false">榛樿</Radio>
<Radio value="true">鑷畾涔�</Radio>
</Radio.Group>)}
@@ -954,6 +1037,27 @@
})(<CodeMirror mode="text/javascript" theme="cobalt" />)}
</Form.Item>
</Col> : null}
+ {window.GLOB.process && card.intertype === 'system' ? <Col span={8}>
+ <Form.Item label={
+ <Tooltip placement="bottomLeft" title="瀵煎叆Excel宸ヤ綔娴佷粎鏀寔鍙戣捣娴佺▼銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 宸ヤ綔娴�
+ </Tooltip>
+ }>
+ <Radio.Group value={verify.workFlow} onChange={(e) => {this.onOptionChange(e.target.value, 'workFlow')}}>
+ <Radio value="true">寮�鍚�</Radio>
+ <Radio value="false">涓嶅紑鍚�</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Col> : null}
+ {verify.workFlow === 'true' ? <Col span={8}>
+ <Form.Item label="榛樿sql锛堝伐浣滄祦锛�">
+ <Radio.Group value={verify.flowSql} onChange={(e) => {this.onOptionChange(e.target.value, 'flowSql')}}>
+ <Radio value="true">鎵ц</Radio>
+ <Radio value="false">涓嶆墽琛�</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Col> : null}
</Row>
</Form>
</TabPane>
@@ -980,7 +1084,7 @@
</span>
} key="unique">
<UniqueForm fields={verify.columns} uniqueChange={this.uniqueChange}/>
- <EditTable actions={['edit', 'move', 'del', 'status']} data={verify.uniques} columns={uniqueColumns} onChange={this.changeUniques}/>
+ <EditTable actions={['edit', 'move', 'del', 'status', 'sql']} data={verify.uniques} columns={uniqueColumns} onChange={this.changeUniques}/>
</TabPane> : null}
{card.intertype === 'system' ? <TabPane tab={
<span>
@@ -1000,6 +1104,7 @@
btn={this.props.card}
usefulfields={verify.columns}
scripts={verify.scripts}
+ workFlow={verify.workFlow}
systemScripts={this.state.systemScripts}
scriptsChange={this.scriptsChange}
wrappedComponentRef={(inst) => this.scriptsFullForm = inst}
@@ -1009,6 +1114,7 @@
btn={this.props.card}
usefulfields={verify.columns}
scripts={verify.scripts}
+ workFlow={verify.workFlow}
systemScripts={this.state.systemScripts}
scriptsChange={this.scriptsChange}
wrappedComponentRef={(inst) => this.scriptsForm = inst}
--
Gitblit v1.8.0