From 076c2b693da1d42cf3a468c0f3d631c1ed424285 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 十一月 2023 18:22:56 +0800
Subject: [PATCH] 2023-11-08
---
src/templates/zshare/verifycard/index.jsx | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index df7c6dc..0c16e8e 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -42,7 +42,6 @@
activeKey: 'base',
appType: sessionStorage.getItem('appType'),
notes: [], // 鐭俊妯℃澘
- setting: null,
verify: {},
fields: [],
usefulfields: '',
@@ -540,15 +539,27 @@
const { appType } = this.state
let _verify = fromJS(card.verify || {}).toJS()
- let _invalid = _verify.invalid
+ let _invalid = _verify.invalid || 'true'
- if (!_invalid) { // 閫夋嫨琛屾椂锛屽け鏁堥獙璇侀粯璁ゅ紑鍚�
- if (config.setting && config.setting.maxScript && config.setting.maxScript >= 300) {
- _invalid = 'false'
- } else {
- _invalid = card.Ot !== 'notRequired' ? 'true' : 'false'
- }
+ _verify.limitInvalid = false
+ if (config.wrap && config.wrap.datatype === 'static') {
+ _verify.limitInvalid = true
+ _verify.limitText = '闈欐�佹暟鎹簮锛屼笉鍙娇鐢ㄥけ鏁堥獙璇�'
+ _invalid = 'false'
+ } else if (config.setting && config.setting.maxScript && config.setting.maxScript >= 300) {
+ _verify.limitInvalid = true
+ _verify.limitText = '鏁版嵁婧愪腑鑷畾涔夎剼鏈繃浜庡鏉傦紝涓嶈兘浣跨敤澶辨晥楠岃瘉锛�'
+ _invalid = 'false'
+ } else if (card.sqlType === 'insert') {
+ _verify.limitInvalid = true
+ _verify.limitText = '鎸夐挳鎿嶄綔绫诲瀷涓恒�婃坊鍔犮�嬫椂锛屼笉鑳戒娇鐢ㄥけ鏁堥獙璇侊紒'
+ _invalid = 'false'
+ } else if (card.Ot === 'notRequired') {
+ _verify.limitInvalid = true
+ _verify.limitText = '鎸夐挳銆婁笉閫夋嫨琛屻�嬫椂锛屼笉鑳戒娇鐢ㄥけ鏁堥獙璇侊紒'
+ _invalid = 'false'
}
+
if (card.sqlType === 'custom') { // 鑷畾涔夐獙璇佹椂锛屼笉浣跨敤榛樿sql
_verify.default = 'false'
}
@@ -621,7 +632,6 @@
this.setState({
activeKey: activeKey,
verifyInter: verifyInter,
- setting: config.setting || {},
verify: _verify,
oriVerify: fromJS(_verify).toJS()
})
@@ -1424,7 +1434,7 @@
handleConfirm = () => {
const { card } = this.props
- const { setting, activeKey } = this.state
+ const { activeKey } = this.state
let verify = fromJS(this.state.verify).toJS()
if (activeKey === 'base') {
@@ -1446,13 +1456,6 @@
notification.warning({
top: 92,
message: '涓嶆墽琛岄粯璁ql鏃讹紝蹇呴』璁剧疆鑷畾涔夎剼鏈紒',
- duration: 5
- })
- return
- } else if (verify.invalid === 'true' && setting.maxScript && setting.maxScript >= 300) {
- notification.warning({
- top: 92,
- message: '鏁版嵁婧愪腑鑷畾涔夎剼鏈繃浜庡鏉傦紝涓嶈兘浣跨敤澶辨晥楠岃瘉锛�',
duration: 5
})
return
@@ -1485,6 +1488,9 @@
})
})
}
+
+ delete verify.limitInvalid
+ delete verify.limitText
if (msg) {
confirm({
@@ -1549,7 +1555,7 @@
render() {
const { card, columns } = this.props
- const { activeKey, verifyInter, setting, verify, fields, uniqueFields, uniqueColumns, unionFields, onceUniqueColumns, columnsFields, contrastColumns, customColumns, orderColumns, scriptsColumns, cbScriptsColumns, orderModular, orderModularDetail, voucher, voucherDetail, notes, appType } = this.state
+ const { activeKey, verifyInter, verify, fields, uniqueFields, uniqueColumns, unionFields, onceUniqueColumns, columnsFields, contrastColumns, customColumns, orderColumns, scriptsColumns, cbScriptsColumns, orderModular, orderModularDetail, voucher, voucherDetail, notes, appType } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -1571,7 +1577,7 @@
{verify.default === 'false' ? <span className="count-tip"><ExclamationOutlined style={{color: 'orange'}}/></span> : null}
</span>
} key="base">
- <BaseForm card={card} appType={appType} columns={columns} unionFields={unionFields} setting={setting} verify={verify} notes={notes} onChange={(verify) => this.setState({verify})} wrappedComponentRef={(inst) => this.baseForm = inst}/>
+ <BaseForm card={card} appType={appType} columns={columns} unionFields={unionFields} verify={verify} notes={notes} onChange={(verify) => this.setState({verify})} wrappedComponentRef={(inst) => this.baseForm = inst}/>
</TabPane> : null}
{verifyInter === 'system' ? <TabPane tab={
<span>
--
Gitblit v1.8.0