@hw-component/form 0.0.4-beta-v7 → 0.0.4-beta-v9

package/es/Form/hooks/index.js

@@ -124,9 +124,16 @@ var useValuesChange = function useValuesChange(_ref4) {
     if (!!dispatchItem) {
       var dispatchKey = _Object$keys(dispatchItem);
       _forEachInstanceProperty(dispatchKey).call(dispatchKey, function (name) {
-        var key = dispatchItem[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: key,
+          key: fnKey,
           name: name
         }, {
           changedValues: changedValues,

package/es/Form/hooks/useInitConfigData.js

@@ -96,12 +96,19 @@ var itemControl = function itemControl(item, form, defaultComponents) {
 };
 var itemDispatchProvider = function itemDispatchProvider(name, config, dispatchSourceData) {
   var dependencies = config.dependencies,
-    fnKey = config.fnKey;
+    fnKey = config.fnKey,
+    reset = config.reset;
   var itemDispatch = dispatchSourceData[dependencies];
   if (!itemDispatch) {
-    return _defineProperty({}, dependencies, _defineProperty({}, name, fnKey));
+    return _defineProperty({}, dependencies, _defineProperty({}, name, {
+      fnKey: fnKey,
+      reset: reset
+    }));
   }
-  var itemNameDispatch = _defineProperty({}, name, fnKey);
+  var itemNameDispatch = _defineProperty({}, name, {
+    fnKey: fnKey,
+    reset: reset
+  });
   return _defineProperty({}, dependencies, _objectSpread(_objectSpread({}, itemDispatch), itemNameDispatch));
 };
 var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
@@ -115,7 +122,9 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
     _dispatch$dependencie = dispatch.dependencies,
     dispatchDependencies = _dispatch$dependencie === void 0 ? dependencies : _dispatch$dependencie,
     _dispatch$manual = dispatch.manual,
-    manual = _dispatch$manual === void 0 ? true : _dispatch$manual;
+    manual = _dispatch$manual === void 0 ? true : _dispatch$manual,
+    _dispatch$reset = dispatch.reset,
+    reset = _dispatch$reset === void 0 ? true : _dispatch$reset;
   if (!fnKey) {
     return {};
   }
@@ -125,7 +134,8 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
       var itemDispatch = itemDispatchProvider(name, {
         dependencies: key,
         fnKey: fnKey,
-        manual: manual
+        manual: manual,
+        reset: reset
       }, dispatchSourceData);
       allDispatch = _objectSpread(_objectSpread({}, allDispatch), itemDispatch);
     });
@@ -134,7 +144,8 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
   var itemDispatch = itemDispatchProvider(name, {
     dependencies: dispatchDependencies,
     fnKey: fnKey,
-    manual: manual
+    manual: manual,
+    reset: reset
   }, dispatchSourceData);
   return _objectSpread(_objectSpread({}, dispatchSourceData), itemDispatch);
 };

package/es/Form/index.js

@@ -44,7 +44,6 @@ var HForm = (function (_ref) {
     }),
     newConfigData = _useInitConfigData.newConfigData,
     dispatchSourceData = _useInitConfigData.dispatchSourceData;
-  console.log(dispatchSourceData, "dispatchSourceData");
   var _useInfoReq = useInfoReq({
       initialValues: initialValues,
       request: request,

package/es/Form/modal.d.ts

@@ -23,11 +23,12 @@ export interface HoverModal {
 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, string>>;
+export type DispatchSourceDataModal = Record<string, Record<string, DispatchModal>>;
 export interface DispatchModal<T = string | string[]> {
     fnKey?: string;
     dependencies?: T;
     manual?: boolean;
+    reset?: boolean;
 }
 export interface HItemProps extends Omit<FormItemProps, "name"> {
     type?: string;

package/es/Select/hooks/changeHooks.js

@@ -178,7 +178,7 @@ var useValueChange = function useValueChange(params) {
     onChange(newChangeVal, subItemOps);
   };
   useEffect(function () {
-    if (mode === "tags") {
+    if (mode === "tags" || value === null || value === undefined) {
       setVal(value);
       return;
     }

package/lib/Form/hooks/index.js

@@ -125,9 +125,16 @@ var useValuesChange = function useValuesChange(_ref4) {
     if (!!dispatchItem) {
       var dispatchKey = _Object$keys(dispatchItem);
       _forEachInstanceProperty(dispatchKey).call(dispatchKey, function (name) {
-        var key = dispatchItem[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: key,
+          key: fnKey,
           name: name
         }, {
           changedValues: changedValues,

package/lib/Form/hooks/useInitConfigData.js

@@ -99,12 +99,19 @@ var itemControl = function itemControl(item, form, defaultComponents) {
 };
 var itemDispatchProvider = function itemDispatchProvider(name, config, dispatchSourceData) {
   var dependencies = config.dependencies,
-    fnKey = config.fnKey;
+    fnKey = config.fnKey,
+    reset = config.reset;
   var itemDispatch = dispatchSourceData[dependencies];
   if (!itemDispatch) {
-    return _defineProperty({}, dependencies, _defineProperty({}, name, fnKey));
+    return _defineProperty({}, dependencies, _defineProperty({}, name, {
+      fnKey: fnKey,
+      reset: reset
+    }));
   }
-  var itemNameDispatch = _defineProperty({}, name, fnKey);
+  var itemNameDispatch = _defineProperty({}, name, {
+    fnKey: fnKey,
+    reset: reset
+  });
   return _defineProperty({}, dependencies, _objectSpread(_objectSpread({}, itemDispatch), itemNameDispatch));
 };
 var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
@@ -118,7 +125,9 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
     _dispatch$dependencie = dispatch.dependencies,
     dispatchDependencies = _dispatch$dependencie === void 0 ? dependencies : _dispatch$dependencie,
     _dispatch$manual = dispatch.manual,
-    manual = _dispatch$manual === void 0 ? true : _dispatch$manual;
+    manual = _dispatch$manual === void 0 ? true : _dispatch$manual,
+    _dispatch$reset = dispatch.reset,
+    reset = _dispatch$reset === void 0 ? true : _dispatch$reset;
   if (!fnKey) {
     return {};
   }
@@ -128,7 +137,8 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
       var itemDispatch = itemDispatchProvider(name, {
         dependencies: key,
         fnKey: fnKey,
-        manual: manual
+        manual: manual,
+        reset: reset
       }, dispatchSourceData);
       allDispatch = _objectSpread(_objectSpread({}, allDispatch), itemDispatch);
     });
@@ -137,7 +147,8 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
   var itemDispatch = itemDispatchProvider(name, {
     dependencies: dispatchDependencies,
     fnKey: fnKey,
-    manual: manual
+    manual: manual,
+    reset: reset
   }, dispatchSourceData);
   return _objectSpread(_objectSpread({}, dispatchSourceData), itemDispatch);
 };

package/lib/Form/index.js

@@ -47,7 +47,6 @@ var HForm = (function (_ref) {
     }),
     newConfigData = _useInitConfigData.newConfigData,
     dispatchSourceData = _useInitConfigData.dispatchSourceData;
-  console.log(dispatchSourceData, "dispatchSourceData");
   var _useInfoReq = index.useInfoReq({
       initialValues: initialValues,
       request: request,

package/lib/Form/modal.d.ts

@@ -23,11 +23,12 @@ export interface HoverModal {
 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, string>>;
+export type DispatchSourceDataModal = Record<string, Record<string, DispatchModal>>;
 export interface DispatchModal<T = string | string[]> {
     fnKey?: string;
     dependencies?: T;
     manual?: boolean;
+    reset?: boolean;
 }
 export interface HItemProps extends Omit<FormItemProps, "name"> {
     type?: string;

package/lib/Select/hooks/changeHooks.js

@@ -179,7 +179,7 @@ var useValueChange = function useValueChange(params) {
     onChange(newChangeVal, subItemOps);
   };
   React.useEffect(function () {
-    if (mode === "tags") {
+    if (mode === "tags" || value === null || value === undefined) {
       setVal(value);
       return;
     }

package/package.json

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

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

@@ -86,10 +86,11 @@ export const useValuesChange = ({
     if (!!dispatchItem) {
       const dispatchKey = Object.keys(dispatchItem);
       dispatchKey.forEach((name) => {
-        const key = dispatchItem[name];
+        const {fnKey,reset} = dispatchItem[name];
+        reset&&form.setFields([{name,value:null,errors:[]}]);
         form.dispatch(
           {
-            key,
+            key:fnKey,
             name,
           },
           {

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

@@ -16,6 +16,7 @@ export default () => {
     const initDispatch: Record<string, argsFn> = {};
     let cacheValues: Record<string, any> = {};
     let isLoading = false;
+
     const norAddItemDispatch = (name, manual, fn) => {
       if (manual === false&&name) {
         initDispatch[name]=fn;

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

@@ -105,17 +105,23 @@ const itemDispatchProvider = (
   config: Required<DispatchModal<string>>,
   dispatchSourceData: DispatchSourceDataModal
 ) => {
-  const { dependencies, fnKey } = config;
+  const { dependencies, fnKey ,reset} = config;
   const itemDispatch = dispatchSourceData[dependencies as string];
   if (!itemDispatch) {
     return {
       [dependencies]: {
-        [name]: fnKey,
+        [name]:{
+          fnKey,
+          reset
+        },
       },
     };
   }
   const itemNameDispatch = {
-    [name]: fnKey,
+    [name]:{
+      fnKey,
+      reset
+    },
   };
   return {
     [dependencies]: {
@@ -133,6 +139,7 @@ const dispatchProvider = (
     fnKey,
     dependencies: dispatchDependencies = dependencies as string | string[],
     manual = true,
+    reset=true
   } = dispatch;
   if (!fnKey) {
     return {};
@@ -144,7 +151,7 @@ const dispatchProvider = (
     dispatchDependencies.forEach((key) => {
       const itemDispatch = itemDispatchProvider(
         name,
-        { dependencies: key, fnKey, manual },
+        { dependencies: key, fnKey, manual ,reset},
         dispatchSourceData
       );
       allDispatch = {
@@ -156,7 +163,7 @@ const dispatchProvider = (
   }
   const itemDispatch = itemDispatchProvider(
     name,
-    { dependencies: dispatchDependencies, fnKey, manual },
+    { dependencies: dispatchDependencies, fnKey, manual ,reset},
     dispatchSourceData
   );
   return {

package/src/components/Form/index.tsx

@@ -26,7 +26,6 @@ export default ({
     configData,
     form: hForm,
   });
-  console.log(dispatchSourceData,"dispatchSourceData")
   const { subControl, infoControl } = useInfoReq({
     initialValues,
     request,

package/src/components/Form/modal.ts

@@ -57,11 +57,12 @@ 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, string>>;
+export type DispatchSourceDataModal = Record<string, Record<string, DispatchModal>>;
 export interface DispatchModal<T = string | string[]> {
   fnKey?: string;
   dependencies?: T;
   manual?: boolean;
+  reset?:boolean;
 }
 export interface HItemProps extends Omit<FormItemProps, "name"> {
   type?: string;

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

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

package/src/components/Select/index.tsx

@@ -37,7 +37,6 @@ const Index: React.FC<HSelectProps> = ({
 }) => {
   const { icon, render } = modeConfig?.[mode || ""] || {};
   const { fieldNames } = useMatchConfigProps({ fieldNames: propsFieldNames });
-
   const selfFilterOption = useFilterOption({ filterOption, serviceSearch });
   const {
     run,

package/src/pages/Form/index.tsx

@@ -27,7 +27,6 @@ const formData = (options) => {
       dispatch: {
         fnKey: "reload",
         dependencies: ["selectInput", "sz"],
-        manual: false,
       },
       itemProps: {
         request: (params = {}, values) => {