@zat-design/sisyphus-react 3.13.18 → 3.13.19-beta.10

package/es/ProForm/components/combination/ProCombination/index.js

@@ -1,23 +1,24 @@
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 // @ts-nocheck
 import { useMemo, useState } from 'react';
 import classNames from 'classnames';
-import Container from '../../Container';
-import * as componentMap from '../../index';
-import { isNullValue, weedOutProps } from '../../../utils';
-import { otherKeys } from '../../../propsType';
-import ProForm from '../../../../ProForm';
-import './style/index.less';
-var useControlled = function useControlled(props) {
+import Container from "../../Container";
+import * as componentMap from "../../index";
+import { isNullValue, weedOutProps } from "../../../utils";
+import { otherKeys } from "../../../propsType";
+import ProForm from "../../../../ProForm";
+import "./style/index.less";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var useControlled = props => {
   var value = props.value,
     onChange = props.onChange;
   var _useState = useState(value || []),
@@ -29,19 +30,19 @@ var useControlled = function useControlled(props) {
       rest[_key] = arguments[_key];
     }
     setValues(rest[0]);
-    onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, rest);
+    onChange === null || onChange === void 0 || onChange(...rest);
   };
   if ('value' in props) {
     return [value, function () {
       for (var _len2 = arguments.length, rest = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         rest[_key2] = arguments[_key2];
       }
-      return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, rest);
+      return onChange === null || onChange === void 0 ? void 0 : onChange(...rest);
     }];
   }
   return [_values, handleChange];
 };
