diff --git a/mock/code.js b/mock/code.js
index 3882510..619b929 100644
--- a/mock/code.js
+++ b/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',
diff --git a/src/pages/System/Code/Code.js b/src/pages/System/Code/Code.js
index d14cd44..1e20ec6 100644
--- a/src/pages/System/Code/Code.js
+++ b/src/pages/System/Code/Code.js
@@ -79,7 +79,7 @@ class Code extends PureComponent {
- {getFieldDecorator('modelName')()}
+ {getFieldDecorator('tablePrefix')()}
@@ -116,13 +116,17 @@ class Code extends PureComponent {
title: '模块名',
dataIndex: 'codeName',
},
+ {
+ title: '服务名',
+ dataIndex: 'serviceName',
+ },
{
title: '表名',
dataIndex: 'tableName',
},
{
- title: '表前缀名',
- dataIndex: 'modelName',
+ title: '表前缀',
+ dataIndex: 'tablePrefix',
},
{
title: '主键名',
diff --git a/src/pages/System/Code/CodeAdd.js b/src/pages/System/Code/CodeAdd.js
index 259e2ad..b7e30af 100644
--- a/src/pages/System/Code/CodeAdd.js
+++ b/src/pages/System/Code/CodeAdd.js
@@ -60,6 +60,16 @@ class CodeAdd extends PureComponent {
],
})()}
+
+ {getFieldDecorator('serviceName', {
+ rules: [
+ {
+ required: true,
+ message: '请输入服务名',
+ },
+ ],
+ })()}
+
{getFieldDecorator('tableName', {
rules: [
@@ -71,7 +81,7 @@ class CodeAdd extends PureComponent {
})()}
- {getFieldDecorator('modelName', {
+ {getFieldDecorator('tablePrefix', {
rules: [
{
required: true,
diff --git a/src/pages/System/Code/CodeEdit.js b/src/pages/System/Code/CodeEdit.js
index 8bcf4ed..7cf2a79 100644
--- a/src/pages/System/Code/CodeEdit.js
+++ b/src/pages/System/Code/CodeEdit.js
@@ -84,6 +84,17 @@ class ParamAdd extends PureComponent {
initialValue: detail.codeName,
})()}
+
+ {getFieldDecorator('serviceName', {
+ rules: [
+ {
+ required: true,
+ message: '请输入服务名',
+ },
+ ],
+ initialValue: detail.serviceName,
+ })()}
+
{getFieldDecorator('tableName', {
rules: [
@@ -96,14 +107,14 @@ class ParamAdd extends PureComponent {
})()}
- {getFieldDecorator('modelName', {
+ {getFieldDecorator('tablePrefix', {
rules: [
{
required: true,
message: '请输入表前缀名',
},
],
- initialValue: detail.modelName,
+ initialValue: detail.tablePrefix,
})()}
diff --git a/src/pages/System/Code/CodeView.js b/src/pages/System/Code/CodeView.js
index 747d9c7..f092a89 100644
--- a/src/pages/System/Code/CodeView.js
+++ b/src/pages/System/Code/CodeView.js
@@ -62,11 +62,14 @@ class ParamView extends PureComponent {
{detail.codeName}
+
+ {detail.serviceName}
+
{detail.tableName}
- {detail.modelName}
+ {detail.tablePrefix}
{detail.pkName}
diff --git a/src/utils/Func.js b/src/utils/Func.js
index 5d67274..7a674d9 100644
--- a/src/utils/Func.js
+++ b/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(',') : '';
}
}