From d5edf87014863eceaa44f28809ae4b54a39b9a8e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:54:05 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/settingform/index.jsx | 88 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 72 insertions(+), 16 deletions(-)
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 8a8c97c..92b8896 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -38,11 +38,24 @@
const { config, setting } = this.props
let menu = window.GLOB.customMenu
- let modules = MenuUtils.getSupModules(menu.components, config.uuid, menu.interfaces)
+ let modules = []
let ismain = false
if (menu.Template === 'BaseTable') {
ismain = config.name === '涓昏〃'
+ }
+
+ if (config.type === 'interface') {
+ menu.components.forEach(item => {
+ if (item.type === 'module' && item.subtype === 'account') {
+ modules.push({
+ value: item.uuid,
+ label: item.name
+ })
+ }
+ })
+ } else {
+ modules = MenuUtils.getSupModules(menu.components, config.uuid, menu.interfaces)
}
modules.unshift({
@@ -148,10 +161,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
@@ -192,7 +205,7 @@
}
render() {
- const { columns, config } = this.props
+ const { columns, config, hasMainSearch } = this.props
const { getFieldDecorator } = this.props.form
const { setting, modules, innerRules, innertip, MenuType, visible } = this.state
@@ -206,6 +219,7 @@
sm: { span: 16 }
}
}
+ let hasUp = !['balcony', 'menubar', 'commonbar', 'tabbar', 'invTable'].includes(config.subtype) && (!config.wrap || config.wrap.supType !== 'multi') && MenuType !== 'billPrint'
return (
<div className="model-datasource-setting-form-box">
@@ -441,6 +455,10 @@
{
required: true,
message: '璇疯緭鍏ラ粯璁ゆ帓搴�!'
+ },
+ {
+ pattern: /^[^'+]+$/,
+ message: '鎺掑簭涓笉鍙娇鐢╘'涓�+'
}
]
})(<Input placeholder={'ID asc, UID desc'} autoComplete="off" />)}
@@ -457,7 +475,7 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {!['balcony', 'menubar', 'commonbar', 'tabbar', 'invTable'].includes(config.subtype) && (!config.wrap || config.wrap.supType !== 'multi') && MenuType !== 'billPrint' ? <Col span={8}>
+ {hasUp ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'璇ョ粍浠跺鏋滃彈鍏朵粬缁勪欢鎺у埗锛岃閫夐」鐩稿簲鐨勭粍浠讹紝娌℃湁鏃堕�夆�滄棤鈥濄��'}>
<QuestionCircleOutlined className="mk-form-tip" />
@@ -519,12 +537,7 @@
</Form.Item>
</Col> : null}
{setting.interType === 'system' ? <Col span={8}>
- <Form.Item label={
- <Tooltip placement="topLeft" title="娴嬭瘯绯荤粺鏁版嵁搴撳潎鎸囧悜鏈湴锛屾寮忕郴缁熷彲浣跨敤鍗曠偣鏁版嵁搴撱��">
- <QuestionCircleOutlined className="mk-form-tip" />
- 鏁版嵁搴�
- </Tooltip>
- }>
+ <Form.Item label="鏁版嵁搴�">
{getFieldDecorator('database', {
initialValue: setting.database || 'local'
})(
@@ -537,13 +550,13 @@
{/* 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>
@@ -563,7 +576,7 @@
initialValue: setting.useMSearch || 'true'
})(
<Radio.Group onChange={(e) => {this.onOptionChange(e.target.value, 'useMSearch')}}>
- <Radio value="true">浣跨敤</Radio>
+ <Radio value="true">浣跨敤{!hasMainSearch ? <Tooltip placement="top" title="鏃犲彲浣跨敤鐨勫閮ㄦ悳绱㈡潯浠�"><span className="mk-dot"></span></Tooltip> : null}</Radio>
<Radio value="false">涓嶄娇鐢�</Radio>
</Radio.Group>
)}
@@ -594,6 +607,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>
@@ -650,7 +680,7 @@
</Col> : null}
{config.subtype === 'dualdatacard' ? <Col span={8}>
<Form.Item label={
- <Tooltip placement="topLeft" title="瀛愯〃鍦ㄤ富琛ㄤ腑鐨勬暟鎹泦鍚嶇О銆�">
+ <Tooltip placement="topLeft" title="瀛愯〃鍦ㄤ富琛ㄤ腑鐨勬暟鎹泦鍚嶇О锛屼娇鐢� sub_data_string 鏃舵暟鎹互 JSON 瀛楃涓插舰寮忚繑鍥烇紙瀛楁闆嗕腑闇�娣诲姞 sub_data_string 瀛楁锛夛紱褰撲富琛ㄥ瓧娈靛瓨鍦� sub_data_string 涓斿�间笉涓虹┖鏃讹紝浼樺厛浣跨敤涓昏〃鐨� sub_data_string銆�">
<QuestionCircleOutlined className="mk-form-tip" />
瀛愯〃瀛楁
</Tooltip>
@@ -660,7 +690,7 @@
rules: [
{
required: true,
- message: '璇疯緭鍏ラ粯璁ゆ帓搴�!'
+ message: '璇疯緭鍏ュ瓙琛ㄥ瓧娈�!'
}
]
})(<Input placeholder={''} autoComplete="off" />)}
@@ -696,6 +726,32 @@
)}
</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}
+ {hasUp && setting.supModule && setting.supModule[0] && setting.supModule[0] !== 'empty' ? <Col span={8}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鏈幏鍙栧埌涓婄骇涓婚敭鍊肩殑鎻愮ず鏂囨湰銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 涓婄骇绌哄�兼彁绀�
+ </Tooltip>
+ }>
+ {getFieldDecorator('supModTip', {
+ initialValue: setting.supModTip || ''
+ })(
+ <Input placeholder={''} autoComplete="off" />
+ )}
+ </Form.Item>
+ </Col> : null}
</Row>
</Form>
<Modal
--
Gitblit v1.8.0