From f0bee3de48c1e039c0e07e729db5d9fa4f6b9a21 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 06 十一月 2024 15:51:15 +0800
Subject: [PATCH] 2024-11-06
---
src/menu/components/module/invoice/verifycard/customscript/index.jsx | 2 +-
src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx | 2 +-
src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx | 2 +-
src/menu/components/module/invoice/verifycard/callbackcustomscript/index.jsx | 2 +-
src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx | 2 +-
src/templates/zshare/verifycard/callbackcustomscript/index.jsx | 2 +-
src/menu/datasource/verifycard/customscript/index.jsx | 2 +-
src/utils/utils-custom.js | 8 ++++----
src/templates/sharecomponent/actioncomponent/verifypay/customscript/index.jsx | 2 +-
src/templates/zshare/verifycard/customscript/index.jsx | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/module/invoice/verifycard/callbackcustomscript/index.jsx b/src/menu/components/module/invoice/verifycard/callbackcustomscript/index.jsx
index 786f5c5..d18ce3e 100644
--- a/src/menu/components/module/invoice/verifycard/callbackcustomscript/index.jsx
+++ b/src/menu/components/module/invoice/verifycard/callbackcustomscript/index.jsx
@@ -71,7 +71,7 @@
let pass = checkSQL(values.sql, 'customscript')
- if (!pass) return
+ if (!pass && !skip) return
let sql = `
/* 绯荤粺瀛楁 */
diff --git a/src/menu/components/module/invoice/verifycard/customscript/index.jsx b/src/menu/components/module/invoice/verifycard/customscript/index.jsx
index 8d848ce..1454d26 100644
--- a/src/menu/components/module/invoice/verifycard/customscript/index.jsx
+++ b/src/menu/components/module/invoice/verifycard/customscript/index.jsx
@@ -62,7 +62,7 @@
let pass = checkSQL(values.sql, 'customscript')
- if (!pass) return
+ if (!pass && !skip) return
let sql = `
/* 绯荤粺瀛楁 */
diff --git a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
index 274f82e..0537dcf 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
@@ -97,7 +97,7 @@
let pass = checkSQL(values.sql, 'customscript')
- if (!pass) return
+ if (!pass && !skip) return
let sheet = btn.sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')
let tail = `
diff --git a/src/menu/datasource/verifycard/customscript/index.jsx b/src/menu/datasource/verifycard/customscript/index.jsx
index d9e4d04..5b4c682 100644
--- a/src/menu/datasource/verifycard/customscript/index.jsx
+++ b/src/menu/datasource/verifycard/customscript/index.jsx
@@ -85,7 +85,7 @@
let pass = checkSQL(values.sql, 'customscript')
- if (!pass) return
+ if (!pass && !skip) return
if (skip) {
this.setState({
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index bfc57cb..f2fc6c8 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -99,7 +99,7 @@
let pass = checkSQL(values.sql, 'customscript')
- if (!pass) return
+ if (!pass && !skip) return
let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
index 36f6164..99135ce 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
@@ -122,7 +122,7 @@
let pass = checkSQL(values.sql, 'customscript')
- if (!pass) return
+ if (!pass && !skip) return
this.setState({
loading: true
diff --git a/src/templates/sharecomponent/actioncomponent/verifypay/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifypay/customscript/index.jsx
index 1704f52..a022ffa 100644
--- a/src/templates/sharecomponent/actioncomponent/verifypay/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifypay/customscript/index.jsx
@@ -71,7 +71,7 @@
let pass = checkSQL(values.sql, 'customscript')
- if (!pass) return
+ if (!pass && !skip) return
let _scripts = fromJS(scripts).toJS()
diff --git a/src/templates/zshare/verifycard/callbackcustomscript/index.jsx b/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
index 7a33ed3..1cd3231 100644
--- a/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
+++ b/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
@@ -75,7 +75,7 @@
let pass = checkSQL(values.sql, 'customscript')
- if (!pass) return
+ if (!pass && !skip) return
let tail = `
aaa:
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index 9e119a1..27d1107 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -76,7 +76,7 @@
let pass = checkSQL(values.sql, 'customscript')
- if (!pass) return
+ if (!pass && !skip) return
let tail = `
aaa:
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index c572283..3de3779 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -2196,10 +2196,10 @@
duration: 5
})
return false
- } else if (/,./ig.test(sql)) {
+ } else if (/,\./ig.test(sql)) {
let lines = []
sql.split(/\n/).forEach((s, i) => {
- if (/,./ig.test(s)) {
+ if (/,\./ig.test(s)) {
lines.push(i + 1)
}
})
@@ -2213,10 +2213,10 @@
duration: 5
})
return false
- } else if (/.,/ig.test(sql)) {
+ } else if (/\.,/ig.test(sql)) {
let lines = []
sql.split(/\n/).forEach((s, i) => {
- if (/.,/ig.test(s)) {
+ if (/\.,/ig.test(s)) {
lines.push(i + 1)
}
})
--
Gitblit v1.8.0