From 2b46797c3a5868f7f26329da5834c13aae07ad69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 四月 2023 11:59:34 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/zshare/verifycard/index.jsx | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index b2be305..12f861b 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -545,7 +545,11 @@
let _invalid = _verify.invalid
if (!_invalid) { // 閫夋嫨琛屾椂锛屽け鏁堥獙璇侀粯璁ゅ紑鍚�
- _invalid = card.Ot !== 'notRequired' ? 'true' : 'false'
+ if (config.setting && config.setting.maxScript && config.setting.maxScript >= 300) {
+ _invalid = 'false'
+ } else {
+ _invalid = card.Ot !== 'notRequired' ? 'true' : 'false'
+ }
}
if (card.sqlType === 'custom') { // 鑷畾涔夐獙璇佹椂锛屼笉浣跨敤榛樿sql
_verify.default = 'false'
@@ -674,6 +678,27 @@
fieldArr.push('bid')
+ let verIndex = _fields.findIndex(item => item.type === 'vercode')
+ if (verIndex > -1) {
+ _fields = fromJS(_fields).toJS()
+ _fields.splice(verIndex, 0, {
+ type: 'text',
+ fieldlength: 50,
+ writein: 'false',
+ field: 'mk_timestamp'
+ }, {
+ type: 'text',
+ fieldlength: 50,
+ writein: 'false',
+ field: 'mk_send_type'
+ }, {
+ type: 'text',
+ fieldlength: 50,
+ writein: 'false',
+ field: 'mk_n_id'
+ })
+ }
+
_fields = _fields.filter(_f => _f.field)
_fields.forEach(_f => {
if (_f.field.toLowerCase() === 'bid') {
@@ -789,6 +814,10 @@
let _updatesql = ''
let _primaryKey = config.setting.primaryKey || 'id'
+ if (this.props.side === 'sub') {
+ _primaryKey = config.setting.subKey || 'id'
+ }
+
if (card.sqlType === 'insert' || card.sqlType === 'insertOrUpdate') {
let keys = []
let values = []
--
Gitblit v1.8.0