@gx-design-vue/pro-table 0.2.0-alpha.14 → 0.2.0-alpha.15

package/dist/ProTable.js

@@ -249,6 +249,15 @@ const ForwardProTable = /* @__PURE__ */ defineComponent((props, { attrs, slots,
 				};
 				continue;
 			}
+			if (key === "expandable") {
+				const userExpandable = props.expandable;
+				const controlledExpandedRowKeys = props.expandedRowKeys;
+				if (userExpandable !== void 0 || controlledExpandedRowKeys !== void 0) result.expandable = {
+					...userExpandable ?? {},
+					...controlledExpandedRowKeys !== void 0 ? { expandedRowKeys: controlledExpandedRowKeys } : {}
+				};
+				continue;
+			}
 			const val = props[key];
 			if (val !== void 0) result[key] = val;
 		}

package/dist/components/ScrollBar/Bar.d.ts

@@ -70,11 +70,11 @@ declare const _default: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
   };
 }>> & Readonly<{}>, {
   readonly always: boolean;
+  readonly minSize: number;
   readonly barStyle: {
     x: CSSProperties;
     y: CSSProperties;
   };
-  readonly minSize: number;
   readonly hasScrollY: boolean;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion

package/dist/components/ScrollBar/Thumb.d.ts

@@ -44,9 +44,9 @@ declare const _default: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     readonly default: () => {};
   };
 }>> & Readonly<{}>, {
-  readonly vertical: boolean;
   readonly always: boolean;
   readonly barStyle: CSSProperties;
+  readonly vertical: boolean;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { _default as default, thumbProps };

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

@@ -47,9 +47,9 @@ declare const CollapseToggle: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     required: true;
   };
 }>> & Readonly<{}>, {
-  hashId: string;
   collapsed: boolean;
   collapseRender: WithFalse<(collapsed?: boolean) => CustomRender>;
+  hashId: string;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { CollapseToggle };

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

@@ -67,8 +67,8 @@ declare const FormItemContainer: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     default: any;
   };
 }>> & Readonly<{}>, {
-  loading: boolean;
   autoRequest: boolean;
+  loading: boolean;
   onSubmit: () => void;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion

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

@@ -70,11 +70,11 @@ declare const FormItemWrapper: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     default: any;
   };
 }>> & Readonly<{}>, {
+  hashId: string;
   label: any;
   labelWidth: string | number;
   labelAlign: "left" | "center" | "right";
   colon: boolean;
-  hashId: string;
   formItemStyle: CSSProperties;
   globalLabelGap: number;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;

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

@@ -111,6 +111,10 @@ declare const ProTableSearchForm: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     default: any;
   };
 }>> & Readonly<{}>, {
+  loading: any;
+  onReset: (params: Record<string, any>) => void;
+  proClasses: Record<string, string>;
+  proStyles: Record<string, any>;
   formColumns: ProSearchMap<"text", string>[];
   formConfig: FormConfig;
   formAutoRequest: boolean;
@@ -120,11 +124,7 @@ declare const ProTableSearchForm: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     searchText?: string;
     resetText?: string;
   };
-  loading: any;
   cardBordered: boolean;
-  proClasses: Record<string, string>;
-  proStyles: Record<string, any>;
-  onReset: (params: Record<string, any>) => void;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { ProTableSearchForm as default };

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

@@ -93,19 +93,19 @@ declare const ListToolBar: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     default: () => {};
   };
 }>> & Readonly<{}>, {
-  actions: VNode<_$vue.RendererNode, _$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<_$vue.RendererNode, _$vue.RendererElement, {
     [key: string]: any;
   }>[];
+  actions: VNode<_$vue.RendererNode, _$vue.RendererElement, {
+    [key: string]: any;
+  }>[];
+  actionsPlacement: ToolbarPlacement;
+  listToolAfter: any;
+  proClasses: Record<string, any>;
+  proStyles: Record<string, any>;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { ListToolBar, ListToolBarSetting };

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

@@ -87,17 +87,17 @@ declare const Toolbar: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     default: () => {};
   };
 }>> & Readonly<{}>, {
+  headerTitle: any;
+  headerTitleTip: any;
+  titleTipText: string;
   actions: VNode<_$vue.RendererNode, _$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, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { Toolbar, Toolbar as default };

package/dist/hooks/useTable.js

@@ -9,13 +9,15 @@ function useTable(tableRef, options) {
 	});
 	const syncedStateKeys = /* @__PURE__ */ new Set();
 	function syncTableState(state = {}) {
-		const nextState = merge({}, state);
-		for (const key of syncedStateKeys) if (!(key in nextState)) {
+		for (const key of syncedStateKeys) if (!(key in state)) {
 			delete tableState[key];
 			syncedStateKeys.delete(key);
 		}
-		Object.assign(tableState, nextState);
-		for (const key of Object.keys(nextState)) syncedStateKeys.add(key);
+		for (const key of Object.keys(state)) {
+			const nextValue = state[key];
+			if (nextValue !== tableState[key]) tableState[key] = nextValue;
+			syncedStateKeys.add(key);
+		}
 		if (options?.request) tableState.request = options.request;
 	}
 	watch(() => toValue(options?.state), (newState) => {