@lesliechan721/aw 0.1.0-beta.60 → 0.1.0-beta.62

package/dist/src/tui/console-app-v4.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { configReferenceKey, configReferenceValues, configReferenceScalars, configReferenceSelection, configReferenceMessage, configCrossLayerDependencies } from './config-references.js';
+import { configReferenceKey, configReferenceValues, configReferenceScalars, configReferenceSelection, configReferenceMessage, configReferenceSource, configCrossLayerDependencies } from './config-references.js';
 import { arrayDraftChanged, arrayDraftValue, createConfigArrayDraft, editConfigArrayDraft } from './config-array-draft.js';
 import { PLUGIN_CONFIG_ARRAY_MAX_ITEMS } from '@lesliechan721/aw-plugin-core';
 import { presentConfigValue, safeConfigText } from './config-value-presentation.js';
@@ -1074,6 +1074,8 @@ export function ConsoleAppV4(props) {
     });
     const externalDraftFlowIds = useRef(new Map());
     const configOverviewAnchors = useRef(new Map());
+    const suspendedConfigDrafts = useRef(new Map());
+    const referenceLeafDrafts = useRef(new Map());
     const exitSent = useRef(false);
     const operationBusy = useRef(false);
     const route = snapshot.router.current.route;
@@ -1384,6 +1386,10 @@ export function ConsoleAppV4(props) {
         if (currentFlowId && sourceDraft)
             externalDraftFlowIds.current.set(sourceDraft.owner, currentFlowId);
         const drafts = [];
+        for (const suspended of suspendedConfigDrafts.current.values()) {
+            if (suspended.externalDraft)
+                drafts.push(suspended.externalDraft);
+        }
         if ((dirty || configCandidate && !configCandidate.selectingScope || nestedPropertyRevision || objectVariantPreview || Object.values(arrayDrafts).some((draft) => draft.initial === undefined ? draft.rows.length > 0 : arrayDraftChanged(draft)) || changedObjectDraftKeys.length > 0) && draftOwner) {
             const flowId = externalDraftFlowIds.current.get(draftOwner);
             drafts.push({
@@ -1410,8 +1416,9 @@ export function ConsoleAppV4(props) {
         configDrafts, configCandidate, arrayDrafts, objectDrafts, nestedPropertyRevision, objectVariantPreview, route.name, snapshot.router.currentFlowId, sourceDraft,
     ]);
     useEffect(() => () => props.controller.setExternalDraftState(), [props.controller]);
+    const currentLayerPage = configRoute && configRoute.layer.scope !== 'effective' ? configLayerPages[configRoute.layer.scope] : undefined;
     const currentConfigPage = configPageMatches(configPage, configRoute) ? configPage
-        : configRoute && configRoute.layer.scope !== 'effective' ? configLayerPages[configRoute.layer.scope] : undefined;
+        : configPageMatches(currentLayerPage, configRoute) ? currentLayerPage : undefined;
     const hasReferenceFields = (configPage ?? configLayerPages.user ?? configLayerPages.project)?.groups
         .some((group) => group.fields.some((field) => configReferenceScalars(field.definition).length > 0)) ?? false;
     useEffect(() => {
@@ -1447,9 +1454,16 @@ export function ConsoleAppV4(props) {
                 .map((field) => [field.key, field]));
             for (const [key, value] of Object.entries(draft.updates)) {
                 const field = fields.get(key);
+                const invalidReferences = field ? configReferenceValues(field.definition, value)
+                    .filter(({ scalar, value: selected }) => {
+                    const reference = referenceContexts[draftScope]?.selections[configReferenceKey(scalar)];
+                    return reference !== undefined && (reference.issues.length > 0
+                        || !reference.choices.some((choice) => choice.value === selected));
+                }).map(({ scalar }) => configReferenceSource(scalar)) : [];
                 if (!field || !configFieldCanSet(field)
-                    || validatePluginConfigValue(field.definition, value, key).length > 0) {
-                    issues.push({ scope: draftScope, key, source: 'update' });
+                    || validatePluginConfigValue(field.definition, value, key).length > 0
+                    || invalidReferences.length > 0) {
+                    issues.push({ scope: draftScope, key, source: 'update', referenceSources: invalidReferences });
                 }
             }
             for (const key of draft.removes) {
@@ -1492,13 +1506,17 @@ export function ConsoleAppV4(props) {
         if (draftOwner !== owner) {
             setDraftOwner(owner);
             if (draftOwner !== undefined) {
-                setConfigDrafts({});
-                setConfigCandidate(undefined);
-                setObjectDrafts({});
-                setArrayDrafts({});
-                setChangedObjectDraftKeys([]);
+                const suspended = suspendedConfigDrafts.current.get(owner);
+                suspendedConfigDrafts.current.delete(owner);
+                setConfigDrafts(suspended?.drafts ?? {});
+                setConfigCandidate(suspended?.candidate);
+                setObjectDrafts(suspended?.objects ?? {});
+                setArrayDrafts(suspended?.arrays ?? {});
+                setChangedObjectDraftKeys(suspended?.changedObjects ?? []);
+                if (suspended)
+                    setInputValue(suspended.input);
                 setObjectError(undefined);
-                setDirty(false);
+                setDirty(suspended?.dirty ?? false);
                 setConfigActionError(undefined);
             }
         }
@@ -1842,13 +1860,31 @@ export function ConsoleAppV4(props) {
     const activePropertyIsConst = activePropertyDefinition && 'const' in activePropertyDefinition && activePropertyDefinition.const !== undefined;
     const referenceNotice = (scalar, value) => {
         const selection = referenceContext?.selections[configReferenceKey(scalar)];
-        const message = referenceContextError && !selection ? referenceContextError : configReferenceMessage(scalar, selection, value);
+        const message = referenceContextError && !selection ? `来源 ${configReferenceSource(scalar)}：${referenceContextError}`
+            : configReferenceMessage(scalar, selection, value);
         const source = 'valueRef' in scalar ? scalar.valueRef.field : '';
-        const pendingSource = editingScope === 'project' && selection?.source !== 'project'
+        const pendingSource = !('valueRef' in scalar && scalar.valueRef?.plugin) && editingScope === 'project' && selection?.source !== 'project'
             && (Object.hasOwn(configDrafts.user?.updates ?? {}, source) || configDrafts.user?.removes.includes(source));
         return [message, pendingSource ? `来源 ${source} 在个人默认有未保存修改。请先保存来源配置，再编辑或保存引用配置。` : undefined]
             .filter(Boolean).join(' ') || undefined;
     };
+    const openReferenceSource = (scalar, leaf) => {
+        const ref = 'valueRef' in scalar ? scalar.valueRef : undefined;
+        if (!ref?.plugin || !configRoute || !draftOwner)
+            return;
+        props.controller.updatePageContext({ focusIndex: focus, scrollOffset });
+        if (leaf)
+            referenceLeafDrafts.current.set(snapshot.router.currentFrameId, leaf);
+        suspendedConfigDrafts.current.set(draftOwner, {
+            drafts: configDrafts, candidate: configCandidate, arrays: arrayDrafts, objects: objectDrafts,
+            changedObjects: changedObjectDraftKeys, dirty, input: inputValue,
+            externalDraft: props.controller.externalDrafts.find((draft) => draft.kind === 'configDraft' && draft.owner === draftOwner),
+        });
+        const sourceId = configRoute.pluginId.split('/')[0];
+        props.controller.beginConfigReferenceSource(`${sourceId}/${ref.plugin}`, ref.field);
+        setFocus(0);
+        setScrollOffset(0);
+    };
     useEffect(() => {
         if (route.name !== 'configFieldEditor' || !activeField)
             return;
@@ -3196,6 +3232,16 @@ export function ConsoleAppV4(props) {
     const updateObjectProperty = (propertyKey, value) => {
         if (!activeField || activeField.definition.type !== 'object' || !activeObjectDraft)
             return false;
+        const definition = activeObjectProperties?.[propertyKey] ?? activeField.definition.additionalProperties;
+        if (definition && value !== undefined) {
+            for (const { scalar, value: selected } of configReferenceValues(definition, value)) {
+                const reference = referenceContext?.selections[configReferenceKey(scalar)];
+                if (!reference || reference.issues.length || !reference.choices.some((choice) => choice.value === selected)) {
+                    setInputError(referenceNotice(scalar, selected) ?? '引用选项已变化，请重新选择。');
+                    return false;
+                }
+            }
+        }
         const candidate = { ...activeObjectDraft, [propertyKey]: value };
         if (value === undefined)
             delete candidate[propertyKey];
@@ -5915,7 +5961,8 @@ export function ConsoleAppV4(props) {
                 ? currentConfigPage.groups.find((group) => group.id === activeTab.id)
                 : undefined;
             if (configDraftIssues.length > 0) {
-                description = `${description ?? ''} 有 ${configDraftIssues.length} 项未保存修改已不适用于当前设置。`;
+                const sources = [...new Set(configDraftIssues.flatMap((issue) => issue.referenceSources ?? []))];
+                description = `${description ?? ''} 有 ${configDraftIssues.length} 项未保存修改已不适用于当前设置。${sources.length ? ` 请检查来源 ${sources.join('、')}。` : ''}`;
             }
             const mutableLayer = { scope: 'effective' };
             const tabActions = activeTab?.kind === 'presets'
@@ -6140,10 +6187,13 @@ export function ConsoleAppV4(props) {
             const selection = configReferenceSelection(referenceContext, scalarReference);
             const current = arrayItem ? itemValue : draftUpdates[activeField.key] ?? activeField.draftValue ?? activeField.value;
             title = `选择${activeField.title}`;
-            description = referenceNotice(scalarReference, current) ?? `选项来自 ${scalarReference.valueRef.field}；保存到${editingScope === 'user' ? '个人默认' : '当前项目'}。`;
+            description = referenceNotice(scalarReference, current) ?? `选项来自 ${configReferenceSource(scalarReference)}；保存到${editingScope === 'user' ? '个人默认' : '当前项目'}。`;
             help = '↑↓ 移动 · Enter 使用 · Esc 返回修复来源';
             actions = selection.choices.map((choice) => ({ label: safeConfigText(choice.title), selected: choice.value === current,
                 run: () => updateDraft(activeField.key, choice.value) }));
+            if (scalarReference.valueRef.plugin)
+                actions.push({ label: `编辑来源 ${configReferenceSource(scalarReference)}`,
+                    run: () => openReferenceSource(scalarReference) });
             content = _jsx(SemanticRows, { actions: [...actions], focus: focus, kind: "choice", compact: policy.mode === 'compact' });
         }
         else if ('const' in activeField.definition && activeField.definition.const !== undefined) {
@@ -6370,11 +6420,14 @@ export function ConsoleAppV4(props) {
             const selection = configReferenceSelection(referenceContext, definition);
             const current = activeObjectDraft[property];
             title = `选择${propertyTitle}`;
-            description = referenceNotice(definition, current) ?? `选项来自 ${definition.valueRef.field}。`;
+            description = referenceNotice(definition, current) ?? `选项来自 ${configReferenceSource(definition)}。`;
             help = '↑↓ 移动 · Enter 使用 · Esc 返回修复来源';
             actions = selection.choices.map((choice) => ({ label: safeConfigText(choice.title), selected: choice.value === current,
                 run: () => { if (updateObjectProperty(property, choice.value))
                     back(); } }));
+            if (definition.valueRef.plugin)
+                actions.push({ label: `编辑来源 ${configReferenceSource(definition)}`,
+                    run: () => openReferenceSource(definition) });
             content = _jsx(SemanticRows, { actions: [...actions], focus: focus, kind: "choice", compact: policy.mode === 'compact' });
         }
         else if (property !== undefined && definition && 'const' in definition && definition.const !== undefined) {
@@ -6477,8 +6530,13 @@ export function ConsoleAppV4(props) {
             title = `编辑${propertyTitle}`;
             description = '确认后更新当前对象草稿；Esc 取消此属性的全部修改。';
             help = '↑↓ 移动 · Enter 编辑 · a 操作 · c 使用 · Esc 取消';
-            content = _jsx(ConfigLeafEditor, { definition: definition, value: activeObjectDraft[property], propertyKey: property, referenceContext: referenceContext, referenceNotice: referenceNotice, columns: size.columns, rowBudget: pageActionBudget(1), active: !overlay && !tooSmall && !busy, error: inputError, onDraftChange: setNestedPropertyRevision, onCancel: back, onConfirm: (value) => { if (!updateObjectProperty(property, value))
-                    return false; back(); return true; } }, `${snapshot.router.currentFrameId}:${property}`);
+            content = _jsx(ConfigLeafEditor, { definition: definition, value: activeObjectDraft[property], propertyKey: property, referenceContext: referenceContext, referenceNotice: referenceNotice, initialDraft: referenceLeafDrafts.current.get(snapshot.router.currentFrameId), onOpenReferenceSource: openReferenceSource, columns: size.columns, rowBudget: pageActionBudget(1), active: !overlay && !tooSmall && !busy, error: inputError, onDraftChange: setNestedPropertyRevision, onCancel: () => { referenceLeafDrafts.current.delete(snapshot.router.currentFrameId); back(); }, onConfirm: (value) => {
+                    if (!updateObjectProperty(property, value))
+                        return false;
+                    referenceLeafDrafts.current.delete(snapshot.router.currentFrameId);
+                    back();
+                    return true;
+                } }, `${snapshot.router.currentFrameId}:${property}`);
         }
         else if (property !== undefined && definition) {
             title = activePropertySensitive ? '输入敏感值' : `输入${propertyTitle}`;
@@ -9427,6 +9485,8 @@ export function ConsoleAppV4(props) {
         }).catch((error) => showSafeUiFailure(error, 'tuiSessionNavigationFailed', 'session-navigation'));
     }
     function clearExternalDraftValues() {
+        suspendedConfigDrafts.current.clear();
+        referenceLeafDrafts.current.clear();
         setDirty(false);
         setConfigDrafts({});
         setConfigCandidate(undefined);