@teamix/pro 1.4.25-bugfix.2 → 1.4.25-bugfix.3

package/es/table/components/Filter/index.js

@@ -1,70 +1,78 @@
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 // 表格项列筛选
-import React, { useEffect, useMemo, useState, memo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import TeamixIcon from '@teamix/icon';
 import { Button, Dropdown, Menu } from '@alicloudfe/components';
 import { usePrefixCls, getMessage } from '@teamix/utils';
 import './index.scss';
-import { useUrlState } from '@teamix/hooks';
 var CheckboxItem = Menu.CheckboxItem;
 var cls = usePrefixCls('teamix-pro-table-toolbar-filter');
 var RadioItem = Menu.RadioItem;
+
 var Filter = function Filter(props) {
-  var _urlState$split, _urlState, _urlState$split2;
   var column = props.column,
-    actionRef = props.actionRef,
-    switchCardView = props.switchCardView,
-    bindUrlProps = props.bindUrlProps,
-    bindUrl = props.bindUrl;
+      actionRef = props.actionRef;
   var _column$filtersWidth = column.filtersWidth,
-    filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth;
-  var _ref = bindUrl ? useUrlState() : [],
-    _ref2 = _slicedToArray(_ref, 2),
-    urlState = _ref2[0],
-    setUrlState = _ref2[1];
-  // 选中过滤项
-  var _useState = useState((_urlState$split = urlState === null || urlState === void 0 ? void 0 : (_urlState = urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) === null || _urlState === void 0 ? void 0 : (_urlState$split2 = _urlState.split) === null || _urlState$split2 === void 0 ? void 0 : _urlState$split2.call(_urlState, ',')) !== null && _urlState$split !== void 0 ? _urlState$split : []),
-    _useState2 = _slicedToArray(_useState, 2),
-    selected = _useState2[0],
-    setSelected = _useState2[1];
+      filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth; // 选中过滤项
+
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      selected = _useState2[0],
+      setSelected = _useState2[1];
+
   var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    visible = _useState4[0],
-    setVisible = _useState4[1];
+      _useState4 = _slicedToArray(_useState3, 2),
+      visible = _useState4[0],
+      setVisible = _useState4[1];
+
   useEffect(function () {
     var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3, _actionRef$current$ge4, _actionRef$current$ge5;
+
     // 从全局状态中读取上次存储的条件
     var rules = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : (_actionRef$current$ge3 = _actionRef$current$ge2.call(_actionRef$current)) === null || _actionRef$current$ge3 === void 0 ? void 0 : (_actionRef$current$ge4 = _actionRef$current$ge3.filterRules) === null || _actionRef$current$ge4 === void 0 ? void 0 : (_actionRef$current$ge5 = _actionRef$current$ge4[column.dataIndex]) === null || _actionRef$current$ge5 === void 0 ? void 0 : _actionRef$current$ge5.rules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : [];
-    // 全局状态中需要有值才赋值。优先级：全局状态 > urlState
-    if (rules && rules.length > 0) {
-      setSelected(rules);
-    }
-  }, []);
-  // 获取过滤项
+    setSelected(rules);
+  }, []); // 获取过滤项
+
   var filters = useMemo(function () {
     if (Array.isArray(column.filters)) {
       return column.filters;
     }
-    var filters = column.dataSource;
-    // 转换 valueEnum 为 options
+
+    var filters = column.dataSource; // 转换 valueEnum 为 options
+
     if (!Array.isArray(column.dataSource)) {
-      filters = Object.entries(column.dataSource).map(function (_ref3) {
+      filters = Object.entries(column.dataSource).map(function (_ref) {
         var _nv$label, _nv$color;
-        var _ref4 = _slicedToArray(_ref3, 2),
-          k = _ref4[0],
-          v = _ref4[1];
+
+        var _ref2 = _slicedToArray(_ref, 2),
+            k = _ref2[0],
+            v = _ref2[1];
+
         var nv = v;
         return _objectSpread(_objectSpread({
           value: k
@@ -73,82 +81,18 @@ var Filter = function Filter(props) {
           color: (_nv$color = nv.color) !== null && _nv$color !== void 0 ? _nv$color : k
         });
       });
-    }
-    // console.log(filters);
+    } // console.log(filters);
+
+
     return filters;
-  }, []);
-  // 点击确定回调
-  var onFilterOk = function onFilterOk() {
-    var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge6, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s, _actionRef$current5, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$r, _actionRef$current9, _actionRef$current9$c;
-    (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex);
-    // 先获取此列的param
-    var param = '';
-    if (column.beforeFilter) {
-      var _column$beforeFilter;
-      param = (_column$beforeFilter = column.beforeFilter) === null || _column$beforeFilter === void 0 ? void 0 : _column$beforeFilter.call(column, selected);
-    } else {
-      param = selected.join(',');
-    }
-    // 需要带上其他所有的信息
-    var rules = (_actionRef$current$ge6 = (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState) === null || _actionRef$current3$g === void 0 ? void 0 : (_actionRef$current3$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
-    // 再设置所有的列筛选状态
-    (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
-      rules: selected,
-      params: param
-    })));
-    var targetPageKey = 'currentPage';
-    var pageInfo = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.pageInfo;
-    if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
-      targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
-    }
-    if (switchCardView === 'card') {
-      var _actionRef$current6, _actionRef$current6$s;
-      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$s = _actionRef$current6.setData) === null || _actionRef$current6$s === void 0 ? void 0 : _actionRef$current6$s.call(_actionRef$current6, []);
-    }
-    // 发送请求
-    (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.request) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7, _defineProperty({}, targetPageKey, 1));
-    (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$r = _actionRef$current8.resetPage) === null || _actionRef$current8$r === void 0 ? void 0 : _actionRef$current8$r.call(_actionRef$current8);
-    // 清空表格选择
-    (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$c = _actionRef$current9.clearRowSelection) === null || _actionRef$current9$c === void 0 ? void 0 : _actionRef$current9$c.call(_actionRef$current9);
-    setVisible(false);
-    // 设置 url
-    if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.headerFilters) !== false && (urlState === null || urlState === void 0 ? void 0 : urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) !== selected.join(',')) {
-      setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState(_defineProperty({}, "filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex), selected.join(',')));
-    }
-  };
-  // 重置回调
-  var onFilterReset = function onFilterReset() {
-    var _actionRef$current$ge7, _actionRef$current10, _actionRef$current10$, _actionRef$current10$2, _actionRef$current11, _actionRef$current11$, _actionRef$current12, _actionRef$current12$;
-    setSelected([]);
-    var rules = (_actionRef$current$ge7 = (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.getState) === null || _actionRef$current10$ === void 0 ? void 0 : (_actionRef$current10$2 = _actionRef$current10$.call(_actionRef$current10)) === null || _actionRef$current10$2 === void 0 ? void 0 : _actionRef$current10$2.filterRules) !== null && _actionRef$current$ge7 !== void 0 ? _actionRef$current$ge7 : {};
-    (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.setFilterRules) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
-      rules: [],
-      params: ''
-    })));
-    (_actionRef$current12 = actionRef.current) === null || _actionRef$current12 === void 0 ? void 0 : (_actionRef$current12$ = _actionRef$current12.filterDataSource) === null || _actionRef$current12$ === void 0 ? void 0 : _actionRef$current12$.call(_actionRef$current12, column.dataIndex);
-    if (selected.length > 0) {
-      var _actionRef$current13, _actionRef$current14, _actionRef$current14$, _actionRef$current15, _actionRef$current15$, _actionRef$current16, _actionRef$current16$;
-      var targetPageKey = 'currentPage';
-      var pageInfo = (_actionRef$current13 = actionRef.current) === null || _actionRef$current13 === void 0 ? void 0 : _actionRef$current13.pageInfo;
-      if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
-        targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
-      }
-      // 发送请求
-      (_actionRef$current14 = actionRef.current) === null || _actionRef$current14 === void 0 ? void 0 : (_actionRef$current14$ = _actionRef$current14.request) === null || _actionRef$current14$ === void 0 ? void 0 : _actionRef$current14$.call(_actionRef$current14, _defineProperty({}, targetPageKey, 1));
-      (_actionRef$current15 = actionRef.current) === null || _actionRef$current15 === void 0 ? void 0 : (_actionRef$current15$ = _actionRef$current15.resetPage) === null || _actionRef$current15$ === void 0 ? void 0 : _actionRef$current15$.call(_actionRef$current15);
-      // 清空表格选择
-      (_actionRef$current16 = actionRef.current) === null || _actionRef$current16 === void 0 ? void 0 : (_actionRef$current16$ = _actionRef$current16.clearRowSelection) === null || _actionRef$current16$ === void 0 ? void 0 : _actionRef$current16$.call(_actionRef$current16);
-      if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.headerFilters) !== false) {
-        setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState(_defineProperty({}, "filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex), undefined));
-      }
-    }
-  };
-  // 渲染单选
+  }, []); // 渲染单选
+
   var renderSingle = function renderSingle() {
-    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref5) {
+    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref3) {
       var _value$toString;
-      var label = _ref5.label,
-        value = _ref5.value;
+
+      var label = _ref3.label,
+          value = _ref3.value;
       var valueStr = (_value$toString = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString !== void 0 ? _value$toString : '';
       return /*#__PURE__*/React.createElement(RadioItem, {
         id: valueStr,
@@ -159,13 +103,15 @@ var Filter = function Filter(props) {
         }
       }, label);
     });
