@nocobase/client-v2 2.1.8 → 2.1.9

package/es/components/form/JsonTextArea.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import type { TextAreaProps } from 'antd/es/input';
+import type { TextAreaRef } from 'antd/es/input/TextArea';
 import React from 'react';
 export interface JsonTextAreaProps extends Omit<TextAreaProps, 'value' | 'onChange'> {
     value?: unknown;
@@ -15,4 +16,4 @@ export interface JsonTextAreaProps extends Omit<TextAreaProps, 'value' | 'onChan
     json5?: boolean;
     showError?: boolean;
 }
-export declare const JsonTextArea: React.MemoExoticComponent<(props: JsonTextAreaProps) => React.JSX.Element>;
+export declare const JsonTextArea: React.MemoExoticComponent<React.ForwardRefExoticComponent<JsonTextAreaProps & React.RefAttributes<TextAreaRef>>>;

package/es/components/form/VariableJsonTextArea.d.ts

@@ -0,0 +1,19 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { type MetaTreeNode } from '@nocobase/flow-engine';
+import React from 'react';
+import { type JsonTextAreaProps } from './JsonTextArea';
+export interface VariableJsonTextAreaProps extends JsonTextAreaProps {
+    namespaces?: string[];
+    extraNodes?: MetaTreeNode[];
+    metaTree?: MetaTreeNode[] | (() => MetaTreeNode[] | Promise<MetaTreeNode[]>);
+    formatPathToValue?: (meta: MetaTreeNode) => string | undefined;
+}
+export declare const VariableJsonTextArea: React.MemoExoticComponent<(props: VariableJsonTextAreaProps) => React.JSX.Element>;
+export declare const VariableJSON: React.MemoExoticComponent<(props: VariableJsonTextAreaProps) => React.JSX.Element>;

package/es/components/form/index.d.ts

@@ -18,3 +18,4 @@ export * from './RemoteSelect';
 export * from './ScanInput';
 export * from './TypedVariableInput';
 export * from './VariableInput';
+export * from './VariableJsonTextArea';

package/es/flow/components/FieldAssignRulesEditor.d.ts

@@ -10,7 +10,7 @@ import type { FilterGroupType } from '@nocobase/utils/client';
 import React from 'react';
 import { FieldAssignValueInput } from './FieldAssignValueInput';
 import { type FieldAssignCascaderOption } from './fieldAssignOptions';
