diff --git a/src/api/system/log/index.ts b/src/api/system/log/index.ts index fe28f2ea4..f0916c9bd 100644 --- a/src/api/system/log/index.ts +++ b/src/api/system/log/index.ts @@ -10,7 +10,6 @@ export function getReqLogList(query: API.PageParams) { }, { isMock: true, - isGetDataDirectly: false, }, ); } diff --git a/src/api/system/log/model.d.ts b/src/api/system/log/model.d.ts index addcee94d..4a25a6fc8 100644 --- a/src/api/system/log/model.d.ts +++ b/src/api/system/log/model.d.ts @@ -32,7 +32,7 @@ declare namespace API { id: number; taskId: number; name: string; - createTime: string; + createdAt: string; consumeTime: number; detail: string; status: number; diff --git a/src/components/dynamic-table/components/table-settings/column-setting.vue b/src/components/dynamic-table/components/table-settings/column-setting.vue index e158d31ea..f357f568e 100644 --- a/src/components/dynamic-table/components/table-settings/column-setting.vue +++ b/src/components/dynamic-table/components/table-settings/column-setting.vue @@ -83,6 +83,7 @@ let inited = false; const defaultColumns = cloneDeep(table.columns); const defaultShowIndex = !!table.showIndex; + const defaultBordered = table.bordered; const tableColumns = ref([]); @@ -103,6 +104,7 @@ const initCheckStatus = () => { tableColumns.value = cloneDeep(defaultColumns); checkIndex.value = defaultShowIndex; + checkBordered.value = defaultBordered; tableColumns.value.forEach((item) => (item.hideInTable ??= false)); }; initCheckStatus(); @@ -157,7 +159,7 @@ const reset = () => { initCheckStatus(); - table.setProps({ showIndex: defaultShowIndex }); + table.setProps({ showIndex: defaultShowIndex, bordered: defaultBordered }); }; diff --git a/src/components/dynamic-table/components/table-settings/size-setting.vue b/src/components/dynamic-table/components/table-settings/size-setting.vue index fd266e866..607b69186 100644 --- a/src/components/dynamic-table/components/table-settings/size-setting.vue +++ b/src/components/dynamic-table/components/table-settings/size-setting.vue @@ -8,7 +8,7 @@