From ec3cc73f8deaf0b83b0b517e65f949a5a5c496dc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 07 一月 2020 09:07:46 +0800
Subject: [PATCH] 2020-01-07

---
 src/templates/subtableconfig/settingform/index.jsx |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/templates/subtableconfig/settingform/index.jsx b/src/templates/subtableconfig/settingform/index.jsx
index 19c8939..ba01c15 100644
--- a/src/templates/subtableconfig/settingform/index.jsx
+++ b/src/templates/subtableconfig/settingform/index.jsx
@@ -49,6 +49,12 @@
     })
   }
 
+  selectChange = (val) => {
+    this.props.form.setFieldsValue({
+      order: `${val} desc`
+    })
+  }
+
   render() {
     const { data, dict, tabId, usefulFields } = this.props
     const { getFieldDecorator } = this.props.form
@@ -72,12 +78,15 @@
         primaryKey = ''
       }
     }
+    if (!primaryKey && columns.length === 0) {
+      primaryKey = 'ID'
+    }
 
     let str = '^(' + usefulFields.join('|') + ')'
     let _patten = new RegExp(str + '[0-9a-zA-Z_]*$', 'g')
 
     return (
-      <Form {...formItemLayout} className="ant-advanced-search-form commontable-setting-form" id="commontable-setting-form">
+      <Form {...formItemLayout} className="ant-advanced-search-form subtable-setting-form" id="subtable-setting-form">
         <Row gutter={24}>
           <Col span={12}>
             <Form.Item label="琛ㄥ悕">
@@ -98,7 +107,7 @@
                 initialValue: data.tableType
               })(
                 <Select
-                  getPopupContainer={() => document.getElementById('commontable-setting-form')}
+                  getPopupContainer={() => document.getElementById('subtable-setting-form')}
                 >
                   <Select.Option value="">涓嶅彲閫�</Select.Option>
                   <Select.Option value="radio">鍗曢��</Select.Option>
@@ -175,10 +184,11 @@
           <Col span={12}>
             <Form.Item label="涓婚敭">
               {getFieldDecorator('primaryKey', {
-                initialValue: primaryKey ? primaryKey : (columns.length === 0 ? 'ID' : '')
+                initialValue: primaryKey
               })(
                 <Select
-                  getPopupContainer={() => document.getElementById('commontable-setting-form')}
+                  getPopupContainer={() => document.getElementById('subtable-setting-form')}
+                  onChange={this.selectChange}
                 >
                   <Select.Option key='unset' value="">涓嶈缃�</Select.Option>
                   {columns.length === 0 ?
@@ -194,7 +204,7 @@
           <Col span={12}>
             <Form.Item label="榛樿鎺掑簭">
               {getFieldDecorator('order', {
-                initialValue: data.order,
+                initialValue: data.order || (primaryKey ? primaryKey + ' desc' : ''),
                 rules: [
                   {
                     required: true,

--
Gitblit v1.8.0