@element-plus/nightly 0.0.20240411 → 0.0.20240412

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Element Plus v0.0.20240411 */
+/*! Element Plus v0.0.20240412 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue')) :
@@ -11554,6 +11554,44 @@
     };
   }
 
+  const SCOPE$3 = "use-empty-values";
+  const DEFAULT_EMPTY_VALUES = ["", void 0, null];
+  const DEFAULT_VALUE_ON_CLEAR = void 0;
+  const useEmptyValuesProps = buildProps({
+    emptyValues: Array,
+    valueOnClear: {
+      type: [String, Number, Boolean, Function],
+      default: void 0,
+      validator: (val) => isFunction$1(val) ? !val() : !val
+    }
+  });
+  const useEmptyValues = (props, defaultValue) => {
+    const config = useGlobalConfig();
+    config.value = config.value || {};
+    const emptyValues = vue.computed(() => props.emptyValues || config.value.emptyValues || DEFAULT_EMPTY_VALUES);
+    const valueOnClear = vue.computed(() => {
+      if (isFunction$1(props.valueOnClear)) {
+        return props.valueOnClear();
+      } else if (props.valueOnClear !== void 0) {
+        return props.valueOnClear;
+      } else if (isFunction$1(config.value.valueOnClear)) {
+        return config.value.valueOnClear();
+      } else if (config.value.valueOnClear !== void 0) {
+        return config.value.valueOnClear;
+      }
+      return defaultValue !== void 0 ? defaultValue : DEFAULT_VALUE_ON_CLEAR;
+    });
+    const isEmptyValue = (value) => {
+      return emptyValues.value.includes(value);
+    };
+    if (!emptyValues.value.includes(valueOnClear.value)) ;
+    return {
+      emptyValues,
+      valueOnClear,
+      isEmptyValue
+    };
+  };
+
   const configProviderContextKey = Symbol();
 
   const globalConfig = vue.ref();
@@ -11621,11 +11659,10 @@
     return context;
   };
   const mergeConfig = (a, b) => {
-    var _a;
     const keys = [.../* @__PURE__ */ new Set([...keysOf(a), ...keysOf(b)])];
     const obj = {};
     for (const key of keys) {
-      obj[key] = (_a = b[key]) != null ? _a : a[key];
+      obj[key] = b[key] !== void 0 ? b[key] : a[key];
     }
     return obj;
   };
@@ -11656,7 +11693,8 @@
     namespace: {
       type: String,
       default: "el"
-    }
+    },
+    ...useEmptyValuesProps
   });
 
   const messageConfig = {};
@@ -11674,7 +11712,7 @@
 
   const ElConfigProvider = withInstall(ConfigProvider);
 
-  const version$1 = "0.0.20240411";
+  const version$1 = "0.0.20240412";
 
   const makeInstaller = (components = []) => {
     const install = (app, options) => {
@@ -17057,7 +17095,17 @@
       type: Boolean,
       default: true
     },
-    color: String
+    color: String,
+    dotStyle: {
+      type: definePropType([String, Object, Array])
+    },
+    offset: {
+      type: definePropType(Array),
+      default: [0, 0]
+    },
+    dotClass: {
+      type: String
+    }
   });
 
   const _hoisted_1$13 = ["textContent"];
@@ -17081,6 +17129,17 @@
         }
         return `${props.value}`;
       });
+      const style = vue.computed(() => {
+        var _a, _b, _c, _d, _e;
+        return [
+          {
+            backgroundColor: props.color,
+            marginRight: addUnit(-((_b = (_a = props.offset) == null ? void 0 : _a[0]) != null ? _b : 0)),
+            marginTop: addUnit((_d = (_c = props.offset) == null ? void 0 : _c[1]) != null ? _d : 0)
+          },
+          (_e = props.dotStyle) != null ? _e : {}
+        ];
+      });
       expose({
         content
       });
@@ -17099,9 +17158,10 @@
                   vue.unref(ns).e("content"),
                   vue.unref(ns).em("content", _ctx.type),
                   vue.unref(ns).is("fixed", !!_ctx.$slots.default),
-                  vue.unref(ns).is("dot", _ctx.isDot)
+                  vue.unref(ns).is("dot", _ctx.isDot),
+                  _ctx.dotClass
                 ]),
