From 885a47cd58f5dd36c8f6bac3dfa583fb7b598387 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 十一月 2023 21:24:58 +0800
Subject: [PATCH] 2023-11-08
---
src/menu/datasource/verifycard/utils.jsx | 8 +++++++-
src/menu/components/share/markcomponent/index.jsx | 2 +-
src/templates/sharecomponent/settingcomponent/settingform/utils.jsx | 8 +++++++-
src/menu/datasource/verifycard/index.jsx | 1 +
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index c95abda..a88f98e 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -430,7 +430,7 @@
>
<MarkForm field={this.props.field} signs={signs} columns={options} markChange={this.markChange}/>
<Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細浠庝笂鍒颁笅锛屽尮閰嶇涓�涓鍚堟潯浠剁殑鏍囪銆�</Col>
- <EditTable actions={['edit', 'move', 'del']} data={marks} columns={markColumns} onChange={(marks) => this.setState({marks})}/>
+ <EditTable actions={['edit', 'move', 'del', 'copy']} type="marks" data={marks} columns={markColumns} onChange={(marks) => this.setState({marks})}/>
</Modal>
</div>
)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index ea27445..2849a5b 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -390,6 +390,7 @@
if (values.uuid) {
scripts = scripts.map(item => {
if (item.uuid === values.uuid) {
+ values.$index = item.$index || ''
return values
} else {
return item
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 8d21423..3fc26be 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -195,13 +195,19 @@
})
arr.forEach(item => {
+ if (/@time_id@/ig.test(item)) return
+
let reg = new RegExp(item, 'i')
if (reg.test(_dataresource)) {
errors.push(`鏁版嵁婧愪腑瀛樺湪鏈浛鎹㈠��${item}`)
}
_scripts.forEach(script => {
if (reg.test(script.sql)) {
- errors.push(`鑷畾涔夎剼鏈�(${script.$index || ''})瀛樺湪鏈浛鎹㈠��${item}`)
+ if (script.$index) {
+ errors.push(`鑷畾涔夎剼鏈�(${script.$index})瀛樺湪鏈浛鎹㈠��${item}`)
+ } else {
+ errors.push(`鑷畾涔夎剼鏈腑瀛樺湪鏈浛鎹㈠��${item}`)
+ }
}
})
})
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index ca11a57..199a33e 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -118,13 +118,19 @@
let arr = sql.match(/@[0-9a-zA-Z_]+@/ig)
arr.forEach(item => {
+ if (/@time_id@/ig.test(item)) return
+
let reg = new RegExp(item, 'i')
if (reg.test(_dataresource)) {
errors.push(`鏁版嵁婧愪腑瀛樺湪鏈浛鎹㈠��${item}`)
}
scripts && scripts.forEach(script => {
if (reg.test(script.sql)) {
- errors.push(`鑷畾涔夎剼鏈�(${script.$index || ''})瀛樺湪鏈浛鎹㈠��${item}`)
+ if (script.$index) {
+ errors.push(`鑷畾涔夎剼鏈�(${script.$index})瀛樺湪鏈浛鎹㈠��${item}`)
+ } else {
+ errors.push(`鑷畾涔夎剼鏈腑瀛樺湪鏈浛鎹㈠��${item}`)
+ }
}
})
})
--
Gitblit v1.8.0