From 0c84df247914f893ef5e41d57a422e10a2dc814c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 12 十一月 2021 17:02:06 +0800
Subject: [PATCH] 2021-11-12

---
 src/templates/formtabconfig/settingform/index.jsx |   57 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/templates/formtabconfig/settingform/index.jsx b/src/templates/formtabconfig/settingform/index.jsx
index 4dab6bc..3d916d5 100644
--- a/src/templates/formtabconfig/settingform/index.jsx
+++ b/src/templates/formtabconfig/settingform/index.jsx
@@ -1,7 +1,10 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Select, Tooltip, Icon, notification, InputNumber } from 'antd'
+import { Form, Row, Col, Input, Radio, Select, Tooltip, notification, InputNumber } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
 import { formRule } from '@/utils/option.js'
+import Utils from '@/utils/utils.js'
 import './index.scss'
 
 const { TextArea } = Input
@@ -11,13 +14,13 @@
     dict: PropTypes.object, // 瀛楀吀椤�
     menu: PropTypes.object,
     config: PropTypes.object,
-    usefulFields: PropTypes.array,
     inputSubmit: PropTypes.any     // 鍥炶溅鎻愪氦浜嬩欢
   }
 
   state = {
     interType: (this.props.config.setting && this.props.config.setting.interType) || 'inner',
     columns: null,
+    usefulFields: [],
     interReadonly: false,
   }
 
@@ -42,12 +45,23 @@
           return true
         }
       })
-    } catch {
+    } catch (e) {
       notification.warning({
         top: 92,
         message: '鑿滃崟淇℃伅閿欒锛�',
-        duration: 10
+        duration: 5
       })
+    }
+
+    let usefulFields = sessionStorage.getItem('permFuncField')
+    if (usefulFields) {
+      try {
+        usefulFields = JSON.parse(usefulFields)
+      } catch (e) {
+        usefulFields = []
+      }
+    } else {
+      usefulFields = []
     }
 
     this.setState({
@@ -55,7 +69,8 @@
       setting: _setting,
       interType: _setting.interType || 'inner',
       interReadonly: _setting.sysInterface === 'true',
-      datatype: _setting.datatype || 'maintable'
+      datatype: _setting.datatype || 'maintable',
+      usefulFields
     })
   }
 
@@ -64,6 +79,17 @@
     return new Promise((resolve, reject) => {
       this.props.form.validateFieldsAndScroll((err, values) => {
         if (!err) {
+          let error = Utils.verifySql(values.dataresource)
+
+          if (error) {
+            notification.warning({
+              top: 92,
+              message: '鏁版嵁婧愪腑涓嶅彲浣跨敤' + error,
+              duration: 5
+            })
+            return
+          }
+
           resolve(values)
         } else {
           reject(err)
@@ -142,9 +168,9 @@
   }
 
   render() {
-    const { dict, usefulFields, menu } = this.props
+    const { dict, menu } = this.props
     const { getFieldDecorator } = this.props.form
-    const { interType, setting, datatype } = this.state
+    const { interType, setting, datatype, usefulFields } = this.state
 
     const formItemLayout = {
       labelCol: {
@@ -173,8 +199,8 @@
                     message: dict['form.required.input'] + '琛ㄥ悕!'
                   },
                   {
-                    max: formRule.input.max,
-                    message: formRule.input.message
+                    max: 50,
+                    message: '琛ㄥ悕鏈�闀夸负50涓瓧绗�!'
                   }
                 ]
               })(<Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />)}
@@ -189,6 +215,7 @@
                   <Select.Option value="1">1鍒�</Select.Option>
                   <Select.Option value="2">2鍒�</Select.Option>
                   <Select.Option value="3">3鍒�</Select.Option>
+                  <Select.Option value="4">4鍒�</Select.Option>
                 </Select>
               )}
             </Form.Item>
@@ -218,8 +245,8 @@
                 initialValue: interType
               })(
                 <Radio.Group onChange={this.onChange}>
-                  <Radio value="inner">{dict['header.form.interface.inner']}</Radio>
-                  <Radio value="outer">{dict['header.form.interface.outer']}</Radio>
+                  <Radio value="inner">{dict['model.interface.inner']}</Radio>
+                  <Radio value="outer">{dict['model.interface.outer']}</Radio>
                 </Radio.Group>
               )}
             </Form.Item>
@@ -230,8 +257,8 @@
                 initialValue: setting.sysInterface || 'false'
               })(
                 <Radio.Group onChange={this.onSysChange}>
-                  <Radio value="true">{dict['header.form.true']}</Radio>
-                  <Radio value="false">{dict['header.form.false']}</Radio>
+                  <Radio value="true">{dict['model.true']}</Radio>
+                  <Radio value="false">{dict['model.false']}</Radio>
                 </Radio.Group>
               )}
             </Form.Item>
@@ -256,7 +283,7 @@
           {datatype === 'query' && interType !== 'outer' ? <Col span={12}>
             <Form.Item label={
               <Tooltip placement="topLeft" overlayClassName="middle" title={`鍙嚜瀹氫箟鏁版嵁澶勭悊鍑芥暟锛屽嚱鏁板悕绉伴渶浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬶紱鏈缃椂浼氳皟鐢ㄧ郴缁熷嚱鏁帮紝浣跨敤绯荤粺鍑芥暟闇�瀹屽杽鏁版嵁婧愩�俙}>
-                <Icon type="question-circle" />
+                <QuestionCircleOutlined className="mk-form-tip" />
                 {dict['header.form.innerFunc']}
               </Tooltip>
             }>
@@ -277,7 +304,7 @@
           {datatype === 'query' && interType !== 'outer' ? <Col span={24}>
             <Form.Item help={'鏁版嵁ID锛�' + menu.MenuID} label={
               <Tooltip placement="topLeft" title="浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愶紝鑷畾涔夊嚱鏁版椂锛屽彲蹇界暐銆�">
-                <Icon type="question-circle" />
+                <QuestionCircleOutlined className="mk-form-tip" />
                 {'鏁版嵁婧�'}
               </Tooltip>
             } className="textarea">

--
Gitblit v1.8.0