-                style: vue.normalizeStyle({ backgroundColor: _ctx.color }),
+                style: vue.normalizeStyle(vue.unref(style)),
                 textContent: vue.toDisplayString(vue.unref(content))
               }, null, 14, _hoisted_1$13), [
                 [vue.vShow, !_ctx.hidden && (vue.unref(content) || _ctx.isDot)]
@@ -18912,7 +18972,8 @@
       type: Boolean,
       default: true
     },
-    unlinkPanels: Boolean
+    unlinkPanels: Boolean,
+    ...useEmptyValuesProps
   });
 
   const _hoisted_1$11 = ["id", "name", "placeholder", "value", "disabled", "readonly"];
@@ -18942,6 +19003,7 @@
       const nsRange = useNamespace("range");
       const { form, formItem } = useFormItem();
       const elPopperOptions = vue.inject("ElPopperOptions", {});
+      const { valueOnClear } = useEmptyValues(props, null);
       const refPopper = vue.ref();
       const inputRef = vue.ref();
       const pickerVisible = vue.ref(false);
@@ -19160,8 +19222,8 @@
         if (showClose.value) {
           event.stopPropagation();
           focusOnInputBox();
-          emitInput(null);
-          emitChange(null, true);
+          emitInput(valueOnClear.value);
+          emitChange(valueOnClear.value, true);
           showClose.value = false;
           pickerVisible.value = false;
           pickerOptions.value.handleClear && pickerOptions.value.handleClear();
@@ -19231,8 +19293,8 @@
           }
         }
         if (userInput.value === "") {
-          emitInput(null);
-          emitChange(null);
+          emitInput(valueOnClear.value);
+          emitChange(valueOnClear.value);
           userInput.value = null;
         }
       };
@@ -23870,11 +23932,12 @@
     validateEvent: {
       type: Boolean,
       default: true
-    }
+    },
+    ...useEmptyValuesProps
   });
   const cascaderEmits = {
-    [UPDATE_MODEL_EVENT]: (val) => !!val || val === null,
-    [CHANGE_EVENT]: (val) => !!val || val === null,
+    [UPDATE_MODEL_EVENT]: (_) => true,
+    [CHANGE_EVENT]: (_) => true,
     focus: (evt) => evt instanceof FocusEvent,
     blur: (evt) => evt instanceof FocusEvent,
     visibleChange: (val) => isBoolean(val),
@@ -23918,6 +23981,7 @@
       const nsInput = useNamespace("input");
       const { t } = useLocale();
       const { form, formItem } = useFormItem();
+      const { valueOnClear } = useEmptyValues(props);
       const tooltipRef = vue.ref(null);
       const input = vue.ref(null);
       const tagWrapper = vue.ref(null);
@@ -23964,8 +24028,9 @@
           return cloneDeep(props.modelValue);
         },
         set(val) {
-          emit(UPDATE_MODEL_EVENT, val);
-          emit(CHANGE_EVENT, val);
+          const value = val || valueOnClear.value;
+          emit(UPDATE_MODEL_EVENT, value);
+          emit(CHANGE_EVENT, value);
           if (props.validateEvent) {
             formItem == null ? void 0 : formItem.validate("change").catch((err) => debugWarn());
           }
@@ -34333,14 +34398,13 @@
     const { inputId } = useFormItemInputId(props, {
       formItemContext: formItem
     });
+    const { valueOnClear, isEmptyValue } = useEmptyValues(props);
     const selectDisabled = vue.computed(() => props.disabled || (form == null ? void 0 : form.disabled));
-    const hasEmptyStringOption = vue.computed(() => optionsArray.value.some((option) => option.value === ""));
     const hasModelValue = vue.computed(() => {
-      return props.multiple ? isArray$1(props.modelValue) && props.modelValue.length > 0 : !isNil(props.modelValue) && (props.modelValue !== "" || hasEmptyStringOption.value);
+      return props.multiple ? isArray$1(props.modelValue) && props.modelValue.length > 0 : !isEmptyValue(props.modelValue);
     });
     const showClose = vue.computed(() => {
-      const criteria = props.clearable && !selectDisabled.value && states.inputHovering && hasModelValue.value;
-      return criteria;
+      return props.clearable && !selectDisabled.value && states.inputHovering && hasModelValue.value;
     });
     const iconComponent = vue.computed(() => props.remote && props.filterable && !props.remoteShowSuffix ? "" : props.suffixIcon);
     const iconReverse = vue.computed(() => nsSelect.is("reverse", iconComponent.value && expanded.value));
@@ -34611,7 +34675,7 @@
     };
     const deleteSelected = (event) => {
       event.stopPropagation();
-      const value = props.multiple ? [] : void 0;
+      const value = props.multiple ? [] : valueOnClear.value;
       if (props.multiple) {
         for (const item of states.selected) {
           if (item.isDisabled)
@@ -34706,6 +34770,7 @@
       return (_b = (_a = tooltipRef.value) == null ? void 0 : _a.popperRef) == null ? void 0 : _b.contentRef;
     });
     const handleMenuEnter = () => {
+      states.isBeforeHide = false;
       vue.nextTick(() => scrollToOption(states.selected));
     };
     const focus = () => {
@@ -35029,7 +35094,8 @@
     ariaLabel: {
       type: String,
       default: void 0
-    }
+    },
+    ...useEmptyValuesProps
   });
 
   const COMPONENT_NAME$9 = "ElSelect";
