From 93d6b5dac3b54f740451a44a9667612e17464a9b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 20 十月 2022 17:14:16 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 2 +-
src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 2 +-
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 2 +-
src/menu/datasource/verifycard/settingform/index.jsx | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index e01e193..7ca57d9 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -734,7 +734,7 @@
)
} else if (item.key === 'sql' || item.key === 'sheet') {
rules.push(
- { pattern: /^[a-zA-Z_]+$/, message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝浠ュ強_' },
+ { pattern: /^[a-zA-Z@_]+$/, message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝浠ュ強_' },
{ max: formRule.func.max, message: formRule.func.maxMessage }
)
} else if (item.key === 'outerFunc' || item.key === 'callbackFunc') {
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 2630176..69041eb 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -199,7 +199,7 @@
message: '琛ㄥ悕鏈�闀夸负50涓瓧绗�!'
},
{
- pattern: /^[a-zA-Z_]+$/,
+ pattern: /^[a-zA-Z@_]+$/,
message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝浠ュ強_'
}
]
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index 3018953..78b28cd 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -561,7 +561,7 @@
)
} else if (item.key === 'sql' || item.key === 'sheet') {
rules.push(
- { pattern: /^[a-zA-Z_]+$/, message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝浠ュ強_' },
+ { pattern: /^[a-zA-Z@_]+$/, message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝浠ュ強_' },
{ max: formRule.func.max, message: formRule.func.maxMessage }
)
} else if (item.key === 'outerFunc' || item.key === 'callbackFunc') {
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index 18ba64c..a0a1c65 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -221,7 +221,7 @@
message: '琛ㄥ悕鏈�闀夸负50涓瓧绗�!'
},
{
- pattern: /^[a-zA-Z_]+$/,
+ pattern: /^[a-zA-Z@_]+$/,
message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝浠ュ強_'
}
]
--
Gitblit v1.8.0