pro-design-vue 1.0.0-rc.0 → 1.0.0-rc.10

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.0.0-rc.0 */
+/*! Pro Design Vue v1.0.0-rc.10 */
 
 (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.0";
+  const version$1 = "1.0.0-rc.10";
 
   const makeInstaller = (components = []) => {
     const install = (app) => {
@@ -8815,7 +8815,7 @@
       transition: { type: null, required: false, default: "linear" },
       useEasing: { type: Boolean, required: false, default: true }
     },
-    emits: ["finished", "onFinished", "onStarted", "started"],
+    emits: ["finished", "started"],
     setup(__props, { expose: __expose, emit: __emit }) {
       const props = __props;
       const emit = __emit;
@@ -8848,11 +8848,9 @@
           duration: props.duration,
           onFinished: () => {
             emit("finished");
-            emit("onFinished");
           },
           onStarted: () => {
             emit("started");
-            emit("onStarted");
           },
           ...props.useEasing ? { transition: TransitionPresets[props.transition] } : {}
         });
@@ -8875,7 +8873,7 @@
         }
         return prefix + x1 + x2 + suffix;
       }
-      __expose({ reset });
+      __expose({ start, reset });
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock(
           "span",
@@ -15756,10 +15754,133 @@
     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, transformerMap, 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) => {
+        var _a;
+        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 itemValue = tempValues[entityKey];
+        const transformFunction = (_a = transformerMap.get(entityKey)) == null ? void 0 : _a.transform;
+        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);
+          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;
+  };
+  const convertKeyInitialValue = (values, transformerMap) => {
+    if (Object.keys(values).length < 1) {
+      return values;
+    }
+    const finalValues = {};
+    Object.keys(values).forEach((entityKey) => {
+      var _a;
+      const itemValue = values[entityKey];
+      const convertValueFunction = (_a = transformerMap.get(entityKey)) == null ? void 0 : _a.convertValue;
+      if (typeof convertValueFunction === "function") {
+        const convertResult = convertValueFunction == null ? void 0 : convertValueFunction(itemValue, entityKey);
+        finalValues[entityKey] = convertResult;
+      } else {
+        finalValues[entityKey] = itemValue;
+      }
+    });
+    return finalValues;
   };
   function useAction({
     props,
@@ -15767,6 +15888,7 @@
     formData,
     initialValues,
     hasInitial,
+    transformerMap,
     onFinish,
     onReset,
     onFinishFailed
@@ -15795,20 +15917,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, transformerMap.value, 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, transformerMap.value, 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, transformerMap.value, props.omitNil);
       return transformedKey != null ? transformedKey : {};
     };
     const setFieldValue = (name, value) => {
@@ -15834,10 +15956,10 @@
       var _a;
       hasInitial.value = true;
       (_a = formRef.value) == null ? void 0 : _a.clearValidate();
-      formData.value = cloneDeep(initialValues.value);
+      formData.value = cloneDeep(convertKeyInitialValue(initialValues.value, transformerMap.value));
       Promise.resolve().then(() => {
         hasInitial.value = false;
-        onReset == null ? void 0 : onReset(formData.value);
+        onReset == null ? void 0 : onReset(transformKeySubmitValue(formData.value, transformerMap.value, props.omitNil));
       });
     };
     const resetField = (name) => {
@@ -16047,7 +16169,8 @@
           }
           return vue.createVNode(FormItem$2, {
             "key": item.key,
-            "item": item
+            "item": item,
+            "grid": mergeGrid.value
           }, null);
         });
       });
@@ -16201,6 +16324,26 @@
     }
   });
 
+  function transformer(items) {
+    const transformerMap = /* @__PURE__ */ new Map();
+    const handler = (items2) => {
+      items2.forEach((item) => {
+        var _a;
+        if (item.name && (item.transform || item.convertValue)) {
+          transformerMap.set(item.name, {
+            transform: item.transform,
+            convertValue: item.convertValue
+          });
+        } else if (item.children) {
+          const children = (_a = runFunction(item.children)) != null ? _a : [];
+          handler(children);
+        }
+      });
+    };
+    handler(items);
+    return transformerMap;
+  }
+
   function _isSlot$5(s) {
     return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
   }
