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

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.0.0-rc.9 */
+/*! Pro Design Vue v1.1.0 */
 
 (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.9";
+  const version$1 = "1.1.0";
 
   const makeInstaller = (components = []) => {
     const install = (app) => {
@@ -2206,13 +2206,13 @@
   function isNumber$2(val) {
     return is$1(val, "Number");
   }
-  function isPromise$1(val) {
-    return is$1(val, "Promise") && isObject$4(val) && isFunction$3(val.then) && isFunction$3(val.catch);
+  function isPromise(val) {
+    return is$1(val, "Promise") && isFunction$2(val.then) && isFunction$2(val.catch);
   }
   function isString$1(val) {
     return is$1(val, "String");
   }
-  function isFunction$3(val) {
+  function isFunction$2(val) {
     return typeof val === "function";
   }
   function isArray$2(val) {
@@ -2256,7 +2256,7 @@
         ...okButtonProps
       },
       async onOk(...args) {
-        if (isPromise$1(onOk)) {
+        if (isPromise(onOk)) {
           return await new Promise(() => {
             onOk == null ? void 0 : onOk(args);
           });
@@ -2507,7 +2507,7 @@
   var funcTag$2 = "[object Function]";
   var genTag$1 = "[object GeneratorFunction]";
   var proxyTag = "[object Proxy]";
-  function isFunction$2(value) {
+  function isFunction$1(value) {
     if (!isObject$3(value)) {
       return false;
     }
@@ -2554,7 +2554,7 @@
     if (!isObject$3(value) || isMasked(value)) {
       return false;
     }
-    var pattern = isFunction$2(value) ? reIsNative : reIsHostCtor;
+    var pattern = isFunction$1(value) ? reIsNative : reIsHostCtor;
     return pattern.test(toSource(value));
   }
 
@@ -2756,7 +2756,7 @@
   }
 
   function isArrayLike(value) {
-    return value != null && isLength(value.length) && !isFunction$2(value);
+    return value != null && isLength(value.length) && !isFunction$1(value);
   }
 
   function isIterateeCall(value, index, object) {
@@ -4429,7 +4429,7 @@
         newValue = objValue;
         if (isArguments(objValue)) {
           newValue = toPlainObject(objValue);
-        } else if (!isObject$3(objValue) || isFunction$2(objValue)) {
+        } else if (!isObject$3(objValue) || isFunction$1(objValue)) {
           newValue = initCloneObject(srcValue);
         }
       } else {
@@ -6848,6 +6848,7 @@
       intl: { type: Object, required: false },
       proPrefixCls: { type: String, required: false },
       contentOffsetTop: { type: Number, required: false },
+      pro: { type: Object, required: false },
       iconPrefixCls: { type: String, required: false },
       getTargetContainer: { type: Function, required: false },
       getPopupContainer: { type: Function, required: false },
@@ -6876,6 +6877,7 @@
       const props = __props;
       const contentOffsetTop = vue.ref(props.contentOffsetTop);
       useProConfigProvide({
+        pro: vue.computed(() => props.pro),
         proPrefixCls: vue.computed(() => props.proPrefixCls),
         intl: vue.computed(() => props.intl),
         locale: vue.computed(() => props.locale),
@@ -6902,6 +6904,7 @@
       }) },
       proPrefixCls: { type: String, required: false, default: "pro" },
       contentOffsetTop: { type: Number, required: false },
+      pro: { type: Object, required: false },
       iconPrefixCls: { type: String, required: false },
       getTargetContainer: { type: Function, required: false },
       getPopupContainer: { type: Function, required: false },
@@ -6927,7 +6930,7 @@
       wave: { type: Object, required: false }
     },
     setup(__props) {
-      const rest = vue.createPropsRestProxy(__props, ["intl", "proPrefixCls"]);
+      const rest = vue.createPropsRestProxy(__props, ["intl", "pro", "proPrefixCls"]);
       antDesignVue.ConfigProvider.config({
         prefixCls: rest.prefixCls
       });
@@ -6943,6 +6946,7 @@
                     contentOffsetTop: _ctx.contentOffsetTop,
                     intl: _ctx.intl,
                     proPrefixCls: _ctx.proPrefixCls,
+                    pro: _ctx.pro,
                     locale: rest.locale
                   }, {
                     default: vue.withCtx(() => [
@@ -6950,7 +6954,7 @@
                     ]),
                     _: 3
                     /* FORWARDED */
-                  }, 8, ["contentOffsetTop", "intl", "proPrefixCls", "locale"])
+                  }, 8, ["contentOffsetTop", "intl", "proPrefixCls", "pro", "locale"])
                 ]),
                 _: 3
                 /* FORWARDED */
@@ -8480,7 +8484,7 @@
       });
       const isComponent = vue.computed(() => {
         const { icon } = props;
-        return !isString$1(icon) && (isObject$4(icon) || isFunction$3(icon));
+        return !isString$1(icon) && (isObject$4(icon) || isFunction$2(icon));
       });
       return (_ctx, _cache) => {
         return isComponent.value ? (vue.openBlock(), vue.createBlock(
@@ -9144,7 +9148,7 @@
       return false;
     }
   }
-  function isFunction$1(value) {
+  function isFunction(value) {
     return typeof value === "function";
   }
   var slice = Array.prototype.slice;
@@ -9152,7 +9156,7 @@
     return Array.from ? Array.from(value) : slice.call(value);
   }
   function forEach(data, callback) {
-    if (data && isFunction$1(callback)) {
+    if (data && isFunction(callback)) {
       if (Array.isArray(data) || isNumber(data.length)) {
         toArray$1(data).forEach(function(value, key) {
           callback.call(data, value, key, data);
@@ -9366,7 +9370,7 @@
   }
   function dispatchEvent(element, type, data) {
     var event;
-    if (isFunction$1(Event) && isFunction$1(CustomEvent)) {
+    if (isFunction(Event) && isFunction(CustomEvent)) {
       event = new CustomEvent(type, {
         detail: data,
         bubbles: true,
@@ -10105,19 +10109,19 @@
   var events$1 = {
     bind: function bind() {
       var element = this.element, options = this.options, cropper = this.cropper;
-      if (isFunction$1(options.cropstart)) {
+      if (isFunction(options.cropstart)) {
         addListener(element, EVENT_CROP_START, options.cropstart);
       }
-      if (isFunction$1(options.cropmove)) {
+      if (isFunction(options.cropmove)) {
         addListener(element, EVENT_CROP_MOVE, options.cropmove);
       }
-      if (isFunction$1(options.cropend)) {
+      if (isFunction(options.cropend)) {
         addListener(element, EVENT_CROP_END, options.cropend);
       }
-      if (isFunction$1(options.crop)) {
+      if (isFunction(options.crop)) {
         addListener(element, EVENT_CROP, options.crop);
       }
-      if (isFunction$1(options.zoom)) {
+      if (isFunction(options.zoom)) {
         addListener(element, EVENT_ZOOM, options.zoom);
       }
       addListener(cropper, EVENT_POINTER_DOWN, this.onCropStart = this.cropStart.bind(this));
@@ -10138,19 +10142,19 @@
     },
     unbind: function unbind() {
       var element = this.element, options = this.options, cropper = this.cropper;
-      if (isFunction$1(options.cropstart)) {
+      if (isFunction(options.cropstart)) {
         removeListener(element, EVENT_CROP_START, options.cropstart);
       }
-      if (isFunction$1(options.cropmove)) {
+      if (isFunction(options.cropmove)) {
         removeListener(element, EVENT_CROP_MOVE, options.cropmove);
       }
-      if (isFunction$1(options.cropend)) {
+      if (isFunction(options.cropend)) {
         removeListener(element, EVENT_CROP_END, options.cropend);
       }
-      if (isFunction$1(options.crop)) {
+      if (isFunction(options.crop)) {
         removeListener(element, EVENT_CROP, options.crop);
       }
-      if (isFunction$1(options.zoom)) {
+      if (isFunction(options.zoom)) {
         removeListener(element, EVENT_ZOOM, options.zoom);
       }
       removeListener(cropper, EVENT_POINTER_DOWN, this.onCropStart);
@@ -11555,7 +11559,7 @@
           this.crop();
         }
         this.setData(options.data);
-        if (isFunction$1(options.ready)) {
+        if (isFunction(options.ready)) {
           addListener(element, EVENT_READY, options.ready, {
             once: true
           });
@@ -11751,7 +11755,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 },
@@ -14766,7 +14770,7 @@
       });
       const icon = vue.computed(() => {
         const render = getSlot(props.iconRender, formSlotsContext);
-        if (isFunction$3(render)) {
+        if (isFunction$2(render)) {
           return vue.createVNode(RenderVNode$1, {
             "vnode": render
           }, null);
@@ -14775,7 +14779,7 @@
       });
       const title = vue.computed(() => {
         const render = getSlot(props.title, formSlotsContext);
-        if (isFunction$3(render)) {
+        if (isFunction$2(render)) {
           return vue.createVNode(RenderVNode$1, {
             "vnode": render
           }, null);
@@ -14889,7 +14893,7 @@
       });
       const icon = vue.computed(() => {
         const render = getSlot(props.iconRender, formSlotsContext);
-        if (isFunction$3(render)) {
+        if (isFunction$2(render)) {
           return vue.createVNode(RenderVNode$1, {
             "vnode": render
           }, null);
@@ -14898,7 +14902,7 @@
       });
       const title = vue.computed(() => {
         const render = getSlot(props.title, formSlotsContext);
-        if (isFunction$3(render)) {
+        if (isFunction$2(render)) {
           return vue.createVNode(RenderVNode$1, {
             "vnode": render
           }, null);
@@ -14907,7 +14911,7 @@
       });
       const description = vue.computed(() => {
         const render = getSlot(props.description, formSlotsContext);
-        if (isFunction$3(render)) {
+        if (isFunction$2(render)) {
           return vue.createVNode(RenderVNode$1, {
             "vnode": render
           }, null);
@@ -14951,7 +14955,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 },
@@ -15767,7 +15771,7 @@
     if (Array.isArray(itemValue)) return false;
     return true;
   }
-  const transformKeySubmitValue = (values, paramsOmitNil) => {
+  const transformKeySubmitValue = (values, transformerMap, paramsOmitNil) => {
     if (Object.keys(values).length < 1) {
       return values;
     }
@@ -15783,6 +15787,7 @@
         return result;
       }
       Object.keys(tempValues).forEach((entityKey) => {
+        var _a;
         const transformForArray = (transformList, subItemValue) => {
           if (!Array.isArray(transformList)) return entityKey;
           transformList.forEach((transform2, idx) => {
@@ -15812,9 +15817,8 @@
           });
           return entityKey;
         };
-        const key = parentsKey ? [parentsKey, entityKey].flat(1) : [entityKey].flat(1);
         const itemValue = tempValues[entityKey];
-        const transformFunction = get(values, key);
+        const transformFunction = (_a = transformerMap.get(entityKey)) == null ? void 0 : _a.transform;
         const transform = () => {
           let tempKey, transformedResult, isTransformedResultPrimitive = false;
           if (typeof transformFunction === "function") {
@@ -15850,7 +15854,7 @@
         }
         if (typeof window === "undefined") return;
         if (isPlainObj(itemValue)) {
-          const genValues = gen(itemValue, key);
+          const genValues = gen(itemValue);
           if (Object.keys(genValues).length < 1) {
             return;
           }
@@ -15864,12 +15868,31 @@
     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,
     formRef,
     formData,
     initialValues,
     hasInitial,
+    transformerMap,
     onFinish,
     onReset,
     onFinishFailed
@@ -15898,20 +15921,20 @@
       if (!namePath) throw new Error("name is require");
       const value = get(formData.value, namePath);
       const obj = set({}, namePath, value);
-      return get(transformKeySubmitValue(obj, props.omitNil), 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 transformKeySubmitValue(obj, props.omitNil);
+      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 = transformKeySubmitValue(values, props.omitNil);
+      const transformedKey = transformKeySubmitValue(values, transformerMap.value, props.omitNil);
       return transformedKey != null ? transformedKey : {};
     };
     const setFieldValue = (name, value) => {
@@ -15937,10 +15960,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(transformKeySubmitValue(formData.value, props.omitNil));
+        onReset == null ? void 0 : onReset(transformKeySubmitValue(formData.value, transformerMap.value, props.omitNil));
       });
     };
     const resetField = (name) => {
@@ -16150,7 +16173,8 @@
           }
           return vue.createVNode(FormItem$2, {
             "key": item.key,
-            "item": item
+            "item": item,
+            "grid": mergeGrid.value
           }, null);
         });
       });
@@ -16214,15 +16238,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 {
@@ -16304,6 +16346,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);
   }
@@ -16320,6 +16382,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({});
@@ -16328,7 +16391,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;
@@ -16373,8 +16436,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
       });
@@ -16385,7 +16449,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;
@@ -16397,22 +16461,22 @@
       });
       const onValuesChange = debounce(() => {
         var _a;
-        (_a = props.onValuesChange) == null ? void 0 : _a.call(props, transformKeySubmitValue(cloneDeep(formData.value), props.omitNil));
+        (_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.submitOnLoading) {
           if (loading.value) return;
-          setloading(true);
+          setLoading(true);
         }
         try {
-          const finalValues = transformKeySubmitValue(cloneDeep(formData.value), props.omitNil);
+          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.submitOnLoading) {
-            setloading(false);
+            setLoading(false);
           }
         }
       };
@@ -16430,6 +16494,7 @@
         formData,
         initialValues,
         hasInitial,
+        transformerMap,
         onFinish,
         onReset: props.onReset,
         onFinishFailed: props.onFinishFailed
@@ -16466,6 +16531,7 @@
         }), null);
         if (submitterProps.value.teleport) {
           return vue.createVNode(vue.Teleport, {
+            "defer": true,
             "to": submitterProps.value.teleport
           }, _isSlot$5(dom) ? dom : {
             default: () => [dom]
@@ -16480,7 +16546,7 @@
         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);
+          (_a2 = props.onInit) == null ? void 0 : _a2.call(props, transformKeySubmitValue(finalValues, transformerMap.value, props.omitNil), action);
         });
       });
       useProvideForm({
@@ -17077,7 +17143,7 @@
         }
         return void 0;
       });
-      const [collapsed, setCollapsed] = useMergedState$1(() => props.defaultCollapsed, {
+      const [collapsed, setCollapsed] = useMergedState$1(() => props.defaultCollapsed && props.submitter !== false, {
         value: vue.computed(() => props.collapsed),
         onChange: (val) => {
           emit("collapse", val);
@@ -17148,7 +17214,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) {
@@ -17176,7 +17242,10 @@
             return {
               ...item,
               hidden,
-              formItemProps: formItemFixStyle.value,
+              formItemProps: {
+                ...item.title ? formItemFixStyle.value : {},
+                ...item.formItemProps
+              },
               colProps: {
                 span: colSpan
               }
@@ -17220,9 +17289,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, {
@@ -17383,7 +17459,8 @@
     },
     emits: [],
     setup(props, {
-      slots
+      slots,
+      expose
     }) {
       const intl = useIntl();
       const prefixCls = usePrefixCls("steps-form");
@@ -17400,7 +17477,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) => {
@@ -17414,10 +17491,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);
@@ -17426,10 +17500,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 = () => {
@@ -17549,6 +17622,9 @@
         regForm,
         onFormFinish
       });
+      expose({
+        formArrayRef
+      });
       return () => vue.createVNode("div", {
         "class": prefixCls
       }, [stepsFormDom.value]);
@@ -19680,6 +19756,7 @@
       }, props.rowHoverDelay.value + 50);
     };
     const hoverContext = {
+      rowHover: props.rowHover,
       hoverColumnKey,
       hoverRowKey,
       handleCellHover,
@@ -19690,6 +19767,7 @@
   };
   const useInjectHover = () => {
     return vue.inject(HoverContextKey, {
+      rowHover: vue.computed(() => void 0),
       hoverRowKey: vue.ref(),
       hoverColumnKey: vue.ref(),
       handleCellHover: () => {
@@ -19711,9 +19789,6 @@
   function is(val, type) {
     return toString.call(val) === `[object ${type}]`;
   }
-  function isFunction(val) {
-    return typeof val === "function";
-  }
   function isArray(val) {
     return val && Array.isArray(val);
   }
@@ -19907,9 +19982,6 @@
     currentData.splice(indexs[indexsLen - 1], 1);
     return currentData;
   }
-  function isPromise(val) {
-    return is(val, "Promise") && isObject(val) && isFunction(val.then) && isFunction(val.catch);
-  }
   function ensureValidVNode(vnodes) {
     return vnodes.some(
       (vnode) => !vue.isVNode(vnode) || vnode.type !== vue.Comment && !(vnode.type === vue.Fragment && !ensureValidVNode(vnode.children))
@@ -19992,7 +20064,8 @@
       type: [Number, String]
     },
     size: {
-      type: String
+      type: String,
+      default: "middle"
     },
     bordered: {
       type: Boolean,
@@ -20088,6 +20161,10 @@
       type: Number,
       default: 59
     },
+    rowHover: {
+      type: Boolean,
+      default: void 0
+    },
     rowKey: {
       type: [Function, String]
     },
@@ -20202,6 +20279,9 @@
     "onUpdate:dataSource": {
       type: Function
     },
+    "onUpdate:columns": {
+      type: Function
+    },
     columnEmptyText: {
       type: [String, Boolean],
       default: "-"
@@ -20214,6 +20294,7 @@
     params: Object,
     defaultData: Array,
     manual: Boolean,
+    manualRequest: Boolean,
     polling: [Number, Function],
     debounceTime: Number,
     onLoad: {
@@ -20283,10 +20364,11 @@
     }
   });
 
-  const mergePropsAndPagination = ({ pagination }, intl) => {
+  const mergePropsAndPagination = (intl, pagination) => {
     if (pagination) {
-      const { current, pageSize, total, showTotal, showSizeChanger } = pagination;
+      const { current, pageSize, total, showTotal, showSizeChanger, ...rest } = pagination;
       return {
+        ...rest,
         current: current || 1,
         total: total || 0,
         pageSize: pageSize || 10,
@@ -20330,23 +20412,21 @@
         }
       );
     }
-    return result.map((item) => {
-      var _a;
-      return {
-        field: item.field,
-        order: (_a = item.order) == null ? void 0 : _a.toUpperCase()
-      };
-    });
+    return result.map((item) => ({
+      field: item.field,
+      order: item.order
+    }));
   };
   const useFetchData = (getData, props) => {
     var _a;
     const umountRef = vue.ref(false);
     const abortRef = vue.ref(null);
-    const manualRequestRef = vue.ref(!!props.manual);
+    const manualRequestRef = vue.ref(!!(props.manual || props.manualRequest));
     const pollingSetTimeRef = vue.ref();
     const pollingLoading = vue.ref(false);
     const keyword = vue.ref("");
     const intl = useIntl();
+    const { pro } = useProConfigInject();
     const innerParams = vue.ref({});
     const sorters = vue.ref();
     const filter = vue.ref();
@@ -20375,8 +20455,23 @@
         // }
       }
     );
+    const contextTable = vue.computed(() => {
+      var _a2, _b;
+      return (_b = (_a2 = pro == null ? void 0 : pro.value) == null ? void 0 : _a2.table) != null ? _b : {};
+    });
+    const contextTablePagination = vue.computed(() => {
+      var _a2, _b;
+      if (props.pagination === false) {
+        return false;
+      }
+      if (props.pagination && ((_a2 = contextTable.value) == null ? void 0 : _a2.pagination)) {
+        return merge(contextTable.value.pagination, props.pagination);
+      } else {
+        return (_b = props.pagination) != null ? _b : contextTable.value.pagination;
+      }
+    });
     const [pagination, setPagination] = useMergedState$1(
-      () => mergePropsAndPagination(props, intl),
+      () => mergePropsAndPagination(intl, contextTablePagination.value),
       {
         onChange(value) {
           var _a2, _b, _c;
@@ -20503,16 +20598,13 @@
         }
       }
     );
-    vue.watch(
-      () => props.manual,
-      () => {
-        abortFetch();
-        fetchListDebounce(false);
-        if (!props.manual) {
-          manualRequestRef.value = false;
-        }
+    vue.watch([() => props.manual, () => props.manualRequest], () => {
+      abortFetch();
+      fetchListDebounce(false);
+      if (!props.manual || !props.manualRequest) {
+        manualRequestRef.value = false;
       }
-    );
+    });
     vue.watch(
       () => pagination.value.current,
       () => {
@@ -20780,7 +20872,7 @@
           var _a2;
           return (_a2 = props.columnsState) == null ? void 0 : _a2.persistenceKey;
         },
-        columnsMap,
+        () => columnsMap.value,
         () => {
           var _a2;
           return (_a2 = props.columnsState) == null ? void 0 : _a2.persistenceType;
@@ -20841,8 +20933,8 @@
     var _a;
     const { columns, counter } = params;
     return (_a = columns == null ? void 0 : columns.map((columnProps, columnsIndex) => {
-      var _a2, _b;
-      const { key, dataIndex, disable, valueEnum } = columnProps;
+      var _a2, _b, _c;
+      const { key, dataIndex, disable, valueEnum, width } = columnProps;
       const columnKey = genColumnKey(
         // key || (dataIndex ? `${dataIndex.toString()}-${columnsIndex}` : ''),
         key || (dataIndex == null ? void 0 : dataIndex.toString()),
@@ -20857,12 +20949,13 @@
         ...columnProps,
         valueEnum,
         fixed: config.fixed,
-        disable: (_a2 = config.disable) != null ? _a2 : disable,
+        width: (_a2 = config.width) != null ? _a2 : width,
+        disable: (_b = config.disable) != null ? _b : disable,
         // width: columnProps.width || (columnProps.fixed ? 200 : undefined),
         children: columnProps.children ? genProColumnToColumn(
           {
             ...params,
-            columns: (_b = columnProps == null ? void 0 : columnProps.children) != null ? _b : []
+            columns: (_c = columnProps == null ? void 0 : columnProps.children) != null ? _c : []
           },
           { ...columnProps, key: columnKey }
         ) : void 0
@@ -24397,6 +24490,7 @@
   }
 
   const DEFAULT_PAGE_SIZE = 10;
+  const PAGE_SIZE_OPTIONS = ["5", "10", "20", "50"];
   function getPaginationParam(pagination, mergedPagination) {
     const param = {
       current: mergedPagination.current,
@@ -24426,7 +24520,11 @@
     return result;
   }
   function usePagination(total, props, mergedData, onChange) {
-    const innerPagination = vue.reactive({ current: 1, pageSize: DEFAULT_PAGE_SIZE });
+    const innerPagination = vue.reactive({
+      current: 1,
+      pageSize: DEFAULT_PAGE_SIZE,
+      pageSizeOptions: PAGE_SIZE_OPTIONS
+    });
     const size = vue.computed(() => props.size);
     const mergedPagination = vue.computed(() => {
       const { pagination } = props;
@@ -24656,7 +24754,9 @@
       if (copyCustomCellProps.rowSpan > 1) {
         mergeCellStyles.height = `${getRowHeight(rowIndex, copyCustomCellProps.rowSpan) - 1}px`;
       }
-      cellProps.props = Object.assign({}, copyCustomCellProps, { style: mergeCellStyles });
+      cellProps.props = Object.assign({}, copyCustomCellProps, {
+        style: { ...copyCustomCellProps.style, ...mergeCellStyles }
+      });
       return cellProps;
     };
     vue.watchEffect(() => {
@@ -25681,6 +25781,7 @@
               var _a, _b;
               return [
                 typeof props.column.title == "function" ? props.column.title({
+                  column: props.column.originColumn,
                   sortColumns: sortColumns.value,
                   sortColumn: (_a = sortColumns.value[0]) == null ? void 0 : _a.column,
                   sortOrder: (_b = sortColumns.value[0]) == null ? void 0 : _b.order
@@ -25735,7 +25836,7 @@
         [`${_ctx.prefixCls}-header-cell-title-inner`]: true
       }),
       title: _ctx.altTitle,
-      style: vue.normalizeStyle(`text-align: ${_ctx.column.align}`)
+      style: vue.normalizeStyle(`justify-content: ${_ctx.column.align}`)
     }, [
       vue.createElementVNode(
         "span",
@@ -25781,16 +25882,28 @@
         1040
         /* FULL_PROPS, DYNAMIC_SLOTS */
       )) : vue.createCommentVNode("v-if", true),
-      _ctx.column.headerTooltip ? (vue.openBlock(), vue.createBlock(_component_Tooltip, {
-        key: 1,
-        title: _ctx.column.headerTooltip
-      }, {
+      _ctx.column.headerTooltip ? (vue.openBlock(), vue.createBlock(_component_Tooltip, { key: 1 }, {
+        title: vue.withCtx(() => [
+          _ctx.column.headerTooltip === true ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(_ctx.title), { key: 0 })) : (vue.openBlock(), vue.createElementBlock(
+            vue.Fragment,
+            { key: 1 },
+            [
+              vue.createTextVNode(
+                vue.toDisplayString(_ctx.column.headerTooltip),
+                1
+                /* TEXT */
+              )
+            ],
+            64
+            /* STABLE_FRAGMENT */
+          ))
+        ]),
         default: vue.withCtx(() => [
           vue.createVNode(_component_InfoCircleOutlined, { style: { "margin-inline-start": "3px", "font-size": "12px" } })
         ]),
         _: 1
         /* STABLE */
-      }, 8, ["title"])) : vue.createCommentVNode("v-if", true)
+      })) : vue.createCommentVNode("v-if", true)
     ], 14, _hoisted_1$d);
   }
   var HeaderCellTitle = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["render", _sfc_render$w]]);
@@ -26975,6 +27088,7 @@
         var _a, _b;
         return vue.h(vue.Fragment, [
           typeof props.column.title == "function" ? props.column.title({
+            column: props.column.originColumn,
             sortColumns: sortColumns.value,
             sortColumn: (_a = sortColumns.value[0]) == null ? void 0 : _a.column,
             sortOrder: (_b = sortColumns.value[0]) == null ? void 0 : _b.order
@@ -28404,28 +28518,29 @@
               event: rowDragEvent.value
             });
           }
+        } else {
+          return [
+            vue.createVNode(
+              "span",
+              { class: `${prefixCls.value}-drag-ghost-image-icon`, innerHTML: dragIcon2 },
+              null
+            ),
+            vue.createVNode(
+              "span",
+              {
+                class: `${prefixCls.value}-drag-ghost-image-label`,
+                style: { maxWidth: `${parentOffsetWidth}px` }
+              },
+              [(_a = slots.label) == null ? void 0 : _a.call(slots)]
+            )
+          ];
         }
-        return [
-          vue.createVNode(
-            "span",
-            { class: `${prefixCls.value}-drag-ghost-image-icon`, innerHTML: dragIcon2 },
-            null
-          ),
-          vue.createVNode(
-            "span",
-            {
-              class: `${prefixCls.value}-drag-ghost-image-label`,
-              style: { maxWidth: `${parentOffsetWidth}px` }
-            },
-            [(_a = slots.label) == null ? void 0 : _a.call(slots)]
-          )
-        ];
       };
       const renderDragGhost = () => {
         if (!dragGhostImage) {
           dragGhostImage = vue.createVNode(renderDragGhostImage);
+          vue.render(dragGhostImage, dragGhostDom);
         }
-        vue.render(dragGhostImage, dragGhostDom);
       };
       vue.watch(
         [prefixCls],
@@ -28831,7 +28946,7 @@
             newValue: modelValue.value,
             oldValue
           });
-          if (isPromise$1(result)) {
+          if (isPromise(result)) {
             result.then((res) => {
               res && emit("closeEditor", [props.cellKey]);
             }).catch(() => {
@@ -29051,7 +29166,7 @@
         recordIndexs
       })) != null ? _c2 : value;
       const beforeOpen = (_e2 = (_d2 = tableContext.props) == null ? void 0 : _d2.onBeforeOpenEditor) == null ? void 0 : _e2.call(_d2, cellRenderArgs);
-      if (isPromise$1(beforeOpen)) {
+      if (isPromise(beforeOpen)) {
         beforeOpen.then((res) => {
           var _a3, _b3;
           if (res) {
@@ -29072,7 +29187,7 @@
         ...cellRenderArgs,
         oldValue: oldValuesMap.value[key]
       });
-      if (isPromise$1(beforeClose)) {
+      if (isPromise(beforeClose)) {
         beforeClose.then((res) => {
           var _a3, _b3;
           if (res) {
@@ -29126,7 +29241,7 @@
                 color: option.color,
                 bordered: false
               },
-              option.text
+              () => option.text
             );
           } else {
             cellValue = option.text || emptyText;
@@ -29199,7 +29314,7 @@
           // 	}),
           shouldOpen: (isEllipsis) => {
             var _a2;
-            return (tooltipProps == null ? void 0 : tooltipProps.shouldOpen) ? (_a2 = tooltipProps == null ? void 0 : tooltipProps.shouldOpen) == null ? void 0 : _a2.call(tooltipProps, isEllipsis, cellRenderArgs) : isEllipsis;
+            return (tooltipProps == null ? void 0 : tooltipProps.shouldOpen) ? (_a2 = tooltipProps == null ? void 0 : tooltipProps.shouldOpen) == null ? void 0 : _a2.call(tooltipProps, isEllipsis, cellRenderArgs) : true;
           },
           onCellLeave: () => {
             emit("cellLeave");
@@ -29831,7 +29946,7 @@
         () => (props.type === "center" ? tableContext.centerRowColumnsMap.value.get(props.rowKey) : columns.value).filter((item) => !!item)
       );
       const { tooltipOpen, leftPopupContainer, centerPopupContainer, rightPopupContainer } = useInjectBody();
-      const { handleCellBlur, handleCellHover, hoverRowKey, hoverColumnKey } = useInjectHover();
+      const { handleCellBlur, handleCellHover, hoverRowKey, hoverColumnKey, rowHover } = useInjectHover();
       const popupContainer = vue.computed(
         () => props.type === "left" ? leftPopupContainer.value : props.type === "center" ? centerPopupContainer.value : props.type === "right" ? rightPopupContainer.value : null
       );
@@ -29840,7 +29955,7 @@
       vue.watch(
         [isRowHover, bodyRow],
         () => {
-          bodyRow.value && (isRowHover.value ? addClass(bodyRow.value, `${props.prefixCls}-row-hover`) : removeClass(bodyRow.value, `${props.prefixCls}-row-hover`));
+          bodyRow.value && rowHover.value && (isRowHover.value ? addClass(bodyRow.value, `${props.prefixCls}-row-hover`) : removeClass(bodyRow.value, `${props.prefixCls}-row-hover`));
         },
         { immediate: true, flush: "post" }
       );
@@ -29907,7 +30022,7 @@
           {
             [`${prefixCls}-row`]: true,
             [`${prefixCls}-row-level-${indent}`]: true,
-            [`${prefixCls}-row-hover`]: isRowHover.value,
+            [`${prefixCls}-row-hover`]: isRowHover.value && rowHover.value,
             [`${prefixCls}-row-dragging`]: isDragging.value,
             [`${prefixCls}-row-dragging-insert-target`]: tableContext.insertToRowKey.value === props.rowKey,
             [`${prefixCls}-row-odd`]: !isEven,
@@ -30584,8 +30699,7 @@
         };
       });
       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 : 0}px)`,
         overflowX: "hidden",
         overflowY: "auto",
         height: "100%"
@@ -31871,9 +31985,14 @@
           var _a;
           const width = col.width;
           const result = (_a = props.onResizeColumn) == null ? void 0 : _a.call(props, w, col, action);
-          if (result !== false && !(width === w && col.width === w)) {
-            col.width = width !== col.width ? col.width : w;
-            vue.triggerRef(rawColumns);
+          if (result !== false) {
+            if (!(width === w && col.width === w)) {
+              col.width = width !== col.width ? col.width : w;
+              vue.triggerRef(rawColumns);
+            }
+            if (action === "end") {
+              emit("update:columns", rawColumns.value, "resize");
+            }
           }
         },
         onRowDragEnd: (opt) => {
@@ -32047,7 +32166,7 @@
               rawColumns.value.splice(index, 1);
             }
             vue.triggerRef(rawColumns);
-            emit("update:columns", rawColumns.value);
+            emit("update:columns", rawColumns.value, "drag");
           };
           if (isPromise(dragEnd)) {
             dragEnd.then(() => {
@@ -33288,10 +33407,18 @@
                     class: vue.normalizeClass(`${_ctx.prefixCls}-toolbar-options`)
                   }, {
                     default: vue.withCtx(() => [
-                      _ctx.mergeOptions.search !== false && !(!!_ctx.title || !!_ctx.$slots.title) ? (vue.openBlock(), vue.createBlock(_component_ProSearch, vue.mergeProps({ key: 0 }, _ctx.searchConfig, { onSearch: _ctx.onSearch }), null, 16, ["onSearch"])) : vue.createCommentVNode("v-if", true),
-                      vue.renderSlot(_ctx.$slots, "searchExtra", {
-                        setParams: _ctx.actionsRef.setParams
-                      })
+                      _ctx.mergeOptions.search !== false && !(!!_ctx.title || !!_ctx.$slots.title) ? (vue.openBlock(), vue.createElementBlock(
+                        vue.Fragment,
+                        { key: 0 },
+                        [
+                          vue.createVNode(_component_ProSearch, vue.mergeProps(_ctx.searchConfig, { onSearch: _ctx.onSearch }), null, 16, ["onSearch"]),
+                          vue.renderSlot(_ctx.$slots, "searchExtra", {
+                            setParams: _ctx.actionsRef.setParams
+                          })
+                        ],
+                        64
+                        /* STABLE_FRAGMENT */
+                      )) : vue.createCommentVNode("v-if", true)
                     ]),
                     _: 3
                     /* FORWARDED */
@@ -33310,7 +33437,18 @@
                     class: vue.normalizeClass(`${_ctx.prefixCls}-toolbar-actions`)
                   }, {
                     default: vue.withCtx(() => [
-                      _ctx.mergeOptions.search !== false && (!!_ctx.title || !!_ctx.$slots.title) ? (vue.openBlock(), vue.createBlock(_component_ProSearch, vue.mergeProps({ key: 0 }, _ctx.searchConfig, { onSearch: _ctx.onSearch }), null, 16, ["onSearch"])) : vue.createCommentVNode("v-if", true),
+                      _ctx.mergeOptions.search !== false && (!!_ctx.title || !!_ctx.$slots.title) ? (vue.openBlock(), vue.createElementBlock(
+                        vue.Fragment,
+                        { key: 0 },
+                        [
+                          vue.createVNode(_component_ProSearch, vue.mergeProps(_ctx.searchConfig, { onSearch: _ctx.onSearch }), null, 16, ["onSearch"]),
+                          vue.renderSlot(_ctx.$slots, "searchExtra", {
+                            setParams: _ctx.actionsRef.setParams
+                          })
+                        ],
+                        64
+                        /* STABLE_FRAGMENT */
+                      )) : vue.createCommentVNode("v-if", true),
                       vue.renderSlot(_ctx.$slots, "actions", {
                         setParams: _ctx.actionsRef.setParams
                       }),
@@ -33629,7 +33767,8 @@
       const {
         hoverRowKey
       } = useProvideHover({
-        rowHoverDelay: vue.computed(() => props.rowHoverDelay)
+        rowHoverDelay: vue.computed(() => props.rowHoverDelay),
+        rowHover: vue.computed(() => props.rowHover)
       });
       const mergedPrefixCls = vue.computed(() => {
         var _a2;
@@ -33673,10 +33812,7 @@
         if (props.pagination === false) {
           return false;
         }
-        if (!props.request) {
-          return Object.assign({}, pagination.value, props.pagination);
-        }
-        return Object.assign({}, props.pagination, pagination.value);
+        return pagination.value;
       });
       const formSubmitLoading = vue.computed(() => {
         if (typeof loading.value === "boolean") {
@@ -33738,9 +33874,44 @@
         };
         return loopFilter(tableColumn.value);
       });
+      const onColumnsChange = (rawColumns, action) => {
+        var _a2;
+        const newMap = {
+          ...counter.columnsMap.value
+        };
+        const newColumns = rawColumns.map((item) => genColumnKey(item.key, item.index));
+        if (action === "resize") {
+          const loopSetWidth = (rawColumns2) => {
+            rawColumns2.forEach((item) => {
+              var _a3;
+              const key = genColumnKey(item.key, item.index);
+              const newSetting = {
+                ...newMap[key]
+              };
+              if ((_a3 = item.children) == null ? void 0 : _a3.length) {
+                loopSetWidth(item.children);
+              } else {
+                newSetting.width = item.width;
+                newMap[key] = newSetting;
+              }
+            });
+          };
+          loopSetWidth(rawColumns);
+        } else {
+          newColumns.forEach((key, order) => {
+            newMap[key] = {
+              ...newMap[key] || {},
+              order
+            };
+          });
+        }
+        counter.setColumnsMap(newMap);
+        counter.setSortKeyColumns(newColumns);
+        (_a2 = props["onUpdate:columns"]) == null ? void 0 : _a2.call(props, rawColumns, action);
+      };
       const formItems = vue.computed(() => {
         var _a2, _b, _c;
-        if (!props.search) {
+        if (props.search === false) {
           return [];
         }
         if ((_b = (_a2 = props.search) == null ? void 0 : _a2.items) == null ? void 0 : _b.length) {
@@ -33752,12 +33923,12 @@
           }
           return true;
         }).map((item) => {
-          return {
+          return omitKeysAndUndefined({
             ...item,
             width: void 0,
             tooltip: item.headerTooltip,
             name: item.dataIndex
-          };
+          }, ["dataIndex", "width"]);
         });
       });
       const preserveRecordsRef = vue.ref(/* @__PURE__ */ new Map());
@@ -33774,8 +33945,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,
@@ -33912,7 +34083,7 @@
           actions: slots.alertActions
         }), vue.createVNode(InteralTable, vue.mergeProps({
           "ref": table
-        }, omit(props, ["onChange", "onUpdate:pagination", "onUpdate:selectedRowKeys"]), {
+        }, omit(props, ["onChange", "onUpdate:pagination", "onUpdate:selectedRowKeys", "onUpdate:columns"]), {
           "prefixCls": mergedPrefixCls.value,
           "columns": mergeColumns || [],
           "size": counter.tableSize.value,
@@ -33923,7 +34094,8 @@
           "expandIcon": expandIcon,
           "expandedRowRender": expandedRowRender,
           "hasContextmenuPopup": !!slots.contextmenuPopup,
-          "onChange": onTableChange
+          "onChange": onTableChange,
+          "onUpdate:columns": onColumnsChange
         }), {
           ...slots,
           footer: props.footer || slots.footer
@@ -33952,7 +34124,7 @@
           "tableShowCard": props.cardProps !== false,
           "loading": formSubmitLoading.value,
           "beforeSearchSubmit": props.beforeSearchSubmit,
-          "manual": props.manual,
+          "manual": props.manual || props.manualRequest,
           "onReset": props.onReset,
           "onSubmit": props.onSubmit,
           "onFormSearchSubmit": onFormSearchSubmit,
@@ -34793,6 +34965,10 @@
       colProps: {
         type: Object,
         default: void 0
+      },
+      grid: {
+        type: Boolean,
+        default: void 0
       }
     },
     setup(props, {
@@ -34806,9 +34982,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;
@@ -34830,7 +35010,7 @@
         default: void 0
       },
       tooltip: {
-        type: String,
+        type: [String, Boolean],
         default: ""
       }
     },
@@ -34848,12 +35028,17 @@
         "props": {
           formData: formData.value
         }
-      }, null)]), props.tooltip && vue.createVNode(antDesignVue.Tooltip, {
-        "title": props.tooltip
-      }, {
+      }, null)]), props.tooltip && vue.createVNode(antDesignVue.Tooltip, null, {
         default: () => [vue.createVNode(QuestionCircleOutlined, {
-          "class": `${prefixCls}-item-tooltip`
-        }, null)]
+          "class": `${prefixCls}-item-tooltip`,
+          "style": "margin-right: 3px"
+        }, null)],
+        title: () => props.tooltip === true ? vue.createVNode(RenderVNode$1, {
+          "vnode": title.value,
+          "props": {
+            formData: formData.value
+          }
+        }, null) : props.tooltip
       })]);
     }
   });
@@ -34870,7 +35055,7 @@
         default: void 0
       },
       tooltip: {
-        type: String,
+        type: [String, Boolean],
         default: void 0
       },
       colProps: {
@@ -34974,25 +35159,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,
@@ -35001,11 +35179,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();
@@ -35034,7 +35215,7 @@
         default: void 0
       },
       tooltip: {
-        type: String,
+        type: [String, Boolean],
         default: void 0
       },
       colProps: {
@@ -35448,7 +35629,7 @@
         default: void 0
       },
       tooltip: {
-        type: String,
+        type: [String, Boolean],
         default: void 0
       },
       readonly: {
@@ -35715,7 +35896,7 @@
         default: void 0
       },
       tooltip: {
-        type: String,
+        type: [String, Boolean],
         default: void 0
       },
       colProps: {
@@ -36545,6 +36726,10 @@
       item: {
         type: Object,
         default: () => ({})
+      },
+      grid: {
+        type: Boolean,
+        default: void 0
       }
     },
     setup(props) {
@@ -36579,6 +36764,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";
@@ -36635,7 +36824,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,
@@ -36661,7 +36850,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%";
         }
@@ -36701,12 +36890,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;
       });
@@ -36753,19 +36944,6 @@
       });
       return () => {
         var _a, _b;
-        const render = getSlot(props.item.render, formSlotsContext);
-        if (render) {
-          return vue.createVNode(FormColWrapper, {
-            "colProps": props.item.colProps
-          }, {
-            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"];
@@ -36793,22 +36971,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
+          "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]
         });
       };
     }