pro-design-vue 1.0.0-rc.8 → 1.0.0

package/dist/index.full.mjs

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.0.0-rc.8 */
+/*! Pro Design Vue v1.0.0 */
 
 import { Modal, ConfigProvider, App, Button as Button$1, Tooltip, Popconfirm, Dropdown, Menu, Slider, Drawer, Input, InputNumber, Form as Form$1, Space, Textarea, Select, TreeSelect, Checkbox as Checkbox$1, CheckboxGroup, RadioGroup, Radio as Radio$1, Cascader, Switch, Rate, DatePicker, RangePicker, TimePicker, TimeRangePicker, Upload, theme as theme$1, FormItemRest, Spin, message, Row as Row$1, Col, FormItem as FormItem$3, Steps, Popover, MenuItem, SubMenu, Empty, Badge, Tag, Pagination, InputSearch, Tree, Card, Tabs, TabPane } from 'ant-design-vue';
 import { inject, ref, getCurrentInstance, nextTick, h, reactive, defineComponent, createVNode, isVNode, Fragment, cloneVNode, provide, computed, renderSlot, createPropsRestProxy, createBlock, openBlock, unref, normalizeProps, guardReactiveProps, withCtx, shallowRef, shallowReadonly, toValue, getCurrentScope, onScopeDispose, watch, onMounted, hasInjectionContext, isRef, toRefs as toRefs$1, customRef, toRef as toRef$1, readonly, watchEffect, toRaw, createElementBlock, createCommentVNode, resolveDynamicComponent, mergeProps, createElementVNode, normalizeStyle, toDisplayString, normalizeClass, createSlots, useAttrs, useTemplateRef, defineAsyncComponent, Teleport, onUnmounted, Comment as Comment$1, useSlots, useModel, withModifiers, mergeModels, renderList, camelize, isReactive, onActivated, onDeactivated, onBeforeUnmount, triggerRef, resolveDirective, withDirectives, vShow, render as render$1, resolveComponent, createTextVNode, vModelText } from 'vue';
@@ -13,7 +13,7 @@ const ELEMENT_ID_MAIN_CONTENT = `__pro_main_content`;
 const SCROLL_FIXED_CLASS = `_scroll__fixed_`;
 const DEFAULT_NAMESPACE = "pro";
 
