cleek 2.4.33 → 2.4.37

package/dist/cleek.es.js

@@ -22412,12 +22412,12 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
       return list;
     });
     const realAcceptBtnType = computed$2(() => {
-      var _a, _b;
+      var _a;
       if (props.acceptBtnType)
         return props.acceptBtnType;
       if ((_a = cleekOptions2.value) == null ? void 0 : _a.popup.acceptBtnType)
-        return (_b = cleekOptions2.value) == null ? void 0 : _b.popup.acceptBtnType;
-      return "flat";
+        return cleekOptions2.value.popup.acceptBtnType;
+      return "outlined";
     });
     const realCancelBtnType = computed$2(() => {
       var _a, _b;
@@ -22425,7 +22425,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
         return props.cancelBtnType;
       if ((_a = cleekOptions2.value) == null ? void 0 : _a.popup.cancelBtnType)
         return (_b = cleekOptions2.value) == null ? void 0 : _b.popup.cancelBtnType;
-      return "outlined";
+      return "flat";
     });
     function onCancel() {
       emits("cancel");
@@ -23075,7 +23075,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     reduceNameFunction: null,
     reduceValueFunction: null,
     notClearable: { type: Boolean },
-    clearValue: { type: [Boolean, String] },
+    clearValue: null,
     searchable: { type: [Boolean, String] },
     minWidth: null,
     width: null,
@@ -23111,8 +23111,6 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         return props.modelValue;
       },
       set(val) {
-        if (val === null)
-          val = realClearValue;
         emits("update:modelValue", val);
       }
     });
@@ -23177,10 +23175,17 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         list.push({ "width": props.width });
       return list;
     });
+    const logicClearValue = computed$2(() => {
+      var _a, _b;
+      if (typeof props.clearValue !== "undefined")
+        return props.clearValue;
+      if (typeof ((_b = (_a = cleekOptions2.value) == null ? void 0 : _a.select) == null ? void 0 : _b.clearValue) !== "undefined")
+        return cleekOptions2.value.select.clearValue;
+      return defaultClearValue;
+    });
     const realClearValue = computed$2(() => {
-      const clearValue = props.clearValue || defaultClearValue;
-      if (clearValue !== "auto")
-        return clearValue;
+      if (logicClearValue.value !== "auto")
+        return logicClearValue.value;
       switch (typeof props.modelValue) {
         case "number":
           return 0;
@@ -23197,9 +23202,8 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       }
     });
     const valueIsDefault = computed$2(() => {
-      const clearValue = props.clearValue || defaultClearValue;
-      if (clearValue !== "auto")
-        return value.value === clearValue;
+      if (logicClearValue.value !== "auto")
+        return value.value === logicClearValue.value;
       switch (typeof props.modelValue) {
         case "number":
           return props.modelValue === 0;
@@ -23237,6 +23241,9 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       const reduceNameProp = props.reduceNameProp || defaultReduceNameProp;
       return option[props.prop || reduceNameProp];
     }
+    function setClearValue() {
+      value.value = realClearValue.value;
+    }
     function setFocus() {
     }
     onMounted(() => {
@@ -23272,7 +23279,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         unref$1(isClearBtnVisible) ? (openBlock(), createElementBlock("div", {
           key: 2,
           class: "ck-select__clear-btn",
-          onClick: _cache[0] || (_cache[0] = ($event) => value.value = unref$1(realClearValue))
+          onClick: _cache[0] || (_cache[0] = ($event) => setClearValue())
         }, [
           createVNode(CkIcon, { icon: "times" })
         ])) : createCommentVNode("", true),
@@ -23307,7 +23314,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-var ckSelect = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-d31fd5ac"]]);
+var ckSelect = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-6ec8caba"]]);
 var ckSidebar_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _hoisted_1$5 = {
   key: 0,