@fangzhongya/fang-ui 0.1.45 → 0.1.47

package/dist/components/double/src/data.cjs

@@ -35,10 +35,7 @@ const dataProps = {
     type: Boolean
   },
   modelValue: {
-    type: [Array, String],
-    default() {
-      return [];
-    }
+    type: [Array, String]
   },
   /**
    * @props { Object } config={}
@@ -69,10 +66,32 @@ const dataProps = {
    * @props { Boolean } disabled=false
    * 是否禁用
    */
-  disabled: { type: Boolean, default: false }
+  disabled: { type: Boolean, default: false },
+  mouse: { type: Boolean },
+  /**
+   * @description whether to trigger form validation
+   */
+  validateEvent: {
+    type: Boolean,
+    default: true
+  },
+  isDoubleValue: {
+    type: Boolean
+  },
+  /**
+   * @props { Function } errorPrompt ( )
+   * 错误提示，默认用 ElMessage.error 提示
+   */
+  errorPrompt: {
+    type: Function
+  },
+  prop: {
+    type: String
+  }
 };
 const dataEmits = [
   "update:modelValue",
+  "click",
   "focus",
   "blur",
   "clear",

package/dist/components/double/src/data.d.ts

@@ -44,7 +44,6 @@ export declare const dataProps: {
     };
     modelValue: {
         type: (StringConstructor | ArrayConstructor)[];
-        default(): never[];
     };
     /**
      * @props { Object } config={}
@@ -77,6 +76,29 @@ export declare const dataProps: {
         type: BooleanConstructor;
         default: boolean;
     };
+    mouse: {
+        type: BooleanConstructor;
+    };
+    /**
+     * @description whether to trigger form validation
+     */
+    validateEvent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    isDoubleValue: {
+        type: BooleanConstructor;
+    };
+    /**
+     * @props { Function } errorPrompt ( )
+     * 错误提示，默认用 ElMessage.error 提示
+     */
+    errorPrompt: {
+        type: FunctionConstructor;
+    };
+    prop: {
+        type: StringConstructor;
+    };
 };
 export type DataProps = ExtractPropTypes<typeof dataProps>;
 /**

package/dist/components/double/src/data.js

@@ -33,10 +33,7 @@ const dataProps = {
     type: Boolean
   },
   modelValue: {
-    type: [Array, String],
-    default() {
-      return [];
-    }
+    type: [Array, String]
   },
   /**
    * @props { Object } config={}
@@ -67,10 +64,32 @@ const dataProps = {
    * @props { Boolean } disabled=false
    * 是否禁用
    */