-export var ProCombination = function ProCombination(props) {
+export var ProCombination = props => {
   var _childProps$, _childProps$2;
   var disabled = props.disabled,
     _props$childProps = props.childProps,
@@ -57,6 +58,7 @@ export var ProCombination = function ProCombination(props) {
     isView = _ref$isView === void 0 ? false : _ref$isView,
     viewEmpty = _ref.viewEmpty,
     form = _ref.form;
+
   // 取到对应组件
   var _ref2 = [componentMap[((_childProps$ = childProps[0]) === null || _childProps$ === void 0 ? void 0 : _childProps$.renderType) || 'Input'], componentMap[((_childProps$2 = childProps[1]) === null || _childProps$2 === void 0 ? void 0 : _childProps$2.renderType) || 'Input']],
     BeforeCom = _ref2[0],
@@ -65,9 +67,9 @@ export var ProCombination = function ProCombination(props) {
     _useControlled2 = _slicedToArray(_useControlled, 2),
     values = _useControlled2[0],
     _handleChange = _useControlled2[1];
-  var handleChange = function handleChange(value, rest, index) {
-    var _value, _value$target, _values2, _values3, _childProps$index, _childProps$index$onC;
-    if (((_value = value) === null || _value === void 0 ? void 0 : (_value$target = _value.target) === null || _value$target === void 0 ? void 0 : _value$target.value) !== undefined) {
+  var handleChange = (value, rest, index) => {
+    var _value, _values2, _values3, _childProps$index, _childProps$index$onC;
+    if (((_value = value) === null || _value === void 0 || (_value = _value.target) === null || _value === void 0 ? void 0 : _value.value) !== undefined) {
       value = value.target.value;
     }
     var _values;
@@ -82,28 +84,29 @@ export var ProCombination = function ProCombination(props) {
       _values = [];
     }
     _handleChange(_values, rest === null || rest === void 0 ? void 0 : rest[0], form);
-    (_childProps$index = childProps[index]) === null || _childProps$index === void 0 ? void 0 : (_childProps$index$onC = _childProps$index.onChange) === null || _childProps$index$onC === void 0 ? void 0 : _childProps$index$onC.call(_childProps$index, value, rest === null || rest === void 0 ? void 0 : rest[0], form); // 支持子组件分别传入onChange
+    (_childProps$index = childProps[index]) === null || _childProps$index === void 0 || (_childProps$index$onC = _childProps$index.onChange) === null || _childProps$index$onC === void 0 || _childProps$index$onC.call(_childProps$index, value, rest === null || rest === void 0 ? void 0 : rest[0], form); // 支持子组件分别传入onChange
   };
   var className = classNames({
     'pro-combination': true,
     'pro-combination-view': isView
   });
-  var addedOtherKeys = useMemo(function () {
-    return [].concat(_toConsumableArray(otherKeys), ['renderType']);
+  var addedOtherKeys = useMemo(() => {
+    return [...otherKeys, 'renderType'];
   }, [otherKeys]);
   // 剔除其他参数
-  var _useMemo = useMemo(function () {
+  var _useMemo = useMemo(() => {
       return weedOutProps(childProps[0] || {}, addedOtherKeys);
     }, [childProps[0]]),
     _useMemo2 = _slicedToArray(_useMemo, 2),
     beforeProps = _useMemo2[0],
     beforeOtherProps = _useMemo2[1];
-  var _useMemo3 = useMemo(function () {
+  var _useMemo3 = useMemo(() => {
       return weedOutProps(childProps[1] || {}, addedOtherKeys);
     }, [childProps[1]]),
     _useMemo4 = _slicedToArray(_useMemo3, 2),
     afterProps = _useMemo4[0],
     afterOtherProps = _useMemo4[1];
+
   // 查看模式
   if (isView) {
     if (!values || !Array.isArray(values)) {
@@ -123,29 +126,30 @@ export var ProCombination = function ProCombination(props) {
         renderType: 'Input'
       });
     }
+
     // 第一个值
     var oneValue = '';
     // 第二个值
     var twoValue = '';
-    childData.forEach(function (item, index) {
-      if (index === 0 && (values === null || values === void 0 ? void 0 : values[0])) {
+    childData.forEach((item, index) => {
+      if (index === 0 && values !== null && values !== void 0 && values[0]) {
         if (['ProEnum', 'ProSelect', 'Select'].includes(item.renderType)) {
-          oneValue = _jsx(BeforeCom, _objectSpread(_objectSpread({}, beforeProps), {}, {
+          oneValue = /*#__PURE__*/_jsx(BeforeCom, _objectSpread(_objectSpread({}, beforeProps), {}, {
             value: values === null || values === void 0 ? void 0 : values[0],
             otherProps: _objectSpread(_objectSpread({}, beforeOtherProps), {}, {
-              isView: isView
+              isView
             })
           }));
         } else {
           oneValue = values === null || values === void 0 ? void 0 : values[0];
         }
       }
-      if (index === 1 && (values === null || values === void 0 ? void 0 : values[1])) {
+      if (index === 1 && values !== null && values !== void 0 && values[1]) {
         if (['ProEnum', 'ProSelect', 'Select'].includes(item.renderType)) {
-          twoValue = _jsx(AfterCom, _objectSpread(_objectSpread({}, afterProps), {}, {
+          twoValue = /*#__PURE__*/_jsx(AfterCom, _objectSpread(_objectSpread({}, afterProps), {}, {
             value: values === null || values === void 0 ? void 0 : values[1],
             otherProps: _objectSpread(_objectSpread({}, afterOtherProps), {}, {
-              isView: isView
+              isView
             })
           }));
         } else {
@@ -153,21 +157,21 @@ export var ProCombination = function ProCombination(props) {
         }
       }
     });
-    return _jsx(Container, {
+    return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,
-      children: _jsx(_Space, {
+      children: /*#__PURE__*/_jsx(_Space, {
         size: 8,
-        children: !oneValue && !twoValue ? viewEmpty : _jsxs(_Fragment, {
+        children: !oneValue && !twoValue ? viewEmpty : /*#__PURE__*/_jsxs(_Fragment, {
           children: [oneValue, separator, twoValue]
         })
       })
     });
   }
-  return _jsxs(_Input.Group, {
+  return /*#__PURE__*/_jsxs(_Input.Group, {
     compact: true,
     className: className,
     id: id,
-    children: [_jsx(BeforeCom, _objectSpread(_objectSpread({
+    children: [/*#__PURE__*/_jsx(BeforeCom, _objectSpread(_objectSpread({
       disabled: disabled
     }, beforeProps), {}, {
       value: values === null || values === void 0 ? void 0 : values[0],
@@ -178,10 +182,10 @@ export var ProCombination = function ProCombination(props) {
         return handleChange(value, rest, 0);
       },
       otherProps: beforeOtherProps
-    })), isView ? separator : separator && _jsx(_Button, {
+    })), isView ? separator : separator && /*#__PURE__*/_jsx(_Button, {
       disabled: true,
       children: separator
-    }), _jsx(AfterCom, _objectSpread(_objectSpread({
+    }), /*#__PURE__*/_jsx(AfterCom, _objectSpread(_objectSpread({
       disabled: disabled
     }, afterProps), {}, {
       value: values === null || values === void 0 ? void 0 : values[1],
@@ -198,7 +202,7 @@ export var ProCombination = function ProCombination(props) {
 ProCombination.defaultProps = {
   disabled: false
 };
-export var childPropsItemProps = function childPropsItemProps(props) {
+export var childPropsItemProps = props => {
   return null;
 };
 export default ProCombination;

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -2,15 +2,15 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _isEqual from "lodash/isEqual";
 import { useDebounceFn, usePrevious, useRequest } from 'ahooks';
+import { isEqual } from 'lodash';
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import locale, { formatMessage } from '../../../../../locale';
+import locale, { formatMessage } from "../../../../../locale";
 var defaultPage = {
   pageNum: 1,
   pageSize: 10
 };
-var useDefaultOptions = function useDefaultOptions(options) {
+var useDefaultOptions = options => {
   var _options$withPaginati;
   var customizePage = options === null || options === void 0 ? void 0 : options.customizePage;
   var _useState = useState(customizePage || defaultPage),
@@ -24,7 +24,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var defaultService = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -55,14 +55,16 @@ export function useRequestList(service, options, useRequestOptions) {
     _useState4 = _slicedToArray(_useState3, 2),
     searchValues = _useState4[0],
     setSearchValues = _useState4[1];
+
   // 当次执行service的请求,包括page参数
-  var params = useMemo(function () {
+  var params = useMemo(() => {
     var _condition = _objectSpread(_objectSpread({}, _defaultParams), searchValues);
     var tempParams = withPagination ? _objectSpread(_objectSpread({}, page), {}, {
       queryBean: _condition !== null && _condition !== void 0 ? _condition : {}
     }) : _condition;
     return transformParams ? transformParams(tempParams) : tempParams;
   }, [page, searchValues, _defaultParams, transformParams]);
+
   // 调接口
   var result = useRequest(service || defaultService, _objectSpread(_objectSpread({}, useRequestOptions), {}, {
     defaultParams: [params]
@@ -70,69 +72,73 @@ export function useRequestList(service, options, useRequestOptions) {
   var data = result.data,
     run = result.run,
     loading = result.loading;
+
   // 搜索条件变化时触发
   var prevParams = usePrevious(params);
-  var _useDebounceFn = useDebounceFn(function () {
+  var _useDebounceFn = useDebounceFn(() => {
       run(params);
     }, {
       wait: 300
     }),
     queryList = _useDebounceFn.run;
-  useEffect(function () {
-    if (prevParams && !_isEqual(prevParams, params)) {
+  useEffect(() => {
+    if (prevParams && !isEqual(prevParams, params)) {
       queryList();
     }
   }, [params, prevParams, queryList]);
+
   // 分页变更
-  var onChange = useCallback(function (current, pageSize) {
+  var onChange = useCallback((current, pageSize) => {
     onPageChange({
       pageNum: current,
-      pageSize: pageSize
+      pageSize
     });
   }, [onPageChange]);
-  var onSearch = useCallback(function (values) {
-    if (!_isEqual(searchValues, values)) {
+  var onSearch = useCallback(values => {
+    if (!isEqual(searchValues, values)) {
       onChange(defaultPage.pageNum, defaultPage.pageSize);
       setSearchValues(values);
     }
   }, [onChange, searchValues]);
+
   // 重置查询条件
-  var onReset = useCallback(function () {
+  var onReset = useCallback(() => {
     onSearch({});
   }, [onSearch]);
-  var dataSource = useMemo(function () {
+  var dataSource = useMemo(() => {
     if (data) {
       var _data$data;
       if (transformResponse) {
-        return (data === null || data === void 0 ? void 0 : data.data) ? transformResponse(data === null || data === void 0 ? void 0 : data.data) : transformResponse(data);
+        return data !== null && data !== void 0 && data.data ? transformResponse(data === null || data === void 0 ? void 0 : data.data) : transformResponse(data);
       }
-      var list = withPagination ? data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.list : data === null || data === void 0 ? void 0 : data.data;
+      var list = withPagination ? data === null || data === void 0 || (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.list : data === null || data === void 0 ? void 0 : data.data;
       return list !== null && list !== void 0 ? list : [];
     }
     return [];
   }, [data, transformResponse, withPagination]);
   return _objectSpread(_objectSpread({}, result), {}, {
-    loading: loading,
+    loading,
     data: dataSource,
-    onReset: onReset,
-    onSearch: onSearch,
-    params: params,
+    onReset,
+    onSearch,
+    params,
     pagination: withPagination ? {
       current: page.pageNum,
       pageSize: page.pageSize,
       onPaginationChange: true,
-      total: data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.total,
-      onChange: onChange,
+      total: data === null || data === void 0 || (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.total,
+      onChange,
       pageSizeOptions: [10, 20, 50, 100],
       showQuickJumper: true,
       showSizeChanger: true,
       onShowSizeChange: onChange,
       hideOnSinglePage: page.pageSize === 10,
-      showTotal: function showTotal(total) {
+      // 只有一页时隐藏分页器
+      showTotal: total => {
         var _locale$ProEditTable;
         if (!total) return;
-        return formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
-          total: total
+        return formatMessage(locale === null || locale === void 0 || (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+          total
         });
       }
     } : false