@hw-component/form 0.0.4-beta-v6 → 0.0.4-beta-v8

package/es/Form/hooks/index.js

@@ -124,14 +124,17 @@ 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;
         form.dispatch({
-          key: key,
+          key: fnKey,
           name: name
         }, {
           changedValues: changedValues,
           oldValues: values
         });
+        reset && form.resetFields([name]);
       });
     }
     onValuesChange === null || onValuesChange === void 0 ? void 0 : onValuesChange(changedValues, values);

package/es/Form/hooks/useHForm.js

@@ -9,8 +9,8 @@ import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _Promise from '@babel/runtime-corejs3/core-js/promise';
-import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js/instance/for-each';
 import _Object$keys from '@babel/runtime-corejs3/core-js/object/keys';
+import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js/instance/for-each';
 import _Reflect$deleteProperty from '@babel/runtime-corejs3/core-js/reflect/delete-property';
 import _concatInstanceProperty from '@babel/runtime-corejs3/core-js/instance/concat';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js/instance/map';
@@ -26,12 +26,12 @@ var useHForm = (function () {
   return useMemo(function () {
     var formatSourceData = {};
     var dispatchSourceData = {};
-    var initDispatch = [];
+    var initDispatch = {};
     var cacheValues = {};
     var isLoading = false;
     var norAddItemDispatch = function norAddItemDispatch(name, manual, fn) {
-      if (manual === false) {
-        initDispatch.push(fn);
+      if (manual === false && name) {
+        initDispatch[name] = fn;
       }
       if (!name) {
         return {
@@ -54,8 +54,9 @@ var useHForm = (function () {
           newValue = this.formatValues(cacheValues);
           form.setFieldsValue(newValue);
         }
-        _forEachInstanceProperty(initDispatch).call(initDispatch, function (fn) {
-          fn({
+        var initKeys = _Object$keys(initDispatch);
+        _forEachInstanceProperty(initKeys).call(initKeys, function (key) {
+          initDispatch[key]({
             changedValues: newValue,
             oldValues: newValue
           });
@@ -136,6 +137,9 @@ var useHForm = (function () {
         } else {
           defaultFn.push(fn);
         }
+        if (manual === false && name) {
+          initDispatch[name] = fn;
+        }
         dispatchSourceData[key] = {
           keysFn: keysFn,
           defaultFn: defaultFn

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/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/Form/hooks/index.js

@@ -125,14 +125,17 @@ 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;
         form.dispatch({
-          key: key,
+          key: fnKey,
           name: name
         }, {
           changedValues: changedValues,
           oldValues: values
         });
+        reset && form.resetFields([name]);
       });
     }
     onValuesChange === null || onValuesChange === void 0 ? void 0 : onValuesChange(changedValues, values);

package/lib/Form/hooks/useHForm.js

@@ -12,8 +12,8 @@ var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArr
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _Promise = require('@babel/runtime-corejs3/core-js/promise');
-var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
 var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
+var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
 var _Reflect$deleteProperty = require('@babel/runtime-corejs3/core-js/reflect/delete-property');
 var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/concat');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
@@ -29,12 +29,12 @@ var useHForm = (function () {
   return React.useMemo(function () {
     var formatSourceData = {};
     var dispatchSourceData = {};
-    var initDispatch = [];
+    var initDispatch = {};
     var cacheValues = {};
     var isLoading = false;
     var norAddItemDispatch = function norAddItemDispatch(name, manual, fn) {
-      if (manual === false) {
-        initDispatch.push(fn);
+      if (manual === false && name) {
+        initDispatch[name] = fn;
       }
       if (!name) {
         return {
@@ -57,8 +57,9 @@ var useHForm = (function () {
           newValue = this.formatValues(cacheValues);
           form.setFieldsValue(newValue);
         }
-        _forEachInstanceProperty(initDispatch).call(initDispatch, function (fn) {
-          fn({
+        var initKeys = _Object$keys(initDispatch);
+        _forEachInstanceProperty(initKeys).call(initKeys, function (key) {
+          initDispatch[key]({
             changedValues: newValue,
             oldValues: newValue
           });
@@ -139,6 +140,9 @@ var useHForm = (function () {
         } else {
           defaultFn.push(fn);
         }
+        if (manual === false && name) {
+          initDispatch[name] = fn;
+        }
         dispatchSourceData[key] = {
           keysFn: keysFn,
           defaultFn: defaultFn

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/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/package.json

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

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

@@ -86,10 +86,10 @@ export const useValuesChange = ({
     if (!!dispatchItem) {
       const dispatchKey = Object.keys(dispatchItem);
       dispatchKey.forEach((name) => {
-        const key = dispatchItem[name];
+        const {fnKey,reset} = dispatchItem[name];
         form.dispatch(
           {
-            key,
+            key:fnKey,
             name,
           },
           {
@@ -97,6 +97,7 @@ export const useValuesChange = ({
             oldValues: values,
           }
         );
+        reset&&form.resetFields([name]);
       });
     }
     onValuesChange?.(changedValues, values);

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

@@ -13,12 +13,12 @@ export default () => {
   return useMemo<HFormInstance>(() => {
     const formatSourceData: Record<string, FormatItemModal> = {};
     let dispatchSourceData: Record<string, DispatchItemData> = {};
-    const initDispatch: argsFn[] = [];
+    const initDispatch: Record<string, argsFn> = {};
     let cacheValues: Record<string, any> = {};
     let isLoading = false;
     const norAddItemDispatch = (name, manual, fn) => {
-      if (manual === false) {
-        initDispatch.push(fn);
+      if (manual === false&&name) {
+        initDispatch[name]=fn;
       }
       if (!name) {
         return {
@@ -43,8 +43,9 @@ export default () => {
           newValue = this.formatValues(cacheValues);
           form.setFieldsValue(newValue);
         }
-        initDispatch.forEach((fn) => {
-          fn({ changedValues: newValue, oldValues: newValue });
+        const initKeys=Object.keys(initDispatch);
+        initKeys.forEach((key) => {
+          initDispatch[key]({ changedValues: newValue, oldValues: newValue });
         });
         isLoading = true;
       },
@@ -110,6 +111,9 @@ export default () => {
         } else {
           defaultFn.push(fn);
         }
+        if (manual===false&&name){
+          initDispatch[name]=fn;
+        }
         dispatchSourceData[key] = {
           keysFn,
           defaultFn,

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/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/pages/ModalForm/index.tsx

@@ -96,6 +96,25 @@ const data = [
     type: "urlUpload",
     rules: [{ required: true }],
   },
+  {
+    label: "下拉框",
+    name: "select",
+    type: "select",
+    dispatch: {
+      fnKey: "reload",
+      dependencies: ["selectInput", "sz"],
+      manual: false,
+    },
+    itemProps: {
+      request: (params = {}, values) => {
+        console.log(values, "paramsparamsparams");
+        const { label = "123", value = 1 } = params;
+        return Promise.resolve([{ label, value }]);
+      },
+      showSearch: true,
+    },
+    rules: [{ required: true }],
+  },
 ];
 let num = 0;
 export default () => {