From e8edfdadb561cd83bf6e1c3e00d55b8cc2aee6d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 十月 2022 17:57:34 +0800
Subject: [PATCH] 2022-10-17

---
 src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx |   47 +++++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index 30dc05c..18ba64c 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -17,7 +17,6 @@
 class SettingForm extends Component {
   static propTpyes = {
     config: PropTypes.object,     // 椤甸潰閰嶇疆
-    dict: PropTypes.object,       // 瀛楀吀椤�
     menu: PropTypes.object,       // 鑿滃崟淇℃伅
     setting: PropTypes.object,    // 鏁版嵁婧愰厤缃�
     columns: PropTypes.array,     // 鍒楄缃�
@@ -190,7 +189,7 @@
   }
 
   render() {
-    const { setting, dict, menu, config, columns } = this.props
+    const { setting, menu, config, columns } = this.props
     const { getFieldDecorator } = this.props.form
     const { interType, funcRules, funcTooltip, tableType, controlField, sysInterface } = this.state
 
@@ -215,24 +214,28 @@
                 rules: [
                   {
                     required: true,
-                    message: dict['form.required.input'] + '琛ㄥ悕!'
+                    message: '璇疯緭鍏ヨ〃鍚�!'
                   },
                   {
                     max: 50,
                     message: '琛ㄥ悕鏈�闀夸负50涓瓧绗�!'
+                  },
+                  {
+                    pattern: /^[a-zA-Z_]+$/,
+                    message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝浠ュ強_'
                   }
                 ]
               })(<Input placeholder={''} autoComplete="off" />)}
             </Form.Item>
           </Col>
           <Col span={8}>
-            <Form.Item label={dict['header.form.intertype']}>
+            <Form.Item label="鎺ュ彛绫诲瀷">
               {getFieldDecorator('interType', {
                 initialValue: interType,
                 rules: [
                   {
                     required: true,
-                    message: dict['form.required.select'] + dict['header.form.intertype'] + '!'
+                    message: '璇烽�夋嫨鎺ュ彛绫诲瀷!'
                   },
                 ]
               })(
@@ -257,19 +260,19 @@
             </Form.Item>
           </Col>
           {interType === 'outer' ? <Col span={8}>
-            <Form.Item label={dict['header.form.sysInterface']}>
+            <Form.Item label="绯荤粺鎺ュ彛">
               {getFieldDecorator('sysInterface', {
                 initialValue: sysInterface,
                 rules: [
                   {
                     required: true,
-                    message: dict['form.required.select'] + dict['header.form.sysInterface'] + '!'
+                    message: '璇烽�夋嫨绯荤粺鎺ュ彛!'
                   },
                 ]
               })(
               <Radio.Group onChange={(e) => {this.onRadioChange(e, 'sysInterface')}}>
-                <Radio value="true">{dict['model.true']}</Radio>
-                <Radio value="false">{dict['model.false']}</Radio>
+                <Radio value="true">鏄�</Radio>
+                <Radio value="false">鍚�</Radio>
               </Radio.Group>)}
             </Form.Item>
           </Col> : null}
@@ -280,7 +283,7 @@
                 rules: [
                   {
                     required: interType === 'outer' && sysInterface === 'true' ? false : true,
-                    message: dict['form.required.input'] + '鎺ュ彛鍦板潃!'
+                    message: '璇疯緭鍏ユ帴鍙e湴鍧�!'
                   },
                 ]
               })(<TextArea rows={2} readOnly={interType === 'outer' && sysInterface === 'true'}/>)}
@@ -310,7 +313,7 @@
                 rules: [
                   {
                     required: true,
-                    message: dict['form.required.input'] + '鍐呴儴鍑芥暟!'
+                    message: '璇疯緭鍏ュ唴閮ㄥ嚱鏁�!'
                   },
                   {
                     max: formRule.func.max,
@@ -399,7 +402,7 @@
                 rules: [
                   {
                     required: true,
-                    message: dict['form.required.input'] + '榛樿鎺掑簭!'
+                    message: '璇疯緭鍏ラ粯璁ゆ帓搴�!'
                   },
                   {
                     max: formRule.input.max,
@@ -415,8 +418,8 @@
                 initialValue: setting.laypage || 'true'
               })(
               <Radio.Group>
-                <Radio value="true">{dict['model.true']}</Radio>
-                <Radio value="false">{dict['model.false']}</Radio>
+                <Radio value="true">鏄�</Radio>
+                <Radio value="false">鍚�</Radio>
               </Radio.Group>)}
             </Form.Item>
           </Col>
@@ -437,12 +440,12 @@
                 initialValue: setting.actionfixed === 'true' || setting.actionfixed === true ? 'true' : 'false'
               })(
               <Radio.Group>
-                <Radio value="true">{dict['model.true']}</Radio>
-                <Radio value="false">{dict['model.false']}</Radio>
+                <Radio value="true">鏄�</Radio>
+                <Radio value="false">鍚�</Radio>
               </Radio.Group>)}
             </Form.Item>
           </Col> : null}
-          {config.Template === 'CommonTable' ? <Col span={8}>
+          {/* {config.Template === 'CommonTable' ? <Col span={8}>
             <Form.Item label={
               <Tooltip placement="topLeft" title={'鍚湁鍚堝苟鍒楁垨琛ㄦ牸鍑虹幇妯悜婊氬姩鏃朵細鏄剧ず寮傚父锛岃鎱庣敤锛�'}>
                 <QuestionCircleOutlined className="mk-form-tip" />
@@ -453,11 +456,11 @@
                 initialValue: setting.columnfixed === 'true' || setting.columnfixed === true ? 'true' : 'false'
               })(
               <Radio.Group>
-                <Radio value="true">{dict['model.true']}</Radio>
-                <Radio value="false">{dict['model.false']}</Radio>
+                <Radio value="true">鏄�</Radio>
+                <Radio value="false">鍚�</Radio>
               </Radio.Group>)}
             </Form.Item>
-          </Col> : null}
+          </Col> : null} */}
           <Col span={8}>
             <Form.Item label="杈规">
               {getFieldDecorator('bordered', {
@@ -487,7 +490,7 @@
               </Radio.Group>)}
             </Form.Item>
           </Col>
-          <Col span={8}>
+          {/* <Col span={8}>
             <Form.Item label="浜嬪姟">
               {getFieldDecorator('transaction', {
                 initialValue: setting.transaction || 'false'
@@ -497,7 +500,7 @@
                 <Radio value="false">涓嶄娇鐢�</Radio>
               </Radio.Group>)}
             </Form.Item>
-          </Col>
+          </Col> */}
           <Col span={8}>
             <Form.Item label={
               <Tooltip placement="topLeft" title="浣跨敤鎬ラ�熸ā寮忔椂锛岃〃鏍间腑鐨勬爣璁般�佸弻鍑讳簨浠躲�佹牸寮忓寲銆佽鍚堝苟銆佸墠缂�銆佸悗缂�銆佸瓧娈甸�忚绛夋晥鏋滃皢鏃犳晥锛屼笖鏁版嵁閮戒細浠ユ枃鏈牸寮忔樉绀恒��">

--
Gitblit v1.8.0