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

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

@@ -72,13 +72,17 @@ var DndWrapper = function DndWrapper(_ref2) {
     value = _ref2.value,
     onChange = _ref2.onChange,
     onDrag = _ref2.onDrag,
-    onDragEnd = _ref2.onDragEnd,
     disabled = _ref2.disabled,
     children = _ref2.children;
-  var onDragEndtInside = function onDragEndtInside(event) {
+  var onDragEnd = function onDragEnd(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;
       });
@@ -86,16 +90,11 @@ 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: onDragEndtInside,
+    onDragEnd: onDragEnd,
     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;
@@ -131,13 +130,11 @@ var DraggableTable = function DraggableTable(_ref3) {
     handlePageChange = tableProps.handlePageChange;
   var onChange = draggableProps.onChange,
     onDrag = draggableProps.onDrag,
-    draggable = draggableProps.draggable,
-    onDragEnd = draggableProps.onDragEnd;
+    draggable = draggableProps.draggable;
   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", "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 _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"];
 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,7 +29,6 @@ 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,
@@ -406,7 +405,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         draggableProps: {
           onChange: onChange,
           onDrag: onDrag,
-          onDragEnd: onDragEnd,
           draggable: draggable
         },
         tableProps: {

package/es/ProEditTable/propsType.d.ts

@@ -377,18 +377,8 @@ 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[], nextDataSource: T[]) => T[];
-    /**
-     * 拖拽结束事件处理
-     * @param event 拖拽事件
-     * @param dataSource 当前数据源
-     * @param nextDataSource 拖拽后的数据源
-     */
-    onDragEnd?: (event: DragEndEvent, dataSource: T[], nextDataSource: T[]) => T[];
+    onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     /**
      * 引用对象
      */

package/es/ProTable/hooks/useAntdTable.js

@@ -4,6 +4,8 @@ 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"];
@@ -32,7 +34,6 @@ function useAntdTable(service, options, useRequestOptions) {
       total: 0,
       selectedRecords: [],
       selectedRowKeys: [],
-      searchValues: undefined,
       extraFilter: {
         filters: undefined,
         sorter: undefined
@@ -45,7 +46,6 @@ function useAntdTable(service, options, useRequestOptions) {
     total = _useSetState2$.total,
     selectedRecords = _useSetState2$.selectedRecords,
     selectedRowKeys = _useSetState2$.selectedRowKeys,
-    searchValues = _useSetState2$.searchValues,
     extraFilter = _useSetState2$.extraFilter,
     allSelected = _useSetState2$.allSelected,
     setState = _useSetState2[1];
@@ -66,6 +66,9 @@ 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 || {};
@@ -190,7 +193,6 @@ function useAntdTable(service, options, useRequestOptions) {
   }, []);
   // 分页变更
   var handlePageChange = useCallback(function (current, pageSize) {
-    var _form$getFieldsValue;
     var page = {
       pageNum: current,
       pageSize: pageSize
@@ -202,10 +204,9 @@ function useAntdTable(service, options, useRequestOptions) {
         selectedRowKeys: []
       });
     }
-    var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
-    run(getTransformParams(_objectSpread(_objectSpread(_objectSpread({
+    run(getTransformParams(_objectSpread(_objectSpread({
       page: page
-    }, searchValues), newValues), extraFilter)));
+    }, searchValues), extraFilter)));
   }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
   var handleTableChange = useCallback(function (pagination, filters, sorter, extra) {
     // 跳过分页改变，使用pagination的onChange
@@ -246,7 +247,6 @@ 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,7 +258,6 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
   var resetParams = useCallback(function (page) {
     setState({
-      searchValues: undefined,
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],

package/es/ProTable/propsType.d.ts

@@ -735,12 +735,6 @@ export interface ProTableUseAntdTableType<I, R> {
      * @default []
      */
     selectedRowKeys: Key[];
-    /**
-    * 搜索值
-    * @description 当前表单的搜索条件
-    * @default undefined
-    */
-    searchValues: I;
     /**
      * 额外过滤条件
      * @description 表单之外的额外过滤条件

package/es/ProUpload/components/ButtonRender.js

@@ -92,9 +92,6 @@ 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/lib/ProEditTable/components/RcTable/DraggableTable.js

@@ -79,13 +79,17 @@ var DndWrapper = function DndWrapper(_ref2) {
     value = _ref2.value,
     onChange = _ref2.onChange,
     onDrag = _ref2.onDrag,
-    onDragEnd = _ref2.onDragEnd,
     disabled = _ref2.disabled,
     children = _ref2.children;
-  var onDragEndtInside = function onDragEndtInside(event) {
+  var onDragEnd = function onDragEnd(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;
       });
@@ -93,16 +97,11 @@ 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: onDragEndtInside,
+    onDragEnd: onDragEnd,
     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;
@@ -138,13 +137,11 @@ var DraggableTable = function DraggableTable(_ref3) {
     handlePageChange = tableProps.handlePageChange;
   var onChange = draggableProps.onChange,
     onDrag = draggableProps.onDrag,
-    draggable = draggableProps.draggable,
-    onDragEnd = draggableProps.onDragEnd;
+    draggable = draggableProps.draggable;
   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,13 +26,12 @@ 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", "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 _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 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,
@@ -409,7 +408,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         draggableProps: {
           onChange: onChange,
           onDrag: onDrag,
-          onDragEnd: onDragEnd,
           draggable: draggable
         },
         tableProps: {

package/lib/ProEditTable/propsType.d.ts

@@ -377,18 +377,8 @@ 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[], nextDataSource: T[]) => T[];
-    /**
-     * 拖拽结束事件处理
-     * @param event 拖拽事件
-     * @param dataSource 当前数据源
-     * @param nextDataSource 拖拽后的数据源
-     */
-    onDragEnd?: (event: DragEndEvent, dataSource: T[], nextDataSource: T[]) => T[];
+    onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     /**
      * 引用对象
      */

package/lib/ProTable/hooks/useAntdTable.js

@@ -39,7 +39,6 @@ function useAntdTable(service, options, useRequestOptions) {
       total: 0,
       selectedRecords: [],
       selectedRowKeys: [],
-      searchValues: undefined,
       extraFilter: {
         filters: undefined,
         sorter: undefined
@@ -52,7 +51,6 @@ function useAntdTable(service, options, useRequestOptions) {
     total = _useSetState2$.total,
     selectedRecords = _useSetState2$.selectedRecords,
     selectedRowKeys = _useSetState2$.selectedRowKeys,
-    searchValues = _useSetState2$.searchValues,
     extraFilter = _useSetState2$.extraFilter,
     allSelected = _useSetState2$.allSelected,
     setState = _useSetState2[1];
@@ -73,6 +71,9 @@ 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 || {};
@@ -197,7 +198,6 @@ function useAntdTable(service, options, useRequestOptions) {
   }, []);
   // 分页变更
   var handlePageChange = (0, _react.useCallback)(function (current, pageSize) {
-    var _form$getFieldsValue;
     var page = {
       pageNum: current,
       pageSize: pageSize
@@ -209,10 +209,9 @@ function useAntdTable(service, options, useRequestOptions) {
         selectedRowKeys: []
       });
     }
-    var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
-    run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: page
-    }, searchValues), newValues), extraFilter)));
+    }, searchValues), extraFilter)));
   }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
   var handleTableChange = (0, _react.useCallback)(function (pagination, filters, sorter, extra) {
     // 跳过分页改变，使用pagination的onChange
@@ -253,7 +252,6 @@ 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: []
@@ -265,7 +263,6 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
   var resetParams = (0, _react.useCallback)(function (page) {
     setState({
-      searchValues: undefined,
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],

package/lib/ProTable/propsType.d.ts

@@ -735,12 +735,6 @@ export interface ProTableUseAntdTableType<I, R> {
      * @default []
      */
     selectedRowKeys: Key[];
-    /**
-    * 搜索值
-    * @description 当前表单的搜索条件
-    * @default undefined
-    */
-    searchValues: I;
     /**
      * 额外过滤条件
      * @description 表单之外的额外过滤条件

package/lib/ProUpload/components/ButtonRender.js

@@ -96,9 +96,6 @@ 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/package.json

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