diff --git a/src/template/table.vue b/src/template/table.vue index eb8eba94..421411d2 100644 --- a/src/template/table.vue +++ b/src/template/table.vue @@ -30,6 +30,7 @@ import TableStore from '@/utils/tableStore' import Table from '@/components/table/index.vue' import TableHeader from '@/components/table/header/index.vue' import PopupEdit from './dialog.vue' +import { mainHeight } from '@/utils/layout' // 注意名字不要重复,若要保持页面存活,名字需要和路由admin后面的字符保持一致 defineOptions({ @@ -37,6 +38,8 @@ defineOptions({ }) const popupEdit = ref() const tableStore = new TableStore({ + // 若页面表格高度需要调整,请修改publicHeight(内容区域除表格外其他内容的高度) + // publicHeight: 60, url: '/user-boot/user/list', method: 'POST', column: [ @@ -153,8 +156,9 @@ const tableStore = new TableStore({ }) } }) - +// 注入到子组件 provide('tableStore', tableStore) +// 默认参数 参数多的话可以使用Object.assign方法 tableStore.table.params.searchState = 1 tableStore.table.params.searchValue = '' tableStore.table.params.casualUser = -1 @@ -164,6 +168,7 @@ onMounted(() => { tableStore.index() }) +// 弹框 const addUser = () => { popupEdit.value.open('新增用户') } diff --git a/src/utils/tableStore.ts b/src/utils/tableStore.ts index 20bc53d4..0514c421 100644 --- a/src/utils/tableStore.ts +++ b/src/utils/tableStore.ts @@ -3,6 +3,7 @@ import createAxios from '@/utils/request' import { requestPayload } from '@/utils/request' import { Method } from 'axios' import { mainHeight } from '@/utils/layout' + interface TableStoreParams { url: string pk?: string @@ -39,7 +40,7 @@ export default class TableStore { loadCallback: null, resetCallback: null, beforeSearchFun: null, - height: mainHeight(20 + (this.showPage ? 58 : 0)).height as string, + height: 0, publicHeight: 0 }) @@ -55,6 +56,7 @@ export default class TableStore { this.table.loadCallback = options.loadCallback || null this.table.beforeSearchFun = options.beforeSearchFun || null Object.assign(this.table.params, options.params) + this.table.height = mainHeight(20 + (this.showPage ? 58 : 0) + this.table.publicHeight).height as string } index() { diff --git a/src/views/pms/voltageSags/monitoringPoint/online/eventStudy/index.vue b/src/views/pms/voltageSags/monitoringPoint/online/eventStudy/index.vue index abfe4ab8..9d18be8d 100644 --- a/src/views/pms/voltageSags/monitoringPoint/online/eventStudy/index.vue +++ b/src/views/pms/voltageSags/monitoringPoint/online/eventStudy/index.vue @@ -1,5 +1,5 @@