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

package/lib/ProForm/components/combination/ProCascader/utils/index.js

@@ -7,14 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.transformDataName = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
+var _lodash = require("lodash");
 var _excluded = ["label", "value", "children"];
-var transformDataName = exports.transformDataName = function transformDataName(dataSource, fieldNames) {
+var transformDataName = (dataSource, fieldNames) => {
   var label = fieldNames.label,
     value = fieldNames.value,
     children = fieldNames.children,
     extraFields = (0, _objectWithoutProperties2.default)(fieldNames, _excluded);
-  if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || 'label' in dataSource[0] && 'value' in dataSource[0] && 'children' in dataSource[0]) {
+  if (!(dataSource !== null && dataSource !== void 0 && dataSource.length) || 'label' in dataSource[0] && 'value' in dataSource[0] && 'children' in dataSource[0]) {
     return dataSource;
   }
   function transformNode(node) {
@@ -23,16 +23,17 @@ var transformDataName = exports.transformDataName = function transformDataName(d
       value: node[value]
     };
     // 处理额外的字段
-    Object.keys(extraFields).forEach(function (key) {
+    Object.keys(extraFields).forEach(key => {
       newNode[key] = node[extraFields[key]];
     });
     if (children && Array.isArray(node[children])) {
       newNode.children = node[children].map(transformNode);
     }
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newNode), (0, _omit2.default)(node, Object.values(fieldNames)));
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newNode), (0, _lodash.omit)(node, Object.values(fieldNames)));
   }
-  var transformData = function transformData(data) {
+  var transformData = data => {
     return data.map(transformNode);
   };
   return transformData(dataSource);
-};
+};
+exports.transformDataName = transformDataName;

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

@@ -6,16 +6,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.childPropsItemProps = exports.ProCombination = void 0;
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 require("antd/es/input/style");
 var _input = _interopRequireDefault(require("antd/es/input"));
+require("antd/es/button/style");
+var _button = _interopRequireDefault(require("antd/es/button"));
 require("antd/es/space/style");
 var _space = _interopRequireDefault(require("antd/es/space"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -24,9 +22,10 @@ var _utils = require("../../../utils");
 var _propsType = require("../../../propsType");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 require("./style/index.less");
+var _jsxRuntime = require("react/jsx-runtime");
 // @ts-nocheck
 
-var useControlled = function useControlled(props) {
+var useControlled = props => {
   var value = props.value,
     onChange = props.onChange;
   var _useState = (0, _react.useState)(value || []),
@@ -38,19 +37,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];
 };
-var ProCombination = exports.ProCombination = function ProCombination(props) {
+var ProCombination = props => {
   var _childProps$, _childProps$2;
   var disabled = props.disabled,
     _props$childProps = props.childProps,
@@ -66,6 +65,7 @@ var ProCombination = exports.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],
@@ -74,9 +74,9 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
     _useControlled2 = (0, _slicedToArray2.default)(_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;
@@ -91,28 +91,29 @@ var ProCombination = exports.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 = (0, _classnames.default)({
     'pro-combination': true,
     'pro-combination-view': isView
   });
-  var addedOtherKeys = (0, _react.useMemo)(function () {
-    return [].concat((0, _toConsumableArray2.default)(_propsType.otherKeys), ['renderType']);
+  var addedOtherKeys = (0, _react.useMemo)(() => {
+    return [..._propsType.otherKeys, 'renderType'];
   }, [_propsType.otherKeys]);
   // 剔除其他参数
-  var _useMemo = (0, _react.useMemo)(function () {
+  var _useMemo = (0, _react.useMemo)(() => {
       return (0, _utils.weedOutProps)(childProps[0] || {}, addedOtherKeys);
     }, [childProps[0]]),
     _useMemo2 = (0, _slicedToArray2.default)(_useMemo, 2),
     beforeProps = _useMemo2[0],
     beforeOtherProps = _useMemo2[1];
-  var _useMemo3 = (0, _react.useMemo)(function () {
+  var _useMemo3 = (0, _react.useMemo)(() => {
       return (0, _utils.weedOutProps)(childProps[1] || {}, addedOtherKeys);
     }, [childProps[1]]),
     _useMemo4 = (0, _slicedToArray2.default)(_useMemo3, 2),
     afterProps = _useMemo4[0],
     afterOtherProps = _useMemo4[1];
+
   // 查看模式
   if (isView) {
     if (!values || !Array.isArray(values)) {
@@ -132,29 +133,30 @@ var ProCombination = exports.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 = (0, _jsxRuntime.jsx)(BeforeCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, beforeProps), {}, {
+          oneValue = /*#__PURE__*/(0, _jsxRuntime.jsx)(BeforeCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, beforeProps), {}, {
             value: values === null || values === void 0 ? void 0 : values[0],
             otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = (0, _jsxRuntime.jsx)(AfterCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, afterProps), {}, {
+          twoValue = /*#__PURE__*/(0, _jsxRuntime.jsx)(AfterCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, afterProps), {}, {
             value: values === null || values === void 0 ? void 0 : values[1],
             otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, afterOtherProps), {}, {
-              isView: isView
+              isView
             })
           }));
         } else {
@@ -162,21 +164,21 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
         }
       }
     });
-    return (0, _jsxRuntime.jsx)(_Container.default, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
-      children: (0, _jsxRuntime.jsx)(_space.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
         size: 8,
-        children: !oneValue && !twoValue ? viewEmpty : (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: !oneValue && !twoValue ? viewEmpty : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
           children: [oneValue, separator, twoValue]
         })
       })
     });
   }
-  return (0, _jsxRuntime.jsxs)(_input.default.Group, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_input.default.Group, {
     compact: true,
     className: className,
     id: id,
-    children: [(0, _jsxRuntime.jsx)(BeforeCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(BeforeCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       disabled: disabled
     }, beforeProps), {}, {
       value: values === null || values === void 0 ? void 0 : values[0],
@@ -187,10 +189,10 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
         return handleChange(value, rest, 0);
       },
       otherProps: beforeOtherProps
-    })), isView ? separator : separator && (0, _jsxRuntime.jsx)(_button.default, {
+    })), isView ? separator : separator && /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
       disabled: true,
       children: separator
-    }), (0, _jsxRuntime.jsx)(AfterCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(AfterCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       disabled: disabled
     }, afterProps), {}, {
       value: values === null || values === void 0 ? void 0 : values[1],
@@ -204,10 +206,12 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
     }))]
   });
 };