-  };
-  // 渲染多选
+  }; // 渲染多选
+
+
   var renderMultiple = function renderMultiple() {
-    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref6) {
+    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref4) {
       var _value$toString2;
-      var label = _ref6.label,
-        value = _ref6.value;
+
+      var label = _ref4.label,
+          value = _ref4.value;
       var valueStr = (_value$toString2 = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString2 !== void 0 ? _value$toString2 : '';
       return /*#__PURE__*/React.createElement(CheckboxItem, {
         key: valueStr,
@@ -181,14 +127,17 @@ var Filter = function Filter(props) {
         }
       }, label);
     });
-  };
-  // 渲染选择区域
+  }; // 渲染选择区域
+
+
   var renderSelect = function renderSelect() {
     if (column.filterMode === 'multiple') {
       return renderMultiple();
     }
+
     return renderSingle();
   };
+
   return /*#__PURE__*/React.createElement(Dropdown, {
     trigger: /*#__PURE__*/React.createElement(TeamixIcon, {
       size: "small",
@@ -222,14 +171,78 @@ var Filter = function Filter(props) {
     className: cls({
       btn: true
     }),
-    onClick: onFilterOk
+    onClick: function onClick() {
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge6, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s, _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+
+      (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
+
+      var param = '';
+
+      if (column.beforeFilter) {
+        var _column$beforeFilter;
+
+        param = (_column$beforeFilter = column.beforeFilter) === null || _column$beforeFilter === void 0 ? void 0 : _column$beforeFilter.call(column, selected);
+      } else {
+        param = selected.join(',');
+      } // 需要带上其他所有的信息
+
+
+      var rules = (_actionRef$current$ge6 = (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState) === null || _actionRef$current3$g === void 0 ? void 0 : (_actionRef$current3$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {}; // 再设置所有的列筛选状态
+
+      (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+        rules: selected,
+        params: param
+      })));
+      var targetPageKey = 'currentPage';
+      var pageInfo = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.pageInfo;
+
+      if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+        targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+      } // 发送请求
+
+
+      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _defineProperty({}, targetPageKey, 1));
+      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
+
+      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
+      setVisible(false);
+    }
   }, getMessage('ok')), /*#__PURE__*/React.createElement(Button, {
     type: "normal",
     size: "small",
     className: cls({
       btn: true
     }),
-    onClick: onFilterReset
+    onClick: function onClick() {
+      var _actionRef$current$ge7, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
+
+      setSelected([]);
+      var rules = (_actionRef$current$ge7 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge7 !== void 0 ? _actionRef$current$ge7 : {};
+      (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.setFilterRules) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+        rules: [],
+        params: ''
+      })));
+      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex);
+
+      if (selected.length > 0) {
+        var _actionRef$current12, _actionRef$current13, _actionRef$current13$, _actionRef$current14, _actionRef$current14$, _actionRef$current15, _actionRef$current15$;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current12 = actionRef.current) === null || _actionRef$current12 === void 0 ? void 0 : _actionRef$current12.pageInfo;
+
+        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current13 = actionRef.current) === null || _actionRef$current13 === void 0 ? void 0 : (_actionRef$current13$ = _actionRef$current13.request) === null || _actionRef$current13$ === void 0 ? void 0 : _actionRef$current13$.call(_actionRef$current13, _defineProperty({}, targetPageKey, 1));
+        (_actionRef$current14 = actionRef.current) === null || _actionRef$current14 === void 0 ? void 0 : (_actionRef$current14$ = _actionRef$current14.resetPage) === null || _actionRef$current14$ === void 0 ? void 0 : _actionRef$current14$.call(_actionRef$current14); // 清空表格选择
+
+        (_actionRef$current15 = actionRef.current) === null || _actionRef$current15 === void 0 ? void 0 : (_actionRef$current15$ = _actionRef$current15.clearRowSelection) === null || _actionRef$current15$ === void 0 ? void 0 : _actionRef$current15$.call(_actionRef$current15);
+      } // setVisible(!visible);
+
+    }
   }, getMessage('reset'))))));
 };
