From 07c005cf28acf74e3afde82122e4c53e1000d70c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 六月 2023 12:06:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index 83a70ae..29f51db 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -119,6 +119,14 @@
})
reject()
return
+ } else if (/,,/ig.test(values.dataresource)) {
+ notification.warning({
+ top: 92,
+ message: '鏁版嵁婧愪腑锛屼笉鍙嚭鐜拌繛缁殑鑻辨枃閫楀彿锛�,,锛�',
+ duration: 5
+ })
+ reject()
+ return
}
let error = Utils.verifySql(values.dataresource)
@@ -221,8 +229,8 @@
message: '琛ㄥ悕鏈�闀夸负50涓瓧绗�!'
},
{
- pattern: /^[a-zA-Z@_]+$/,
- message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝浠ュ強_'
+ pattern: /^[a-zA-Z0-9@_]+$/,
+ message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝銆佹暟瀛椾互鍙奯'
}
]
})(<Input placeholder={''} autoComplete="off" />)}
@@ -442,7 +450,7 @@
{config.Template === 'CommonTable' ? <Col span={8}>
<Form.Item label="鎸夐挳鍥哄畾">
{getFieldDecorator('actionfixed', {
- initialValue: setting.actionfixed === 'true' || setting.actionfixed === true ? 'true' : 'false'
+ initialValue: setting.actionfixed === 'true' ? 'true' : 'false'
})(
<Radio.Group>
<Radio value="true">鏄�</Radio>
--
Gitblit v1.8.0