From 6b447b250ae2018ad2ca692cd50d764709acbf4e Mon Sep 17 00:00:00 2001 From: Ataris <512056026@qq.com> Date: Fri, 9 Nov 2018 11:05:45 +0800 Subject: [PATCH 1/3] Accept Null --- src/models/bo/property.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/models/bo/property.ts b/src/models/bo/property.ts index 0207873..438d503 100644 --- a/src/models/bo/property.ts +++ b/src/models/bo/property.ts @@ -2,7 +2,7 @@ import { Table, Column, Model, AutoIncrement, PrimaryKey, AllowNull, DataType, D import { User, Interface, Module, Repository } from '../' export enum SCOPES { REQUEST = 'request', RESPONSE = 'response' } -export enum TYPES { STRING = 'String', NUMBER = 'Number', BOOLEAN = 'Boolean', OBJECT = 'Object', ARRAY = 'Array', FUNCTION = 'Function', REGEXP = 'RegExp' } +export enum TYPES { STRING = 'String', NUMBER = 'Number', BOOLEAN = 'Boolean', OBJECT = 'Object', ARRAY = 'Array', FUNCTION = 'Function', REGEXP = 'RegExp', Null = 'Null' } export enum REQUEST_PARAMS_TYPE { HEADERS = 1, @@ -100,4 +100,4 @@ export default class Property extends Model { /** 是否为必填选项 */ required: boolean -} \ No newline at end of file +} From bb0b21a34018ab108cef909d9e8151c2085adb25 Mon Sep 17 00:00:00 2001 From: Ataris <512056026@qq.com> Date: Fri, 9 Nov 2018 11:11:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=BC=E5=AE=B9Null=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/init/bo.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/init/bo.ts b/src/scripts/init/bo.ts index b173ddc..e32b188 100644 --- a/src/scripts/init/bo.ts +++ b/src/scripts/init/bo.ts @@ -2,7 +2,7 @@ import { mock } from 'mockjs' const scopes = ['request', 'response'] const methods = ['GET', 'POST', 'PUT', 'DELETE'] -const types = ['String', 'Number', 'Boolean', 'Object', 'Array', 'Function', 'RegExp'] +const types = ['String', 'Number', 'Boolean', 'Object', 'Array', 'Function', 'RegExp', 'Null'] const values = ['@INT', '@FLOAT', '@TITLE', '@NAME'] let USER_ID = 100000000 @@ -102,4 +102,4 @@ export const BO_PROPERTY_FN = (source: any) => { }), source, ) -} \ No newline at end of file +} From 66e7deffdc5011f7508327f6a9b985cf528fabce Mon Sep 17 00:00:00 2001 From: Ataris <512056026@qq.com> Date: Fri, 9 Nov 2018 11:16:05 +0800 Subject: [PATCH 3/3] add patch sql --- database/patch-null-type.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 database/patch-null-type.sql diff --git a/database/patch-null-type.sql b/database/patch-null-type.sql new file mode 100644 index 0000000..be6e79d --- /dev/null +++ b/database/patch-null-type.sql @@ -0,0 +1,2 @@ +ALTER TABLE `Properties` + MODIFY COLUMN `type` enum('String','Number','Boolean','Object','Array','Function','RegExp','Null') NOT NULL;