Deprecate total time (#166)

Author: sheepzh

global.d.ts

@@ -184,6 +184,7 @@ declare namespace timer {
          */
         type Dimension =
             // Running time
+            // @deprecated v1.3.4
             | 'total'
             // Focus time
             | 'focus'

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

@@ -103,7 +103,11 @@ const _default = defineComponent({
     name: "PopupOptionContainer",
     setup(_props, ctx) {
         const option: UnwrapRef<timer.option.PopupOption> = reactive(defaultPopup())
-        optionService.getAllOption().then(currentVal => copy(option, currentVal))
+        optionService.getAllOption().then(currentVal => {
+            // Remove total @since v1.3.4
+            currentVal.defaultType === 'total' && (currentVal.defaultType = 'focus')
+            copy(option, currentVal)
+        })
         ctx.expose({
             async reset() {
                 copy(option, defaultPopup())

src/app/components/report/table/columns/total.ts

@@ -8,11 +8,22 @@
 import type { PropType } from "vue"
 
 import { t } from "@app/locale"
-import { ElTableColumn } from "element-plus"
+import { ElIcon, ElTableColumn, ElTooltip } from "element-plus"
 import { defineComponent, h } from "vue"
 import { periodFormatter } from "../../formatter"
+import { QuestionFilled } from "@element-plus/icons-vue"
 
-const columnLabel = t(msg => msg.item.total)
+function renderHeader() {
+    return [
+        t(msg => msg.item.total),
+        h(ElTooltip, {
+            content: t(msg => msg.item.totalTip),
+            placement: 'top',
+        }, () => h(ElIcon, {
+            style: { paddingLeft: '3px' },
+        }, () => h(QuestionFilled)))
+    ]
+}
 
 const _default = defineComponent({
     name: "TotalColumn",
@@ -24,11 +35,10 @@ const _default = defineComponent({
     setup(props) {
         return () => h(ElTableColumn, {
             prop: "total",
-            label: columnLabel,
             minWidth: 130,
             align: "center",
-            sortable: "custom"
         }, {
+            header: renderHeader,
             default: ({ row }: { row: timer.stat.Row }) => periodFormatter(row.total, props.timeFormat)
         })
     }

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

@@ -67,8 +67,8 @@ const _default = defineComponent({
                 onAliasChange: (host: string, newAlias: string) => ctx.emit("aliasChange", host, newAlias)
             }))
             result.push(h(FocusColumn, { timeFormat: props.timeFormat }))
-            result.push(h(TotalColumn, { timeFormat: props.timeFormat }))
             result.push(h(TimeColumn))
+            result.push(h(TotalColumn, { timeFormat: props.timeFormat }))
             result.push(h(OperationColumn, {
                 mergeDate: props.mergeDate,
                 mergeHost: props.mergeHost,

src/app/components/trend/components/chart/wrapper.ts

@@ -85,7 +85,7 @@ function optionOf(
     xAxisData: string[],
     subtext: string,
     timeFormat: timer.app.TimeFormat,
-    [focusData, totalData, timeData]: number[][]
+    [focusData, timeData]: [number[], number[]]
 ) {
     const textColor = getPrimaryTextColor()
     const secondaryTextColor = getSecondaryTextColor()
@@ -139,14 +139,6 @@ function optionOf(
             textStyle: { color: textColor },
         }],
         series: [{
-            // run time
-            name: t(msg => msg.item.total),
-            data: totalData,
-            yAxisIndex: 0,
-            type: 'line',
-            smooth: true,
-            tooltip: { formatter: (params: any) => formatTimeOfEchart(params, timeFormat) }
-        }, {
             name: t(msg => msg.item.focus),
             data: focusData,
             yAxisIndex: 0,
@@ -208,23 +200,21 @@ async function processSubtitle(host: timer.app.trend.HostInfo) {
     return subtitle
 }
 
-function processDataItems(allDates: string[], timeFormat: timer.app.TimeFormat, rows: timer.stat.Row[]): number[][] {
+function processDataItems(allDates: string[], timeFormat: timer.app.TimeFormat, rows: timer.stat.Row[]): [number[], number[]] {
     timeFormat = timeFormat || 'default'
     const millConverter = MILL_CONVERTERS[timeFormat]
     const focusData: number[] = []
-    const totalData: number[] = []
     const timeData: number[] = []
 
-    const dateInfoMap = {}
+    const dateInfoMap: Record<string, timer.stat.Row> = {}
     rows.forEach(row => dateInfoMap[row.date] = row)
 
     allDates.forEach(date => {
-        const row = dateInfoMap[date] || {}
-        focusData.push(millConverter(row.focus || 0))
-        totalData.push(millConverter(row.total || 0))
-        timeData.push(row.time || 0)
+        const row = dateInfoMap[date]
+        focusData.push(millConverter(row?.focus || 0))
+        timeData.push(row?.time || 0)
     })
-    return [focusData, totalData, timeData]
+    return [focusData, timeData]
 }
 
 class ChartWrapper {

src/database/router-database.ts

@@ -25,6 +25,7 @@ export type TimerCondition = {
      * Total range, milliseconds
      * 
      * @since 0.0.9
+     * @deprecated 1.3.4
      */
     totalRange?: number[]
     /**

src/database/timer-database.ts

@@ -82,7 +82,9 @@ class FooterWrapper {
 
         const option = await optionService.getAllOption()
         this.timeSelectWrapper.init(option.defaultDuration)
-        this.typeSelectWrapper.init(option.defaultType)
+        // Remove total @since v1.3.4
+        const defaultType = option.defaultType === 'total' ? 'focus' : option.defaultType
+        this.typeSelectWrapper.init(defaultType)
         this.mergeHostWrapper.init(option.defaultMergeDomain)
         this.query()
     }

src/popup/components/footer/index.ts

@@ -63,7 +63,7 @@ $optionPadding: 10px
 #type-select-popup
   z-index: 2004
   left: 619px
-  top: 380px
+  top: 410px
   margin: 0px
 #time-select-popup
   z-index: 2004

src/popup/style/index.sass

@@ -10,7 +10,11 @@ import type { Messages } from ".."
 export type ItemMessage = {
     date: string
     host: string
+    // @deprecated v1.3.4
     total: string
+    // @since v1.3.4
+    // @deprecated v1.3.4
+    totalTip: string
     focus: string
     time: string
     operation: {
@@ -33,6 +37,7 @@ const _default: Messages<ItemMessage> = {
         date: '日期',
         host: '域名',
         total: '运行时长',
+        totalTip: '许多用户反应该数据实际作用不大。作者深思熟虑，打算于不久的将来下线它。如果您有疑问，欢迎提交反馈。',
         focus: '浏览时长',
         time: '打开次数',
         operation: {
@@ -53,6 +58,7 @@ const _default: Messages<ItemMessage> = {
         date: '日期',
         host: '域名',
         total: '運行時長',
+        totalTip: '許多用戶反應該數據實際作用不大。作者深思熟慮，打算於不久的將來下線它。如果您有疑問，歡迎提交反饋。',
         focus: '瀏覽時長',
         time: '訪問次數',
         operation: {
@@ -73,6 +79,7 @@ const _default: Messages<ItemMessage> = {
         date: 'Date',
         host: 'Site URL',
         total: 'Running Time',
+        totalTip: 'The author plans to take this column offline in the near future. If you have questions, feel free to submit feedback.',
         focus: 'Browsing Time',
         time: 'Site Visits',
         operation: {
@@ -93,6 +100,7 @@ const _default: Messages<ItemMessage> = {
         date: '日期',
         host: 'URL',
         total: '実行時間',
+        totalTip: '著者は、近い将来にオフラインにする予定です。 ご不明な点がございましたら、お気軽にフィードバックを送信してください。',
         focus: '閲覧時間',
         time: '拜訪回数',
         operation: {