pro-design-vue 1.4.6 → 1.4.7

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.4.6 */
+/*! Pro Design Vue v1.4.7 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('ant-design-vue'), require('vue'), require('ant-design-vue/es/locale/zh_CN.js')) :
@@ -32,7 +32,7 @@
   const DEFAULT_NAMESPACE = "pro";
   const DEFAULT_LOCALE = "zh-CN";
 
-  const version$1 = "1.4.6";
+  const version$1 = "1.4.7";
 
   const makeInstaller = (components = []) => {
     const install = (app) => {
@@ -24961,9 +24961,10 @@
       pollingLoading,
       pagination,
       reset: async () => {
-        const { pagination: optionPageInfo } = props || {};
-        const { current = 1, pageSize = 10 } = optionPageInfo || {};
+        const optionPageInfo = mergePropsAndPagination(intl, contextTablePagination.value);
+        const { current = 1, pageSize = 10, ...rest } = optionPageInfo || {};
         const initialPageInfo = {
+          ...rest,
           current,
           total: 0,
           pageSize
@@ -37956,7 +37957,9 @@
             return;
           }
         }
-        actions.setFormSearch(values);
+        actions.setFormSearch({
+          ...values
+        });
       };
       const counter = useContainer(props);
       const tableColumn = vue.computed(() => {
@@ -38867,11 +38870,11 @@
     setup(__props) {
       const slots = vue.useSlots();
       const prefixCls = usePrefixCls("page");
-      const footerHeight = vue.ref(0);
       const contentHeight = vue.ref(0);
       const shouldAutoHeight = vue.ref(false);
       const { contentOffsetTop, page } = useProConfigInject();
       const tabActiveKey = vue.useModel(__props, "activeKey");
+      const rootRef = vue.useTemplateRef("root");
       const footerRef = vue.useTemplateRef("footer");
       const contentRef = vue.useTemplateRef("content");
       const mergeContentPadding = vue.computed(() => {
@@ -38965,8 +38968,9 @@
           return;
         }
         await vue.nextTick();
-        footerHeight.value = ((_a = footerRef.value) == null ? void 0 : _a.offsetHeight) || 0;
-        contentHeight.value = window.innerHeight - (((_c = (_b = contentRef.value) == null ? void 0 : _b.getBoundingClientRect()) == null ? void 0 : _c.top) || 0) - footerHeight.value - __props.heightOffset;
+        const rootBottomPadding = parseFloat(getComputedStyle(rootRef.value).paddingBottom);
+        const footerHeight = ((_a = footerRef.value) == null ? void 0 : _a.offsetHeight) || 0;
+        contentHeight.value = window.innerHeight - (((_c = (_b = contentRef.value) == null ? void 0 : _b.getBoundingClientRect()) == null ? void 0 : _c.top) || 0) - rootBottomPadding - footerHeight - __props.heightOffset;
         setTimeout(() => {
           shouldAutoHeight.value = true;
         }, 30);
@@ -38988,6 +38992,7 @@
         return vue.openBlock(), vue.createElementBlock(
           "div",
           {
+            ref: "root",
             class: vue.normalizeClass([vue.unref(prefixCls), ((_a = _ctx.tabList) == null ? void 0 : _a.length) ? `is-tabs` : ""]),
             style: vue.normalizeStyle((_b = vue.unref(page)) == null ? void 0 : _b.pageStyle)
           },