-export default /*#__PURE__*/memo(Filter);
+
+export default Filter;

package/es/table/components/Layout/index.js

@@ -1,10 +1,17 @@
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection", "toolBar", "dataTeamixSpm", "bindUrl", "bindUrlProps"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection", "toolBar"];
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 import React, { isValidElement } from 'react';
 import { usePrefixCls } from '@teamix/utils';
 import { Header } from '../../../field';
@@ -14,32 +21,34 @@ import ToolBar from '../ToolBar';
 import QuickAction from '../QuickAction';
 import './index.scss';
 var cls = usePrefixCls('teamix-pro-table-layout');
+
 var Layout = function Layout(props) {
   var header = props.header,
-    mainAction = props.mainAction,
-    extra = props.extra,
-    actionRef = props.actionRef,
-    dataFilter = props.dataFilter,
-    dataFilterFormRef = props.dataFilterFormRef,
-    afterDataFilter = props.afterDataFilter,
-    rowSelection = props.rowSelection,
-    toolBar = props.toolBar,
-    dataTeamixSpm = props.dataTeamixSpm,
-    bindUrl = props.bindUrl,
-    bindUrlProps = props.bindUrlProps,
-    otherProps = _objectWithoutProperties(props, _excluded);
-  // 渲染主操作区
+      mainAction = props.mainAction,
+      extra = props.extra,
+      actionRef = props.actionRef,
+      dataFilter = props.dataFilter,
+      dataFilterFormRef = props.dataFilterFormRef,
+      afterDataFilter = props.afterDataFilter,
+      rowSelection = props.rowSelection,
+      toolBar = props.toolBar,
+      otherProps = _objectWithoutProperties(props, _excluded); // 渲染主操作区
+
+
   var renderMainAction = function renderMainAction() {
     var _mainAction$actions;
+
     if (_typeof(mainAction) === 'object' && (mainAction === null || mainAction === void 0 ? void 0 : (_mainAction$actions = mainAction.actions) === null || _mainAction$actions === void 0 ? void 0 : _mainAction$actions.length) > 0) {
       // 判断 actions 是否 visible 都为 false，是的话也不渲染
       var isEmptyActions = mainAction === null || mainAction === void 0 ? void 0 : mainAction.actions.every(function (action) {
         return (action === null || action === void 0 ? void 0 : action.visible) === false;
       });
+
       if (isEmptyActions) {
         return;
-      }
-      // 默认 context
+      } // 默认 context
+
+
       var defaultContext = {
         action: actionRef.current,
         rowSelection: rowSelection
@@ -47,12 +56,12 @@ var Layout = function Layout(props) {
       return /*#__PURE__*/React.createElement("div", {
         className: cls('main-action')
       }, /*#__PURE__*/React.createElement(ProActionGroup, _objectSpread(_objectSpread({}, mainAction), {}, {
-        context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context),
-        "data-teamix-spm": dataTeamixSpm ? "".concat(dataTeamixSpm, "-mainAction") : undefined
+        context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;
-  };
-  // 渲染 addonAfter
+  }; // 渲染 addonAfter
+
+
   var renderAddonAfter = function renderAddonAfter() {
     return /*#__PURE__*/React.createElement("div", {
       className: cls('addon-after-wrapper')
@@ -64,12 +73,15 @@ var Layout = function Layout(props) {
       actionRef: actionRef,
       toolBar: toolBar
     }, otherProps)));
-  };
-  // 渲染新版 QueryFilter
+  }; // 渲染新版 QueryFilter
+
+
   var renderQueryFilter = function renderQueryFilter() {
     var _dataFilter$schema;
+
     if (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) {
       var _dataFilter$schema2;
+
       if ( /*#__PURE__*/isValidElement(dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content)) {
         // 自定义渲染内容
         return /*#__PURE__*/React.createElement(QueryFilterLayout, _objectSpread({
@@ -77,12 +89,11 @@ var Layout = function Layout(props) {
             // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
             setTimeout(function () {
               var _actionRef$current, _actionRef$current$re;
+
               // if (actionRef.current?.getState?.().fullScreenState) {
               // 偏移量8像素为面板展开后的下margin
-              (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$re = _actionRef$current.resetTableMaxBodyHeight) === null || _actionRef$current$re === void 0 ? void 0 : _actionRef$current$re.call(_actionRef$current, expand ? 8 : 0);
-              // }
+              (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$re = _actionRef$current.resetTableMaxBodyHeight) === null || _actionRef$current$re === void 0 ? void 0 : _actionRef$current$re.call(_actionRef$current, expand ? 8 : 0); // }
             });
-
             (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
           },
           panelContent: dataFilter.content,
@@ -96,17 +107,15 @@ var Layout = function Layout(props) {
             // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
             setTimeout(function () {
               var _actionRef$current2, _actionRef$current2$r;
+
               // if (actionRef.current?.getState?.().fullScreenState) {
               // 偏移量8像素为面板展开后的下margin
-              (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$r = _actionRef$current2.resetTableMaxBodyHeight) === null || _actionRef$current2$r === void 0 ? void 0 : _actionRef$current2$r.call(_actionRef$current2, expand ? 8 : 0);
-              // }
+              (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$r = _actionRef$current2.resetTableMaxBodyHeight) === null || _actionRef$current2$r === void 0 ? void 0 : _actionRef$current2$r.call(_actionRef$current2, expand ? 8 : 0); // }
             });
-
             (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
           },
           addonBefore: renderMainAction(),
-          addonAfter: renderAddonAfter(),
-          bindUrl: bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.filters) !== false
+          addonAfter: renderAddonAfter()
         }, dataFilter)), afterDataFilter && /*#__PURE__*/React.createElement("div", {
           className: "mb8 ".concat(cls('after-data-filter-wrapper'))
         }, afterDataFilter));
@@ -128,8 +137,9 @@ var Layout = function Layout(props) {
         }, afterDataFilter) : null
       }));
     }
-  };
-  // 区域组合渲染
+  }; // 区域组合渲染
+
+
   var renderLayout = function renderLayout() {
     if (header && mainAction) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
@@ -145,6 +155,7 @@ var Layout = function Layout(props) {
       }))), renderQueryFilter());
     } else if (header && !mainAction) {
       var _dataFilter$schema3, _dataFilter$schema4;
+
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         className: cls('wrapper')
       }, /*#__PURE__*/React.createElement("div", {
@@ -162,14 +173,18 @@ var Layout = function Layout(props) {
       if (!dataFilterFormRef && !extra) {
         return null;
       }
+
       return /*#__PURE__*/React.createElement(React.Fragment, null, renderQueryFilter());
     }
   };
+
   if ((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.schema) || mainAction || header || extra || toolBar !== false) {
     return /*#__PURE__*/React.createElement("div", {
       className: cls()
     }, renderLayout());
   }
+
   return /*#__PURE__*/React.createElement(React.Fragment, null);
 };
+
 export default /*#__PURE__*/React.memo(Layout);

package/es/table/components/Layout/index.scss

@@ -1,7 +1,7 @@
 $prefix: 'teamix-pro-table-layout';
 
 .theme-hybridcloud-dark {
-  --panel-filter-bg: #141414;
+  --panel-filter-bg: #1f1f1f;
 }
 
 .#{$prefix} {
@@ -43,6 +43,5 @@ $prefix: 'teamix-pro-table-layout';
   &-addon-after-wrapper {
     display: flex;
     align-items: center;
-    margin-bottom: 8px;
   }
 }