@mptw/skylens-ui 1.4.57 → 1.4.58

package/components/SLCalendarPopup.vue

@@ -45,12 +45,12 @@
             SLIcon.text-xs.text-danger(icon='exclamation-circle')
       .calendar-body
         SLDatePicker(
-            v-model="dateRange2"
-            color="skylens-gray"
-            :is-range="true"
-            :min-date="minDateProxy"
-            :max-date="maxDate2"
-            :max-days="maxDaysProxy"
+          v-model="dateRange2"
+          color="skylens-gray"
+          :is-range="true"
+          :min-date="minDateProxy"
+          :max-date="maxDate2"
+          :max-days="maxDaysProxy"
           )
     .calendar
       .calendar-header
@@ -78,29 +78,29 @@
             SLIcon.text-xs.text-danger(icon='exclamation-circle')
       .calendar-body
         SLDatePicker(
-            v-model="dateRange1"
-            color='skylens-purple'
-            :is-range="true"
-            :min-date="minDateProxy"
-            :max-date="maxDate1"
-            :max-days="maxDaysProxy"
+          v-model="dateRange1"
+          color='skylens-purple'
+          :is-range="true"
+          :min-date="minDateProxy"
+          :max-date="maxDate1"
+          :max-days="maxDaysProxy"
           )
         .data-date 最新資料：{{ dataDateString }}（{{ dataSourceTypeString }}）
   .popup-footer
     //- .compare(v-if="isCompare") 比較 #[span.range1 {{ dateRange1Style2 }}] 與 #[span.range2 {{ dateRange2Style2 }}]
     .actions
       SLButton(
-          size="lg"
-          color="pgray-5"
-          title="取消"
-          @click="onClickedCancel"
+        size="lg"
+        color="pgray-5"
+        title="取消"
+        @click="onClickedCancel"
         )
       SLButton(
-          size="lg"
-          color="primary"
-          title="套用"
-          :disabled="isApplyButtonDisabled"
-          @click="onClickedApply"
+        size="lg"
+        color="primary"
+        title="套用"
+        :disabled="isApplyButtonDisabled"
+        @click="onClickedApply"
         )
 </template>
 
@@ -123,7 +123,7 @@ import {
   previousDateRange,
   isValidDate,
 } from "~ui/utils";
-import { CABLE_DEFAULT_END_DATE_BEFORE_NOW, MOBILE_DEFAULT_END_DATE_BEFORE_NOW } from "~ui/utils/constants";
+import { CABLE_DEFAULT_END_DATE_BEFORE_NOW } from "~ui/utils/constants";
 import type IDateRange from "~ui/interface/IDateRange";
 import { OnlineSourceType } from "~ui/interface/IWeb";
 
