From c7aece35a62b6e91fd98a625bf0e53f64bfbd18d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 八月 2023 16:22:15 +0800
Subject: [PATCH] 2023-08-17
---
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 53 +++++++++++++++++------------------------------------
1 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index 18ba64c..a86f41a 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -2,9 +2,7 @@
import PropTypes from 'prop-types'
import { Form, Row, Col, Input, Radio, Tooltip, notification, Select, InputNumber } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
-import moment from 'moment'
-import Api from '@/api'
import { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
import asyncComponent from '@/utils/asyncComponent'
@@ -72,7 +70,6 @@
}
handleConfirm = () => {
- const { setting } = this.props
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
@@ -119,6 +116,14 @@
})
reject()
return
+ } else if (/,,/ig.test(values.dataresource)) {
+ notification.warning({
+ top: 92,
+ message: '鏁版嵁婧愪腑锛屼笉鍙嚭鐜拌繛缁殑鑻辨枃閫楀彿锛�,,锛�',
+ duration: 5
+ })
+ reject()
+ return
}
let error = Utils.verifySql(values.dataresource)
@@ -132,24 +137,6 @@
reject()
return
}
- }
-
- // 鏁版嵁婧愪繚瀛�
- if (
- values.interType === 'system' && values.default !== 'false' &&
- /[^\s]+\s+[^\s]+/ig.test(values.dataresource) && setting.dataresource !== values.dataresource
- ) {
- let param = {
- func: 's_DataSrc_Save',
- LText: values.dataresource,
- MenuID: this.props.menu.MenuID
- }
-
- param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
- Api.genericInterface(param)
}
resolve(values)
@@ -221,8 +208,8 @@
message: '琛ㄥ悕鏈�闀夸负50涓瓧绗�!'
},
{
- pattern: /^[a-zA-Z_]+$/,
- message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝浠ュ強_'
+ pattern: /^[a-zA-Z0-9@_]+$/,
+ message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝銆佹暟瀛椾互鍙奯'
}
]
})(<Input placeholder={''} autoComplete="off" />)}
@@ -260,7 +247,12 @@
</Form.Item>
</Col>
{interType === 'outer' ? <Col span={8}>
- <Form.Item label="绯荤粺鎺ュ彛">
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鍗曠偣鐧诲綍绯荤粺">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 绯荤粺鎺ュ彛
+ </Tooltip>
+ }>
{getFieldDecorator('sysInterface', {
initialValue: sysInterface,
rules: [
@@ -437,7 +429,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>
@@ -490,17 +482,6 @@
</Radio.Group>)}
</Form.Item>
</Col>
- {/* <Col span={8}>
- <Form.Item label="浜嬪姟">
- {getFieldDecorator('transaction', {
- initialValue: setting.transaction || 'false'
- })(
- <Radio.Group>
- <Radio value="true">浣跨敤</Radio>
- <Radio value="false">涓嶄娇鐢�</Radio>
- </Radio.Group>)}
- </Form.Item>
- </Col> */}
<Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title="浣跨敤鎬ラ�熸ā寮忔椂锛岃〃鏍间腑鐨勬爣璁般�佸弻鍑讳簨浠躲�佹牸寮忓寲銆佽鍚堝苟銆佸墠缂�銆佸悗缂�銆佸瓧娈甸�忚绛夋晥鏋滃皢鏃犳晥锛屼笖鏁版嵁閮戒細浠ユ枃鏈牸寮忔樉绀恒��">
--
Gitblit v1.8.0