@zat-design/sisyphus-react 3.13.6 → 3.13.7-beta.1

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

@@ -17,15 +17,17 @@ var _antd = require("antd");
 var _classnames3 = _interopRequireDefault(require("classnames"));
 var _react = require("react");
 var _lodash = require("lodash");
+var _locale = _interopRequireDefault(require("../../../locale"));
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _AdaptiveTooltip = _interopRequireDefault(require("../AdaptiveTooltip"));
-var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className", "checkStrictly", "checkable"],
+var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "placeholder", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className", "checkStrictly", "checkable"],
   _excluded2 = ["children"];
 /* eslint-disable react/no-danger */
 /* 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,
@@ -50,6 +52,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     useRequest = props.useRequest,
     transformResponse = props.transformResponse,
     fieldNames = props.fieldNames,
+    placeholder = props.placeholder,
     _props$tooltip = props.tooltip,
     tooltip = _props$tooltip === void 0 ? false : _props$tooltip,
     _props$showSearch = props.showSearch,
@@ -168,11 +171,26 @@ 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,
     onSuccess: function onSuccess(data) {
-      // 用户配置了处理枚举函数
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(data);
         var resultData = transferDataSource(responseData, showCodeName);
@@ -181,16 +199,33 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
           origDataSource: resultData
         });
       } else {
-        defaultOnSuccessFun(data);
+        defaultOnSuccessFun(fetchFunction.data);
       }
-    },
-    debounceWait: 300
+    }
   }, 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 () {
+    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;
+        var resultData = transferDataSource(responseData, showCodeName);
+        setState({
+          selectList: countChild(resultData),
+          origDataSource: resultData
+        });
+      } else {
+        defaultOnSuccessFun(fetchFunction.data);
+      }
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -212,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", {
@@ -399,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) {
@@ -424,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) {
@@ -565,6 +604,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     onClick: nodeChangeEvent,
     className: cls,
     children: (0, _jsxRuntime.jsx)(_antd.TreeSelect, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      placeholder: placeholder || _locale.default.ProForm.treeSelectPlaceholder,
       maxTagPlaceholder: function maxTagPlaceholder(rest) {
         var _rest = rest.map(function (tag) {
           var _tag$label, _tag$label$props, _tag$label2, _tag$label2$props, _tag$label2$props$chi, _tag$label2$props$chi2, _tag$label2$props$chi3, _tag$label3, _tag$label3$props, _tag$label3$props$dan;

package/lib/locale/en_US.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
         unfold: string;
         packUp: string;
         inputPlaceholder: string;
+        treeSelectPlaceholder: string;
         selectPlaceHolder: string;
         switchText: string[];
         ruleStartEndText: string[];

package/lib/locale/en_US.js

@@ -31,6 +31,7 @@ var _default = exports.default = {
     unfold: 'Unfold',
     packUp: 'PackUp',
     inputPlaceholder: 'Please enter',
+    treeSelectPlaceholder: 'Please select',
     selectPlaceHolder: 'Please select',
     switchText: ['Yes', 'No'],
     ruleStartEndText: ['start value', 'end value'],

package/lib/locale/zh_CN.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
         unfold: string;
         packUp: string;
         inputPlaceholder: string;
+        treeSelectPlaceholder: string;
         selectPlaceHolder: string;
         switchText: string[];
         ruleStartEndText: string[];

package/lib/locale/zh_CN.js

@@ -31,6 +31,7 @@ var _default = exports.default = {
     unfold: '展开',
     packUp: '收起',
     inputPlaceholder: '请输入',
+    treeSelectPlaceholder: '请选择',
     selectPlaceHolder: '请选择',
     switchText: ['是', '否'],
     ruleStartEndText: ['起始值', '截止值'],

package/package.json

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