⚡ 优化代码生成模块

mock/code.js

@@ -5,10 +5,10 @@ function getFakeList(req, res) {
   const list = [];
   list.push({
     id: '1',
+    serviceName: 'blade-demo',
     codeName: '通知公告',
     tableName: 'blade_notice',
     pkName: 'id',
-    modelName: 'blade_',
     packageName: 'org.springblade.desk',
   });
   json.data = {
@@ -26,10 +26,11 @@ function getFakeDetail(req, res) {
   const json = { code: 200, success: true, msg: '操作成功' };
   const detail = {
     id: '1',
+    serviceName: 'blade-demo',
     codeName: '通知公告',
     tableName: 'blade_notice',
     pkName: 'id',
-    modelName: 'blade_',
+    tablePrefix: 'blade_',
     packageName: 'org.springblade.desk',
     apiPath: 'D:\\Develop\\WorkSpace\\Git\\SpringBlade\\blade-ops\\blade-develop',
     webPath: 'D:\\Develop\\WorkSpace\\Git\\Sword',

src/pages/System/Code/Code.js

@@ -79,7 +79,7 @@ class Code extends PureComponent {
         </Col>
         <Col md={6} sm={24}>
           <FormItem label="表前缀名">
-            {getFieldDecorator('modelName')(<Input placeholder="请输入表前缀名" />)}
+            {getFieldDecorator('tablePrefix')(<Input placeholder="请输入表前缀名" />)}
           </FormItem>
         </Col>
         <Col>
@@ -116,13 +116,17 @@ class Code extends PureComponent {
         title: '模块名',
         dataIndex: 'codeName',
       },
+      {
+        title: '服务名',
+        dataIndex: 'serviceName',
+      },
       {
         title: '表名',
         dataIndex: 'tableName',
       },
       {
-        title: '表前缀名',
-        dataIndex: 'modelName',
+        title: '表前缀',
+        dataIndex: 'tablePrefix',
       },
       {
         title: '主键名',

src/pages/System/Code/CodeAdd.js

@@ -60,6 +60,16 @@ class CodeAdd extends PureComponent {
                 ],
               })(<Input placeholder="请输入模块名" />)}
             </FormItem>
+            <FormItem {...formItemLayout} label="服务名">
+              {getFieldDecorator('serviceName', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请输入服务名',
+                  },
+                ],
+              })(<Input placeholder="请输入服务名" />)}
+            </FormItem>
             <FormItem {...formItemLayout} label="表名">
               {getFieldDecorator('tableName', {
                 rules: [
@@ -71,7 +81,7 @@ class CodeAdd extends PureComponent {
               })(<Input placeholder="请输入表名" />)}
             </FormItem>
             <FormItem {...formItemLayout} label="表前缀名">
-              {getFieldDecorator('modelName', {
+              {getFieldDecorator('tablePrefix', {
                 rules: [
                   {
                     required: true,

src/pages/System/Code/CodeEdit.js

@@ -84,6 +84,17 @@ class ParamAdd extends PureComponent {
                 initialValue: detail.codeName,
               })(<Input placeholder="请输入模块名" />)}
             </FormItem>
+            <FormItem {...formItemLayout} label="服务名">
+              {getFieldDecorator('serviceName', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请输入服务名',
+                  },
+                ],
+                initialValue: detail.serviceName,
+              })(<Input placeholder="请输入服务名" />)}
+            </FormItem>
             <FormItem {...formItemLayout} label="表名">
               {getFieldDecorator('tableName', {
                 rules: [
@@ -96,14 +107,14 @@ class ParamAdd extends PureComponent {
               })(<Input placeholder="请输入表名" />)}
             </FormItem>
             <FormItem {...formItemLayout} label="表前缀名">
-              {getFieldDecorator('modelName', {
+              {getFieldDecorator('tablePrefix', {
                 rules: [
                   {
                     required: true,
                     message: '请输入表前缀名',
                   },
                 ],
-                initialValue: detail.modelName,
+                initialValue: detail.tablePrefix,
               })(<Input placeholder="请输入表前缀名" />)}
             </FormItem>
             <FormItem {...formItemLayout} label="主键名">

src/pages/System/Code/CodeView.js

@@ -62,11 +62,14 @@ class ParamView extends PureComponent {
             <FormItem {...formItemLayout} label="模块名">
               <span>{detail.codeName}</span>
             </FormItem>
+            <FormItem {...formItemLayout} label="服务名">
+              <span>{detail.serviceName}</span>
+            </FormItem>
             <FormItem {...formItemLayout} label="表名">
               <span>{detail.tableName}</span>
             </FormItem>
             <FormItem {...formItemLayout} label="表前缀名">
-              <span>{detail.modelName}</span>
+              <span>{detail.tablePrefix}</span>
             </FormItem>
             <FormItem {...formItemLayout} label="主键名">
               <span>{detail.pkName}</span>

src/utils/Func.js

@@ -91,6 +91,6 @@ export default class Func {
    * @returns {string}
    */
   static split(str) {
-    return str ? str.split(',') : '';
+    return str ? String(str).split(',') : '';
   }
 }