From 64074a29a4d2c08b382860a9f364ac538279071a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 28 十月 2024 10:11:39 +0800
Subject: [PATCH] 2024-10-28
---
src/menu/datasource/verifycard/settingform/index.jsx | 69 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 11 deletions(-)
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 560e5d9..87940cc 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -105,6 +105,9 @@
if (values.interType === 'system' && values.onload === 'false') {
values.sync = 'false'
}
+ if (values.interType === 'system' && values.database === 'sso') {
+ values.sync = 'false'
+ }
// 鏁版嵁婧愬墠绔獙璇�
if (values.interType === 'system' && values.execute !== 'false' && values.dataresource) {
@@ -145,10 +148,10 @@
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
+ _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.works_flow_detail_id,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
+ _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.works_flow_detail_id,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
@@ -414,10 +417,10 @@
{getFieldDecorator('primaryKey', {
initialValue: setting.primaryKey || ''
})(
- <Select>
+ <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
{columns.map((option, i) =>
<Select.Option key={i} value={option.field}>
- {option.label}
+ {`${option.label}锛�${option.field}锛塦}
</Select.Option>
)}
</Select>
@@ -438,6 +441,10 @@
{
required: true,
message: '璇疯緭鍏ラ粯璁ゆ帓搴�!'
+ },
+ {
+ pattern: /^[^'+]+$/,
+ message: '鎺掑簭涓笉鍙娇鐢╘'涓�+'
}
]
})(<Input placeholder={'ID asc, UID desc'} autoComplete="off" />)}
@@ -515,16 +522,27 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
+ {setting.interType === 'system' ? <Col span={8}>
+ <Form.Item label="鏁版嵁搴�">
+ {getFieldDecorator('database', {
+ initialValue: setting.database || 'local'
+ })(
+ <Radio.Group>
+ <Radio value="local">鏈湴</Radio>
+ <Radio value="sso">鍗曠偣</Radio>
+ </Radio.Group>)}
+ </Form.Item>
+ </Col> : null}
{/* 1銆佷笉鍒嗛〉涓斾笉瀛樺湪涓婄骇妯″潡 */}
{!['navbar', 'interface', 'calendar'].includes(config.type) && !['editable', 'basetable', 'dualdatacard', 'invoice', 'invTable'].includes(config.subtype) && (!config.pageable || (config.pageable && setting.laypage === 'false')) && (setting.supModule.length === 0 || setting.supModule[0] === 'empty') && setting.interType === 'system' && setting.onload !== 'false' ? <Col span={8}>
<Form.Item label={
- <Tooltip placement="topLeft" title={'鍒濆鍖栧姞杞芥椂锛屾槸鍚︿笌鍏朵粬缁勪欢涓�鍚屽姞杞芥暟鎹紝娉細濡傝彍鍗曟湭浣跨敤鍚庣缂撳瓨锛屽垯鏌ヨ璇彞澶т簬8000瀛楃鏃舵棤鏁堛��'}>
+ <Tooltip placement="topLeft" title={'鍒濆鍖栧姞杞芥椂锛屾槸鍚︿笌鍏朵粬缁勪欢涓�鍚屽姞杞芥暟鎹��'}>
<QuestionCircleOutlined className="mk-form-tip" />
鍚屾鏌ヨ
</Tooltip>
}>
{getFieldDecorator('sync', {
- initialValue: setting.sync || 'true'
+ initialValue: setting.sync || 'false'
})(
<Radio.Group>
<Radio value="true">鏄�</Radio>
@@ -575,6 +593,23 @@
<Radio.Group onChange={(e) => {this.onOptionChange(e.target.value, 'onload')}}>
<Radio value="true">鍔犺浇</Radio>
<Radio value="false">涓嶅姞杞�</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col> : null}
+ {setting.interType === 'system' ? <Col span={8}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="浣跨敤鍚庣sql鑴氭湰鏃舵湁鏁堛��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 浜嬪姟
+ </Tooltip>
+ }>
+ {getFieldDecorator('transact', {
+ initialValue: setting.transact || 'false'
+ })(
+ <Radio.Group onChange={(e) => {this.onOptionChange(e.target.value, 'transact')}}>
+ <Radio value="true">鍚敤</Radio>
+ <Radio value="false">绂佺敤</Radio>
</Radio.Group>
)}
</Form.Item>
@@ -641,7 +676,7 @@
rules: [
{
required: true,
- message: '璇疯緭鍏ラ粯璁ゆ帓搴�!'
+ message: '璇疯緭鍏ュ瓙琛ㄥ瓧娈�!'
}
]
})(<Input placeholder={''} autoComplete="off" />)}
@@ -652,10 +687,10 @@
{getFieldDecorator('subKey', {
initialValue: setting.subKey || ''
})(
- <Select>
+ <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
{this.props.subColumns.map((option, i) =>
<Select.Option key={i} value={option.field}>
- {option.label}
+ {`${option.label}锛�${option.field}锛塦}
</Select.Option>
)}
</Select>
@@ -667,16 +702,28 @@
{getFieldDecorator('subBID', {
initialValue: setting.subBID || ''
})(
- <Select>
+ <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
{this.props.subColumns.map((option, i) =>
<Select.Option key={i} value={option.field}>
- {option.label}
+ {`${option.label}锛�${option.field}锛塦}
</Select.Option>
)}
</Select>
)}
</Form.Item>
</Col> : null}
+ {setting.onload !== 'false' ? <Col span={8}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鍙欢杩熷垵濮嬪寲鏁版嵁鐨勫姞杞芥椂闂达紝鍗曚綅姣锛坢s锛夈��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 寤舵椂鍔犺浇
+ </Tooltip>
+ }>
+ {getFieldDecorator('delay', {
+ initialValue: setting.delay,
+ })(<InputNumber min={0} max={60000} precision={0} />)}
+ </Form.Item>
+ </Col> : null}
</Row>
</Form>
<Modal
--
Gitblit v1.8.0