Merge from main

Author: sheepzh

.github/ISSUE_TEMPLATE/translation-------.md

@@ -0,0 +1,11 @@
+---
+name: Translation Issue / 翻译改善建议
+about: Improve the translation of this extension
+title: 'Report translation mistakes'
+labels: 'locale'
+assignees: ''
+---
+
+## Any Snapshot?
+
+

README.md

@@ -34,7 +34,6 @@
 [![](https://img.shields.io/amo/rating/2690100?color=green)](https://addons.mozilla.org/en-US/firefox/addon/2690100)
 [![Mozilla Add-on](https://img.shields.io/amo/users/2690100?color=green)](https://addons.mozilla.org/en-US/firefox/addon/2690100)
 
-
 ## 截图
 
 > 弹窗页展示今日数据
@@ -53,23 +52,30 @@
 
 详细展示图文：[douban.com](https://www.douban.com/group/topic/213888429/)
 
-## 开发
+## 贡献指南
+
+如果你想参与到该项目的开源建设，可以考虑以下几种方式
+
+#### 提交 Issue
+
+如果您有一些好的想法，或者 bug 反馈，可以新建一条 [issue](https://github.com/sheepzh/timer/issues) 。作者会在第一时间进行回复。
+
+#### 参与开发
+
+如果你知道如何开发浏览器扩展，并且熟悉该项目的技术栈 ( TypeScript + vue3 + ElementPlus )，也可以贡献代码：
+
+1. Fork 自己的仓库
+2. 开发完成后请直接 PR 到 main 分支，并在 message 里关联指定的 issue
+
+当然也欢迎新手同学使用该项目作为学习项目自己练手
 
-```
- git clone https://github.com/sheepzh/timer.git
- cd timer
- npm install
- # 开发编译，输出目录为 dist_dev
- npm run dev
- # 生产编译，输出目录为 dist_prod 和 market_packages
- npm run build
-```
+#### 完善翻译
 
-- 欢迎大家 PR， PR 之前请先创建 ISSUE
+除了简体中文外，该扩展另外的本地化语言都依赖机翻。所以也非常欢迎您在 [issue](https://github.com/sheepzh/timer/issues/new?assignees=&labels=locale&template=translation-------.md&title=Report+translation+mistakes) 里提交翻译建议。
 
-## TODO
+#### 好评鼓励
 
-请查看 [功能迭代 RoadMap](https://github.com/sheepzh/timer/projects/1) 项目
+至于最简单粗暴的贡献方式，当然是在 [Firefox](https://addons.mozilla.org/zh-CN/firefox/addon/web%E6%99%82%E9%96%93%E7%B5%B1%E8%A8%88/) / [Chrome](https://chrome.google.com/webstore/detail/%E7%BD%91%E8%B4%B9%E5%BE%88%E8%B4%B5-%E4%B8%8A%E7%BD%91%E6%97%B6%E9%97%B4%E7%BB%9F%E8%AE%A1/dkdhhcbjijekmneelocdllcldcpmekmm) / [Edge](https://microsoftedge.microsoft.com/addons/detail/timer-the-web-time-is-e/fepjgblalcnepokjblgbgmapmlkgfahc) 好评三连啦 XXD
 
 ## 致谢
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "timer",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "Web timer",
   "homepage": "https://github.com/sheepzh/timer",
   "scripts": {
@@ -54,4 +54,4 @@
     "vue": "^3.2.33",
     "vue-router": "^4.0.14"
   }
-}
+}

src/app/components/common/input-filter-item.ts

@@ -13,7 +13,7 @@ const _default = defineComponent({
     props: {
         placeholder: String
     },
-    emits: ["clear", "enter"],
+    emits: ["search"],
     setup(props, ctx) {
         const modelValue: Ref<string> = ref("")
         return () => h(ElInput, {
@@ -23,10 +23,11 @@ const _default = defineComponent({
             clearable: true,
             onClear() {
                 modelValue.value = ''
-                ctx.emit("clear")
+                ctx.emit("search", "")
             },
             onInput: (val: string) => modelValue.value = val.trim(),
-            onKeyup: (event: KeyboardEvent) => event.key === 'Enter' && ctx.emit("enter", modelValue.value)
+            onKeyup: (event: KeyboardEvent) => event.key === 'Enter' && ctx.emit("search", modelValue.value),
+            onBlur: (_event: FocusEvent) => ctx.emit("search", modelValue.value),
         })
     }
 })

src/app/components/limit/filter.ts

@@ -38,14 +38,10 @@ const _default = defineComponent({
         return () => [
             h(InputFilterItem, {
                 placeholder: urlPlaceholder,
-                onClear() {
-                    url.value = ""
+                onSearch(searchVal: string) {
+                    url.value = searchVal
                     handleChange()
                 },
-                onEnter(newVal: string) {
-                    url.value = newVal
-                    handleChange()
-                }
             }),
             h(SwitchFilterItem, {
                 label: onlyEnabledLabel,

src/app/components/report/filter/index.ts

@@ -72,14 +72,10 @@ const _default = defineComponent({
         return () => [
             h(InputFilterItem, {
                 placeholder: hostPlaceholder,
-                onClear() {
-                    host.value = ""
+                onSearch(searchVal: string) {
+                    host.value = searchVal
                     handleChange()
                 },
-                onEnter(newVal: string) {
-                    host.value = newVal
-                    handleChange()
-                }
             }),
             h(DateRangeFilterItem, {
                 startPlaceholder: dateStartPlaceholder,

src/app/components/site-manage/filter.ts

@@ -43,23 +43,15 @@ const _default = defineComponent({
         return () => [
             h(InputFilterItem, {
                 placeholder: hostPlaceholder,
-                onClear() {
-                    host.value = ""
+                onSearch(searchVal: string) {
+                    host.value = searchVal
                     handleChange()
                 },
-                onEnter(newVal: string) {
-                    host.value = newVal
-                    handleChange()
-                }
             }),
             h(InputFilterItem, {
                 placeholder: aliasPlaceholder,
-                onClear() {
-                    alias.value = ""
-                    handleChange()
-                },
-                onEnter(newVal: string) {
-                    alias.value = newVal
+                onSearch(searchVal: string) {
+                    alias.value = searchVal
                     handleChange()
                 }
             }),

src/app/layout/menu.ts

@@ -10,7 +10,7 @@ import { ElIcon, ElMenu, ElMenuItem, ElMenuItemGroup, MenuItemRegistered } from
 import { RouteLocationNormalizedLoaded, Router, useRoute, useRouter } from "vue-router"
 import { I18nKey, t } from "@app/locale"
 import { MenuMessage } from "@app/locale/components/menu"
-import { GITHUB_ISSUE_ADD, HOME_PAGE, MEAT_URL, TU_CAO_PAGE } from "@util/constant/url"
+import { HOME_PAGE, MEAT_URL, TU_CAO_PAGE } from "@util/constant/url"
 import { Aim, Calendar, ChatSquare, Folder, Food, HotWater, Rank, SetUp, Stopwatch, Sugar, Tickets, Timer, TrendCharts } from "@element-plus/icons-vue"
 import ElementIcon from "../element-ui/icon"
 import { locale } from "@util/i18n"
@@ -34,37 +34,46 @@ type _RouteProps = {
 }
 
 /**
- * Use TU_CAO_PAGE, if the locale is Chinese
- * 
- * @since 0.9.0
+ * Generate menu items after locale initialized
  */
-let realFeedbackLink: string = GITHUB_ISSUE_ADD
-if (locale === 'zh_CN') {
-    realFeedbackLink = TU_CAO_PAGE
-}
-
-const OTHER_MENU_ITEMS: _MenuItem[] = [{
-    title: 'feedback',
-    href: realFeedbackLink,
-    icon: ChatSquare,
-    index: '_feedback'
-}]
-HOME_PAGE && OTHER_MENU_ITEMS.push({
-    title: 'rate',
-    href: HOME_PAGE,
-    icon: Sugar,
-    index: '_rate'
-})
-OTHER_MENU_ITEMS.push({
-    title: 'meat',
-    href: MEAT_URL,
-    icon: Food,
-    index: '_meat'
-})
+function generateMenus(): _MenuGroup[] {
+    /**
+     * Use TU_CAO_PAGE, if the locale is Chinese
+     * 
+     * @since 0.9.0
+     */
+    const isZhCn = locale === "zh_CN"
+
+    const otherMenuItems: _MenuItem[] = []
+    HOME_PAGE && otherMenuItems.push({
+        title: 'rate',
+        href: HOME_PAGE,
+        icon: Sugar,
+        index: '_rate'
+    })
+    if (isZhCn) {
+        otherMenuItems.push({
+            title: 'feedback',
+            href: TU_CAO_PAGE,
+            icon: ChatSquare,
+            index: '_feedback'
+        }, {
+            title: 'meat',
+            href: MEAT_URL,
+            icon: Food,
+            index: '_meat'
+        })
+    } else {
+        otherMenuItems.push({
+            title: 'translationMistake',
+            href: 'https://github.com/sheepzh/timer/issues/new?assignees=&labels=locale&template=translation-------.md&title=Report+translation+mistakes',
+            icon: ChatSquare,
+            index: '_i18n'
+        })
+    }
 
-// All menu items
-const ALL_MENU: _MenuGroup[] = [
-    {
+    // All menu items
+    return [{
         title: 'data',
         children: [{
             title: 'dashboard',
@@ -115,9 +124,9 @@ const ALL_MENU: _MenuGroup[] = [
         }]
     }, {
         title: 'other',
-        children: OTHER_MENU_ITEMS
-    }
-]
+        children: otherMenuItems
+    }]
+}
 
 function openMenu(route: string, title: I18nKey, routeProps: UnwrapRef<_RouteProps>) {
     const routerVal = routeProps.router
@@ -178,7 +187,7 @@ const _default = defineComponent({
 
         return () => h(ElMenu,
             { defaultActive: routeProps.current.path },
-            () => ALL_MENU.map(menu => renderMenu(menu, routeProps))
+            () => generateMenus().map(menu => renderMenu(menu, routeProps))
         )
     }
 })

src/app/locale/components/menu.ts

@@ -25,6 +25,7 @@ export type MenuMessage = {
     feedback: string
     rate: string
     meat: string
+    translationMistake: string
 }
 const _default: Messages<MenuMessage> = {
     zh_CN: {
@@ -44,7 +45,8 @@ const _default: Messages<MenuMessage> = {
         other: '其他',
         feedback: '有什么反馈吗？',
         rate: '打个分吧！',
-        meat: '请作者吃饭~'
+        meat: '请作者吃饭~',
+        translationMistake: '提交翻译错误'
     },
     zh_TW: {
         dashboard: '儀錶盤',
@@ -63,7 +65,8 @@ const _default: Messages<MenuMessage> = {
         other: '其他',
         feedback: '有什麼反饋嗎？',
         rate: '打個分吧！',
-        meat: '請作者吃飯~'
+        meat: '請作者吃飯~',
+        translationMistake: '改善翻译~'
     },
     en: {
         dashboard: "Dashboard",
@@ -82,7 +85,8 @@ const _default: Messages<MenuMessage> = {
         option: 'Options',
         feedback: 'Feedback',
         rate: 'Rate It',
-        meat: 'Invite the author to dinner'
+        meat: 'Invite the author to dinner',
+        translationMistake: 'Improve translation'
     },
     ja: {
         dashboard: 'ダッシュボード',
@@ -101,7 +105,8 @@ const _default: Messages<MenuMessage> = {
         option: '拡張設定',
         feedback: 'フィードバック',
         rate: 'それを評価',
-        meat: '著者を夕食に招待する'
+        meat: '著者を夕食に招待する',
+        translationMistake: '翻訳を改善する'
     }
 }
 

src/service/components/host-merge-ruler.ts

@@ -81,7 +81,9 @@ export default class CustomizedHostMergeRuler implements IHostMergeRuler {
         matchResult && (merged = matchResult.result)
         if (merged === undefined) {
             // No rule matched
-            return isIpAndPort(origin) ? origin : psl.get(origin)
+            return isIpAndPort(origin)
+                ? origin
+                : psl.get(origin) || this.merge0(2, origin)
         } else {
             return this.merge0(merged, origin)
         }
@@ -90,4 +92,4 @@ export default class CustomizedHostMergeRuler implements IHostMergeRuler {
     private merge0(merged: string | number, origin: string): string {
         return typeof merged === 'string' ? (merged === '' ? origin : merged) : getTheSuffix(origin, merged)
     }
-}
+}