-export type AssignMode = 'default' | 'assign';
+export type AssignMode = 'default' | 'assign' | 'override';
 type CollectionFieldLike = {
     name?: unknown;
     title?: unknown;
@@ -53,6 +53,8 @@ export interface FieldAssignRulesEditorProps {
     defaultMode?: AssignMode;
     /** 固定 mode：用于“仅默认值/仅赋值”的场景 */
     fixedMode?: AssignMode;
+    /** 可选 mode 列表；fixedMode 优先级更高 */
+    allowedModes?: AssignMode[];
     /** 是否显示 condition */
     showCondition?: boolean;
     /** 是否显示 enable 开关 */

package/es/flow/models/blocks/filter-form/FilterFormBlockModel.d.ts

@@ -24,6 +24,7 @@ export declare class FilterFormBlockModel extends FilterBlockModel<{
     private initialDefaultsPromise?;
     private initialRefreshHandledTargetIds;
     private lastDefaultValueByFieldName;
+    private userEditedFieldNames;
     private defaultValuesRefreshSeq;
     get form(): any;
     get title(): string;
@@ -39,6 +40,10 @@ export declare class FilterFormBlockModel extends FilterBlockModel<{
     markInitialTargetRefreshHandled(targetId: string): void;
     private ensureFilterItemsBeforeRender;
     private canApplyFormDefaultValue;
+    private canApplyFormOverrideValue;
+    private normalizeFieldValueMode;
+    private markFilterFormUserEditedFields;
+    private resetFilterFormUserEditedFields;
     private matchDefaultValueCondition;
     applyFormDefaultValues(options?: {
         force?: boolean;

package/es/flow/models/blocks/form/FormBlockModel.d.ts

@@ -51,6 +51,10 @@ export declare class FormBlockModel<T extends DefaultCollectionBlockModelStructu
      * @internal
      */
     resetUserModifiedFields(): void;
+    /**
+     * @internal
+     */
+    resetRuntimeUserEditedState(): void;
     onDispatchEventStart(eventName: string, options?: any, inputArgs?: Record<string, any>): Promise<void>;
     getStepParams(flowKey: string, stepKey: string): any | undefined;
     getStepParams(flowKey: string): Record<string, any> | undefined;

package/es/flow/models/blocks/form/value-runtime/rules.d.ts

@@ -32,6 +32,7 @@ export type RuleEngineOptions = {
     getFormValueAtPath: (namePath: NamePath) => any;
     setFormValues: (callerCtx: any, patch: Patch, options?: SetOptions) => Promise<void>;
     findExplicitHit: (pathKey: string) => string | null;
+    findUserEditedHit: (pathKey: string) => string | null;
     lastDefaultValueByPathKey: Map<string, any>;
     lastWriteMetaByPathKey: Map<string, FormValueWriteMeta>;
     observableBindings: Map<string, ObservableBinding>;
@@ -122,6 +123,18 @@ export declare class RuleEngine {
     private resolveRunJSValue;
     private resolveTemplateValue;
     private commitRuleDeps;
+    private isScalarValueTarget;
+    private shouldSkipEmptyArrayAggregateForScalarTarget;
+    private normalizeUnresolvedToManyAggregateForScalarTarget;
+    private isArrayValueCollectionField;
+    private stringifyAggregateItem;
+    private normalizeAggregateArrayForScalarTarget;
+    private shouldSkipMultiValueAggregateForScalarTarget;
+    private getClearedAggregateValueForScalarTarget;
+    private isUserClearedToManyAggregate;
+    private isTextScalarTarget;
+    private getLatestWriteMetaForPath;
+    private getToManyAggregateSourceInfo;
     /**
      * Check if default rule value can be applied.
      * Default value can overwrite when:
@@ -130,6 +143,14 @@ export declare class RuleEngine {
      */
     private checkDefaultRuleCanApply;
     private createRuleEvaluationContext;
+    private getLocalFormValuesSnapshot;
+    private resolveLocalFormValuesPath;
+    private recordLocalFormValuesDep;
+    private extractSingleLocalFormValuesPath;
+    private stringifyTemplateReplacement;
+    private createLocalTemplateTokenStore;
+    private restoreLocalTemplateTokens;
+    private resolveLocalFormValuesTemplates;
     private buildItemChainValue;
     private getFieldIndexSignature;
     private updateRuleDeps;

package/es/flow/models/blocks/form/value-runtime/runtime.d.ts

@@ -17,6 +17,7 @@ export declare class FormValueRuntime {
     private readonly getForm;
     private readonly valuesMirror;
     private readonly explicitSet;
+    private readonly userEditedSet;
     private readonly lastDefaultValueByPathKey;
     private readonly lastWriteMetaByPathKey;
     private readonly observableBindings;
@@ -29,6 +30,8 @@ export declare class FormValueRuntime {
     private lastObservedSource;
     private lastObservedToken;
     private readonly formValuesProxy;
+    private readonly mountedFieldModelsByPathKey;
+    private readonly mountedFieldModelPathKeys;
     private mountedListener?;
     private unmountedListener?;
     private readonly formPatcher;
@@ -42,11 +45,14 @@ export declare class FormValueRuntime {
      *
      * - mode=default → source=default（遵循 explicit/空值覆盖语义）
      * - mode=assign  → source=system（不受 explicit 影响，依赖变化时持续生效）
+     * - mode=override → source=override（首次覆盖已有值，用户修改后停止）
      */
     syncAssignRules(items: FormAssignRuleItem[]): void;
     get formValues(): any;
     getFormValuesSnapshot(): any;
+    private toMirrorSnapshot;
     canApplyDefaultValuePatch(namePath: NamePath, resolved: any): boolean;
+    canApplyOverrideValuePatch(namePath: NamePath): boolean;
     recordDefaultValuePatch(namePath: NamePath, value?: any): void;
     private getFormValueAtPath;
     mount(options?: {
@@ -54,6 +60,7 @@ export declare class FormValueRuntime {
     }): void;
     dispose(): void;
     resetAfterFormReset(): void;
+    resetUserEditedState(): void;
     isSuppressed(): boolean;
     handleFormFieldsChange(changedFields: Array<{
         name?: NamePath | string | number;
@@ -83,7 +90,19 @@ export declare class FormValueRuntime {
     private tryResolveNamePath;
     private bumpChangeTick;
     private emitFormValuesChange;
+    private syncMountedFieldModelValue;
+    private syncMountedFieldModelValueForModel;
+    private rebuildMountedFieldModelIndex;
+    private indexMountedFieldModelTree;
+    private unindexMountedFieldModelTree;
+    private visitModelAndForks;
+    private indexMountedFieldModel;
+    private unindexMountedFieldModel;
+    private isMountedModelInThisForm;
+    private getMountedModelNamePaths;
+    private normalizeNamePathValue;
     private markExplicit;
+    private markUserEdited;
     private normalizeObservedNamePath;
     private clearExplicitForDefaultPatch;
     private shouldPreserveDescendantDefaultsOnExplicit;
@@ -91,5 +110,7 @@ export declare class FormValueRuntime {
     private shouldKeepDefaultPathValueEnabled;
     private isExplicit;
     private findExplicitHit;
+    private findUserEditedHit;
+    private isDescendantPathKey;
 }
 export {};

package/es/flow/models/blocks/form/value-runtime/types.d.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export type NamePath = Array<string | number>;
-export type ValueSource = 'default' | 'linkage' | 'user' | 'system';
+export type ValueSource = 'default' | 'linkage' | 'user' | 'system' | 'override';
 export type Patch = Record<string, any> | Array<{
     path: string | NamePath;
     value: any;
@@ -48,7 +48,7 @@ export interface FormValuesChangePayload {
     allValues?: any;
     allValuesSnapshot?: any;
 }
-export type AssignMode = 'default' | 'assign';
+export type AssignMode = 'default' | 'assign' | 'override';
 export type FormAssignRuleItem = {
     key?: string;
     enable?: boolean;