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

package/es/ProEditTable/components/RcTable/DraggableTable.js

@@ -72,17 +72,13 @@ var DndWrapper = function DndWrapper(_ref2) {
     value = _ref2.value,
     onChange = _ref2.onChange,
     onDrag = _ref2.onDrag,
+    onDragEnd = _ref2.onDragEnd,
     disabled = _ref2.disabled,
     children = _ref2.children;
-  var onDragEnd = function onDragEnd(event) {
+  var onDragEndtInside = function onDragEndtInside(event) {
     var active = event.active,
       over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      if (onDrag) {
-        var nextList = onDrag(event, value);
-        onChange(nextList);
-        return;
-      }
       var activeIndex = value.findIndex(function (i) {
         return i.rowKey === active.id;
       });
@@ -90,11 +86,16 @@ var DndWrapper = function DndWrapper(_ref2) {
         return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
       });
       var nextValue = arrayMove(value, activeIndex, overIndex);
+      if (onDrag || onDragEnd) {
+        var nextList = onDragEnd ? onDragEnd(event, value, nextValue) : onDrag(event, value, nextValue);
+        onChange(nextList);
+        return;
+      }
       onChange(nextValue);
     }
   };
   return draggable && !disabled ? _jsx(DndContext, {
-    onDragEnd: onDragEnd,
+    onDragEnd: onDragEndtInside,
     children: _jsx(SortableContext, {
       items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
         return i.rowKey;
@@ -130,11 +131,13 @@ var DraggableTable = function DraggableTable(_ref3) {
     handlePageChange = tableProps.handlePageChange;
   var onChange = draggableProps.onChange,
     onDrag = draggableProps.onDrag,
-    draggable = draggableProps.draggable;
+    draggable = draggableProps.draggable,
+    onDragEnd = draggableProps.onDragEnd;
   return _jsxs(DndWrapper, {
     value: value,
     onChange: onChange,
     onDrag: onDrag,
+    onDragEnd: onDragEnd,
     disabled: disabled,
     draggable: draggable,
     children: [headerRender ? _jsx("div", {

package/es/ProEditTable/index.js

@@ -11,7 +11,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
+var _excluded = ["value", "onChange", "onDrag", "onDragEnd", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray, isBoolean, set } from 'lodash';
@@ -29,6 +29,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
+    onDragEnd = _ref.onDragEnd,
     className = _ref.className,
     columns = _ref.columns,
     type = _ref.type,
@@ -405,6 +406,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         draggableProps: {
           onChange: onChange,
           onDrag: onDrag,
+          onDragEnd: onDragEnd,
           draggable: draggable
         },
         tableProps: {

package/es/ProEditTable/propsType.d.ts

@@ -377,8 +377,18 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     rowDraggable?: (record?: T) => string | boolean;
     /**
      * 拖拽事件处理
+     * @param event 拖拽事件
+     * @param dataSource 当前数据源
+     * @param nextDataSource 拖拽后的数据源
      */
-    onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
+    onDrag?: (event: DragEndEvent, dataSource: T[], nextDataSource: T[]) => T[];
+    /**
+     * 拖拽结束事件处理
+     * @param event 拖拽事件
+     * @param dataSource 当前数据源
+     * @param nextDataSource 拖拽后的数据源
+     */
+    onDragEnd?: (event: DragEndEvent, dataSource: T[], nextDataSource: T[]) => T[];
     /**
      * 引用对象
      */

package/es/ProEnum/utils/index.js

@@ -9,7 +9,7 @@ import { isNull, isUndefined } from 'lodash';
  * @returns
  */
 export function getEnumData(storage, cacheKey, baseEnumStorage) {
-  if (baseEnumStorage) {
+  if (baseEnumStorage && window.localStorage.getItem(cacheKey)) {
     return baseEnumStorage;
   }
   if (storage === 'localStorage') {

package/es/ProTable/hooks/useAntdTable.js

@@ -4,8 +4,6 @@ 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"];
@@ -28,7 +26,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
 };
 var previousSearchValues = null;
 function useAntdTable(service, options, useRequestOptions) {
-  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params;
+  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params, _form$getFieldsValue3;
   var _useSetState = useSetState({
       data: [],
       total: 0,
@@ -38,7 +36,8 @@ function useAntdTable(service, options, useRequestOptions) {
         filters: undefined,
         sorter: undefined
       },
-      allSelected: false
+      allSelected: false,
+      searchValues: {}
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
@@ -48,6 +47,7 @@ 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,
@@ -66,9 +66,6 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
-  // 搜索表单里的值
-  var _searchValues = _Form.useWatch([], form);
-  var searchValues = removeEmptyKeys(_searchValues);
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams;
   var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
@@ -193,6 +190,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, []);
   // 分页变更
   var handlePageChange = useCallback(function (current, pageSize) {
+    var _form$getFieldsValue;
     var page = {
       pageNum: current,
       pageSize: pageSize
@@ -204,11 +202,14 @@ function useAntdTable(service, options, useRequestOptions) {
         selectedRowKeys: []
       });
     }
+    var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
+    var nextValues = removeEmptyKeys(newValues);
     run(getTransformParams(_objectSpread(_objectSpread({
       page: page
-    }, searchValues), extraFilter)));
-  }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
+    }, nextValues), extraFilter)));
+  }, [allSelected, extraFilter, data, getTransformParams]);
   var handleTableChange = useCallback(function (pagination, filters, sorter, extra) {
+    var _form$getFieldsValue2;
     // 跳过分页改变，使用pagination的onChange
     if (extra.action === 'paginate') {
       return;
@@ -226,13 +227,14 @@ function useAntdTable(service, options, useRequestOptions) {
         sorter: sorter
       }
     });
+    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
-    }, searchValues), {}, {
+    }, _values), {}, {
       filters: filters,
       sorter: sorter
     })));
-  }, [allSelected, searchValues, getTransformParams]);
+  }, [allSelected, getTransformParams]);
   var onSearch = useCallback(function (values) {
     var newPage = {
       pageNum: 1,
@@ -247,6 +249,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: []
@@ -258,6 +261,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
   var resetParams = useCallback(function (page) {
     setState({
+      searchValues: {},
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],
@@ -471,10 +475,11 @@ function useAntdTable(service, options, useRequestOptions) {
     onChange: handlePageChange
   };
   var useAntdTableProps = _objectSpread(_objectSpread({}, result), {}, {
+    form: form,
     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: searchValues,
+    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

@@ -579,7 +579,7 @@ export interface ProTableRequestOptionsType<T, R> {
      * @description 用于获取和设置表单值
      * @default undefined
      */
-    form?: FormInstance;
+    form: FormInstance;
     /**
      * 重置时是否重新查询
      * @description 控制表单重置后是否自动发起查询

package/es/ProTable/utils/index.js

@@ -75,27 +75,23 @@ export var getRowKey = function getRowKey(rowKey, record) {
 /** 移除对象中的 null , undefined, '' 的key */
 export var removeEmptyKeys = function removeEmptyKeys(obj) {
   if (!obj) return {};
-  // 使用 Object.entries() 将对象转换为键值对数组
-  var entries = Object.entries(obj);
-  // 过滤掉值为 null, undefined, 或 '' 的键值对
-  var filteredEntries = entries.filter(function (_ref2) {
+  // 一次遍历完成所有处理
+  return Object.fromEntries(Object.entries(obj).filter(function (_ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
-      key = _ref3[0],
+      _ = _ref3[0],
       value = _ref3[1];
-    return !isEmpty(value);
-  });
-  // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
-  var nextObj = Object.fromEntries(filteredEntries);
-  // 空对象的移除出去
-  Object.keys(nextObj).forEach(function (key) {
-    var _Object$values;
-    if (nextObj[key] && _typeof(nextObj[key]) === 'object' && ((_Object$values = Object.values(nextObj[key])) === null || _Object$values === void 0 ? void 0 : _Object$values.every(function (item) {
-      return [null, undefined, ''].includes(item);
-    }))) {
-      nextObj[key] = undefined;
+    // 过滤空值
+    if (value === null || value === undefined || value === '') {
+      return false;
     }
-  });
-  return nextObj;
+    // 检查是否是全空对象
+    if (value && _typeof(value) === 'object' && !Array.isArray(value)) {
+      return !Object.values(value).every(function (item) {
+        return item === null || item === undefined || item === '';
+      });
+    }
+    return true;
+  }));
 };
 /** 判断是有值的对象 */
 export var isNonEmptyObject = function isNonEmptyObject(obj) {

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,7 +12,7 @@ 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 */
@@ -21,6 +21,7 @@ import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from
 import classnames from 'classnames';
 import { useImperativeHandle, forwardRef } 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';
@@ -50,6 +51,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,
@@ -171,26 +173,29 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
   // 配置了异步数据源，拉取枚举数据逻辑 如果有code不掉接口从local里根据code取值
   var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread({
     manual: true,
-    onSuccess: function onSuccess(data) {
-      // 用户配置了处理枚举函数
+    debounceWait: 300
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
+  useImperativeHandle(ref, function () {
+    return {
+      useRequestRef: fetchFunction
+    };
+  });
+  // 请求成功
+  useDeepCompareEffect(function () {
+    if (fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) {
       if (transformResponse && typeof transformResponse === 'function') {
-        var responseData = transformResponse(data);
+        var responseData = transformResponse(fetchFunction.data);
+        // debugger;
         var resultData = transferDataSource(responseData, showCodeName);
         setState({
           selectList: countChild(resultData),
           origDataSource: resultData
         });
       } else {
-        defaultOnSuccessFun(data);
+        defaultOnSuccessFun(fetchFunction.data);
       }
-    },
-    debounceWait: 300
-  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
-  useImperativeHandle(ref, function () {
-    return {
-      useRequestRef: fetchFunction
-    };
-  });
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
   useDeepCompareEffect(function () {
     if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -565,6 +570,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/ProUpload/components/ButtonRender.js

@@ -92,6 +92,9 @@ var ButtonRender = function ButtonRender(props) {
               children: [_jsx(CloudUploadOutlined, {}), buttonText]
             })), afterRender ? _jsx("div", {
               className: "pro-upload-button-inner-right",
+              onClick: function onClick(e) {
+                return e.stopPropagation();
+              },
               children: afterRender
             }) : null]
           })

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/ProEditTable/components/RcTable/DraggableTable.js

@@ -79,17 +79,13 @@ var DndWrapper = function DndWrapper(_ref2) {
     value = _ref2.value,
     onChange = _ref2.onChange,
     onDrag = _ref2.onDrag,
+    onDragEnd = _ref2.onDragEnd,
     disabled = _ref2.disabled,
     children = _ref2.children;
-  var onDragEnd = function onDragEnd(event) {
+  var onDragEndtInside = function onDragEndtInside(event) {
     var active = event.active,
       over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      if (onDrag) {
-        var nextList = onDrag(event, value);
-        onChange(nextList);
-        return;
-      }
       var activeIndex = value.findIndex(function (i) {
         return i.rowKey === active.id;
       });
@@ -97,11 +93,16 @@ var DndWrapper = function DndWrapper(_ref2) {
         return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
       });
       var nextValue = (0, _sortable.arrayMove)(value, activeIndex, overIndex);
+      if (onDrag || onDragEnd) {
+        var nextList = onDragEnd ? onDragEnd(event, value, nextValue) : onDrag(event, value, nextValue);
+        onChange(nextList);
+        return;
+      }
       onChange(nextValue);
     }
   };
   return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
-    onDragEnd: onDragEnd,
+    onDragEnd: onDragEndtInside,
     children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {
       items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
         return i.rowKey;
@@ -137,11 +138,13 @@ var DraggableTable = function DraggableTable(_ref3) {
     handlePageChange = tableProps.handlePageChange;
   var onChange = draggableProps.onChange,
     onDrag = draggableProps.onDrag,
-    draggable = draggableProps.draggable;
+    draggable = draggableProps.draggable,
+    onDragEnd = draggableProps.onDragEnd;
   return (0, _jsxRuntime.jsxs)(DndWrapper, {
     value: value,
     onChange: onChange,
     onDrag: onDrag,
+    onDragEnd: onDragEnd,
     disabled: disabled,
     draggable: draggable,
     children: [headerRender ? (0, _jsxRuntime.jsx)("div", {

package/lib/ProEditTable/index.js

@@ -26,12 +26,13 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
 var _RcTable = require("./components/RcTable");
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
+var _excluded = ["value", "onChange", "onDrag", "onDragEnd", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _resetProps$otherProp;
   var value = _ref.value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
+    onDragEnd = _ref.onDragEnd,
     className = _ref.className,
     columns = _ref.columns,
     type = _ref.type,
@@ -408,6 +409,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         draggableProps: {
           onChange: onChange,
           onDrag: onDrag,
+          onDragEnd: onDragEnd,
           draggable: draggable
         },
         tableProps: {

package/lib/ProEditTable/propsType.d.ts

@@ -377,8 +377,18 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     rowDraggable?: (record?: T) => string | boolean;
     /**
      * 拖拽事件处理
+     * @param event 拖拽事件
+     * @param dataSource 当前数据源
+     * @param nextDataSource 拖拽后的数据源
      */
-    onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
+    onDrag?: (event: DragEndEvent, dataSource: T[], nextDataSource: T[]) => T[];
+    /**
+     * 拖拽结束事件处理
+     * @param event 拖拽事件
+     * @param dataSource 当前数据源
+     * @param nextDataSource 拖拽后的数据源
+     */
+    onDragEnd?: (event: DragEndEvent, dataSource: T[], nextDataSource: T[]) => T[];
     /**
      * 引用对象
      */

package/lib/ProEnum/utils/index.js

@@ -22,7 +22,7 @@ var _excluded = ["children"];
  * @returns
  */
 function getEnumData(storage, cacheKey, baseEnumStorage) {
-  if (baseEnumStorage) {
+  if (baseEnumStorage && window.localStorage.getItem(cacheKey)) {
     return baseEnumStorage;
   }
   if (storage === 'localStorage') {

package/lib/ProTable/hooks/useAntdTable.js

@@ -33,7 +33,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
 };
 var previousSearchValues = null;
 function useAntdTable(service, options, useRequestOptions) {
-  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params;
+  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params, _form$getFieldsValue3;
   var _useSetState = (0, _ahooks.useSetState)({
       data: [],
       total: 0,
@@ -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,6 +54,7 @@ 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,
@@ -71,9 +73,6 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
-  // 搜索表单里的值
-  var _searchValues = _antd.Form.useWatch([], form);
-  var searchValues = (0, _utils.removeEmptyKeys)(_searchValues);
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams;
   var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
@@ -198,6 +197,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, []);
   // 分页变更
   var handlePageChange = (0, _react.useCallback)(function (current, pageSize) {
+    var _form$getFieldsValue;
     var page = {
       pageNum: current,
       pageSize: pageSize
@@ -209,11 +209,14 @@ function useAntdTable(service, options, useRequestOptions) {
         selectedRowKeys: []
       });
     }
+    var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
+    var nextValues = (0, _utils.removeEmptyKeys)(newValues);
     run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: page
-    }, searchValues), extraFilter)));
-  }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
+    }, nextValues), extraFilter)));
+  }, [allSelected, extraFilter, data, getTransformParams]);
   var handleTableChange = (0, _react.useCallback)(function (pagination, filters, sorter, extra) {
+    var _form$getFieldsValue2;
     // 跳过分页改变，使用pagination的onChange
     if (extra.action === 'paginate') {
       return;
@@ -231,13 +234,14 @@ function useAntdTable(service, options, useRequestOptions) {
         sorter: sorter
       }
     });
+    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
-    }, searchValues), {}, {
+    }, _values), {}, {
       filters: filters,
       sorter: sorter
     })));
-  }, [allSelected, searchValues, getTransformParams]);
+  }, [allSelected, getTransformParams]);
   var onSearch = (0, _react.useCallback)(function (values) {
     var newPage = {
       pageNum: 1,
@@ -252,6 +256,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: []
@@ -263,6 +268,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
   var resetParams = (0, _react.useCallback)(function (page) {
     setState({
+      searchValues: {},
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],
@@ -476,10 +482,11 @@ function useAntdTable(service, options, useRequestOptions) {
     onChange: handlePageChange
   };
   var useAntdTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, result), {}, {
+    form: form,
     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: searchValues,
+    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

@@ -579,7 +579,7 @@ export interface ProTableRequestOptionsType<T, R> {
      * @description 用于获取和设置表单值
      * @default undefined
      */
-    form?: FormInstance;
+    form: FormInstance;
     /**
      * 重置时是否重新查询
      * @description 控制表单重置后是否自动发起查询

package/lib/ProTable/utils/index.js

@@ -82,27 +82,23 @@ var getRowKey = exports.getRowKey = function getRowKey(rowKey, record) {
 /** 移除对象中的 null , undefined, '' 的key */
 var removeEmptyKeys = exports.removeEmptyKeys = function removeEmptyKeys(obj) {
   if (!obj) return {};
-  // 使用 Object.entries() 将对象转换为键值对数组
-  var entries = Object.entries(obj);
-  // 过滤掉值为 null, undefined, 或 '' 的键值对
-  var filteredEntries = entries.filter(function (_ref2) {
+  // 一次遍历完成所有处理
+  return Object.fromEntries(Object.entries(obj).filter(function (_ref2) {
     var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-      key = _ref3[0],
+      _ = _ref3[0],
       value = _ref3[1];
-    return !isEmpty(value);
-  });
-  // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
-  var nextObj = Object.fromEntries(filteredEntries);
-  // 空对象的移除出去
-  Object.keys(nextObj).forEach(function (key) {
-    var _Object$values;
-    if (nextObj[key] && (0, _typeof2.default)(nextObj[key]) === 'object' && ((_Object$values = Object.values(nextObj[key])) === null || _Object$values === void 0 ? void 0 : _Object$values.every(function (item) {
-      return [null, undefined, ''].includes(item);
-    }))) {
-      nextObj[key] = undefined;
+    // 过滤空值
+    if (value === null || value === undefined || value === '') {
+      return false;
     }
-  });
-  return nextObj;
+    // 检查是否是全空对象
+    if (value && (0, _typeof2.default)(value) === 'object' && !Array.isArray(value)) {
+      return !Object.values(value).every(function (item) {
+        return item === null || item === undefined || item === '';
+      });
+    }
+    return true;
+  }));
 };
 /** 判断是有值的对象 */
 var isNonEmptyObject = exports.isNonEmptyObject = function isNonEmptyObject(obj) {

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,10 +17,11 @@ 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 */
@@ -50,6 +51,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,
@@ -171,26 +173,29 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   // 配置了异步数据源，拉取枚举数据逻辑 如果有code不掉接口从local里根据code取值
   var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)({
     manual: true,
-    onSuccess: function onSuccess(data) {
-      // 用户配置了处理枚举函数
+    debounceWait: 300
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      useRequestRef: fetchFunction
+    };
+  });
+  // 请求成功
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    if (fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) {
       if (transformResponse && typeof transformResponse === 'function') {
-        var responseData = transformResponse(data);
+        var responseData = transformResponse(fetchFunction.data);
+        // debugger;
         var resultData = transferDataSource(responseData, showCodeName);
         setState({
           selectList: countChild(resultData),
           origDataSource: resultData
         });
       } else {
-        defaultOnSuccessFun(data);
+        defaultOnSuccessFun(fetchFunction.data);
       }
-    },
-    debounceWait: 300
-  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
-  (0, _react.useImperativeHandle)(ref, function () {
-    return {
-      useRequestRef: fetchFunction
-    };
-  });
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -565,6 +570,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/ProUpload/components/ButtonRender.js

@@ -96,6 +96,9 @@ var ButtonRender = function ButtonRender(props) {
               children: [(0, _jsxRuntime.jsx)(_icons.CloudUploadOutlined, {}), buttonText]
             })), afterRender ? (0, _jsxRuntime.jsx)("div", {
               className: "pro-upload-button-inner-right",
+              onClick: function onClick(e) {
+                return e.stopPropagation();
+              },
               children: afterRender
             }) : null]
           })

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.5",
+  "version": "3.13.6-beta.2",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",