element-plus 2.4.0 → 2.4.2

package/dist/index.full.mjs

@@ -1,4 +1,4 @@
-/*! Element Plus v2.4.0 */
+/*! Element Plus v2.4.2 */
 
 import { getCurrentScope, onScopeDispose, unref, readonly, shallowRef, watchEffect, ref, watch, getCurrentInstance, onMounted, nextTick, computed as computed$1, openBlock, createElementBlock, createElementVNode, warn, isVNode, Fragment, Comment, onBeforeUnmount, isRef, inject, onUnmounted, h as h$1, Teleport, onBeforeMount, provide, defineComponent, renderSlot, normalizeClass, normalizeStyle, mergeProps, useSlots, createBlock, Transition, withCtx, withDirectives, resolveDynamicComponent, createCommentVNode, createTextVNode, toDisplayString, createVNode, vShow, toRef, reactive, toRefs, onUpdated, TransitionGroup, useAttrs as useAttrs$1, withModifiers, cloneVNode, Text as Text$1, onDeactivated, renderList, withKeys, createSlots, normalizeProps, toRaw as toRaw$1, vModelCheckbox, vModelRadio, resolveComponent, onBeforeUpdate, vModelText, toHandlers, guardReactiveProps, markRaw, effectScope, triggerRef, resolveDirective, createApp, shallowReactive, render } from 'vue';
 
@@ -8846,7 +8846,9 @@ const useDraggable = (targetRef, dragRef, draggable) => {
         offsetX: moveX,
         offsetY: moveY
       };
