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

package/dist/index.full.mjs

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.0.0-rc.12 */
+/*! Pro Design Vue v1.0.0-rc.14 */
 
 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.12";
+const version$1 = "1.0.0-rc.14";
 
 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
         });
@@ -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);
@@ -16231,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 {
@@ -16366,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;
@@ -16442,7 +16460,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       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);
@@ -16451,7 +16469,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
         console.log("\u{1F680} ~ onFinish ~ error:", error);
       } finally {
         if (props.submitOnLoading) {
-          setloading(false);
+          setLoading(false);
         }
       }
     };
@@ -16506,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]
@@ -17081,7 +17100,6 @@ var QueryFilter = /* @__PURE__ */ defineComponent({
       }
       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);
@@ -17118,7 +17136,7 @@ var QueryFilter = /* @__PURE__ */ defineComponent({
       }
       return void 0;
     });
-    const [collapsed, setCollapsed] = useMergedState$1(() => props.defaultCollapsed && !!props.submitter, {
+    const [collapsed, setCollapsed] = useMergedState$1(() => props.defaultCollapsed && props.submitter !== false, {
       value: computed(() => props.collapsed),
       onChange: (val) => {
         emit("collapse", val);
@@ -17452,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) => {
@@ -17466,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);
@@ -17478,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 = () => {
@@ -19735,6 +19749,7 @@ const useProvideHover = (props) => {
     }, props.rowHoverDelay.value + 50);
   };
   const hoverContext = {
+    rowHover: props.rowHover,
     hoverColumnKey,
     hoverRowKey,
     handleCellHover,
@@ -19745,6 +19760,7 @@ const useProvideHover = (props) => {
 };
 const useInjectHover = () => {
   return inject(HoverContextKey, {
+    rowHover: computed(() => void 0),
     hoverRowKey: ref(),
     hoverColumnKey: ref(),
     handleCellHover: () => {
@@ -19766,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);
 }
@@ -19962,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))
@@ -20047,7 +20057,8 @@ const baseTableProps = () => ({
     type: [Number, String]
   },
   size: {
-    type: String
+    type: String,
+    default: "middle"
   },
   bordered: {
     type: Boolean,
@@ -20143,6 +20154,10 @@ const baseTableProps = () => ({
     type: Number,
     default: 59
   },
+  rowHover: {
+    type: Boolean,
+    default: void 0
+  },
   rowKey: {
     type: [Function, String]
   },
@@ -20257,6 +20272,9 @@ const baseTableProps = () => ({
   "onUpdate:dataSource": {
     type: Function
   },
+  "onUpdate:columns": {
+    type: Function
+  },
   columnEmptyText: {
     type: [String, Boolean],
     default: "-"
@@ -20340,8 +20358,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,
@@ -20835,7 +20854,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;
@@ -20896,8 +20915,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()),
@@ -20906,18 +20925,20 @@ function genProColumnToColumn(params, parents) {
     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
@@ -24452,6 +24473,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,
@@ -24481,7 +24503,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;
@@ -24711,7 +24737,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(() => {
@@ -25736,6 +25764,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
@@ -25836,16 +25865,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]]);
@@ -27030,6 +27071,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
@@ -28459,28 +28501,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],
@@ -28886,7 +28929,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(() => {
@@ -29106,7 +29149,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) {
@@ -29127,7 +29170,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) {
@@ -29254,7 +29297,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");
@@ -29886,7 +29929,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
     );
@@ -29895,7 +29938,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" }
     );
@@ -29962,7 +30005,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,
@@ -30639,8 +30682,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%"
@@ -31926,9 +31968,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) => {
@@ -32102,7 +32149,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(() => {
@@ -33684,7 +33731,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;
@@ -33728,10 +33776,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") {
@@ -33793,9 +33838,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) {
@@ -33807,12 +33887,12 @@ var Table = /* @__PURE__ */ defineComponent({
         }
         return true;
       }).map((item) => {
-        return {
+        return omitKeysAndUndefined({
           ...item,
           width: void 0,
           tooltip: item.headerTooltip,
           name: item.dataIndex
-        };
+        }, ["dataIndex", "width", "tooltip", "disable"]);
       });
     });
     const preserveRecordsRef = ref(/* @__PURE__ */ new Map());
@@ -33829,8 +33909,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,
@@ -33967,7 +34047,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,
@@ -33978,7 +34058,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
@@ -36768,12 +36849,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;
     });
@@ -36820,20 +36903,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,
-          "grid": mergeGrid.value
-        }, {
-          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"];
@@ -36861,23 +36930,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,
         "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]
       });
     };
   }