From 15cef6cf0ba330c3f3116bc2e87b31be2c158d12 Mon Sep 17 00:00:00 2001
From: Ariver <ar@MacBook-Air.local>
Date: Wed, 06 May 2026 11:35:55 +0800
Subject: [PATCH] checkpoint: v2.0.2 — 标签拖拽排序，tagOrder 持久化到 DB，影响显示分组顺序
---
Apptag/ContentView.swift | 45 ++++++++++++++++------
Apptag/DataLayer.swift | 39 +++++++++++++++++--
Apptag/Info.plist | 2
3 files changed, 69 insertions(+), 17 deletions(-)
diff --git a/Apptag/ContentView.swift b/Apptag/ContentView.swift
index a9e24e6..c399bac 100644
--- a/Apptag/ContentView.swift
+++ b/Apptag/ContentView.swift
@@ -202,6 +202,7 @@
@State private var selectedAppPaths: Set<URL> = []
@State private var selectedTagNames: Set<String> = []
@State private var successToast: String? = nil
+ @State private var draggedTagNames: [String] = [] // live drag order
// Configurable defaults
@AppStorage("defaultGroupName") private var defaultGroupName = "Other"
@@ -267,8 +268,11 @@
func setEditPhase(_ phase: EditPhase) {
if phase != .none {
NotificationCenter.default.post(name: .apptagEditModeChanged, object: nil, userInfo: ["active": true])
- // Re-activate to ensure overlay window stays key during view transition
NSApp.activate(ignoringOtherApps: true)
+ // Sync drag order from database when entering edit mode
+ if draggedTagNames.isEmpty {
+ draggedTagNames = TagEditor.orderedTagNames()
+ }
}
editPhase = phase
if phase == .none {
@@ -434,13 +438,23 @@
HStack(spacing: 0) {
VStack(alignment: .leading, spacing: 4) {
Text("Select tags:").font(.caption).foregroundStyle(.secondary).padding(.bottom, 4)
- ScrollView(.vertical, showsIndicators: false) {
- VStack(spacing: 4) {
- ForEach(sortedTagNames, id: \.self) { tagName in
- selectableTagItem(tagName)
- }
- }.padding(12)
- }.frame(width: 145)
+ List {
+ ForEach(sortedTagNames, id: \.self) { tagName in
+ selectableTagItem(tagName)
+ }
+ .onMove { from, to in
+ var names = sortedTagNames
+ names.move(fromOffsets: from, toOffset: to)
+ // Persist the new order
+ let fullOrder = TagEditor.orderedTagNames()
+ let otherTags = fullOrder.filter { !names.contains($0) }
+ draggedTagNames = names + otherTags
+ TagEditor.reorderTags(draggedTagNames)
+ }
+ }
+ .listStyle(.plain)
+ .scrollContentBackground(.hidden)
+ .frame(width: 170)
}
Rectangle().fill(.secondary.opacity(0.12)).frame(width: 1)
@@ -544,9 +558,11 @@
// MARK: - Computed
private var sortedTagNames: [String] {
- tagColors.keys
- .filter { $0 != "Mac自带" && $0 != defaultGroupName }
- .sorted { $0.localizedStandardCompare($1) == .orderedAscending }
+ let filtered = tagColors.keys.filter { $0 != "Mac自带" && $0 != defaultGroupName }
+ // Use user-defined order, fall back to alpha
+ let ordered = draggedTagNames.filter { filtered.contains($0) }
+ let remaining = filtered.filter { !ordered.contains($0) }.sorted()
+ return ordered + remaining
}
private var tagLabels: [TagLabel] {
@@ -554,7 +570,10 @@
}
private var groups: [TagGroup] {
- AppIndexer.group(apps: allApps, defaultGroupName: defaultGroupName)
+ let order = draggedTagNames.isEmpty
+ ? TagEditor.orderedTagNames()
+ : draggedTagNames
+ return AppIndexer.group(apps: allApps, defaultGroupName: defaultGroupName, tagOrder: order)
}
// MARK: - Actions
@@ -570,9 +589,11 @@
let store = TagDatabase.migrateFromFinderIfNeeded(apps: apps)
apps = TagEditor.annotate(apps: apps)
let colors = store.tags.mapValues { $0.color }
+ let order = TagEditor.orderedTagNames()
DispatchQueue.main.async {
allApps = apps
tagColors = colors
+ draggedTagNames = order
}
}
}
diff --git a/Apptag/DataLayer.swift b/Apptag/DataLayer.swift
index ffcd67f..7dc2cbd 100644
--- a/Apptag/DataLayer.swift
+++ b/Apptag/DataLayer.swift
@@ -96,10 +96,12 @@
}
/// Group apps by their tags (from TagDatabase).
+ /// Groups are sorted by tagOrder (user-defined), falling back to alpha.
static func group(
apps: [AppInfo],
nameOverrides: [String: String] = [:],
- defaultGroupName: String = "Other"
+ defaultGroupName: String = "Other",
+ tagOrder: [String] = []
) -> [TagGroup] {
let macCategory = "Mac自带"
var dict: [String: [AppInfo]] = [:]
@@ -116,19 +118,27 @@
}
}
+ // Build sort index from tagOrder: lower index = appears first
+ var orderIndex: [String: Int] = [:]
+ for (i, name) in tagOrder.enumerated() {
+ orderIndex[name] = i
+ }
+
return dict
.sorted { lhs, rhs in
if lhs.key == macCategory { return false }
if rhs.key == macCategory { return true }
if lhs.key == defaultGroupName { return false }
if rhs.key == defaultGroupName { return true }
+ // Use custom order if both are in tagOrder
+ let li = orderIndex[lhs.key] ?? Int.max
+ let ri = orderIndex[rhs.key] ?? Int.max
+ if li != ri { return li < ri }
return lhs.key.localizedStandardCompare(rhs.key) == .orderedAscending
}
.map { TagGroup(name: $0.key, apps: $0.value) }
}
}
-
-// MARK: - Local Tag Database (JSON-backed)
enum TagDatabase {
@@ -142,6 +152,7 @@
var version: Int = 1
var tags: [String: TagDef] = [:]
var appTags: [String: [String]] = [:] // path → tag names
+ var tagOrder: [String] = [] // display order; empty → alpha sort
var migrated: Bool = false
}
@@ -273,6 +284,21 @@
return store.tags.mapValues { $0.color }
}
+ /// Tag names in display order. Falls back to alpha sort if no custom order.
+ static func orderedTagNames() -> [String] {
+ let store = TagDatabase.load()
+ let ordered = store.tagOrder.filter { store.tags[$0] != nil }
+ let remaining = store.tags.keys.filter { !ordered.contains($0) }.sorted()
+ return ordered + remaining
+ }
+
+ /// Persist a new tag display order.
+ static func reorderTags(_ names: [String]) {
+ var store = TagDatabase.load()
+ store.tagOrder = names
+ TagDatabase.save(store)
+ }
+
/// Annotate scanned apps with tags from the database.
static func annotate(apps: [AppInfo]) -> [AppInfo] {
let store = TagDatabase.load()
@@ -291,7 +317,11 @@
static func assignTag(_ tag: String, color: Int, to paths: [String]) {
var store = TagDatabase.load()
// Ensure tag definition exists
- if store.tags[tag] == nil { store.tags[tag] = TagDatabase.TagDef(color: color) }
+ if store.tags[tag] == nil {
+ store.tags[tag] = TagDatabase.TagDef(color: color)
+ // New tag: append to display order
+ if !store.tagOrder.contains(tag) { store.tagOrder.append(tag) }
+ }
for path in paths {
var current = store.appTags[path] ?? []
if !current.contains(tag) {
@@ -335,6 +365,7 @@
static func deleteTagCompletely(_ tag: String) {
var store = TagDatabase.load()
store.tags.removeValue(forKey: tag)
+ store.tagOrder.removeAll { $0 == tag }
for (path, var tags) in store.appTags {
tags.removeAll { $0 == tag }
if tags.isEmpty {
diff --git a/Apptag/Info.plist b/Apptag/Info.plist
index afcc28f..9fd523b 100644
--- a/Apptag/Info.plist
+++ b/Apptag/Info.plist
@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.0.1</string>
+ <string>2.0.2</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
--
Gitblit v1.9.3