fix: 修复 Mod 配置页启用状态的读写

Author: Applesaber

ChuChartManager/Front/src/client/mod.ts

@@ -48,6 +48,7 @@ export interface Manifest {
 }
 
 export interface ModConfigSection {
+  enabled: boolean
   entries: Record<string, unknown>
 }
 

ChuChartManager/Front/src/locales/en.yaml

@@ -224,7 +224,7 @@ music:
   openExplorer: Open in Explorer
   openXml: Edit Music.xml
 mods:
-  experimentalWarning: This feature is experimental and may be unstable
+  appleChuBetaWarning: AppleChu is currently in closed beta. Features and configuration formats may change between versions
   wip: Loading...
   noMods: No Mods detected
   search: Search features...

ChuChartManager/Front/src/locales/ja.yaml

@@ -224,7 +224,7 @@ music:
   openExplorer: エクスプローラーで開く
   openXml: Music.xml を編集
 mods:
-  experimentalWarning: この機能は実験的であり、不安定な場合があります
+  appleChuBetaWarning: AppleChu は現在クローズドベータ版です。機能や設定形式はバージョンによって変更される場合があります
   wip: 読み込み中...
   noMods: Mod が検出されません
   search: 機能を検索...

ChuChartManager/Front/src/locales/zh.yaml

@@ -224,7 +224,7 @@ music:
   openExplorer: 在资源管理器中打开
   openXml: 编辑 Music.xml
 mods:
-  experimentalWarning: 此功能为实验性，可能存在不稳定的情况
+  appleChuBetaWarning: AppleChu 目前处于内测阶段，功能和配置格式可能随版本调整
   wip: 正在加载...
   noMods: 未检测到 Mod
   search: 搜索功能...

ChuChartManager/Front/src/views/ModManager.vue

