@fangzhongya/fang-ui 0.1.45 → 0.1.47

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

@@ -1,4 +1,5 @@
-import { defineComponent, computed, ref, watch, onMounted, createElementBlock, openBlock, withModifiers, normalizeClass, unref, renderSlot, createBlock, createElementVNode, createCommentVNode, resolveDynamicComponent, mergeProps, toDisplayString, createVNode, withCtx } from "vue";
+import { defineComponent, ref, computed, watch, onMounted, onUnmounted, createElementBlock, openBlock, withModifiers, normalizeClass, unref, renderSlot, createBlock, createElementVNode, createCommentVNode, resolveDynamicComponent, mergeProps, toDisplayString, createVNode, withCtx } from "vue";
+import { isEqual } from "@fangzhongya/utils/basic/object/isEqual";
 import { name, dataProps, dataExpose, dataSlot, dataEmits } from "./data.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { Icon } from "../../icon/index.js";
@@ -7,12 +8,16 @@ import { useComponsGet } from "../../../hooks/compons/index.js";
 import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 import { useLocale } from "../../../hooks/locale/index.js";
+import { Message } from "../../message/index.js";
+import "../../form/index.js";
+import { useDisabled, useFormItem } from "element-plus/es/components/form/index";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: getProps(dataProps),
   emits: dataEmits,
   setup(__props, { expose: __expose, emit: __emit }) {
     const { getLocale } = useLocale();
+    let doubleValueDate = 0;
     const cs = useCssName(name);
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps, {
@@ -26,6 +31,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return getLocale("end");
       }
     });
