vue-devui 1.6.17 → 1.6.19

package/switch/index.es.js

@@ -1,35 +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;
-};
-import { defineComponent, watch, provide, reactive, toRefs, createVNode, onUnmounted, Transition, mergeProps, ref, computed, unref, nextTick, withModifiers, Comment, Text, h, Fragment, inject, withDirectives, cloneVNode, onMounted, Teleport, createTextVNode, onBeforeUnmount, renderSlot, useSlots } from "vue";
+import { defineComponent, watch, provide, reactive, toRefs, createVNode, onUnmounted, Transition, mergeProps, ref, computed, nextTick, unref, withModifiers, Comment, Text, Fragment, h, inject, withDirectives, cloneVNode, onMounted, Teleport, createTextVNode, onBeforeUnmount, renderSlot, useSlots } from "vue";
 import "clipboard";
 import { offset, flip, arrow, computePosition } from "@floating-ui/dom";
 const switchProps = {
@@ -161,6 +130,10 @@ const formProps = {
   appendToBodyScrollStrategy: {
     type: String,
     default: "reposition"
+  },
+  requirePosition: {
+    type: String,
+    default: "left"
   }
 };
 const FORM_TOKEN = "dForm";
@@ -885,8 +858,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");
@@ -896,11 +871,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"), Set = 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"), Set = 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(Set), weakMapCtorString = toSource(WeakMap2);
+      var dataViewCtorString = toSource(DataView), mapCtorString = toSource(Map2), promiseCtorString = toSource(Promise2), setCtorString = toSource(Set), 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)) {
@@ -2148,7 +2123,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) {
@@ -2367,7 +2342,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);
@@ -2445,7 +2431,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;
@@ -2730,7 +2727,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;
@@ -2892,7 +2889,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 || Set && getTag(new Set()) != 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 || Set && getTag(new Set()) != 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) {
@@ -4765,7 +4762,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);
@@ -5609,7 +5609,10 @@ function useFormValidation(itemContexts) {
       try {
         await field.validate("");
       } catch (err) {
-        errors = __spreadValues(__spreadValues({}, errors), err);
+        errors = {
+          ...errors,
+          ...err
+        };
       }
     }
     if (!Object.keys(errors).length) {
@@ -5666,11 +5669,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,
@@ -5756,13 +5760,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 };
 }
@@ -5953,18 +5960,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);
@@ -6014,6 +6024,11 @@ const FlexibleOverlay = defineComponent({
   }
 });
 const POPPER_TRIGGER_TOKEN = Symbol("popper-trigger");
+/**
+* @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$1 = useNamespace("popper-trigger");
 function wrapContent(content) {
@@ -6076,11 +6091,7 @@ const popoverProps = {
   },
   position: {
     type: Array,
-    default: ["bottom"]
-  },
-  align: {
-    type: String,
-    default: null
+    default: () => ["top", "right", "bottom", "left"]
   },
   offset: {
     type: [Number, Object],
@@ -6151,6 +6162,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 = () => {
@@ -6169,13 +6181,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();
     }
@@ -6325,7 +6337,6 @@ var Popover = defineComponent({
       content,
       popType,
       position,
-      align,
       offset: offset2,
       showAnimation
     } = toRefs(props);
@@ -6367,7 +6378,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,
@@ -6489,14 +6499,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 };
@@ -6626,7 +6637,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) {
@@ -6645,13 +6656,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;
   };
@@ -6674,7 +6685,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];
@@ -6952,9 +6963,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 = {
@@ -6996,7 +7043,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);
@@ -7571,7 +7618,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) {
@@ -7692,10 +7749,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";
@@ -7770,15 +7824,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,
@@ -7806,11 +7857,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,
@@ -7820,7 +7873,7 @@ defineComponent({
       validate,
       resetField,
       clearValidate
-    }));
+    });
     provide(FORM_ITEM_TOKEN, context);
     ctx.expose({
       validate,
@@ -7844,8 +7897,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)];
       }
     })]);
   }