@gx-design-vue/pro-table 0.2.0-alpha.18 → 0.2.0-alpha.19

package/dist/ProTable.js

@@ -140,9 +140,10 @@ const ForwardProTable = /* @__PURE__ */ defineComponent((props, { attrs, slots,
 		if (props.form === false) return void 0;
 		return props.form?.actions;
 	});
-	const { formColumns, defaultFormSearch, formState, getFormSearch, resetFormState } = useTableForm({
+	const { formColumns, formParamKeys, defaultFormSearch, formState, getFormSearch, resetFormState } = useTableForm({
 		searchMap: computed(() => props.searchMap ?? []),
-		columns: computed(() => props.columns ?? [])
+		columns: computed(() => props.columns ?? []),
+		params: computed(() => props.params)
 	});
 	const { dataSource, setTableDataList, operateTableDataRow, handleTableChange, reload, run } = useFetchData({
 		rowKey: computed(() => props.rowKey),
@@ -157,6 +158,8 @@ const ForwardProTable = /* @__PURE__ */ defineComponent((props, { attrs, slots,
 		debounceTime: computed(() => props.debounceTime ?? 10),
 		params: computed(() => props.params),
 		defaultFormSearch,
+		formParamKeys,
+		getFormSearch,
 		onLoadingChange: props.onLoadingChange,
 		onRequestError: props.onRequestError,
 		onBeforeSearchSubmit: props.onBeforeSearchSubmit

package/dist/components/SearchForm/SearchForm.d.ts

@@ -111,6 +111,8 @@ declare const ProTableSearchForm: import("vue").DefineComponent<import("vue").Ex
 }>> & Readonly<{}>, {
   onReset: (params: Record<string, any>) => void;
   loading: any;
+  proClasses: Record<string, string>;
+  proStyles: Record<string, any>;
   formColumns: ProSearchMap<"text", string>[];
   formConfig: FormConfig;
   formAutoRequest: boolean;
@@ -121,8 +123,6 @@ declare const ProTableSearchForm: import("vue").DefineComponent<import("vue").Ex
     resetText?: string;
   };
   cardBordered: boolean;
-  proClasses: Record<string, string>;
-  proStyles: Record<string, any>;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { ProTableSearchForm as default };

package/dist/components/Toolbar/ListToolBar.d.ts

@@ -91,19 +91,19 @@ declare const ListToolBar: import("vue").DefineComponent<import("vue").ExtractPr
     default: () => {};
   };
 }>> & Readonly<{}>, {
-  actions: VNode<import("vue").RendererNode, import("vue").RendererElement, {
-    [key: string]: any;
-  }>[];
-  proClasses: Record<string, any>;
-  proStyles: Record<string, any>;
-  titleTipText: string;
-  actionsPlacement: ToolbarPlacement;
   headerTitle: any;
-  listToolAfter: any;
   headerTitleTip: any;
+  titleTipText: string;
   settings: VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
   }>[];
+  actions: VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+  }>[];
+  actionsPlacement: ToolbarPlacement;
+  listToolAfter: any;
+  proClasses: Record<string, any>;
+  proStyles: Record<string, any>;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { ListToolBar, ListToolBarSetting };

package/dist/components/Toolbar/index.d.ts

@@ -85,17 +85,17 @@ declare const Toolbar: import("vue").DefineComponent<import("vue").ExtractPropTy
     default: () => {};
   };
 }>> & Readonly<{}>, {
+  headerTitle: any;
+  headerTitleTip: any;
+  titleTipText: string;
   actions: VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
   }>[];
+  actionsPlacement: ToolbarPlacement;
+  listToolAfter: any;
   proClasses: Record<string, any>;
   proStyles: Record<string, any>;
   options: any;
-  titleTipText: string;
-  actionsPlacement: ToolbarPlacement;
-  headerTitle: any;
-  listToolAfter: any;
-  headerTitleTip: any;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { Toolbar, Toolbar as default };

package/dist/hooks/useFetchData.d.ts

@@ -16,6 +16,8 @@ interface FetchDataConfig<T = any, R = any> {
   debounceTime: ComputedRef<number>;
   params: ComputedRef<R | undefined>;
   defaultFormSearch: Ref<Record<string, any>>;
+  formParamKeys: ComputedRef<string[]>;
+  getFormSearch: () => Record<string, any>;
   onLoadingChange: ((loading: boolean) => any) | undefined;
   onRequestError: ((e: Error) => void) | undefined;
   onBeforeSearchSubmit: BeforeSearchSubmit<R> | undefined;

package/dist/hooks/useFetchData.js

@@ -13,7 +13,7 @@ const EMPTY_ARRAY = [];
 * 通过 requestId + AbortController 双重保证旧响应不回写。
 */
 function useFetchData(config, action) {
-	const { rowKey, polling, pollingTime, request, postData, dataSource, immediate, waitRequest, autoRequest, debounceTime, params, defaultFormSearch, onLoadingChange, onRequestError, onBeforeSearchSubmit } = config;
+	const { rowKey, polling, pollingTime, request, postData, dataSource, immediate, waitRequest, autoRequest, debounceTime, params, defaultFormSearch, formParamKeys, getFormSearch, onLoadingChange, onRequestError, onBeforeSearchSubmit } = config;
 	const { pageInfo, paginationInfo, setPagination, setLoading, setColumns, removeRowKeys, syncSelectedRows, columns } = action;
 	const tableDataList = ref([]);
 	const unmounted = ref(false);
@@ -48,6 +48,13 @@ function useFetchData(config, action) {
 		abortController.value?.abort();
 		abortController.value = null;
 	}
+	function omitFormParams(source) {
+		if (!source) return {};
+		const omittedKeys = new Set(formParamKeys.value);
+		const result = {};
+		for (const key of Object.keys(source)) if (!omittedKeys.has(key)) result[key] = source[key];
+		return result;
+	}
 	/** 写入表格数据并同步 sortIndex，无 request 时同步 dataSource total */
 	function setTableDataList(list) {
 		tableDataList.value = getSortIndex(toRaw(list), toRaw(pageInfo));
@@ -81,7 +88,8 @@ function useFetchData(config, action) {
 					current: handleCurrentPage(toRaw(pageInfo), removeKeys.length)
 				},
 				...toRaw(defaultFormSearch.value),
-				...toRaw(params.value),
+				...getFormSearch(),
+				...omitFormParams(toRaw(params.value)),
 				...fetchParams.params || {}
 			};
 			if (onBeforeSearchSubmit && isFunction(onBeforeSearchSubmit)) actionParams = await onBeforeSearchSubmit({
@@ -161,13 +169,6 @@ function useFetchData(config, action) {
 			dispatchFetch({ isPolling: false });
 		}
 	}, { deep: true });
-	watch(() => defaultFormSearch.value, (current, previous) => {
-		if (waitRequest.value) return;
-		if (current !== previous) {
-			setPagination({ current: 1 });
-			dispatchFetch({ isPolling: false });
-		}
-	}, { deep: true });
 	watch(() => polling.value, () => {
 		if (waitRequest.value) return;
 		if (!polling.value) stopPolling();

package/dist/hooks/useTableForm.d.ts

@@ -5,9 +5,11 @@ import { ComputedRef, Ref } from "vue";
 interface UseTableFormOptions {
   searchMap: ComputedRef<ProSearchMap[]>;
   columns: ComputedRef<ProColumnType[]>;
+  params: ComputedRef<Record<string, any> | undefined>;
 }
 interface UseTableFormReturn {
   formColumns: ComputedRef<ProSearchMap[]>;
+  formParamKeys: ComputedRef<string[]>;
   defaultFormSearch: Ref<Record<string, any>>;
   formState: Ref<Record<string, any>>;
   getFormSearch: () => Record<string, any>;

package/dist/hooks/useTableForm.js

@@ -1,6 +1,9 @@
 import { computed, ref, toRaw, watch } from "vue";
 import { cloneDeep } from "@gx-design-vue/pro-utils";
 //#region src/hooks/useTableForm.ts
+function hasOwnValue(target, key) {
+	return !!target && Object.hasOwn(target, key);
+}
 function sortFormItemsByOrder(items) {
 	let maxOrder = items.reduce((max, item) => {
 		return item.order !== void 0 ? Math.max(max, item.order) : max;
@@ -18,46 +21,97 @@ function sortFormItemsByOrder(items) {
 	sorted.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
 	return sorted;
 }
-function computeDefaultFormValues(columns) {
+function computeDefaultFormValues(columns, params) {
 	const defaults = {};
 	for (const col of columns) {
 		const valueType = col.valueType ?? "text";
-		if (col.initialValue !== void 0) defaults[col.name] = col.initialValue;
+		const name = col.name;
+		if (valueType === "dateRange" && (col.rangeStartName || col.rangeEndName)) {
+			const startKey = col.rangeStartName || "start";
+			const endKey = col.rangeEndName || "end";
+			defaults[startKey] = hasOwnValue(params, startKey) ? params[startKey] : void 0;
+			defaults[endKey] = hasOwnValue(params, endKey) ? params[endKey] : void 0;
+		} else if (hasOwnValue(params, name)) defaults[name] = params[name];
+		else if (col.initialValue !== void 0) defaults[col.name] = col.initialValue;
 		else if (valueType === "numberRange") defaults[col.name] = [];
 		else if (valueType === "treeSelect" && (col.field?.treeCheckable || col.field?.multiple)) defaults[col.name] = [];
 		else if (valueType === "cascader" && col.field?.multiple) defaults[col.name] = [];
-		else if (valueType === "dateRange") if (col.rangeStartName || col.rangeEndName) {
-			defaults[col.rangeStartName || "start"] = void 0;
-			defaults[col.rangeEndName || "end"] = void 0;
-		} else defaults[col.name] = void 0;
+		else if (valueType === "dateRange") defaults[col.name] = void 0;
 	}
 	return defaults;
 }
+function buildFormStateFromDefaults(defaults, columns) {
+	const state = cloneDeep(toRaw(defaults));
+	for (const record of columns) if (record.valueType === "dateRange" && (record.rangeStartName || record.rangeEndName)) {
+		const startKey = record.rangeStartName || "start";
+		const endKey = record.rangeEndName || "end";
+		const startValue = defaults[startKey];
+		const endValue = defaults[endKey];
+		if (startValue !== void 0 || endValue !== void 0) state[record.name] = [startValue, endValue];
+	}
+	return state;
+}
 function useTableForm(options) {
-	const { searchMap, columns } = options;
+	const { searchMap, columns, params } = options;
 	const formColumns = computed(() => {
-		const colsFromSearchMap = searchMap.value;
+		const colsFromSearchMap = searchMap.value ?? [];
+		const searchMapNames = new Set(colsFromSearchMap.map((item) => item.name));
 		const colsFromColumns = columns.value.filter((col) => col.searchConfig).map((col) => ({
 			...col.searchConfig,
 			order: col.searchConfig.order ?? col.order ?? 0
-		}));
+		})).filter((col) => !searchMapNames.has(col.name));
 		return sortFormItemsByOrder([...colsFromSearchMap, ...colsFromColumns]);
 	});
+	const formParamKeys = computed(() => {
+		const keys = /* @__PURE__ */ new Set();
+		for (const record of formColumns.value) {
+			if (record.name !== void 0) keys.add(record.name);
+			if (record.valueType === "dateRange" && (record.rangeStartName || record.rangeEndName)) {
+				keys.add(record.rangeStartName || "start");
+				keys.add(record.rangeEndName || "end");
+			}
+		}
+		return [...keys];
+	});
 	const defaultFormSearch = computed(() => {
-		return computeDefaultFormValues(formColumns.value);
+		return computeDefaultFormValues(formColumns.value, params.value);
 	});
 	const formState = ref({});
 	watch(() => defaultFormSearch.value, (newDefaults) => {
-		formState.value = cloneDeep(toRaw(newDefaults));
+		const nextState = { ...formState.value };
+		const defaultState = buildFormStateFromDefaults(newDefaults, formColumns.value);
+		for (const key of Object.keys(defaultState)) if (!hasOwnValue(nextState, key)) nextState[key] = defaultState[key];
+		formState.value = nextState;
+	}, {
+		deep: true,
+		immediate: true
+	});
+	watch(() => params.value, (newParams) => {
+		if (!newParams) return;
+		const nextState = { ...formState.value };
+		for (const record of formColumns.value) {
+			const name = record.name;
+			if (record.valueType === "dateRange" && (record.rangeStartName || record.rangeEndName)) {
+				const startKey = record.rangeStartName || "start";
+				const endKey = record.rangeEndName || "end";
+				if (hasOwnValue(newParams, startKey) || hasOwnValue(newParams, endKey)) {
+					const startValue = newParams[startKey];
+					const endValue = newParams[endKey];
+					nextState[name] = startValue !== void 0 || endValue !== void 0 ? [startValue, endValue] : void 0;
+				}
+			} else if (hasOwnValue(newParams, name)) nextState[name] = newParams[name];
+		}
+		formState.value = nextState;
 	}, {
 		deep: true,
 		immediate: true
 	});
 	function getFormSearch() {
-		const searchParams = cloneDeep(toRaw(formState.value));
+		const searchParams = {};
 		for (const record of formColumns.value) {
 			const valueType = record.valueType ?? "text";
 			const name = record.name;
+			searchParams[name] = cloneDeep(toRaw(formState.value[name]));
 			if (valueType === "text") searchParams[name] = formState.value[name] ?? record.initialValue;
 			if (valueType === "dateRange" && (record.rangeStartName || record.rangeEndName)) {
 				const rangeValue = searchParams[name];
@@ -81,21 +135,14 @@ function useTableForm(options) {
 		return searchParams;
 	}
 	function resetFormState() {
-		const defaults = cloneDeep(toRaw(defaultFormSearch.value));
-		formState.value = defaults;
-		for (const record of formColumns.value) if (record.valueType === "dateRange" && (record.rangeStartName || record.rangeEndName)) {
-			const startKey = record.rangeStartName || "start";
-			const endKey = record.rangeEndName || "end";
-			const startValue = defaults[startKey];
-			const endValue = defaults[endKey];
-			if (startValue !== void 0 || endValue !== void 0) formState.value[record.name] = [startValue, endValue];
-		}
+		formState.value = buildFormStateFromDefaults(cloneDeep(toRaw(defaultFormSearch.value)), formColumns.value);
 	}
 	function changeFormState(key, value) {
 		if (key) formState.value[key] = value;
 	}
 	return {
 		formColumns,
+		formParamKeys,
 		defaultFormSearch,
 		formState,
 		getFormSearch,