pro-design-vue 1.0.0-rc.12 → 1.0.0-rc.14

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.0.0-rc.12 */
+/*! Pro Design Vue v1.0.0-rc.14 */
 
 (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.12";
+  const version$1 = "1.0.0-rc.14";
 
   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 {
@@ -8480,7 +8480,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 +9144,7 @@
       return false;
     }
   }
-  function isFunction$1(value) {
+  function isFunction(value) {
     return typeof value === "function";
   }
   var slice = Array.prototype.slice;
@@ -9152,7 +9152,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 +9366,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 +10105,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 +10138,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 +11555,7 @@
           this.crop();
         }
         this.setData(options.data);
-        if (isFunction$1(options.ready)) {
+        if (isFunction(options.ready)) {
           addListener(element, EVENT_READY, options.ready, {
             once: true
           });
@@ -14766,7 +14766,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 +14775,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 +14889,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 +14898,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 +14907,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);
@@ -16234,15 +16234,33 @@
         action
       } = useInjectForm();
       const formSlotsContext = useInjectSlots$1();
-      const submit = () => {
+      const submit = async () => {
         var _a;
-        action.submit();
-        (_a = props.onSubmit) == null ? void 0 : _a.call(props);
+        if (!props.onSubmit) {
+          action.submit();
+          return;
+        }
+        const values = action.getFieldsValue();
+        const response = (_a = props.onSubmit) == null ? void 0 : _a.call(props, values, action);
+        const result = await response;
+        if (result) {
+          action.submit();
+        }
+        return result;
       };
-      const reset = () => {
-        var _a, _b;
-        (_a = action.reset) == null ? void 0 : _a.call(action);
-        (_b = props.onReset) == null ? void 0 : _b.call(props);
+      const reset = async () => {
+        var _a;
+        if (!props.onReset) {
+          action.reset();
+          return;
+        }
+        const values = action.getFieldsValue();
+        const response = (_a = props.onReset) == null ? void 0 : _a.call(props, values, action);
+        const result = await response;
+        if (result) {
+          action.reset();
+        }
+        return result;
       };
       const resetButton = vue.computed(() => {
         const {
@@ -16369,7 +16387,7 @@
         var _a;
         return (_a = props.formKey) != null ? _a : requestFormCacheId.toString();
       });
-      const [loading, setloading] = useMergedState$1(false, {
+      const [loading, setLoading] = useMergedState$1(false, {
         value: vue.computed(() => props.loading),
         onChange: (val) => {
           var _a;
@@ -16445,7 +16463,7 @@
         if (!props.onFinish) return;
         if (props.submitOnLoading) {
           if (loading.value) return;
-          setloading(true);
+          setLoading(true);
         }
         try {
           const finalValues = transformKeySubmitValue(cloneDeep(formData.value), transformerMap.value, props.omitNil);
@@ -16454,7 +16472,7 @@
           console.log("\u{1F680} ~ onFinish ~ error:", error);
         } finally {
           if (props.submitOnLoading) {
-            setloading(false);
+            setLoading(false);
           }
         }
       };
@@ -16509,6 +16527,7 @@
         }), null);
         if (submitterProps.value.teleport) {
           return vue.createVNode(vue.Teleport, {
+            "defer": true,
             "to": submitterProps.value.teleport
           }, _isSlot$5(dom) ? dom : {
             default: () => [dom]
@@ -17084,7 +17103,6 @@
         }
         if (props.defaultColsNumber !== void 0) {
           const oneRowControlsNumber = 24 / spanSize.value.span - 1;
-          console.log("\u{1F680} ~ showLength ~ oneRowControlsNumber:", oneRowControlsNumber);
           return props.defaultColsNumber > oneRowControlsNumber ? oneRowControlsNumber : props.defaultColsNumber;
         }
         return Math.max(1, 24 / spanSize.value.span - 1);
@@ -17121,7 +17139,7 @@
         }
         return void 0;
       });
-      const [collapsed, setCollapsed] = useMergedState$1(() => props.defaultCollapsed && !!props.submitter, {
+      const [collapsed, setCollapsed] = useMergedState$1(() => props.defaultCollapsed && props.submitter !== false, {
         value: vue.computed(() => props.collapsed),
         onChange: (val) => {
           emit("collapse", val);
@@ -17455,7 +17473,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) => {
@@ -17469,10 +17487,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);
@@ -17481,10 +17496,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 = () => {
@@ -19738,6 +19752,7 @@
       }, props.rowHoverDelay.value + 50);
     };
     const hoverContext = {
+      rowHover: props.rowHover,
       hoverColumnKey,
       hoverRowKey,
       handleCellHover,
@@ -19748,6 +19763,7 @@
   };
   const useInjectHover = () => {
     return vue.inject(HoverContextKey, {
+      rowHover: vue.computed(() => void 0),
       hoverRowKey: vue.ref(),
       hoverColumnKey: vue.ref(),
       handleCellHover: () => {
@@ -19769,9 +19785,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);
   }
@@ -19965,9 +19978,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))
@@ -20050,7 +20060,8 @@
       type: [Number, String]
     },
     size: {
-      type: String
+      type: String,
+      default: "middle"
     },
     bordered: {
       type: Boolean,
@@ -20146,6 +20157,10 @@
       type: Number,
       default: 59
     },
+    rowHover: {
+      type: Boolean,
+      default: void 0
+    },
     rowKey: {
       type: [Function, String]
     },
@@ -20260,6 +20275,9 @@
     "onUpdate:dataSource": {
       type: Function
     },
+    "onUpdate:columns": {
+      type: Function
+    },
     columnEmptyText: {
       type: [String, Boolean],
       default: "-"
@@ -20343,8 +20361,9 @@
 
   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,
@@ -20838,7 +20857,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;
@@ -20899,8 +20918,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()),
@@ -20909,18 +20928,20 @@
       const config = counter.columnsMap.value[columnKey] || {
         fixed: columnProps.fixed
       };
+      console.log("\u{1F680} ~ ?.map ~ config:", config);
       const tempColumns = {
         index: columnsIndex,
         key: columnKey,
         ...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
@@ -24455,6 +24476,7 @@
   }
 
   const DEFAULT_PAGE_SIZE = 10;
+  const PAGE_SIZE_OPTIONS = ["5", "10", "20", "50"];
   function getPaginationParam(pagination, mergedPagination) {
     const param = {
       current: mergedPagination.current,
@@ -24484,7 +24506,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;
@@ -24714,7 +24740,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(() => {
@@ -25739,6 +25767,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
@@ -25839,16 +25868,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]]);
@@ -27033,6 +27074,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
@@ -28462,28 +28504,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],
@@ -28889,7 +28932,7 @@
             newValue: modelValue.value,
             oldValue
           });
-          if (isPromise$1(result)) {
+          if (isPromise(result)) {
             result.then((res) => {
               res && emit("closeEditor", [props.cellKey]);
             }).catch(() => {
@@ -29109,7 +29152,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) {
@@ -29130,7 +29173,7 @@
         ...cellRenderArgs,
         oldValue: oldValuesMap.value[key]
       });
-      if (isPromise$1(beforeClose)) {
+      if (isPromise(beforeClose)) {
         beforeClose.then((res) => {
           var _a3, _b3;
           if (res) {
@@ -29257,7 +29300,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");
@@ -29889,7 +29932,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
       );
@@ -29898,7 +29941,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" }
       );
@@ -29965,7 +30008,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,
@@ -30642,8 +30685,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%"
@@ -31929,9 +31971,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) => {
@@ -32105,7 +32152,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(() => {
@@ -33687,7 +33734,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;
@@ -33731,10 +33779,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") {
@@ -33796,9 +33841,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) {
@@ -33810,12 +33890,12 @@
           }
           return true;
         }).map((item) => {
-          return {
+          return omitKeysAndUndefined({
             ...item,
             width: void 0,
             tooltip: item.headerTooltip,
             name: item.dataIndex
-          };
+          }, ["dataIndex", "width", "tooltip", "disable"]);
         });
       });
       const preserveRecordsRef = vue.ref(/* @__PURE__ */ new Map());
@@ -33832,8 +33912,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,
@@ -33970,7 +34050,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,
@@ -33981,7 +34061,8 @@
           "expandIcon": expandIcon,
           "expandedRowRender": expandedRowRender,
           "hasContextmenuPopup": !!slots.contextmenuPopup,
-          "onChange": onTableChange
+          "onChange": onTableChange,
+          "onUpdate:columns": onColumnsChange
         }), {
           ...slots,
           footer: props.footer || slots.footer
@@ -36771,12 +36852,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;
       });
@@ -36823,20 +36906,6 @@
       });
       return () => {
         var _a, _b;
-        const render = getSlot(props.item.render, formSlotsContext);
-        if (render) {
-          return vue.createVNode(FormColWrapper, {
-            "colProps": props.item.colProps,
-            "grid": mergeGrid.value
-          }, {
-            default: () => [vue.createVNode(RenderVNode$1, {
-              "vnode": render,
-              "props": {
-                formData: formData.value
-              }
-            }, null)]
-          });
-        }
         const renderFormItem = getSlot(props.item.renderFormItem, formSlotsContext);
         const extraRender = getSlot((_a = props.item.extra) == null ? void 0 : _a.item, formSlotsContext);
         const FieldComponent = (_b = fieldComponentMap[fieldType.value]) != null ? _b : fieldComponentMap["text"];
@@ -36864,23 +36933,33 @@
         if (extraRender) {
           defaultDom = vue.createVNode("div", {
             "style": "display: flex; flex-direction: row; justify-content: flex-start; align-items: center;"
-          }, [defaultDom, vue.createVNode(RenderVNode$1, {
+          }, [defaultDom, vue.createVNode("div", {
+            "style": "margin-inline-start: 5px; flex-shrink: 0;"
+          }, [vue.createVNode(RenderVNode$1, {
             "vnode": extraRender,
             "props": {
               formData: formData.value,
               listName: listName == null ? void 0 : listName.value,
               name: props.item.name
             }
-          }, null)]);
+          }, null)])]);
         }
+        const formItemDom = vue.createVNode(antDesignVue.Form.Item, restItemProps.value, {
+          default: () => [defaultDom],
+          ...slotsGetter.value
+        });
+        const render = getSlot(props.item.render, formSlotsContext);
         return vue.createVNode(FormColWrapper, {
           "colProps": props.item.colProps,
           "grid": mergeGrid.value
         }, {
-          default: () => [vue.createVNode(antDesignVue.Form.Item, restItemProps.value, {
-            default: () => [defaultDom],
-            ...slotsGetter.value
-          })]
+          default: () => [render ? vue.createVNode(RenderVNode$1, {
+            "vnode": render,
+            "props": {
+              formData: formData.value,
+              defaultDom: formItemDom
+            }
+          }, null) : formItemDom]
         });
       };
     }