pro-design-vue 1.2.4 → 1.2.5

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.2.4 */
+/*! Pro Design Vue v1.2.5 */
 
 (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.4";
+  const version$1 = "1.2.5";
 
   const makeInstaller = (components = []) => {
     const install = (app) => {
@@ -35162,7 +35162,6 @@
         });
         (_e = (_d = cardProps.value) == null ? void 0 : _d.onTabChange) == null ? void 0 : _e.call(_d, key);
       };
-      console.log("\u{1F680} ~ return ~ cardProps.value:", cardProps.value);
       return () => {
         var _a2, _b2, _c2, _d;
         const searchDom = vue.createVNode(ProQueryFilter, vue.mergeProps({
@@ -35243,6 +35242,19 @@
         var _a2;
         return (_a2 = props.prefixCls) != null ? _a2 : prefixCls;
       });
+      const mergeOptions = vue.computed(() => {
+        var _a2, _b;
+        if (props.options === false) {
+          return false;
+        }
+        if (props.options === void 0) {
+          return (_a2 = table == null ? void 0 : table.value) == null ? void 0 : _a2.options;
+        }
+        return {
+          ...(_b = table == null ? void 0 : table.value) == null ? void 0 : _b.options,
+          ...props.options
+        };
+      });
       useProvideLevel();
       vue.watch(hoverRowKey, (newValue, oldValue) => {
         if (counter.rootDomRef.value) {
@@ -35294,11 +35306,11 @@
       });
       const onFormSearchSubmit = (values) => {
         var _a2, _b;
-        if (props.options && props.options.search) {
+        if (mergeOptions.value && mergeOptions.value.search) {
           const {
             name = "keyword"
-          } = props.options.search === true ? {} : props.options.search;
-          const success = (_b = (_a2 = props.options.search) == null ? void 0 : _a2.onSearch) == null ? void 0 : _b.call(_a2, actions.keyword.value);
+          } = mergeOptions.value.search === true ? {} : mergeOptions.value.search;
+          const success = (_b = (_a2 = mergeOptions.value.search) == null ? void 0 : _a2.onSearch) == null ? void 0 : _b.call(_a2, actions.keyword.value);
           if (success !== false) {
             actions.setFormSearch({
               ...values,
@@ -35445,7 +35457,7 @@
         (_a2 = props["onUpdate:selectedRowKeys"]) == null ? void 0 : _a2.call(props, [], []);
         setSelectedRowKeys([]);
       };
-      const hideToolbar = vue.computed(() => props.options === false && !props.title && !slots.title && !slots.toolbar && !slots.searchExtra && !slots.toolbarActions);
+      const hideToolbar = vue.computed(() => mergeOptions.value === false && !props.title && !slots.title && !slots.toolbar && !slots.searchExtra && !slots.toolbarActions);
       const notNeedCardDom = vue.computed(() => {
         var _a2;
         if ((props.search === false || !((_a2 = formItems.value) == null ? void 0 : _a2.length)) && props.toolBar === false) {
@@ -35515,7 +35527,7 @@
         reset
       });
       return () => {
-        var _a2, _b;
+        var _a2, _b, _c, _d;
         const {
           expandIcon = slots.expandIcon,
           expandedRowRender = slots.expandedRowRender
@@ -35526,7 +35538,7 @@
           "subTitle": props.subTitle,
           "tooltip": props.tooltip,
           "prefixCls": mergedPrefixCls.value,
-          "options": props.options,
+          "options": mergeOptions.value,
           "actionsRef": {
             ...actions,
             fullScreen: () => {
@@ -35589,7 +35601,7 @@
             return tableDom;
           })();
           tableDom = vue.createVNode(antDesignVue.Card, vue.mergeProps({
-            "bordered": isBordered("table", props.cardBordered),
+            "bordered": isBordered("table", (_d = props.cardBordered) != null ? _d : (_c = table == null ? void 0 : table.value) == null ? void 0 : _c.cardBordered),
             "bodyStyle": cardBodyStyle.value
           }, props.cardProps), _isSlot$2(tableDom) ? tableDom : {
             default: () => [_tableDom]
@@ -35602,7 +35614,7 @@
           }
         }, {
           default: () => {
-            var _a3;
+            var _a3, _b2, _c2;
             return [vue.createVNode("div", vue.mergeProps({
               "ref": counter.rootDomRef
             }, attrs, {
@@ -35611,7 +35623,7 @@
             }), [props.search !== false && !!((_a3 = formItems.value) == null ? void 0 : _a3.length) && vue.createVNode(FormRender, {
               "prefixCls": mergedPrefixCls.value,
               "items": formItems.value,
-              "cardBordered": props.cardBordered,
+              "cardBordered": (_c2 = props.cardBordered) != null ? _c2 : (_b2 = table == null ? void 0 : table.value) == null ? void 0 : _b2.cardBordered,
               "search": props.search,
               "tableShowCard": props.cardProps !== false,
               "loading": formSubmitLoading.value,