Support merge subdomains when popup page open (#161)

Author: sheepzh

global.d.ts

@@ -37,6 +37,12 @@ declare namespace timer {
              * @since 1.2.5
              */
             weekStart: WeekStartOption
+            /**
+             * Whether to merge domain by default
+             * 
+             * @since 1.3.2
+             */
+            defaultMergeDomain: boolean
         }
 
         /**

src/app/components/option/components/popup.ts

@@ -18,6 +18,14 @@ import { ALL_DIMENSIONS } from "@util/stat"
 import { locale } from "@util/i18n"
 import { rotate } from "@util/array"
 
+const mergeDomain = (option: UnwrapRef<timer.option.PopupOption>) => h(ElSwitch, {
+    modelValue: option.defaultMergeDomain,
+    onChange: (newVal: boolean) => {
+        option.defaultMergeDomain = newVal
+        optionService.setPopupOption(option)
+    }
+})
+
 const popupMaxInput = (option: UnwrapRef<timer.option.PopupOption>) => h(ElInputNumber, {
     modelValue: option.popupMax,
     size: 'small',
@@ -83,6 +91,7 @@ const defaultDurationLabel = t(msg => msg.option.popup.duration[defaultPopOption
 const displayDefaultLabel = `${defaultDurationLabel}/${defaultTypeLabel}`
 
 function copy(target: timer.option.PopupOption, source: timer.option.PopupOption) {
+    target.defaultMergeDomain = source.defaultMergeDomain
     target.defaultDuration = source.defaultDuration
     target.defaultType = source.defaultType
     target.displaySiteName = source.displaySiteName
@@ -102,6 +111,13 @@ const _default = defineComponent({
             }
         })
         return () => h('div', [
+            renderOptionItem({
+                input: mergeDomain(option),
+            },
+                msg => msg.popup.defaultMergeDomain,
+                t(msg => msg.option.no)
+            ),
+            h(ElDivider),
             renderOptionItem({
                 duration: durationSelect(option),
                 type: typeSelect(option)

src/app/locale/components/option.ts

@@ -14,6 +14,7 @@ export type OptionMessage = {
     popup: {
         title: string
         max: string
+        defaultMergeDomain: string
         defaultDisplay: string
         displaySiteName: string
         duration: PopupDurationMessage
@@ -93,12 +94,13 @@ const _default: Messages<OptionMessage> = {
         popup: {
             title: '弹窗页',
             max: '只显示前 {input} 条数据，剩下的条目合并显示',
+            defaultMergeDomain: '{input} 打开时合并子域名',
             defaultDisplay: "打开时显示 {duration} {type}",
             displaySiteName: '{input}  显示时是否使用 {siteName} 来代替域名',
             duration: popupDurationMessages.zh_CN,
             durationWidth: "80px",
             weekStart: "每周的第一天 {input}",
-            weekStartAsNormal: '按照惯例'
+            weekStartAsNormal: '按照惯例',
         },
         appearance: {
             title: '外观',
@@ -174,6 +176,7 @@ const _default: Messages<OptionMessage> = {
         popup: {
             title: '彈窗頁',
             max: '隻顯示前 {input} 條數據，剩下的條目合並顯示',
+            defaultMergeDomain: '{input} 打開時合併子域名',
             defaultDisplay: "打開時顯示 {duration} {type}",
             displaySiteName: '{input}  顯示時是否使用 {siteName} 來代替域名',
             duration: popupDurationMessages.zh_CN,
@@ -254,7 +257,8 @@ const _default: Messages<OptionMessage> = {
         popup: {
             title: 'Popup Page',
             max: 'Show the first {input} data items',
-            defaultDisplay: "Show {duration} {type} when opened",
+            defaultMergeDomain: '{input} Merge subdomains on open',
+            defaultDisplay: "Show {duration} {type} on open",
             displaySiteName: '{input}  Whether to display {siteName} instead of URL',
             duration: popupDurationMessages.en,
             durationWidth: "110px",
@@ -335,6 +339,7 @@ const _default: Messages<OptionMessage> = {
         popup: {
             title: 'ポップアップページ',
             max: '最初の {input} 個のデータのみを表示し、残りのエントリは結合されます',
+            defaultMergeDomain: '{input} オープン時にサブドメインをマージ',
             defaultDisplay: "開くと {duration} {type} が表示されます",
             displaySiteName: '{input}  ホストの代わりに {siteName} を表示するかどうか',
             duration: popupDurationMessages.ja,

src/popup/components/footer/index.ts

@@ -83,7 +83,7 @@ class FooterWrapper {
         const option = await optionService.getAllOption()
         this.timeSelectWrapper.init(option.defaultDuration)
         this.typeSelectWrapper.init(option.defaultType)
-        this.mergeHostWrapper.init()
+        this.mergeHostWrapper.init(option.defaultMergeDomain)
         this.query()
     }
 

src/popup/components/footer/merge-host.ts

@@ -19,7 +19,7 @@ class MergeHostWrapper {
         this.handleChanged = handleChanged
     }
 
-    init() {
+    init(initialVal: boolean) {
         this.mergeHostSwitch = document.getElementById('merge-host-switch')
         this.mergeHostPopup = document.getElementById('merge-host-popup-container')
         this.mergeHostPopupInfo = document.getElementById('merge-host-popup-info')
@@ -35,6 +35,7 @@ class MergeHostWrapper {
             }
             this.handleChanged?.()
         }
+        initialVal && this.mergeHostSwitch.click()
     }
 
     mergedHost() {

src/util/constant/option.ts

@@ -16,6 +16,7 @@ export function defaultPopup(): timer.option.PopupOption {
          */
         displaySiteName: true,
         weekStart: 'default',
+        defaultMergeDomain: false,
     }
 }