@zat-design/sisyphus-react 4.0.0-beta.4 → 4.0.0-beta.5

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

@@ -1,49 +1,39 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProForm/components/combination/ProCascader/utils/index.ts
-var utils_exports = {};
-__export(utils_exports, {
-  transformDataName: () => transformDataName
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
-var import_lodash = require("lodash");
+exports.transformDataName = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _lodash = require("lodash");
+var _excluded = ["label", "value", "children"];
 var transformDataName = (dataSource, fieldNames) => {
-  const { label, value, children, ...extraFields } = fieldNames;
-  if (!(dataSource == null ? void 0 : dataSource.length) || "label" in dataSource[0] && "value" in dataSource[0] && "children" in dataSource[0]) {
+  var label = fieldNames.label,
+    value = fieldNames.value,
+    children = fieldNames.children,
+    extraFields = (0, _objectWithoutProperties2.default)(fieldNames, _excluded);
+  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) {
-    const newNode = { label: node[label], value: node[value] };
-    Object.keys(extraFields).forEach((key) => {
+    var newNode = {
+      label: node[label],
+      value: node[value]
+    };
+    // 处理额外的字段
+    Object.keys(extraFields).forEach(key => {
       newNode[key] = node[extraFields[key]];
     });
     if (children && Array.isArray(node[children])) {
       newNode.children = node[children].map(transformNode);
     }
-    return { ...newNode, ...(0, import_lodash.omit)(node, Object.values(fieldNames)) };
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newNode), (0, _lodash.omit)(node, Object.values(fieldNames)));
   }
-  const transformData = (data) => {
+  var transformData = data => {
     return data.map(transformNode);
   };
   return transformData(dataSource);
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  transformDataName
-});
+exports.transformDataName = transformDataName;

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

@@ -1,129 +1,131 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProForm/components/combination/ProModalSelect/hooks/useRequestList.ts
-var useRequestList_exports = {};
-__export(useRequestList_exports, {
-  default: () => useRequestList_default,
-  useRequestList: () => useRequestList
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(useRequestList_exports);
-var import_ahooks = require("ahooks");
-var import_lodash = require("lodash");
-var import_react = require("react");
-var import_locale = __toESM(require("../../../../../locale"));
+exports.default = void 0;
+exports.useRequestList = useRequestList;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+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 _ahooks = require("ahooks");
+var _lodash = require("lodash");
+var _react = require("react");
+var _locale = _interopRequireWildcard(require("../../../../../locale"));
 var defaultPage = {
   pageNum: 1,
   pageSize: 10
 };
-var useDefaultOptions = (options) => {
-  const customizePage = options == null ? void 0 : options.customizePage;
-  const [page, onPageChange] = (0, import_react.useState)(customizePage || defaultPage);
-  return {
-    ...options,
-    withPagination: (options == null ? void 0 : options.withPagination) ?? true,
-    page: (options == null ? void 0 : options.page) || page,
-    onPageChange: (options == null ? void 0 : options.onPageChange) || onPageChange
-  };
-};
-var defaultService = async () => {
-  return {};
+var useDefaultOptions = options => {
+  var _options$withPaginati;
+  var customizePage = options === null || options === void 0 ? void 0 : options.customizePage;
+  var _useState = (0, _react.useState)(customizePage || defaultPage),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    page = _useState2[0],
+    onPageChange = _useState2[1];
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, options), {}, {
+    withPagination: (_options$withPaginati = options === null || options === void 0 ? void 0 : options.withPagination) !== null && _options$withPaginati !== void 0 ? _options$withPaginati : true,
+    page: (options === null || options === void 0 ? void 0 : options.page) || page,
+    onPageChange: (options === null || options === void 0 ? void 0 : options.onPageChange) || onPageChange
+  });
 };
+var defaultService = /*#__PURE__*/function () {
+  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:
+          return _context.abrupt("return", {});
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function defaultService() {
+    return _ref.apply(this, arguments);
+  };
+}();
 function useRequestList(service, options, useRequestOptions) {
-  var _a;
-  const { page, withPagination, onPageChange, transformParams, transformResponse } = useDefaultOptions(options);
-  const { defaultParams } = useRequestOptions || {};
-  const _defaultParams = Array.isArray(defaultParams) ? defaultParams == null ? void 0 : defaultParams[0] : defaultParams || {};
-  const [searchValues, setSearchValues] = (0, import_react.useState)();
-  const params = (0, import_react.useMemo)(() => {
-    const _condition = {
-      ..._defaultParams,
-      ...searchValues
-    };
-    const tempParams = withPagination ? {
-      ...page,
-      queryBean: _condition ?? {}
-    } : _condition;
+  var _data$data2;
+  var _useDefaultOptions = useDefaultOptions(options),
+    page = _useDefaultOptions.page,
+    withPagination = _useDefaultOptions.withPagination,
+    onPageChange = _useDefaultOptions.onPageChange,
+    transformParams = _useDefaultOptions.transformParams,
+    transformResponse = _useDefaultOptions.transformResponse;
+  var _ref2 = useRequestOptions || {},
+    defaultParams = _ref2.defaultParams;
+  var _defaultParams = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
+  // 搜索表单里的值
+  var _useState3 = (0, _react.useState)(),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    searchValues = _useState4[0],
+    setSearchValues = _useState4[1];
+
+  // 当次执行service的请求,包括page参数
+  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]);
-  const result = (0, import_ahooks.useRequest)(service || defaultService, {
-    ...useRequestOptions,
+
+  // 调接口
+  var result = (0, _ahooks.useRequest)(service || defaultService, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, useRequestOptions), {}, {
     defaultParams: [params]
-  });
-  const { data, run, loading } = result;
-  const prevParams = (0, import_ahooks.usePrevious)(params);
-  const { run: queryList } = (0, import_ahooks.useDebounceFn)(
-    () => {
+  }));
+  var data = result.data,
+    run = result.run,
+    loading = result.loading;
+
+  // 搜索条件变化时触发
+  var prevParams = (0, _ahooks.usePrevious)(params);
+  var _useDebounceFn = (0, _ahooks.useDebounceFn)(() => {
       run(params);
-    },
-    {
+    }, {
       wait: 300
-    }
-  );
-  (0, import_react.useEffect)(() => {
-    if (prevParams && !(0, import_lodash.isEqual)(prevParams, params)) {
+    }),
+    queryList = _useDebounceFn.run;
+  (0, _react.useEffect)(() => {
+    if (prevParams && !(0, _lodash.isEqual)(prevParams, params)) {
       queryList();
     }
   }, [params, prevParams, queryList]);
-  const onChange = (0, import_react.useCallback)(
-    (current, pageSize) => {
-      onPageChange({
-        pageNum: current,
-        pageSize
-      });
-    },
-    [onPageChange]
-  );
-  const onSearch = (0, import_react.useCallback)(
-    (values) => {
-      if (!(0, import_lodash.isEqual)(searchValues, values)) {
-        onChange(defaultPage.pageNum, defaultPage.pageSize);
-        setSearchValues(values);
-      }
-    },
-    [onChange, searchValues]
-  );
-  const onReset = (0, import_react.useCallback)(() => {
+
+  // 分页变更
+  var onChange = (0, _react.useCallback)((current, pageSize) => {
+    onPageChange({
+      pageNum: current,
+      pageSize
+    });
+  }, [onPageChange]);
+  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)(() => {
     onSearch({});
   }, [onSearch]);
-  const dataSource = (0, import_react.useMemo)(() => {
-    var _a2;
+  var dataSource = (0, _react.useMemo)(() => {
     if (data) {
+      var _data$data;
       if (transformResponse) {
-        return (data == null ? void 0 : data.data) ? transformResponse(data == null ? 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);
       }
-      const list = withPagination ? (_a2 = data == null ? void 0 : data.data) == null ? void 0 : _a2.list : data == null ? void 0 : data.data;
-      return list ?? [];
+      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 {
-    ...result,
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, result), {}, {
     loading,
     data: dataSource,
     onReset,
@@ -133,7 +135,7 @@ function useRequestList(service, options, useRequestOptions) {
       current: page.pageNum,
       pageSize: page.pageSize,
       onPaginationChange: true,
-      total: (_a = data == null ? void 0 : data.data) == null ? void 0 : _a.total,
+      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,
@@ -141,17 +143,14 @@ function useRequestList(service, options, useRequestOptions) {
       onShowSizeChange: onChange,
       hideOnSinglePage: page.pageSize === 10,
       // 只有一页时隐藏分页器
-      showTotal: (total) => {
-        var _a2, _b;
-        if (!total)
-          return;
-        return (0, import_locale.formatMessage)((_b = (_a2 = import_locale.default) == null ? void 0 : _a2.ProEditTable) == null ? void 0 : _b.total, { total });
+      showTotal: total => {
+        var _locale$ProEditTable;
+        if (!total) return;
+        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
-  };
+  });
 }
-var useRequestList_default = useRequestList;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  useRequestList
-});
+var _default = exports.default = useRequestList;