@nocobase/client-v2 2.1.8 → 2.1.9

package/src/flow/models/blocks/filter-form/FilterFormBlockModel.tsx

@@ -231,6 +231,7 @@ export class FilterFormBlockModel extends FilterBlockModel<{
   private initialDefaultsPromise?: Promise<void>;
   private initialRefreshHandledTargetIds = new Set<string>();
   private lastDefaultValueByFieldName = new Map<string, any>();
+  private userEditedFieldNames = new Set<string>();
   private defaultValuesRefreshSeq = 0;
 
   get form() {
@@ -436,6 +437,28 @@ export class FilterFormBlockModel extends FilterBlockModel<{
     return isEqual(current, this.lastDefaultValueByFieldName.get(name));
   }
 
+  private canApplyFormOverrideValue(name: string, force?: boolean) {
+    if (force) return true;
+    return !this.userEditedFieldNames.has(name);
+  }
+
+  private normalizeFieldValueMode(mode: unknown): 'default' | 'assign' | 'override' {
+    if (mode === 'assign') return 'assign';
+    if (mode === 'override') return 'override';
+    return 'default';
+  }
+
+  private markFilterFormUserEditedFields(changedValues: any) {
+    if (!changedValues || typeof changedValues !== 'object' || Array.isArray(changedValues)) return;
+    for (const name of Object.keys(changedValues)) {
+      this.userEditedFieldNames.add(String(name));
+    }
+  }
+
+  private resetFilterFormUserEditedFields() {
+    this.userEditedFieldNames.clear();
+  }
+
   private async matchDefaultValueCondition(condition: any) {
     if (!condition) return true;
 
@@ -458,6 +481,10 @@ export class FilterFormBlockModel extends FilterBlockModel<{
     if (!form) return appliedValues;
 
     const force = options?.force === true;
+    if (force) {
+      this.resetFilterFormUserEditedFields();
+    }
+
     const params = this.getStepParams?.('formFilterBlockModelSettings', 'defaultValues');
     const rules = (params?.value || []) as any[];
     if (!Array.isArray(rules) || rules.length === 0) return appliedValues;
@@ -499,8 +526,9 @@ export class FilterFormBlockModel extends FilterBlockModel<{
 
       const operator = getDefaultOperator(itemModel as any);
       const normalized = normalizeFilterValueByOperator(operator, resolved);
-      const mode = String(rule.mode || 'default') === 'assign' ? 'assign' : 'default';
+      const mode = this.normalizeFieldValueMode(rule.mode);
       if (mode === 'default' && !this.canApplyFormDefaultValue(String(name), current, force)) continue;
+      if (mode === 'override' && !this.canApplyFormOverrideValue(String(name), force)) continue;
       if (isEqual(current, normalized)) {
         if (mode === 'default') {
           this.lastDefaultValueByFieldName.set(String(name), normalized);
@@ -527,6 +555,7 @@ export class FilterFormBlockModel extends FilterBlockModel<{
   }
 
   private handleFilterFormValuesChange(changedValues: any, allValues: any) {
+    this.markFilterFormUserEditedFields(changedValues);
     const refreshSeq = ++this.defaultValuesRefreshSeq;
     void (async () => {
       const appliedValues = await this.applyFormDefaultValues({ refreshSeq });

package/src/flow/models/blocks/filter-form/__tests__/defaultValues.wiring.test.ts

@@ -50,6 +50,7 @@ function createFilterFormDefaultValuesModel(rules: any[], initialValues: Record<
   const model = {
     defaultValuesRefreshSeq: 0,
     lastDefaultValueByFieldName: new Map<string, any>(),
+    userEditedFieldNames: new Set<string>(),
     form: {
       getFieldsValue: () => ({ ...values }),
       getFieldValue: (name: string) => values[name],
@@ -86,6 +87,10 @@ function createFilterFormDefaultValuesModel(rules: any[], initialValues: Record<
       return undefined;
     }),
     canApplyFormDefaultValue: (FilterFormBlockModel.prototype as any).canApplyFormDefaultValue,
+    canApplyFormOverrideValue: (FilterFormBlockModel.prototype as any).canApplyFormOverrideValue,
+    normalizeFieldValueMode: (FilterFormBlockModel.prototype as any).normalizeFieldValueMode,
+    markFilterFormUserEditedFields: (FilterFormBlockModel.prototype as any).markFilterFormUserEditedFields,
+    resetFilterFormUserEditedFields: (FilterFormBlockModel.prototype as any).resetFilterFormUserEditedFields,
     matchDefaultValueCondition: (FilterFormBlockModel.prototype as any).matchDefaultValueCondition,
     applyFormDefaultValues: FilterFormBlockModel.prototype.applyFormDefaultValues,
     handleFilterFormValuesChange: (FilterFormBlockModel.prototype as any).handleFilterFormValuesChange,
@@ -315,6 +320,78 @@ describe('filter-form defaultValues wiring', () => {
     expect(values.username_user).toBe('Bob');
   });
 
+  it('applies override values until the target filter field is changed by user', async () => {
+    const { model, values } = createFilterFormDefaultValuesModel(
+      [
+        {
+          key: 'username-override',
+          enable: true,
+          targetPath: 'username',
+          mode: 'override',
+          value: '{{ ctx.formValues.nickname_nick }}',
+        },
+      ],
+      { nickname_nick: 'Bob', username_user: 'Manual' },
+    );
+
+    await FilterFormBlockModel.prototype.applyFormDefaultValues.call(model as any);
+    expect(values.username_user).toBe('Bob');
+
+    values.nickname_nick = 'Carol';
+    model.defaultValuesRefreshSeq += 1;
+    await FilterFormBlockModel.prototype.applyFormDefaultValues.call(model as any, {
+      refreshSeq: model.defaultValuesRefreshSeq,
+    });
+    expect(values.username_user).toBe('Carol');
+
+    values.username_user = 'User value';
+    (model as any).handleFilterFormValuesChange(
+      { username_user: 'User value' },
+      { nickname_nick: 'Carol', username_user: 'User value' },
+    );
+
+    await waitFor(() => {
+      expect(values.username_user).toBe('User value');
+    });
+
+    values.nickname_nick = 'Dora';
+    model.defaultValuesRefreshSeq += 1;
+    await FilterFormBlockModel.prototype.applyFormDefaultValues.call(model as any, {
+      refreshSeq: model.defaultValuesRefreshSeq,
+    });
+    expect(values.username_user).toBe('User value');
+  });
+
+  it('clears filter form user-edited override state on forced apply', async () => {
+    const { model, values } = createFilterFormDefaultValuesModel(
+      [
+        {
+          key: 'username-override',
+          enable: true,
+          targetPath: 'username',
+          mode: 'override',
+          condition: {
+            logic: '$and',
+            items: [{ path: '{{ ctx.formValues.nickname_nick }}', operator: '$eq', value: 'allow' }],
+          },
+          value: '{{ ctx.formValues.nickname_nick }}',
+        },
+      ],
+      { nickname_nick: 'deny', username_user: 'User value' },
+    );
+
+    model.userEditedFieldNames.add('username_user');
+
+    await FilterFormBlockModel.prototype.applyFormDefaultValues.call(model as any, { force: true });
+    expect(values.username_user).toBe('User value');
+    expect(model.userEditedFieldNames.has('username_user')).toBe(false);
+
+    values.nickname_nick = 'allow';
+    await FilterFormBlockModel.prototype.applyFormDefaultValues.call(model as any);
+
+    expect(values.username_user).toBe('allow');
+  });
+
   it('skips filter form field values when the rule condition does not match', async () => {
     const { model, values } = createFilterFormDefaultValuesModel(
       [

package/src/flow/models/blocks/form/EditFormModel.tsx

@@ -239,6 +239,7 @@ EditFormModel.registerFlow({
           // 切换记录（翻页等）时，清理“用户改动标记”，避免把上一条记录的编辑状态带到下一条
           if (recordChanged) {
             ctx.model.resetUserModifiedFields?.();
+            ctx.model.resetRuntimeUserEditedState?.();
           }
 
           ctx.form.setFieldsValue(currentRecord);

package/src/flow/models/blocks/form/FormBlockModel.tsx

@@ -166,6 +166,13 @@ export class FormBlockModel<
     this.userModifiedTopLevelFields.clear();
   }
 
+  /**
+   * @internal
+   */
+  resetRuntimeUserEditedState(): void {
+    this.formValueRuntime?.resetUserEditedState?.();
+  }
+
   public async onDispatchEventStart(eventName: string, options?: any, inputArgs?: Record<string, any>): Promise<void> {
     if (eventName === 'beforeRender') {
       const grid = this.subModels.grid;

package/src/flow/models/blocks/form/__tests__/FormBlockModel.test.tsx

@@ -420,6 +420,23 @@ describe('FormBlockModel (form/formValues injection & server resolve anchors)',
     expect(savedUids).toContain('grid-1');
   });
 
+  it('keeps dirty reset separate from runtime user-edited reset', async () => {
+    const model = await setupFormModel();
+    const resetUserEditedState = vi.fn();
+    model.formValueRuntime = { resetUserEditedState } as any;
+
+    model.markUserModifiedFields({ status: 'draft' });
+    expect(model.getUserModifiedFields().has('status')).toBe(true);
+
+    model.resetUserModifiedFields();
+
+    expect(model.getUserModifiedFields().size).toBe(0);
+    expect(resetUserEditedState).not.toHaveBeenCalled();
+
+    model.resetRuntimeUserEditedState();
+    expect(resetUserEditedState).toHaveBeenCalledTimes(1);
+  });
+
   it('re-syncs delegated assignRules when grid submodel is added after block init', async () => {
     const model = await setupFormModel();
     const syncAssignRules = vi.fn();