element-pe 2.2.96 → 2.2.98

package/dist/index.full.js

@@ -8957,7 +8957,9 @@
           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);
@@ -29677,6 +29679,7 @@
   };
 
   const useDialog = (props, targetRef) => {
+    var _a;
     const instance = vue.getCurrentInstance();
     const emit = instance.emit;
     const { nextZIndex } = useZIndex();
@@ -29686,7 +29689,7 @@
     const visible = vue.ref(false);
     const closed = vue.ref(false);
     const rendered = vue.ref(false);
-    const zIndex = vue.ref(props.zIndex || nextZIndex());
+    const zIndex = vue.ref((_a = props.zIndex) != null ? _a : nextZIndex());
     let openTimer = void 0;
     let closeTimer = void 0;
     const namespace = useGlobalConfig("namespace", defaultNamespace);
@@ -29773,8 +29776,8 @@
       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();
       }
     }
@@ -29791,7 +29794,7 @@
         closed.value = false;
         open();
         rendered.value = true;
-        zIndex.value = props.zIndex ? zIndex.value++ : nextZIndex();
+        zIndex.value = isUndefined$1(props.zIndex) ? nextZIndex() : zIndex.value++;
         vue.nextTick(() => {
           emit("open");
           if (targetRef.value) {
@@ -37356,16 +37359,20 @@
                       [vue.vShow, !(item <= currentValue.value)]
                     ])
                   ], 64)) : vue.createCommentVNode("v-if", true),
-                  showDecimalIcon(item) ? (vue.openBlock(), vue.createBlock(vue.unref(ElIcon), {
-                    key: 1,
-                    style: vue.normalizeStyle(vue.unref(decimalStyle)),
-                    class: vue.normalizeClass([vue.unref(ns).e("icon"), vue.unref(ns).e("decimal")])
-                  }, {
-                    default: vue.withCtx(() => [
-                      (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(decimalIconComponent))))
-                    ]),
-                    _: 1
-                  }, 8, ["style", "class"])) : vue.createCommentVNode("v-if", true)
+                  showDecimalIcon(item) ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
+                    (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(voidComponent)), {
+                      class: vue.normalizeClass([vue.unref(ns).em("decimal", "box")])
+                    }, null, 8, ["class"])),
+                    vue.createVNode(vue.unref(ElIcon), {
+                      style: vue.normalizeStyle(vue.unref(decimalStyle)),
+                      class: vue.normalizeClass([vue.unref(ns).e("icon"), vue.unref(ns).e("decimal")])
+                    }, {
+                      default: vue.withCtx(() => [
+                        (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(decimalIconComponent))))
+                      ]),
+                      _: 1
+                    }, 8, ["style", "class"])
+                  ], 64)) : vue.createCommentVNode("v-if", true)
                 ]),
                 _: 2
               }, 1032, ["class"])
@@ -39282,8 +39289,7 @@
         required: true
       },
       style: Object,
