@hw-component/form 1.5.6 → 1.5.8

package/es/Form/hooks/useHForm.js

@@ -11,6 +11,7 @@ import 'core-js/modules/es.promise.js';
 import 'core-js/modules/es.object.keys.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/es.reflect.delete-property.js';
+import 'core-js/modules/es.array.slice.js';
 import 'core-js/modules/es.function.name.js';
 import 'core-js/modules/es.array.concat.js';
 import 'core-js/modules/es.array.map.js';
@@ -100,10 +101,12 @@ var useHForm = (function () {
         });
         return newValue;
       },
-      dispatch: function dispatch(action) {
-        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-          args[_key - 1] = arguments[_key];
+      dispatch: function dispatch() {
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
         }
+        var action = args[0],
+          dispatchArgs = args.slice(1);
         var key = action.key,
           name = action.name;
         var items = dispatchSourceData[key];
@@ -114,13 +117,13 @@ var useHForm = (function () {
           defaultFn = items.defaultFn;
         if (name) {
           var _keysFn$name;
-          return (_keysFn$name = keysFn[name]) === null || _keysFn$name === void 0 ? void 0 : _keysFn$name.call.apply(_keysFn$name, [keysFn].concat(args));
+          return (_keysFn$name = keysFn[name]) === null || _keysFn$name === void 0 ? void 0 : _keysFn$name.call.apply(_keysFn$name, [keysFn].concat(_toConsumableArray(dispatchArgs)));
         }
         var fnArrays = Object.keys(keysFn).map(function (itemKey) {
           return keysFn[itemKey];
         });
         [].concat(_toConsumableArray(fnArrays), _toConsumableArray(defaultFn)).forEach(function (fn) {
-          fn.apply(void 0, args);
+          fn.apply(void 0, _toConsumableArray(dispatchArgs));
         });
       },
       addDispatchListener: function addDispatchListener(action, fn) {

package/es/Select/hooks/norHooks.d.ts

@@ -10,7 +10,7 @@ export declare const useOptionReq: ({ manual, request, options, serviceSearch, s
     data: OptionType[] | undefined;
     onSearch: ((value: string) => void) | undefined;
     mathShowSearch: boolean | undefined;
-    reload: ({ options: changeOpts, params }: ParamsModal) => void | Promise<OptionType[] | undefined>;
+    reload: (reloadParams?: ParamsModal) => void | Promise<OptionType[] | undefined>;
 };
 export declare const useFilterOption: ({ filterOption, serviceSearch, }: PartialHSelectProps) => boolean | import("rc-select/lib/Select").FilterFunc<import("rc-select/lib/Select").DefaultOptionType> | undefined;
 export {};

package/es/Select/hooks/norHooks.js

@@ -66,8 +66,9 @@ var useOptionReq = function useOptionReq(_ref) {
     run = _useRequest.run,
     loading = _useRequest.loading,
     error = _useRequest.error;
-  var reload = function reload(_ref3) {
-    var changeOpts = _ref3.options,
+  var reload = function reload(reloadParams) {
+    var _ref3 = reloadParams || {},
+      changeOpts = _ref3.options,
       params = _ref3.params;
     if (changeOpts) {
       return setData(changeOpts);

package/lib/Form/hooks/useHForm.js

@@ -14,6 +14,7 @@ require('core-js/modules/es.promise.js');
 require('core-js/modules/es.object.keys.js');
 require('core-js/modules/web.dom-collections.for-each.js');
 require('core-js/modules/es.reflect.delete-property.js');
+require('core-js/modules/es.array.slice.js');
 require('core-js/modules/es.function.name.js');
 require('core-js/modules/es.array.concat.js');
 require('core-js/modules/es.array.map.js');
@@ -103,10 +104,12 @@ var useHForm = (function () {
         });
         return newValue;
       },
-      dispatch: function dispatch(action) {
-        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-          args[_key - 1] = arguments[_key];
+      dispatch: function dispatch() {
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
         }
+        var action = args[0],
+          dispatchArgs = args.slice(1);
         var key = action.key,
           name = action.name;
         var items = dispatchSourceData[key];
@@ -117,13 +120,13 @@ var useHForm = (function () {
           defaultFn = items.defaultFn;
         if (name) {
           var _keysFn$name;
-          return (_keysFn$name = keysFn[name]) === null || _keysFn$name === void 0 ? void 0 : _keysFn$name.call.apply(_keysFn$name, [keysFn].concat(args));
+          return (_keysFn$name = keysFn[name]) === null || _keysFn$name === void 0 ? void 0 : _keysFn$name.call.apply(_keysFn$name, [keysFn].concat(_toConsumableArray(dispatchArgs)));
         }
         var fnArrays = Object.keys(keysFn).map(function (itemKey) {
           return keysFn[itemKey];
         });
         [].concat(_toConsumableArray(fnArrays), _toConsumableArray(defaultFn)).forEach(function (fn) {
-          fn.apply(void 0, args);
+          fn.apply(void 0, _toConsumableArray(dispatchArgs));
         });
       },
       addDispatchListener: function addDispatchListener(action, fn) {

package/lib/Select/hooks/norHooks.d.ts

@@ -10,7 +10,7 @@ export declare const useOptionReq: ({ manual, request, options, serviceSearch, s
     data: OptionType[] | undefined;
     onSearch: ((value: string) => void) | undefined;
     mathShowSearch: boolean | undefined;
-    reload: ({ options: changeOpts, params }: ParamsModal) => void | Promise<OptionType[] | undefined>;
+    reload: (reloadParams?: ParamsModal) => void | Promise<OptionType[] | undefined>;
 };
 export declare const useFilterOption: ({ filterOption, serviceSearch, }: PartialHSelectProps) => boolean | import("rc-select/lib/Select").FilterFunc<import("rc-select/lib/Select").DefaultOptionType> | undefined;
 export {};

package/lib/Select/hooks/norHooks.js

@@ -67,8 +67,9 @@ var useOptionReq = function useOptionReq(_ref) {
     run = _useRequest.run,
     loading = _useRequest.loading,
     error = _useRequest.error;
-  var reload = function reload(_ref3) {
-    var changeOpts = _ref3.options,
+  var reload = function reload(reloadParams) {
+    var _ref3 = reloadParams || {},
+      changeOpts = _ref3.options,
       params = _ref3.params;
     if (changeOpts) {
       return setData(changeOpts);

package/package.json

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

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

@@ -85,7 +85,8 @@ export default () => {
         });
         return newValue;
       }, //转化方法
-      dispatch(action, ...args) {
+      dispatch(...args) {
+        const [action,...dispatchArgs]=args;
         const { key, name } = action;
         const items = dispatchSourceData[key];
         if (!items) {
@@ -93,13 +94,13 @@ export default () => {
         }
         const { keysFn, defaultFn } = items;
         if (name) {
-          return keysFn[name]?.(...args);
+          return keysFn[name]?.(...dispatchArgs);
         }
         const fnArrays = Object.keys(keysFn).map((itemKey) => {
           return keysFn[itemKey];
         }); //不存在name就合并
         [...fnArrays, ...defaultFn].forEach((fn) => {
-          fn(...args);
+          fn(...dispatchArgs);
         });
       },
       addDispatchListener(action, fn) {

package/src/components/Select/hooks/norHooks.ts

@@ -42,7 +42,8 @@ export const useOptionReq = ({
       },
     }
   );
-  const reload = ({ options: changeOpts, params }: ParamsModal) => {
+  const reload = (reloadParams?: ParamsModal) => {
+    const { options: changeOpts, params }=reloadParams||{};
     if (changeOpts) {
       return setData(changeOpts);
     }