Browse Source

👣 修复致命错误

master
wangxiang 3 years ago
parent
commit
ea0a54e65c
  1. 23
      kicc-ui/src/views/system/config/index.vue

23
kicc-ui/src/views/system/config/index.vue

@ -167,8 +167,8 @@ @@ -167,8 +167,8 @@
import {usePagination} from "/@/components/Table/src/hooks/usePagination";
import {useTableStyle} from "/@/components/Table/src/hooks/useTableStyle";
import {useTableScroll} from "/@/components/Table/src/hooks/useTableScroll";
import expandIcon from "/@/components/Table/src/components/ExpandIcon";
import {omit} from "lodash-es";
import {PAGE_SIZE, PAGE_SIZE_OPTIONS} from "/@/components/Table/src/const";
import {isBoolean} from "/@/utils/is";
/** 类型规范统一声明定义区域 */
interface TableState {
@ -202,12 +202,12 @@ @@ -202,12 +202,12 @@
const ASelectOption = Select.Option;
const ARangePicker = DatePicker.RangePicker;
const { t } = useI18n();
const { prefixCls } = useDesign('basic-table');
const { prefixCls: headerPrefixCls } = useDesign('basic-table-header');
const wrapRef = ref(null);
const tableElRef = ref(null);
const queryFormElRef = ref(null);
const { t } = useI18n();
const { prefixCls } = useDesign('basic-table');
const { prefixCls: headerPrefixCls } = useDesign('basic-table-header');
const { createConfirm } = useMessage();
const { createMessage } = useMessage();
const { toggle, isFullscreen } = useFullscreen(wrapRef);
@ -245,10 +245,9 @@ @@ -245,10 +245,9 @@
bordered: true
}
});
const defineBasicTableProps = defineProps(basicProps);
const basicTableProps = computed(() => ({ ...toRaw(defineBasicTableProps), ...state.tableProps } as unknown as BasicTableProps));
// vben-tablerowSelection,
const basicTableProps = computed(() => {
return { ...basicProps, ...state.tableProps } as unknown as BasicTableProps;
});
const {
getRowSelection,
getRowSelectionRef,
@ -269,17 +268,15 @@ @@ -269,17 +268,15 @@
// 使vben-table线
const { getRowClassName } = useTableStyle(basicTableProps, prefixCls);
// 使vben-table
const { getScrollRef, redoHeight } = useTableScroll(basicTableProps, tableElRef, columns as any, getRowSelectionRef, state.tableProps.dataSource as any);
// table
//const { getScrollRef, redoHeight } = useTableScroll(basicTableProps, tableElRef, columns as any, getRowSelectionRef, state.tableProps.dataSource as any);
// a-table
const getBindValues = computed(() => {
debugger
const propsData: Recordable = {
...state.tableProps,
tableLayout: 'fixed',
columns: columns,
size: state.selectedKeys[0],
scroll: unref(getScrollRef),
//scroll: unref(getScrollRef),
rowClassName: unref(getRowClassName),
rowSelection: unref(getRowSelectionRef),
pagination: toRaw(unref(getPaginationInfo)),

Loading…
Cancel
Save