lujiuyin/suixinkan_ios_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

从 iOS 17 Observation 迁移至 iOS 16 兼容的 Combine 架构

Browse Source 
将最低部署版本降至 iOS 16，以 ObservableObject 替换 @Observable，新增导航与 UI 兼容层，并补充登录冒烟 UI 测试。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
汉秋
2026-06-26 10:16:35 +08:00
parent 0314033a7f
commit 703078352c
127 changed files with 2320 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
suixinkan/Features/ScenicPermission/ViewModels/PermissionApplyViewModel.swift
View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
/// 权限申请角色选项实体，表示可申请的一个业务角色。
struct PermissionRoleOption: Equatable, Identifiable {
@ -31,21 +31,20 @@ struct ExistingRolePermissionInfo: Equatable, Identifiable {
}
@MainActor
@Observable
/// 权限申请 ViewModel，负责角色/景区选择和提交审核。
final class PermissionApplyViewModel {
var roleOptions: [PermissionRoleOption] = []
var selectedRoleId: Int?
var scenicOptions: [PermissionScenicOption] = []
var loadingScenics = false
var scenicLoadFailed = false
var scenicLoadFailureReason: String?
var submitting = false
var message: String?
final class PermissionApplyViewModel: ObservableObject {
@Published var roleOptions: [PermissionRoleOption] = []
@Published var selectedRoleId: Int?
@Published var scenicOptions: [PermissionScenicOption] = []
@Published var loadingScenics = false
@Published var scenicLoadFailed = false
@Published var scenicLoadFailureReason: String?
@Published var submitting = false
@Published var message: String?
private let initialPending: RoleApplyPendingResponse?
private var rolePermissions: [RolePermissionResponse] = []
private var selectedIds: Set<Int> = []
@Published private var rolePermissions: [RolePermissionResponse] = []
@Published private var selectedIds: Set<Int> = []
/// 初始化权限申请 ViewModel，可传入驳回申请用于编辑回填。
init(initialPending: RoleApplyPendingResponse? = nil) {
@ -181,13 +180,12 @@ final class PermissionApplyViewModel {
}
@MainActor
@Observable
/// 权限申请状态 ViewModel，负责读取审核中的或指定编号的权限申请。
final class PermissionApplyStatusViewModel {
var loading = false
var pending: RoleApplyPendingResponse?
var loadFailed = false
var loadFailureReason: String?
final class PermissionApplyStatusViewModel: ObservableObject {
@Published var loading = false
@Published var pending: RoleApplyPendingResponse?
@Published var loadFailed = false
@Published var loadFailureReason: String?
/// 加载权限申请状态；有申请编号时优先匹配编号，否则展示审核中或驳回记录。
func load(api: any ScenicPermissionServing, applyCode: String?) async {