@@ -39131,7 +39197,8 @@
     ariaLabel: {
       type: String,
       default: void 0
-    }
+    },
+    ...useEmptyValuesProps
   });
   const OptionProps = buildProps({
     data: Array,
@@ -39502,6 +39569,7 @@
       formItemContext: elFormItem
     });
     const { getLabel, getValue, getDisabled, getOptions } = useProps(props);
+    const { valueOnClear, isEmptyValue } = useEmptyValues(props);
     const states = vue.reactive({
       inputValue: "",
       cachedOptions: [],
@@ -39554,13 +39622,11 @@
       const totalHeight = filteredOptions.value.length * props.itemHeight;
       return totalHeight > props.height ? props.height : totalHeight;
     });
-    const hasEmptyStringOption = vue.computed(() => allOptions.value.some((option) => getValue(option) === ""));
     const hasModelValue = vue.computed(() => {
-      return props.multiple ? isArray$1(props.modelValue) && props.modelValue.length > 0 : !isNil(props.modelValue) && (props.modelValue !== "" || hasEmptyStringOption.value);
+      return props.multiple ? isArray$1(props.modelValue) && props.modelValue.length > 0 : !isEmptyValue(props.modelValue);
     });
     const showClearBtn = vue.computed(() => {
-      const criteria = props.clearable && !selectDisabled.value && states.inputHovering && hasModelValue.value;
-      return criteria;
+      return props.clearable && !selectDisabled.value && states.inputHovering && hasModelValue.value;
     });
     const iconComponent = vue.computed(() => props.remote && props.filterable ? "" : arrow_down_default);
     const iconReverse = vue.computed(() => iconComponent.value && nsSelect.is("reverse", expanded.value));
