pro-design-vue 1.2.11 → 1.2.12

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.2.11 */
+/*! Pro Design Vue v1.2.12 */
 
 (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.2.11";
+  const version$1 = "1.2.12";
 
   const makeInstaller = (components = []) => {
     const install = (app) => {
@@ -8414,6 +8414,7 @@
         proPrefixCls: vue.computed(() => props.proPrefixCls),
         intl: vue.computed(() => props.intl),
         locale: vue.computed(() => props.locale),
+        dark: vue.computed(() => props.dark),
         contentOffsetTop: vue.computed(() => props.contentOffsetTop || contentOffsetTop.value),
         setContentOffsetTop: (offsetTop) => {
           contentOffsetTop.value = offsetTop;
@@ -21882,7 +21883,7 @@
       pollingLoading.value = false;
     };
     const fetchList = async (isPolling) => {
-      var _a2, _b, _c, _d;
+      var _a2, _b, _c, _d, _e, _f, _g;
       if (manualRequestRef.value) {
         manualRequestRef.value = false;
         return;
@@ -21894,12 +21895,13 @@
       }
       const { current, pageSize } = pagination.value;
       const params = { ...innerParams.value, ...formSearch.value };
-      if ((props == null ? void 0 : props.pagination) !== false) {
-        params.current = current;
-        params.pageSize = pageSize;
+      if (contextTablePagination.value !== false) {
+        const { fieldNames } = (_a2 = contextTablePagination.value) != null ? _a2 : {};
+        params[(_b = fieldNames == null ? void 0 : fieldNames.current) != null ? _b : "current"] = current;
+        params[(_c = fieldNames == null ? void 0 : fieldNames.pageSize) != null ? _c : "pageSize"] = pageSize;
       }
       if (keyword.value) {
-        params[(_a2 = keywordName.value) != null ? _a2 : "keyword"] = keyword.value;
+        params[(_d = keywordName.value) != null ? _d : "keyword"] = keyword.value;
       }
       try {
         const {
@@ -21907,13 +21909,13 @@
           success,
           total = 0,
           ...rest
-        } = await ((_b = getData.value) == null ? void 0 : _b.call(getData, params, vue.toRaw(sorters.value), vue.toRaw(filter.value))) || {};
+        } = await ((_e = getData.value) == null ? void 0 : _e.call(getData, params, vue.toRaw(sorters.value), vue.toRaw(filter.value))) || {};
         if (success === false) return [];
         setTableDataList(data);
-        if (((_c = pagination.value) == null ? void 0 : _c.total) !== total) {
+        if (((_f = pagination.value) == null ? void 0 : _f.total) !== total) {
           pagination.value.total = total || data.length;
         }
-        (_d = props.onLoad) == null ? void 0 : _d.call(props, data, rest);
+        (_g = props.onLoad) == null ? void 0 : _g.call(props, data, rest);
         return data;
       } catch (e) {
         if (props.onRequestError === void 0) throw new Error(e);
@@ -31393,8 +31395,8 @@
       const nestExpandable = vue.computed(() => tableContext.expandType.value === "nest");
       const hasNestChildren = vue.computed(
         () => {
-          var _a;
-          return !!(tableContext.childrenColumnName.value && ((_a = props.record) == null ? void 0 : _a[tableContext.childrenColumnName.value]));
+          var _a, _b;
+          return !!(tableContext.childrenColumnName.value && ((_b = (_a = props.record) == null ? void 0 : _a[tableContext.childrenColumnName.value]) == null ? void 0 : _b.length));
         }
       );
       const mergedExpandable = vue.computed(() => rowExpandable.value || nestExpandable.value);
@@ -33077,7 +33079,10 @@
       );
       const expandedRowRender = vue.computed(() => props.expandedRowRender);
       const expandType = eagerComputed(
-        () => rawData.value.some((column) => column == null ? void 0 : column[childrenColumnName.value]) ? "nest" : expandedRowRender.value ? "row" : null
+        () => rawData.value.some((column) => {
+          var _a;
+          return (_a = column == null ? void 0 : column[childrenColumnName.value]) == null ? void 0 : _a.length;
+        }) ? "nest" : expandedRowRender.value ? "row" : null
       );
       const expandable = eagerComputed(() => !!props.expandedRowRender);
       const columns = useColumns({
@@ -33330,7 +33335,12 @@
         );
       };
       const paginationProps = vue.computed(() => {
-        return omit(mergedPagination.value, ["position", "onChange", "onShowSizeChange"]);
+        return omit(mergedPagination.value, [
+          "position",
+          "onChange",
+          "onShowSizeChange",
+          "fieldNames"
+        ]);
       });
       const paginationClass = vue.computed(() => {
         return {
@@ -35269,7 +35279,8 @@
       const tableRef = vue.ref();
       const {
         table,
-        prefixCls: antPrefixCls
+        prefixCls: antPrefixCls,
+        dark
       } = useProConfigInject();
       const prefixCls = usePrefixCls("table");
       const {
@@ -35570,7 +35581,7 @@
         reset
       });
       return () => {
-        var _a2, _b, _c, _d;
+        var _a2, _b, _c, _d, _e;
         const {
           expandIcon = slots.expandIcon,
           expandedRowRender = slots.expandedRowRender
@@ -35644,7 +35655,7 @@
             return tableDom;
           })();
           tableDom = vue.createVNode(antDesignVue.Card, vue.mergeProps({
-            "bordered": isBordered("table", (_d = props.cardBordered) != null ? _d : (_c = table == null ? void 0 : table.value) == null ? void 0 : _c.cardBordered),
+            "bordered": isBordered("table", (_e = (_d = props.cardBordered) != null ? _d : (_c = table == null ? void 0 : table.value) == null ? void 0 : _c.cardBordered) != null ? _e : dark == null ? void 0 : dark.value),
             "bodyStyle": cardBodyStyle.value
           }, props.cardProps), _isSlot$2(tableDom) ? tableDom : {
             default: () => [_tableDom]
@@ -35657,7 +35668,7 @@
           }
         }, {
           default: () => {
-            var _a3, _b2, _c2;
+            var _a3, _b2, _c2, _d2;
             return [vue.createVNode("div", vue.mergeProps({
               "ref": counter.rootDomRef
             }, attrs, {
@@ -35666,7 +35677,7 @@
             }), [props.search !== false && !!((_a3 = formItems.value) == null ? void 0 : _a3.length) && vue.createVNode(FormRender, {
               "prefixCls": mergedPrefixCls.value,
               "items": formItems.value,
-              "cardBordered": (_c2 = props.cardBordered) != null ? _c2 : (_b2 = table == null ? void 0 : table.value) == null ? void 0 : _b2.cardBordered,
+              "cardBordered": (_d2 = (_c2 = props.cardBordered) != null ? _c2 : (_b2 = table == null ? void 0 : table.value) == null ? void 0 : _b2.cardBordered) != null ? _d2 : dark == null ? void 0 : dark.value,
               "search": props.search,
               "tableShowCard": props.cardProps !== false,
               "loading": formSubmitLoading.value,