-      height: Number,
-      labelKey: String
+      height: Number
     },
     setup() {
       const ns = useNamespace("select");
@@ -39297,7 +39303,7 @@
       key: 0,
       class: vue.normalizeClass(_ctx.ns.be("group", "title")),
       style: vue.normalizeStyle([_ctx.style, { lineHeight: `${_ctx.height}px` }])
-    }, vue.toDisplayString(_ctx.item[_ctx.labelKey]), 7)) : (vue.openBlock(), vue.createElementBlock("div", {
+    }, vue.toDisplayString(_ctx.item.label), 7)) : (vue.openBlock(), vue.createElementBlock("div", {
       key: 1,
       class: vue.normalizeClass(_ctx.ns.be("group", "split")),
       style: vue.normalizeStyle(_ctx.style)
@@ -39325,20 +39331,41 @@
     };
   }
 
-  const SelectProps = {
+  const defaultProps$4 = {
+    label: "label",
+    value: "value",
+    disabled: "disabled",
+    options: "options"
+  };
+  function useProps(props) {
+    const aliasProps = vue.computed(() => ({ ...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,
@@ -39375,7 +39402,9 @@
     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,
@@ -39390,7 +39419,7 @@
       default: true
     },
     options: {
-      type: Array,
+      type: definePropType(Array),
       required: true
     },
     placeholder: {
@@ -39406,22 +39435,19 @@
       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,
       default: "value"
     },
-    labelKey: {
-      type: String,
-      default: "label"
-    },
     scrollbarAlwaysOn: {
       type: Boolean,
       default: false
@@ -39443,29 +39469,36 @@
       type: Boolean,
       default: true
     }
-  };
-  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,
-    labelKey: String
-  };
+    created: Boolean
+  });
+
+  const selectV2InjectionKey = Symbol("ElSelectV2Injection");
 
   const _sfc_main$F = vue.defineComponent({
     props: OptionProps,
     emits: ["select", "hover"],
     setup(props, { emit }) {
+      const select = vue.inject(selectV2InjectionKey);
       const ns = useNamespace("select");
       const { hoverItem, selectOptionClick } = useOption(props, { emit });
+      const { getLabel } = useProps(select.props);
       return {
         ns,
         hoverItem,
-        selectOptionClick
+        selectOptionClick,
+        getLabel
       };
     }
   });
@@ -39489,14 +39522,12 @@
         index: _ctx.index,
         disabled: _ctx.disabled
       }, () => [
-        vue.createElementVNode("span", null, vue.toDisplayString(_ctx.item[_ctx.labelKey]), 1)
+        vue.createElementVNode("span", null, vue.toDisplayString(_ctx.getLabel(_ctx.item)), 1)
       ])
     ], 46, _hoisted_1$j);
   }
   var OptionItem = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["render", _sfc_render$8], ["__file", "option-item.vue"]]);
 
-  const selectV2InjectionKey = Symbol("ElSelectV2Injection");
-
   var ElSelectMenu = vue.defineComponent({
     name: "ElSelectDropdown",
     props: {
@@ -39505,8 +39536,7 @@
         required: true
       },
       hoveringIndex: Number,
-      width: Number,
-      labelKey: String
+      width: Number
     },
     setup(props, {
       slots,
@@ -39514,6 +39544,11 @@
     }) {
       const select = vue.inject(selectV2InjectionKey);
       const ns = useNamespace("select");
+      const {
+        getLabel,
+        getValue,
+        getDisabled
+      } = useProps(select.props);
       const cachedHeights = vue.ref([]);
       const listRef = vue.ref();
       const size = vue.computed(() => props.data.length);
@@ -39558,9 +39593,9 @@
       };
       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 {
@@ -39615,8 +39650,7 @@
           return vue.createVNode(GroupItem, {
             "item": item,
             "style": style,
-            "height": sized ? itemSize : estimatedSize,
-            "labelKey": props.labelKey
+            "height": sized ? itemSize : estimatedSize
           }, null);
         }
         const isSelected = isItemSelected(modelValue, item);
@@ -39624,17 +39658,16 @@
         const isHovering = isItemHovering(index);
         return vue.createVNode(OptionItem, vue.mergeProps(itemProps, {
           "selected": isSelected,
-          "disabled": item.disabled || isDisabled,
+          "disabled": getDisabled(item) || isDisabled,
           "created": !!item.created,
           "hovering": isHovering,
           "item": item,
           "onSelect": onSelect,
-          "onHover": onHover,
-          "labelKey": props.labelKey
+          "onHover": onHover
         }), {
           default: (props2) => {
             var _a;
-            return ((_a = slots.default) == null ? void 0 : _a.call(slots, props2)) || vue.createVNode("span", null, [item.label]);
+            return ((_a = slots.default) == null ? void 0 : _a.call(slots, props2)) || vue.createVNode("span", null, [getLabel(item)]);
           }
         });
       };