@@ -166,6 +166,8 @@ export default defineComponent({
   },
   emits: ["update:modelValue", "compare:change"],
   setup(props, { emit }) {
+    const runtimeConfig = useRuntimeConfig();
+
     const { dataSourceType, minDate, maxDate, maxDays, modelValue } =
       toRefs(props);
 
@@ -289,7 +291,7 @@ export default defineComponent({
       switch (dataSourceType.value) {
         case OnlineSourceType.Mobile:
           return formatDate(
-            subDays(new Date(), MOBILE_DEFAULT_END_DATE_BEFORE_NOW),
+            subDays(new Date(), runtimeConfig.public.defaultMobileEndDateBeforeNow),
             "yyyy/MM/dd"
           );
         default:
@@ -359,13 +361,13 @@ export default defineComponent({
       if (status1.value === "custom") {
         const days =
           !rangeInputDate1.value ||
-          !rangeInputDate1.value.start ||
-          !rangeInputDate1.value.end
+            !rangeInputDate1.value.start ||
+            !rangeInputDate1.value.end
             ? -1
             : differenceInCalendarDays(
-                rangeInputDate1.value.end,
-                rangeInputDate1.value.start
-              ) + 1;
+              rangeInputDate1.value.end,
+              rangeInputDate1.value.start
+            ) + 1;
         return `自訂 ${days === -1 ? "" : `${days}天`}`;
       }
 
@@ -378,26 +380,22 @@ export default defineComponent({
     const dateRange1Style1 = computed(() => {
       if (!dateRange1.value) return "";
 
-      return `${
-        dateRange1.value.start
+      return `${dateRange1.value.start
           ? formatDate(dateRange1.value.start, "yyyy/MM/dd")
           : ""
-      }${
-        dateRange1.value.end
+        }${dateRange1.value.end
           ? `-${formatDate(dateRange1.value.end, "yyyy/MM/dd")}`
           : ""
-      }`;
+        }`;
     });
     const dateRange1Style2 = computed(() => {
       if (!dateRange1.value) return "";
 
-      return `${
-        dateRange1.value ? formatDate(dateRange1.value.start, "yyyy/MM/dd") : ""
-      }${
-        dateRange1.value.end
+      return `${dateRange1.value ? formatDate(dateRange1.value.start, "yyyy/MM/dd") : ""
+        }${dateRange1.value.end
           ? ` - ${formatDate(dateRange1.value.end, "yyyy/MM/dd")}`
           : ""
-      }`;
+        }`;
     });
     const maxDate2 = computed(() => {
       if (!dateRange1.value) return maxDate1.value;
@@ -414,39 +412,35 @@ export default defineComponent({
 
       const days =
         !rangeInputDate2.value ||
-        !rangeInputDate2.value.start ||
-        !rangeInputDate2.value.end
+          !rangeInputDate2.value.start ||
+          !rangeInputDate2.value.end
           ? -1
           : differenceInCalendarDays(
-              rangeInputDate2.value.end,
-              rangeInputDate2.value.start
-            ) + 1;
+            rangeInputDate2.value.end,
+            rangeInputDate2.value.start
+          ) + 1;
       return `自訂 ${days === -1 ? "" : `${days}天`}`;
     });
     const dateRange2Style1 = computed(() => {
       if (!dateRange2.value) return "";
 
-      return `${
-        dateRange2.value.start
+      return `${dateRange2.value.start
           ? formatDate(dateRange2.value.start, "yyyy/MM/dd")
           : ""
-      }${
-        dateRange2.value.end
+        }${dateRange2.value.end
           ? `-${formatDate(dateRange2.value.end, "yyyy/MM/dd")}`
           : ""
-      }`;
+        }`;
     });
     const dateRange2Style2 = computed(() => {
       if (!dateRange2.value) return "";
-      return `${
-        dateRange2.value.start
+      return `${dateRange2.value.start
           ? formatDate(dateRange2.value.start, "yyyy/MM/dd")
           : ""
-      }${
-        dateRange2.value.end
+        }${dateRange2.value.end
           ? ` - ${formatDate(dateRange2.value.end, "yyyy/MM/dd")}`
           : ""
-      }`;
+        }`;
     });
     const isApplyButtonDisabled = computed(() => {
       return (

package/nuxt.config.ts

@@ -7,6 +7,11 @@ const currentDir = dirname(fileURLToPath(import.meta.url));
 export default defineNuxtConfig({
   alias: { '~ui': currentDir, 'images': fileURLToPath(new URL('./assets/images', import.meta.url)) },
   devtools: { enabled: true },
+  runtimeConfig: {
+    public: {
+      defaultMobileEndDateBeforeNow: 4,
+    },
+  },
   components: [
     { path: '~ui/components' }
   ],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mptw/skylens-ui",
   "type": "module",
-  "version": "1.4.57",
+  "version": "1.4.58",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",

package/utils/constants.ts

@@ -60,7 +60,6 @@ export const POI_CHART_COLORS = [
 ];
 
 export const CABLE_DEFAULT_END_DATE_BEFORE_NOW = 6;
-export const MOBILE_DEFAULT_END_DATE_BEFORE_NOW = 3;
 
 export const TAIWAN_COUNTRIES = [
   '台北市',