zuaa
/
vue-vben-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(table): try to get close to the form stuck

This commit is contained in:
Vben 2021-06-06 22:54:25 +08:00
parent 19d8e01e11
commit d81481c521
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/components/Table/src/hooks/useTable.ts
View File

@ -2,10 +2,16 @@ import type { BasicTableProps, TableActionType, FetchParams, BasicColumn } from
import type { PaginationProps } from '../types/pagination'; import type { PaginationProps } from '../types/pagination';
import type { DynamicProps } from '/#/utils'; import type { DynamicProps } from '/#/utils';
import type { FormActionType } from '/@/components/Form'; import type { FormActionType } from '/@/components/Form';
import type { WatchStopHandle } from 'vue'; // import type { WatchStopHandle } from 'vue';
import { getDynamicProps } from '/@/utils'; import { getDynamicProps } from '/@/utils';
import { ref, onUnmounted, unref, watch, toRaw } from 'vue'; import {
ref,
onUnmounted,
unref,
// watch,
toRaw,
} from 'vue';
import { isProdMode } from '/@/utils/env'; import { isProdMode } from '/@/utils/env';
import { error } from '/@/utils/log'; import { error } from '/@/utils/log';
@ -25,7 +31,7 @@ export function useTable(tableProps?: Props): [
const loadedRef = ref<Nullable<boolean>>(false); const loadedRef = ref<Nullable<boolean>>(false);
const formRef = ref<Nullable<UseTableMethod>>(null); const formRef = ref<Nullable<UseTableMethod>>(null);
let stopWatch: WatchStopHandle; // let stopWatch: WatchStopHandle;
function register(instance: TableActionType, formInstance: UseTableMethod) { function register(instance: TableActionType, formInstance: UseTableMethod) {
isProdMode() && isProdMode() &&
@ -41,18 +47,18 @@ export function useTable(tableProps?: Props): [
tableProps && instance.setProps(getDynamicProps(tableProps)); tableProps && instance.setProps(getDynamicProps(tableProps));
loadedRef.value = true; loadedRef.value = true;
stopWatch?.(); // stopWatch?.();
stopWatch = watch( // stopWatch = watch(
() => tableProps, // () => tableProps,
() => { // () => {
tableProps && instance.setProps(getDynamicProps(tableProps)); // tableProps && instance.setProps(getDynamicProps(tableProps));
}, // },
{ // {
immediate: true, // immediate: true,
deep: true, // deep: true,
} // }
); // );
} }
function getTableInstance(): TableActionType { function getTableInstance(): TableActionType {