@@ -39726,13 +39759,14 @@
   });
 
   function useAllowCreate(props, states) {
+    const { aliasProps, getLabel, getValue } = useProps(props);
     const createOptionCount = vue.ref(0);
     const cachedSelectedOption = vue.ref(null);
     const enableAllowCreateMode = vue.computed(() => {
       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) {
@@ -39749,10 +39783,10 @@
       if (enableAllowCreateMode.value) {
         if (query && query.length > 0 && !hasExistingOption(query)) {
           const newOption = {
-            [props.valueKey]: query,
-            [props.labelKey]: 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;
@@ -39773,10 +39807,10 @@
       }
     }
     function removeNewOption(option) {
-      if (!enableAllowCreateMode.value || !option || !option.created || option.created && props.reserveKeyword && states.inputValue === option[props.labelKey]) {
+      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--;
@@ -39796,28 +39830,6 @@
     };
   }
 
-  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 = vue.ref(false);
     const handleCompositionStart = () => {
@@ -39856,6 +39868,7 @@
     const nsInput = useNamespace("input");
     const { form: elForm, formItem: elFormItem } = useFormItem();
     const table = vue.inject(TABLE_INJECTION_KEY, void 0);
+    const { getLabel, getValue, getDisabled, getOptions } = useProps(props);
     const states = vue.reactive({
       inputValue: DEFAULT_INPUT_PLACEHOLDER,
       displayInputValue: DEFAULT_INPUT_PLACEHOLDER,
@@ -39930,37 +39943,37 @@
       const isValidOption = (o) => {
         const query = states.inputValue;
         const regexp = new RegExp(escapeStringRegexp(query), "i");
-        const containsQueryString = query ? regexp.test(o[props.labelKey] || "") : true;
+        const containsQueryString = query ? regexp.test(getLabel(o) || "") : true;
         return containsQueryString;
       };
       if (props.loading) {
         return [];
       }
-      return flattenOptions((Array.isArray(props.options) && props.options ? 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 = vue.computed(() => {
       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 = vue.computed(() => filteredOptions.value.every((option) => option.disabled));
+    const optionsAllDisabled = vue.computed(() => filteredOptions.value.every((option) => getDisabled(option)));
     const selectTableInput = vue.computed(() => table && props.tableInput);
     const selectSize = vue.computed(() => {
       if (selectTableInput.value) {
@@ -40084,7 +40097,7 @@
     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)) {
@@ -40104,9 +40117,6 @@
     const getValueKey = (item) => {
       return isObject$1(item) ? get(item, props.valueKey) : item;
     };
-    const getLabel = (item) => {
-      return isObject$1(item) ? item[props.labelKey] : item;
-    };
     const resetInputHeight = () => {
       return vue.nextTick(() => {
         var _a, _b;
@@ -40138,7 +40148,7 @@
       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),
@@ -40147,7 +40157,7 @@
           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);
@@ -40169,8 +40179,8 @@
         setSoftFocus();
       } else {
         selectedIndex.value = idx;
-        states.selectedLabel = option[props.labelKey];
-        update(option.value);
+        states.selectedLabel = getLabel(option);
+        update(getValue(option));
         expanded.value = false;
         states.isComposing = false;
         states.isSilentBlur = byClick;
@@ -40183,7 +40193,7 @@
     };
     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 && !selectViewMode.value) {
         selectedOptions = [
           ...props.modelValue.slice(0, index),
@@ -40191,7 +40201,7 @@
         ];
         states.cachedOptions.splice(index, 1);
         update(selectedOptions);
-        emit("remove-tag", option.value);
+        emit("remove-tag", getValue(option));
         states.softFocus = true;
         removeNewOption(option);
         return vue.nextTick(focusAndUpdatePopup);
@@ -40289,7 +40299,7 @@
         }
       }
       const option = options[newIndex];
-      if (option.disabled || option.type === "Group") {
+      if (getDisabled(option) || option.type === "Group") {
         return onKeyboardNavigate(direction, newIndex);
       } else {
         updateHoveringIndex(newIndex);
@@ -40374,12 +40384,12 @@
         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][props.labelKey];
+            states.selectedLabel = getLabel(options[selectedItemIndex]);
             updateHoveringIndex(selectedItemIndex);
           } else {
-            states.selectedLabel = `${props.modelValue}`;
+            states.selectedLabel = getValueKey(props.modelValue);
           }
         } else {
           states.selectedLabel = "";
@@ -40470,6 +40480,8 @@
       debouncedOnInputChange,
       deleteTag,
       getLabel,
+      getValue,
+      getDisabled,
       getValueKey,
       handleBlur,
       handleClear,
@@ -40605,11 +40617,11 @@
               _ctx.collapseTags && _ctx.modelValue.length > 0 ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.showTagList, (item) => {
                   return vue.openBlock(), vue.createElementBlock("div", {
-                    key: _ctx.getValueKey(item),
+                    key: _ctx.getValueKey(_ctx.getValue(item)),
                     class: vue.normalizeClass(_ctx.nsSelectV2.e("selected-item"))
                   }, [
                     vue.createVNode(_component_el_tag, {
-                      closable: !_ctx.selectDisabled && !_ctx.selectViewMode && !(item == null ? void 0 : item.disable),
+                      closable: !_ctx.selectDisabled && !_ctx.selectViewMode && !_ctx.getDisabled(item),
                       size: _ctx.collapseTagSize,
                       type: "info",
                       "disable-transitions": "",
@@ -40621,7 +40633,7 @@
                           style: vue.normalizeStyle({
                             maxWidth: `${_ctx.tagMaxWidth}px`
                           })
-                        }, vue.toDisplayString(item == null ? void 0 : item.label), 7)
+                        }, vue.toDisplayString(_ctx.getLabel(item)), 7)
                       ]),
                       _: 2
                     }, 1032, ["closable", "size", "onClose"])
@@ -40652,7 +40664,7 @@
                             style: vue.normalizeStyle({
                               maxWidth: `${_ctx.tagMaxWidth}px`
                             })
-                          }, "+ " + vue.toDisplayString(_ctx.modelValue.length - _ctx.maxCollapseTags), 7)
+                          }, " + " + vue.toDisplayString(_ctx.modelValue.length - _ctx.maxCollapseTags), 7)
                         ]),
                         content: vue.withCtx(() => [
                           vue.createElementVNode("div", {
@@ -40660,11 +40672,11 @@
                           }, [
                             (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.collapseTagList, (selected) => {
                               return vue.openBlock(), vue.createElementBlock("div", {
-                                key: _ctx.getValueKey(selected),
+                                key: _ctx.getValueKey(_ctx.getValue(selected)),
                                 class: vue.normalizeClass(_ctx.nsSelectV2.e("selected-item"))
                               }, [
                                 vue.createVNode(_component_el_tag, {
-                                  closable: !_ctx.selectDisabled && !_ctx.selectViewMode && !selected.disabled,
+                                  closable: !_ctx.selectDisabled && !_ctx.selectViewMode && !_ctx.getDisabled(selected),
                                   size: _ctx.collapseTagSize,
                                   class: "in-tooltip",
                                   type: "info",
@@ -40692,18 +40704,18 @@
                         style: vue.normalizeStyle({
                           maxWidth: `${_ctx.tagMaxWidth}px`
                         })
-                      }, "+ " + vue.toDisplayString(_ctx.modelValue.length - _ctx.maxCollapseTags), 7))
+                      }, " + " + vue.toDisplayString(_ctx.modelValue.length - _ctx.maxCollapseTags), 7))
                     ]),
                     _: 1
                   }, 8, ["size"])) : vue.createCommentVNode("v-if", true)
                 ], 2)
               ], 64)) : (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 1 }, vue.renderList(_ctx.states.cachedOptions, (selected) => {
                 return vue.openBlock(), vue.createElementBlock("div", {
-                  key: _ctx.getValueKey(selected),
+                  key: _ctx.getValueKey(_ctx.getValue(selected)),
                   class: vue.normalizeClass(_ctx.nsSelectV2.e("selected-item"))
                 }, [
                   vue.createVNode(_component_el_tag, {
-                    closable: !_ctx.selectDisabled && !_ctx.selectViewMode && !selected.disabled,
+                    closable: !_ctx.selectDisabled && !_ctx.selectViewMode && !_ctx.getDisabled(selected),
                     size: _ctx.collapseTagSize,
                     type: "info",
                     "disable-transitions": "",
@@ -40874,8 +40886,7 @@
             data: _ctx.filteredOptions,
             width: _ctx.popperSize,
             "hovering-index": _ctx.states.hoveringIndex,
-            "scrollbar-always-on": _ctx.scrollbarAlwaysOn,
-            "label-key": _ctx.labelKey
+            "scrollbar-always-on": _ctx.scrollbarAlwaysOn
           }, {
             default: vue.withCtx((scope) => [
               vue.renderSlot(_ctx.$slots, "default", vue.normalizeProps(vue.guardReactiveProps(scope)))
@@ -40888,7 +40899,7 @@
               ])
             ]),
             _: 3
-          }, 8, ["data", "width", "hovering-index", "scrollbar-always-on", "label-key"])
+          }, 8, ["data", "width", "hovering-index", "scrollbar-always-on"])
         ]),
         _: 3
       }, 8, ["visible", "teleported", "popper-class", "popper-options", "effect", "placement", "offset", "show-arrow", "transition", "persistent", "onBeforeShow"])
