From 717ee7da58b21504dfa718c958fe1315fbdb41d9 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Mon, 21 Jan 2019 21:48:58 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=AD=97=E6=AE=B5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/code.js                      |  4 ++--
 src/pages/System/Code/Code.js     | 12 ++++++------
 src/pages/System/Code/CodeAdd.js  | 20 ++++++++++----------
 src/pages/System/Code/CodeEdit.js | 22 +++++++++++-----------
 src/pages/System/Code/CodeView.js |  6 +++---
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/mock/code.js b/mock/code.js
index 813abd8..5195817 100644
--- a/mock/code.js
+++ b/mock/code.js
@@ -8,7 +8,7 @@ function getFakeList(req, res) {
     codeName: '通知公告',
     tableName: 'blade_notice',
     pkName: 'id',
-    modelName: 'Notice',
+    modelName: 'blade_',
     packageName: 'org.springblade.desk',
   });
   json.data = {
@@ -29,7 +29,7 @@ function getFakeDetail(req, res) {
     codeName: '通知公告',
     tableName: 'blade_notice',
     pkName: 'id',
-    modelName: 'Notice',
+    modelName: 'blade_',
     packageName: 'org.springblade.desk',
     apiPath: 'D:\\Workspaces\\java\\SpringBlade\\blade-service\\blade-desk',
     webPath: 'D:\\Workspaces\\web\\Sword',
diff --git a/src/pages/System/Code/Code.js b/src/pages/System/Code/Code.js
index 469fa8d..d14cd44 100644
--- a/src/pages/System/Code/Code.js
+++ b/src/pages/System/Code/Code.js
@@ -78,8 +78,8 @@ class Code extends PureComponent {
           </FormItem>
         </Col>
         <Col md={6} sm={24}>
-          <FormItem label="实体名">
-            {getFieldDecorator('modelName')(<Input placeholder="请输入实体名" />)}
+          <FormItem label="表前缀名">
+            {getFieldDecorator('modelName')(<Input placeholder="请输入表前缀名" />)}
           </FormItem>
         </Col>
         <Col>
@@ -121,12 +121,12 @@ class Code extends PureComponent {
         dataIndex: 'tableName',
       },
       {
-        title: '主键名',
-        dataIndex: 'pkName',
+        title: '表前缀名',
+        dataIndex: 'modelName',
       },
       {
-        title: '实体名',
-        dataIndex: 'modelName',
+        title: '主键名',
+        dataIndex: 'pkName',
       },
       {
         title: '包名',
diff --git a/src/pages/System/Code/CodeAdd.js b/src/pages/System/Code/CodeAdd.js
index 877454f..259e2ad 100644
--- a/src/pages/System/Code/CodeAdd.js
+++ b/src/pages/System/Code/CodeAdd.js
@@ -70,6 +70,16 @@ class CodeAdd extends PureComponent {
                 ],
               })(<Input placeholder="请输入表名" />)}
             </FormItem>
+            <FormItem {...formItemLayout} label="表前缀名">
+              {getFieldDecorator('modelName', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请输入表前缀名',
+                  },
+                ],
+              })(<Input placeholder="请输入表前缀名" />)}
+            </FormItem>
             <FormItem {...formItemLayout} label="主键名">
               {getFieldDecorator('pkName', {
                 rules: [
@@ -80,16 +90,6 @@ class CodeAdd extends PureComponent {
                 ],
               })(<Input placeholder="请输入主键名" />)}
             </FormItem>
-            <FormItem {...formItemLayout} label="实体名">
-              {getFieldDecorator('modelName', {
-                rules: [
-                  {
-                    required: true,
-                    message: '请输入实体名',
-                  },
-                ],
-              })(<Input placeholder="请输入实体名" />)}
-            </FormItem>
             <FormItem {...formItemLayout} label="包名">
               {getFieldDecorator('packageName', {
                 rules: [
diff --git a/src/pages/System/Code/CodeEdit.js b/src/pages/System/Code/CodeEdit.js
index 6a3e44b..8bcf4ed 100644
--- a/src/pages/System/Code/CodeEdit.js
+++ b/src/pages/System/Code/CodeEdit.js
@@ -95,6 +95,17 @@ class ParamAdd extends PureComponent {
                 initialValue: detail.tableName,
               })(<Input placeholder="请输入表名" />)}
             </FormItem>
+            <FormItem {...formItemLayout} label="表前缀名">
+              {getFieldDecorator('modelName', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请输入表前缀名',
+                  },
+                ],
+                initialValue: detail.modelName,
+              })(<Input placeholder="请输入表前缀名" />)}
+            </FormItem>
             <FormItem {...formItemLayout} label="主键名">
               {getFieldDecorator('pkName', {
                 rules: [
@@ -106,17 +117,6 @@ class ParamAdd extends PureComponent {
                 initialValue: detail.pkName,
               })(<Input placeholder="请输入主键名" />)}
             </FormItem>
-            <FormItem {...formItemLayout} label="实体名">
-              {getFieldDecorator('modelName', {
-                rules: [
-                  {
-                    required: true,
-                    message: '请输入实体名',
-                  },
-                ],
-                initialValue: detail.modelName,
-              })(<Input placeholder="请输入实体名" />)}
-            </FormItem>
             <FormItem {...formItemLayout} label="包名">
               {getFieldDecorator('packageName', {
                 rules: [
diff --git a/src/pages/System/Code/CodeView.js b/src/pages/System/Code/CodeView.js
index ec6acc7..747d9c7 100644
--- a/src/pages/System/Code/CodeView.js
+++ b/src/pages/System/Code/CodeView.js
@@ -65,12 +65,12 @@ class ParamView extends PureComponent {
             <FormItem {...formItemLayout} label="表名">
               <span>{detail.tableName}</span>
             </FormItem>
+            <FormItem {...formItemLayout} label="表前缀名">
+              <span>{detail.modelName}</span>
+            </FormItem>
             <FormItem {...formItemLayout} label="主键名">
               <span>{detail.pkName}</span>
             </FormItem>
-            <FormItem {...formItemLayout} label="实体名">
-              <span>{detail.modelName}</span>
-            </FormItem>
             <FormItem {...formItemLayout} label="包名">
               <span>{detail.packageName}</span>
             </FormItem>