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 {
-
- {getFieldDecorator('modelName')()}
+
+ {getFieldDecorator('modelName')()}
@@ -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 {
],
})()}
+
+ {getFieldDecorator('modelName', {
+ rules: [
+ {
+ required: true,
+ message: '请输入表前缀名',
+ },
+ ],
+ })()}
+
{getFieldDecorator('pkName', {
rules: [
@@ -80,16 +90,6 @@ class CodeAdd extends PureComponent {
],
})()}
-
- {getFieldDecorator('modelName', {
- rules: [
- {
- required: true,
- message: '请输入实体名',
- },
- ],
- })()}
-
{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,
})()}
+
+ {getFieldDecorator('modelName', {
+ rules: [
+ {
+ required: true,
+ message: '请输入表前缀名',
+ },
+ ],
+ initialValue: detail.modelName,
+ })()}
+
{getFieldDecorator('pkName', {
rules: [
@@ -106,17 +117,6 @@ class ParamAdd extends PureComponent {
initialValue: detail.pkName,
})()}
-
- {getFieldDecorator('modelName', {
- rules: [
- {
- required: true,
- message: '请输入实体名',
- },
- ],
- initialValue: detail.modelName,
- })()}
-
{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 {
{detail.tableName}
+
+ {detail.modelName}
+
{detail.pkName}
-
- {detail.modelName}
-
{detail.packageName}