@@ -53854,7 +53865,7 @@
   const _Tree = Tree;
   const ElTree = _Tree;
 
-  const useSelect = (props, { attrs }, {
+  const useSelect = (props, { attrs, emit }, {
     tree,
     key
   }) => {
@@ -53862,6 +53873,7 @@
     const result = {
       ...pick(vue.toRefs(props), Object.keys(ElSelect.props)),
       ...attrs,
+      "onUpdate:modelValue": (value) => emit(UPDATE_MODEL_EVENT, value),
       valueKey: key,
       popperClass: vue.computed(() => {
         const classes = [ns.e("popper")];
@@ -56033,12 +56045,20 @@
       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));
@@ -56127,6 +56147,14 @@
         var _a, _b;
         return (_b = (_a = props.font) == null ? void 0 : _a.fontFamily) != null ? _b : "sans-serif";
       });
+      const textAlign = vue.computed(() => {
+        var _a, _b;
+        return (_b = (_a = props.font) == null ? void 0 : _a.textAlign) != null ? _b : "center";
+      });
+      const textBaseline = vue.computed(() => {
+        var _a, _b;
+        return (_b = (_a = props.font) == null ? void 0 : _a.textBaseline) != null ? _b : "top";
+      });
       const gapX = vue.computed(() => props.gap[0]);
       const gapY = vue.computed(() => props.gap[1]);
       const gapXCenter = vue.computed(() => gapX.value / 2);
@@ -56230,7 +56258,9 @@
               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);
           };