+exports.ProCombination = ProCombination;
 ProCombination.defaultProps = {
   disabled: false
 };
-var childPropsItemProps = exports.childPropsItemProps = function childPropsItemProps(props) {
+var childPropsItemProps = props => {
   return null;
 };
+exports.childPropsItemProps = childPropsItemProps;
 var _default = exports.default = ProCombination;

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

@@ -11,15 +11,15 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
 var _ahooks = require("ahooks");
+var _lodash = require("lodash");
 var _react = require("react");
 var _locale = _interopRequireWildcard(require("../../../../../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 = (0, _react.useState)(customizePage || defaultPage),
@@ -33,7 +33,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var defaultService = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -64,14 +64,16 @@ function useRequestList(service, options, useRequestOptions) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     searchValues = _useState4[0],
     setSearchValues = _useState4[1];
+
   // 当次执行service的请求,包括page参数
-  var params = (0, _react.useMemo)(function () {
+  var params = (0, _react.useMemo)(() => {
     var _condition = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultParams), searchValues);
     var tempParams = withPagination ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, page), {}, {
       queryBean: _condition !== null && _condition !== void 0 ? _condition : {}
     }) : _condition;
     return transformParams ? transformParams(tempParams) : tempParams;
   }, [page, searchValues, _defaultParams, transformParams]);
+
   // 调接口
   var result = (0, _ahooks.useRequest)(service || defaultService, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, useRequestOptions), {}, {
     defaultParams: [params]
@@ -79,69 +81,73 @@ function useRequestList(service, options, useRequestOptions) {
   var data = result.data,
     run = result.run,
     loading = result.loading;
+
   // 搜索条件变化时触发
   var prevParams = (0, _ahooks.usePrevious)(params);
-  var _useDebounceFn = (0, _ahooks.useDebounceFn)(function () {
+  var _useDebounceFn = (0, _ahooks.useDebounceFn)(() => {
       run(params);
     }, {
       wait: 300
     }),
     queryList = _useDebounceFn.run;
-  (0, _react.useEffect)(function () {
-    if (prevParams && !(0, _isEqual2.default)(prevParams, params)) {
+  (0, _react.useEffect)(() => {
+    if (prevParams && !(0, _lodash.isEqual)(prevParams, params)) {
       queryList();
     }
   }, [params, prevParams, queryList]);
+
   // 分页变更
-  var onChange = (0, _react.useCallback)(function (current, pageSize) {
+  var onChange = (0, _react.useCallback)((current, pageSize) => {
     onPageChange({
       pageNum: current,
-      pageSize: pageSize
+      pageSize
     });
   }, [onPageChange]);
-  var onSearch = (0, _react.useCallback)(function (values) {
-    if (!(0, _isEqual2.default)(searchValues, values)) {
+  var onSearch = (0, _react.useCallback)(values => {
+    if (!(0, _lodash.isEqual)(searchValues, values)) {
       onChange(defaultPage.pageNum, defaultPage.pageSize);
       setSearchValues(values);
     }
   }, [onChange, searchValues]);
+
   // 重置查询条件
-  var onReset = (0, _react.useCallback)(function () {
+  var onReset = (0, _react.useCallback)(() => {
     onSearch({});
   }, [onSearch]);
-  var dataSource = (0, _react.useMemo)(function () {
+  var dataSource = (0, _react.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 (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEditTable = _locale.default.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
-          total: total
+        return (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 || (_locale$ProEditTable = _locale.default.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+          total
         });
       }
     } : false