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 | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 7e5f409..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">
@@ -461,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" />
@@ -562,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>
)}
@@ -597,8 +611,13 @@
)}
</Form.Item>
</Col> : null}
- {window.backend && setting.interType === 'system' ? <Col span={8}>
- <Form.Item label="浜嬪姟">
+ {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'
})(
@@ -661,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>
@@ -719,6 +738,20 @@
})(<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