@@ -57224,8 +57254,10 @@
         beforeClose: null,
         callback: null,
         cancelButtonText: "",
+        cancelButtonType: "",
         cancelButtonClass: "",
         confirmButtonText: "",
+        confirmButtonType: "",
         confirmButtonClass: "",
         customClass: "",
         customStyle: {},
@@ -57577,6 +57609,7 @@
                     }, [
                       _ctx.showCancelButton ? (vue.openBlock(), vue.createBlock(_component_el_button, {
                         key: 0,
+                        type: _ctx.cancelButtonType || "",
                         loading: _ctx.cancelButtonLoading,
                         class: vue.normalizeClass([_ctx.cancelButtonClass]),
                         round: _ctx.roundButton,
@@ -57588,10 +57621,10 @@
                           vue.createTextVNode(vue.toDisplayString(_ctx.cancelButtonText || _ctx.t("el.messagebox.cancel")), 1)
                         ]),
                         _: 1
-                      }, 8, ["loading", "class", "round", "size"])) : vue.createCommentVNode("v-if", true),
+                      }, 8, ["type", "loading", "class", "round", "size"])) : vue.createCommentVNode("v-if", true),
                       vue.withDirectives(vue.createVNode(_component_el_button, {
                         ref: "confirmRef",
-                        type: "primary",
+                        type: _ctx.confirmButtonType || "primary",
                         loading: _ctx.confirmButtonLoading,
                         class: vue.normalizeClass([_ctx.confirmButtonClasses]),
                         round: _ctx.roundButton,
@@ -57604,7 +57637,7 @@
                           vue.createTextVNode(vue.toDisplayString(_ctx.confirmButtonText || _ctx.t("el.messagebox.confirm")), 1)
                         ]),
                         _: 1
-                      }, 8, ["loading", "class", "round", "disabled", "size"]), [
+                      }, 8, ["type", "loading", "class", "round", "disabled", "size"]), [
                         [vue.vShow, _ctx.showConfirmButton]
                       ])
                     ], 2)