pro-design-vue 1.0.0-rc.11 → 1.0.0-rc.13

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.0.0-rc.11 */
+/*! Pro Design Vue v1.0.0-rc.13 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('ant-design-vue'), require('vue')) :
@@ -16,7 +16,7 @@
   const SCROLL_FIXED_CLASS = `_scroll__fixed_`;
   const DEFAULT_NAMESPACE = "pro";
 
-  const version$1 = "1.0.0-rc.11";
+  const version$1 = "1.0.0-rc.13";
 
   const makeInstaller = (components = []) => {
     const install = (app) => {
@@ -11751,7 +11751,7 @@
     __name: "drawer",
     props: {
       description: { type: String, required: false },
-      showFullscreen: { type: Boolean, required: false, default: true },
+      showFullscreen: { type: Boolean, required: false, default: false },
       defaultFullscreen: { type: Boolean, required: false },
       autofocus: { type: Boolean, required: false, default: false },
       closable: { type: Boolean, required: false, default: true },
@@ -14951,7 +14951,7 @@
     __name: "modal",
     props: {
       description: { type: String, required: false },
-      showFullscreen: { type: Boolean, required: false, default: true },
+      showFullscreen: { type: Boolean, required: false, default: false },
       defaultFullscreen: { type: Boolean, required: false },
       draggable: { type: Boolean, required: false, default: false },
       top: { type: Number, required: false, default: 100 },
@@ -16234,15 +16234,33 @@
         action
       } = useInjectForm();
       const formSlotsContext = useInjectSlots$1();
-      const submit = () => {
+      const submit = async () => {
         var _a;
-        action.submit();
-        (_a = props.onSubmit) == null ? void 0 : _a.call(props);
+        if (!props.onSubmit) {
+          action.submit();
+          return;
+        }
+        const values = action.getFieldsValue();
+        const response = (_a = props.onSubmit) == null ? void 0 : _a.call(props, values, action);
+        const result = await response;
+        if (result) {
+          action.submit();
+        }
+        return result;
       };
-      const reset = () => {
-        var _a, _b;
-        (_a = action.reset) == null ? void 0 : _a.call(action);
-        (_b = props.onReset) == null ? void 0 : _b.call(props);
+      const reset = async () => {
+        var _a;
+        if (!props.onReset) {
+          action.reset();
+          return;
+        }
+        const values = action.getFieldsValue();
+        const response = (_a = props.onReset) == null ? void 0 : _a.call(props, values, action);
+        const result = await response;
+        if (result) {
+          action.reset();
+        }
+        return result;
       };
       const resetButton = vue.computed(() => {
         const {
@@ -16369,7 +16387,7 @@
         var _a;
         return (_a = props.formKey) != null ? _a : requestFormCacheId.toString();
       });
-      const [loading, setloading] = useMergedState$1(false, {
+      const [loading, setLoading] = useMergedState$1(false, {
         value: vue.computed(() => props.loading),
         onChange: (val) => {
           var _a;
@@ -16445,7 +16463,7 @@
         if (!props.onFinish) return;
         if (props.submitOnLoading) {
           if (loading.value) return;
-          setloading(true);
+          setLoading(true);
         }
         try {
           const finalValues = transformKeySubmitValue(cloneDeep(formData.value), transformerMap.value, props.omitNil);
@@ -16454,7 +16472,7 @@
           console.log("\u{1F680} ~ onFinish ~ error:", error);
         } finally {
           if (props.submitOnLoading) {
-            setloading(false);
+            setLoading(false);
           }
         }
       };
@@ -16509,6 +16527,7 @@
         }), null);
         if (submitterProps.value.teleport) {
           return vue.createVNode(vue.Teleport, {
+            "defer": true,
             "to": submitterProps.value.teleport
           }, _isSlot$5(dom) ? dom : {
             default: () => [dom]
@@ -17084,6 +17103,7 @@
         }
         if (props.defaultColsNumber !== void 0) {
           const oneRowControlsNumber = 24 / spanSize.value.span - 1;
+          console.log("\u{1F680} ~ showLength ~ oneRowControlsNumber:", oneRowControlsNumber);
           return props.defaultColsNumber > oneRowControlsNumber ? oneRowControlsNumber : props.defaultColsNumber;
         }
         return Math.max(1, 24 / spanSize.value.span - 1);
@@ -17120,7 +17140,7 @@
         }
         return void 0;
       });
-      const [collapsed, setCollapsed] = useMergedState$1(() => props.defaultCollapsed, {
+      const [collapsed, setCollapsed] = useMergedState$1(() => props.defaultCollapsed && !!props.submitter, {
         value: vue.computed(() => props.collapsed),
         onChange: (val) => {
           emit("collapse", val);
@@ -17191,7 +17211,7 @@
               firstRowFull = colSpan === 24 && !item.hidden;
             }
             const hidden = item.hidden || // 如果收起了
-            props.submitter !== false && collapsed.value && (firstRowFull || // 如果 超过显示长度 且 总长度超过了 24
+            collapsed.value && (firstRowFull || // 如果 超过显示长度 且 总长度超过了 24
             totalSize.value > showLength.value) && !!index;
             if (hidden) {
               if (!props.preserve) {
@@ -17219,7 +17239,10 @@
             return {
               ...item,
               hidden,
-              formItemProps: formItemFixStyle.value,
+              formItemProps: {
+                ...item.title ? formItemFixStyle.value : {},
+                ...item.formItemProps
+              },
               colProps: {
                 span: colSpan
               }
@@ -17263,9 +17286,16 @@
       }), {
         ...slots,
         submitter: ({
+          props: props2,
+          action,
           defaultDoms
         }) => {
-          return vue.createVNode(vue.Fragment, null, [defaultDoms, needCollapse.value !== false && vue.createVNode("a", {
+          var _a2;
+          return vue.createVNode(vue.Fragment, null, [slots.submitter ? (_a2 = slots.submitter) == null ? void 0 : _a2.call(slots, {
+            props: props2,
+            action,
+            defaultDoms
+          }) : defaultDoms, needCollapse.value !== false && vue.createVNode("a", {
             "class": `${prefixCls}-collapse-button`,
             "onClick": () => setCollapsed(!collapsed.value)
           }, [collapsed.value ? intl.getMessage("form.collapsed", "\u5C55\u5F00") : intl.getMessage("form.expand", "\u6536\u8D77"), !!hiddenNum.value && `(${hiddenNum.value})`, vue.createVNode(DownOutlined, {
@@ -17444,7 +17474,7 @@
         onChange: props.onCurrentChange
       });
       const regForm = (formRef, index) => {
-        formArrayRef.value[index] = formRef;
+        formArrayRef.value[index] = formRef.value;
       };
       const lastStep = vue.computed(() => step.value === props.steps.length - 1);
       const onFormFinish = async (name, formData) => {
@@ -17458,10 +17488,7 @@
           const success = await props.onFinish(values);
           if (success) {
             setStep(0);
-            formArrayRef.value.forEach((form) => {
-              var _a;
-              return (_a = form.value) == null ? void 0 : _a.reset();
-            });
+            formArrayRef.value.forEach((form) => form == null ? void 0 : form.reset());
           }
         } catch (error) {
           console.log(error);
@@ -17470,10 +17497,9 @@
         }
       };
       const onSubmit = () => {
-        var _a;
         const from = formArrayRef.value[step.value];
         if (from) {
-          (_a = from.value) == null ? void 0 : _a.submit();
+          from == null ? void 0 : from.submit();
         }
       };
       const prePage = () => {
@@ -33821,8 +33847,8 @@
         }
         onCleanSelected();
       });
-      const [selectedRowKeys, setSelectedRowKeys] = useMergedState(props.rowSelection ? ((_a = props.rowSelection) == null ? void 0 : _a.defaultSelectedRowKeys) || [] : void 0, {
-        value: vue.computed(() => props.rowSelection ? props.rowSelection.selectedRowKeys : void 0)
+      const [selectedRowKeys, setSelectedRowKeys] = useMergedState(props.selectedRowKeys || (props.rowSelection ? ((_a = props.rowSelection) == null ? void 0 : _a.defaultSelectedRowKeys) || [] : void 0), {
+        value: vue.computed(() => props.selectedRowKeys || (props.rowSelection ? props.rowSelection.selectedRowKeys : void 0))
       });
       const rowSelection = vue.computed(() => ({
         selectedRowKeys: selectedRowKeys.value,
@@ -36694,7 +36720,7 @@
           disabled: ((_e = runFunction((_d = props.item.disabled) != null ? _d : baseProps == null ? void 0 : baseProps.disabled, formData.value, rowData == null ? void 0 : rowData.value)) != null ? _e : allDisabledKeys.value.includes(props.item.key)) ? true : void 0,
           placeholder: (_f = props.item.placeholder) != null ? _f : baseProps == null ? void 0 : baseProps.placeholder,
           options: (_h = (_g = props.item.options) != null ? _g : baseProps == null ? void 0 : baseProps.options) != null ? _h : baseProps == null ? void 0 : baseProps.treeData,
-          allowClear: (_j = (_i = props.item.allowClear) != null ? _i : baseProps == null ? void 0 : baseProps.allowClear) != null ? _j : false
+          allowClear: (_j = (_i = props.item.allowClear) != null ? _i : baseProps == null ? void 0 : baseProps.allowClear) != null ? _j : true
         };
         return omitUndefined({
           valueEnum: props.item.valueEnum,
@@ -36760,12 +36786,14 @@
           }, [vue.createVNode(FormTitle, {
             "title": props.item.title,
             "tooltip": props.item.tooltip
-          }, null)]), vue.createVNode(RenderVNode$1, {
+          }, null)]), vue.createVNode("div", {
+            "class": `${prefixCls}-item-title-extra`
+          }, [vue.createVNode(RenderVNode$1, {
             "vnode": extraRender,
             "props": {
               formData: formData.value
             }
-          }, null)]);
+          }, null)])]);
         }
         return temp;
       });
@@ -36812,20 +36840,6 @@
       });
       return () => {
         var _a, _b;
-        const render = getSlot(props.item.render, formSlotsContext);
-        if (render) {
-          return vue.createVNode(FormColWrapper, {
-            "colProps": props.item.colProps,
-            "grid": mergeGrid.value
-          }, {
-            default: () => [vue.createVNode(RenderVNode$1, {
-              "vnode": render,
-              "props": {
-                formData: formData.value
-              }
-            }, null)]
-          });
-        }
         const renderFormItem = getSlot(props.item.renderFormItem, formSlotsContext);
         const extraRender = getSlot((_a = props.item.extra) == null ? void 0 : _a.item, formSlotsContext);
         const FieldComponent = (_b = fieldComponentMap[fieldType.value]) != null ? _b : fieldComponentMap["text"];
@@ -36853,23 +36867,33 @@
         if (extraRender) {
           defaultDom = vue.createVNode("div", {
             "style": "display: flex; flex-direction: row; justify-content: flex-start; align-items: center;"
-          }, [defaultDom, vue.createVNode(RenderVNode$1, {
+          }, [defaultDom, vue.createVNode("div", {
+            "style": "margin-inline-start: 5px; flex-shrink: 0;"
+          }, [vue.createVNode(RenderVNode$1, {
             "vnode": extraRender,
             "props": {
               formData: formData.value,
               listName: listName == null ? void 0 : listName.value,
               name: props.item.name
             }
-          }, null)]);
+          }, null)])]);
         }
+        const formItemDom = vue.createVNode(antDesignVue.Form.Item, restItemProps.value, {
+          default: () => [defaultDom],
+          ...slotsGetter.value
+        });
+        const render = getSlot(props.item.render, formSlotsContext);
         return vue.createVNode(FormColWrapper, {
           "colProps": props.item.colProps,
           "grid": mergeGrid.value
         }, {
-          default: () => [vue.createVNode(antDesignVue.Form.Item, restItemProps.value, {
-            default: () => [defaultDom],
-            ...slotsGetter.value
-          })]
+          default: () => [render ? vue.createVNode(RenderVNode$1, {
+            "vnode": render,
+            "props": {
+              formData: formData.value,
+              defaultDom: formItemDom
+            }
+          }, null) : formItemDom]
         });
       };
     }