@zat-design/sisyphus-react 3.13.6 → 3.13.7

package/es/ProTable/components/FormatColumn/index.js

@@ -130,8 +130,8 @@ export var formatColumn = function formatColumn(_ref2) {
         if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
           var _originalObj$record$r;
           var diffResult = otherProps.viewRender({
-            originalValue: originalValue,
-            originalRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
+            originValue: originalValue,
+            originRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
             value: value,
             record: record,
             index: index
@@ -167,8 +167,8 @@ export var formatColumn = function formatColumn(_ref2) {
         if (isFunction(onDiff)) {
           var _originalObj$record$r2;
           var _diffResult = onDiff({
-            originalValue: originalValue,
-            originalRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
+            originValue: originalValue,
+            originRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
             value: value,
             record: record,
             index: index

package/es/ProTable/hooks/useAntdTable.js

@@ -4,10 +4,12 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/message/style";
 import _message from "antd/es/message";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 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';
@@ -36,7 +38,8 @@ function useAntdTable(service, options, useRequestOptions) {
         filters: undefined,
         sorter: undefined
       },
-      allSelected: false
+      allSelected: false,
+      searchValues: {}
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
@@ -46,9 +49,10 @@ function useAntdTable(service, options, useRequestOptions) {
     selectedRowKeys = _useSetState2$.selectedRowKeys,
     extraFilter = _useSetState2$.extraFilter,
     allSelected = _useSetState2$.allSelected,
+    searchValues = _useSetState2$.searchValues,
     setState = _useSetState2[1];
   var _useDefaultOptions = useDefaultOptions(options),
-    form = _useDefaultOptions.form,
+    _form = _useDefaultOptions.form,
     page = _useDefaultOptions.page,
     extraParams = _useDefaultOptions.extraParams,
     rowKey = _useDefaultOptions.rowKey,
@@ -64,12 +68,15 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
+  var _Form$useForm = _Form.useForm(_form),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams;
   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,
@@ -90,7 +97,7 @@ function useAntdTable(service, options, useRequestOptions) {
       return transformParams(realParams, requestParams);
     }
     return requestParams;
-  }, [defaultParam, extraParams]);
+  };
   // 仅清数据源相关，查询相关
   var handleSetStateCallback = function handleSetStateCallback(values) {
     setState(_objectSpread({
@@ -135,13 +142,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
    */
@@ -187,7 +194,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,
@@ -205,8 +212,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') {
@@ -225,15 +232,15 @@ function useAntdTable(service, options, useRequestOptions) {
         sorter: sorter
       }
     });
-    var _values = (_form$getFieldsValue2 = form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
+    var _values = (_form$getFieldsValue2 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
     run(getTransformParams(_objectSpread(_objectSpread({
       page: page
     }, _values), {}, {
       filters: filters,
       sorter: sorter
     })));
-  }, [allSelected, getTransformParams]);
-  var onSearch = useCallback(function (values) {
+  };
+  var onSearch = function onSearch(values) {
     var newPage = {
       pageNum: 1,
       pageSize: page.pageSize
@@ -247,6 +254,7 @@ function useAntdTable(service, options, useRequestOptions) {
     if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) || !isEqual(previousSearchValues, _values)) {
       previousSearchValues = _values;
       setState({
+        searchValues: _values,
         allSelected: false,
         selectedRecords: [],
         selectedRowKeys: []
@@ -255,9 +263,10 @@ 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,
       selectedRecords: [],
       selectedRowKeys: [],
@@ -266,9 +275,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,
@@ -281,7 +290,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) || {},
@@ -475,7 +484,7 @@ function useAntdTable(service, options, useRequestOptions) {
     data: data,
     params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
     rowSelection: rowSelection,
-    searchValues: (_form$getFieldsValue3 = form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
+    searchValues: (_form$getFieldsValue3 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
     allSelected: allSelected,
     selectedTip: selectedTip,
     selectedRowKeys: selectedRowKeys,

package/es/ProTable/propsType.d.ts

@@ -186,13 +186,13 @@ export interface ProTableColumnType extends Omit<ColumnType<any>, 'dataIndex'> {
      * @description 自定义如何比较数据差异，触发条件必须写render
      * @default undefined
      */
-    onDiff?: ({ value, record, index, originalValue, originalRecord }: any) => any;
+    onDiff?: ({ value, record, index, originValue, originRecord }: any) => any;
     /**
      * 自定义比对渲染
      * @description 用于开启比对时，自定义 render 渲染初始值，触发条件必须写render
      * @default undefined
      */
-    viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
+    viewRender?: ({ value, record, index, originValue, originRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
     /**
      * 是否已更改
      * @description 标记列值是否已变更

package/es/ProTable/utils/index.js

@@ -30,8 +30,8 @@ export var getOriginalValue = function getOriginalValue(value, record, originalO
       isAddCell: null
     };
   }
-  var originalRecord = get(originalObj, get(record, rowKey));
-  var originalValue = get(originalRecord, dataIndex);
+  var originRecord = get(originalObj, get(record, rowKey));
+  var originalValue = get(originRecord, dataIndex);
   if (isEmpty(originalValue) && !isEmpty(value)) {
     return {
       originalValue: originalValue,

package/es/ProTree/components/AdaptiveTooltip.js

@@ -1,45 +1,19 @@
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { useEffect, useState } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
   var children = _ref.children;
-  var _useState = useState('right'),
-    _useState2 = _slicedToArray(_useState, 2),
-    placement = _useState2[0],
-    setPlacement = _useState2[1];
-  useEffect(function () {
-    var handleResize = function handleResize() {
-      var tooltipElement = document.getElementById('adaptive-tooltip');
-      if (tooltipElement) {
-        var boundingRect = tooltipElement.getBoundingClientRect();
-        var windowWidth = window.innerWidth;
-        if (windowWidth - boundingRect.right < 150) {
-          setPlacement('left');
-        } else {
-          setPlacement('right');
-        }
-      }
-    };
-    window.addEventListener('resize', handleResize);
-    handleResize();
-    return function () {
-      window.removeEventListener('resize', handleResize);
-    };
-  }, [children]);
   return _jsx(_Tooltip, {
-    placement: placement,
+    placement: "rightTop",
     title: _jsx("div", {
       onMouseDown: function onMouseDown(e) {
         return e.stopPropagation();
       },
       children: children
     }),
-    id: "adaptive-tooltip",
-    children: _jsxs("span", {
+    children: _jsx("span", {
       className: "pro-tree-wrap-ellipse",
-      children: [" ", children]
+      children: children
     })
   });
 };

package/es/ProTree/components/ProTree.js

@@ -75,7 +75,6 @@ var ProTree = function ProTree(props) {
     showExpand = _props$showExpand === void 0 ? false : _props$showExpand,
     defaultExpandAll = props.defaultExpandAll,
     other = _objectWithoutProperties(props, _excluded);
-  var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
   var _useSetState = useSetState({
       open: false,

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

@@ -12,20 +12,22 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/tree-select/style";
 import _TreeSelect from "antd/es/tree-select";
-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"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable react/no-danger */
 /* 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';
 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,
@@ -50,6 +52,7 @@ export var 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 @@ 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,
     onSuccess: function onSuccess(data) {
-      // 用户配置了处理枚举函数
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(data);
         var resultData = transferDataSource(responseData, showCodeName);
@@ -181,16 +199,33 @@ export var 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) : [];
   useImperativeHandle(ref, function () {
     return {
       useRequestRef: fetchFunction
     };
   });
+  // 设置cacheKey后使用缓存的数据
+  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]);
   useDeepCompareEffect(function () {
     if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -212,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", {
@@ -399,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) {
@@ -424,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) {
@@ -565,6 +604,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     onClick: nodeChangeEvent,
     className: cls,
     children: _jsx(_TreeSelect, _objectSpread(_objectSpread({
+      placeholder: placeholder || locale.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/es/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/es/locale/en_US.js

@@ -25,6 +25,7 @@ export default {
     unfold: 'Unfold',
     packUp: 'PackUp',
     inputPlaceholder: 'Please enter',
+    treeSelectPlaceholder: 'Please select',
     selectPlaceHolder: 'Please select',
     switchText: ['Yes', 'No'],
     ruleStartEndText: ['start value', 'end value'],

package/es/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/es/locale/zh_CN.js

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

package/lib/ProTable/components/FormatColumn/index.js

@@ -136,8 +136,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
           var _originalObj$record$r;
           var diffResult = otherProps.viewRender({
-            originalValue: originalValue,
-            originalRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
+            originValue: originalValue,
+            originRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
             value: value,
             record: record,
             index: index
@@ -173,8 +173,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         if ((0, _lodash.isFunction)(onDiff)) {
           var _originalObj$record$r2;
           var _diffResult = onDiff({
-            originalValue: originalValue,
-            originalRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
+            originValue: originalValue,
+            originRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
             value: value,
             record: record,
             index: index

package/lib/ProTable/hooks/useAntdTable.js

@@ -43,7 +43,8 @@ function useAntdTable(service, options, useRequestOptions) {
         filters: undefined,
         sorter: undefined
       },
-      allSelected: false
+      allSelected: false,
+      searchValues: {}
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
@@ -53,9 +54,10 @@ function useAntdTable(service, options, useRequestOptions) {
     selectedRowKeys = _useSetState2$.selectedRowKeys,
     extraFilter = _useSetState2$.extraFilter,
     allSelected = _useSetState2$.allSelected,
+    searchValues = _useSetState2$.searchValues,
     setState = _useSetState2[1];
   var _useDefaultOptions = useDefaultOptions(options),
-    form = _useDefaultOptions.form,
+    _form = _useDefaultOptions.form,
     page = _useDefaultOptions.page,
     extraParams = _useDefaultOptions.extraParams,
     rowKey = _useDefaultOptions.rowKey,
@@ -71,12 +73,15 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
+  var _Form$useForm = _antd.Form.useForm(_form),
+    _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
+    form = _Form$useForm2[0];
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams;
   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,
@@ -97,7 +102,7 @@ function useAntdTable(service, options, useRequestOptions) {
       return transformParams(realParams, requestParams);
     }
     return requestParams;
-  }, [defaultParam, extraParams]);
+  };
   // 仅清数据源相关，查询相关
   var handleSetStateCallback = function handleSetStateCallback(values) {
     setState((0, _objectSpread2.default)({
@@ -142,13 +147,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
    */
@@ -194,7 +199,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,
@@ -212,8 +217,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') {
@@ -232,15 +237,15 @@ function useAntdTable(service, options, useRequestOptions) {
         sorter: sorter
       }
     });
-    var _values = (_form$getFieldsValue2 = form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
+    var _values = (_form$getFieldsValue2 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
     run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: page
     }, _values), {}, {
       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
@@ -254,6 +259,7 @@ function useAntdTable(service, options, useRequestOptions) {
     if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) || !(0, _lodash.isEqual)(previousSearchValues, _values)) {
       previousSearchValues = _values;
       setState({
+        searchValues: _values,
         allSelected: false,
         selectedRecords: [],
         selectedRowKeys: []
@@ -262,9 +268,10 @@ 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,
       selectedRecords: [],
       selectedRowKeys: [],
@@ -273,9 +280,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,
@@ -288,7 +295,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) || {},
@@ -482,7 +489,7 @@ function useAntdTable(service, options, useRequestOptions) {
     data: data,
     params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
     rowSelection: rowSelection,
-    searchValues: (_form$getFieldsValue3 = form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
+    searchValues: (_form$getFieldsValue3 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
     allSelected: allSelected,
     selectedTip: selectedTip,
     selectedRowKeys: selectedRowKeys,

package/lib/ProTable/propsType.d.ts

@@ -186,13 +186,13 @@ export interface ProTableColumnType extends Omit<ColumnType<any>, 'dataIndex'> {
      * @description 自定义如何比较数据差异，触发条件必须写render
      * @default undefined
      */
-    onDiff?: ({ value, record, index, originalValue, originalRecord }: any) => any;
+    onDiff?: ({ value, record, index, originValue, originRecord }: any) => any;
     /**
      * 自定义比对渲染
      * @description 用于开启比对时，自定义 render 渲染初始值，触发条件必须写render
      * @default undefined
      */
-    viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
+    viewRender?: ({ value, record, index, originValue, originRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
     /**
      * 是否已更改
      * @description 标记列值是否已变更

package/lib/ProTable/utils/index.js

@@ -37,8 +37,8 @@ var getOriginalValue = exports.getOriginalValue = function getOriginalValue(valu
       isAddCell: null
     };
   }
-  var originalRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
-  var originalValue = (0, _lodash.get)(originalRecord, dataIndex);
+  var originRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
+  var originalValue = (0, _lodash.get)(originRecord, dataIndex);
   if (isEmpty(originalValue) && !isEmpty(value)) {
     return {
       originalValue: originalValue,

package/lib/ProTree/components/AdaptiveTooltip.js

@@ -1,51 +1,24 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _react = require("react");
 var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
   var children = _ref.children;
-  var _useState = (0, _react.useState)('right'),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    placement = _useState2[0],
-    setPlacement = _useState2[1];
-  (0, _react.useEffect)(function () {
-    var handleResize = function handleResize() {
-      var tooltipElement = document.getElementById('adaptive-tooltip');
-      if (tooltipElement) {
-        var boundingRect = tooltipElement.getBoundingClientRect();
-        var windowWidth = window.innerWidth;
-        if (windowWidth - boundingRect.right < 150) {
-          setPlacement('left');
-        } else {
-          setPlacement('right');
-        }
-      }
-    };
-    window.addEventListener('resize', handleResize);
-    handleResize();
-    return function () {
-      window.removeEventListener('resize', handleResize);
-    };
-  }, [children]);
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    placement: placement,
+    placement: "rightTop",
     title: (0, _jsxRuntime.jsx)("div", {
       onMouseDown: function onMouseDown(e) {
         return e.stopPropagation();
       },
       children: children
     }),
-    id: "adaptive-tooltip",
-    children: (0, _jsxRuntime.jsxs)("span", {
+    children: (0, _jsxRuntime.jsx)("span", {
       className: "pro-tree-wrap-ellipse",
-      children: [" ", children]
+      children: children
     })
   });
 };

package/lib/ProTree/components/ProTree.js

@@ -75,7 +75,6 @@ var ProTree = function ProTree(props) {
     showExpand = _props$showExpand === void 0 ? false : _props$showExpand,
     defaultExpandAll = props.defaultExpandAll,
     other = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
   var _useSetState = (0, _ahooks.useSetState)({
       open: false,

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",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",