From 12c4dd8bb0bb4c523dcf2fbb81191a7f3556a430 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 15 一月 2020 12:50:22 +0800
Subject: [PATCH] 2020-01-15

---
 src/templates/formtabconfig/settingform/index.jsx |  125 +++++++++++++----------------------------
 1 files changed, 40 insertions(+), 85 deletions(-)

diff --git a/src/templates/formtabconfig/settingform/index.jsx b/src/templates/formtabconfig/settingform/index.jsx
index 24ce02c..adbd0b7 100644
--- a/src/templates/formtabconfig/settingform/index.jsx
+++ b/src/templates/formtabconfig/settingform/index.jsx
@@ -10,24 +10,44 @@
   static propTpyes = {
     dict: PropTypes.object, // 瀛楀吀椤�
     menu: PropTypes.object,
-    data: PropTypes.object,
     config: PropTypes.object,
-    columns: PropTypes.array,
     usefulFields: PropTypes.array
   }
 
   state = {
-    interType: this.props.data.interType || 'inner',
-    columns: this.props.columns.filter(item => item.field && item.type !== 'colspan'),
+    interType: null,
+    columns: null,
     currentTabs: null,
     selectTabs: []
   }
 
   UNSAFE_componentWillMount() {
-    const { config, data } = this.props
+    const { config, menu } = this.props
+    console.log(menu)
+    console.log(config)
     let _tabs = []
     let _select = []
     let _tabMap = new Map()
+    let _columns = []
+    let _interType = 'inner'
+    let _setting = config.setting
+
+    try {
+      _columns = menu.LongParam.columns.filter(item => item.field && item.type !== 'colspan')
+      // config.groups.forEach(group => {
+      //   if (group.isDefault) {
+      //     _columns.push()
+      //   }
+      //   group.sublist
+      // })
+      _interType = menu.LongParam.setting.interType
+    } catch {
+      notification.warning({
+        top: 92,
+        message: '鑿滃崟淇℃伅閿欒锛�',
+        duration: 10
+      })
+    }
 
     config.tabgroups.forEach(groupname => {
       config[groupname].forEach(tab => {
@@ -38,7 +58,7 @@
       })
     })
 
-    data.subtabs && data.subtabs.forEach(tabId => {
+    _setting.subtabs && _setting.subtabs.forEach(tabId => {
       if (_tabMap.has(tabId)) {
         _select.push(tabId)
       }
@@ -46,7 +66,10 @@
 
     this.setState({
       currentTabs: _tabs,
-      selectTabs: _select
+      selectTabs: _select,
+      columns: _columns,
+      interType: _interType,
+      setting: _setting
     })
   }
 
@@ -81,16 +104,15 @@
   }
 
   selectChange = (val) => {
-    // let _order = this.props.form.getFieldValue('order')
     this.props.form.setFieldsValue({
       order: `${val} desc`
     })
   }
 
   render() {
-    const { data, dict, menu, usefulFields } = this.props
+    const { dict, menu, usefulFields } = this.props
     const { getFieldDecorator } = this.props.form
-    const { interType, columns, selectTabs } = this.state
+    const { interType, columns, selectTabs, setting } = this.state
 
     const formItemLayout = {
       labelCol: {
@@ -103,7 +125,7 @@
       }
     }
 
-    let primaryKey = data.primaryKey
+    let primaryKey = setting.primaryKey
     if (primaryKey) {
       let field = columns.filter(column => column.field === primaryKey)
       if (field.length !== 1) {
@@ -123,7 +145,7 @@
           <Col span={12}>
             <Form.Item label="琛ㄥ悕">
               {getFieldDecorator('tableName', {
-                initialValue: data.tableName,
+                initialValue: setting.tableName,
                 rules: [
                   {
                     required: true,
@@ -138,24 +160,9 @@
             </Form.Item>
           </Col>
           <Col span={12}>
-            <Form.Item label="琛ㄦ牸灞炴��">
-              {getFieldDecorator('tableType', {
-                initialValue: data.tableType
-              })(
-                <Select
-                  getPopupContainer={() => document.getElementById('commontable-setting-form')}
-                >
-                  <Select.Option value="">涓嶅彲閫�</Select.Option>
-                  <Select.Option value="radio">鍗曢��</Select.Option>
-                  <Select.Option value="checkbox">澶氶��</Select.Option>
-                </Select>
-              )}
-            </Form.Item>
-          </Col>
-          <Col span={12}>
             <Form.Item label={dict['header.form.intertype']}>
               {getFieldDecorator('interType', {
-                initialValue: data.interType || 'inner'
+                initialValue: setting.interType || 'inner'
               })(
                 <Radio.Group onChange={this.onChange}>
                   <Radio value="inner">{dict['header.form.interface.inner']}</Radio>
@@ -167,7 +174,7 @@
           {interType === 'outer' ? <Col span={12}>
             <Form.Item label={dict['header.form.interface']}>
               {getFieldDecorator('interface', {
-                initialValue: data.interface || '',
+                initialValue: setting.interface || '',
                 rules: [
                   {
                     required: true,
@@ -189,7 +196,7 @@
               </Tooltip>
             }>
               {getFieldDecorator('innerFunc', {
-                initialValue: data.innerFunc || '',
+                initialValue: setting.innerFunc || '',
                 rules: [
                   {
                     pattern: _patten,
@@ -210,26 +217,14 @@
               </Tooltip>
             } className="textarea">
               {getFieldDecorator('dataresource', {
-                initialValue: data.dataresource
+                initialValue: setting.dataresource
               })(<TextArea rows={4} />)}
             </Form.Item>
           </Col> : null}
-          <Col span={12}>
-            <Form.Item label="鍥哄畾鎸夐挳">
-              {getFieldDecorator('actionfixed', {
-                initialValue: data.actionfixed ? 'true' : 'false'
-              })(
-                <Select>
-                  <Select.Option value="true">鏄�</Select.Option>
-                  <Select.Option value="false">鍚�</Select.Option>
-                </Select>
-              )}
-            </Form.Item>
-          </Col>
           {interType === 'outer' ? <Col span={12}>
             <Form.Item label={dict['header.form.outerFunc']}>
               {getFieldDecorator('outerFunc', {
-                initialValue: data.outerFunc || '',
+                initialValue: setting.outerFunc || '',
                 rules: [
                   {
                     pattern: formRule.func.pattern,
@@ -242,18 +237,7 @@
               })(<Input placeholder="" autoComplete="off" />)}
             </Form.Item>
           </Col> : null}
-          <Col span={12}>
-            <Form.Item label="鍥哄畾鍒�">
-              {getFieldDecorator('columnfixed', {
-                initialValue: data.columnfixed ? 'true' : 'false'
-              })(
-                <Select>
-                  <Select.Option value="true">鏄�</Select.Option>
-                  <Select.Option value="false">鍚�</Select.Option>
-                </Select>
-              )}
-            </Form.Item>
-          </Col>
+          
           <Col span={12}>
             <Form.Item label="涓婚敭">
               {getFieldDecorator('primaryKey', {
@@ -270,35 +254,6 @@
                   {columns.map((option, index) =>
                     <Select.Option id={option.uuid} title={option.label} key={index} value={option.field}>{option.label}</Select.Option>
                   )}
-                </Select>
-              )}
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item label="榛樿鎺掑簭">
-              {getFieldDecorator('order', {
-                initialValue: data.order || (primaryKey ? primaryKey + ' desc' : ''),
-                rules: [
-                  {
-                    required: true,
-                    message: dict['form.required.input'] + '榛樿鎺掑簭瀛楁!'
-                  },
-                  {
-                    max: formRule.input.max,
-                    message: formRule.input.message
-                  }
-                ]
-              })(<Input placeholder="ID asc, UID desc" autoComplete="off" />)}
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Form.Item label="鍒濆鍖�">
-              {getFieldDecorator('onload', {
-                initialValue: data.onload || 'true'
-              })(
-                <Select>
-                  <Select.Option value="true">鍔犺浇鏁版嵁</Select.Option>
-                  <Select.Option value="false">涓嶅姞杞芥暟鎹�</Select.Option>
                 </Select>
               )}
             </Form.Item>

--
Gitblit v1.8.0