From 270da5b374bb9b4e4754f185a997bbd28219b494 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Thu, 30 Mar 2023 21:04:27 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B43=E6=9C=8830=E6=97=A5=20=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/BasicTable.vue | 2 +- .../Table/src/components/settings/index.vue | 6 +-- src/hooks/system/useListPage.ts | 2 +- src/views/kc/ktgl/KcKetangbiaoList.vue | 44 ++++++++++--------- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 69b6246..2a1ed3a 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/src/components/Table/src/BasicTable.vue @@ -211,7 +211,7 @@ /*if (slots.expandedRowRender) { propsData = omit(propsData, 'scroll'); }*/ - //update-end---author:wangshuai ---date:20230214 for：[QQYUN-4237]代码生成 内嵌子表模式 没有滚动条------------ + //update-end---author:wangshuai ---date:20230214 for：[QQYUN-4237]代码生成 内嵌子表模式 没有滚动条------------ propsData = omit(propsData, ['class', 'onChange']); return propsData; diff --git a/src/components/Table/src/components/settings/index.vue b/src/components/Table/src/components/settings/index.vue index d740f4f..3a615ad 100644 --- a/src/components/Table/src/components/settings/index.vue +++ b/src/components/Table/src/components/settings/index.vue @@ -2,7 +2,7 @@
- +
@@ -10,7 +10,7 @@ import type { PropType } from 'vue'; import type { TableSetting, ColumnChangeParam } from '../../types/table'; import { defineComponent, computed, unref } from 'vue'; - // import ColumnSetting from './ColumnSetting.vue'; + import ColumnSetting from './ColumnSetting.vue'; import SizeSetting from './SizeSetting.vue'; import RedoSetting from './RedoSetting.vue'; import FullScreenSetting from './FullScreenSetting.vue'; @@ -20,7 +20,7 @@ export default defineComponent({ name: 'TableSetting', components: { - // ColumnSetting, + ColumnSetting, SizeSetting, RedoSetting, FullScreenSetting, diff --git a/src/hooks/system/useListPage.ts b/src/hooks/system/useListPage.ts index 81cc60f..a44e038 100644 --- a/src/hooks/system/useListPage.ts +++ b/src/hooks/system/useListPage.ts @@ -247,7 +247,7 @@ export function useListTable(tableProps: TableProps): [ // 是否显示序号列 showIndexColumn: false, // 显示表格设置 - showTableSetting: true, + showTableSetting: false, // 表格全屏设置 tableSetting: { fullScreen: false, diff --git a/src/views/kc/ktgl/KcKetangbiaoList.vue b/src/views/kc/ktgl/KcKetangbiaoList.vue index 7393962..79557fa 100644 --- a/src/views/kc/ktgl/KcKetangbiaoList.vue +++ b/src/views/kc/ktgl/KcKetangbiaoList.vue @@ -14,32 +14,32 @@ - + + + + + + + + + + + + + + + + 查询 重置 - + @@ -51,8 +51,8 @@