-const version$1 = "1.0.0-rc.8";
+const version$1 = "1.0.0";
 
 const makeInstaller = (components = []) => {
   const install = (app) => {
@@ -2203,13 +2203,13 @@ const isNil = (value) => value === null || value === void 0;
 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) {
@@ -2253,7 +2253,7 @@ const confirm = (props) => {
       ...okButtonProps
     },
     async onOk(...args) {
-      if (isPromise$1(onOk)) {
+      if (isPromise(onOk)) {
         return await new Promise(() => {
           onOk == null ? void 0 : onOk(args);
         });
@@ -2504,7 +2504,7 @@ var asyncTag = "[object AsyncFunction]";
 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;
   }
@@ -2551,7 +2551,7 @@ function baseIsNative(value) {
   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));
 }
 
@@ -2753,7 +2753,7 @@ function isLength(value) {
 }
 
 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) {
@@ -4426,7 +4426,7 @@ function baseMergeDeep(object, source, key, srcIndex, mergeFunc, customizer, sta
       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 {
@@ -8477,7 +8477,7 @@ var _sfc_main$V = /* @__PURE__ */ defineComponent({
     });
     const isComponent = 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 ? (openBlock(), createBlock(
@@ -9141,7 +9141,7 @@ function isPlainObject(value) {
     return false;
   }
 }
-function isFunction$1(value) {
+function isFunction(value) {
   return typeof value === "function";
 }
 var slice = Array.prototype.slice;
@@ -9149,7 +9149,7 @@ function toArray$1(value) {
   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);
@@ -9363,7 +9363,7 @@ function addListener(element, type, listener) {
 }
 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,
@@ -10102,19 +10102,19 @@ var preview = {
 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));
@@ -10135,19 +10135,19 @@ var events$1 = {
   },
   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);
@@ -11552,7 +11552,7 @@ var Cropper = /* @__PURE__ */ (function() {
         this.crop();
       }
       this.setData(options.data);
-      if (isFunction$1(options.ready)) {
+      if (isFunction(options.ready)) {
         addListener(element, EVENT_READY, options.ready, {
           once: true
         });
@@ -11748,7 +11748,7 @@ var _sfc_main$S = /* @__PURE__ */ defineComponent({
   __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 },
@@ -14763,7 +14763,7 @@ var FieldUploadButton = /* @__PURE__ */ defineComponent({
     });
     const icon = computed(() => {
       const render = getSlot(props.iconRender, formSlotsContext);
-      if (isFunction$3(render)) {
+      if (isFunction$2(render)) {
         return createVNode(RenderVNode$1, {
           "vnode": render
         }, null);
@@ -14772,7 +14772,7 @@ var FieldUploadButton = /* @__PURE__ */ defineComponent({
     });
     const title = computed(() => {
       const render = getSlot(props.title, formSlotsContext);
-      if (isFunction$3(render)) {
+      if (isFunction$2(render)) {
         return createVNode(RenderVNode$1, {
           "vnode": render
         }, null);
@@ -14886,7 +14886,7 @@ var FieldUploadDragger = /* @__PURE__ */ defineComponent({
     });
     const icon = computed(() => {
       const render = getSlot(props.iconRender, formSlotsContext);
-      if (isFunction$3(render)) {
+      if (isFunction$2(render)) {
         return createVNode(RenderVNode$1, {
           "vnode": render
         }, null);
@@ -14895,7 +14895,7 @@ var FieldUploadDragger = /* @__PURE__ */ defineComponent({
     });
     const title = computed(() => {
       const render = getSlot(props.title, formSlotsContext);
-      if (isFunction$3(render)) {
+      if (isFunction$2(render)) {
         return createVNode(RenderVNode$1, {
           "vnode": render
         }, null);
@@ -14904,7 +14904,7 @@ var FieldUploadDragger = /* @__PURE__ */ defineComponent({
     });
     const description = computed(() => {
       const render = getSlot(props.description, formSlotsContext);
-      if (isFunction$3(render)) {
+      if (isFunction$2(render)) {
         return createVNode(RenderVNode$1, {
           "vnode": render
         }, null);
@@ -14948,7 +14948,7 @@ var _sfc_main$R = /* @__PURE__ */ defineComponent({
   __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 },
@@ -15751,10 +15751,133 @@ const covertFormName = (namePath) => {
   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,
@@ -15762,6 +15885,7 @@ function useAction({
   formData,
   initialValues,
   hasInitial,
+  transformerMap,
   onFinish,
   onReset,
   onFinishFailed
@@ -15790,20 +15914,20 @@ function useAction({
     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) => {
@@ -15829,10 +15953,10 @@ function useAction({
     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) => {
@@ -16042,7 +16166,8 @@ var FormItems = /* @__PURE__ */ defineComponent({
         }
         return createVNode(FormItem$2, {
           "key": item.key,
-          "item": item
+          "item": item,
+          "grid": mergeGrid.value
         }, null);
       });
     });
@@ -16106,15 +16231,33 @@ var FormSubmitter = /* @__PURE__ */ defineComponent({
       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 = computed(() => {
       const {
@@ -16196,6 +16339,26 @@ var FormSubmitter = /* @__PURE__ */ defineComponent({
   }
 });
 
+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]" && !isVNode(s);
 }
@@ -16212,6 +16375,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
     attrs
   }) {
     const mountedRef = ref(false);
+    const transformerMap = shallowRef(/* @__PURE__ */ new Map());
     const formRef = ref();
     const prefixCls = usePrefixCls("form");
     const formData = ref({});
@@ -16220,7 +16384,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       var _a;
       return (_a = props.formKey) != null ? _a : requestFormCacheId.toString();
     });
-    const [loading, setloading] = useMergedState$1(false, {
+    const [loading, setLoading] = useMergedState$1(false, {
       value: computed(() => props.loading),
       onChange: (val) => {
         var _a;
@@ -16265,8 +16429,9 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       });
     };
     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
     });
@@ -16277,7 +16442,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
     } = useInitialValues(props);
     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;
@@ -16289,22 +16454,22 @@ var BaseForm = /* @__PURE__ */ defineComponent({
     });
     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);
+        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) {
-          setloading(false);
+        if (props.submitOnLoading) {
+          setLoading(false);
         }
       }
     };
@@ -16322,6 +16487,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       formData,
       initialValues,
       hasInitial,
+      transformerMap,
       onFinish,
       onReset: props.onReset,
       onFinishFailed: props.onFinishFailed
@@ -16358,6 +16524,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       }), null);
       if (submitterProps.value.teleport) {
         return createVNode(Teleport, {
+          "defer": true,
           "to": submitterProps.value.teleport
         }, _isSlot$5(dom) ? dom : {
           default: () => [dom]
@@ -16369,8 +16536,11 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       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,
@@ -16417,7 +16587,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
         "style": attrs.style
       }), {
         default: () => [createVNode(Spin, {
-          "spinning": requestLoading.value || props.submitOnLoading && loading.value
+          "spinning": props.showLoading && (requestLoading.value || loading.value)
         }, {
           default: () => [createVNode(FormRowWrapper, null, {
             default: () => [createVNode(FormItems, {
@@ -16451,8 +16621,7 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
   emits: ["update:open"],
   setup(props, {
     slots,
-    emit,
-    expose
+    emit
   }) {
     const _open = ref(false);
     const loading = ref(false);
@@ -16460,7 +16629,6 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
     const intl = useIntl();
     const formRef = ref();
     const footerRef = ref(null);
-    const formExpose = useFormExpose(formRef);
     const open = computed({
       get: () => {
         var _a;
@@ -16480,7 +16648,7 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
     });
     const formProps = 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"
       };
     });
@@ -16586,10 +16754,6 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
       }
       return result;
     };
-    expose({
-      formRef,
-      ...formExpose
-    });
     return () => createVNode(Fragment, null, [createVNode(ProDrawer, mergeProps(drawerProps.value, {
       "open": open.value,
       "onAfterOpenChange": (e) => {
@@ -16603,9 +16767,7 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
         closeConfirm(e);
       }
     }), {
-      default: () => [createVNode(BaseForm, mergeProps({
-        "ref": formRef
-      }, formProps.value, {
+      default: () => [createVNode(BaseForm, mergeProps(formProps.value, {
         "submitter": submitterConfig.value,
         "onFinish": async (values) => {
           const result = await onFinishHandle(values);
@@ -16624,6 +16786,11 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
             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,
@@ -16648,8 +16815,7 @@ var ModalForm = /* @__PURE__ */ defineComponent({
   emits: ["update:open"],
   setup(props, {
     slots,
-    emit,
-    expose
+    emit
   }) {
     const _open = ref(false);
     const loading = ref(false);
@@ -16657,7 +16823,6 @@ var ModalForm = /* @__PURE__ */ defineComponent({
     const intl = useIntl();
     const formRef = ref();
     const footerRef = ref(null);
-    const formExpose = useFormExpose(formRef);
     const open = computed({
       get: () => {
         var _a;
@@ -16678,7 +16843,7 @@ var ModalForm = /* @__PURE__ */ defineComponent({
     const formProps = 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"
       };
     });
@@ -16785,10 +16950,6 @@ var ModalForm = /* @__PURE__ */ defineComponent({
       }
       return result;
     };
-    expose({
-      formRef,
-      ...formExpose
-    });
     return () => createVNode(Fragment, null, [createVNode(ProModal, mergeProps(modalProps.value, {
       "open": open.value,
       "afterClose": () => {
@@ -16802,9 +16963,7 @@ var ModalForm = /* @__PURE__ */ defineComponent({
         closeConfirm(e);
       }
     }), {
-      default: () => [createVNode(BaseForm, mergeProps({
-        "ref": formRef
-      }, formProps.value, {
+      default: () => [createVNode(BaseForm, mergeProps(formProps.value, {
         "submitter": submitterConfig.value,
         "onFinish": async (values) => {
           const result = await onFinishHandle(values);
@@ -16823,6 +16982,11 @@ var ModalForm = /* @__PURE__ */ defineComponent({
             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,
@@ -16972,7 +17136,7 @@ var QueryFilter = /* @__PURE__ */ defineComponent({
       }
       return void 0;
     });
-    const [collapsed, setCollapsed] = useMergedState$1(() => props.defaultCollapsed, {
+    const [collapsed, setCollapsed] = useMergedState$1(() => props.defaultCollapsed && props.submitter !== false, {
       value: computed(() => props.collapsed),
       onChange: (val) => {
         emit("collapse", val);
@@ -17071,7 +17235,10 @@ var QueryFilter = /* @__PURE__ */ defineComponent({
           return {
             ...item,
             hidden,
-            formItemProps: formItemFixStyle.value,
+            formItemProps: {
+              ...item.title ? formItemFixStyle.value : {},
+              ...item.formItemProps
+            },
             colProps: {
               span: colSpan
             }
@@ -17101,7 +17268,7 @@ var QueryFilter = /* @__PURE__ */ defineComponent({
         justify: "start",
         class: `${prefixCls}-row`
       },
-      "submitOnLoading": false,
+      "showLoading": false,
       "submitter": submitterConfig.value,
       "items": processedList.value,
       "layout": spanSize.value.layout,
@@ -17115,9 +17282,16 @@ var QueryFilter = /* @__PURE__ */ defineComponent({
     }), {
       ...slots,
       submitter: ({
+        props: props2,
+        action,
         defaultDoms
       }) => {
-        return createVNode(Fragment, null, [defaultDoms, needCollapse.value !== false && createVNode("a", {
+        var _a2;
+        return createVNode(Fragment, null, [slots.submitter ? (_a2 = slots.submitter) == null ? void 0 : _a2.call(slots, {
+          props: props2,
+          action,
+          defaultDoms
+        }) : defaultDoms, needCollapse.value !== false && 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})`, createVNode(DownOutlined, {
@@ -17278,7 +17452,8 @@ var StepsForm = /* @__PURE__ */ defineComponent({
   },
   emits: [],
   setup(props, {
-    slots
+    slots,
+    expose
   }) {
     const intl = useIntl();
     const prefixCls = usePrefixCls("steps-form");
@@ -17295,7 +17470,7 @@ var StepsForm = /* @__PURE__ */ defineComponent({
       onChange: props.onCurrentChange
     });
     const regForm = (formRef, index) => {
-      formArrayRef.value[index] = formRef;
+      formArrayRef.value[index] = formRef.value;
     };
     const lastStep = computed(() => step.value === props.steps.length - 1);
     const onFormFinish = async (name, formData) => {
@@ -17309,10 +17484,7 @@ var StepsForm = /* @__PURE__ */ defineComponent({
         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);
@@ -17321,10 +17493,9 @@ var StepsForm = /* @__PURE__ */ defineComponent({
       }
     };
     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 = () => {
@@ -17444,6 +17615,9 @@ var StepsForm = /* @__PURE__ */ defineComponent({
       regForm,
       onFormFinish
     });
+    expose({
+      formArrayRef
+    });
     return () => createVNode("div", {
       "class": prefixCls
     }, [stepsFormDom.value]);
@@ -19575,6 +19749,7 @@ const useProvideHover = (props) => {
     }, props.rowHoverDelay.value + 50);
   };
   const hoverContext = {
+    rowHover: props.rowHover,
     hoverColumnKey,
     hoverRowKey,
     handleCellHover,
@@ -19585,6 +19760,7 @@ const useProvideHover = (props) => {
 };
 const useInjectHover = () => {
   return inject(HoverContextKey, {
+    rowHover: computed(() => void 0),
     hoverRowKey: ref(),
     hoverColumnKey: ref(),
     handleCellHover: () => {
@@ -19606,9 +19782,6 @@ const useProvideLevel = () => {
 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);
 }
@@ -19802,9 +19975,6 @@ function deleteNestItemData(data, indexs, childrenColumnName) {
   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) => !isVNode(vnode) || vnode.type !== Comment$1 && !(vnode.type === Fragment && !ensureValidVNode(vnode.children))
@@ -19887,7 +20057,8 @@ const baseTableProps = () => ({
     type: [Number, String]
   },
   size: {
-    type: String
+    type: String,
+    default: "middle"
   },
   bordered: {
     type: Boolean,
@@ -19983,6 +20154,10 @@ const baseTableProps = () => ({
     type: Number,
     default: 59
   },
+  rowHover: {
+    type: Boolean,
+    default: void 0
+  },
   rowKey: {
     type: [Function, String]
   },
@@ -20097,6 +20272,9 @@ const baseTableProps = () => ({
   "onUpdate:dataSource": {
     type: Function
   },
+  "onUpdate:columns": {
+    type: Function
+  },
   columnEmptyText: {
     type: [String, Boolean],
     default: "-"
@@ -20109,6 +20287,7 @@ const baseTableProps = () => ({
   params: Object,
   defaultData: Array,
   manual: Boolean,
+  manualRequest: Boolean,
   polling: [Number, Function],
   debounceTime: Number,
   onLoad: {
@@ -20180,8 +20359,9 @@ const tableProps = () => ({
 
 const mergePropsAndPagination = ({ pagination }, intl) => {
   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,
@@ -20225,19 +20405,16 @@ const formatSorters = (sorter) => {
       }
     );
   }
-  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 = ref(false);
   const abortRef = ref(null);
-  const manualRequestRef = ref(!!props.manual);
+  const manualRequestRef = ref(!!(props.manual || props.manualRequest));
   const pollingSetTimeRef = ref();
   const pollingLoading = ref(false);
   const keyword = ref("");
@@ -20398,16 +20575,13 @@ const useFetchData = (getData, props) => {
       }
     }
   );
-  watch(
-    () => props.manual,
-    () => {
-      abortFetch();
-      fetchListDebounce(false);
-      if (!props.manual) {
-        manualRequestRef.value = false;
-      }
+  watch([() => props.manual, () => props.manualRequest], () => {
+    abortFetch();
+    fetchListDebounce(false);
+    if (!props.manual || !props.manualRequest) {
+      manualRequestRef.value = false;
     }
-  );
+  });
   watch(
     () => pagination.value.current,
     () => {
@@ -20675,7 +20849,7 @@ const useContainer = (props) => {
         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;
@@ -20736,8 +20910,8 @@ function genProColumnToColumn(params, parents) {
   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()),
@@ -20752,12 +20926,13 @@ function genProColumnToColumn(params, parents) {
       ...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
@@ -24292,6 +24467,7 @@ function useFlattenRecords(pageDataRef, childrenColumnNameRef, expandedKeysRef,
 }
 
 const DEFAULT_PAGE_SIZE = 10;
+const PAGE_SIZE_OPTIONS = ["5", "10", "20", "50"];
 function getPaginationParam(pagination, mergedPagination) {
   const param = {
     current: mergedPagination.current,
@@ -24321,7 +24497,11 @@ function extendsObject(...list) {
   return result;
 }
 function usePagination(total, props, mergedData, onChange) {
-  const innerPagination = reactive({ current: 1, pageSize: DEFAULT_PAGE_SIZE });
+  const innerPagination = reactive({
+    current: 1,
+    pageSize: DEFAULT_PAGE_SIZE,
+    pageSizeOptions: PAGE_SIZE_OPTIONS
+  });
   const size = computed(() => props.size);
   const mergedPagination = computed(() => {
     const { pagination } = props;
@@ -24551,7 +24731,9 @@ const useCellProps = ({
     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;
   };
   watchEffect(() => {
@@ -25576,6 +25758,7 @@ var _sfc_main$A = defineComponent({
             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
@@ -25630,7 +25813,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
       [`${_ctx.prefixCls}-header-cell-title-inner`]: true
     }),
     title: _ctx.altTitle,
-    style: normalizeStyle(`text-align: ${_ctx.column.align}`)
+    style: normalizeStyle(`justify-content: ${_ctx.column.align}`)
   }, [
     createElementVNode(
       "span",
@@ -25676,16 +25859,28 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
       1040
       /* FULL_PROPS, DYNAMIC_SLOTS */
     )) : createCommentVNode("v-if", true),
-    _ctx.column.headerTooltip ? (openBlock(), createBlock(_component_Tooltip, {
-      key: 1,
-      title: _ctx.column.headerTooltip
-    }, {
+    _ctx.column.headerTooltip ? (openBlock(), createBlock(_component_Tooltip, { key: 1 }, {
+      title: withCtx(() => [
+        _ctx.column.headerTooltip === true ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.title), { key: 0 })) : (openBlock(), createElementBlock(
+          Fragment,
+          { key: 1 },
+          [
+            createTextVNode(
+              toDisplayString(_ctx.column.headerTooltip),
+              1
+              /* TEXT */
+            )
+          ],
+          64
+          /* STABLE_FRAGMENT */
+        ))
+      ]),
       default: withCtx(() => [
         createVNode(_component_InfoCircleOutlined, { style: { "margin-inline-start": "3px", "font-size": "12px" } })
       ]),
       _: 1
       /* STABLE */
-    }, 8, ["title"])) : createCommentVNode("v-if", true)
+    })) : createCommentVNode("v-if", true)
   ], 14, _hoisted_1$d);
 }
 var HeaderCellTitle = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["render", _sfc_render$w]]);
@@ -26870,6 +27065,7 @@ var _sfc_main$u = defineComponent({
       var _a, _b;
       return h(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
@@ -28299,28 +28495,29 @@ var _sfc_main$n = defineComponent({
             event: rowDragEvent.value
           });
         }
+      } else {
+        return [
+          createVNode(
+            "span",
+            { class: `${prefixCls.value}-drag-ghost-image-icon`, innerHTML: dragIcon2 },
+            null
+          ),
+          createVNode(
+            "span",
+            {
+              class: `${prefixCls.value}-drag-ghost-image-label`,
+              style: { maxWidth: `${parentOffsetWidth}px` }
+            },
+            [(_a = slots.label) == null ? void 0 : _a.call(slots)]
+          )
+        ];
       }
-      return [
-        createVNode(
-          "span",
-          { class: `${prefixCls.value}-drag-ghost-image-icon`, innerHTML: dragIcon2 },
-          null
-        ),
-        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 = createVNode(renderDragGhostImage);
+        render$1(dragGhostImage, dragGhostDom);
       }
-      render$1(dragGhostImage, dragGhostDom);
     };
     watch(
       [prefixCls],
@@ -28726,7 +28923,7 @@ var _sfc_main$m = defineComponent({
           newValue: modelValue.value,
           oldValue
         });
-        if (isPromise$1(result)) {
+        if (isPromise(result)) {
           result.then((res) => {
             res && emit("closeEditor", [props.cellKey]);
           }).catch(() => {
@@ -28946,7 +29143,7 @@ const BodyCell = (props, { slots, emit }) => {
       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) {
@@ -28967,7 +29164,7 @@ const BodyCell = (props, { slots, emit }) => {
       ...cellRenderArgs,
       oldValue: oldValuesMap.value[key]
     });
-    if (isPromise$1(beforeClose)) {
+    if (isPromise(beforeClose)) {
       beforeClose.then((res) => {
         var _a3, _b3;
         if (res) {
@@ -29021,7 +29218,7 @@ const BodyCell = (props, { slots, emit }) => {
               color: option.color,
               bordered: false
             },
-            option.text
+            () => option.text
           );
         } else {
           cellValue = option.text || emptyText;
@@ -29094,7 +29291,7 @@ const BodyCell = (props, { slots, emit }) => {
         // 	}),
         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");
@@ -29726,7 +29923,7 @@ var _sfc_main$i = defineComponent({
       () => (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 = computed(
       () => props.type === "left" ? leftPopupContainer.value : props.type === "center" ? centerPopupContainer.value : props.type === "right" ? rightPopupContainer.value : null
     );
@@ -29735,7 +29932,7 @@ var _sfc_main$i = defineComponent({
     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" }
     );
@@ -29802,7 +29999,7 @@ var _sfc_main$i = defineComponent({
         {
           [`${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,
@@ -30479,8 +30676,7 @@ var _sfc_main$g = defineComponent({
       };
     });
     const bodyViewportStyle = 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%"
@@ -31766,9 +31962,14 @@ var _sfc_main$f = defineComponent({
         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;
-          triggerRef(rawColumns);
+        if (result !== false) {
+          if (!(width === w && col.width === w)) {
+            col.width = width !== col.width ? col.width : w;
+            triggerRef(rawColumns);
+          }
+          if (action === "end") {
+            emit("update:columns", rawColumns.value, "resize");
+          }
         }
       },
       onRowDragEnd: (opt) => {
@@ -31942,7 +32143,7 @@ var _sfc_main$f = defineComponent({
             rawColumns.value.splice(index, 1);
           }
           triggerRef(rawColumns);
-          emit("update:columns", rawColumns.value);
+          emit("update:columns", rawColumns.value, "drag");
         };
         if (isPromise(dragEnd)) {
           dragEnd.then(() => {
@@ -33183,10 +33384,18 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
                   class: normalizeClass(`${_ctx.prefixCls}-toolbar-options`)
                 }, {
                   default: withCtx(() => [
-                    _ctx.mergeOptions.search !== false && !(!!_ctx.title || !!_ctx.$slots.title) ? (openBlock(), createBlock(_component_ProSearch, mergeProps({ key: 0 }, _ctx.searchConfig, { onSearch: _ctx.onSearch }), null, 16, ["onSearch"])) : createCommentVNode("v-if", true),
-                    renderSlot(_ctx.$slots, "searchExtra", {
-                      setParams: _ctx.actionsRef.setParams
-                    })
+                    _ctx.mergeOptions.search !== false && !(!!_ctx.title || !!_ctx.$slots.title) ? (openBlock(), createElementBlock(
+                      Fragment,
+                      { key: 0 },
+                      [
+                        createVNode(_component_ProSearch, mergeProps(_ctx.searchConfig, { onSearch: _ctx.onSearch }), null, 16, ["onSearch"]),
+                        renderSlot(_ctx.$slots, "searchExtra", {
+                          setParams: _ctx.actionsRef.setParams
+                        })
+                      ],
+                      64
+                      /* STABLE_FRAGMENT */
+                    )) : createCommentVNode("v-if", true)
                   ]),
                   _: 3
                   /* FORWARDED */
@@ -33205,7 +33414,18 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
                   class: normalizeClass(`${_ctx.prefixCls}-toolbar-actions`)
                 }, {
                   default: withCtx(() => [
-                    _ctx.mergeOptions.search !== false && (!!_ctx.title || !!_ctx.$slots.title) ? (openBlock(), createBlock(_component_ProSearch, mergeProps({ key: 0 }, _ctx.searchConfig, { onSearch: _ctx.onSearch }), null, 16, ["onSearch"])) : createCommentVNode("v-if", true),
+                    _ctx.mergeOptions.search !== false && (!!_ctx.title || !!_ctx.$slots.title) ? (openBlock(), createElementBlock(
+                      Fragment,
+                      { key: 0 },
+                      [
+                        createVNode(_component_ProSearch, mergeProps(_ctx.searchConfig, { onSearch: _ctx.onSearch }), null, 16, ["onSearch"]),
+                        renderSlot(_ctx.$slots, "searchExtra", {
+                          setParams: _ctx.actionsRef.setParams
+                        })
+                      ],
+                      64
+                      /* STABLE_FRAGMENT */
+                    )) : createCommentVNode("v-if", true),
                     renderSlot(_ctx.$slots, "actions", {
                       setParams: _ctx.actionsRef.setParams
                     }),
@@ -33524,7 +33744,8 @@ var Table = /* @__PURE__ */ defineComponent({
     const {
       hoverRowKey
     } = useProvideHover({
-      rowHoverDelay: computed(() => props.rowHoverDelay)
+      rowHoverDelay: computed(() => props.rowHoverDelay),
+      rowHover: computed(() => props.rowHover)
     });
     const mergedPrefixCls = computed(() => {
       var _a2;
@@ -33568,10 +33789,7 @@ var Table = /* @__PURE__ */ defineComponent({
       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 = computed(() => {
       if (typeof loading.value === "boolean") {
@@ -33633,9 +33851,44 @@ var Table = /* @__PURE__ */ defineComponent({
       };
       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 = 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) {
@@ -33647,12 +33900,12 @@ var Table = /* @__PURE__ */ defineComponent({
         }
         return true;
       }).map((item) => {
-        return {
+        return omitKeysAndUndefined({
           ...item,
           width: void 0,
           tooltip: item.headerTooltip,
           name: item.dataIndex
-        };
+        }, ["dataIndex", "width"]);
       });
     });
     const preserveRecordsRef = ref(/* @__PURE__ */ new Map());
@@ -33669,8 +33922,8 @@ var Table = /* @__PURE__ */ defineComponent({
       }
       onCleanSelected();
     });
-    const [selectedRowKeys, setSelectedRowKeys] = useMergedState(props.rowSelection ? ((_a = props.rowSelection) == null ? void 0 : _a.defaultSelectedRowKeys) || [] : void 0, {
-      value: 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: computed(() => props.selectedRowKeys || (props.rowSelection ? props.rowSelection.selectedRowKeys : void 0))
     });
     const rowSelection = computed(() => ({
       selectedRowKeys: selectedRowKeys.value,
@@ -33807,7 +34060,7 @@ var Table = /* @__PURE__ */ defineComponent({
         actions: slots.alertActions
       }), createVNode(InteralTable, 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,
@@ -33818,7 +34071,8 @@ var Table = /* @__PURE__ */ defineComponent({
         "expandIcon": expandIcon,
         "expandedRowRender": expandedRowRender,
         "hasContextmenuPopup": !!slots.contextmenuPopup,
-        "onChange": onTableChange
+        "onChange": onTableChange,
+        "onUpdate:columns": onColumnsChange
       }), {
         ...slots,
         footer: props.footer || slots.footer
@@ -33847,7 +34101,7 @@ var Table = /* @__PURE__ */ defineComponent({
         "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,
@@ -34688,6 +34942,10 @@ var FormColWrapper = /* @__PURE__ */ defineComponent({
     colProps: {
       type: Object,
       default: void 0
+    },
+    grid: {
+      type: Boolean,
+      default: void 0
     }
   },
   setup(props, {
@@ -34701,9 +34959,13 @@ var FormColWrapper = /* @__PURE__ */ defineComponent({
       var _a;
       return (_a = props.colProps) != null ? _a : colProps == null ? void 0 : colProps.value;
     });
+    const mergeGrid = 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 createVNode(Col, mergeColProps.value, {
           default: () => {
             var _a2;
@@ -34725,7 +34987,7 @@ var FormTitle = /* @__PURE__ */ defineComponent({
       default: void 0
     },
     tooltip: {
-      type: String,
+      type: [String, Boolean],
       default: ""
     }
   },
@@ -34743,12 +35005,17 @@ var FormTitle = /* @__PURE__ */ defineComponent({
       "props": {
         formData: formData.value
       }
-    }, null)]), props.tooltip && createVNode(Tooltip, {
-      "title": props.tooltip
-    }, {
+    }, null)]), props.tooltip && createVNode(Tooltip, null, {
       default: () => [createVNode(QuestionCircleOutlined, {
-        "class": `${prefixCls}-item-tooltip`
-      }, null)]
+        "class": `${prefixCls}-item-tooltip`,
+        "style": "margin-right: 3px"
+      }, null)],
+      title: () => props.tooltip === true ? createVNode(RenderVNode$1, {
+        "vnode": title.value,
+        "props": {
+          formData: formData.value
+        }
+      }, null) : props.tooltip
     })]);
   }
 });
@@ -34765,7 +35032,7 @@ var FormGroup = /* @__PURE__ */ defineComponent({
       default: void 0
     },
     tooltip: {
-      type: String,
+      type: [String, Boolean],
       default: void 0
     },
     colProps: {
@@ -34869,25 +35136,18 @@ var FormGroup$1 = /*#__PURE__*/Object.freeze({
 function useFieldValue({
   namePath,
   initialValue,
-  convertValue,
-  transform
+  convertValue
 }) {
   const fieldValue = shallowRef();
-  const { formData, initialValues, mountedRef } = useInjectForm();
+  const { formData, initialValues } = useInjectForm();
   const modelValue = 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);
   };
   watch(
     modelValue,
     (newValue) => {
-      fieldValue.value = cloneDeep(
-        convertValue ? convertValue(newValue, namePath.value) : newValue
-      );
+      fieldValue.value = cloneDeep(newValue);
     },
     {
       immediate: true,
@@ -34896,11 +35156,14 @@ function useFieldValue({
   );
   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();
@@ -34929,7 +35192,7 @@ var FormSet = /* @__PURE__ */ defineComponent({
       default: void 0
     },
     tooltip: {
-      type: String,
+      type: [String, Boolean],
       default: void 0
     },
     colProps: {
@@ -35343,7 +35606,7 @@ var FormListContainer = /* @__PURE__ */ defineComponent({
       default: void 0
     },
     tooltip: {
-      type: String,
+      type: [String, Boolean],
       default: void 0
     },
     readonly: {
@@ -35610,7 +35873,7 @@ var FormList = /* @__PURE__ */ defineComponent({
       default: void 0
     },
     tooltip: {
-      type: String,
+      type: [String, Boolean],
       default: void 0
     },
     colProps: {
@@ -36440,6 +36703,10 @@ var FormItem = /* @__PURE__ */ defineComponent({
     item: {
       type: Object,
       default: () => ({})
+    },
+    grid: {
+      type: Boolean,
+      default: void 0
     }
   },
   setup(props) {
@@ -36474,6 +36741,10 @@ var FormItem = /* @__PURE__ */ defineComponent({
       transform: props.item.transform
     });
     const fieldRef = ref();
+    const mergeGrid = computed(() => {
+      var _a;
+      return (_a = props.grid) != null ? _a : grid == null ? void 0 : grid.value;
+    });
     const fieldType = computed(() => {
       var _a;
       return (_a = props.item.fieldType) != null ? _a : "text";
@@ -36530,7 +36801,7 @@ var FormItem = /* @__PURE__ */ defineComponent({
         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,
@@ -36556,7 +36827,7 @@ var FormItem = /* @__PURE__ */ defineComponent({
       };
       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%";
       }
@@ -36596,12 +36867,14 @@ var FormItem = /* @__PURE__ */ defineComponent({
         }, [createVNode(FormTitle, {
           "title": props.item.title,
           "tooltip": props.item.tooltip
-        }, null)]), createVNode(RenderVNode$1, {
+        }, null)]), createVNode("div", {
+          "class": `${prefixCls}-item-title-extra`
+        }, [createVNode(RenderVNode$1, {
           "vnode": extraRender,
           "props": {
             formData: formData.value
           }
-        }, null)]);
+        }, null)])]);
       }
       return temp;
     });
@@ -36648,19 +36921,6 @@ var FormItem = /* @__PURE__ */ defineComponent({
     });
     return () => {
       var _a, _b;
-      const render = getSlot(props.item.render, formSlotsContext);
-      if (render) {
-        return createVNode(FormColWrapper, {
-          "colProps": props.item.colProps
-        }, {
-          default: () => [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"];
@@ -36688,22 +36948,33 @@ var FormItem = /* @__PURE__ */ defineComponent({
       if (extraRender) {
         defaultDom = createVNode("div", {
           "style": "display: flex; flex-direction: row; justify-content: flex-start; align-items: center;"
-        }, [defaultDom, createVNode(RenderVNode$1, {
+        }, [defaultDom, createVNode("div", {
+          "style": "margin-inline-start: 5px; flex-shrink: 0;"
+        }, [createVNode(RenderVNode$1, {
           "vnode": extraRender,
           "props": {
             formData: formData.value,
             listName: listName == null ? void 0 : listName.value,
             name: props.item.name
           }
-        }, null)]);
+        }, null)])]);
       }
+      const formItemDom = createVNode(Form$1.Item, restItemProps.value, {
+        default: () => [defaultDom],
+        ...slotsGetter.value
+      });
+      const render = getSlot(props.item.render, formSlotsContext);
       return createVNode(FormColWrapper, {
-        "colProps": props.item.colProps
+        "colProps": props.item.colProps,
+        "grid": mergeGrid.value
       }, {
-        default: () => [createVNode(Form$1.Item, restItemProps.value, {
-          default: () => [defaultDom],
-          ...slotsGetter.value
-        })]
+        default: () => [render ? createVNode(RenderVNode$1, {
+          "vnode": render,
+          "props": {
+            formData: formData.value,
+            defaultDom: formItemDom
+          }
+        }, null) : formItemDom]
       });
     };
   }