-  disabled: { type: Boolean, default: false }
+  disabled: { type: Boolean, default: false },
+  mouse: { type: Boolean },
+  /**
+   * @description whether to trigger form validation
+   */
+  validateEvent: {
+    type: Boolean,
+    default: true
+  },
+  isDoubleValue: {
+    type: Boolean
+  },
+  /**
+   * @props { Function } errorPrompt ( )
+   * 错误提示，默认用 ElMessage.error 提示
+   */
+  errorPrompt: {
+    type: Function
+  },
+  prop: {
+    type: String
+  }
 };
 const dataEmits = [
   "update:modelValue",
+  "click",
   "focus",
   "blur",
   "clear",

package/dist/components/double/src/index2.cjs

@@ -1,20 +1,25 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
+const isEqual = require("@fangzhongya/utils/basic/object/isEqual");
 const data = require("./data.cjs");
 const index$1 = require("../../../hooks/cssname/index.cjs");
-const index$4 = require("../../icon/index.cjs");
+const index$6 = require("../../icon/index.cjs");
 const clear = require("../../../icons/vue/clear.cjs");
-const index$3 = require("../../../hooks/compons/index.cjs");
+const index$4 = require("../../../hooks/compons/index.cjs");
 const index$2 = require("../../../hooks/props-default/index.cjs");
 const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 const index = require("../../../hooks/locale/index.cjs");
+const index$5 = require("../../message/index.cjs");
+require("../../form/index.cjs");
+const index$3 = require("element-plus/es/components/form/index");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
   props: index$2.getProps(data.dataProps),
   emits: data.dataEmits,
   setup(__props, { expose: __expose, emit: __emit }) {
     const { getLocale } = index.useLocale();
+    let doubleValueDate = 0;
     const cs = index$1.useCssName(data.name);
     const prs = __props;
     const props = index$2.usePropsDefault(data.name, prs, data.dataProps, {
@@ -28,7 +33,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return getLocale("end");
       }
     });
-    const compons = index$3.useComponsGet(props.compons);
+    const disabled = index$3.useDisabled();
+    const { formItem: elFormItem } = index$3.useFormItem();
+    const refDom = vue.ref();
+    const compons = index$4.useComponsGet(props.compons);
     const pcompon = vue.computed(() => {
       if (typeof props.compon == "string") {
         const tcom = lineToLargeHump.lineToLargeHump(props.compon);
@@ -38,13 +46,18 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     });
     const emit = __emit;
-    const refInput = vue.ref();
     const isfocus = vue.ref(false);
     const start = vue.ref();
     const end = vue.ref();
     const emove = vue.ref(false);
+    vue.watch(
+      () => props.mouse,
+      () => {
+        emove.value = props.mouse;
+      }
+    );
     const isclear = vue.computed(() => {
-      if (props.clearable) {
+      if (props.clearable && disabled.value === false) {
         if (start.value || end.value) {
           if (emove.value || isfocus.value) {
             return true;
@@ -75,14 +88,24 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           }
         }
         if (v) {
+          if (props.isDoubleValue && v.length == 0) {
+            if (doubleValueDate > Date.now() - 400) {
+              return;
+            }
+          }
           const s = v[0];
           const e = v[1];
           if (s !== start.value) {
             start.value = s;
+            onInput(0);
           }
           if (e !== end.value) {
             end.value = e;
+            onInput(1);
           }
+        } else {
+          start.value = void 0;
+          end.value = void 0;
         }
       },
       {
@@ -90,30 +113,26 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         deep: true
       }
     );
-    vue.watch(
-      () => isfocus.value,
-      () => {
-        if (isfocus.value) {
-          emit("focus");
-        } else {
-          emit("blur");
-        }
+    function validateEvent() {
+      var _a;
+      if (props.validateEvent) {
+        (_a = elFormItem == null ? void 0 : elFormItem.validate) == null ? void 0 : _a.call(elFormItem, "blur").catch((err) => console.log("err", err));
       }
-    );
+    }
     function onMouseenter() {
       emove.value = true;
     }
     function onMouseleave() {
       emove.value = false;
     }
-    const errer = vue.ref();
+    const error = vue.ref();
     function onInput(type) {
       var _a, _b;
       if (!props.check) {
         setValue([start.value, end.value]);
         return;
       }
-      errer.value = void 0;
+      error.value = void 0;
       if (!start.value || !end.value) {
         handleValidationSuccess(type);
         return;
@@ -123,11 +142,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           handleValidationError(e, type);
         } else {
           handleValidationSuccess(type);
-          setValue([start.value, end.value]);
         }
+        setValue([start.value, end.value]);
       };
       if (typeof props.check === "function") {
-        const v = props.check(start.value, end.value, callback);
+        const v = props.check(callback, start.value, end.value);
         if (v === false) {
           return false;
         }
@@ -143,29 +162,50 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       handleValidationSuccess(type);
     }
+    function errorPrompt(ts, num) {
+      if (props.errorPrompt) {
+        props.errorPrompt(ts, num);
+      } else {
+        index$5.Message.error(ts);
+      }
+    }
     function handleValidationError(e, type) {
+      if (type === 0) {
+        start.value = void 0;
+      } else if (type === 1) {
+        end.value = void 0;
+      }
       if (typeof e === "string") {
         e = new Error(e);
       }
-      e.type = type;
-      errer.value = e;
-      emit("validate", void 0, false, e.message);
+      errorPrompt(e.message, type);
     }
     function handleValidationSuccess(type) {
-      emit("validate", void 0, true, "");
       setValue([start.value, end.value]);
     }
-    function onClear() {
+    function onClear(...arr) {
       start.value = void 0;
       end.value = void 0;
       if (props.check) {
-        errer.value = void 0;
-        emit("validate", void 0, true, "");
+        error.value = void 0;
       }
       setValue(void 0);
       emit("clear");
+      if (!isfocus.value) {
+        isfocus.value = true;
+        emit("focus", ...arr);
+      }
     }
     function setValue(value) {
+      if (value && (value[0] === void 0 || value[0] === null) && (value[1] === void 0 || value[1] === null)) {
+        value = [];
+      }
+      if (props.isDoubleValue && value) {
+        if (value[0] === void 0 || value[0] === null || value[1] === void 0 || value[1] === null) {
+          doubleValueDate = Date.now();
+          value = [];
+        }
+      }
       if (props.multiple && value) {
         let v = "";
         if (typeof props.multiple != "string") {
@@ -173,53 +213,83 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         } else {
           v = value.join(props.multiple);
         }
-        emit("update:modelValue", v);
-        emit("change", v);
+        if (!isEqual.isEqual(v, props.modelValue)) {
+          emit("update:modelValue", v);
+          emit("change", v);
+          validateEvent();
+        }
       } else {
-        emit("update:modelValue", value);
-        emit("change", value);
+        if (!isEqual.isEqual(value, props.modelValue)) {
+          emit("update:modelValue", value);
+          emit("change", value);
+          validateEvent();
+        }
       }
     }
-    function onClick() {
-      isfocus.value = true;
-      if (refInput.value) {
-        refInput.value.focus();
+    function onClick(...arr) {
+      if (!disabled.value) {
+        if (!isfocus.value) {
+          isfocus.value = true;
+          emit("focus", ...arr);
+        }
       }
-      clearBlur();
-    }
-    function onFocus() {
-      isfocus.value = true;
-      clearBlur();
+      emit("click", ...arr);
     }
-    let timeout;
-    function onBlur() {
-      timeout = setTimeout(() => {
-        isfocus.value = false;
-      }, 200);
+    const isfocusCom = vue.ref(false);
+    function onFocus(...arr) {
+      isfocusCom.value = true;
+      if (!isfocus.value) {
+        isfocus.value = true;
+        emit("focus", ...arr);
+      }
     }
-    function clearBlur() {
-      clearTimeout(timeout);
+    function onBlur(...arr) {
+      isfocusCom.value = false;
+      if (!emove.value) {
+        if (isfocus.value) {
+          isfocus.value = false;
+          emit("blur", ...arr);
+          validateEvent();
+        }
+      }
     }
+    const onClickTotal = (event) => {
+      var _a;
+      if (!((_a = refDom.value) == null ? void 0 : _a.contains(event.target)) && isfocusCom.value == false) {
+        if (isfocus.value) {
+          isfocus.value = false;
+          emit("blur", event);
+          validateEvent();
+        }
+      }
+    };
     vue.onMounted(() => {
       if (globalThis) {
-        globalThis.addEventListener("click", () => {
-          isfocus.value = false;
-        });
+        globalThis.addEventListener("click", onClickTotal);
+      }
+    });
+    vue.onUnmounted(() => {
+      if (globalThis) {
+        globalThis.removeEventListener("click", onClickTotal);
       }
     });
     __expose({
-      ...data.dataExpose
+      ...data.dataExpose,
+      focus: onClick
     });
     return (_ctx, _cache) => {
       var _a, _b, _c, _d;
       return vue.openBlock(), vue.createElementBlock("div", {
-        class: vue.normalizeClass([vue.unref(cs).z(), vue.unref(cs).is("focus", isfocus.value)]),
+        class: vue.normalizeClass([vue.unref(cs).z(), vue.unref(cs).is("focus", isfocus.value), vue.unref(cs).is("disabled", vue.unref(disabled))]),
+        ref_key: "refDom",
+        ref: refDom,
         onMouseenter,
         onMouseleave,
         onClick: vue.withModifiers(onClick, ["stop"])
       }, [
         vue.renderSlot(_ctx.$slots, vue.unref(data.dataSlot).prefix),
         (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(pcompon.value), vue.mergeProps(vue.unref(props).config, {
+          disabled: vue.unref(disabled),
           multiple: multiple.value,
           class: [vue.unref(cs).z("value"), vue.unref(cs).z("start")],
           modelValue: start.value,
@@ -228,13 +298,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             _cache[1] || (_cache[1] = ($event) => onInput(0))
           ],
           placeholder: vue.unref(props).startPlaceholder + (((_a = vue.unref(props).config) == null ? void 0 : _a.placeholder) ?? ""),
-          onClick: vue.withModifiers(onFocus, ["stop"]),
+          onFocus,
           onBlur
-        }), null, 16, ["multiple", "class", "modelValue", "placeholder"])),
+        }), null, 16, ["disabled", "multiple", "class", "modelValue", "placeholder"])),
         vue.createElementVNode("span", {
           class: vue.normalizeClass([vue.unref(cs).z("range")])
         }, vue.toDisplayString(vue.unref(props).rangeSeparator), 3),
         (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(pcompon.value), vue.mergeProps(vue.unref(props).config, {
+          disabled: vue.unref(disabled),
           multiple: multiple.value,
           class: [vue.unref(cs).z("value"), vue.unref(cs).z("end")],
           modelValue: end.value,
@@ -243,29 +314,23 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             _cache[3] || (_cache[3] = ($event) => onInput(1))
           ],
           placeholder: vue.unref(props).endPlaceholder + (((_b = vue.unref(props).config) == null ? void 0 : _b.placeholder) ?? ""),
-          onClick: vue.withModifiers(onFocus, ["stop"]),
+          onFocus,
           onBlur
-        }), null, 16, ["multiple", "class", "modelValue", "placeholder"])),
-        errer.value ? (vue.openBlock(), vue.createElementBlock("span", {
+        }), null, 16, ["disabled", "multiple", "class", "modelValue", "placeholder"])),
+        error.value ? (vue.openBlock(), vue.createElementBlock("span", {
           key: 0,
           class: vue.normalizeClass([
             vue.unref(cs).z("error"),
             vue.unref(cs).is("clear", isclear.value),
-            "type-" + ((_c = errer.value) == null ? void 0 : _c.type)
+            "type-" + ((_c = error.value) == null ? void 0 : _c.type)
           ])
-        }, vue.toDisplayString(((_d = errer.value) == null ? void 0 : _d.message) ? errer.value.message : errer.value), 3)) : vue.createCommentVNode("", true),
-        vue.createElementVNode("input", {
-          class: vue.normalizeClass(vue.unref(cs).z("focus")),
-          ref_key: "refInput",
-          ref: refInput,
-          onBlur
-        }, null, 34),
+        }, vue.toDisplayString(((_d = error.value) == null ? void 0 : _d.message) ? error.value.message : error.value), 3)) : vue.createCommentVNode("", true),
         isclear.value ? (vue.openBlock(), vue.createElementBlock("span", {
           key: 1,
           class: vue.normalizeClass([vue.unref(cs).z("icon"), vue.unref(cs).z("clear")]),
           onClick: vue.withModifiers(onClear, ["stop"])
         }, [
-          vue.createVNode(vue.unref(index$4.Icon), null, {
+          vue.createVNode(vue.unref(index$6.Icon), null, {
             default: vue.withCtx(() => [
               vue.createVNode(clear.default)
             ]),