Package-Helper:improve:UI及操作逻辑调整

BlackCCCat · BlackCCCat · commit df09dea23d1d · 2026-04-09T15:19:39.000+08:00
diff --git a/Package-Helper/app_intents.tsx b/Package-Helper/app_intents.tsx
@@ -35,7 +35,7 @@ export const TogglePickedIntent = AppIntentManager.register({
     const index = pickedItems.findIndex(item => item.code === code)
 
     if (index >= 0) {
-      pickedItems[index].timestamp = 1
+      pickedItems.splice(index, 1)
     } else {
       pickedItems.push({ code, timestamp: Date.now() })
     }
@@ -67,7 +67,7 @@ export const MarkAllPickedIntent = AppIntentManager.register({
           const code = singleCodeMatch[0]
           if (code && !existing.has(code)) {
             existing.add(code)
-            pickedItems.push({ code, timestamp: 1 })
+            pickedItems.push({ code, timestamp: Date.now() })
           }
         }
       }
diff --git a/Package-Helper/components/HomePage.tsx b/Package-Helper/components/HomePage.tsx
@@ -1,5 +1,6 @@
 import {
   Button,
+  DisclosureGroup,
   ForEach,
   HStack,
   List,
@@ -11,7 +12,7 @@ import {
 } from "scripting"
 
 import { EmptyPickupBlock, MetricTile, PickupRow } from "./common"
-import { getAllPickupInfo, loadConfig } from "../utils"
+import { getHomePickupInfo, loadConfig } from "../utils"
 
 export function HomePage(props: {
   onRefresh: () => void
@@ -20,10 +21,11 @@ export function HomePage(props: {
   onDelete: (code: string) => void
 }) {
   const cfg = loadConfig()
-  const allItems = getAllPickupInfo(cfg)
+  const allItems = getHomePickupInfo(cfg)
   const pendingItems = allItems.filter((item) => !item.picked)
   const pickedItems = allItems.filter((item) => item.picked)
   const [showRefreshToast, setShowRefreshToast] = useState(false)
+  const [pickedExpanded, setPickedExpanded] = useState(false)
 
   return (
     <NavigationStack>
@@ -123,28 +125,33 @@ export function HomePage(props: {
               subtitle="标记已取件后，会在这里保留最近状态。"
             />
           ) : (
-            <ForEach
-              count={pickedItems.slice(0, 3).length}
-              itemBuilder={(index) => {
-                const item = pickedItems.slice(0, 3)[index]
-                return (
-                  <PickupRow
-                    key={`picked-${item.code}-${index}`}
-                    item={item}
-                    showDate={cfg.showDate}
-                    checked
-                    onToggle={props.onUnpicked}
-                  />
-                )
-              }}
-              onDelete={(indices) => {
-                const shownItems = pickedItems.slice(0, 3)
-                for (const index of indices) {
-                  const item = shownItems[index]
-                  if (item) props.onDelete(item.code)
-                }
-              }}
-            />
+            <DisclosureGroup
+              title={`最近已处理 (${pickedItems.length})`}
+              isExpanded={pickedExpanded}
+              onChanged={setPickedExpanded}
+            >
+              <ForEach
+                count={pickedItems.length}
+                itemBuilder={(index) => {
+                  const item = pickedItems[index]
+                  return (
+                    <PickupRow
+                      key={`picked-${item.code}-${index}`}
+                      item={item}
+                      showDate={cfg.showDate}
+                      checked
+                      onToggle={props.onUnpicked}
+                    />
+                  )
+                }}
+                onDelete={(indices) => {
+                  for (const index of indices) {
+                    const item = pickedItems[index]
+                    if (item) props.onDelete(item.code)
+                  }
+                }}
+              />
+            </DisclosureGroup>
           )}
         </Section>
       </List>
diff --git a/Package-Helper/components/PreviewPage.tsx b/Package-Helper/components/PreviewPage.tsx
@@ -7,14 +7,62 @@ import {
   Text,
 } from "scripting"
 import { EmptyPickupBlock, PickupRow } from "./common"
-import { getAllPickupInfo, handleAnyData, loadConfig, safeRefreshWidget } from "../utils"
+import { clearPreviewResults, getPreviewPickupInfo, handleAnyData, loadConfig, safeRefreshWidget } from "../utils"
 
 export function PreviewPage(props: {
   onChanged: () => void
   onDelete: (code: string) => void
+  onClear: () => void
 }) {
   const cfg = loadConfig()
-  const previewItems = getAllPickupInfo(cfg).slice(0, cfg.widgetShowCount)
+  const previewItems = getPreviewPickupInfo(cfg)
+
+  const groupedItems = [
+    {
+      title: "今天",
+      items: previewItems.filter((item) => {
+        const value = item.date || item.importedAt
+        if (!value) return false
+        const date = new Date(value)
+        const now = new Date()
+        return date.toDateString() === now.toDateString()
+      }),
+    },
+    {
+      title: "近3天",
+      items: previewItems.filter((item) => {
+        const value = item.date || item.importedAt
+        if (!value) return false
+        const time = new Date(value).getTime()
+        if (!Number.isFinite(time)) return false
+        const now = Date.now()
+        const startOfToday = new Date()
+        startOfToday.setHours(0, 0, 0, 0)
+        return time < startOfToday.getTime() && time >= now - 3 * 24 * 60 * 60 * 1000
+      }),
+    },
+    {
+      title: "近7天",
+      items: previewItems.filter((item) => {
+        const value = item.date || item.importedAt
+        if (!value) return false
+        const time = new Date(value).getTime()
+        if (!Number.isFinite(time)) return false
+        const now = Date.now()
+        return time < now - 3 * 24 * 60 * 60 * 1000 && time >= now - 7 * 24 * 60 * 60 * 1000
+      }),
+    },
+    {
+      title: "更早",
+      items: previewItems.filter((item) => {
+        const value = item.date || item.importedAt
+        if (!value) return true
+        const time = new Date(value).getTime()
+        if (!Number.isFinite(time)) return true
+        return time < Date.now() - 7 * 24 * 60 * 60 * 1000
+      }),
+    },
+  ].filter((group) => group.items.length > 0)
 
   return (
     <NavigationStack>
@@ -23,6 +71,21 @@ export function PreviewPage(props: {
         navigationBarTitleDisplayMode="inline"
         listStyle="insetGroup"
         toolbar={{
+          topBarLeading: (
+            <Button
+              title="清空"
+              action={async () => {
+                const ok = await Dialog.confirm({
+                  title: "清空解析结果",
+                  message: "这只会清空预览页中的解析结果，不会影响主页包裹。",
+                  confirmLabel: "清空",
+                })
+                if (!ok) return
+                clearPreviewResults()
+                props.onClear()
+              }}
+            />
+          ),
           topBarTrailing: (
             <Button
               title=""
@@ -52,20 +115,22 @@ export function PreviewPage(props: {
           ),
         }}
       >
-        <Section header={<Text>解析预览</Text>}>
-          {previewItems.length === 0 ? (
+        {groupedItems.length === 0 ? (
+          <Section header={<Text>解析预览</Text>}>
             <EmptyPickupBlock
               title="暂无可预览内容"
               subtitle="添加短信后，这里会展示当前解析出来的包裹结果。"
             />
-          ) : (
+          </Section>
+        ) : groupedItems.map((group) => (
+          <Section key={group.title} header={<Text>{group.title}</Text>}>
             <ForEach
-              count={previewItems.length}
+              count={group.items.length}
               itemBuilder={(index) => {
-                const item = previewItems[index]
+                const item = group.items[index]
                 return (
                   <PickupRow
-                    key={`preview-${item.code}-${index}`}
+                    key={`preview-${group.title}-${item.code}-${index}`}
                     item={item}
                     showDate={cfg.showDate}
                     checked={!!item.picked}
@@ -74,13 +139,13 @@ export function PreviewPage(props: {
               }}
               onDelete={(indices) => {
                 for (const index of indices) {
-                  const item = previewItems[index]
+                  const item = group.items[index]
                   if (item) props.onDelete(item.code)
                 }
               }}
             />
-          )}
-        </Section>
+          </Section>
+        ))}
       </List>
     </NavigationStack>
   )
diff --git a/Package-Helper/components/RootTabView.tsx b/Package-Helper/components/RootTabView.tsx
@@ -9,7 +9,7 @@ import { HomePage } from "./HomePage"
 import { PreviewPage } from "./PreviewPage"
 import { SettingsPage } from "./SettingsPage"
 import { HOME_TAB, PREVIEW_TAB, SETTINGS_TAB } from "../types"
-import { deletePickup, markPicked, safeRefreshWidget, unmarkPicked } from "../utils"
+import { deleteHomePickup, deletePreviewPickup, markPicked, safeRefreshWidget, unmarkPicked } from "../utils"
 
 export function RootTabView(props: {
   initialNotice?: string | null
@@ -32,8 +32,10 @@ export function RootTabView(props: {
         <PreviewPage
           onChanged={() => bump()}
           onDelete={(code) => {
-            deletePickup(code)
-            safeRefreshWidget()
+            deletePreviewPickup(code)
+            bump()
+          }}
+          onClear={() => {
             bump()
           }}
         />
@@ -53,7 +55,7 @@ export function RootTabView(props: {
             bump()
           }}
           onDelete={(code) => {
-            deletePickup(code)
+            deleteHomePickup(code)
             safeRefreshWidget()
             bump()
           }}
diff --git a/Package-Helper/components/SettingsPage.tsx b/Package-Helper/components/SettingsPage.tsx
@@ -4,6 +4,7 @@ import {
   Image,
   Navigation,
   NavigationStack,
+  Picker,
   Slider,
   Section,
   Text,
@@ -25,6 +26,7 @@ import {
   resetConfig,
   saveConfig,
   safeRefreshWidget,
+  CLEANUP_DAY_OPTIONS,
 } from "../utils"
 
 export function SettingsPage(props: {
@@ -35,6 +37,9 @@ export function SettingsPage(props: {
   const [keywords, setKeywords] = useState<string[]>(cfg.keywords)
   const [showCount, setShowCount] = useState(cfg.widgetShowCount)
   const [showDate, setShowDate] = useState(cfg.showDate)
+  const [autoCleanupPicked, setAutoCleanupPicked] = useState(cfg.autoCleanupPicked)
+  const [autoCleanupPreview, setAutoCleanupPreview] = useState(cfg.autoCleanupPreview)
+  const [cleanupDays, setCleanupDays] = useState(cfg.cleanupDays)
 
   const [showSavedToast, setShowSavedToast] = useState(false)
   const [toastMessage, setToastMessage] = useState("已保存")
@@ -50,13 +55,19 @@ export function SettingsPage(props: {
       keywords: normalizeKeywords(next.keywords ?? keywords),
       widgetShowCount: clampShowCount(Number(next.widgetShowCount ?? showCount)),
       showDate: next.showDate ?? showDate,
+      autoCleanupPicked: next.autoCleanupPicked ?? autoCleanupPicked,
+      autoCleanupPreview: next.autoCleanupPreview ?? autoCleanupPreview,
+      cleanupDays: next.cleanupDays ?? cleanupDays,
     }
 
     saveConfig(merged)
     setAutoDetect(merged.autoDetectSMS)
     setKeywords(merged.keywords)
     setShowCount(merged.widgetShowCount)
     setShowDate(merged.showDate)
+    setAutoCleanupPicked(merged.autoCleanupPicked)
+    setAutoCleanupPreview(merged.autoCleanupPreview)
+    setCleanupDays(merged.cleanupDays)
     if (!options?.silent) {
       presentToast("已保存")
     }
@@ -120,24 +131,51 @@ export function SettingsPage(props: {
             </HStack>
             <Slider
               min={1}
-              max={50}
+              max={8}
               step={1}
               value={showCount}
               onChanged={setShowCount}
               minValueLabel={<Text>1</Text>}
-              maxValueLabel={<Text>50</Text>}
+              maxValueLabel={<Text>8</Text>}
               label={<Text>显示条数</Text>}
             />
           </VStack>
         </Section>
 
+        <Section header={<Text>自动清理</Text>}>
+          <Toggle
+            title="已取件过期自动清理"
+            value={autoCleanupPicked}
+            onChanged={setAutoCleanupPicked}
+          />
+
+          <Toggle
+            title="解析预览过期自动清理"
+            value={autoCleanupPreview}
+            onChanged={setAutoCleanupPreview}
+          />
+
+          {autoCleanupPicked || autoCleanupPreview ? (
+            <Picker
+              title="清理周期"
+              pickerStyle="menu"
+              value={cleanupDays}
+              onChanged={setCleanupDays}
+            >
+              {CLEANUP_DAY_OPTIONS.map((days) => (
+                <Text key={`cleanup-${days}`} tag={days}>{days} 天</Text>
+              ))}
+            </Picker>
+          ) : null}
+        </Section>
+
         <Section header={<Text>数据管理</Text>}>
           <CenterDestructiveRow
             title="清除已取记录"
             onPress={async () => {
               const ok = await Dialog.confirm({
                 title: "清除已取记录",
-                message: "仅清除已处理状态，已导入短信会保留。",
+                message: "会从主页和小组件移除已取件记录，解析预览会保留。",
                 confirmLabel: "清除",
               })
               if (!ok) return
@@ -162,6 +200,9 @@ export function SettingsPage(props: {
               setKeywords(DEFAULT_CONFIG.keywords)
               setShowCount(DEFAULT_CONFIG.widgetShowCount)
               setShowDate(DEFAULT_CONFIG.showDate)
+              setAutoCleanupPicked(DEFAULT_CONFIG.autoCleanupPicked)
+              setAutoCleanupPreview(DEFAULT_CONFIG.autoCleanupPreview)
+              setCleanupDays(DEFAULT_CONFIG.cleanupDays)
               safeRefreshWidget()
               props.onChanged()
               presentToast("已重置")
diff --git a/Package-Helper/script.json b/Package-Helper/script.json
@@ -5,7 +5,7 @@
     "autoUpdateInterval": 86400
   },
   "description": "修改自：https://raw.githubusercontent.com/1085481057/Scripting/refs/heads/main/快递小助手.scripting",
-  "color": "rgba(37, 99, 235, 1)",
+  "color": "rgba(102, 196, 235, 1)",
   "runInApp": true,
   "localizedDescriptions": {},
   "version": "",
diff --git a/Package-Helper/types.ts b/Package-Helper/types.ts
diff --git a/Package-Helper/utils.ts b/Package-Helper/utils.ts
diff --git a/Package-Helper/widget.tsx b/Package-Helper/widget.tsx

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export const TogglePickedIntent = AppIntentManager.register({`
`35`	`35`	`const index = pickedItems.findIndex(item => item.code === code)`
`36`	`36`
`37`	`37`	`if (index >= 0) {`
`38`		`- pickedItems[index].timestamp = 1`
	`38`	`+ pickedItems.splice(index, 1)`
`39`	`39`	`} else {`
`40`	`40`	`pickedItems.push({ code, timestamp: Date.now() })`
`41`	`41`	`}`
`@@ -67,7 +67,7 @@ export const MarkAllPickedIntent = AppIntentManager.register({`
`67`	`67`	`const code = singleCodeMatch[0]`
`68`	`68`	`if (code && !existing.has(code)) {`
`69`	`69`	`existing.add(code)`
`70`		`- pickedItems.push({ code, timestamp: 1 })`
	`70`	`+ pickedItems.push({ code, timestamp: Date.now() })`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`