@hw-component/form 1.5.7 → 1.6.0

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,13 +101,14 @@ var useHForm = (function () {
         });
         return newValue;
       },
-      dispatch: function dispatch(action) {
+      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;
-        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-          args[_key - 1] = arguments[_key];
-        }
-        var dispatchArgs = args || [];
         var items = dispatchSourceData[key];
         if (!items) {
           return;
@@ -115,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(dispatchArgs));
+          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, dispatchArgs);
+          fn.apply(void 0, _toConsumableArray(dispatchArgs));
         });
       },
       addDispatchListener: function addDispatchListener(action, fn) {

package/es/Input/ButtonInput.js

@@ -15,7 +15,7 @@ import { Input, Button } from 'antd';
 import { useRequest } from 'ahooks';
 
 var _excluded = ["buttonProps", "value", "onChange", "children", "request"],
-  _excluded2 = ["onClick", "type", "loading"];
+  _excluded2 = ["onClick", "type", "ghost", "loading"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Index = function Index(_ref) {
@@ -29,6 +29,8 @@ var Index = function Index(_ref) {
   var onClick = buttonProps.onClick,
     _buttonProps$type = buttonProps.type,
     type = _buttonProps$type === void 0 ? "primary" : _buttonProps$type,
+    _buttonProps$ghost = buttonProps.ghost,
+    ghost = _buttonProps$ghost === void 0 ? true : _buttonProps$ghost,
     btnLoading = buttonProps.loading,
     oProps = _objectWithoutProperties(buttonProps, _excluded2);
   var _useRequest = useRequest(function (val) {
@@ -79,13 +81,15 @@ var Index = function Index(_ref) {
       },
       value: value,
       onChange: change
-    })), jsx(Button, _objectSpread(_objectSpread({}, oProps), {}, {
+    })), jsx(Button, _objectSpread(_objectSpread({
       type: type,
       onClick: click,
       loading: loading || btnLoading,
       style: {
-        marginLeft: 4
+        marginLeft: 8
       },
+      ghost: ghost
+    }, oProps), {}, {
       children: children
     }))]
   });

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,13 +104,14 @@ var useHForm = (function () {
         });
         return newValue;
       },
-      dispatch: function dispatch(action) {
+      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;
-        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-          args[_key - 1] = arguments[_key];
-        }
-        var dispatchArgs = args || [];
         var items = dispatchSourceData[key];
         if (!items) {
           return;
@@ -118,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(dispatchArgs));
+          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, dispatchArgs);
+          fn.apply(void 0, _toConsumableArray(dispatchArgs));
         });
       },
       addDispatchListener: function addDispatchListener(action, fn) {

package/lib/Input/ButtonInput.js

@@ -18,7 +18,7 @@ var antd = require('antd');
 var ahooks = require('ahooks');
 
 var _excluded = ["buttonProps", "value", "onChange", "children", "request"],
-  _excluded2 = ["onClick", "type", "loading"];
+  _excluded2 = ["onClick", "type", "ghost", "loading"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Index = function Index(_ref) {
@@ -32,6 +32,8 @@ var Index = function Index(_ref) {
   var onClick = buttonProps.onClick,
     _buttonProps$type = buttonProps.type,
     type = _buttonProps$type === void 0 ? "primary" : _buttonProps$type,
+    _buttonProps$ghost = buttonProps.ghost,
+    ghost = _buttonProps$ghost === void 0 ? true : _buttonProps$ghost,
     btnLoading = buttonProps.loading,
     oProps = _objectWithoutProperties(buttonProps, _excluded2);
   var _useRequest = ahooks.useRequest(function (val) {
@@ -82,13 +84,15 @@ var Index = function Index(_ref) {
       },
       value: value,
       onChange: change
-    })), jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({}, oProps), {}, {
+    })), jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({
       type: type,
       onClick: click,
       loading: loading || btnLoading,
       style: {
-        marginLeft: 4
+        marginLeft: 8
       },
+      ghost: ghost
+    }, oProps), {}, {
       children: children
     }))]
   });

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.7",
+  "version": "1.6.0",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

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

@@ -85,9 +85,9 @@ export default () => {
         });
         return newValue;
       }, //转化方法
-      dispatch(action, ...args) {
+      dispatch(...args) {
+        const [action,...dispatchArgs]=args;
         const { key, name } = action;
-        const dispatchArgs=args||[];
         const items = dispatchSourceData[key];
         if (!items) {
           return;

package/src/components/Input/ButtonInput.tsx

@@ -14,6 +14,7 @@ const Index: React.FC<HButtonInputProps> = ({
   const {
     onClick,
     type = "primary",
+      ghost=true,
     loading: btnLoading,
     ...oProps
   } = buttonProps;
@@ -38,11 +39,12 @@ const Index: React.FC<HButtonInputProps> = ({
     <Input.Group compact style={{ display: "flex" }}>
       <Input {...props} style={{ flex: 1 }} value={value} onChange={change} />
       <Button
-        {...oProps}
         type={type}
         onClick={click}
         loading={loading || btnLoading}
-        style={{ marginLeft: 4 }}
+        style={{ marginLeft: 8 }}
+        ghost={ghost}
+        {...oProps}
       >
         {children}
       </Button>

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);
     }