@zat-design/sisyphus-react 3.13.6-beta.2 → 3.13.6-beta.4

package/es/ProTable/hooks/useAntdTable.js

@@ -7,7 +7,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["page", "filters", "sorter"];
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
 import { pickBy, isObject, merge, set, isEqual, omit } from 'lodash';
 import { defaultPage } from '../index';
@@ -71,7 +71,7 @@ function useAntdTable(service, options, useRequestOptions) {
   var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
   var initPage = (options === null || options === void 0 ? void 0 : options.page) || defaultPage;
   var previousPage = usePrevious(page || defaultPage);
-  var getTransformParams = useCallback(function (params) {
+  var getTransformParams = function getTransformParams(params) {
     var _pickBy;
     var realParams = _objectSpread(_objectSpread(_objectSpread({}, defaultParam), extraParams), params);
     var _realParams$page = realParams.page,
@@ -92,7 +92,7 @@ function useAntdTable(service, options, useRequestOptions) {
       return transformParams(realParams, requestParams);
     }
     return requestParams;
-  }, [defaultParam, extraParams]);
+  };
   // 仅清数据源相关，查询相关
   var handleSetStateCallback = function handleSetStateCallback(values) {
     setState(_objectSpread({
@@ -137,13 +137,13 @@ function useAntdTable(service, options, useRequestOptions) {
   var run = result.run,
     refreshAsync = result.refreshAsync;
   // service变化时触发 (禁止掉防止service变更时导致的死循环)
-  var clearSelected = useCallback(function () {
+  var clearSelected = function clearSelected() {
     setState({
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: []
     });
-  }, []);
+  };
   /**
    * 手动触发时，手动调用run
    */
@@ -189,7 +189,7 @@ function useAntdTable(service, options, useRequestOptions) {
     };
   }, []);
   // 分页变更
-  var handlePageChange = useCallback(function (current, pageSize) {
+  var handlePageChange = function handlePageChange(current, pageSize) {
     var _form$getFieldsValue;
     var page = {
       pageNum: current,
@@ -207,8 +207,8 @@ function useAntdTable(service, options, useRequestOptions) {
     run(getTransformParams(_objectSpread(_objectSpread({
       page: page
     }, nextValues), extraFilter)));
-  }, [allSelected, extraFilter, data, getTransformParams]);
-  var handleTableChange = useCallback(function (pagination, filters, sorter, extra) {
+  };
+  var handleTableChange = function handleTableChange(pagination, filters, sorter, extra) {
     var _form$getFieldsValue2;
     // 跳过分页改变，使用pagination的onChange
     if (extra.action === 'paginate') {
@@ -234,8 +234,8 @@ function useAntdTable(service, options, useRequestOptions) {
       filters: filters,
       sorter: sorter
     })));
-  }, [allSelected, getTransformParams]);
-  var onSearch = useCallback(function (values) {
+  };
+  var onSearch = function onSearch(values) {
     var newPage = {
       pageNum: 1,
       pageSize: page.pageSize
@@ -258,8 +258,8 @@ function useAntdTable(service, options, useRequestOptions) {
     run(getTransformParams(_objectSpread(_objectSpread({
       page: newPage
     }, extraFilter), _values)));
-  }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
-  var resetParams = useCallback(function (page) {
+  };
+  var resetParams = function resetParams(page) {
     setState({
       searchValues: {},
       allSelected: false,
@@ -270,9 +270,9 @@ function useAntdTable(service, options, useRequestOptions) {
         sorter: undefined
       }
     });
-  }, []);
+  };
   // 重置查询条件: 页码还原、勾选清空
-  var onReset = useCallback(function () {
+  var onReset = function onReset() {
     form === null || form === void 0 ? void 0 : form.resetFields();
     var newPage = {
       pageNum: 1,
@@ -285,7 +285,7 @@ function useAntdTable(service, options, useRequestOptions) {
         page: newPage
       }));
     }
-  }, [page.pageSize, run, resetParams, getTransformParams]);
+  };
   var refreshPage = function refreshPage(res) {
     var transformResult = transformResponse ? transformResponse(res) : res || {};
     var _ref3 = isListResult(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},

package/es/ProTree/components/ProTreeSelect/index.js

@@ -19,7 +19,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable react/jsx-closing-tag-location */
 import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from 'ahooks';
 import classnames from 'classnames';
-import { useImperativeHandle, forwardRef } from 'react';
+import { useImperativeHandle, forwardRef, useCallback } from 'react';
 import { cloneDeep, debounce } from 'lodash';
 import locale from '../../../locale';
 import { useProConfig } from '../../../ProConfigProvider';
@@ -27,6 +27,7 @@ import Container from '../../../ProForm/components/Container';
 import AdaptiveTooltip from '../AdaptiveTooltip';
 var SHOW_PARENT = _TreeSelect.SHOW_PARENT;
 export var ProTreeSelect = function ProTreeSelect(props, ref) {
+  var _useRequest$options;
   // 全局属性配置在ConfigProvider
   var _ref = useProConfig('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -170,19 +171,48 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
       origDataSource: resultData || []
     });
   };
+  var successTransformDataHandle = useCallback(function (res) {
+    if (transformResponse && typeof transformResponse === 'function') {
+      return transformResponse(res);
+    }
+    var _ref4 = res || {},
+      _ref4$status = _ref4.status,
+      status = _ref4$status === void 0 ? 200 : _ref4$status,
+      msg = _ref4.message,
+      data = _ref4.data;
+    if (status !== 200) {
+      _message.error(msg);
+      return;
+    }
+    return data;
+  }, []);
   // 配置了异步数据源，拉取枚举数据逻辑 如果有code不掉接口从local里根据code取值
   var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread({
     manual: true,
-    debounceWait: 300
+    debounceWait: 300,
+    onSuccess: function onSuccess(data) {
+      if (transformResponse && typeof transformResponse === 'function') {
+        var responseData = transformResponse(data);
+        var resultData = transferDataSource(responseData, showCodeName);
+        setState({
+          selectList: countChild(resultData),
+          origDataSource: resultData
+        });
+      } else {
+        defaultOnSuccessFun(fetchFunction.data);
+      }
+    }
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
+  var cacheList = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.cacheKey) ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
   useImperativeHandle(ref, function () {
     return {
       useRequestRef: fetchFunction
     };
   });
-  // 请求成功
+  // 设置cacheKey后使用缓存的数据
   useDeepCompareEffect(function () {
-    if (fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) {
+    var _useRequest$options2;
+    if (fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.cacheKey) {
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(fetchFunction.data);
         // debugger;
@@ -217,17 +247,21 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     if (enumCode || dataSource) {
       return undefined;
     }
+    // 如果配置手动加载，不执行请求
+    var _ref5 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+      defaultParams = _ref5.defaultParams,
+      manual = _ref5.manual;
     // disabled 状态时，不查询接口
     if (defaultDisableValue || !useRequest) {
       return undefined;
     }
-    // 如果配置手动加载，不执行请求
-    var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
-      defaultParams = _ref4.defaultParams;
+    if (manual || (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length)) {
+      return;
+    }
     var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
     // 执行用户配置的枚举服务，拉取枚举数据进行更新
     fetchFunction.run(params);
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, defaultDisableValue]);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
   // disable默认值
   if (defaultDisableValue) {
     return _jsx("span", {
@@ -404,7 +438,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     return sourceList;
   }
   var searchTreeEvent = debounce(/*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchVal) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchVal) {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -429,7 +463,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
       }, _callee);
     }));
     return function (_x) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }(), 500);
   function findTreeNode(treeList, nodeValue) {

package/lib/ProTable/hooks/useAntdTable.js

@@ -78,7 +78,7 @@ function useAntdTable(service, options, useRequestOptions) {
   var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
   var initPage = (options === null || options === void 0 ? void 0 : options.page) || _index.defaultPage;
   var previousPage = (0, _ahooks.usePrevious)(page || _index.defaultPage);
-  var getTransformParams = (0, _react.useCallback)(function (params) {
+  var getTransformParams = function getTransformParams(params) {
     var _pickBy;
     var realParams = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultParam), extraParams), params);
     var _realParams$page = realParams.page,
@@ -99,7 +99,7 @@ function useAntdTable(service, options, useRequestOptions) {
       return transformParams(realParams, requestParams);
     }
     return requestParams;
-  }, [defaultParam, extraParams]);
+  };
   // 仅清数据源相关，查询相关
   var handleSetStateCallback = function handleSetStateCallback(values) {
     setState((0, _objectSpread2.default)({
@@ -144,13 +144,13 @@ function useAntdTable(service, options, useRequestOptions) {
   var run = result.run,
     refreshAsync = result.refreshAsync;
   // service变化时触发 (禁止掉防止service变更时导致的死循环)
-  var clearSelected = (0, _react.useCallback)(function () {
+  var clearSelected = function clearSelected() {
     setState({
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: []
     });
-  }, []);
+  };
   /**
    * 手动触发时，手动调用run
    */
@@ -196,7 +196,7 @@ function useAntdTable(service, options, useRequestOptions) {
     };
   }, []);
   // 分页变更
-  var handlePageChange = (0, _react.useCallback)(function (current, pageSize) {
+  var handlePageChange = function handlePageChange(current, pageSize) {
     var _form$getFieldsValue;
     var page = {
       pageNum: current,
@@ -214,8 +214,8 @@ function useAntdTable(service, options, useRequestOptions) {
     run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: page
     }, nextValues), extraFilter)));
-  }, [allSelected, extraFilter, data, getTransformParams]);
-  var handleTableChange = (0, _react.useCallback)(function (pagination, filters, sorter, extra) {
+  };
+  var handleTableChange = function handleTableChange(pagination, filters, sorter, extra) {
     var _form$getFieldsValue2;
     // 跳过分页改变，使用pagination的onChange
     if (extra.action === 'paginate') {
@@ -241,8 +241,8 @@ function useAntdTable(service, options, useRequestOptions) {
       filters: filters,
       sorter: sorter
     })));
-  }, [allSelected, getTransformParams]);
-  var onSearch = (0, _react.useCallback)(function (values) {
+  };
+  var onSearch = function onSearch(values) {
     var newPage = {
       pageNum: 1,
       pageSize: page.pageSize
@@ -265,8 +265,8 @@ function useAntdTable(service, options, useRequestOptions) {
     run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: newPage
     }, extraFilter), _values)));
-  }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
-  var resetParams = (0, _react.useCallback)(function (page) {
+  };
+  var resetParams = function resetParams(page) {
     setState({
       searchValues: {},
       allSelected: false,
@@ -277,9 +277,9 @@ function useAntdTable(service, options, useRequestOptions) {
         sorter: undefined
       }
     });
-  }, []);
+  };
   // 重置查询条件: 页码还原、勾选清空
-  var onReset = (0, _react.useCallback)(function () {
+  var onReset = function onReset() {
     form === null || form === void 0 ? void 0 : form.resetFields();
     var newPage = {
       pageNum: 1,
@@ -292,7 +292,7 @@ function useAntdTable(service, options, useRequestOptions) {
         page: newPage
       }));
     }
-  }, [page.pageSize, run, resetParams, getTransformParams]);
+  };
   var refreshPage = function refreshPage(res) {
     var transformResult = transformResponse ? transformResponse(res) : res || {};
     var _ref3 = (0, _utils.isListResult)(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -27,6 +27,7 @@ var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onCha
 /* eslint-disable react/jsx-closing-tag-location */
 var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;
 var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
+  var _useRequest$options;
   // 全局属性配置在ConfigProvider
   var _ref = (0, _ProConfigProvider.useProConfig)('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -170,19 +171,48 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       origDataSource: resultData || []
     });
   };