+    const disabled = useDisabled();
+    const { formItem: elFormItem } = useFormItem();
+    const refDom = ref();
     const compons = useComponsGet(props.compons);
     const pcompon = computed(() => {
       if (typeof props.compon == "string") {
@@ -36,13 +44,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     });
     const emit = __emit;
-    const refInput = ref();
     const isfocus = ref(false);
     const start = ref();
     const end = ref();
     const emove = ref(false);
+    watch(
+      () => props.mouse,
+      () => {
+        emove.value = props.mouse;
+      }
+    );
     const isclear = computed(() => {
-      if (props.clearable) {
+      if (props.clearable && disabled.value === false) {
         if (start.value || end.value) {
           if (emove.value || isfocus.value) {
             return true;
@@ -73,14 +86,24 @@ const _sfc_main = /* @__PURE__ */ 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;
         }
       },
       {
@@ -88,30 +111,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         deep: true
       }
     );
-    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 = ref();
+    const error = 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;
@@ -121,11 +140,11 @@ const _sfc_main = /* @__PURE__ */ 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;
         }
@@ -141,29 +160,50 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       handleValidationSuccess(type);
     }
+    function errorPrompt(ts, num) {
+      if (props.errorPrompt) {
+        props.errorPrompt(ts, num);
+      } else {
+        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") {
@@ -171,53 +211,83 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         } else {
           v = value.join(props.multiple);
         }
-        emit("update:modelValue", v);
-        emit("change", v);
+        if (!isEqual(v, props.modelValue)) {
+          emit("update:modelValue", v);
+          emit("change", v);
+          validateEvent();
+        }
       } else {
-        emit("update:modelValue", value);
-        emit("change", value);
+        if (!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 = 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();
+        }
+      }
+    };
     onMounted(() => {
       if (globalThis) {
-        globalThis.addEventListener("click", () => {
-          isfocus.value = false;
-        });
+        globalThis.addEventListener("click", onClickTotal);
+      }
+    });
+    onUnmounted(() => {
+      if (globalThis) {
+        globalThis.removeEventListener("click", onClickTotal);
       }
     });
     __expose({
-      ...dataExpose
+      ...dataExpose,
+      focus: onClick
     });
     return (_ctx, _cache) => {
       var _a, _b, _c, _d;
       return openBlock(), createElementBlock("div", {
-        class: normalizeClass([unref(cs).z(), unref(cs).is("focus", isfocus.value)]),
+        class: normalizeClass([unref(cs).z(), unref(cs).is("focus", isfocus.value), unref(cs).is("disabled", unref(disabled))]),
+        ref_key: "refDom",
+        ref: refDom,
         onMouseenter,
         onMouseleave,
         onClick: withModifiers(onClick, ["stop"])
       }, [
         renderSlot(_ctx.$slots, unref(dataSlot).prefix),
         (openBlock(), createBlock(resolveDynamicComponent(pcompon.value), mergeProps(unref(props).config, {
+          disabled: unref(disabled),
           multiple: multiple.value,
           class: [unref(cs).z("value"), unref(cs).z("start")],
           modelValue: start.value,
@@ -226,13 +296,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _cache[1] || (_cache[1] = ($event) => onInput(0))
           ],
           placeholder: unref(props).startPlaceholder + (((_a = unref(props).config) == null ? void 0 : _a.placeholder) ?? ""),
-          onClick: withModifiers(onFocus, ["stop"]),
+          onFocus,
           onBlur
-        }), null, 16, ["multiple", "class", "modelValue", "placeholder"])),
+        }), null, 16, ["disabled", "multiple", "class", "modelValue", "placeholder"])),
         createElementVNode("span", {
           class: normalizeClass([unref(cs).z("range")])
         }, toDisplayString(unref(props).rangeSeparator), 3),
         (openBlock(), createBlock(resolveDynamicComponent(pcompon.value), mergeProps(unref(props).config, {
+          disabled: unref(disabled),
           multiple: multiple.value,
           class: [unref(cs).z("value"), unref(cs).z("end")],
           modelValue: end.value,
@@ -241,23 +312,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _cache[3] || (_cache[3] = ($event) => onInput(1))
           ],
           placeholder: unref(props).endPlaceholder + (((_b = unref(props).config) == null ? void 0 : _b.placeholder) ?? ""),
-          onClick: withModifiers(onFocus, ["stop"]),
+          onFocus,
           onBlur
-        }), null, 16, ["multiple", "class", "modelValue", "placeholder"])),
-        errer.value ? (openBlock(), createElementBlock("span", {
+        }), null, 16, ["disabled", "multiple", "class", "modelValue", "placeholder"])),
+        error.value ? (openBlock(), createElementBlock("span", {
           key: 0,
           class: normalizeClass([
             unref(cs).z("error"),
             unref(cs).is("clear", isclear.value),
-            "type-" + ((_c = errer.value) == null ? void 0 : _c.type)
+            "type-" + ((_c = error.value) == null ? void 0 : _c.type)
           ])
-        }, toDisplayString(((_d = errer.value) == null ? void 0 : _d.message) ? errer.value.message : errer.value), 3)) : createCommentVNode("", true),
-        createElementVNode("input", {
-          class: normalizeClass(unref(cs).z("focus")),
-          ref_key: "refInput",
-          ref: refInput,
-          onBlur
-        }, null, 34),
+        }, toDisplayString(((_d = error.value) == null ? void 0 : _d.message) ? error.value.message : error.value), 3)) : createCommentVNode("", true),
         isclear.value ? (openBlock(), createElementBlock("span", {
           key: 1,
           class: normalizeClass([unref(cs).z("icon"), unref(cs).z("clear")]),

package/dist/components/double/style/index2.scss

@@ -1 +1,2 @@
+@use '../../icon/style/index2.scss' as *;
 @use '../index.scss' as *;

package/dist/components/forms/common/config.cjs

@@ -7,11 +7,12 @@ const provides = {
 const changes = [
   "Select",
   "Date",
-  "Array",
   "Check",
   "Labels",
   "Switch",
-  "Cascader"
+  "Cascader",
+  "Selector"
+  // 'Double',
 ];
 exports.changes = changes;
 exports.provides = provides;

package/dist/components/forms/common/config.js

@@ -5,11 +5,12 @@ const provides = {
 const changes = [
   "Select",
   "Date",
-  "Array",
   "Check",
   "Labels",
   "Switch",
-  "Cascader"
+  "Cascader",
+  "Selector"
+  // 'Double',
 ];
 export {
   changes,