-      targetRef.value.style.transform = `translate(${addUnit(moveX)}, ${addUnit(moveY)})`;
+      if (targetRef.value) {
+        targetRef.value.style.transform = `translate(${addUnit(moveX)}, ${addUnit(moveY)})`;
+      }
     };
     const onMouseup = () => {
       document.removeEventListener("mousemove", onMousemove);
@@ -11287,7 +11289,7 @@ const ConfigProvider = defineComponent({
 
 const ElConfigProvider = withInstall(ConfigProvider);
 
-const version$1 = "2.4.0";
+const version$1 = "2.4.2";
 
 const makeInstaller = (components = []) => {
   const install = (app, options) => {
@@ -21034,7 +21036,8 @@ const useCarousel = (props, emit, componentName) => {
   }
   function resetTimer() {
     pauseTimer();
-    startTimer();
+    if (!props.pauseOnHover)
+      startTimer();
   }
   function setContainerHeight(height) {
     if (props.height !== "auto")
@@ -29247,6 +29250,7 @@ const dialogEmits = {
 };
 
 const useDialog = (props, targetRef) => {
+  var _a;
   const instance = getCurrentInstance();
   const emit = instance.emit;
   const { nextZIndex } = useZIndex();
@@ -29256,7 +29260,7 @@ const useDialog = (props, targetRef) => {
   const visible = ref(false);
   const closed = ref(false);
   const rendered = ref(false);
-  const zIndex = ref(props.zIndex || nextZIndex());
+  const zIndex = ref((_a = props.zIndex) != null ? _a : nextZIndex());
   let openTimer = void 0;
   let closeTimer = void 0;
   const namespace = useGlobalConfig("namespace", defaultNamespace);
@@ -29343,8 +29347,8 @@ const useDialog = (props, targetRef) => {
     emit("closeAutoFocus");
   }
   function onFocusoutPrevented(event) {
-    var _a;
-    if (((_a = event.detail) == null ? void 0 : _a.focusReason) === "pointer") {
+    var _a2;
+    if (((_a2 = event.detail) == null ? void 0 : _a2.focusReason) === "pointer") {
       event.preventDefault();
     }
   }
@@ -29361,7 +29365,7 @@ const useDialog = (props, targetRef) => {
       closed.value = false;
       open();
       rendered.value = true;
-      zIndex.value = props.zIndex ? zIndex.value++ : nextZIndex();
+      zIndex.value = isUndefined$1(props.zIndex) ? nextZIndex() : zIndex.value++;
       nextTick(() => {
         emit("open");
         if (targetRef.value) {
@@ -33842,7 +33846,7 @@ const useSelect$3 = (props, states, ctx) => {
       originClientHeight = originClientHeight || (input2.clientHeight > 0 ? input2.clientHeight + 2 : 0);
       const _tags = tags.value;
       const cssVarOfSelectSize = getComputedStyle(input2).getPropertyValue(ns.cssVarName("input-height"));
-      const gotSize = cssVarOfSelectSize || getComponentSize(selectSize.value || (form == null ? void 0 : form.size));
+      const gotSize = Number.parseFloat(cssVarOfSelectSize) || getComponentSize(selectSize.value || (form == null ? void 0 : form.size));
       const sizeInMap = selectSize.value || gotSize === originClientHeight || originClientHeight <= 0 ? gotSize : originClientHeight;
       const isElHidden = input2.offsetParent === null;
       !isElHidden && (input2.style.height = `${(states.selected.length === 0 ? sizeInMap : Math.max(_tags ? _tags.clientHeight + (_tags.clientHeight > sizeInMap ? 6 : 0) : 0, sizeInMap)) - 2}px`);
@@ -36746,16 +36750,20 @@ const _sfc_main$G = /* @__PURE__ */ defineComponent({
                     [vShow, !(item <= currentValue.value)]
                   ])
                 ], 64)) : createCommentVNode("v-if", true),
-                showDecimalIcon(item) ? (openBlock(), createBlock(unref(ElIcon), {
-                  key: 1,
-                  style: normalizeStyle(unref(decimalStyle)),
-                  class: normalizeClass([unref(ns).e("icon"), unref(ns).e("decimal")])
-                }, {
-                  default: withCtx(() => [
-                    (openBlock(), createBlock(resolveDynamicComponent(unref(decimalIconComponent))))
-                  ]),
-                  _: 1
-                }, 8, ["style", "class"])) : createCommentVNode("v-if", true)
+                showDecimalIcon(item) ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+                  (openBlock(), createBlock(resolveDynamicComponent(unref(voidComponent)), {
+                    class: normalizeClass([unref(ns).em("decimal", "box")])
+                  }, null, 8, ["class"])),
+                  createVNode(unref(ElIcon), {
+                    style: normalizeStyle(unref(decimalStyle)),
+                    class: normalizeClass([unref(ns).e("icon"), unref(ns).e("decimal")])
+                  }, {
+                    default: withCtx(() => [
+                      (openBlock(), createBlock(resolveDynamicComponent(unref(decimalIconComponent))))
+                    ]),
+                    _: 1
+                  }, 8, ["style", "class"])
+                ], 64)) : createCommentVNode("v-if", true)
               ]),
               _: 2
             }, 1032, ["class"])
@@ -38714,20 +38722,41 @@ function useOption(props, { emit }) {
   };
 }
 
-const SelectProps = {
+const defaultProps$4 = {
+  label: "label",
+  value: "value",
+  disabled: "disabled",
+  options: "options"
+};
+function useProps(props) {
+  const aliasProps = computed$1(() => ({ ...defaultProps$4, ...props.props }));
+  const getLabel = (option) => get(option, aliasProps.value.label);
+  const getValue = (option) => get(option, aliasProps.value.value);
+  const getDisabled = (option) => get(option, aliasProps.value.disabled);
+  const getOptions = (option) => get(option, aliasProps.value.options);
+  return {
+    aliasProps,
+    getLabel,
+    getValue,
+    getDisabled,
+    getOptions
+  };
+}
+
+const SelectProps = buildProps({
   allowCreate: Boolean,
   autocomplete: {
-    type: String,
+    type: definePropType(String),
     default: "none"
   },
   automaticDropdown: Boolean,
   clearable: Boolean,
   clearIcon: {
-    type: [String, Object],
+    type: iconPropType,
     default: circle_close_default
   },
   effect: {
-    type: String,
+    type: definePropType(String),
     default: "light"
   },
   collapseTags: Boolean,
@@ -38759,7 +38788,9 @@ const SelectProps = {
   loading: Boolean,
   loadingText: String,
   label: String,
-  modelValue: [Array, String, Number, Boolean, Object],
+  modelValue: {
+    type: definePropType([Array, String, Number, Boolean, Object])
+  },
   multiple: Boolean,
   multipleLimit: {
     type: Number,
@@ -38774,7 +38805,7 @@ const SelectProps = {
     default: true
   },
   options: {
-    type: Array,
+    type: definePropType(Array),
     required: true
   },
   placeholder: {
@@ -38790,13 +38821,14 @@ const SelectProps = {
     default: ""
   },
   popperOptions: {
-    type: Object,
+    type: definePropType(Object),
     default: () => ({})
   },
   remote: Boolean,
-  size: {
-    type: String,
-    validator: isValidComponentSize
+  size: useSizeProp,
+  props: {
+    type: definePropType(Object),
+    default: () => defaultProps$4
   },
   valueKey: {
     type: String,
@@ -38815,28 +38847,36 @@ const SelectProps = {
     values: Ee,
     default: "bottom-start"
   }
-};
-const OptionProps = {
+});
+const OptionProps = buildProps({
   data: Array,
   disabled: Boolean,
   hovering: Boolean,
-  item: Object,
+  item: {
+    type: definePropType(Object),
+    required: true
+  },
   index: Number,
   style: Object,
   selected: Boolean,
   created: Boolean
-};
+});
+
+const selectV2InjectionKey = Symbol("ElSelectV2Injection");
 
 const _sfc_main$D = defineComponent({
   props: OptionProps,
   emits: ["select", "hover"],
   setup(props, { emit }) {
+    const select = inject(selectV2InjectionKey);
     const ns = useNamespace("select");
     const { hoverItem, selectOptionClick } = useOption(props, { emit });
+    const { getLabel } = useProps(select.props);
     return {
       ns,
       hoverItem,
-      selectOptionClick
+      selectOptionClick,
+      getLabel
     };
   }
 });
@@ -38860,14 +38900,12 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
       index: _ctx.index,
       disabled: _ctx.disabled
     }, () => [
-      createElementVNode("span", null, toDisplayString(_ctx.item.label), 1)
+      createElementVNode("span", null, toDisplayString(_ctx.getLabel(_ctx.item)), 1)
     ])
   ], 46, _hoisted_1$h);
 }
 var OptionItem = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["render", _sfc_render$6], ["__file", "option-item.vue"]]);
 
-const selectV2InjectionKey = Symbol("ElSelectV2Injection");
-
 var ElSelectMenu = defineComponent({
   name: "ElSelectDropdown",
   props: {
@@ -38884,6 +38922,11 @@ var ElSelectMenu = defineComponent({
   }) {
     const select = inject(selectV2InjectionKey);
     const ns = useNamespace("select");
+    const {
+      getLabel,
+      getValue,
+      getDisabled
+    } = useProps(select.props);
     const cachedHeights = ref([]);
     const listRef = ref();
     const size = computed$1(() => props.data.length);
@@ -38928,9 +38971,9 @@ var ElSelectMenu = defineComponent({
     };
     const isItemSelected = (modelValue, target) => {
       if (select.props.multiple) {
-        return contains(modelValue, target.value);
+        return contains(modelValue, getValue(target));
       }
-      return isEqual(modelValue, target.value);
+      return isEqual(modelValue, getValue(target));
     };
     const isItemDisabled = (modelValue, selected) => {
       const {
@@ -38993,7 +39036,7 @@ var ElSelectMenu = defineComponent({
       const isHovering = isItemHovering(index);
       return createVNode(OptionItem, mergeProps(itemProps, {
         "selected": isSelected,
-        "disabled": item.disabled || isDisabled,
+        "disabled": getDisabled(item) || isDisabled,
         "created": !!item.created,
         "hovering": isHovering,
         "item": item,
@@ -39002,7 +39045,7 @@ var ElSelectMenu = defineComponent({
       }), {
         default: (props2) => {
           var _a;
-          return ((_a = slots.default) == null ? void 0 : _a.call(slots, props2)) || createVNode("span", null, [item.label]);
+          return ((_a = slots.default) == null ? void 0 : _a.call(slots, props2)) || createVNode("span", null, [getLabel(item)]);
         }
       });
     };
@@ -39094,13 +39137,14 @@ var ElSelectMenu = defineComponent({
 });
 
 function useAllowCreate(props, states) {
+  const { aliasProps, getLabel, getValue } = useProps(props);
   const createOptionCount = ref(0);
   const cachedSelectedOption = ref(null);
   const enableAllowCreateMode = computed$1(() => {
     return props.allowCreate && props.filterable;
   });
   function hasExistingOption(query) {
-    const hasValue = (option) => option.value === query;
+    const hasValue = (option) => getValue(option) === query;
     return props.options && props.options.some(hasValue) || states.createdOptions.some(hasValue);
   }
   function selectNewOption(option) {
@@ -39117,10 +39161,10 @@ function useAllowCreate(props, states) {
     if (enableAllowCreateMode.value) {
       if (query && query.length > 0 && !hasExistingOption(query)) {
         const newOption = {
-          value: query,
-          label: query,
+          [aliasProps.value.value]: query,
+          [aliasProps.value.label]: query,
           created: true,
-          disabled: false
+          [aliasProps.value.disabled]: false
         };
         if (states.createdOptions.length >= createOptionCount.value) {
           states.createdOptions[createOptionCount.value] = newOption;
@@ -39141,10 +39185,10 @@ function useAllowCreate(props, states) {
     }
   }
   function removeNewOption(option) {
-    if (!enableAllowCreateMode.value || !option || !option.created || option.created && props.reserveKeyword && states.inputValue === option.label) {
+    if (!enableAllowCreateMode.value || !option || !option.created || option.created && props.reserveKeyword && states.inputValue === getLabel(option)) {
       return;
     }
-    const idx = states.createdOptions.findIndex((it) => it.value === option.value);
+    const idx = states.createdOptions.findIndex((it) => getValue(it) === getValue(option));
     if (~idx) {
       states.createdOptions.splice(idx, 1);
       createOptionCount.value--;
@@ -39164,28 +39208,6 @@ function useAllowCreate(props, states) {
   };
 }
 
-const flattenOptions = (options) => {
-  const flattened = [];
-  options.forEach((option) => {
-    if (isArray$1(option.options)) {
-      flattened.push({
-        label: option.label,
-        isTitle: true,
-        type: "Group"
-      });
-      option.options.forEach((o) => {
-        flattened.push(o);
-      });
-      flattened.push({
-        type: "Group"
-      });
-    } else {
-      flattened.push(option);
-    }
-  });
-  return flattened;
-};
-
 function useInput(handleInput) {
   const isComposing = ref(false);
   const handleCompositionStart = () => {
@@ -39223,6 +39245,7 @@ const useSelect$1 = (props, emit) => {
   const nsSelectV2 = useNamespace("select-v2");
   const nsInput = useNamespace("input");
   const { form: elForm, formItem: elFormItem } = useFormItem();
+  const { getLabel, getValue, getDisabled, getOptions } = useProps(props);
   const states = reactive({
     inputValue: DEFAULT_INPUT_PLACEHOLDER,
     displayInputValue: DEFAULT_INPUT_PLACEHOLDER,
@@ -39296,37 +39319,37 @@ const useSelect$1 = (props, emit) => {
     const isValidOption = (o) => {
       const query = states.inputValue;
       const regexp = new RegExp(escapeStringRegexp(query), "i");
-      const containsQueryString = query ? regexp.test(o.label || "") : true;
+      const containsQueryString = query ? regexp.test(getLabel(o) || "") : true;
       return containsQueryString;
     };
     if (props.loading) {
       return [];
     }
-    return flattenOptions(props.options.concat(states.createdOptions).map((v) => {
-      if (isArray$1(v.options)) {
-        const filtered = v.options.filter(isValidOption);
+    return [...props.options, ...states.createdOptions].reduce((all, item) => {
+      const options = getOptions(item);
+      if (isArray$1(options)) {
+        const filtered = options.filter(isValidOption);
         if (filtered.length > 0) {
-          return {
-            ...v,
-            options: filtered
-          };
-        }
-      } else {
-        if (props.remote || isValidOption(v)) {
-          return v;
+          all.push({
+            label: getLabel(item),
+            isTitle: true,
+            type: "Group"
+          }, ...filtered, { type: "Group" });
         }
+      } else if (props.remote || isValidOption(item)) {
+        all.push(item);
       }
-      return null;
-    }).filter((v) => v !== null));
+      return all;
+    }, []);
   });
   const filteredOptionsValueMap = computed$1(() => {
     const valueMap = /* @__PURE__ */ new Map();
     filteredOptions.value.forEach((option, index) => {
-      valueMap.set(getValueKey(option.value), { option, index });
+      valueMap.set(getValueKey(getValue(option)), { option, index });
     });
     return valueMap;
   });
-  const optionsAllDisabled = computed$1(() => filteredOptions.value.every((option) => option.disabled));
+  const optionsAllDisabled = computed$1(() => filteredOptions.value.every((option) => getDisabled(option)));
   const selectSize = useFormSize();
   const collapseTagSize = computed$1(() => selectSize.value === "small" ? "small" : "default");
   const tagMaxWidth = computed$1(() => {
@@ -39442,7 +39465,7 @@ const useSelect$1 = (props, emit) => {
   const update = (val) => {
     emit(UPDATE_MODEL_EVENT, val);
     emitChange(val);
-    states.previousValue = val == null ? void 0 : val.toString();
+    states.previousValue = String(val);
   };
   const getValueIndex = (arr = [], value) => {
     if (!isObject$1(value)) {
@@ -39462,9 +39485,6 @@ const useSelect$1 = (props, emit) => {
   const getValueKey = (item) => {
     return isObject$1(item) ? get(item, props.valueKey) : item;
   };
-  const getLabel = (item) => {
-    return isObject$1(item) ? item.label : item;
-  };
   const resetInputHeight = () => {
     return nextTick(() => {
       var _a, _b;
@@ -39496,7 +39516,7 @@ const useSelect$1 = (props, emit) => {
     var _a, _b;
     if (props.multiple) {
       let selectedOptions = props.modelValue.slice();
-      const index = getValueIndex(selectedOptions, option.value);
+      const index = getValueIndex(selectedOptions, getValue(option));
       if (index > -1) {
         selectedOptions = [
           ...selectedOptions.slice(0, index),
@@ -39505,7 +39525,7 @@ const useSelect$1 = (props, emit) => {
         states.cachedOptions.splice(index, 1);
         removeNewOption(option);
       } else if (props.multipleLimit <= 0 || selectedOptions.length < props.multipleLimit) {
-        selectedOptions = [...selectedOptions, option.value];
+        selectedOptions = [...selectedOptions, getValue(option)];
         states.cachedOptions.push(option);
         selectNewOption(option);
         updateHoveringIndex(idx);
@@ -39527,8 +39547,8 @@ const useSelect$1 = (props, emit) => {
       setSoftFocus();
     } else {
       selectedIndex.value = idx;
-      states.selectedLabel = option.label;
-      update(option.value);
+      states.selectedLabel = getLabel(option);
+      update(getValue(option));
       expanded.value = false;
       states.isComposing = false;
       states.isSilentBlur = byClick;
@@ -39541,7 +39561,7 @@ const useSelect$1 = (props, emit) => {
   };
   const deleteTag = (event, option) => {
     let selectedOptions = props.modelValue.slice();
-    const index = getValueIndex(selectedOptions, option.value);
+    const index = getValueIndex(selectedOptions, getValue(option));
     if (index > -1 && !selectDisabled.value) {
       selectedOptions = [
         ...props.modelValue.slice(0, index),
@@ -39549,7 +39569,7 @@ const useSelect$1 = (props, emit) => {
       ];
       states.cachedOptions.splice(index, 1);
       update(selectedOptions);
-      emit("remove-tag", option.value);
+      emit("remove-tag", getValue(option));
       states.softFocus = true;
       removeNewOption(option);
       return nextTick(focusAndUpdatePopup);
@@ -39647,7 +39667,7 @@ const useSelect$1 = (props, emit) => {
       }
     }
     const option = options[newIndex];
-    if (option.disabled || option.type === "Group") {
+    if (getDisabled(option) || option.type === "Group") {
       return onKeyboardNavigate(direction, newIndex);
     } else {
       updateHoveringIndex(newIndex);
@@ -39732,12 +39752,12 @@ const useSelect$1 = (props, emit) => {
       if (hasModelValue.value) {
         states.previousValue = props.modelValue;
         const options = filteredOptions.value;
-        const selectedItemIndex = options.findIndex((option) => getValueKey(option.value) === getValueKey(props.modelValue));
+        const selectedItemIndex = options.findIndex((option) => getValueKey(getValue(option)) === getValueKey(props.modelValue));
         if (~selectedItemIndex) {
-          states.selectedLabel = options[selectedItemIndex].label;
+          states.selectedLabel = getLabel(options[selectedItemIndex]);
           updateHoveringIndex(selectedItemIndex);
         } else {
-          states.selectedLabel = `${props.modelValue}`;
+          states.selectedLabel = getValueKey(props.modelValue);
         }
       } else {
         states.selectedLabel = "";
@@ -39826,6 +39846,8 @@ const useSelect$1 = (props, emit) => {
     debouncedOnInputChange,
     deleteTag,
     getLabel,
+    getValue,
+    getDisabled,
     getValueKey,
     handleBlur,
     handleClear,
@@ -39958,11 +39980,11 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
             _ctx.collapseTags && _ctx.modelValue.length > 0 ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
               (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.showTagList, (item) => {
                 return openBlock(), createElementBlock("div", {
-                  key: _ctx.getValueKey(item),
+                  key: _ctx.getValueKey(_ctx.getValue(item)),
                   class: normalizeClass(_ctx.nsSelectV2.e("selected-item"))
                 }, [
                   createVNode(_component_el_tag, {
-                    closable: !_ctx.selectDisabled && !(item == null ? void 0 : item.disable),
+                    closable: !_ctx.selectDisabled && !_ctx.getDisabled(item),
                     size: _ctx.collapseTagSize,
                     type: "info",
                     "disable-transitions": "",
@@ -39974,7 +39996,7 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
                         style: normalizeStyle({
                           maxWidth: `${_ctx.tagMaxWidth}px`
                         })
-                      }, toDisplayString(item == null ? void 0 : item.label), 7)
+                      }, toDisplayString(_ctx.getLabel(item)), 7)
                     ]),
                     _: 2
                   }, 1032, ["closable", "size", "onClose"])
@@ -40005,7 +40027,7 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
                           style: normalizeStyle({
                             maxWidth: `${_ctx.tagMaxWidth}px`
                           })
-                        }, "+ " + toDisplayString(_ctx.modelValue.length - _ctx.maxCollapseTags), 7)
+                        }, " + " + toDisplayString(_ctx.modelValue.length - _ctx.maxCollapseTags), 7)
                       ]),
                       content: withCtx(() => [
                         createElementVNode("div", {
@@ -40013,11 +40035,11 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
                         }, [
                           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.collapseTagList, (selected) => {
                             return openBlock(), createElementBlock("div", {
-                              key: _ctx.getValueKey(selected),
+                              key: _ctx.getValueKey(_ctx.getValue(selected)),
                               class: normalizeClass(_ctx.nsSelectV2.e("selected-item"))
                             }, [
                               createVNode(_component_el_tag, {
-                                closable: !_ctx.selectDisabled && !selected.disabled,
+                                closable: !_ctx.selectDisabled && !_ctx.getDisabled(selected),
                                 size: _ctx.collapseTagSize,
                                 class: "in-tooltip",
                                 type: "info",
@@ -40045,18 +40067,18 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
                       style: normalizeStyle({
                         maxWidth: `${_ctx.tagMaxWidth}px`
                       })
-                    }, "+ " + toDisplayString(_ctx.modelValue.length - _ctx.maxCollapseTags), 7))
+                    }, " + " + toDisplayString(_ctx.modelValue.length - _ctx.maxCollapseTags), 7))
                   ]),
                   _: 1
                 }, 8, ["size"])) : createCommentVNode("v-if", true)
               ], 2)
             ], 64)) : (openBlock(true), createElementBlock(Fragment, { key: 1 }, renderList(_ctx.states.cachedOptions, (selected) => {
               return openBlock(), createElementBlock("div", {
-                key: _ctx.getValueKey(selected),
+                key: _ctx.getValueKey(_ctx.getValue(selected)),
                 class: normalizeClass(_ctx.nsSelectV2.e("selected-item"))
               }, [
                 createVNode(_component_el_tag, {
-                  closable: !_ctx.selectDisabled && !selected.disabled,
+                  closable: !_ctx.selectDisabled && !_ctx.getDisabled(selected),
                   size: _ctx.collapseTagSize,
                   type: "info",
                   "disable-transitions": "",
@@ -42064,6 +42086,10 @@ const switchProps = buildProps({
   value: {
     type: [Boolean, String, Number],
     default: false
+  },
+  label: {
+    type: String,
+    default: void 0
   }
 });
 const switchEmits = {
@@ -42073,7 +42099,7 @@ const switchEmits = {
 };
 
 const _hoisted_1$d = ["onClick"];
-const _hoisted_2$9 = ["id", "aria-checked", "aria-disabled", "name", "true-value", "false-value", "disabled", "tabindex", "onKeydown"];
+const _hoisted_2$9 = ["id", "aria-checked", "aria-disabled", "aria-label", "name", "true-value", "false-value", "disabled", "tabindex", "onKeydown"];
 const _hoisted_3$4 = ["aria-hidden"];
 const _hoisted_4$2 = ["aria-hidden"];
 const _hoisted_5$1 = ["aria-hidden"];
@@ -42229,6 +42255,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
           role: "switch",
           "aria-checked": unref(checked),
           "aria-disabled": unref(switchDisabled),
+          "aria-label": _ctx.label,
           name: _ctx.name,
           "true-value": _ctx.activeValue,
           "false-value": _ctx.inactiveValue,
@@ -52613,7 +52640,7 @@ Tree.install = (app) => {
 const _Tree = Tree;
 const ElTree = _Tree;
 
-const useSelect = (props, { attrs }, {
+const useSelect = (props, { attrs, emit }, {
   tree,
   key
 }) => {
@@ -52621,6 +52648,7 @@ const useSelect = (props, { attrs }, {
   const result = {
     ...pick(toRefs(props), Object.keys(ElSelect.props)),
     ...attrs,
+    "onUpdate:modelValue": (value) => emit(UPDATE_MODEL_EVENT, value),
     valueKey: key,
     popperClass: computed$1(() => {
       const classes = [ns.e("popper")];
@@ -53931,10 +53959,6 @@ const uploadBaseProps = buildProps({
     type: String,
     default: ""
   },
-  type: {
-    type: String,
-    default: "select"
-  },
   fileList: {
     type: definePropType(Array),
     default: () => mutable([])
@@ -54031,23 +54055,25 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   props: uploadListProps,
   emits: uploadListEmits,
   setup(__props, { emit }) {
+    const props = __props;
     const { t } = useLocale();
     const nsUpload = useNamespace("upload");
     const nsIcon = useNamespace("icon");
     const nsList = useNamespace("list");
     const disabled = useFormDisabled();
     const focusing = ref(false);
+    const containerKls = computed$1(() => [
+      nsUpload.b("list"),
+      nsUpload.bm("list", props.listType),
+      nsUpload.is("disabled", props.disabled)
+    ]);
     const handleRemove = (file) => {
       emit("remove", file);
     };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(TransitionGroup, {
         tag: "ul",
-        class: normalizeClass([
-          unref(nsUpload).b("list"),
-          unref(nsUpload).bm("list", _ctx.listType),
-          unref(nsUpload).is("disabled", unref(disabled))
-        ]),
+        class: normalizeClass(unref(containerKls)),
         name: unref(nsList).b()
       }, {
         default: withCtx(() => [
@@ -54778,12 +54804,20 @@ function useClips() {
     if (content instanceof HTMLImageElement) {
       ctx.drawImage(content, 0, 0, contentWidth, contentHeight);
     } else {
-      const { color, fontSize, fontStyle, fontWeight, fontFamily } = font;
+      const {
+        color,
+        fontSize,
+        fontStyle,
+        fontWeight,
+        fontFamily,
+        textAlign,
+        textBaseline
+      } = font;
       const mergedFontSize = Number(fontSize) * ratio;
       ctx.font = `${fontStyle} normal ${fontWeight} ${mergedFontSize}px/${height}px ${fontFamily}`;
       ctx.fillStyle = color;
-      ctx.textAlign = "center";
-      ctx.textBaseline = "top";
+      ctx.textAlign = textAlign;
+      ctx.textBaseline = textBaseline;
       const contents = Array.isArray(content) ? content : [content];
       contents == null ? void 0 : contents.forEach((item, index) => {
         ctx.fillText(item != null ? item : "", contentWidth / 2, index * (mergedFontSize + FontGap * ratio));
@@ -54872,6 +54906,14 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       var _a, _b;
       return (_b = (_a = props.font) == null ? void 0 : _a.fontFamily) != null ? _b : "sans-serif";
     });
+    const textAlign = computed$1(() => {
+      var _a, _b;
+      return (_b = (_a = props.font) == null ? void 0 : _a.textAlign) != null ? _b : "center";
+    });
+    const textBaseline = computed$1(() => {
+      var _a, _b;
+      return (_b = (_a = props.font) == null ? void 0 : _a.textBaseline) != null ? _b : "top";
+    });
     const gapX = computed$1(() => props.gap[0]);
     const gapY = computed$1(() => props.gap[1]);
     const gapXCenter = computed$1(() => gapX.value / 2);
@@ -54975,7 +55017,9 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
             fontSize: fontSize.value,
             fontStyle: fontStyle.value,
             fontWeight: fontWeight.value,
-            fontFamily: fontFamily.value
+            fontFamily: fontFamily.value,
+            textAlign: textAlign.value,
+            textBaseline: textBaseline.value
           }, gapX.value, gapY.value);
           appendWatermark(textClips, clipWidth);
         };
@@ -56825,4 +56869,4 @@ var installer = makeInstaller([...Components, ...Plugins]);
 const install = installer.install;
 const version = installer.version;
 
-export { BAR_MAP, CASCADER_PANEL_INJECTION_KEY, CHANGE_EVENT, ClickOutside, CommonPicker, CommonProps, DEFAULT_FORMATS_DATE, DEFAULT_FORMATS_DATEPICKER, DEFAULT_FORMATS_TIME, COLLECTION_INJECTION_KEY as DROPDOWN_COLLECTION_INJECTION_KEY, COLLECTION_ITEM_INJECTION_KEY as DROPDOWN_COLLECTION_ITEM_INJECTION_KEY, DROPDOWN_INJECTION_KEY, DefaultProps, DynamicSizeGrid$1 as DynamicSizeGrid, DynamicSizeList$1 as DynamicSizeList, EVENT_CODE, Effect, ElAffix, ElAlert, ElAside, ElAutoResizer, ElAutocomplete, ElAvatar, ElBacktop, ElBadge, ElBreadcrumb, ElBreadcrumbItem, ElButton, ElButtonGroup$1 as ElButtonGroup, ElCalendar, ElCard, ElCarousel, ElCarouselItem, ElCascader, ElCascaderPanel, ElCheckTag, ElCheckbox, ElCheckboxButton, ElCheckboxGroup$1 as ElCheckboxGroup, ElCol, ElCollapse, ElCollapseItem, ElCollapseTransition, ElCollection, ElCollectionItem, ElColorPicker, ElConfigProvider, ElContainer, ElCountdown, ElDatePicker, ElDescriptions, ElDescriptionsItem, ElDialog, ElDivider, ElDrawer, ElDropdown, ElDropdownItem, ElDropdownMenu, ElEmpty, ElFooter, ElForm, ElFormItem, ElHeader, ElIcon, ElImage, ElImageViewer, ElInfiniteScroll, ElInput, ElInputNumber, ElLink, ElLoading, vLoading as ElLoadingDirective, Loading as ElLoadingService, ElMain, ElMenu, ElMenuItem, ElMenuItemGroup, ElMessage, ElMessageBox, ElNotification, ElOption, ElOptionGroup, ElOverlay, ElPageHeader, ElPagination, ElPopconfirm, ElPopover, ElPopoverDirective, ElPopper, ElPopperArrow, ElPopperContent, ElPopperTrigger, ElProgress, ElRadio, ElRadioButton, ElRadioGroup, ElRate, ElResult, ElRow, ElScrollbar, ElSelect, ElSelectV2, ElSkeleton, ElSkeletonItem, ElSlider, ElSpace, ElStatistic, ElStep, ElSteps, ElSubMenu, ElSwitch, ElTabPane, ElTable, ElTableColumn, ElTableV2, ElTabs, ElTag, ElText, ElTimePicker, ElTimeSelect, ElTimeline, ElTimelineItem, ElTooltip, ElTransfer, ElTree, ElTreeSelect, ElTreeV2, ElUpload, FIRST_KEYS, FIRST_LAST_KEYS, FORWARD_REF_INJECTION_KEY, FixedSizeGrid$1 as FixedSizeGrid, FixedSizeList$1 as FixedSizeList, GAP, ID_INJECTION_KEY, INPUT_EVENT, INSTALLED_KEY, IconComponentMap, IconMap, LAST_KEYS, LEFT_CHECK_CHANGE_EVENT, Mousewheel, POPPER_CONTENT_INJECTION_KEY, POPPER_INJECTION_KEY, RIGHT_CHECK_CHANGE_EVENT, ROOT_PICKER_INJECTION_KEY, RowAlign, RowJustify, SIZE_INJECTION_KEY, TOOLTIP_INJECTION_KEY, TableV2$1 as TableV2, Alignment as TableV2Alignment, FixedDir as TableV2FixedDir, placeholderSign as TableV2Placeholder, SortOrder as TableV2SortOrder, TimePickPanel, TrapFocus, UPDATE_MODEL_EVENT, WEEK_DAYS, affixEmits, affixProps, alertEffects, alertEmits, alertProps, arrowMiddleware, autoResizerProps, autocompleteEmits, autocompleteProps, avatarEmits, avatarProps, backtopEmits, backtopProps, badgeProps, breadcrumbItemProps, breadcrumbKey, breadcrumbProps, buildLocaleContext, buildTimeList, buildTranslator, buttonEmits, buttonGroupContextKey, buttonNativeTypes, buttonProps, buttonTypes, calendarEmits, calendarProps, cardProps, carouselContextKey, carouselEmits, carouselItemProps, carouselProps, cascaderEmits, cascaderProps, checkTagEmits, checkTagProps, checkboxEmits, checkboxGroupContextKey, checkboxGroupEmits, checkboxGroupProps, checkboxProps, colProps, collapseContextKey, collapseEmits, collapseItemProps, collapseProps, colorPickerContextKey, colorPickerEmits, colorPickerProps, componentSizeMap, componentSizes, configProviderContextKey, configProviderProps, countdownEmits, countdownProps, createModelToggleComposable, dateEquals, datePickTypes, datePickerProps, dayjs, installer as default, defaultInitialZIndex, defaultNamespace, descriptionProps, dialogEmits, dialogInjectionKey, dialogProps, dividerProps, drawerEmits, drawerProps, dropdownItemProps, dropdownMenuProps, dropdownProps, elPaginationKey, emitChangeFn, emptyProps, extractDateFormat, extractTimeFormat, formContextKey, formEmits, formItemContextKey, formItemProps, formItemValidateStates, formProps, formatter, genFileId, getPositionDataWithUnit, iconProps, imageEmits, imageProps, imageViewerEmits, imageViewerProps, inputEmits, inputNumberEmits, inputNumberProps, inputProps, install, linkEmits, linkProps, localeContextKey, makeInstaller, makeList, menuEmits, menuItemEmits, menuItemGroupProps, menuItemProps, menuProps, messageConfig, messageDefaults, messageEmits, messageProps, messageTypes, namespaceContextKey, notificationEmits, notificationProps, notificationTypes, overlayEmits, overlayProps, pageHeaderEmits, pageHeaderProps, paginationEmits, paginationProps, parseDate, popconfirmEmits, popconfirmProps, popoverEmits, popoverProps, popperArrowProps, popperContentEmits, popperContentProps, popperCoreConfigProps, popperProps, popperTriggerProps, progressProps, provideGlobalConfig, radioButtonProps, radioEmits, radioGroupEmits, radioGroupKey, radioGroupProps, radioProps, radioPropsBase, rangeArr, rateEmits, rateProps, renderThumbStyle$1 as renderThumbStyle, resultProps, roleTypes, rowContextKey, rowProps, scrollbarContextKey, scrollbarEmits, scrollbarProps, selectGroupKey, selectKey, selectV2InjectionKey, skeletonItemProps, skeletonProps, sliderContextKey, sliderEmits, sliderProps, spaceProps, statisticProps, stepProps, stepsEmits, stepsProps, subMenuProps, switchEmits, switchProps, tabBarProps, tabNavEmits, tabNavProps, tabPaneProps, tableV2Props, tableV2RowProps, tabsEmits, tabsProps, tabsRootContextKey, tagEmits, tagProps, textProps, thumbProps, timePickerDefaultProps, timeUnits$1 as timeUnits, timelineItemProps, tooltipEmits, transferCheckedChangeFn, transferEmits, transferProps, translate, uploadBaseProps, uploadContentProps, uploadContextKey, uploadDraggerEmits, uploadDraggerProps, uploadListEmits, uploadListProps, uploadListTypes, uploadProps, useAttrs, useCascaderConfig, useCursor, useDelayedRender, useDelayedToggle, useDelayedToggleProps, useDeprecated, useDialog, useDisabled, useDraggable, useEscapeKeydown, useFloating, useFloatingProps, useFocus, useFocusController, useFormDisabled, useFormItem, useFormItemInputId, useFormSize, useForwardRef, useForwardRefDirective, useGetDerivedNamespace, useGlobalComponentSettings, useGlobalConfig, useGlobalSize, useId, useIdInjection, useLocale, useLockscreen, useModal, useModelToggle, useModelToggleEmits, useModelToggleProps, useNamespace, useOrderedChildren, usePopper, usePopperArrowProps, usePopperContainer, usePopperContainerId, usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps, usePopperProps, usePopperTriggerProps, usePreventGlobal, useProp, useSameTarget, useSize, useSizeProp, useSizeProps, useSpace, useTeleport, useThrottleRender, useTimeout, useTooltipContentProps, useTooltipModelToggle, useTooltipModelToggleEmits, useTooltipModelToggleProps, useTooltipProps, useTooltipTriggerProps, useTransitionFallthrough, useTransitionFallthroughEmits, useZIndex, vLoading, vRepeatClick, valueEquals, version, virtualizedGridProps, virtualizedListProps, virtualizedProps, virtualizedScrollbarProps, zIndexContextKey };
+export { BAR_MAP, CASCADER_PANEL_INJECTION_KEY, CHANGE_EVENT, ClickOutside, CommonPicker, CommonProps, DEFAULT_FORMATS_DATE, DEFAULT_FORMATS_DATEPICKER, DEFAULT_FORMATS_TIME, COLLECTION_INJECTION_KEY as DROPDOWN_COLLECTION_INJECTION_KEY, COLLECTION_ITEM_INJECTION_KEY as DROPDOWN_COLLECTION_ITEM_INJECTION_KEY, DROPDOWN_INJECTION_KEY, DefaultProps, DynamicSizeGrid$1 as DynamicSizeGrid, DynamicSizeList$1 as DynamicSizeList, EVENT_CODE, Effect, ElAffix, ElAlert, ElAside, ElAutoResizer, ElAutocomplete, ElAvatar, ElBacktop, ElBadge, ElBreadcrumb, ElBreadcrumbItem, ElButton, ElButtonGroup$1 as ElButtonGroup, ElCalendar, ElCard, ElCarousel, ElCarouselItem, ElCascader, ElCascaderPanel, ElCheckTag, ElCheckbox, ElCheckboxButton, ElCheckboxGroup$1 as ElCheckboxGroup, ElCol, ElCollapse, ElCollapseItem, ElCollapseTransition, ElCollection, ElCollectionItem, ElColorPicker, ElConfigProvider, ElContainer, ElCountdown, ElDatePicker, ElDescriptions, ElDescriptionsItem, ElDialog, ElDivider, ElDrawer, ElDropdown, ElDropdownItem, ElDropdownMenu, ElEmpty, ElFooter, ElForm, ElFormItem, ElHeader, ElIcon, ElImage, ElImageViewer, ElInfiniteScroll, ElInput, ElInputNumber, ElLink, ElLoading, vLoading as ElLoadingDirective, Loading as ElLoadingService, ElMain, ElMenu, ElMenuItem, ElMenuItemGroup, ElMessage, ElMessageBox, ElNotification, ElOption, ElOptionGroup, ElOverlay, ElPageHeader, ElPagination, ElPopconfirm, ElPopover, ElPopoverDirective, ElPopper, ElPopperArrow, ElPopperContent, ElPopperTrigger, ElProgress, ElRadio, ElRadioButton, ElRadioGroup, ElRate, ElResult, ElRow, ElScrollbar, ElSelect, ElSelectV2, ElSkeleton, ElSkeletonItem, ElSlider, ElSpace, ElStatistic, ElStep, ElSteps, ElSubMenu, ElSwitch, ElTabPane, ElTable, ElTableColumn, ElTableV2, ElTabs, ElTag, ElText, ElTimePicker, ElTimeSelect, ElTimeline, ElTimelineItem, ElTooltip, ElTransfer, ElTree, ElTreeSelect, ElTreeV2, ElUpload, ElWatermark, FIRST_KEYS, FIRST_LAST_KEYS, FORWARD_REF_INJECTION_KEY, FixedSizeGrid$1 as FixedSizeGrid, FixedSizeList$1 as FixedSizeList, GAP, ID_INJECTION_KEY, INPUT_EVENT, INSTALLED_KEY, IconComponentMap, IconMap, LAST_KEYS, LEFT_CHECK_CHANGE_EVENT, Mousewheel, POPPER_CONTENT_INJECTION_KEY, POPPER_INJECTION_KEY, RIGHT_CHECK_CHANGE_EVENT, ROOT_PICKER_INJECTION_KEY, RowAlign, RowJustify, SIZE_INJECTION_KEY, TOOLTIP_INJECTION_KEY, TableV2$1 as TableV2, Alignment as TableV2Alignment, FixedDir as TableV2FixedDir, placeholderSign as TableV2Placeholder, SortOrder as TableV2SortOrder, TimePickPanel, TrapFocus, UPDATE_MODEL_EVENT, WEEK_DAYS, affixEmits, affixProps, alertEffects, alertEmits, alertProps, arrowMiddleware, autoResizerProps, autocompleteEmits, autocompleteProps, avatarEmits, avatarProps, backtopEmits, backtopProps, badgeProps, breadcrumbItemProps, breadcrumbKey, breadcrumbProps, buildLocaleContext, buildTimeList, buildTranslator, buttonEmits, buttonGroupContextKey, buttonNativeTypes, buttonProps, buttonTypes, calendarEmits, calendarProps, cardProps, carouselContextKey, carouselEmits, carouselItemProps, carouselProps, cascaderEmits, cascaderProps, checkTagEmits, checkTagProps, checkboxEmits, checkboxGroupContextKey, checkboxGroupEmits, checkboxGroupProps, checkboxProps, colProps, collapseContextKey, collapseEmits, collapseItemProps, collapseProps, colorPickerContextKey, colorPickerEmits, colorPickerProps, componentSizeMap, componentSizes, configProviderContextKey, configProviderProps, countdownEmits, countdownProps, createModelToggleComposable, dateEquals, datePickTypes, datePickerProps, dayjs, installer as default, defaultInitialZIndex, defaultNamespace, descriptionProps, dialogEmits, dialogInjectionKey, dialogProps, dividerProps, drawerEmits, drawerProps, dropdownItemProps, dropdownMenuProps, dropdownProps, elPaginationKey, emitChangeFn, emptyProps, extractDateFormat, extractTimeFormat, formContextKey, formEmits, formItemContextKey, formItemProps, formItemValidateStates, formProps, formatter, genFileId, getPositionDataWithUnit, iconProps, imageEmits, imageProps, imageViewerEmits, imageViewerProps, inputEmits, inputNumberEmits, inputNumberProps, inputProps, install, linkEmits, linkProps, localeContextKey, makeInstaller, makeList, menuEmits, menuItemEmits, menuItemGroupProps, menuItemProps, menuProps, messageConfig, messageDefaults, messageEmits, messageProps, messageTypes, namespaceContextKey, notificationEmits, notificationProps, notificationTypes, overlayEmits, overlayProps, pageHeaderEmits, pageHeaderProps, paginationEmits, paginationProps, parseDate, popconfirmEmits, popconfirmProps, popoverEmits, popoverProps, popperArrowProps, popperContentEmits, popperContentProps, popperCoreConfigProps, popperProps, popperTriggerProps, progressProps, provideGlobalConfig, radioButtonProps, radioEmits, radioGroupEmits, radioGroupKey, radioGroupProps, radioProps, radioPropsBase, rangeArr, rateEmits, rateProps, renderThumbStyle$1 as renderThumbStyle, resultProps, roleTypes, rowContextKey, rowProps, scrollbarContextKey, scrollbarEmits, scrollbarProps, selectGroupKey, selectKey, selectV2InjectionKey, skeletonItemProps, skeletonProps, sliderContextKey, sliderEmits, sliderProps, spaceProps, statisticProps, stepProps, stepsEmits, stepsProps, subMenuProps, switchEmits, switchProps, tabBarProps, tabNavEmits, tabNavProps, tabPaneProps, tableV2Props, tableV2RowProps, tabsEmits, tabsProps, tabsRootContextKey, tagEmits, tagProps, textProps, thumbProps, timePickerDefaultProps, timeUnits$1 as timeUnits, timelineItemProps, tooltipEmits, transferCheckedChangeFn, transferEmits, transferProps, translate, uploadBaseProps, uploadContentProps, uploadContextKey, uploadDraggerEmits, uploadDraggerProps, uploadListEmits, uploadListProps, uploadListTypes, uploadProps, useAttrs, useCascaderConfig, useCursor, useDelayedRender, useDelayedToggle, useDelayedToggleProps, useDeprecated, useDialog, useDisabled, useDraggable, useEscapeKeydown, useFloating, useFloatingProps, useFocus, useFocusController, useFormDisabled, useFormItem, useFormItemInputId, useFormSize, useForwardRef, useForwardRefDirective, useGetDerivedNamespace, useGlobalComponentSettings, useGlobalConfig, useGlobalSize, useId, useIdInjection, useLocale, useLockscreen, useModal, useModelToggle, useModelToggleEmits, useModelToggleProps, useNamespace, useOrderedChildren, usePopper, usePopperArrowProps, usePopperContainer, usePopperContainerId, usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps, usePopperProps, usePopperTriggerProps, usePreventGlobal, useProp, useSameTarget, useSize, useSizeProp, useSizeProps, useSpace, useTeleport, useThrottleRender, useTimeout, useTooltipContentProps, useTooltipModelToggle, useTooltipModelToggleEmits, useTooltipModelToggleProps, useTooltipProps, useTooltipTriggerProps, useTransitionFallthrough, useTransitionFallthroughEmits, useZIndex, vLoading, vRepeatClick, valueEquals, version, virtualizedGridProps, virtualizedListProps, virtualizedProps, virtualizedScrollbarProps, watermarkProps, zIndexContextKey };