feat: rename the "updateValue" in diapatch to "setFieldValue"

Author: Ohh-889

primitives/filed-form /src/Field.tsx

@@ -99,7 +99,7 @@ function Field<Values = any>(props: InternalFieldProps<Values>) {
           if (newValue !== oldValue) {
             dispatch({
               name,
-              type: 'updateValue',
+              type: 'setFieldValue',
               value: newValue
             });
           }

primitives/filed-form /src/FieldContext.ts

@@ -82,11 +82,19 @@ export interface InternalCallbacks<Values = any> {
 
 export interface InternalFieldHooks<Values = any> {
   dispatch: (action: Action) => void;
-  subscribeField: (name: AllPaths<Values>, cb: () => void, opt?: { includeChildren?: boolean; mask?: ChangeMask }) => () => void;
-  subscribeFields: (names: AllPaths<Values>[], cb: () => void, opt?: { includeChildren?: boolean; mask?: ChangeMask }) => () => void;
   getInitialValue: <T extends AllPaths<Values>>(name: T) => PathToDeepType<Values, T>;
   registerField: (entity: FieldEntity) => () => void;
   setFieldRules: (name: AllPaths<Values>, rules?: Rule[]) => void;
+  subscribeField: (
+    name: AllPaths<Values>,
+    cb: () => void,
+    opt?: { includeChildren?: boolean; mask?: ChangeMask }
+  ) => () => void;
+  subscribeFields: (
+    names: AllPaths<Values>[],
+    cb: () => void,
+    opt?: { includeChildren?: boolean; mask?: ChangeMask }
+  ) => () => void;
 }
 
 export interface FormInstance<Values = any>
@@ -168,8 +176,8 @@ export const useFieldsState = <Values = any>(
   form: FormInstance<Values>,
   names: AllPaths<Values>[],
   opts?: {
-    mask?: SubscribeMaskOptions;
     includeChildren?: boolean;
+    mask?: SubscribeMaskOptions;
   }
 ) => {
   const state = form.getFields(names);
@@ -178,13 +186,16 @@ export const useFieldsState = <Values = any>(
 
   const { subscribeFields } = getInternalHooks();
 
-  const { mask = {
-    errors: true,
-    touched: true,
-    validated: true,
-    validating: true,
-    warnings: true
-  }, includeChildren } = opts || {};
+  const {
+    includeChildren,
+    mask = {
+      errors: true,
+      touched: true,
+      validated: true,
+      validating: true,
+      warnings: true
+    }
+  } = opts || {};
 
   // eslint-disable-next-line react/hook-use-state
   const [_, forceUpdate] = useState({});
@@ -198,7 +209,7 @@ export const useFieldsState = <Values = any>(
         });
       },
       {
-        includeChildren: includeChildren,
+        includeChildren,
         mask: toMask(mask)
       }
     );
@@ -257,7 +268,7 @@ function useWatch<Values = any>(
 
   const nameIsArray = isArray(names) || !names;
 
-  useFieldsState<Values>(form, namesArray, {mask: {value: true}, includeChildren: includeChildren || !names });
+  useFieldsState<Values>(form, namesArray, { includeChildren: includeChildren || !names, mask: { value: true } });
 
   return nameIsArray ? form.getFieldsValue(namesArray) : form.getFieldValue(names);
 }

primitives/filed-form /src/createStore.ts

@@ -140,8 +140,8 @@ class FormStore {
   //  ===== dispatch =====
   private baseDispatch = (a: Action) => {
     switch (a.type) {
-      case 'updateValue':
-        this.updateValue(a.name, a.value, { validate: a.validate });
+      case 'setFieldValue':
+        this.setFieldValue(a.name, a.value, a.validate);
         break;
       case 'setFieldsValue':
         this.setFieldsValue(a.values, a.validate);
@@ -433,7 +433,7 @@ class FormStore {
         const nextVal = def.compute(getKey, this._store);
         const prevVal = getKey(k);
         if (!isEqual(prevVal, nextVal)) {
-          this.updateValue(keyOfName(k), nextVal, { markTouched: false }); // 不标记 touched
+          this.setFieldValue(keyOfName(k), nextVal);
         }
       }
     });
@@ -504,54 +504,64 @@ class FormStore {
   };
 
   private setFieldValue = (name: NamePath, value: StoreValue, validate = false) => {
-    this.dispatch({ name, type: 'updateValue', validate, value });
-  };
-
-  private updateValue = (
-    name: NamePath,
-    value: StoreValue,
-    { markTouched = true, validate = false }: { markTouched?: boolean; validate?: boolean } = {}
-  ) => {
     const key = keyOfName(name);
-
     const before = get(this._store, key);
 
-    if (isEqual(before, value)) return; // value not changed, do not trigger
-
-    this.updateStore(set(this._store, name, value));
-
-    this._validated.delete(key);
+    if (isEqual(before, value)) return; // no change
 
-    // touched
-    let mask = ChangeTag.Value;
-
-    if (markTouched && !this._touched.has(key)) {
-      this._touched.add(key);
-      mask |= ChangeTag.Touched;
-    }
-    // dirty: compare with initial
     const initV = this.getInitialValue(key);
 
-    isEqual(value, initV) ? this._dirty.delete(key) : this._dirty.add(key);
+    // 1. 更新 store
+    this.updateStore(set(this._store, name, value));
 
-    mask |= ChangeTag.Dirty;
+    // 2. 更新元状态（dirty/touched/validated）
+    const mask = this.updateMetaState(key, value, initV);
 
+    // 3. 通知订阅者
     this.enqueueNotify([name], mask);
 
-    // callback
+    // 4. 执行回调
     this._callbacks.onValuesChange?.(set({}, key, value), this._store);
-
     this.triggerOnFieldsChange([key]);
 
+    // 5. 触发依赖计算
     const affected = this.collectDependents([key]);
-
     this.recomputeTargets(affected);
 
+    // 6. 是否立即校验
     if (validate) {
       this.dispatch({ name, type: 'validateField' });
     }
   };
 
+  private updateMetaState = (key: string, value: StoreValue, initV: StoreValue): ChangeMask => {
+    let mask = ChangeTag.Value;
+
+    // touched
+    if (!this._touched.has(key)) {
+      this._touched.add(key);
+      mask |= ChangeTag.Touched;
+    }
+
+    // dirty
+    const wasDirty = this._dirty.has(key);
+    const isDirty = !isEqual(value, initV);
+    if (isDirty && !wasDirty) {
+      this._dirty.add(key);
+      mask |= ChangeTag.Dirty;
+    } else if (!isDirty && wasDirty) {
+      this._dirty.delete(key);
+      mask |= ChangeTag.Dirty;
+    }
+
+    // validated 一旦值变了 → 作废
+    if (this._validated.has(key)) {
+      this._validated.delete(key);
+    }
+
+    return mask;
+  };
+
   // ------------------------------------------------
   // Fields State (errors/touched/validating/warnings, selectors)
   // ------------------------------------------------
@@ -1121,7 +1131,8 @@ class FormStore {
       isFieldValidating: this.isFieldValidating,
       resetFields: (names: NonNullable<NamePath>[] = []) => this.dispatch({ names, type: 'reset' }),
       setFieldsValue: (values: Store, validate = false) => this.dispatch({ type: 'setFieldsValue', validate, values }),
-      setFieldValue: this.setFieldValue,
+      setFieldValue: (name: NamePath, value: StoreValue, validate = false) =>
+        this.dispatch({ name, type: 'setFieldValue', validate, value }),
       submit: this.submit,
       use: this.use,
       validateField: (name: NamePath, opts?: ValidateOptions) => this.dispatch({ name, opts, type: 'validateField' }),

primitives/filed-form /src/form-core/middleware.ts

@@ -8,7 +8,7 @@ export interface ValidateFieldsOptions extends ValidateOptions {
 }
 
 export type Action =
-  | { name: NamePath; type: 'updateValue'; validate?: boolean; value: StoreValue }
+  | { name: NamePath; type: 'setFieldValue'; validate?: boolean; value: StoreValue }
   | { type: 'setFieldsValue'; validate?: boolean; values: Store }
   | { names?: NonNullable<NamePath>[]; type: 'reset' }
   | {