vue-devui 1.6.17 → 1.6.19

package/table/index.es.js

@@ -1,39 +1,4 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-import { computed, ref, watchEffect, watch, getCurrentInstance, unref, defineComponent, inject, createVNode, mergeProps, toRefs, onMounted, onUnmounted, Transition, nextTick, withModifiers, Comment, Text, h, Fragment, withDirectives, cloneVNode, provide, Teleport, vShow, resolveDynamicComponent, render, reactive, resolveComponent, toRef, createTextVNode, onBeforeUnmount, isVNode, onBeforeMount, onUpdated, resolveDirective } from "vue";
+import { computed, ref, watchEffect, watch, getCurrentInstance, unref, defineComponent, inject, createVNode, mergeProps, toRefs, onMounted, onUnmounted, Transition, nextTick, withModifiers, Comment, Text, Fragment, h, withDirectives, cloneVNode, provide, Teleport, vShow, resolveDynamicComponent, render, reactive, resolveComponent, toRef, createTextVNode, onBeforeUnmount, isVNode, onBeforeMount, onUpdated, resolveDirective } from "vue";
 import "clipboard";
 import { offset, flip, arrow, computePosition } from "@floating-ui/dom";
 import { onClickOutside } from "@vueuse/core";
@@ -261,10 +226,14 @@ function useTableWatcher(props, store) {
       store.setExpandRows(props.expandRowKeys);
     }
   });
-  watch(() => props.data, () => {
-    store.updateRows();
-    store.updateColumns();
-  }, { deep: true });
+  watch(
+    () => props.data,
+    () => {
+      store.updateRows();
+      store.updateColumns();
+    },
+    { deep: true }
+  );
 }
 function useHorizontalScroll(table2) {
   const ns2 = useNamespace$1("table");
@@ -692,21 +661,25 @@ function createSelection(dataSource, rowKey, flatRows) {
     }
   });
   const _halfChecked = ref(false);
-  watch(_checkSet, (set) => {
-    if (set.size === 0) {
-      return;
-    }
-    let allTrue = true;
-    let allFalse = true;
-    const items = flatRows.value;
-    for (let i = 0; i < items.length; i++) {
-      const checked = isRowChecked(items[i], i);
-      allTrue && (allTrue = checked);
-      allFalse && (allFalse = !checked);
-    }
-    _checkAllRecord.value = allTrue;
-    _halfChecked.value = !(allFalse || allTrue);
-  }, { immediate: true, deep: true });
+  watch(
+    _checkSet,
+    (set) => {
+      if (set.size === 0) {
+        return;
+      }
+      let allTrue = true;
+      let allFalse = true;
+      const items = flatRows.value;
+      for (let i = 0; i < items.length; i++) {
+        const checked = isRowChecked(items[i], i);
+        allTrue && (allTrue = checked);
+        allFalse && (allFalse = !checked);
+      }
+      _checkAllRecord.value = allTrue;
+      _halfChecked.value = !(allFalse || allTrue);
+    },
+    { immediate: true, deep: true }
+  );
   watch(dataSource, (value) => {
     _checkAllRecord.value = value.findIndex((item, index2) => !isRowChecked(item, index2)) === -1;
   });
