@hw-component/form 0.0.4-beta-v9 → 0.0.5-beta-v1

package/es/Form/hooks/index.js

@@ -114,6 +114,31 @@ var useDefaultComponents = function useDefaultComponents() {
   var defaultComponent = useFormConfigContext("defaultComponent");
   return _objectSpread(_objectSpread({}, componentConfig), defaultComponent);
 };
+var dispatchControl = function dispatchControl(form, params, dispatch) {
+  if (!dispatch) {
+    return;
+  }
+  var dispatchKey = _Object$keys(dispatch);
+  _forEachInstanceProperty(dispatchKey).call(dispatchKey, function (name) {
+    var _dispatch$name = dispatch[name],
+      fnKey = _dispatch$name.fnKey,
+      reset = _dispatch$name.reset;
+    if (reset) {
+      form.setFields([{
+        name: name,
+        value: null,
+        errors: []
+      }]);
+    }
+    if (!fnKey) {
+      return;
+    }
+    form.dispatch({
+      key: fnKey,
+      name: name
+    }, params);
+  });
+};
 var useValuesChange = function useValuesChange(_ref4) {
   var onValuesChange = _ref4.onValuesChange,
     dispatch = _ref4.dispatch,
@@ -121,26 +146,10 @@ var useValuesChange = function useValuesChange(_ref4) {
   return function (changedValues, values) {
     var changeKey = _Object$keys(changedValues)[0];
     var dispatchItem = dispatch[changeKey];
-    if (!!dispatchItem) {
-      var dispatchKey = _Object$keys(dispatchItem);
-      _forEachInstanceProperty(dispatchKey).call(dispatchKey, function (name) {
-        var _dispatchItem$name = dispatchItem[name],
-          fnKey = _dispatchItem$name.fnKey,
-          reset = _dispatchItem$name.reset;
-        reset && form.setFields([{
-          name: name,
-          value: null,
-          errors: []
-        }]);
-        form.dispatch({
-          key: fnKey,
-          name: name
-        }, {
-          changedValues: changedValues,
-          oldValues: values
-        });
-      });
-    }
+    dispatchControl(form, {
+      changedValues: changedValues,
+      oldValues: values
+    }, dispatchItem);
     onValuesChange === null || onValuesChange === void 0 ? void 0 : onValuesChange(changedValues, values);
   };
 };

package/lib/Form/hooks/index.js

@@ -115,6 +115,31 @@ var useDefaultComponents = function useDefaultComponents() {
   var defaultComponent = FormConfigProvider.useFormConfigContext("defaultComponent");
   return _objectSpread(_objectSpread({}, config.default), defaultComponent);
 };
+var dispatchControl = function dispatchControl(form, params, dispatch) {
+  if (!dispatch) {
+    return;
+  }
+  var dispatchKey = _Object$keys(dispatch);
+  _forEachInstanceProperty(dispatchKey).call(dispatchKey, function (name) {
+    var _dispatch$name = dispatch[name],
+      fnKey = _dispatch$name.fnKey,
+      reset = _dispatch$name.reset;
+    if (reset) {
+      form.setFields([{
+        name: name,
+        value: null,
+        errors: []
+      }]);
+    }
+    if (!fnKey) {
+      return;
+    }
+    form.dispatch({
+      key: fnKey,
+      name: name
+    }, params);
+  });
+};
 var useValuesChange = function useValuesChange(_ref4) {
   var onValuesChange = _ref4.onValuesChange,
     dispatch = _ref4.dispatch,
@@ -122,26 +147,10 @@ var useValuesChange = function useValuesChange(_ref4) {
   return function (changedValues, values) {
     var changeKey = _Object$keys(changedValues)[0];
     var dispatchItem = dispatch[changeKey];
-    if (!!dispatchItem) {
-      var dispatchKey = _Object$keys(dispatchItem);
-      _forEachInstanceProperty(dispatchKey).call(dispatchKey, function (name) {
-        var _dispatchItem$name = dispatchItem[name],
-          fnKey = _dispatchItem$name.fnKey,
-          reset = _dispatchItem$name.reset;
-        reset && form.setFields([{
-          name: name,
-          value: null,
-          errors: []
-        }]);
-        form.dispatch({
-          key: fnKey,
-          name: name
-        }, {
-          changedValues: changedValues,
-          oldValues: values
-        });
-      });
-    }
+    dispatchControl(form, {
+      changedValues: changedValues,
+      oldValues: values
+    }, dispatchItem);
     onValuesChange === null || onValuesChange === void 0 ? void 0 : onValuesChange(changedValues, values);
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "0.0.4-beta-v9",
+  "version": "0.0.5-beta-v1",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Form/hooks/index.ts

@@ -75,6 +75,28 @@ export const useDefaultComponents = () => {
   return { ...FormConfig, ...defaultComponent };
 };
 
+const dispatchControl=(form:HFormInstance,params,dispatch?:Record<string, DispatchModal>)=>{
+   if (!dispatch){
+      return;
+   }
+  const dispatchKey = Object.keys(dispatch);
+  dispatchKey.forEach((name) => {
+    const { fnKey, reset } = dispatch[name];
+    if (reset) {
+      form.setFields([{ name, value: null, errors: [] }]);
+    }
+    if (!fnKey){
+      return;
+    }
+    form.dispatch(
+        {
+          key: fnKey,
+          name,
+        },
+        params
+    );
+  });
+};//触发
 export const useValuesChange = ({
   onValuesChange,
   dispatch,
@@ -83,23 +105,7 @@ export const useValuesChange = ({
   return (changedValues: any, values: any) => {
     const changeKey = Object.keys(changedValues)[0];
     const dispatchItem = dispatch[changeKey];
-    if (!!dispatchItem) {
-      const dispatchKey = Object.keys(dispatchItem);
-      dispatchKey.forEach((name) => {
-        const {fnKey,reset} = dispatchItem[name];
-        reset&&form.setFields([{name,value:null,errors:[]}]);
-        form.dispatch(
-          {
-            key:fnKey,
-            name,
-          },
-          {
-            changedValues,
-            oldValues: values,
-          }
-        );
-      });
-    }
+    dispatchControl(form,{ changedValues,oldValues: values},dispatchItem);
     onValuesChange?.(changedValues, values);
   };
 };

package/src/components/Form/hooks/useHForm.ts

@@ -18,8 +18,8 @@ export default () => {
     let isLoading = false;
 
     const norAddItemDispatch = (name, manual, fn) => {
-      if (manual === false&&name) {
-        initDispatch[name]=fn;
+      if (manual === false && name) {
+        initDispatch[name] = fn;
       }
       if (!name) {
         return {
@@ -44,7 +44,7 @@ export default () => {
           newValue = this.formatValues(cacheValues);
           form.setFieldsValue(newValue);
         }
-        const initKeys=Object.keys(initDispatch);
+        const initKeys = Object.keys(initDispatch);
         initKeys.forEach((key) => {
           initDispatch[key]({ changedValues: newValue, oldValues: newValue });
         });
@@ -112,8 +112,8 @@ export default () => {
         } else {
           defaultFn.push(fn);
         }
-        if (manual===false&&name){
-          initDispatch[name]=fn;
+        if (manual === false && name) {
+          initDispatch[name] = fn;
         }
         dispatchSourceData[key] = {
           keysFn,

package/src/components/Form/hooks/useInitConfigData.tsx

@@ -105,22 +105,22 @@ const itemDispatchProvider = (
   config: Required<DispatchModal<string>>,
   dispatchSourceData: DispatchSourceDataModal
 ) => {
-  const { dependencies, fnKey ,reset} = config;
+  const { dependencies, fnKey, reset } = config;
   const itemDispatch = dispatchSourceData[dependencies as string];
   if (!itemDispatch) {
     return {
       [dependencies]: {
-        [name]:{
+        [name]: {
           fnKey,
-          reset
+          reset,
         },
       },
     };
   }
   const itemNameDispatch = {
-    [name]:{
+    [name]: {
       fnKey,
-      reset
+      reset,
     },
   };
   return {
@@ -139,7 +139,7 @@ const dispatchProvider = (
     fnKey,
     dependencies: dispatchDependencies = dependencies as string | string[],
     manual = true,
-    reset=true
+    reset = true,
   } = dispatch;
   if (!fnKey) {
     return {};
@@ -151,7 +151,7 @@ const dispatchProvider = (
     dispatchDependencies.forEach((key) => {
       const itemDispatch = itemDispatchProvider(
         name,
-        { dependencies: key, fnKey, manual ,reset},
+        { dependencies: key, fnKey, manual, reset },
         dispatchSourceData
       );
       allDispatch = {
@@ -163,7 +163,7 @@ const dispatchProvider = (
   }
   const itemDispatch = itemDispatchProvider(
     name,
-    { dependencies: dispatchDependencies, fnKey, manual ,reset},
+    { dependencies: dispatchDependencies, fnKey, manual, reset },
     dispatchSourceData
   );
   return {
@@ -176,7 +176,7 @@ type InitConfigModal = Required<Pick<HFormProps, "configData" | "form">>;
 export default ({ configData, form }: InitConfigModal) => {
   const defaultComponents = useDefaultComponents();
   return useMemo(() => {
-    const newConfigData:HItemProps[] = [];
+    const newConfigData: HItemProps[] = [];
     let dispatchSourceData: DispatchSourceDataModal = {};
     configData.forEach((item) => {
       const itemDispatch = dispatchProvider(item, dispatchSourceData);

package/src/components/Form/modal.ts

@@ -57,12 +57,15 @@ type HelperModal = (form: HFormInstance) => React.ReactNode | string;
 export type HideModal = (form: HFormInstance) => boolean;
 
 export type AddDispatchListenerFn = (action: ActionModal, fn: argsFn) => void;
-export type DispatchSourceDataModal = Record<string, Record<string, DispatchModal>>;
+export type DispatchSourceDataModal = Record<
+  string,
+  Record<string, DispatchModal>
+>;
 export interface DispatchModal<T = string | string[]> {
   fnKey?: string;
   dependencies?: T;
   manual?: boolean;
-  reset?:boolean;
+  reset?: boolean;
 }
 export interface HItemProps extends Omit<FormItemProps, "name"> {
   type?: string;

package/src/components/Select/hooks/changeHooks.tsx

@@ -138,7 +138,7 @@ export const useValueChange = (params: PartialHSelectProps) => {
     onChange(newChangeVal, subItemOps);
   };
   useEffect(() => {
-    if (mode === "tags"||value===null||value===undefined) {
+    if (mode === "tags" || value === null || value === undefined) {
       setVal(value);
       return;
     }