+  var successTransformDataHandle = (0, _react.useCallback)(function (res) {
+    if (transformResponse && typeof transformResponse === 'function') {
+      return transformResponse(res);
+    }
+    var _ref4 = res || {},
+      _ref4$status = _ref4.status,
+      status = _ref4$status === void 0 ? 200 : _ref4$status,
+      msg = _ref4.message,
+      data = _ref4.data;
+    if (status !== 200) {
+      _antd.message.error(msg);
+      return;
+    }
+    return data;
+  }, []);
   // 配置了异步数据源，拉取枚举数据逻辑 如果有code不掉接口从local里根据code取值
   var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)({
     manual: true,
-    debounceWait: 300
+    debounceWait: 300,
+    onSuccess: function onSuccess(data) {
+      if (transformResponse && typeof transformResponse === 'function') {
+        var responseData = transformResponse(data);
+        var resultData = transferDataSource(responseData, showCodeName);
+        setState({
+          selectList: countChild(resultData),
+          origDataSource: resultData
+        });
+      } else {
+        defaultOnSuccessFun(fetchFunction.data);
+      }
+    }
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
+  var cacheList = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.cacheKey) ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       useRequestRef: fetchFunction
     };
   });
-  // 请求成功
+  // 设置cacheKey后使用缓存的数据
   (0, _ahooks.useDeepCompareEffect)(function () {
-    if (fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) {
+    var _useRequest$options2;
+    if (fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.cacheKey) {
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(fetchFunction.data);
         // debugger;
@@ -217,17 +247,21 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     if (enumCode || dataSource) {
       return undefined;
     }
+    // 如果配置手动加载，不执行请求
+    var _ref5 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+      defaultParams = _ref5.defaultParams,
+      manual = _ref5.manual;
     // disabled 状态时，不查询接口
     if (defaultDisableValue || !useRequest) {
       return undefined;
     }
-    // 如果配置手动加载，不执行请求
-    var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
-      defaultParams = _ref4.defaultParams;
+    if (manual || (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length)) {
+      return;
+    }
     var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
     // 执行用户配置的枚举服务，拉取枚举数据进行更新
     fetchFunction.run(params);
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, defaultDisableValue]);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
   // disable默认值
   if (defaultDisableValue) {
     return (0, _jsxRuntime.jsx)("span", {
@@ -404,7 +438,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     return sourceList;
   }
   var searchTreeEvent = (0, _lodash.debounce)(/*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(searchVal) {
+    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(searchVal) {
       var result;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -429,7 +463,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       }, _callee);
     }));
     return function (_x) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }(), 500);
   function findTreeNode(treeList, nodeValue) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.6-beta.2",
+  "version": "3.13.6-beta.4",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",