@@ -729,8 +702,16 @@ function createFixedLogic(columns) {
 function createStore(dataSource, table2, ctx) {
   const _data = ref([]);
   const { _columns, flatColumns, insertColumn, removeColumn, sortColumn, updateColumns } = createColumnGenerator();
-  const { flatRows, hiddenRowKeys, rowLevelMap, updateRows, firstDefaultColumn, updateFirstDefaultColumn } = createRowGenerator(dataSource, table2.props.rowKey, flatColumns);
-  const { _checkAll, _checkSet, _halfChecked, getCheckedRows, isRowChecked, checkRow, toggleRowSelection } = createSelection(_data, table2.props.rowKey, flatRows);
+  const { flatRows, hiddenRowKeys, rowLevelMap, updateRows, firstDefaultColumn, updateFirstDefaultColumn } = createRowGenerator(
+    dataSource,
+    table2.props.rowKey,
+    flatColumns
+  );
+  const { _checkAll, _checkSet, _halfChecked, getCheckedRows, isRowChecked, checkRow, toggleRowSelection } = createSelection(
+    _data,
+    table2.props.rowKey,
+    flatRows
+  );
   const { thList, collectTh, sortData } = useSort$1(dataSource, flatRows);
   const { isFixedLeft } = createFixedLogic(_columns);
   const { isRowExpanded, updateExpandRows, setExpandRows, toggleRowExpansion } = useExpand(_data, table2);
@@ -738,10 +719,14 @@ function createStore(dataSource, table2, ctx) {
   const emitTableEvent = (eventName, ...params) => {
     ctx.emit.apply(ctx, [eventName, ...params]);
   };
-  watch(dataSource, (value) => {
-    _data.value = [...value];
-    updateExpandRows();
-  }, { deep: true, immediate: true });
+  watch(
+    dataSource,
+    (value) => {
+      _data.value = [...value];
+      updateExpandRows();
+    },
+    { deep: true, immediate: true }
+  );
   return {
     states: {
       _data,
@@ -895,11 +880,7 @@ const dropdownProps = {
   },
   position: {
     type: Array,
-    default: ["bottom"]
-  },
-  align: {
-    type: String,
-    default: null
+    default: () => ["bottom", "top", "left", "right"]
   },
   offset: {
     type: [Number, Object],
@@ -964,76 +945,91 @@ const useDropdownEvent = ({ id, isOpen, origin, dropdownRef, props, emit }) => {
     const originEl = getElement(originVal);
     const subscriptions = [];
     setTimeout(() => {
-      subscriptions.push(subscribeEvent(document, "click", (e) => {
-        e.stopPropagation();
-        const dropdownValues = [...dropdownMap.values()];
-        if (!isOpen.value || closeScope.value === "none" || (dropdownEl == null ? void 0 : dropdownEl.contains(e.target)) && closeScope.value === "blank" || dropdownValues.some((item) => {
-          var _a;
-          return (_a = item.toggleEl) == null ? void 0 : _a.contains(e.target);
-        }) && dropdownValues.some((item) => {
-          var _a;
-          return (_a = item.menuEl) == null ? void 0 : _a.contains(e.target);
-        })) {
-          return;
-        }
-        [...dropdownMap.values()].reverse().forEach((item) => {
-          setTimeout(() => {
-            var _a, _b;
-            if (!((_a = item.toggleEl) == null ? void 0 : _a.contains(e.target))) {
-              (_b = item.toggle) == null ? void 0 : _b.call(item);
-            }
-          }, 0);
-        });
-        overlayEnter = false;
-      }));
+      subscriptions.push(
+        subscribeEvent(document, "click", (e) => {
+          e.stopPropagation();
+          const dropdownValues = [...dropdownMap.values()];
+          if (!isOpen.value || closeScope.value === "none" || (dropdownEl == null ? void 0 : dropdownEl.contains(e.target)) && closeScope.value === "blank" || dropdownValues.some((item) => {
+            var _a;
+            return (_a = item.toggleEl) == null ? void 0 : _a.contains(e.target);
+          }) && dropdownValues.some((item) => {
+            var _a;
+            return (_a = item.menuEl) == null ? void 0 : _a.contains(e.target);
+          })) {
+            return;
+          }
+          [...dropdownMap.values()].reverse().forEach((item) => {
+            setTimeout(() => {
+              var _a, _b;
+              if (!((_a = item.toggleEl) == null ? void 0 : _a.contains(e.target))) {
+                (_b = item.toggle) == null ? void 0 : _b.call(item);
+              }
+            }, 0);
+          });
+          overlayEnter = false;
+        })
+      );
     }, 0);
     if (triggerVal === "click") {
-      subscriptions.push(subscribeEvent(originEl, "click", () => toggle(!isOpen.value)), subscribeEvent(dropdownEl, "mouseleave", (e) => {
-        var _a;
-        if (closeOnMouseLeaveMenu.value && !((_a = dropdownMap.get(id).child) == null ? void 0 : _a.contains(e.relatedTarget))) {
-          handleLeave("dropdown", true);
-        }
-      }));
+      subscriptions.push(
+        subscribeEvent(originEl, "click", () => toggle(!isOpen.value)),
+        subscribeEvent(dropdownEl, "mouseleave", (e) => {
+          var _a;
+          if (closeOnMouseLeaveMenu.value && !((_a = dropdownMap.get(id).child) == null ? void 0 : _a.contains(e.relatedTarget))) {
+            handleLeave("dropdown", true);
+          }
+        })
+      );
     } else if (triggerVal === "hover") {
-      subscriptions.push(subscribeEvent(originEl, "mouseenter", () => {
-        originEnter = true;
-        toggle(true);
-      }), subscribeEvent(originEl, "mouseleave", () => {
-        originEnter = false;
-        handleLeave("origin");
-      }), subscribeEvent(dropdownEl, "mouseenter", () => {
-        overlayEnter = true;
-        isOpen.value = true;
-      }), subscribeEvent(dropdownEl, "mouseleave", (e) => {
-        var _a;
-        overlayEnter = false;
-        if (e.relatedTarget && ((originEl == null ? void 0 : originEl.contains(e.relatedTarget)) || ((_a = dropdownMap.get(id).child) == null ? void 0 : _a.contains(e.relatedTarget)))) {
-          return;
-        }
-        handleLeave("dropdown", true);
-      }));
+      subscriptions.push(
+        subscribeEvent(originEl, "mouseenter", () => {
+          originEnter = true;
+          toggle(true);
+        }),
+        subscribeEvent(originEl, "mouseleave", () => {
+          originEnter = false;
+          handleLeave("origin");
+        }),
+        subscribeEvent(dropdownEl, "mouseenter", () => {
+          overlayEnter = true;
+          isOpen.value = true;
+        }),
+        subscribeEvent(dropdownEl, "mouseleave", (e) => {
+          var _a;
+          overlayEnter = false;
+          if (e.relatedTarget && ((originEl == null ? void 0 : originEl.contains(e.relatedTarget)) || ((_a = dropdownMap.get(id).child) == null ? void 0 : _a.contains(e.relatedTarget)))) {
+            return;
+          }
+          handleLeave("dropdown", true);
+        })
+      );
     }
     onInvalidate(() => subscriptions.forEach((v) => v()));
   });
 };
 function useDropdown(id, visible, isOpen, origin, dropdownRef, emit) {
-  watch(visible, (newVal, oldVal) => {
-    if (oldVal === void 0) {
-      return;
-    }
-    isOpen.value = newVal;
-    emit("toggle", isOpen.value);
-  }, { immediate: true });
+  watch(
+    visible,
+    (newVal, oldVal) => {
+      if (oldVal === void 0) {
+        return;
+      }
+      isOpen.value = newVal;
+      emit("toggle", isOpen.value);
+    },
+    { immediate: true }
+  );
   watch([isOpen, dropdownRef], ([isOpenVal, dropdownEl]) => {
     var _a;
     if (isOpenVal) {
-      dropdownMap.set(id, __spreadProps(__spreadValues({}, dropdownMap.get(id)), {
+      dropdownMap.set(id, {
+        ...dropdownMap.get(id),
         menuEl: dropdownEl,
         toggle: () => {
           isOpen.value = false;
           emit("toggle", isOpen.value);
         }
-      }));
+      });
       for (const value of dropdownMap.values()) {
         if ((_a = value.menuEl) == null ? void 0 : _a.contains(origin.value)) {
           value.child = dropdownEl;
@@ -1096,13 +1092,16 @@ function useFixedOverlay(props, ctx) {
   const removeBodyAdditions = () => {
     lockScrollCb == null ? void 0 : lockScrollCb();
   };
-  watch(() => props.modelValue, (val) => {
-    if (val) {
-      props.lockScroll && (lockScrollCb = lockScroll());
-    } else {
-      removeBodyAdditions();
+  watch(
+    () => props.modelValue,
+    (val) => {
+      if (val) {
+        props.lockScroll && (lockScrollCb = lockScroll());
+      } else {
+        removeBodyAdditions();
+      }
     }
-  });
+  );
   onUnmounted(removeBodyAdditions);
   return { onClick };
 }
@@ -1270,18 +1269,21 @@ function useOverlay(props, emit) {
     const originEl = (_b = (_a = props.origin) == null ? void 0 : _a.$el) != null ? _b : props.origin;
     originEl && (originObserver == null ? void 0 : originObserver.unobserve(originEl));
   };
-  watch(() => props.modelValue, () => {
-    if (props.modelValue && props.origin) {
-      nextTick(updatePosition);
-      window.addEventListener("scroll", scrollCallback, true);
-      window.addEventListener("resize", updatePosition);
-      observeOrigin();
-    } else {
-      window.removeEventListener("scroll", scrollCallback, true);
-      window.removeEventListener("resize", updatePosition);
-      unobserveOrigin();
+  watch(
+    () => props.modelValue,
+    () => {
+      if (props.modelValue && props.origin) {
+        nextTick(updatePosition);
+        window.addEventListener("scroll", scrollCallback, true);
+        window.addEventListener("resize", updatePosition);
+        observeOrigin();
+      } else {
+        window.removeEventListener("scroll", scrollCallback, true);
+        window.removeEventListener("resize", updatePosition);
+        unobserveOrigin();
+      }
     }
-  });
+  );
   onUnmounted(() => {
     window.removeEventListener("scroll", scrollCallback, true);
     window.removeEventListener("resize", updatePosition);
@@ -1330,6 +1332,11 @@ const FlexibleOverlay = defineComponent({
     };
   }
 });
+/**
+* @vue/shared v3.4.27
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/
 const isObject = (val) => val !== null && typeof val === "object";
 const ns$3 = useNamespace$1("popper-trigger");
 function wrapContent(content) {
@@ -1401,7 +1408,6 @@ var Dropdown = defineComponent({
     const {
       visible,
       position,
-      align,
       offset: offset2,
       destroyOnHide,
       shiftOffset,
@@ -1459,7 +1465,6 @@ var Dropdown = defineComponent({
           "ref": overlayRef,
           "origin": origin.value,
           "position": position.value,
-          "align": align.value,
           "offset": offset2.value,
           "shiftOffset": shiftOffset == null ? void 0 : shiftOffset.value,
           "onPositionChange": handlePositionChange,
@@ -1760,8 +1765,8 @@ defineComponent({
 });
 class View {
   constructor() {
-    __publicField(this, "top", "50%");
-    __publicField(this, "left", "50%");
+    this.top = "50%";
+    this.left = "50%";
   }
 }
 const loadingProps = {
@@ -1779,13 +1784,9 @@ const loadingProps = {
 };
 class LoadingOptions {
   constructor() {
-    __publicField(this, "target");
-    __publicField(this, "message");
-    __publicField(this, "loadingTemplateRef");
-    __publicField(this, "backdrop", true);
-    __publicField(this, "positionType", "relative");
-    __publicField(this, "view", new View());
-    __publicField(this, "zIndex");
+    this.backdrop = true;
+    this.positionType = "relative";
+    this.view = new View();
   }
 }
 var loading = "";
@@ -1853,7 +1854,7 @@ var Loading = defineComponent({
 });
 const COMPONENT_CONTAINER_SYMBOL = Symbol("dev_component_container");
 function createComponent(component, props, children = null) {
-  const vnode = h(component, __spreadValues({}, props), children);
+  const vnode = h(component, { ...props }, children);
   const container = document.createElement("div");
   vnode[COMPONENT_CONTAINER_SYMBOL] = container;
   render(vnode, container);
@@ -1940,9 +1941,16 @@ const removeAttribute = (el) => {
 };
 const handleProps = (el, vprops) => {
   var _a;
-  const props = __spreadValues(__spreadValues({}, new LoadingOptions()), vprops);
+  const props = {
+    ...new LoadingOptions(),
+    ...vprops
+  };
   const loadingTemplateRef = props.loadingTemplateRef;
-  const loadingInstance = createComponent(loadingConstructor, __spreadValues({}, props), loadingTemplateRef ? () => loadingTemplateRef : null);
+  const loadingInstance = createComponent(
+    loadingConstructor,
+    { ...props },
+    loadingTemplateRef ? () => loadingTemplateRef : null
+  );
   el.style.position = props.positionType || "relative";
   el.options = props;
   el.instance = loadingInstance;
@@ -2712,8 +2720,10 @@ var lodash = { exports: {} };
       var nativeObjectToString = objectProto.toString;
       var objectCtorString = funcToString.call(Object2);
       var oldDash = root._;
-      var reIsNative = RegExp2("^" + funcToString.call(hasOwnProperty).replace(reRegExpChar, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$");
-      var Buffer2 = moduleExports ? context.Buffer : undefined$1, Symbol2 = context.Symbol, Uint8Array2 = context.Uint8Array, allocUnsafe = Buffer2 ? Buffer2.allocUnsafe : undefined$1, getPrototype = overArg(Object2.getPrototypeOf, Object2), objectCreate = Object2.create, propertyIsEnumerable = objectProto.propertyIsEnumerable, splice = arrayProto.splice, spreadableSymbol = Symbol2 ? Symbol2.isConcatSpreadable : undefined$1, symIterator = Symbol2 ? Symbol2.iterator : undefined$1, symToStringTag = Symbol2 ? Symbol2.toStringTag : undefined$1;
+      var reIsNative = RegExp2(
+        "^" + funcToString.call(hasOwnProperty).replace(reRegExpChar, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$"
+      );
+      var Buffer = moduleExports ? context.Buffer : undefined$1, Symbol2 = context.Symbol, Uint8Array = context.Uint8Array, allocUnsafe = Buffer ? Buffer.allocUnsafe : undefined$1, getPrototype = overArg(Object2.getPrototypeOf, Object2), objectCreate = Object2.create, propertyIsEnumerable = objectProto.propertyIsEnumerable, splice = arrayProto.splice, spreadableSymbol = Symbol2 ? Symbol2.isConcatSpreadable : undefined$1, symIterator = Symbol2 ? Symbol2.iterator : undefined$1, symToStringTag = Symbol2 ? Symbol2.toStringTag : undefined$1;
       var defineProperty = function() {
         try {
           var func = getNative(Object2, "defineProperty");
@@ -2723,11 +2733,11 @@ var lodash = { exports: {} };
         }
       }();
       var ctxClearTimeout = context.clearTimeout !== root.clearTimeout && context.clearTimeout, ctxNow = Date2 && Date2.now !== root.Date.now && Date2.now, ctxSetTimeout = context.setTimeout !== root.setTimeout && context.setTimeout;
-      var nativeCeil = Math2.ceil, nativeFloor = Math2.floor, nativeGetSymbols = Object2.getOwnPropertySymbols, nativeIsBuffer = Buffer2 ? Buffer2.isBuffer : undefined$1, nativeIsFinite = context.isFinite, nativeJoin = arrayProto.join, nativeKeys = overArg(Object2.keys, Object2), nativeMax = Math2.max, nativeMin = Math2.min, nativeNow = Date2.now, nativeParseInt = context.parseInt, nativeRandom = Math2.random, nativeReverse = arrayProto.reverse;
-      var DataView = getNative(context, "DataView"), Map2 = getNative(context, "Map"), Promise2 = getNative(context, "Promise"), Set2 = getNative(context, "Set"), WeakMap2 = getNative(context, "WeakMap"), nativeCreate = getNative(Object2, "create");
-      var metaMap = WeakMap2 && new WeakMap2();
+      var nativeCeil = Math2.ceil, nativeFloor = Math2.floor, nativeGetSymbols = Object2.getOwnPropertySymbols, nativeIsBuffer = Buffer ? Buffer.isBuffer : undefined$1, nativeIsFinite = context.isFinite, nativeJoin = arrayProto.join, nativeKeys = overArg(Object2.keys, Object2), nativeMax = Math2.max, nativeMin = Math2.min, nativeNow = Date2.now, nativeParseInt = context.parseInt, nativeRandom = Math2.random, nativeReverse = arrayProto.reverse;
+      var DataView = getNative(context, "DataView"), Map2 = getNative(context, "Map"), Promise2 = getNative(context, "Promise"), Set2 = getNative(context, "Set"), WeakMap = getNative(context, "WeakMap"), nativeCreate = getNative(Object2, "create");
+      var metaMap = WeakMap && new WeakMap();
       var realNames = {};
-      var dataViewCtorString = toSource(DataView), mapCtorString = toSource(Map2), promiseCtorString = toSource(Promise2), setCtorString = toSource(Set2), weakMapCtorString = toSource(WeakMap2);
+      var dataViewCtorString = toSource(DataView), mapCtorString = toSource(Map2), promiseCtorString = toSource(Promise2), setCtorString = toSource(Set2), weakMapCtorString = toSource(WeakMap);
       var symbolProto = Symbol2 ? Symbol2.prototype : undefined$1, symbolValueOf = symbolProto ? symbolProto.valueOf : undefined$1, symbolToString = symbolProto ? symbolProto.toString : undefined$1;
       function lodash2(value) {
         if (isObjectLike(value) && !isArray(value) && !(value instanceof LazyWrapper)) {
@@ -3975,7 +3985,7 @@ var lodash = { exports: {} };
       }
       function cloneArrayBuffer(arrayBuffer) {
         var result2 = new arrayBuffer.constructor(arrayBuffer.byteLength);
-        new Uint8Array2(result2).set(new Uint8Array2(arrayBuffer));
+        new Uint8Array(result2).set(new Uint8Array(arrayBuffer));
         return result2;
       }
       function cloneDataView(dataView, isDeep) {
@@ -4194,7 +4204,18 @@ var lodash = { exports: {} };
           var holders = length < 3 && args[0] !== placeholder && args[length - 1] !== placeholder ? [] : replaceHolders(args, placeholder);
           length -= holders.length;
           if (length < arity) {
-            return createRecurry(func, bitmask, createHybrid, wrapper.placeholder, undefined$1, args, holders, undefined$1, undefined$1, arity - length);
+            return createRecurry(
+              func,
+              bitmask,
+              createHybrid,
+              wrapper.placeholder,
+              undefined$1,
+              args,
+              holders,
+              undefined$1,
+              undefined$1,
+              arity - length
+            );
           }
           var fn = this && this !== root && this instanceof wrapper ? Ctor : func;
           return apply(fn, this, args);
@@ -4272,7 +4293,18 @@ var lodash = { exports: {} };
           length -= holdersCount;
           if (isCurried && length < arity) {
             var newHolders = replaceHolders(args, placeholder);
-            return createRecurry(func, bitmask, createHybrid, wrapper.placeholder, thisArg, args, newHolders, argPos, ary2, arity - length);
+            return createRecurry(
+              func,
+              bitmask,
+              createHybrid,
+              wrapper.placeholder,
+              thisArg,
+              args,
+              newHolders,
+              argPos,
+              ary2,
+              arity - length
+            );
           }
           var thisBinding = isBind ? thisArg : this, fn = isBindKey ? thisBinding[func] : func;
           length = args.length;
@@ -4557,7 +4589,7 @@ var lodash = { exports: {} };
             object4 = object4.buffer;
             other = other.buffer;
           case arrayBufferTag:
-            if (object4.byteLength != other.byteLength || !equalFunc(new Uint8Array2(object4), new Uint8Array2(other))) {
+            if (object4.byteLength != other.byteLength || !equalFunc(new Uint8Array(object4), new Uint8Array(other))) {
               return false;
             }
             return true;
@@ -4719,7 +4751,7 @@ var lodash = { exports: {} };
         return result2;
       };
       var getTag = baseGetTag;
-      if (DataView && getTag(new DataView(new ArrayBuffer(1))) != dataViewTag || Map2 && getTag(new Map2()) != mapTag || Promise2 && getTag(Promise2.resolve()) != promiseTag || Set2 && getTag(new Set2()) != setTag || WeakMap2 && getTag(new WeakMap2()) != weakMapTag) {
+      if (DataView && getTag(new DataView(new ArrayBuffer(1))) != dataViewTag || Map2 && getTag(new Map2()) != mapTag || Promise2 && getTag(Promise2.resolve()) != promiseTag || Set2 && getTag(new Set2()) != setTag || WeakMap && getTag(new WeakMap()) != weakMapTag) {
         getTag = function(value) {
           var result2 = baseGetTag(value), Ctor = result2 == objectTag ? value.constructor : undefined$1, ctorString = Ctor ? toSource(Ctor) : "";
           if (ctorString) {
@@ -6592,7 +6624,10 @@ var lodash = { exports: {} };
         options = assignInWith({}, options, settings, customDefaultsAssignIn);
         var imports = assignInWith({}, options.imports, settings.imports, customDefaultsAssignIn), importsKeys = keys(imports), importsValues = baseValues(imports, importsKeys);
         var isEscaping, isEvaluating, index2 = 0, interpolate = options.interpolate || reNoMatch, source = "__p += '";
-        var reDelimiters = RegExp2((options.escape || reNoMatch).source + "|" + interpolate.source + "|" + (interpolate === reInterpolate ? reEsTemplate : reNoMatch).source + "|" + (options.evaluate || reNoMatch).source + "|$", "g");
+        var reDelimiters = RegExp2(
+          (options.escape || reNoMatch).source + "|" + interpolate.source + "|" + (interpolate === reInterpolate ? reEsTemplate : reNoMatch).source + "|" + (options.evaluate || reNoMatch).source + "|$",
+          "g"
+        );
         var sourceURL = "//# sourceURL=" + (hasOwnProperty.call(options, "sourceURL") ? (options.sourceURL + "").replace(/\s/g, " ") : "lodash.templateSources[" + ++templateCounter + "]") + "\n";
         string3.replace(reDelimiters, function(match, escapeValue, interpolateValue, esTemplateValue, evaluateValue, offset2) {
           interpolateValue || (interpolateValue = esTemplateValue);
@@ -7577,7 +7612,8 @@ const commonProps = {
     default: true
   }
 };
-const checkboxProps = __spreadProps(__spreadValues({}, commonProps), {
+const checkboxProps = {
+  ...commonProps,
   checked: {
     type: Boolean,
     default: false
@@ -7607,8 +7643,9 @@ const checkboxProps = __spreadProps(__spreadValues({}, commonProps), {
     type: Boolean,
     default: false
   }
-});
-const checkboxGroupProps = __spreadProps(__spreadValues({}, commonProps), {
+};
+const checkboxGroupProps = {
+  ...commonProps,
   modelValue: {
     type: Array,
     required: true
@@ -7645,7 +7682,7 @@ const checkboxGroupProps = __spreadProps(__spreadValues({}, commonProps), {
     type: String,
     default: ""
   }
-});
+};
 const checkboxGroupInjectionKey = Symbol("d-checkbox-group");
 const formProps = {
   data: {
@@ -7701,6 +7738,10 @@ const formProps = {
   appendToBodyScrollStrategy: {
     type: String,
     default: "reposition"
+  },
+  requirePosition: {
+    type: String,
+    default: "left"
   }
 };
 const FORM_TOKEN = "dForm";
@@ -7737,7 +7778,10 @@ function useFormValidation(itemContexts) {
       try {
         await field.validate("");
       } catch (err) {
-        errors = __spreadValues(__spreadValues({}, errors), err);
+        errors = {
+          ...errors,
+          ...err
+        };
       }
     }
     if (!Object.keys(errors).length) {
@@ -7794,11 +7838,12 @@ defineComponent({
     }, {
       deep: true
     });
-    provide(FORM_TOKEN, reactive(__spreadProps(__spreadValues({}, toRefs(props)), {
+    provide(FORM_TOKEN, reactive({
+      ...toRefs(props),
       emit: ctx.emit,
       addItemContext,
       removeItemContext
-    })));
+    }));
     provide(STYLE_TOKEN, props.styleType);
     ctx.expose({
       validate,
@@ -7865,11 +7910,7 @@ const popoverProps = {
   },
   position: {
     type: Array,
-    default: ["bottom"]
-  },
-  align: {
-    type: String,
-    default: null
+    default: () => ["top", "right", "bottom", "left"]
   },
   offset: {
     type: [Number, Object],
@@ -7940,6 +7981,7 @@ function usePopover(props, visible, placement, origin, popoverRef) {
 function usePopoverEvent(props, visible, origin) {
   const { trigger, position, mouseEnterDelay, mouseLeaveDelay, disabled } = toRefs(props);
   const isClick = computed(() => trigger.value === "click");
+  const isHover = computed(() => trigger.value === "hover");
   const placement = ref(position.value[0].split("-")[0]);
   const isEnter = ref(false);
   const onClick = () => {
@@ -7958,13 +8000,13 @@ function usePopoverEvent(props, visible, origin) {
     if (disabled.value) {
       return;
     }
-    if (!isClick.value) {
+    if (isHover.value) {
       isEnter.value = true;
       enter();
     }
   };
   const onMouseleave = () => {
-    if (!isClick.value) {
+    if (isHover.value) {
       isEnter.value = false;
       leave();
     }
@@ -8114,7 +8156,6 @@ var Popover = defineComponent({
       content,
       popType,
       position,
-      align,
       offset: offset2,
       showAnimation
     } = toRefs(props);
@@ -8156,7 +8197,6 @@ var Popover = defineComponent({
           "ref": popoverRef,
           "origin": origin.value,
           "position": position.value,
-          "align": align.value,
           "offset": offset2.value,
           "class": [ns2.e("content"), popType.value !== "default" ? "is-icon" : ""],
           "show-arrow": true,
@@ -8278,14 +8318,15 @@ function useFormLabel() {
   }));
   const labelInnerClasses = computed(() => ({
     [`${ns2.e("label-span")}`]: true,
-    [`${ns2.em("label", "required")}`]: formItemContext.isRequired,
+    [`${ns2.em("label", "required")}`]: formItemContext.isRequired && labelData.value.requiredPosition === "left",
+    [`${ns2.em("label", "required-right")}`]: formItemContext.isRequired && labelData.value.requiredPosition === "right",
     [`${ns2.em("label", "required-hide")}`]: formItemContext.isRequired && formContext.hideRequiredMark
   }));
   const tipsPopover = computed(() => {
     if (typeof labelData.value.helpTips === "string") {
-      return __spreadProps(__spreadValues({}, defaultTipsPopover), { content: labelData.value.helpTips });
+      return { ...defaultTipsPopover, content: labelData.value.helpTips };
     } else {
-      return __spreadValues(__spreadValues({}, defaultTipsPopover), labelData.value.helpTips);
+      return { ...defaultTipsPopover, ...labelData.value.helpTips };
     }
   });
   return { labelClasses, labelInnerClasses, tipsPopover };
@@ -8415,7 +8456,7 @@ var FormControl = defineComponent({
   }
 });
 function _extends() {
-  _extends = Object.assign || function(target) {
+  _extends = Object.assign ? Object.assign.bind() : function(target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
       for (var key in source) {
@@ -8434,13 +8475,13 @@ function _inheritsLoose(subClass, superClass) {
   _setPrototypeOf(subClass, superClass);
 }
 function _getPrototypeOf(o) {
-  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf2(o2) {
+  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf2(o2) {
     return o2.__proto__ || Object.getPrototypeOf(o2);
   };
   return _getPrototypeOf(o);
 }
 function _setPrototypeOf(o, p) {
-  _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf2(o2, p2) {
+  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf2(o2, p2) {
     o2.__proto__ = p2;
     return o2;
   };
@@ -8463,7 +8504,7 @@ function _isNativeReflectConstruct() {
 }
 function _construct(Parent, args, Class) {
   if (_isNativeReflectConstruct()) {
-    _construct = Reflect.construct;
+    _construct = Reflect.construct.bind();
   } else {
     _construct = function _construct2(Parent2, args2, Class2) {
       var a = [null];
@@ -8741,9 +8782,45 @@ var whitespace = function whitespace2(rule, value, source, errors, options) {
     errors.push(format(options.messages.whitespace, rule.fullField));
   }
 };
+var urlReg;
+var getUrlRegex = function() {
+  if (urlReg) {
+    return urlReg;
+  }
+  var word = "[a-fA-F\\d:]";
+  var b = function b2(options) {
+    return options && options.includeBoundaries ? "(?:(?<=\\s|^)(?=" + word + ")|(?<=" + word + ")(?=\\s|$))" : "";
+  };
+  var v4 = "(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}";
+  var v6seg = "[a-fA-F\\d]{1,4}";
+  var v6 = ("\n(?:\n(?:" + v6seg + ":){7}(?:" + v6seg + "|:)|                                    // 1:2:3:4:5:6:7::  1:2:3:4:5:6:7:8\n(?:" + v6seg + ":){6}(?:" + v4 + "|:" + v6seg + "|:)|                             // 1:2:3:4:5:6::    1:2:3:4:5:6::8   1:2:3:4:5:6::8  1:2:3:4:5:6::1.2.3.4\n(?:" + v6seg + ":){5}(?::" + v4 + "|(?::" + v6seg + "){1,2}|:)|                   // 1:2:3:4:5::      1:2:3:4:5::7:8   1:2:3:4:5::8    1:2:3:4:5::7:1.2.3.4\n(?:" + v6seg + ":){4}(?:(?::" + v6seg + "){0,1}:" + v4 + "|(?::" + v6seg + "){1,3}|:)| // 1:2:3:4::        1:2:3:4::6:7:8   1:2:3:4::8      1:2:3:4::6:7:1.2.3.4\n(?:" + v6seg + ":){3}(?:(?::" + v6seg + "){0,2}:" + v4 + "|(?::" + v6seg + "){1,4}|:)| // 1:2:3::          1:2:3::5:6:7:8   1:2:3::8        1:2:3::5:6:7:1.2.3.4\n(?:" + v6seg + ":){2}(?:(?::" + v6seg + "){0,3}:" + v4 + "|(?::" + v6seg + "){1,5}|:)| // 1:2::            1:2::4:5:6:7:8   1:2::8          1:2::4:5:6:7:1.2.3.4\n(?:" + v6seg + ":){1}(?:(?::" + v6seg + "){0,4}:" + v4 + "|(?::" + v6seg + "){1,6}|:)| // 1::              1::3:4:5:6:7:8   1::8            1::3:4:5:6:7:1.2.3.4\n(?::(?:(?::" + v6seg + "){0,5}:" + v4 + "|(?::" + v6seg + "){1,7}|:))             // ::2:3:4:5:6:7:8  ::2:3:4:5:6:7:8  ::8             ::1.2.3.4\n)(?:%[0-9a-zA-Z]{1,})?                                             // %eth0            %1\n").replace(/\s*\/\/.*$/gm, "").replace(/\n/g, "").trim();
+  var v46Exact = new RegExp("(?:^" + v4 + "$)|(?:^" + v6 + "$)");
+  var v4exact = new RegExp("^" + v4 + "$");
+  var v6exact = new RegExp("^" + v6 + "$");
+  var ip = function ip2(options) {
+    return options && options.exact ? v46Exact : new RegExp("(?:" + b(options) + v4 + b(options) + ")|(?:" + b(options) + v6 + b(options) + ")", "g");
+  };
+  ip.v4 = function(options) {
+    return options && options.exact ? v4exact : new RegExp("" + b(options) + v4 + b(options), "g");
+  };
+  ip.v6 = function(options) {
+    return options && options.exact ? v6exact : new RegExp("" + b(options) + v6 + b(options), "g");
+  };
+  var protocol = "(?:(?:[a-z]+:)?//)";
+  var auth = "(?:\\S+(?::\\S*)?@)?";
+  var ipv4 = ip.v4().source;
+  var ipv6 = ip.v6().source;
+  var host = "(?:(?:[a-z\\u00a1-\\uffff0-9][-_]*)*[a-z\\u00a1-\\uffff0-9]+)";
+  var domain = "(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*";
+  var tld = "(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))";
+  var port = "(?::\\d{2,5})?";
+  var path = '(?:[/?#][^\\s"]*)?';
+  var regex = "(?:" + protocol + "|www\\.)" + auth + "(?:localhost|" + ipv4 + "|" + ipv6 + "|" + host + domain + tld + ")" + port + path;
+  urlReg = new RegExp("(?:^" + regex + "$)", "i");
+  return urlReg;
+};
 var pattern$2 = {
   email: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+\.)+[a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]{2,}))$/,
-  url: new RegExp("^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$", "i"),
   hex: /^#?([a-f0-9]{6}|[a-f0-9]{3})$/i
 };
 var types = {
@@ -8785,7 +8862,7 @@ var types = {
     return typeof value === "string" && value.length <= 320 && !!value.match(pattern$2.email);
   },
   url: function url(value) {
-    return typeof value === "string" && value.length <= 2048 && !!value.match(pattern$2.url);
+    return typeof value === "string" && value.length <= 2048 && !!value.match(getUrlRegex());
   },
   hex: function hex(value) {
     return typeof value === "string" && !!value.match(pattern$2.hex);
@@ -9360,7 +9437,17 @@ var Schema = /* @__PURE__ */ function() {
       if (rule.asyncValidator) {
         res = rule.asyncValidator(rule, data.value, cb, data.source, options);
       } else if (rule.validator) {
-        res = rule.validator(rule, data.value, cb, data.source, options);
+        try {
+          res = rule.validator(rule, data.value, cb, data.source, options);
+        } catch (error) {
+          console.error == null ? void 0 : console.error(error);
+          if (!options.suppressValidatorError) {
+            setTimeout(function() {
+              throw error;
+            }, 0);
+          }
+          cb(error.message);
+        }
         if (res === true) {
           cb();
         } else if (res === false) {
@@ -9481,10 +9568,7 @@ function useFormItemValidate(props, _rules) {
       } else {
         return rule.trigger === triggerVal;
       }
-    }).map((_a) => {
-      var rule = __objRest(_a, []);
-      return rule;
-    });
+    }).map(({ ...rule }) => rule);
   };
   const onValidateSuccess = () => {
     validateState.value = "success";
@@ -9559,15 +9643,12 @@ defineComponent({
   props: formItemProps,
   setup(props, ctx) {
     const formContext = inject(FORM_TOKEN);
-    const _a = toRefs(props), {
+    const {
       messageType: itemMessageType,
       popPosition: itemPopPosition,
-      showFeedback: itemShowFeedback
-    } = _a, otherProps = __objRest(_a, [
-      "messageType",
-      "popPosition",
-      "showFeedback"
-    ]);
+      showFeedback: itemShowFeedback,
+      ...otherProps
+    } = toRefs(props);
     const {
       label,
       helpTips,
@@ -9595,11 +9676,13 @@ defineComponent({
       layout: formContext.layout,
       labelSize: formContext.labelSize,
       labelAlign: formContext.labelAlign,
+      requiredPosition: formContext.requirePosition,
       helpTips: helpTips.value,
       formItemCtx: ctx
     }));
     provide(LABEL_DATA, labelData);
-    const context = reactive(__spreadProps(__spreadValues({}, otherProps), {
+    const context = reactive({
+      ...otherProps,
       showFeedback,
       messageType,
       popPosition,
@@ -9609,7 +9692,7 @@ defineComponent({
       validate,
       resetField,
       clearValidate
-    }));
+    });
     provide(FORM_ITEM_TOKEN, context);
     ctx.expose({
       validate,
@@ -9633,8 +9716,8 @@ defineComponent({
       "extra-info": extraInfo.value
     }, {
       default: () => {
-        var _a2, _b;
-        return [(_b = (_a2 = ctx.slots).default) == null ? void 0 : _b.call(_a2)];
+        var _a, _b;
+        return [(_b = (_a = ctx.slots).default) == null ? void 0 : _b.call(_a)];
       }
     })]);
   }
@@ -9721,10 +9804,13 @@ function useCheckbox(props, ctx) {
     var _a;
     return (_a = checkboxGroupConf == null ? void 0 : checkboxGroupConf.border.value) != null ? _a : props.border;
   });
-  watch(() => props.modelValue, () => {
-    formItemContext == null ? void 0 : formItemContext.validate("change").catch(() => {
-    });
-  });
+  watch(
+    () => props.modelValue,
+    () => {
+      formItemContext == null ? void 0 : formItemContext.validate("change").catch(() => {
+      });
+    }
+  );
   return {
     mergedChecked,
     mergedDisabled,
@@ -9780,10 +9866,14 @@ function useCheckboxGroup(props, ctx) {
       return valList.value.some((item) => item.value === itemVal);
     }
   };
-  watch(() => props.modelValue, () => {
-    formItemContext == null ? void 0 : formItemContext.validate("change").catch(() => {
-    });
-  }, { deep: true });
+  watch(
+    () => props.modelValue,
+    () => {
+      formItemContext == null ? void 0 : formItemContext.validate("change").catch(() => {
+      });
+    },
+    { deep: true }
+  );
   const checkboxGroupSize = computed(() => props.size || (formContext == null ? void 0 : formContext.size) || "md");
   provide(checkboxGroupInjectionKey, {
     disabled: toRef(props, "disabled"),
@@ -9950,9 +10040,10 @@ defineComponent({
                   value: opt
                 });
               } else if (typeof opt === "object") {
-                mergedOpt = Object.assign({}, defaultOpt, __spreadProps(__spreadValues({}, opt), {
+                mergedOpt = Object.assign({}, defaultOpt, {
+                  ...opt,
                   label: opt.name
-                }));
+                });
               }
               return createVNode(Checkbox, mergedOpt, null);
             });
@@ -10047,11 +10138,15 @@ function useFilterRender(ctx) {
       "filter-icon-active": Boolean(singleVal.value || ((_a = multipleVal.value) == null ? void 0 : _a.length))
     };
   });
-  onClickOutside(filterMenuRef, () => {
-    showMenu.value = false;
-  }, {
-    ignore: [filterIconRef]
-  });
+  onClickOutside(
+    filterMenuRef,
+    () => {
+      showMenu.value = false;
+    },
+    {
+      ignore: [filterIconRef]
+    }
+  );
   return { showMenu, filterMenuRef, filterIconRef, iconClasses, handleIconClick, handleConfirm, handleSelect };
 }
 function useFilterMultiple(filterList, ctx) {
@@ -10068,21 +10163,25 @@ function useFilterMultiple(filterList, ctx) {
   });
   const _halfChecked = ref(false);
   filterList == null ? void 0 : filterList.forEach((item) => {
-    _checkList.value.push(__spreadValues({ checked: false }, item));
+    _checkList.value.push({ checked: false, ...item });
   });
-  watch(_checkList, (list2) => {
-    if (!list2.length) {
-      return;
-    }
-    let allTrue = true;
-    let allFalse = true;
-    for (let i = 0; i < list2.length; i++) {
-      allTrue && (allTrue = Boolean(list2[i].checked));
-      allFalse && (allFalse = Boolean(!list2[i].checked));
-    }
-    _checkAllRecord.value = allTrue;
-    _halfChecked.value = !(allFalse || allTrue);
-  }, { immediate: true, deep: true });
+  watch(
+    _checkList,
+    (list2) => {
+      if (!list2.length) {
+        return;
+      }
+      let allTrue = true;
+      let allFalse = true;
+      for (let i = 0; i < list2.length; i++) {
+        allTrue && (allTrue = Boolean(list2[i].checked));
+        allFalse && (allFalse = Boolean(!list2[i].checked));
+      }
+      _checkAllRecord.value = allTrue;
+      _halfChecked.value = !(allFalse || allTrue);
+    },
+    { immediate: true, deep: true }
+  );
   const getCheckedItems = () => {
     return _checkList.value.filter((item) => item.checked);
   };
@@ -10757,11 +10856,7 @@ const tooltipProps = {
   },
   position: {
     type: [String, Array],
-    default: "top"
-  },
-  align: {
-    type: String,
-    default: null
+    default: () => ["top", "right", "bottom", "left"]
   },
   showAnimation: {
     type: Boolean,
@@ -10874,7 +10969,6 @@ var Tooltip = defineComponent({
     const {
       showAnimation,
       content,
-      align,
       overlayClass,
       teleport
     } = toRefs(props);
@@ -10915,7 +11009,6 @@ var Tooltip = defineComponent({
           "class": className.value,
           "origin": origin.value,
           "position": positionArr.value,
-          "align": align.value,
           "offset": 6,
           "show-arrow": true,
           "style": overlayStyles.value,
@@ -11111,14 +11204,17 @@ function useLazyLoad() {
   let lazyObserver;
   onMounted(() => {
     if (lazy) {
-      lazyObserver = new IntersectionObserver((entries) => {
-        const lazyFlagOb = entries[0];
-        if (lazyFlagOb.isIntersecting) {
-          table2.emit("load-more");
+      lazyObserver = new IntersectionObserver(
+        (entries) => {
+          const lazyFlagOb = entries[0];
+          if (lazyFlagOb.isIntersecting) {
+            table2.emit("load-more");
+          }
+        },
+        {
+          root: table2.tableRef.value
         }
-      }, {
-        root: table2.tableRef.value
-      });
+      );
       lazyObserver.observe(lazyFlagRef.value);
     }
   });
@@ -11648,43 +11744,79 @@ function createColumn(id, props, ctx) {
     }
     return cellMap[type4.value || "default"].renderCell(rowData, columnItem, store, rowIndex, tableProps2, cellMode, ctx);
   }
-  watch([field, header2, order], ([fieldVal, headerVal, orderVal]) => {
-    column2.field = fieldVal;
-    column2.header = headerVal;
-    column2.order = orderVal;
-  }, { immediate: true });
-  watch([sortable, sortDirection, sortMethod], ([sortableVal, sortDirectionVal, sortMethodVal]) => {
-    column2.sortable = sortableVal;
-    column2.sortDirection = sortDirectionVal;
-    column2.sortMethod = sortMethodVal;
-  }, { immediate: true });
-  watch([filterable, filterList, filterMultiple], ([filterableVal, filterListVal, filterMultipleVal]) => {
-    column2.filterable = filterableVal;
-    column2.filterMultiple = filterMultipleVal;
-    column2.filterList = filterListVal;
-  }, { immediate: true });
-  watch([fixedLeft, fixedRight], ([left, right]) => {
-    column2.fixedLeft = left;
-    column2.fixedRight = right;
-  }, { immediate: true });
-  watch(align, (alignVal) => {
-    column2.align = alignVal;
-  }, { immediate: true });
-  watch(cellClass, (cellClassVal) => {
-    column2.cellClass = cellClassVal;
-  }, { immediate: true });
-  watch(showOverflowTooltip, (showVal) => {
-    column2.showOverflowTooltip = showVal;
-  }, { immediate: true });
-  watch(resizeable, (resizeVal) => {
-    column2.resizeable = resizeVal;
-  }, { immediate: true });
-  watch([width, minWidth, maxWidth], ([widthVal, minWidthVal, maxWidthVal]) => {
-    column2.width = formatWidth(widthVal);
-    column2.minWidth = minWidthVal;
-    column2.maxWidth = maxWidthVal;
-    column2.realWidth = column2.width;
-  }, { immediate: true });
+  watch(
+    [field, header2, order],
+    ([fieldVal, headerVal, orderVal]) => {
+      column2.field = fieldVal;
+      column2.header = headerVal;
+      column2.order = orderVal;
+    },
+    { immediate: true }
+  );
+  watch(
+    [sortable, sortDirection, sortMethod],
+    ([sortableVal, sortDirectionVal, sortMethodVal]) => {
+      column2.sortable = sortableVal;
+      column2.sortDirection = sortDirectionVal;
+      column2.sortMethod = sortMethodVal;
+    },
+    { immediate: true }
+  );
+  watch(
+    [filterable, filterList, filterMultiple],
+    ([filterableVal, filterListVal, filterMultipleVal]) => {
+      column2.filterable = filterableVal;
+      column2.filterMultiple = filterMultipleVal;
+      column2.filterList = filterListVal;
+    },
+    { immediate: true }
+  );
+  watch(
+    [fixedLeft, fixedRight],
+    ([left, right]) => {
+      column2.fixedLeft = left;
+      column2.fixedRight = right;
+    },
+    { immediate: true }
+  );
+  watch(
+    align,
+    (alignVal) => {
+      column2.align = alignVal;
+    },
+    { immediate: true }
+  );
+  watch(
+    cellClass,
+    (cellClassVal) => {
+      column2.cellClass = cellClassVal;
+    },
+    { immediate: true }
+  );
+  watch(
+    showOverflowTooltip,
+    (showVal) => {
+      column2.showOverflowTooltip = showVal;
+    },
+    { immediate: true }
+  );
+  watch(
+    resizeable,
+    (resizeVal) => {
+      column2.resizeable = resizeVal;
+    },
+    { immediate: true }
+  );
+  watch(
+    [width, minWidth, maxWidth],
+    ([widthVal, minWidthVal, maxWidthVal]) => {
+      column2.width = formatWidth(widthVal);
+      column2.minWidth = minWidthVal;
+      column2.maxWidth = maxWidthVal;
+      column2.realWidth = column2.width;
+    },
+    { immediate: true }
+  );
   onBeforeMount(() => {
     column2.id = id;
     column2.renderHeader = renderHeader;