|
@@ -39,9 +39,10 @@
|
|
|
ColumnChangeParam,
|
|
|
} from './types/table';
|
|
|
|
|
|
- import { defineComponent, ref, computed, unref, toRaw } from 'vue';
|
|
|
+ import { defineComponent, ref, computed, unref, toRaw, inject, watchEffect } from 'vue';
|
|
|
import { Table } from 'ant-design-vue';
|
|
|
import { BasicForm, useForm } from '/@/components/Form/index';
|
|
|
+ import { PageWrapperFixedHeightKey } from '/@/components/Page';
|
|
|
import expandIcon from './components/ExpandIcon';
|
|
|
import HeaderCell from './components/HeaderCell.vue';
|
|
|
import { InnerHandlers } from './types/table';
|
|
@@ -64,6 +65,7 @@
|
|
|
import { omit } from 'lodash-es';
|
|
|
import { basicProps } from './props';
|
|
|
import { isFunction } from '/@/utils/is';
|
|
|
+ import { warn } from '/@/utils/log';
|
|
|
|
|
|
export default defineComponent({
|
|
|
components: {
|
|
@@ -104,6 +106,13 @@
|
|
|
return { ...props, ...unref(innerPropsRef) } as BasicTableProps;
|
|
|
});
|
|
|
|
|
|
+ const isFixedHeightPage = inject(PageWrapperFixedHeightKey);
|
|
|
+ watchEffect(() => {
|
|
|
+ unref(isFixedHeightPage) &&
|
|
|
+ props.canResize &&
|
|
|
+ warn("[BasicTable] 'canRize' not worked with PageWrapper while 'fixedHeight' is true");
|
|
|
+ });
|
|
|
+
|
|
|
const { getLoading, setLoading } = useLoading(getProps);
|
|
|
const {
|
|
|
getPaginationInfo,
|
|
@@ -380,9 +389,9 @@
|
|
|
align-items: center;
|
|
|
}
|
|
|
|
|
|
- .ant-table-tbody > tr.ant-table-row-selected td {
|
|
|
- //background-color: fade(@primary-color, 8%) !important;
|
|
|
- }
|
|
|
+ //.ant-table-tbody > tr.ant-table-row-selected td {
|
|
|
+ //background-color: fade(@primary-color, 8%) !important;
|
|
|
+ //}
|
|
|
}
|
|
|
|
|
|
.ant-pagination {
|