@@ -16217,6 +16360,7 @@
       attrs
     }) {
       const mountedRef = vue.ref(false);
+      const transformerMap = vue.shallowRef(/* @__PURE__ */ new Map());
       const formRef = vue.ref();
       const prefixCls = usePrefixCls("form");
       const formData = vue.ref({});
@@ -16270,8 +16414,9 @@
         });
       };
       vue.watch(() => props.items, () => {
-        var _a;
-        formItems.value = formatItems((_a = props.items) != null ? _a : []);
+        var _a, _b;
+        transformerMap.value = transformer((_a = props.items) != null ? _a : []);
+        formItems.value = formatItems((_b = props.items) != null ? _b : []);
       }, {
         immediate: true
       });
@@ -16282,7 +16427,7 @@
       } = useInitialValues(props);
       vue.watch(initialValues, (newValues, oldValues) => {
         if (!isEqual(newValues, oldValues)) {
-          formData.value = cloneDeep(newValues);
+          formData.value = cloneDeep(convertKeyInitialValue(newValues, transformerMap.value));
           if (!props.request || props.requestAbort) {
             Promise.resolve().then(() => {
               hasInitial.value = false;
@@ -16294,21 +16439,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), transformerMap.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), transformerMap.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);
           }
         }
@@ -16327,6 +16472,7 @@
         formData,
         initialValues,
         hasInitial,
+        transformerMap,
         onFinish,
         onReset: props.onReset,
         onFinishFailed: props.onFinishFailed
@@ -16374,8 +16520,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, transformerMap.value, props.omitNil), action);
+        });
       });
       useProvideForm({
         ...linkage,
@@ -16422,7 +16571,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, {
@@ -16456,8 +16605,7 @@
     emits: ["update:open"],
     setup(props, {
       slots,
-      emit,
-      expose
+      emit
     }) {
       const _open = vue.ref(false);
       const loading = vue.ref(false);
@@ -16465,7 +16613,6 @@
       const intl = useIntl();
       const formRef = vue.ref();
       const footerRef = vue.ref(null);
-      const formExpose = useFormExpose(formRef);
       const open = vue.computed({
         get: () => {
           var _a;
@@ -16485,7 +16632,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"
         };
       });
@@ -16591,10 +16738,6 @@
         }
         return result;
       };
-      expose({
-        formRef,
-        ...formExpose
-      });
       return () => vue.createVNode(vue.Fragment, null, [vue.createVNode(ProDrawer, vue.mergeProps(drawerProps.value, {
         "open": open.value,
         "onAfterOpenChange": (e) => {
@@ -16608,9 +16751,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);
@@ -16629,6 +16770,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,
@@ -16653,8 +16799,7 @@
     emits: ["update:open"],
     setup(props, {
       slots,
-      emit,
-      expose
+      emit
     }) {
       const _open = vue.ref(false);
       const loading = vue.ref(false);
@@ -16662,7 +16807,6 @@
       const intl = useIntl();
       const formRef = vue.ref();
       const footerRef = vue.ref(null);
-      const formExpose = useFormExpose(formRef);
       const open = vue.computed({
         get: () => {
           var _a;
@@ -16683,7 +16827,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"
         };
       });
@@ -16790,10 +16934,6 @@
         }
         return result;
       };
-      expose({
-        formRef,
-        ...formExpose
-      });
       return () => vue.createVNode(vue.Fragment, null, [vue.createVNode(ProModal, vue.mergeProps(modalProps.value, {
         "open": open.value,
         "afterClose": () => {
@@ -16807,9 +16947,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);
@@ -16828,6 +16966,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,
@@ -17048,7 +17191,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) {
@@ -17106,7 +17249,7 @@
           justify: "start",
           class: `${prefixCls}-row`
         },
-        "submitOnLoading": false,
+        "showLoading": false,
         "submitter": submitterConfig.value,
         "items": processedList.value,
         "layout": spanSize.value.layout,
@@ -17283,7 +17426,8 @@
     },
     emits: [],
     setup(props, {
-      slots
+      slots,
+      expose
     }) {
       const intl = useIntl();
       const prefixCls = usePrefixCls("steps-form");
@@ -17449,6 +17593,9 @@
         regForm,
         onFormFinish
       });
+      expose({
+        formArrayRef
+      });
       return () => vue.createVNode("div", {
         "class": prefixCls
       }, [stepsFormDom.value]);
@@ -18162,7 +18309,8 @@
       showFixedButton: { type: Boolean, required: false, default: true },
       theme: { type: String, required: true },
       width: { type: Number, required: true },
-      zIndex: { type: Number, required: false, default: 0 }
+      zIndex: { type: Number, required: false, default: 0 },
+      fixed: { type: Boolean, required: false, default: true }
     }, {
       "collapse": { type: Boolean },
       "collapseModifiers": {},
@@ -18299,7 +18447,7 @@
           vue.Fragment,
           null,
           [
-            _ctx.domVisible ? (vue.openBlock(), vue.createElementBlock(
+            _ctx.domVisible && _ctx.fixed ? (vue.openBlock(), vue.createElementBlock(
               "div",
               {
                 key: 0,
@@ -18315,9 +18463,9 @@
               {
                 class: vue.normalizeClass([
                   vue.unref(prefixCls),
-                  `${vue.unref(prefixCls)}--fixed`,
                   _ctx.theme,
                   {
+                    [`${vue.unref(prefixCls)}--fixed`]: _ctx.fixed,
                     [`${vue.unref(prefixCls)}--mixed`]: _ctx.isSidebarMixed,
                     [`${vue.unref(prefixCls)}--no-mixed`]: !_ctx.isSidebarMixed
                   }
@@ -18549,6 +18697,7 @@
       sidebarTheme: { type: String, required: false, default: "light" },
       sidebarWidth: { type: Number, required: false, default: 200 },
       sideCollapseWidth: { type: Number, required: false, default: 60 },
+      sidebarFixed: { type: Boolean, required: false, default: true },
       tabbarEnable: { type: Boolean, required: false, default: true },
       tabbarHeight: { type: Number, required: false, default: 40 },
       zIndex: { type: Number, required: false, default: 200 }
@@ -18884,6 +19033,7 @@
               "margin-top": sidebarMarginTop.value,
               "mixed-width": _ctx.sidebarMixedWidth,
               show: showSidebar.value,
+              fixed: _ctx.sidebarFixed,
               theme: _ctx.sidebarTheme,
               width: getSidebarWidth.value,
               "z-index": sidebarZIndex.value,
@@ -18908,7 +19058,7 @@
                 ]),
                 key: "0"
               } : void 0
-            ]), 1032, ["collapse", "expand-on-hover", "expand-on-hovering", "extra-collapse", "extra-visible", "show-collapse-button", "show-fixed-button", "collapse-width", "dom-visible", "extra-width", "fixed-extra", "header-height", "is-sidebar-mixed", "margin-top", "mixed-width", "show", "theme", "width", "z-index"])) : vue.createCommentVNode("v-if", true),
+            ]), 1032, ["collapse", "expand-on-hover", "expand-on-hovering", "extra-collapse", "extra-visible", "show-collapse-button", "show-fixed-button", "collapse-width", "dom-visible", "extra-width", "fixed-extra", "header-height", "is-sidebar-mixed", "margin-top", "mixed-width", "show", "fixed", "theme", "width", "z-index"])) : vue.createCommentVNode("v-if", true),
             vue.createElementVNode(
               "div",
               {
@@ -20786,6 +20936,22 @@
     return (a.index || 0) - (b.index || 0);
   };
 
+  const flatColumnsHandle = (columns) => {
+    const flatColumns = [];
+    const loopColumns = (columns2) => {
+      columns2.forEach((column) => {
+        var _a;
+        if ((_a = column == null ? void 0 : column.children) == null ? void 0 : _a.length) {
+          loopColumns(column == null ? void 0 : column.children);
+        } else {
+          flatColumns.push(column);
+        }
+      });
+    };
+    loopColumns(columns);
+    return flatColumns;
+  };
+
   function useMergedState(defaultStateValue, option) {
     const { defaultValue, value = vue.ref() } = option || {};
     let initValue = typeof defaultStateValue === "function" ? defaultStateValue() : defaultStateValue;
@@ -29000,6 +29166,15 @@
               status: option.status,
               text: option.text
             });
+          } else if (option.color) {
+            cellValue = vue.createVNode(
+              antDesignVue.Tag,
+              {
+                color: option.color,
+                bordered: false
+              },
+              () => option.text
+            );
           } else {
             cellValue = option.text || emptyText;
           }
@@ -30274,6 +30449,7 @@
       const tableSlotsContext = useInjectSlots();
       const dragRowPlaceholderRef = vue.ref();
       const bodyRef = vue.ref();
+      const measureDomRef = vue.ref();
       const bodyInnerRef = vue.ref();
       const scrollLayerRef = vue.ref();
       const viewportRef = vue.ref();
@@ -30455,8 +30631,8 @@
         };
       });
       const bodyViewportStyle = vue.computed(() => ({
-        // width: `calc(100% + ${tableContext.showVerticalScrollbar.value ? tableContext.scrollBarSize.value || 15 : 0}px)`,
-        width: `calc(100% + 0px)`,
+        width: `calc(100% + ${tableContext.showVerticalScrollbar.value ? tableContext.scrollBarSize.value || 15 : 0}px)`,
+        // width: `calc(100% + 0px)`,
         overflowX: "hidden",
         overflowY: "auto",
         height: "100%"
@@ -30584,6 +30760,12 @@
         return summaryStyle.value;
       });
       const emptyStyle = vue.computed(() => ({ width: `${props.bodyWidth}px` }));
+      useResizeObserver(measureDomRef, (entries) => {
+        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,
         measureDomStyle: vue.computed(() => ({
@@ -30634,6 +30816,7 @@
           emit("update:bodyScrollWidth", e.detail.width);
         },
         bodyRef,
+        measureDomRef,
         bodyInnerRef,
         viewportRef,
         summaryViewportRef,
@@ -30790,15 +30973,15 @@
           _: 1
           /* STABLE */
         }),
-        vue.withDirectives((vue.openBlock(), vue.createElementBlock(
+        vue.createElementVNode(
           "div",
           {
             key: "body",
             ref: "bodyRef",
             class: vue.normalizeClass(_ctx.bodyClass),
             style: vue.normalizeStyle(_ctx.bodyStyle),
-            onDragstart: _cache[9] || (_cache[9] = (...args) => _ctx.handleDragStart && _ctx.handleDragStart(...args)),
-            onKeydown: _cache[10] || (_cache[10] = (...args) => _ctx.handleKeydown && _ctx.handleKeydown(...args))
+            onDragstart: _cache[8] || (_cache[8] = (...args) => _ctx.handleDragStart && _ctx.handleDragStart(...args)),
+            onKeydown: _cache[9] || (_cache[9] = (...args) => _ctx.handleKeydown && _ctx.handleKeydown(...args))
           },
           [
             vue.createElementVNode("div", _hoisted_1$3, [
@@ -31108,24 +31291,22 @@
                 6
                 /* CLASS, STYLE */
               ),
-              vue.withDirectives(vue.createElementVNode(
+              vue.createElementVNode(
                 "div",
                 {
-                  style: vue.normalizeStyle(_ctx.measureDomStyle),
-                  onResize: _cache[6] || (_cache[6] = (...args) => _ctx.handleBodyResize && _ctx.handleBodyResize(...args))
+                  ref: "measureDomRef",
+                  style: vue.normalizeStyle(_ctx.measureDomStyle)
                 },
                 null,
-                36
-                /* STYLE, NEED_HYDRATION */
-              ), [
-                [_directive_resize]
-              ]),
+                4
+                /* STYLE */
+              ),
               vue.withDirectives(vue.createElementVNode(
                 "div",
                 {
                   class: vue.normalizeClass(`${_ctx.prefixCls}-body-scroll-measure`),
                   style: vue.normalizeStyle(`min-width: ${_ctx.bodyInnerWidth}px`),
-                  onResizewidth: _cache[7] || (_cache[7] = (...args) => _ctx.handleBodyScrollResize && _ctx.handleBodyScrollResize(...args))
+                  onResizewidth: _cache[6] || (_cache[6] = (...args) => _ctx.handleBodyScrollResize && _ctx.handleBodyScrollResize(...args))
                 },
                 null,
                 38
@@ -31138,7 +31319,7 @@
                 {
                   class: vue.normalizeClass(`${_ctx.prefixCls}-body-inner-measure`),
                   style: vue.normalizeStyle(`min-width: ${_ctx.scrollX}px`),
-                  onResizewidth: _cache[8] || (_cache[8] = (...args) => _ctx.handleBodyInnerResize && _ctx.handleBodyInnerResize(...args))
+                  onResizewidth: _cache[7] || (_cache[7] = (...args) => _ctx.handleBodyInnerResize && _ctx.handleBodyInnerResize(...args))
                 },
                 null,
                 38
@@ -31153,9 +31334,7 @@
           ],
           38
           /* CLASS, STYLE, NEED_HYDRATION */
-        )), [
-          [_directive_resize, void 0, "height"]
-        ]),
+        ),
         vue.createVNode(_component_RenderSlot, null, {
           default: vue.withCtx(() => [
             _ctx.summary && _ctx.summaryFixed === "bottom" ? (vue.openBlock(), vue.createElementBlock(
@@ -31184,7 +31363,7 @@
                         vue.withDirectives((vue.openBlock(), vue.createElementBlock(
                           "div",
                           {
-                            onResizeheight: _cache[11] || (_cache[11] = (...args) => _ctx.handleResize && _ctx.handleResize(...args))
+                            onResizeheight: _cache[10] || (_cache[10] = (...args) => _ctx.handleResize && _ctx.handleResize(...args))
                           },
                           [
                             vue.createVNode(_component_RenderVNode, { vnode: _ctx.summary }, null, 8, ["vnode"])
@@ -31637,6 +31816,9 @@
       const showHorizontalScrollbar = vue.ref(false);
       const debounceFn = debounce(() => {
         showHorizontalScrollbar.value = bodyMaxWidth.value > bodyWidth.value;
+        if (bodyWidth.value > bodyScrollWidth.value) {
+          bodyScrollWidth.value = bodyWidth.value;
+        }
       }, 100);
       vue.watch([bodyMaxWidth, bodyWidth], () => {
         debounceFn();
@@ -33356,25 +33538,10 @@
   function _isSlot$3(s) {
     return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
   }
-  const flatColumnsHandle = (columns) => {
-    const flatColumns = [];
-    const loopColumns = (columns2) => {
-      columns2.forEach((column) => {
-        var _a;
-        if ((_a = column == null ? void 0 : column.children) == null ? void 0 : _a.length) {
-          loopColumns(column == null ? void 0 : column.children);
-        } else {
-          flatColumns.push(column);
-        }
-      });
-    };
-    loopColumns(columns);
-    return flatColumns;
-  };
   var FormRender = /* @__PURE__ */ vue.defineComponent({
     props: {
       prefixCls: String,
-      columns: {
+      items: {
         type: Array,
         default: () => []
       },
@@ -33388,6 +33555,7 @@
       },
       loading: Boolean,
       manual: Boolean,
+      tableShowCard: Boolean,
       beforeSearchSubmit: {
         type: Function,
         default: (searchParams) => searchParams
@@ -33412,25 +33580,6 @@
     setup: (props) => {
       var _a, _b, _c;
       const activeTabKey = vue.ref(((_a = props.search) == null ? void 0 : _a.cardProps) !== false ? (_c = (_b = props.search) == null ? void 0 : _b.cardProps) == null ? void 0 : _c.activeTabKey : "");
-      const formItems = vue.computed(() => {
-        var _a2, _b2, _c2;
-        if ((_b2 = (_a2 = props.search) == null ? void 0 : _a2.items) == null ? void 0 : _b2.length) {
-          return (_c2 = props.search) == null ? void 0 : _c2.items;
-        }
-        return flatColumnsHandle(props.columns).filter((item) => {
-          if (item.hideInSearch) {
-            return false;
-          }
-          return true;
-        }).map((item) => {
-          return {
-            ...item,
-            width: void 0,
-            tooltip: item.headerTooltip,
-            name: item.dataIndex
-          };
-        });
-      });
       const cardProps = vue.computed(() => {
         var _a2, _b2;
         if (!((_a2 = props.search) == null ? void 0 : _a2.cardProps)) {
@@ -33461,14 +33610,15 @@
         (_e = (_d = cardProps.value) == null ? void 0 : _d.onTabChange) == null ? void 0 : _e.call(_d, key);
       };
       return () => {
-        var _a2, _b2, _c2;
+        var _a2, _b2, _c2, _d;
         const searchDom = vue.createVNode(ProQueryFilter, vue.mergeProps({
           "class": `${props.prefixCls}-form`
         }, omit(props.search || {}, ["cardProps", "tabName"]), {
-          "items": formItems.value,
+          "items": props.items,
           "loading": props.loading,
           "style": {
-            marginBlockEnd: ((_a2 = props.search) == null ? void 0 : _a2.cardProps) !== false ? 0 : "40px"
+            marginBlockEnd: ((_a2 = props.search) == null ? void 0 : _a2.cardProps) !== false && props.tableShowCard ? 0 : "30px",
+            ...(_b2 = props.search) == null ? void 0 : _b2.style
           },
           "onReset": props.onReset,
           "onFinish": (values) => {
@@ -33485,7 +33635,7 @@
             submit(values, true);
           }
         }), null);
-        if (((_b2 = props.search) == null ? void 0 : _b2.cardProps) !== false) {
+        if (((_c2 = props.search) == null ? void 0 : _c2.cardProps) !== false && props.tableShowCard) {
           return vue.createVNode(antDesignVue.Card, vue.mergeProps({
             "class": `${props.prefixCls}-search`,
             "activeTabKey": activeTabKey.value,
@@ -33493,7 +33643,7 @@
             "style": {
               marginBlockEnd: "16px"
             }
-          }, omit((_c2 = cardProps.value) != null ? _c2 : {}, ["onTabChange", "activeTabKey"]), {
+          }, omit((_d = cardProps.value) != null ? _d : {}, ["onTabChange", "activeTabKey"]), {
             "onTabChange": onTabChange
           }), _isSlot$3(searchDom) ? searchDom : {
             default: () => [searchDom]
@@ -33635,6 +33785,28 @@
         };
         return loopFilter(tableColumn.value);
       });
+      const formItems = vue.computed(() => {
+        var _a2, _b, _c;
+        if (!props.search) {
+          return [];
+        }
+        if ((_b = (_a2 = props.search) == null ? void 0 : _a2.items) == null ? void 0 : _b.length) {
+          return (_c = props.search) == null ? void 0 : _c.items;
+        }
+        return flatColumnsHandle(props.columns).filter((item) => {
+          if (item.hideInSearch) {
+            return false;
+          }
+          return true;
+        }).map((item) => {
+          return {
+            ...item,
+            width: void 0,
+            tooltip: item.headerTooltip,
+            name: item.dataIndex
+          };
+        });
+      });
       const preserveRecordsRef = vue.ref(/* @__PURE__ */ new Map());
       const getRowKey = vue.computed(() => typeof props.rowKey == "function" ? props.rowKey : (record) => {
         return record == null ? void 0 : record[props.rowKey || "id"];
@@ -33682,7 +33854,8 @@
       };
       const hideToolbar = vue.computed(() => props.options === false && !props.title && !slots.title && !slots.toolbar && !slots.searchExtra && !slots.toolbarActions);
       const notNeedCardDom = vue.computed(() => {
-        if (props.search === false && props.toolBar === false) {
+        var _a2;
+        if ((props.search === false || !((_a2 = formItems.value) == null ? void 0 : _a2.length)) && props.toolBar === false) {
           return true;
         }
         return false;
@@ -33749,7 +33922,7 @@
         reset
       });
       return () => {
-        var _a2, _b;
+        var _a2, _b, _c;
         const {
           expandIcon = slots.expandIcon,
           expandedRowRender = slots.expandedRowRender
@@ -33818,11 +33991,12 @@
         }, attrs, {
           "class": [`${mergedPrefixCls.value}-wrapper ${props.bordered ? mergedPrefixCls.value + "-wrapper-bordered" : ""} ${"dark" === theme.value ? mergedPrefixCls.value + "-wrapper-dark" : ""} ${pollingLoading.value ? mergedPrefixCls.value + "-wrapper-polling" : ""}`, attrs.class],
           "onKeydown": onKeydown
-        }), [props.search !== false && vue.createVNode(FormRender, {
+        }), [props.search !== false && !!((_c = formItems.value) == null ? void 0 : _c.length) && vue.createVNode(FormRender, {
           "prefixCls": mergedPrefixCls.value,
-          "columns": props.columns,
+          "items": formItems.value,
           "cardBordered": props.cardBordered,
           "search": props.search,
+          "tableShowCard": props.cardProps !== false,
           "loading": formSubmitLoading.value,
           "beforeSearchSubmit": props.beforeSearchSubmit,
           "manual": props.manual,
@@ -34666,6 +34840,10 @@
       colProps: {
         type: Object,
         default: void 0
+      },
+      grid: {
+        type: Boolean,
+        default: void 0
       }
     },
     setup(props, {
@@ -34679,9 +34857,13 @@
         var _a;
         return (_a = props.colProps) != null ? _a : colProps == null ? void 0 : colProps.value;
       });
+      const mergeGrid = vue.computed(() => {
+        var _a;
+        return (_a = props.grid) != null ? _a : grid == null ? void 0 : grid.value;
+      });
       return () => {
         var _a;
-        if (grid == null ? void 0 : grid.value) {
+        if (mergeGrid.value) {
           return vue.createVNode(antDesignVue.Col, mergeColProps.value, {
             default: () => {
               var _a2;
@@ -34847,25 +35029,18 @@
   function useFieldValue({
     namePath,
     initialValue,
-    convertValue,
-    transform
+    convertValue
   }) {
     const fieldValue = vue.shallowRef();
-    const { formData, initialValues, mountedRef } = useInjectForm();
+    const { formData, initialValues } = useInjectForm();
     const modelValue = vue.computed(() => get(formData.value, namePath.value));
     const onValueChange = (value) => {
-      set(
-        formData.value,
-        namePath.value,
-        transform ? transform(value, namePath.value, formData.value) : value
-      );
+      set(formData.value, namePath.value, value);
     };
     vue.watch(
       modelValue,
       (newValue) => {
-        fieldValue.value = cloneDeep(
-          convertValue ? convertValue(newValue, namePath.value) : newValue
-        );
+        fieldValue.value = cloneDeep(newValue);
       },
       {
         immediate: true,
@@ -34874,11 +35049,14 @@
     );
     const initFieldInitialValue = () => {
       var _a;
-      if (!mountedRef.value && typeof modelValue.value === "undefined" && typeof initialValue !== "undefined") {
-        const value = transform ? transform(initialValue, namePath.value, formData.value) : initialValue;
+      if (
+        // !mountedRef.value &&
+        typeof modelValue.value === "undefined" && typeof initialValue !== "undefined"
+      ) {
+        const value = convertValue ? convertValue(initialValue, namePath.value) : initialValue;
         set(formData.value, namePath.value, cloneDeep(value));
-        set((_a = initialValues == null ? void 0 : initialValues.value) != null ? _a : {}, namePath.value, cloneDeep(value));
-        fieldValue.value = convertValue ? convertValue(initialValue, namePath.value) : initialValue;
+        set((_a = initialValues == null ? void 0 : initialValues.value) != null ? _a : {}, namePath.value, cloneDeep(initialValue));
+        fieldValue.value = value;
       }
     };
     initFieldInitialValue();
@@ -36418,6 +36596,10 @@
       item: {
         type: Object,
         default: () => ({})
+      },
+      grid: {
+        type: Boolean,
+        default: void 0
       }
     },
     setup(props) {
@@ -36452,6 +36634,10 @@
         transform: props.item.transform
       });
       const fieldRef = vue.ref();
+      const mergeGrid = vue.computed(() => {
+        var _a;
+        return (_a = props.grid) != null ? _a : grid == null ? void 0 : grid.value;
+      });
       const fieldType = vue.computed(() => {
         var _a;
         return (_a = props.item.fieldType) != null ? _a : "text";
@@ -36534,7 +36720,7 @@
         };
         if (props.item.width && !fieldWidthSizeMap[props.item.width]) {
           newStyle.width = isNumber$2(props.item.width) ? props.item.width + "px" : props.item.width;
-        } else if (grid == null ? void 0 : grid.value) {
+        } else if (mergeGrid == null ? void 0 : mergeGrid.value) {
           newStyle.maxWidth = "100%";
           newStyle.width = "100%";
         }
@@ -36629,7 +36815,8 @@
         const render = getSlot(props.item.render, formSlotsContext);
         if (render) {
           return vue.createVNode(FormColWrapper, {
-            "colProps": props.item.colProps
+            "colProps": props.item.colProps,
+            "grid": mergeGrid.value
           }, {
             default: () => [vue.createVNode(RenderVNode$1, {
               "vnode": render,
@@ -36676,7 +36863,8 @@
           }, null)]);
         }
         return vue.createVNode(FormColWrapper, {
-          "colProps": props.item.colProps
+          "colProps": props.item.colProps,
+          "grid": mergeGrid.value
         }, {
           default: () => [vue.createVNode(antDesignVue.Form.Item, restItemProps.value, {
             default: () => [defaultDom],