@@ -123,7 +123,7 @@ watch(config, () => {
 
 <template>
   <div class="p-xy h-100dvh flex flex-col of-hidden">
-    <div class="text-sm op-60 mb-3 px-2 py-1.5 bg-orange/10 c-orange rd">{{ t('mods.experimentalWarning') }}</div>
+    <div class="text-sm op-60 mb-3 px-2 py-1.5 bg-orange/10 c-orange rd">{{ t('mods.appleChuBetaWarning') }}</div>
     <div v-if="!loading" class="flex items-center gap-x-6 gap-y-2 flex-wrap shrink-0 px-2 pb-3 border-b border-solid border-[oklch(0.9_0.02_var(--hue))]">
       <div class="flex items-center gap-2 min-w-0">
         <span :class="modOk ? 'i-mdi-check-circle c-green-6' : 'i-mdi-alert-circle c-red-6'" class="text-5 shrink-0" />

ChuChartManager/Front/src/views/ModManager/ModConfigurator.vue

@@ -48,9 +48,13 @@ const visibleSections = computed(() => {
 function ensureState(section: ManifestSection) {
   if (!props.config[section.id]) {
     props.config[section.id] = {
+      enabled: !!section.always_enabled || !!section.default_enabled,
       entries: {},
     }
   }
+  else if (typeof props.config[section.id].enabled !== 'boolean') {
+    props.config[section.id].enabled = !!section.always_enabled || !!section.default_enabled
+  }
   return props.config[section.id]
 }
 </script>

ChuChartManager/Front/src/views/ModManager/ModSection.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { computed, ref, useId } from 'vue'
+import { CheckBox } from '@munet/ui'
 import { locale } from '@/locales'
 import type { ManifestSection, ModConfigSection } from '@/client/mod'
 import ModEntry from './ModEntry.vue'
@@ -13,64 +14,74 @@ const props = defineProps<{
 const language = computed(() => locale.value.startsWith('zh') ? 'zh' : 'en')
 const label = computed(() => props.section.label?.[language.value] || props.section.id)
 const description = computed(() => props.section.description?.[language.value] || '')
-const entries = computed(() => props.section.entries?.filter(entry => !entry.hidden) ?? [])
+const entries = computed(() => props.section.entries?.filter(entry =>
+  !entry.hidden && entry.key.replaceAll('_', '').toLowerCase() !== 'enable') ?? [])
 const basicEntries = computed(() => entries.value.filter(entry => !entry.advanced))
 const advancedEntries = computed(() => entries.value.filter(entry => entry.advanced))
 const advancedExpanded = ref(false)
 const advancedOpen = computed(() => props.revealAdvanced || advancedExpanded.value)
 const advancedContentId = `advanced-${useId()}`
+const enabled = computed({
+  get: () => props.section.always_enabled ? true : props.state.enabled,
+  set: value => { props.state.enabled = props.section.always_enabled ? true : value },
+})
 </script>
 
 <template>
-  <div class="mod-section">
+  <div class="mod-section" :class="{ 'section-disabled': !enabled, 'always-enabled': section.always_enabled }">
     <div class="section-header">
-      <div class="section-label">{{ label }}</div>
+      <CheckBox v-if="!section.always_enabled" v-model:value="enabled" class="section-switch">
+        <span class="section-label">{{ label }}</span>
+      </CheckBox>
+      <div v-else class="section-label">{{ label }}</div>
       <div v-if="description" class="text-sm op-80 min-w-0">{{ description }}</div>
     </div>
 
-    <div v-if="basicEntries.length" class="flex flex-col gap-2 mt-2">
-      <ModEntry
-        v-for="entry in basicEntries"
-        :key="entry.key"
-        :entry="entry"
-        :section-state="state"
-      />
-    </div>
-
-    <template v-if="advancedEntries.length">
-      <button
-        v-if="!revealAdvanced"
-        type="button"
-        class="advanced-toggle"
-        :aria-expanded="advancedOpen"
-        :aria-controls="advancedContentId"
-        @click="advancedExpanded = !advancedExpanded"
-      >
-        <span
-          class="i-mdi-chevron-down advanced-chevron"
-          :class="{ expanded: advancedOpen }"
-          aria-hidden="true"
-        />
-        <span>{{ $t('mods.advancedOptions') }}</span>
-        <span class="op-55">{{ advancedEntries.length }}</span>
-      </button>
-      <div v-else class="advanced-label">
-        <span class="i-mdi-tune-variant text-4" aria-hidden="true" />
-        <span>{{ $t('mods.advancedOptions') }}</span>
-      </div>
-      <div
-        v-show="advancedOpen"
-        :id="advancedContentId"
-        class="flex flex-col gap-2 mt-2"
-      >
+    <div class="section-options">
+      <div v-if="basicEntries.length" class="flex flex-col gap-2 mt-2">
         <ModEntry
-          v-for="entry in advancedEntries"
+          v-for="entry in basicEntries"
           :key="entry.key"
           :entry="entry"
           :section-state="state"
         />
       </div>
-    </template>
+
+      <template v-if="advancedEntries.length">
+        <button
+          v-if="!revealAdvanced"
+          type="button"
+          class="advanced-toggle"
+          :aria-expanded="advancedOpen"
+          :aria-controls="advancedContentId"
+          @click="advancedExpanded = !advancedExpanded"
+        >
+          <span
+            class="i-mdi-chevron-down advanced-chevron"
+            :class="{ expanded: advancedOpen }"
+            aria-hidden="true"
+          />
+          <span>{{ $t('mods.advancedOptions') }}</span>
+          <span class="op-55">{{ advancedEntries.length }}</span>
+        </button>
+        <div v-else class="advanced-label">
+          <span class="i-mdi-tune-variant text-4" aria-hidden="true" />
+          <span>{{ $t('mods.advancedOptions') }}</span>
+        </div>
+        <div
+          v-show="advancedOpen"
+          :id="advancedContentId"
+          class="flex flex-col gap-2 mt-2"
+        >
+          <ModEntry
+            v-for="entry in advancedEntries"
+            :key="entry.key"
+            :entry="entry"
+            :section-state="state"
+          />
+        </div>
+      </template>
+    </div>
   </div>
 </template>
 
@@ -86,6 +97,15 @@ const advancedContentId = `advanced-${useId()}`
   &:hover
     border-color: oklch(0.68 0.17 var(--hue) / 0.45)
 
+  &.always-enabled
+    background: oklch(0.68 0.17 var(--hue) / 0.05)
+
+  &.section-disabled .section-options
+    opacity: 0.48
+
+.section-options
+  transition: opacity 0.2s ease
+
 .section-header
   display: grid
   grid-template-columns: minmax(8rem, 12rem) minmax(0, 1fr)
@@ -97,6 +117,9 @@ const advancedContentId = `advanced-${useId()}`
   font-size: 1rem
   overflow-wrap: anywhere
 
+.section-switch
+  min-width: 0
+
 .advanced-toggle,
 .advanced-label
   display: flex

ChuChartManager/Services/AppleChuConfigSchema.cs

@@ -17,6 +17,8 @@ internal sealed record AppleChuConfigEntrySchema(
 
 internal sealed record AppleChuConfigSectionSchema(
     string Id,
+    bool DefaultEnabled,
+    bool AlwaysEnabled,
     IReadOnlyList<AppleChuConfigEntrySchema> Entries);
 
 internal static class AppleChuConfigSchema
@@ -38,7 +40,15 @@ internal static IReadOnlyList<AppleChuConfigSectionSchema> Parse(
                 foreach (var rawEntry in rawEntries)
                     entries.Add(ParseEntry(rawEntry, id));
             }
-            result.Add(new AppleChuConfigSectionSchema(id, entries));
+            var alwaysEnabled = ReadBooleanAlias(rawSection, id, false, "always_enabled", "alwaysEnabled");
+            var defaultEnabled = ReadBooleanAlias(
+                rawSection,
+                id,
+                alwaysEnabled,
+                "default_enabled",
+                "default_on",
+                "defaultOn");
+            result.Add(new AppleChuConfigSectionSchema(id, defaultEnabled, alwaysEnabled, entries));
         }
 
         return result;
@@ -78,6 +88,29 @@ internal static bool KeysEqual(string left, string right) => string.Equals(
         right.Replace("_", "", StringComparison.Ordinal),
         StringComparison.OrdinalIgnoreCase);
 
+    internal static bool IsEnableEntry(AppleChuConfigEntrySchema entry) => KeysEqual(entry.Key, "enable");
+
+    private static bool ReadBooleanAlias(
+        TomlTable table,
+        string sectionId,
+        bool fallback,
+        params string[] keys)
+    {
+        bool? result = null;
+        foreach (var key in keys)
+        {
+            if (!table.TryGetValue(key, out var value))
+                continue;
+            if (value is not bool boolean)
+                throw new InvalidDataException($"manifest 中 {sectionId}.{key} 必须是布尔值");
+            if (result.HasValue && result.Value != boolean)
+                throw new InvalidDataException($"manifest 中 {sectionId} 的启用状态元数据存在冲突");
+            result = boolean;
+        }
+
+        return result ?? fallback;
+    }
+
     private static AppleChuConfigEntrySchema ParseEntry(TomlTable rawEntry, string sectionId)
     {
         var key = rawEntry.TryGetValue("key", out var keyValue) ? keyValue as string : null;

ChuChartManager/Services/AppleChuConfigService.cs

@@ -6,7 +6,7 @@ namespace ChuChartManager.Services;
 
 public sealed class AppleChuConfigService
 {
-    public sealed record SectionState(Dictionary<string, object?> Entries);
+    public sealed record SectionState(bool Enabled, Dictionary<string, object?> Entries);
 
     private readonly object writeLock = new();
 
@@ -28,17 +28,20 @@ public Dictionary<string, SectionState> ReadOrCreate(
         foreach (var section in schema)
         {
             var table = GetTable(document, section.Id);
+            var enabled = ReadEnabled(section, table);
             var entries = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase);
             foreach (var entry in section.Entries)
             {
+                if (AppleChuConfigSchema.IsEnableEntry(entry))
+                    continue;
                 if (AppleChuConfigSchema.TryGetValue(table, entry.Key, out var configured)
                     && AppleChuConfigSchema.TryNormalize(entry, configured, out var normalized))
                 {
                     entries[entry.Key] = normalized;
                 }
             }
 
-            result[section.Id] = new SectionState(entries);
+            result[section.Id] = new SectionState(enabled, entries);
         }
 
         return result;
@@ -81,19 +84,22 @@ private static IReadOnlyDictionary<string, SectionState> NormalizeRequest(
         foreach (var section in schema)
         {
             requestedSections.TryGetValue(section.Id, out var requested);
+            var enabled = section.AlwaysEnabled || (requested?.Enabled ?? section.DefaultEnabled);
             var entries = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase);
             foreach (var (key, supplied) in requested?.Entries ?? [])
             {
                 var entry = section.Entries.FirstOrDefault(item =>
                     AppleChuConfigSchema.KeysEqual(item.Key, key));
                 if (entry == null)
                     throw new ArgumentException($"未知的 AppleChu 配置项: {section.Id}.{key}");
+                if (AppleChuConfigSchema.IsEnableEntry(entry))
+                    throw new ArgumentException($"{section.Id}.Enable 必须通过栏目开关设置");
                 if (!AppleChuConfigSchema.TryNormalize(entry, supplied, out var normalized))
                     throw new ArgumentException($"{section.Id}.{entry.Key} 的值不符合 {entry.Type} 类型、范围或候选值");
                 entries[entry.Key] = normalized;
             }
 
-            result[section.Id] = new SectionState(entries);
+            result[section.Id] = new SectionState(enabled, entries);
         }
 
         return result;
@@ -117,6 +123,33 @@ private static TomlTable ParseDocument(string source, string name)
         return AppleChuConfigSchema.TryGetValue(document, key, out var value) ? value as TomlTable : null;
     }
 
+    private static bool ReadEnabled(AppleChuConfigSectionSchema section, TomlTable? table)
+    {
+        if (section.AlwaysEnabled)
+            return true;
+
+        var enableEntry = section.Entries.FirstOrDefault(AppleChuConfigSchema.IsEnableEntry);
+        if (enableEntry != null)
+        {
+            if (AppleChuConfigSchema.TryGetValue(table, enableEntry.Key, out var configured)
+                && AppleChuConfigSchema.TryNormalize(enableEntry, configured, out var normalized)
+                && normalized is bool enabled)
+            {
+                return enabled;
+            }
+
+            return section.DefaultEnabled;
+        }
+
+        if (AppleChuConfigSchema.TryGetValue(table, "Disabled", out var disabledValue)
+            && disabledValue is bool disabled)
+        {
+            return !disabled;
+        }
+
+        return table != null || section.DefaultEnabled;
+    }
+
     private static string GetConfigPath(string gamePath) => Path.Combine(gamePath, "bin", "AppleChu.toml");
 
     private static void WriteAtomically(string path, string contents)