@@ -39761,7 +39827,7 @@
     const update = (val) => {
       emit(UPDATE_MODEL_EVENT, val);
       emitChange(val);
-      states.previousValue = String(val);
+      states.previousValue = props.multiple ? String(val) : val;
     };
     const getValueIndex = (arr = [], value) => {
       if (!isObject$1(value)) {
@@ -39891,7 +39957,7 @@
       if (isArray$1(props.modelValue)) {
         emptyValue = [];
       } else {
-        emptyValue = void 0;
+        emptyValue = valueOnClear.value;
       }
       if (props.multiple) {
         states.cachedOptions = [];
@@ -39970,6 +40036,7 @@
       }
     };
     const handleMenuEnter = () => {
+      states.isBeforeHide = false;
       return vue.nextTick(() => {
         if (~indexRef.value) {
           scrollToItem(states.hoveringIndex);
@@ -40034,7 +40101,7 @@
     });
     vue.watch(() => props.modelValue, (val, oldVal) => {
       var _a;
-      if (!val || val.toString() !== states.previousValue) {
+      if (!val || props.multiple && val.toString() !== states.previousValue || !props.multiple && getValueKey(val) !== getValueKey(states.previousValue)) {
         initStates();
       }
       if (!isEqual$1(val, oldVal) && props.validateEvent) {
@@ -45374,20 +45441,23 @@
         let rowNum = newVal;
         const childNodes = (_a = rows[rowNum]) == null ? void 0 : _a.childNodes;
         if (childNodes == null ? void 0 : childNodes.length) {
+          let control = 0;
           const indexes = Array.from(childNodes).reduce((acc, item, index) => {
             var _a2, _b;
-            const pre = ((_a2 = childNodes[index - 1]) == null ? void 0 : _a2.colSpan) > 1;
-            const next = ((_b = childNodes[index + 1]) == null ? void 0 : _b.colSpan) > 1;
-            if (item.nodeName !== "TD" && !pre && !next) {
+            if (((_a2 = childNodes[index]) == null ? void 0 : _a2.colSpan) > 1) {
+              control = (_b = childNodes[index]) == null ? void 0 : _b.colSpan;
+            }
+            if (item.nodeName !== "TD" && control === 0) {
               acc.push(index);
             }
+            control > 0 && control--;
             return acc;
           }, []);
           indexes.forEach((rowIndex) => {
             var _a2;
             while (rowNum > 0) {
               const preChildNodes = (_a2 = rows[rowNum - 1]) == null ? void 0 : _a2.childNodes;
-              if (preChildNodes[rowIndex] && preChildNodes[rowIndex].nodeName === "TD") {
+              if (preChildNodes[rowIndex] && preChildNodes[rowIndex].nodeName === "TD" && preChildNodes[rowIndex].rowSpan > 1) {
                 addClass(preChildNodes[rowIndex], "hover-cell");
                 hoveredCellList.push(preChildNodes[rowIndex]);
                 break;
@@ -49805,7 +49875,8 @@
     clearIcon: {
       type: definePropType([String, Object]),
       default: () => circle_close_default
-    }
+    },
+    ...useEmptyValuesProps
   });
 
   const parseTime = (time) => {
@@ -49941,6 +50012,8 @@
           placeholder: _ctx.placeholder,
           "default-first-option": "",
           filterable: _ctx.editable,
+          "empty-values": _ctx.emptyValues,
+          "value-on-clear": _ctx.valueOnClear,
           "onUpdate:modelValue": _cache[0] || (_cache[0] = (event) => _ctx.$emit("update:modelValue", event)),
           onChange: _cache[1] || (_cache[1] = (event) => _ctx.$emit("change", event)),
           onBlur: _cache[2] || (_cache[2] = (event) => _ctx.$emit("blur", event)),
@@ -49968,7 +50041,7 @@
             }), 128))
           ]),
           _: 1
-        }, 8, ["model-value", "disabled", "clearable", "clear-icon", "size", "effect", "placeholder", "filterable"]);
+        }, 8, ["model-value", "disabled", "clearable", "clear-icon", "size", "effect", "placeholder", "filterable", "empty-values", "value-on-clear"]);
       };
     }
   });
@@ -58452,9 +58525,11 @@
   exports.ClickOutside = ClickOutside;
   exports.CommonPicker = CommonPicker;
   exports.CommonProps = CommonProps;
+  exports.DEFAULT_EMPTY_VALUES = DEFAULT_EMPTY_VALUES;
   exports.DEFAULT_FORMATS_DATE = DEFAULT_FORMATS_DATE;
   exports.DEFAULT_FORMATS_DATEPICKER = DEFAULT_FORMATS_DATEPICKER;
   exports.DEFAULT_FORMATS_TIME = DEFAULT_FORMATS_TIME;
+  exports.DEFAULT_VALUE_ON_CLEAR = DEFAULT_VALUE_ON_CLEAR;
   exports.DROPDOWN_COLLECTION_INJECTION_KEY = COLLECTION_INJECTION_KEY;
   exports.DROPDOWN_COLLECTION_ITEM_INJECTION_KEY = COLLECTION_ITEM_INJECTION_KEY;
   exports.DROPDOWN_INJECTION_KEY = DROPDOWN_INJECTION_KEY;
@@ -58600,6 +58675,7 @@
   exports.ROOT_PICKER_INJECTION_KEY = ROOT_PICKER_INJECTION_KEY;
   exports.RowAlign = RowAlign;
   exports.RowJustify = RowJustify;
+  exports.SCOPE = SCOPE$3;
   exports.SIZE_INJECTION_KEY = SIZE_INJECTION_KEY;
   exports.TOOLTIP_INJECTION_KEY = TOOLTIP_INJECTION_KEY;
   exports.TableV2 = TableV2$1;
@@ -58827,6 +58903,8 @@
   exports.useDialog = useDialog;
   exports.useDisabled = useDisabled;
   exports.useDraggable = useDraggable;
+  exports.useEmptyValues = useEmptyValues;
+  exports.useEmptyValuesProps = useEmptyValuesProps;
   exports.useEscapeKeydown = useEscapeKeydown;
   exports.useFloating = useFloating$1;
   exports.useFloatingProps = useFloatingProps;