diff --git a/src/api/items.ts b/src/api/items.ts index 0a4300e..dee10be 100644 --- a/src/api/items.ts +++ b/src/api/items.ts @@ -4,12 +4,13 @@ export function getItems(f: Function, query: Object) { return f(query); } -export function setItems(response: any, k: string, v: string):Array { +export function setItems(response: any, k: string, v: string,rk:string):Array { const data: Array = []; k = k || 'id'; v = v || 'name'; - if (response.data && response.data.list && response.data.list.length > 0) { - response.data.list.forEach((e: any) => { + rk = rk || 'list' + if (response.data && response['data'][rk] && response['data'][rk].length > 0) { + response['data'][rk].forEach((e: any) => { data.push({ key: e[k].toString(), value: e[v].toString(), diff --git a/src/api/system/tools/gen/index.ts b/src/api/system/tools/gen/index.ts index baa5c35..575731e 100644 --- a/src/api/system/tools/gen/index.ts +++ b/src/api/system/tools/gen/index.ts @@ -72,3 +72,12 @@ export function batchGenCode(ids:number[]){ data: {ids} }) } + + +export function syncTable(tableId:number){ + return request({ + url: '/api/v1/system/tools/gen/syncTable', + method: 'post', + data: {tableId} + }) +} diff --git a/src/views/system/tools/gen/component/model.ts b/src/views/system/tools/gen/component/model.ts index ee81dcc..0f851a7 100644 --- a/src/views/system/tools/gen/component/model.ts +++ b/src/views/system/tools/gen/component/model.ts @@ -9,6 +9,11 @@ export interface TableData { updateTime:string; } +export interface DictOpt{ + dictName :string; + dictType:string; +} + export interface TableColumns { columnId: number; tableId: number; @@ -22,7 +27,6 @@ export interface TableColumns { isPk: boolean; isIncrement: boolean; isRequired: boolean; - isInsert: boolean; isEdit: boolean; isList: boolean; isDetail: boolean; diff --git a/src/views/system/tools/gen/component/tableColumns.vue b/src/views/system/tools/gen/component/tableColumns.vue index 784eb91..7d84278 100644 --- a/src/views/system/tools/gen/component/tableColumns.vue +++ b/src/views/system/tools/gen/component/tableColumns.vue @@ -51,19 +51,6 @@ - - -