pro-design-vue 1.0.0-rc.7 → 1.0.0-rc.9

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.0.0-rc.7 */
+/*! Pro Design Vue v1.0.0-rc.9 */
 
 (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.7";
+  const version$1 = "1.0.0-rc.9";
 
   const makeInstaller = (components = []) => {
     const install = (app) => {
@@ -15754,10 +15754,115 @@
     return isString$1(namePath) ? namePath.indexOf(".") > -1 ? namePath.split(".") : [namePath] : namePath;
   };
 
-  const transformKey = (values, paramsOmitNil, parentKey) => {
-    console.log("\u{1F680} ~ transformKey ~ parentKey:", parentKey);
-    console.log("\u{1F680} ~ transformKey ~ paramsOmitNil:", paramsOmitNil);
-    return values;
+  function isPlainObj(itemValue) {
+    if (typeof itemValue !== "object") return false;
+    if (itemValue === null) return true;
+    if (isValidElement$1(itemValue)) return false;
+    if (itemValue.constructor === RegExp) return false;
+    if (itemValue instanceof Map) return false;
+    if (itemValue instanceof Set) return false;
+    if (itemValue instanceof HTMLElement) return false;
+    if (itemValue instanceof Blob) return false;
+    if (itemValue instanceof File) return false;
+    if (Array.isArray(itemValue)) return false;
+    return true;
+  }
+  const transformKeySubmitValue = (values, paramsOmitNil) => {
+    if (Object.keys(values).length < 1) {
+      return values;
+    }
+    if (typeof window === "undefined") return values;
+    if (typeof values !== "object" || isNil(values) || values instanceof Blob) {
+      return values;
+    }
+    let finalValues = Array.isArray(values) ? [] : {};
+    const gen = (tempValues, parentsKey) => {
+      const isArrayValues = Array.isArray(tempValues);
+      let result = isArrayValues ? [] : {};
+      if (tempValues == null || tempValues === void 0) {
+        return result;
+      }
+      Object.keys(tempValues).forEach((entityKey) => {
+        const transformForArray = (transformList, subItemValue) => {
+          if (!Array.isArray(transformList)) return entityKey;
+          transformList.forEach((transform2, idx) => {
+            if (!transform2) return;
+            const subTransformItem = subItemValue == null ? void 0 : subItemValue[idx];
+            if (typeof transform2 === "function") {
+              subItemValue[idx] = transform2(subItemValue, entityKey, tempValues);
+            }
+            if (typeof transform2 === "object" && !Array.isArray(transform2)) {
+              Object.keys(transform2).forEach((transformArrayItem) => {
+                const subTransformItemValue = subTransformItem == null ? void 0 : subTransformItem[transformArrayItem];
+                if (typeof transform2[transformArrayItem] === "function" && subTransformItemValue) {
+                  const res = transform2[transformArrayItem](
+                    subTransformItem[transformArrayItem],
+                    entityKey,
+                    tempValues
+                  );
+                  subTransformItem[transformArrayItem] = typeof res === "object" ? res[transformArrayItem] : res;
+                } else if (typeof transform2[transformArrayItem] === "object" && Array.isArray(transform2[transformArrayItem]) && subTransformItemValue) {
+                  transformForArray(transform2[transformArrayItem], subTransformItemValue);
+                }
+              });
+            }
+            if (typeof transform2 === "object" && Array.isArray(transform2) && subTransformItem) {
+              transformForArray(transform2, subTransformItem);
+            }
+          });
+          return entityKey;
+        };
+        const key = parentsKey ? [parentsKey, entityKey].flat(1) : [entityKey].flat(1);
+        const itemValue = tempValues[entityKey];
+        const transformFunction = get(values, key);
+        const transform = () => {
+          let tempKey, transformedResult, isTransformedResultPrimitive = false;
+          if (typeof transformFunction === "function") {
+            transformedResult = transformFunction == null ? void 0 : transformFunction(itemValue, entityKey, tempValues);
+            const typeOfResult = typeof transformedResult;
+            if (typeOfResult !== "object" && typeOfResult !== "undefined") {
+              tempKey = entityKey;
+              isTransformedResultPrimitive = true;
+            } else {
+              tempKey = transformedResult;
+            }
+          } else {
+            tempKey = transformForArray(transformFunction, itemValue);
+          }
+          if (Array.isArray(tempKey)) {
+            result = set(result, tempKey, itemValue);
+            return;
+          }
+          if (typeof tempKey === "object" && !Array.isArray(finalValues)) {
+            finalValues = merge(finalValues, tempKey);
+          } else if (typeof tempKey === "object" && Array.isArray(finalValues)) {
+            result = { ...result, ...tempKey };
+          } else if (tempKey !== null || tempKey !== void 0) {
+            result = set(
+              result,
+              [tempKey],
+              isTransformedResultPrimitive ? transformedResult : itemValue
+            );
+          }
+        };
+        if (transformFunction && typeof transformFunction === "function") {
+          transform();
+        }
+        if (typeof window === "undefined") return;
+        if (isPlainObj(itemValue)) {
+          const genValues = gen(itemValue, key);
+          if (Object.keys(genValues).length < 1) {
+            return;
+          }
+          result = set(result, [entityKey], genValues);
+          return;
+        }
+        transform();
+      });
+      return paramsOmitNil ? result : tempValues;
+    };
+    finalValues = Array.isArray(values) && Array.isArray(finalValues) ? [...gen(values)] : merge({}, gen(values), finalValues);
+    return finalValues;
   };
   function useAction({
     props,
@@ -15793,20 +15898,20 @@
       if (!namePath) throw new Error("name is require");
       const value = get(formData.value, namePath);
       const obj = set({}, namePath, value);
-      return get(transformKey(obj, props.omitNil, namePath), namePath);
+      return get(transformKeySubmitValue(obj, props.omitNil), namePath);
     };
     const getFieldFormatValueObject = (name) => {
       const namePath = covertFormName(name);
       if (!namePath) throw new Error("name is require");
       const value = get(formData.value, namePath);
       const obj = set({}, namePath, value);
-      return transformKey(obj, props.omitNil, namePath);
+      return transformKeySubmitValue(obj, props.omitNil);
     };
     const validateFieldsReturnFormatValue = async (nameList) => {
       var _a;
       if (!Array.isArray(nameList) && nameList) throw new Error("nameList must be array");
       const values = await ((_a = formRef.value) == null ? void 0 : _a.validateFields(nameList));
-      const transformedKey = transformKey(values, props.omitNil);
+      const transformedKey = transformKeySubmitValue(values, props.omitNil);
       return transformedKey != null ? transformedKey : {};
     };
     const setFieldValue = (name, value) => {
@@ -15835,7 +15940,7 @@
       formData.value = cloneDeep(initialValues.value);
       Promise.resolve().then(() => {
         hasInitial.value = false;
-        onReset == null ? void 0 : onReset(formData.value);
+        onReset == null ? void 0 : onReset(transformKeySubmitValue(formData.value, props.omitNil));
       });
     };
     const resetField = (name) => {
@@ -16292,21 +16397,21 @@
       });
       const onValuesChange = debounce(() => {
         var _a;
-        (_a = props.onValuesChange) == null ? void 0 : _a.call(props, cloneDeep(formData.value));
+        (_a = props.onValuesChange) == null ? void 0 : _a.call(props, transformKeySubmitValue(cloneDeep(formData.value), props.omitNil));
       }, 200);
       const onFinish = async () => {
         if (!props.onFinish) return;
-        if (props.showLoading) {
+        if (props.submitOnLoading) {
           if (loading.value) return;
           setloading(true);
         }
         try {
-          const finalValues = cloneDeep(formData.value);
+          const finalValues = transformKeySubmitValue(cloneDeep(formData.value), props.omitNil);
           await props.onFinish(finalValues);
         } catch (error) {
           console.log("\u{1F680} ~ onFinish ~ error:", error);
         } finally {
-          if (props.showLoading) {
+          if (props.submitOnLoading) {
             setloading(false);
           }
         }
@@ -16372,8 +16477,11 @@
         var _a, _b, _c;
         mountedRef.value = true;
         requestFormCacheId += 1;
-        const finalValues = (_b = (_a = formRef.value) == null ? void 0 : _a.getFieldsValue) == null ? void 0 : _b.call(_a, true);
-        (_c = props.onInit) == null ? void 0 : _c.call(props, finalValues, action);
+        const finalValues = (_c = (_b = (_a = formRef.value) == null ? void 0 : _a.getFieldsValue) == null ? void 0 : _b.call(_a, true)) != null ? _c : {};
+        Promise.resolve().then(() => {
+          var _a2;
+          (_a2 = props.onInit) == null ? void 0 : _a2.call(props, transformKeySubmitValue(finalValues, props.omitNil), action);
+        });
       });
       useProvideForm({
         ...linkage,
@@ -16420,7 +16528,7 @@
           "style": attrs.style
         }), {
           default: () => [vue.createVNode(antDesignVue.Spin, {
-            "spinning": requestLoading.value || props.submitOnLoading && loading.value
+            "spinning": props.showLoading && (requestLoading.value || loading.value)
           }, {
             default: () => [vue.createVNode(FormRowWrapper, null, {
               default: () => [vue.createVNode(FormItems, {
@@ -16454,8 +16562,7 @@
     emits: ["update:open"],
     setup(props, {
       slots,
-      emit,
-      expose
+      emit
     }) {
       const _open = vue.ref(false);
       const loading = vue.ref(false);
@@ -16463,7 +16570,6 @@
       const intl = useIntl();
       const formRef = vue.ref();
       const footerRef = vue.ref(null);
-      const formExpose = useFormExpose(formRef);
       const open = vue.computed({
         get: () => {
           var _a;
@@ -16483,7 +16589,7 @@
       });
       const formProps = vue.computed(() => {
         return {
-          ...omitUndefined(omit(props, ["onOpenChange", "closeOnFinish", "drawerProps", "title", "width", "confirmOnValuesChange", "submitTimeout", "onFinish", "submitter"])),
+          ...omitUndefined(omit(props, ["onOpenChange", "closeOnFinish", "drawerProps", "title", "width", "onInit", "confirmOnValuesChange", "submitTimeout", "onFinish", "submitter"])),
           layout: "vertical"
         };
       });
@@ -16589,10 +16695,6 @@
         }
         return result;
       };
-      expose({
-        formRef,
-        ...formExpose
-      });
       return () => vue.createVNode(vue.Fragment, null, [vue.createVNode(ProDrawer, vue.mergeProps(drawerProps.value, {
         "open": open.value,
         "onAfterOpenChange": (e) => {
@@ -16606,9 +16708,7 @@
           closeConfirm(e);
         }
       }), {
-        default: () => [vue.createVNode(BaseForm, vue.mergeProps({
-          "ref": formRef
-        }, formProps.value, {
+        default: () => [vue.createVNode(BaseForm, vue.mergeProps(formProps.value, {
           "submitter": submitterConfig.value,
           "onFinish": async (values) => {
             const result = await onFinishHandle(values);
@@ -16627,6 +16727,11 @@
               valuesChanged.value = false;
             }
             (_a = props.onReset) == null ? void 0 : _a.call(props);
+          },
+          "onInit": (values, action) => {
+            var _a;
+            formRef.value = action;
+            (_a = props.onInit) == null ? void 0 : _a.call(props, values, action);
           }
         }), formSlots.value)],
         ...drawerSlots.value,
@@ -16651,8 +16756,7 @@
     emits: ["update:open"],
     setup(props, {
       slots,
-      emit,
-      expose
+      emit
     }) {
       const _open = vue.ref(false);
       const loading = vue.ref(false);
@@ -16660,7 +16764,6 @@
       const intl = useIntl();
       const formRef = vue.ref();
       const footerRef = vue.ref(null);
-      const formExpose = useFormExpose(formRef);
       const open = vue.computed({
         get: () => {
           var _a;
@@ -16681,7 +16784,7 @@
       const formProps = vue.computed(() => {
         var _a;
         return {
-          ...omitUndefined(omit(props, ["onOpenChange", "closeOnFinish", "modalProps", "title", "width", "confirmOnValuesChange", "submitTimeout", "onFinish", "submitter"])),
+          ...omitUndefined(omit(props, ["onInit", "onOpenChange", "closeOnFinish", "modalProps", "title", "width", "confirmOnValuesChange", "submitTimeout", "onFinish", "submitter"])),
           layout: (_a = props.layout) != null ? _a : "vertical"
         };
       });
@@ -16788,10 +16891,6 @@
         }
         return result;
       };
-      expose({
-        formRef,
-        ...formExpose
-      });
       return () => vue.createVNode(vue.Fragment, null, [vue.createVNode(ProModal, vue.mergeProps(modalProps.value, {
         "open": open.value,
         "afterClose": () => {
@@ -16805,9 +16904,7 @@
           closeConfirm(e);
         }
       }), {
-        default: () => [vue.createVNode(BaseForm, vue.mergeProps({
-          "ref": formRef
-        }, formProps.value, {
+        default: () => [vue.createVNode(BaseForm, vue.mergeProps(formProps.value, {
           "submitter": submitterConfig.value,
           "onFinish": async (values) => {
             const result = await onFinishHandle(values);
@@ -16826,6 +16923,11 @@
               valuesChanged.value = false;
             }
             (_a = props.onReset) == null ? void 0 : _a.call(props);
+          },
+          "onInit": (values, action) => {
+            var _a;
+            formRef.value = action;
+            (_a = props.onInit) == null ? void 0 : _a.call(props, values, action);
           }
         }), formSlots.value)],
         ...modalSlots.value,
@@ -17046,7 +17148,7 @@
               firstRowFull = colSpan === 24 && !item.hidden;
             }
             const hidden = item.hidden || // 如果收起了
-            collapsed.value && (firstRowFull || // 如果 超过显示长度 且 总长度超过了 24
+            props.submitter !== false && collapsed.value && (firstRowFull || // 如果 超过显示长度 且 总长度超过了 24
             totalSize.value > showLength.value) && !!index;
             if (hidden) {
               if (!props.preserve) {
@@ -17104,7 +17206,7 @@
           justify: "start",
           class: `${prefixCls}-row`
         },
-        "submitOnLoading": false,
+        "showLoading": false,
         "submitter": submitterConfig.value,
         "items": processedList.value,
         "layout": spanSize.value.layout,
@@ -30612,11 +30714,10 @@
       });
       const emptyStyle = vue.computed(() => ({ width: `${props.bodyWidth}px` }));
       useResizeObserver(measureDomRef, (entries) => {
-        var _a, _b;
-        console.log("\u{1F680} ~ useResizeObserver ~ entries:", (_a = entries[0]) == null ? void 0 : _a.contentRect);
-        const contentRect = (_b = entries[0]) == null ? void 0 : _b.contentRect;
-        emit("update:bodyWidth", contentRect == null ? void 0 : contentRect.width);
-        emit("update:bodyHeight", contentRect == null ? void 0 : contentRect.height);
+        var _a;
+        const contentRect = (_a = entries[0]) == null ? void 0 : _a.contentRect;
+        emit("update:bodyWidth", (contentRect == null ? void 0 : contentRect.width) || 0);
+        emit("update:bodyHeight", (contentRect == null ? void 0 : contentRect.height) || 0);
       });
       return {
         bodyContainerStyle,