@hostlink/nuxt-light 1.62.0 → 1.62.1

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.62.0",
+  "version": "1.62.1",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/l-date-picker.d.vue.ts

@@ -5,9 +5,9 @@ type __VLS_ModelProps = {
     modelValue?: any;
 };
 type __VLS_PublicProps = __VLS_Props & __VLS_ModelProps;
-declare var __VLS_36: string, __VLS_37: any;
+declare var __VLS_38: string, __VLS_39: any;
 type __VLS_Slots = {} & {
-    [K in NonNullable<typeof __VLS_36>]?: (props: typeof __VLS_37) => any;
+    [K in NonNullable<typeof __VLS_38>]?: (props: typeof __VLS_39) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (value: any) => any;

package/dist/runtime/components/l-date-picker.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, watch } from "vue";
+import { ref, computed, watch, nextTick } from "vue";
 import { useLight } from "#imports";
 import { QInput } from "quasar";
 const modelValue = defineModel({ type: null, ...{
@@ -88,49 +88,29 @@ const props = defineProps({
 });
 const light = useLight();
 const popup = ref(null);
+const inputValue = ref("");
+const isInternalUpdate = ref(false);
+function modelToString(val) {
+  if (!val) return "";
+  if (typeof val === "object" && val.from) {
+    return val.from + (val.to ? " to " + val.to : "");
+  }
+  return val || "";
+}
 watch(modelValue, (newVal) => {
-  popup.value.hide();
-});
-const localValue = computed({
-  get: () => {
-    if (!modelValue.value) {
-      return modelValue.value;
-    }
-    if (typeof modelValue.value === "object") {
-      let s = modelValue.value.from;
-      if (modelValue.value.to) {
-        s += " to " + modelValue.value.to;
-      }
-      return s;
-    }
-    return modelValue.value;
-  },
-  set: (val) => {
-    if (props.range) {
-      if (val == null || val == "") {
-        modelValue.value = null;
-        return;
-      }
-      const parts = val.split(" to ");
-      if (parts.length == 2) {
-        const from = parts[0];
-        const to = parts[1];
-        if (from.match(/^\d{4}-\d{2}-\d{2}$/) && to.match(/^\d{4}-\d{2}-\d{2}$/)) {
-          modelValue.value = { from, to };
-          return;
-        }
-      }
-      modelValue.value = null;
-      return;
-    }
-    modelValue.value = val;
+  if (isInternalUpdate.value) {
+    isInternalUpdate.value = false;
+    return;
   }
-});
+  inputValue.value = modelToString(newVal);
+  popup.value?.hide();
+}, { deep: true, immediate: true });
 const inputMask = computed(() => {
   if (!props.range) {
     return "####-##-##";
+  } else {
+    return "####-##-## to ####-##-##";
   }
-  return "";
 });
 const inputRules = computed(() => {
   const rules = [];
@@ -147,7 +127,8 @@ const inputRules = computed(() => {
   return null;
 });
 const inputProps = computed(() => {
-  const { mask, locale, calendar, modelValue: modelValue2, defautYearMonth, defaultView, events, ...rest } = light.getInputProps(props);
+  const { mask, locale, calendar, modelValue: modelValue2, defautYearMonth, defaultView, events, emitImmediately, ...rest } = light.getInputProps(props);
+  delete rest["onUpdate:modelValue"];
   return rest;
 });
 const dateProps = computed(() => {
@@ -183,10 +164,36 @@ const dateProps = computed(() => {
   } = props;
   return rest;
 });
+const onUpdateInput = (val) => {
+  isInternalUpdate.value = true;
+  if (props.range) {
+    if (val == null || val === "") {
+      modelValue.value = null;
+      return;
+    }
+    const parts = val.split(" to ");
+    if (parts.length === 2) {
+      const from = parts[0] || "";
+      const to = parts[1] || "";
+      if (from.match(/^\d{4}-\d{2}-\d{2}$/) && to.match(/^\d{4}-\d{2}-\d{2}$/)) {
+        modelValue.value = { from, to };
+        return;
+      }
+      if (from.match(/^\d{4}-\d{2}-\d{2}$/) && to === "") {
+        modelValue.value = from;
+        return;
+      }
+    }
+    modelValue.value = null;
+    return;
+  }
+  modelValue.value = val;
+};
 </script>
 
 <template>
-    <q-input v-model="localValue" :mask="inputMask" :rules="inputRules" v-bind="inputProps">
+    <q-input :mask="inputMask" :rules="inputRules" v-bind="inputProps" @update:model-value="onUpdateInput"
+        v-model="inputValue">
         <template v-slot:prepend>
             <q-icon name="sym_o_event" class="cursor-pointer">
                 <q-popup-proxy cover transition-show="scale" transition-hide="scale" ref="popup">

package/dist/runtime/components/l-date-picker.vue.d.ts

@@ -5,9 +5,9 @@ type __VLS_ModelProps = {
     modelValue?: any;
 };
 type __VLS_PublicProps = __VLS_Props & __VLS_ModelProps;
-declare var __VLS_36: string, __VLS_37: any;
+declare var __VLS_38: string, __VLS_39: any;
 type __VLS_Slots = {} & {
-    [K in NonNullable<typeof __VLS_36>]?: (props: typeof __VLS_37) => any;
+    [K in NonNullable<typeof __VLS_38>]?: (props: typeof __VLS_39) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (value: any) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.62.0",
+  "version": "1.62.1",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",