Browse Source

👣 修复致命错误

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

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

@ -147,7 +147,7 @@
*/ */
import { BasicTitle } from '/@/components/Basic'; import { BasicTitle } from '/@/components/Basic';
import { RedoOutlined, ColumnHeightOutlined, FullscreenOutlined, FullscreenExitOutlined, LeftOutlined, RightOutlined } from '@ant-design/icons-vue'; import { RedoOutlined, ColumnHeightOutlined, FullscreenOutlined, FullscreenExitOutlined, LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
import {ref, onMounted, watchEffect, ComputedRef, computed, watch} from 'vue'; import { ref, onMounted, watchEffect, ComputedRef, computed, watch } from 'vue';
import { Table, Form, Row, Col, Divider, Tooltip, Dropdown, Menu, Select, DatePicker, Alert } from 'ant-design-vue'; import { Table, Form, Row, Col, Divider, Tooltip, Dropdown, Menu, Select, DatePicker, Alert } from 'ant-design-vue';
import {BasicColumn, BasicTableProps, PaginationProps, SizeType, SorterResult} from '/@/components/Table'; import {BasicColumn, BasicTableProps, PaginationProps, SizeType, SorterResult} from '/@/components/Table';
import { listConfig, delConfig } from '/@/api/platform/system/controller/config'; import { listConfig, delConfig } from '/@/api/platform/system/controller/config';
@ -167,8 +167,8 @@
import {usePagination} from "/@/components/Table/src/hooks/usePagination"; import {usePagination} from "/@/components/Table/src/hooks/usePagination";
import {useTableStyle} from "/@/components/Table/src/hooks/useTableStyle"; import {useTableStyle} from "/@/components/Table/src/hooks/useTableStyle";
import {useTableScroll} from "/@/components/Table/src/hooks/useTableScroll"; import {useTableScroll} from "/@/components/Table/src/hooks/useTableScroll";
import expandIcon from "/@/components/Table/src/components/ExpandIcon"; import {PAGE_SIZE, PAGE_SIZE_OPTIONS} from "/@/components/Table/src/const";
import {omit} from "lodash-es"; import {isBoolean} from "/@/utils/is";
/** 类型规范统一声明定义区域 */ /** 类型规范统一声明定义区域 */
interface TableState { interface TableState {
@ -202,12 +202,12 @@
const ASelectOption = Select.Option; const ASelectOption = Select.Option;
const ARangePicker = DatePicker.RangePicker; const ARangePicker = DatePicker.RangePicker;
const { t } = useI18n();
const { prefixCls } = useDesign('basic-table');
const { prefixCls: headerPrefixCls } = useDesign('basic-table-header');
const wrapRef = ref(null); const wrapRef = ref(null);
const tableElRef = ref(null); const tableElRef = ref(null);
const queryFormElRef = 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 { createConfirm } = useMessage();
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const { toggle, isFullscreen } = useFullscreen(wrapRef); const { toggle, isFullscreen } = useFullscreen(wrapRef);
@ -245,10 +245,9 @@
bordered: true bordered: true
} }
}); });
const defineBasicTableProps = defineProps(basicProps);
const basicTableProps = computed(() => ({ ...toRaw(defineBasicTableProps), ...state.tableProps } as unknown as BasicTableProps));
// vben-tablerowSelection, // vben-tablerowSelection,
const basicTableProps = computed(() => {
return { ...basicProps, ...state.tableProps } as unknown as BasicTableProps;
});
const { const {
getRowSelection, getRowSelection,
getRowSelectionRef, getRowSelectionRef,
@ -269,17 +268,15 @@
// 使vben-table线 // 使vben-table线
const { getRowClassName } = useTableStyle(basicTableProps, prefixCls); const { getRowClassName } = useTableStyle(basicTableProps, prefixCls);
// 使vben-table // 使vben-table
const { getScrollRef, redoHeight } = useTableScroll(basicTableProps, tableElRef, columns as any, getRowSelectionRef, state.tableProps.dataSource as any); //const { getScrollRef, redoHeight } = useTableScroll(basicTableProps, tableElRef, columns as any, getRowSelectionRef, state.tableProps.dataSource as any);
// a-table
// table
const getBindValues = computed(() => { const getBindValues = computed(() => {
debugger
const propsData: Recordable = { const propsData: Recordable = {
...state.tableProps, ...state.tableProps,
tableLayout: 'fixed', tableLayout: 'fixed',
columns: columns, columns: columns,
size: state.selectedKeys[0], size: state.selectedKeys[0],
scroll: unref(getScrollRef), //scroll: unref(getScrollRef),
rowClassName: unref(getRowClassName), rowClassName: unref(getRowClassName),
rowSelection: unref(getRowSelectionRef), rowSelection: unref(getRowSelectionRef),
pagination: toRaw(unref(getPaginationInfo)), pagination: toRaw(unref(getPaginationInfo)),

Loading…
Cancel
Save