cleek 2.4.32 → 2.4.36

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,
@@ -23087,6 +23087,9 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     group: null,
     groupVertical: null,
     widthBreaks: null,
+    icon: null,
+    iconRight: null,
+    iconPack: null,
     label: null,
     labelAlign: null
   },
@@ -23108,8 +23111,6 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         return props.modelValue;
       },
       set(val) {
-        if (val === null)
-          val = realClearValue;
         emits("update:modelValue", val);
       }
     });
@@ -23132,6 +23133,10 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       var _a, _b;
       const list = [];
       list.push(hooks8.getGroupClass(props, windowWidth.value));
+      if (props.icon)
+        list.push("has-icon-left");
+      if (props.iconRight)
+        list.push("has-icon-right");
       const layout = props.layout || ((_a = cleekOptions2.value) == null ? void 0 : _a.styles.layout);
       if (layout)
         list.push(layout);
@@ -23170,10 +23175,18 @@ 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;
+      console.log("logicClearValue", logicClearValue.value);
+      if (logicClearValue.value !== "auto")
+        return logicClearValue.value;
       switch (typeof props.modelValue) {
         case "number":
           return 0;
@@ -23189,10 +23202,10 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
           return null;
       }
     });
+    console.log("realClearValue", realClearValue.value);
     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;
@@ -23230,6 +23243,12 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       const reduceNameProp = props.reduceNameProp || defaultReduceNameProp;
       return option[props.prop || reduceNameProp];
     }
+    function setClearValue() {
+      console.log("value.value", value.value);
+      console.log("realClearValue.value", realClearValue.value);
+      value.value = realClearValue.value;
+      console.log("value.value", value.value);
+    }
     function setFocus() {
     }
     onMounted(() => {
@@ -23248,15 +23267,29 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         class: "ck-select",
         style: normalizeStyle(unref$1(computedStyle))
       }, [
-        unref$1(isClearBtnVisible) ? (openBlock(), createElementBlock("div", {
+        __props.icon ? (openBlock(), createBlock(CkIcon, {
           key: 0,
+          class: "ck-select__icon-left",
+          color: "lightgrey",
+          icon: __props.icon,
+          "icon-pack": __props.iconPack
+        }, null, 8, ["icon", "icon-pack"])) : createCommentVNode("", true),
+        __props.iconRight ? (openBlock(), createBlock(CkIcon, {
+          key: 1,
+          class: "ck-select__icon-right",
+          color: "lightgrey",
+          icon: __props.iconRight,
+          "icon-pack": __props.iconPack
+        }, null, 8, ["icon", "icon-pack"])) : createCommentVNode("", true),
+        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),
         __props.label ? (openBlock(), createBlock(CkLabel, {
-          key: 1,
+          key: 3,
           align: __props.labelAlign,
           for: "ck-input"
         }, {
@@ -23286,7 +23319,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-var ckSelect = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-55473558"]]);
+var ckSelect = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-71e3efde"]]);
 var ckSidebar_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _hoisted_1$5 = {
   key: 0,