@nocobase/client-v2 2.2.0-alpha.1 → 2.2.0-alpha.3

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

@@ -12,11 +12,16 @@ import type { FormAssignRuleItem, NamePath, Patch, SetOptions } from './types';
 type FormBlockModel = FlowModel & {
     getAclActionName?: () => string;
 };
+export type FormValuePatch = {
+    path: NamePath;
+    value: unknown;
+};
 export declare class FormValueRuntime {
     private readonly model;
     private readonly getForm;
     private readonly valuesMirror;
     private readonly explicitSet;
+    private readonly userEditedSet;
     private readonly lastDefaultValueByPathKey;
     private readonly lastWriteMetaByPathKey;
     private readonly observableBindings;
@@ -29,6 +34,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 +49,16 @@ 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;
+    getUserEditedValuePatches(): FormValuePatch[];
+    getUserEditedValuesSnapshot(): Record<string, unknown>;
+    private toMirrorSnapshot;
     canApplyDefaultValuePatch(namePath: NamePath, resolved: any): boolean;
+    canApplyOverrideValuePatch(namePath: NamePath): boolean;
     recordDefaultValuePatch(namePath: NamePath, value?: any): void;
     private getFormValueAtPath;
     mount(options?: {
@@ -54,6 +66,7 @@ export declare class FormValueRuntime {
     }): void;
     dispose(): void;
     resetAfterFormReset(): void;
+    resetUserEditedState(): void;
     isSuppressed(): boolean;
     handleFormFieldsChange(changedFields: Array<{
         name?: NamePath | string | number;
@@ -83,7 +96,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 +116,10 @@ export declare class FormValueRuntime {
     private shouldKeepDefaultPathValueEnabled;
     private isExplicit;
     private findExplicitHit;
+    private findUserEditedHit;
+    private findLatestWriteMeta;
+    private isCurrentUserEditedPath;
+    private omitNonUserDescendantValues;
+    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;

package/es/flow/models/blocks/js-block/JSBlock.d.ts

@@ -10,6 +10,7 @@ import React from 'react';
 import { BlockModel } from '../../base';
 export declare class JSBlockModel extends BlockModel {
     private _mountedOnce;
+    get showBlockCard(): boolean;
     renderComponent(): React.ReactNode;
     render(): React.JSX.Element;
     protected onMount(): void;

package/es/flow/models/blocks/table/TableActionsColumnModel.d.ts

@@ -8,6 +8,7 @@
  */
 import React from 'react';
 import { TableCustomColumnModel } from './TableCustomColumnModel';
+export declare const tableRowActionsClassName: string;
 export declare class TableActionsColumnModel extends TableCustomColumnModel {
     afterAddAsSubModel(): Promise<void>;
     getColumnProps(): {

package/es/flow/models/blocks/table/TableBlockModel.d.ts

@@ -64,6 +64,7 @@ export declare class TableBlockModel extends CollectionBlockModel<TableBlockMode
     isRowSelectionEnabled(): boolean;
     isShowIndexEnabled(): boolean;
     getRecordIndex(record: Record<string, unknown>, index: number): string | number;
+    getDragSortFieldName(): string | undefined;
     getLeftAuxiliaryColumn(): {
         key: string;
         width: number;

package/es/flow/models/blocks/table/dragSort/dragSortHooks.d.ts

@@ -8,7 +8,7 @@
  */
 import React from 'react';
 import type { TableBlockModel } from '../TableBlockModel';
-export declare function useDragSortBodyWrapper(model: TableBlockModel, dataSourceRef: React.MutableRefObject<any>, getRowKeyFunc: (record: any) => string | number): (props: any) => React.JSX.Element;
+export declare function useDragSortBodyWrapper(model: TableBlockModel, dataSourceRef: React.MutableRefObject<any>, getRowKeyFunc: (record: any) => string | number, dragSortFieldName?: string): (props: any) => React.JSX.Element;
 export declare function useDragSortRowComponent(dragSort: boolean): React.FC<{
     [key: string]: any;
     rowIndex?: number;

package/es/flow/models/blocks/table/dragSort/dragSortSettings.d.ts

@@ -15,7 +15,7 @@ export declare const dragSortSettings: {
     defaultParams: {
         dragSort: boolean;
     };
-    handler(ctx: any, params: any): Promise<void>;
+    handler(ctx: any, params: any): void;
 };
 export declare const dragSortBySettings: {
     title: string;
@@ -29,6 +29,7 @@ export declare const dragSortBySettings: {
                 value: any;
                 disabled: any;
             }[];
+            allowClear: boolean;
             placeholder: any;
         };
     };

package/es/flow/models/blocks/table/dragSort/dragSortUtils.d.ts

@@ -6,25 +6,27 @@
  * 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 { Collection } from '@nocobase/flow-engine';
+import type { Collection, CollectionField } from '@nocobase/flow-engine';
 /**
  * 从 collection 中获取所有 sort 类型的字段
  * @param collection - 集合对象
  * @returns 排序字段数组
  */
-export declare function getSortFields(collection: Collection | undefined): import("@nocobase/flow-engine").CollectionField[];
+export declare function getSortFields(collection: Collection | undefined): CollectionField[];
+export declare function getSortField(collection: Collection | undefined, fieldName?: string | null): CollectionField | undefined;
+export declare function hasSortField(collection: Collection | undefined, fieldName?: string | null): boolean;
 /**
  * 获取 collection 中第一个可用的 sort 字段
  * @param collection - 集合对象
  * @returns 第一个排序字段，如果没有则返回 undefined
  */
-export declare function getFirstSortField(collection: Collection | undefined): import("@nocobase/flow-engine").CollectionField;
+export declare function getFirstSortField(collection: Collection | undefined): CollectionField;
 /**
  * 将 sort 字段转换为选项格式
  * @param fields - 字段数组
  * @returns 选项数组
  */
-export declare function convertFieldsToOptions(fields: any[]): {
+export declare function convertFieldsToOptions(fields: CollectionField[]): {
     label: any;
     value: any;
     disabled: any;

package/es/flow/models/fields/AssociationFieldModel/RecordSelectFieldModel.d.ts

@@ -23,6 +23,8 @@ export declare function collectAssociationHydrationCandidates(options: {
     labelKey: string;
     statusMap: Map<string, HydrateStatus>;
 }): HydrationCandidate[];
+export declare function getAssociationHydrationNamePath(model: any): any;
+export declare function getAssociationHydrationSetterContext(model: any): any;
 export declare function CreateContent({ model, toOne }: {
     model: any;
     toOne?: boolean;

package/es/flow/models/fields/AssociationFieldModel/SubTableFieldModel/SubTableColumnModel.d.ts

@@ -18,6 +18,7 @@ export declare function FieldWithoutPermissionPlaceholder({ targetModel }: {
 }): React.JSX.Element;
 export declare function buildRowPathFromFieldIndex(fieldIndex: unknown): Array<string | number> | null;
 export declare function getLatestSubTableRowRecord(form: any, fieldIndex: unknown, fallbackRecord: any): any;
+export declare function buildSubTableColumnNamePath(fieldPath: Array<string | number>, rowIdx: number, namePath: string | number, rowFieldIndex: unknown): Array<string | number>;
 export declare function isSubTableColumnReadPretty(parent: any): boolean;
 export declare function isSubTableColumnConfiguredReadPretty(parent: any): boolean;
 export declare function getSubTableColumnTitleField(parent: any): any;
@@ -31,10 +32,15 @@ export interface SubTableColumnModelStructure {
 export declare class SubTableColumnModel<T extends SubTableColumnModelStructure = SubTableColumnModelStructure> extends EditableItemModel<T> {
     static renderMode: ModelRenderMode;
     static fieldComponentContext: string;
+    private getAssociationField;
+    private getParentFormValues;
+    private createParentItemAccessors;
+    private createRowItemContextPropertyOptions;
     renderHiddenInConfig(): React.JSX.Element;
     static defineChildren(ctx: FlowModelContext): any;
     get collection(): any;
     get hasFormulaColumn(): boolean;
+    get hasFormValueDrivenDataScopeColumn(): boolean;
     onInit(options: any): void;
     afterAddAsSubModel(): Promise<void>;
     getColumnProps(): TableColumnProps;

package/es/flow/resolveViewParamsToViewList.d.ts

@@ -17,4 +17,4 @@ export interface ViewItem {
     index: number;
 }
 export declare function resolveViewParamsToViewList(flowEngine: FlowEngine, viewParams: ViewParam[], routeModel: FlowModel): ViewItem[];
-export declare function updateViewListHidden(viewItems: ViewItem[]): void;
+export declare function updateViewListHidden(viewItems: ViewItem[], isMobileLayout?: boolean): void;

package/es/flow/utils/dataScopeRowSnapshot.d.ts

@@ -0,0 +1,59 @@
+/**
+ * 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 { FlowContext } from '@nocobase/flow-engine';
+import { type FieldIndexEntry, type NamePath } from './formValueDeps';
+export type FilterTargetKey = string | string[] | null | undefined;
+export type RowIdentity = string;
+export type RowScopedFieldIndexEntry = FieldIndexEntry & {
+    filterTargetKey?: FilterTargetKey;
+};
+export type RowScope = {
+    entries: RowScopedFieldIndexEntry[];
+    tailPath: NamePath;
+    identityTailPaths: NamePath[];
+};
+export type DataScopeValuePath = {
+    path: NamePath;
+    rowScope?: RowScope;
+};
+export type DataScopeStructuralPath = {
+    path: NamePath;
+    kind: 'index' | 'length';
+    rowScope?: RowScope;
+};
+export type DataScopeTriggerPath = {
+    path: NamePath;
+    includeChildren: boolean;
+};
+export type DataScopeClearDeps = {
+    wildcard: boolean;
+    valuePaths: DataScopeValuePath[];
+    structuralPaths: DataScopeStructuralPath[];
+    triggerPaths: DataScopeTriggerPath[];
+};
+export type DataScopeSnapshotValue = {
+    value: unknown;
+    rowIdentities?: Array<RowIdentity | null>;
+    rowDetached?: boolean;
+};
+export type DataScopeClearSnapshot = {
+    complete: boolean;
+    rowDetached: boolean;
+    rowMissing: boolean;
+    values: Map<string, DataScopeSnapshotValue>;
+    structures: Map<string, DataScopeSnapshotValue>;
+};
+export type DataScopeClearChangeStatus = {
+    status: 'changed' | 'unchanged' | 'unknown';
+    snapshot: DataScopeClearSnapshot | null;
+};
+export declare function applyDataScopeFieldIndexTargetKeys(ctx: FlowContext, entries: FieldIndexEntry[]): RowScopedFieldIndexEntry[];
+export declare function createDataScopeRowScope(entries: RowScopedFieldIndexEntry[], parentDepth: number, tailPath: NamePath): RowScope | undefined;
+export declare function buildDepsSnapshot(deps: DataScopeClearDeps, formBlock: any, payload?: unknown): DataScopeClearSnapshot | null;
+export declare function getDepsChangeStatus(deps: DataScopeClearDeps, formBlock: any, payload: unknown, snapshot: DataScopeClearSnapshot | null): DataScopeClearChangeStatus;

package/es/flow/utils/dateTimeDisplayProps.d.ts

@@ -0,0 +1,49 @@
+/**
+ * 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 { FlowModelContext } from '@nocobase/flow-engine';
+type DateTimeDisplayProps = {
+    dateOnly?: boolean;
+    dateFormat?: string;
+    format?: string;
+    picker?: string;
+    showTime?: boolean;
+    timeFormat?: string;
+};
+type DateTimeCollectionField = {
+    type?: string;
+    interface?: string;
+    getComponentProps?: () => DateTimeDisplayProps;
+    targetCollection?: {
+        getField?: (name?: string) => DateTimeCollectionField | undefined;
+    };
+};
+type DateTimeModelContext = FlowModelContext & {
+    collectionField?: DateTimeCollectionField;
+};
+type DateTimeModel = {
+    props?: DateTimeDisplayProps & {
+        titleField?: string;
+    };
+    context?: DateTimeModelContext;
+    getStepParams?: (flowKey: string, stepKey: string) => DateTimeDisplayProps | undefined;
+};
+type ResolveDateTimeDisplayPropsOptions = {
+    model?: DateTimeModel;
+    collectionField?: DateTimeCollectionField;
+    titleField?: string;
+    currentProps?: DateTimeDisplayProps;
+    params?: DateTimeDisplayProps;
+    withDefaults?: boolean;
+};
+export declare const getDateTimeFormatCollectionField: (options: ResolveDateTimeDisplayPropsOptions) => DateTimeCollectionField;
+export declare const isTimeCollectionField: (collectionField?: DateTimeCollectionField) => boolean;
+export declare const isDateOnlyCollectionField: (collectionField?: DateTimeCollectionField) => boolean;
+export declare const getSavedDateTimeFormatParams: (model?: DateTimeModel) => DateTimeDisplayProps;
+export declare const resolveDateTimeDisplayProps: (options: ResolveDateTimeDisplayPropsOptions) => DateTimeDisplayProps;
+export {};

package/es/flow/utils/formValueDeps.d.ts

@@ -0,0 +1,32 @@
+/**
+ * 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 { FlowContext } from '@nocobase/flow-engine';
+export type NamePath = Array<string | number>;
+export type FieldIndexEntry = {
+    name: string;
+    index: number;
+};
+export declare function isSameNamePath(a: NamePath, b: NamePath): boolean;
+export declare function isNamePathPrefix(prefix: NamePath, path: NamePath): boolean;
+export declare function dedupeNamePaths(paths: NamePath[]): NamePath[];
+export declare function minimizeNamePaths(paths: NamePath[]): NamePath[];
+export declare function parseFieldIndexEntries(fieldIndex: unknown): FieldIndexEntry[];
+export declare function getFieldIndexEntriesFromContext(ctx: FlowContext | {
+    model?: unknown;
+    fieldIndex?: unknown;
+}): FieldIndexEntry[];
+export declare function buildItemRowPath(entries: FieldIndexEntry[], parentDepth: number): NamePath | null;
+export declare function buildItemListRootPath(entries: FieldIndexEntry[], parentDepth: number): NamePath | null;
+export declare function parseDependencyPath(subPath: string): NamePath;
+export declare function parsePathKey(pathKey: string): NamePath;
+export declare function getChangedPathsFromPayload(payload: unknown, options?: {
+    includeArrayChangedValues?: boolean;
+}): NamePath[];
+export declare function isFormValueChangeSource(model: unknown): boolean;
+export declare function findFormValueChangeSource(ctx: FlowContext): unknown | null;

package/es/flow-compat/FieldValidation.d.ts

@@ -8,7 +8,7 @@
  */
 import React from 'react';
 interface ValidationRule {
-    key: string;
+    key?: string;
     name: string;
     args?: {
         [key: string]: any;
@@ -22,6 +22,7 @@ interface ValidationData {
 interface FieldValidationProps {
     value?: ValidationData;
     onChange?: (value: ValidationData) => void;
+    inheritedValue?: ValidationData;
     type?: string;
     availableValidationOptions?: string[];
     excludeValidationOptions?: string[];

package/es/index.d.ts

@@ -37,5 +37,6 @@ export * from './collection-manager/interfaces';
 export * from './collection-manager/template-fields';
 export * from './data-source';
 export * from './flow';
-export { DEFAULT_DATA_SOURCE_KEY, isTitleField, isTitleFieldInterface } from './flow-compat';
+export { DEFAULT_DATA_SOURCE_KEY, IconPicker, isTitleField, isTitleFieldInterface, NocoBaseDesktopRouteType, } from './flow-compat';
+export type { NocoBaseDesktopRoute } from './flow-compat';
 export { default as AntdAppProvider } from './theme/AntdAppProvider';