@pisell/materials 3.0.4 → 3.0.6

package/es/components/filter/components/FilterButton/index.js

@@ -38,12 +38,16 @@ var Filter = function Filter(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     ref: ref
   }, /*#__PURE__*/React.createElement(Popover, {
-    trigger: "click",
     content: content,
-    arrow: false,
+    arrow: false
+    // 渲染到当前元素上时页面会闪烁滚动条
+    // 渲染到body时内部form等无法继承
+    ,
     getPopupContainer: function getPopupContainer() {
       return ref.current;
-    }
+    },
+    mouseEnterDelay: 0.1,
+    transitionName: "test"
   }, /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(FilterLines, null),
     size: "large"

package/es/components/sort/index.js

@@ -86,7 +86,7 @@ var Sort = function Sort(_ref2) {
       return {
         key: d.name,
         label: d.label,
-        children: sortChildrenMap[d.type](d.name, !!localPagination),
+        children: sortChildrenMap[d.type](d.name, !!(d !== null && d !== void 0 && d.localFilter)),
         popupClassName: "".concat(prefix, "sort-sub-menu-popup-wrap")
       };
     });

package/es/components/sort/types.d.ts

@@ -6,6 +6,7 @@ export declare type SortItemProps = {
     name?: string | string[];
     isCustom: boolean;
     columnKey?: string;
+    localFilter?: boolean;
 };
 export declare type SortListProps = {
     list: SortItemProps[];

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

@@ -18,6 +18,7 @@ import { Table, Form } from "antd";
 import React, { useState, useMemo, useCallback } from "react";
 import { FormPagination } from "../../Pagination";
 import { calcFilterSort } from "../Table/utils";
+import { isArr } from "@pisell/utils";
 var BasicTable = function BasicTable(props) {
   var _pagination$pageSizeO;
   var dataSource = props.dataSource,
@@ -38,6 +39,13 @@ var BasicTable = function BasicTable(props) {
     page: 1,
     size: 10
   };
+  var group = Form.useWatch("group_by", {
+    form: form,
+    preserve: true
+  });
+  var isGroup = useMemo(function () {
+    return isArr(group) && group.length > 0;
+  }, [group]);
   var showTotal = pagination.showTotal,
     localPagination = pagination.localPagination;
   var _showTotal = useCallback(function (total, range) {
@@ -92,6 +100,8 @@ var BasicTable = function BasicTable(props) {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, _extends({
     key: defaultExpandedRowKeys.join("-")
   }, other, {
+    // 开启分组条件后关闭行选择功能
+    rowSelection: isGroup ? false : other === null || other === void 0 ? void 0 : other.rowSelection,
     virtual: virtual,
     onChange: function onChange(pagination, filters, sorter) {
       form.setFieldsValue({

package/es/components/table/Table/fields/rangePicker/Edit/index.js

@@ -12,6 +12,7 @@ import { isArr, isBoolean, isString } from "@pisell/utils";
 import dayjs from "dayjs";
 import React, { forwardRef, useMemo } from "react";
 import DatePicker from "../../../../../date-picker";
+import { getText } from "../../../../../../locales";
 var RangePicker = DatePicker.RangePicker;
 var defaultFormat = "YYYY-MM-DD HH:mm:ss";
 var Edit = function Edit(props, ref) {
@@ -42,25 +43,25 @@ var Edit = function Edit(props, ref) {
     return value;
   }, [value]);
   var rangePresets = [{
-    label: "Today",
+    label: getText("table-action-range-picker-presets-today"),
     value: [dayjs().startOf("day"), dayjs().endOf("day")]
   }, {
-    label: "Yesterday",
+    label: getText("table-action-range-picker-presets-yesterday"),
     value: [dayjs().add(-1, "d").startOf("day"), dayjs().add(-1, "d").endOf("day")]
   }, {
-    label: "Last 3 Days",
+    label: getText("table-action-range-picker-presets-last-3-day"),
     value: [dayjs().add(-3, "d").startOf("day"), dayjs().endOf("day")]
   }, {
-    label: "Last 7 Days",
+    label: getText("table-action-range-picker-presets-last-7-day"),
     value: [dayjs().add(-7, "d").startOf("day"), dayjs().endOf("day")]
   }, {
-    label: "Last 14 Days",
+    label: getText("table-action-range-picker-presets-last-14-day"),
     value: [dayjs().add(-14, "d").startOf("day"), dayjs().endOf("day")]
   }, {
-    label: "Last 30 Days",
+    label: getText("table-action-range-picker-presets-last-30-day"),
     value: [dayjs().add(-30, "d").startOf("day"), dayjs().endOf("day")]
   }, {
-    label: "Last 90 Days",
+    label: getText("table-action-range-picker-presets-last-90-day"),
     value: [dayjs().add(-90, "d").startOf("day"), dayjs().endOf("day")]
   }];
   var _showTime = useMemo(function () {

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

@@ -76,7 +76,8 @@ var GridViewTable = function GridViewTable(_ref) {
       localPagination: !!(tableProps !== null && tableProps !== void 0 && (_tableProps$paginatio = tableProps.pagination) !== null && _tableProps$paginatio !== void 0 && _tableProps$paginatio.localPagination),
       handleResize: handleResize,
       handleSave: handleSave,
-      dragSort: tableProps === null || tableProps === void 0 ? void 0 : tableProps.dragSort
+      dragSort: tableProps === null || tableProps === void 0 ? void 0 : tableProps.dragSort,
+      bordered: tableProps.bordered
     }),
     columns = _useTransColumns.columns;
   var dataSource = useTransDataSource({

package/es/components/table/Table/tableConfig/body/index.less

@@ -4,7 +4,5 @@
 }
 
 .materials-grid-table-cell {
-  height: 1px;
   padding: 12px;
-
 }

package/es/components/table/Table/tableConfig/header/index.d.ts

@@ -10,6 +10,7 @@ export interface CustomHeaderCellProps {
     style?: any;
     lock?: 0 | 1;
     editable?: boolean;
+    position: 'start' | 'end' | "";
 }
 declare const _default: {
     Row: React.FC<any>;

package/es/components/table/Table/tableConfig/header/index.js

@@ -1,6 +1,6 @@
 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); }
 var _excluded = ["index"],
-  _excluded2 = ["onResize", "width", "field_type", "lock", "editable", "dataIndex"];
+  _excluded2 = ["onResize", "width", "field_type", "lock", "editable", "dataIndex", "position"];
 var _templateObject;
 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; }
@@ -29,14 +29,18 @@ var CustomHeaderCell = function CustomHeaderCell(props) {
     lock = props.lock,
     editable = props.editable,
     dataIndex = props.dataIndex,
+    position = props.position,
     restProps = _objectWithoutProperties(props, _excluded2);
   var isCheckbox = !props.record;
 
   // checkbox 不居中,  添加padding
   if (isCheckbox) {
-    restProps.style = _objectSpread(_objectSpread({}, restProps.style), {}, {
-      paddingInlineStart: 8
-    });
+    restProps.style = _objectSpread({}, restProps.style);
+  }
+
+  // 最后一列不增加拖拽功能
+  if (position === 'end') {
+    return /*#__PURE__*/React.createElement("td", restProps, /*#__PURE__*/React.createElement(CellProvider, props));
   }
   return /*#__PURE__*/React.createElement(ResizeCellStyle, {
     width: width || 200,

package/es/components/table/Table/utils.d.ts

@@ -146,7 +146,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/es/components/table/hooks/useTransColumns.d.ts

@@ -6,6 +6,7 @@ declare type UseTransColumnsProps = {
     handleSave?: (row: Record<string, any>) => void;
     handleResize?: (index: number) => (e: any, p2: any) => void;
     dragSort: boolean;
+    bordered: boolean;
 };
 declare const useTransColumns: (params: UseTransColumnsProps) => {
     columns: any[];

package/es/components/table/hooks/useTransColumns.js

@@ -13,26 +13,29 @@ import getColumnSelectProps from "../TableFilter/selectFilter";
 import SortIcon from "../TableFilter/SortIcon";
 import { getValueByKeys } from "../Table/fields/utils";
 import { getText } from "../../../locales";
-var genOnCell = function genOnCell(position) {
+var genOnCell = function genOnCell(_ref) {
+  var bordered = _ref.bordered,
+    position = _ref.position;
   return function (_) {
     var styleObj = {};
     var notGroupStyle = {};
+    var borderStr = bordered ? "1px solid #EAECF0" : "";
     if (position === "start") {
       styleObj = {
-        borderLeft: "1px solid #EAECF0",
+        borderLeft: borderStr,
         borderRadius: "8px 0px 0px 0px",
         padding: "12px"
       };
       notGroupStyle = {
-        borderLeft: "1px solid #EAECF0"
+        borderLeft: borderStr
       };
     } else if (position === "end") {
       styleObj = {
-        borderRight: "1px solid #EAECF0",
+        borderRight: borderStr,
         borderRadius: "0px 8px 0px 0px"
       };
       notGroupStyle = {
-        borderRight: "1px solid #EAECF0"
+        borderRight: borderStr
       };
     }
     return {
@@ -48,7 +51,8 @@ var useTransColumns = function useTransColumns(params) {
     form = params.form,
     handleSave = params.handleSave,
     handleResize = params.handleResize,
-    dragSort = params.dragSort;
+    dragSort = params.dragSort,
+    bordered = params.bordered;
   var group = Form.useWatch("group_by", {
     form: form,
     preserve: true
@@ -60,9 +64,9 @@ var useTransColumns = function useTransColumns(params) {
     var fieldCol = columns.find(function (item) {
       return "".concat(item.dataIndex) === groupField;
     });
-    var _ref = fieldCol || {},
-      render = _ref.render,
-      dataIndex = _ref.dataIndex;
+    var _ref2 = fieldCol || {},
+      render = _ref2.render,
+      dataIndex = _ref2.dataIndex;
     var dom = /*#__PURE__*/React.createElement("div", null, getValueByKeys(children === null || children === void 0 ? void 0 : children[0], dataIndex || groupField.split(",")));
     if (render) {
       dom = render(getValueByKeys(children === null || children === void 0 ? void 0 : children[0], dataIndex), record.children[0]);
@@ -87,7 +91,8 @@ var useTransColumns = function useTransColumns(params) {
       newColumns.unshift({
         key: "__sort",
         width: 60,
-        align: "center"
+        align: "center",
+        className: "drag-sort-cell"
       });
     }
     return newColumns.map(function (col, index) {
@@ -103,16 +108,27 @@ var useTransColumns = function useTransColumns(params) {
         position = "end";
       }
       var groupObj = {};
+      if (groupField) {
+        groupObj = {
+          render: function render(text, record) {
+            var _col$render;
+            if (record.__is_group) {
+              return null;
+            }
+            return (col === null || col === void 0 ? void 0 : (_col$render = col.render) === null || _col$render === void 0 ? void 0 : _col$render.call(col, text, record)) || text;
+          }
+        };
+      }
       if (position === "start" && groupField) {
         groupObj = {
           fixed: "left",
           width: 350,
           render: function render(text, record) {
-            var _col$render;
+            var _col$render2;
             if (record.__is_group && groupFieldRender) {
               return groupFieldRender(text, record);
             }
-            return (col === null || col === void 0 ? void 0 : (_col$render = col.render) === null || _col$render === void 0 ? void 0 : _col$render.call(col, text, record)) || text;
+            return (col === null || col === void 0 ? void 0 : (_col$render2 = col.render) === null || _col$render2 === void 0 ? void 0 : _col$render2.call(col, text, record)) || text;
           }
         };
       }
@@ -159,7 +175,10 @@ var useTransColumns = function useTransColumns(params) {
         onCell: function onCell(record) {
           return _objectSpread(_objectSpread(_objectSpread({
             record: record
-          }, item), genOnCell(position)(record)), {}, {
+          }, item), genOnCell({
+            position: position,
+            bordered: bordered
+          })(record)), {}, {
             handleSave: handleSave
           });
         },
@@ -167,12 +186,13 @@ var useTransColumns = function useTransColumns(params) {
           return _objectSpread(_objectSpread({
             record: record
           }, item), {}, {
-            onResize: handleResize === null || handleResize === void 0 ? void 0 : handleResize(index)
+            onResize: handleResize === null || handleResize === void 0 ? void 0 : handleResize(index),
+            position: position
           });
         }
       });
     });
-  }, [columns, groupFieldRender, dragSort, groupField]);
+  }, [columns, groupFieldRender, dragSort, groupField, bordered]);
   return {
     columns: _columns
   };

package/es/components/table/hooks/useTransSortSetting.js

@@ -5,6 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { useMemo } from "react";
+import { isBoolean } from "@pisell/utils";
 var useTransSortSetting = function useTransSortSetting(params) {
   var sort = params.sort,
     originColumnsMap = params.originColumnsMap;
@@ -15,13 +16,15 @@ var useTransSortSetting = function useTransSortSetting(params) {
           var name = item.name,
             label = item.label,
             columnKey = item.columnKey,
-            isCustom = item.isCustom;
+            isCustom = item.isCustom,
+            localFilter = item.localFilter;
           if (!isCustom && columnKey && originColumnsMap.has(columnKey)) {
             var column = originColumnsMap.get(columnKey);
             name = column.dataIndex || name;
             label = column.title || label;
           }
           return _objectSpread(_objectSpread({}, item), {}, {
+            localFilter: isBoolean(localFilter) ? localFilter : true,
             name: name,
             label: label
           });

package/es/components/table/hooks/useTriggerValuesChange.js

@@ -1,4 +1,4 @@
-import { useCallback } from "react";
+import { useCallback, useRef } from "react";
 import { getSettingKeyArrByMode } from "../Table/utils";
 /**
  * 判断是否触发值变化
@@ -14,6 +14,10 @@ var useTriggerValuesChange = function useTriggerValuesChange(params) {
   var _ref = filter || {},
     list = _ref.list,
     show = _ref.show;
+  var _ref2 = sort || {},
+    sortList = _ref2.list,
+    sortShow = _ref2.show;
+  var lastIsRemoteSort = useRef(false);
   var getIsTriggerValuesChange = useCallback(function (changedValues, values) {
     var keys = getSettingKeyArrByMode({
       filter: filter,
@@ -27,10 +31,38 @@ var useTriggerValuesChange = function useTriggerValuesChange(params) {
     if (changedKey === "pagination") {
       return true;
     }
-    if (changedKey === 'view_mode') {
+    if (changedKey === "view_mode") {
       return false;
     }
 
+    /**
+     * 排序变化时，如果排序有远程接口排序，则触发值变化
+     */
+    if (changedKey === "order_by") {
+      if (sortShow && sortList !== null && sortList !== void 0 && sortList.length) {
+        var _value$split, _value$split$call;
+        var value = changedValues[changedKey];
+        var sortField = (value === null || value === void 0 ? void 0 : (_value$split = value.split) === null || _value$split === void 0 ? void 0 : (_value$split$call = _value$split.call(value, ":")) === null || _value$split$call === void 0 ? void 0 : _value$split$call[0]) || "";
+        var remoteSortKeys = sortList.filter(function (item) {
+          return !item.localFilter;
+        }).map(function (item) {
+          var _item$name;
+          return (_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name.toString();
+        });
+        var result = remoteSortKeys.includes(sortField);
+        // sort值清空时 如果上次更新是远程排序 那么触发onValuesChange
+        if (sortField === "" && lastIsRemoteSort.current) {
+          lastIsRemoteSort.current = false;
+          return true;
+        }
+        // sortField有值时 存入当前是否远程状态
+        if (sortField !== "") {
+          lastIsRemoteSort.current = result;
+        }
+        return result;
+      }
+    }
+
     /**
      * 过滤器变化时，如果过滤器有远程过滤，则触发值变化
      */
@@ -41,7 +73,8 @@ var useTriggerValuesChange = function useTriggerValuesChange(params) {
         var remoteFilterKeys = list.filter(function (item) {
           return !item.localFilter;
         }).map(function (item) {
-          return item.name;
+          var _item$name2;
+          return (_item$name2 = item.name) === null || _item$name2 === void 0 ? void 0 : _item$name2.toString();
         });
         return remoteFilterKeys.includes(filterKey);
       }

package/es/components/table/index.less

@@ -69,10 +69,25 @@
   .pisell-lowcode-table-wrapper .pisell-lowcode-table.pisell-lowcode-table-bordered >.pisell-lowcode-table-container {
     border-left: none;
   }
-  .pisell-lowcode-table-wrapper .pisell-lowcode-table-thead tr td:first-child {
+  .pisell-lowcode-table-wrapper .pisell-lowcode-table-bordered .pisell-lowcode-table-thead tr td:first-child {
     border-left: 1px solid #EAECF0;
   }
-  .pisell-lowcode-table-wrapper .pisell-lowcode-table-thead tr th:first-child {
+  .pisell-lowcode-table-wrapper .pisell-lowcode-table-bordered .pisell-lowcode-table-thead tr th:first-child {
     border-left: 1px solid #EAECF0;
   }
+  div.pisell-lowcode-table-selection-column {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .pisell-lowcode-table-bordered .pisell-lowcode-table-tbody .pisell-lowcode-table-selection-column {
+    border-left: 1px solid #EAECF0;
+  }
+  .drag-sort-cell {
+    .editable-cell-value-wrap {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
 }

package/es/locales/en-US.d.ts

@@ -28,5 +28,12 @@ declare const _default: {
     "table-column-group-records": string;
     "table-column-drag-sort-disabled-tip": string;
     "table-action-filter-no-filter": string;
+    "table-action-range-picker-presets-today": string;
+    "table-action-range-picker-presets-yesterday": string;
+    "table-action-range-picker-presets-last-3-day": string;
+    "table-action-range-picker-presets-last-7-day": string;
+    "table-action-range-picker-presets-last-14-day": string;
+    "table-action-range-picker-presets-last-30-day": string;
+    "table-action-range-picker-presets-last-90-day": string;
 };
 export default _default;

package/es/locales/en-US.js

@@ -33,5 +33,12 @@ export default {
   "table-action-column-title": "Header settings",
   "table-column-group-records": "records",
   "table-column-drag-sort-disabled-tip": "Automatic sorting is enabled, manual dragging is disabled.",
-  "table-action-filter-no-filter": "No filter options available."
+  "table-action-filter-no-filter": "No filter options available.",
+  "table-action-range-picker-presets-today": "Today",
+  "table-action-range-picker-presets-yesterday": "Yesterday",
+  "table-action-range-picker-presets-last-3-day": "Last 3 Days",
+  "table-action-range-picker-presets-last-7-day": "Last 7 Days",
+  "table-action-range-picker-presets-last-14-day": "Last 14 Days",
+  "table-action-range-picker-presets-last-30-day": "Last 30 Days",
+  "table-action-range-picker-presets-last-90-day": "Last 90 Days"
 };

package/es/locales/zh-CN.d.ts

@@ -28,5 +28,12 @@ declare const _default: {
     "table-column-group-records": string;
     "table-column-drag-sort-disabled-tip": string;
     "table-action-filter-no-filter": string;
+    "table-action-range-picker-presets-today": string;
+    "table-action-range-picker-presets-yesterday": string;
+    "table-action-range-picker-presets-last-3-day": string;
+    "table-action-range-picker-presets-last-7-day": string;
+    "table-action-range-picker-presets-last-14-day": string;
+    "table-action-range-picker-presets-last-30-day": string;
+    "table-action-range-picker-presets-last-90-day": string;
 };
 export default _default;

package/es/locales/zh-CN.js

@@ -33,5 +33,12 @@ export default {
   "table-action-column-title": "表头设置",
   "table-column-group-records": "条记录",
   "table-column-drag-sort-disabled-tip": "已开启自动排序，无法手动拖拽",
-  "table-action-filter-no-filter": "没有可用的筛选器。"
+  "table-action-filter-no-filter": "没有可用的筛选器。",
+  "table-action-range-picker-presets-today": "今天",
+  "table-action-range-picker-presets-yesterday": "昨天",
+  "table-action-range-picker-presets-last-3-day": "过去3天",
+  "table-action-range-picker-presets-last-7-day": "过去7天",
+  "table-action-range-picker-presets-last-14-day": "过去14天",
+  "table-action-range-picker-presets-last-30-day": "过去30天",
+  "table-action-range-picker-presets-last-90-day": "过去90天"
 };

package/es/locales/zh-TW.d.ts

@@ -28,5 +28,12 @@ declare const _default: {
     "table-column-group-records": string;
     "table-column-drag-sort-disabled-tip": string;
     "table-action-filter-no-filter": string;
+    "table-action-range-picker-presets-today": string;
+    "table-action-range-picker-presets-yesterday": string;
+    "table-action-range-picker-presets-last-3-day": string;
+    "table-action-range-picker-presets-last-7-day": string;
+    "table-action-range-picker-presets-last-14-day": string;
+    "table-action-range-picker-presets-last-30-day": string;
+    "table-action-range-picker-presets-last-90-day": string;
 };
 export default _default;

package/es/locales/zh-TW.js

@@ -33,5 +33,12 @@ export default {
   "table-action-column-title": "表頭設置",
   "table-column-group-records": "條記錄",
   "table-column-drag-sort-disabled-tip": "已開啟自動排序，無法手動拖曳",
-  "table-action-filter-no-filter": "沒有可用的篩選器。"
+  "table-action-filter-no-filter": "沒有可用的篩選器。",
+  "table-action-range-picker-presets-today": "今天",
+  "table-action-range-picker-presets-yesterday": "昨天",
+  "table-action-range-picker-presets-last-3-day": "過去3天",
+  "table-action-range-picker-presets-last-7-day": "過去7天",
+  "table-action-range-picker-presets-last-14-day": "過去14天",
+  "table-action-range-picker-presets-last-30-day": "過去30天",
+  "table-action-range-picker-presets-last-90-day": "過去90天"
 };

package/lib/components/filter/components/FilterButton/index.js

@@ -70,10 +70,11 @@ var Filter = ({
   return /* @__PURE__ */ import_react.default.createElement("div", { ref }, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Popover,
     {
-      trigger: "click",
       content,
       arrow: false,
-      getPopupContainer: () => ref.current
+      getPopupContainer: () => ref.current,
+      mouseEnterDelay: 0.1,
+      transitionName: "test"
     },
     /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { icon: /* @__PURE__ */ import_react.default.createElement(import_FilterLines.default, null), size: "large" }, isMobileBool ? null : (0, import_locales.getText)("table-action-filter-button"))
   ));

package/lib/components/sort/index.js

@@ -101,7 +101,7 @@ var Sort = ({
       return {
         key: d.name,
         label: d.label,
-        children: sortChildrenMap[d.type](d.name, !!localPagination),
+        children: sortChildrenMap[d.type](d.name, !!(d == null ? void 0 : d.localFilter)),
         popupClassName: `${prefix}sort-sub-menu-popup-wrap`
       };
     });

package/lib/components/sort/types.d.ts

@@ -6,6 +6,7 @@ export declare type SortItemProps = {
     name?: string | string[];
     isCustom: boolean;
     columnKey?: string;
+    localFilter?: boolean;
 };
 export declare type SortListProps = {
     list: SortItemProps[];

package/lib/components/table/BasicTable/index.js

@@ -36,6 +36,7 @@ var import_antd = require("antd");
 var import_react = __toESM(require("react"));
 var import_Pagination = require("../../Pagination");
 var import_utils = require("../Table/utils");
+var import_utils2 = require("@pisell/utils");
 var BasicTable = (props) => {
   var _a;
   const { dataSource, pagination, value, virtual, ...other } = props;
@@ -46,6 +47,8 @@ var BasicTable = (props) => {
     page: 1,
     size: 10
   };
+  const group = import_antd.Form.useWatch("group_by", { form, preserve: true });
+  const isGroup = (0, import_react.useMemo)(() => (0, import_utils2.isArr)(group) && group.length > 0, [group]);
   const { showTotal, localPagination } = pagination;
   const _showTotal = (0, import_react.useCallback)(
     (total2, range) => {
@@ -105,6 +108,7 @@ var BasicTable = (props) => {
     {
       key: defaultExpandedRowKeys.join("-"),
       ...other,
+      rowSelection: isGroup ? false : other == null ? void 0 : other.rowSelection,
       virtual,
       onChange: (pagination2, filters, sorter) => {
         form.setFieldsValue({

package/lib/components/table/Table/fields/rangePicker/Edit/index.js

@@ -36,6 +36,7 @@ var import_utils = require("@pisell/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var import_react = __toESM(require("react"));
 var import_date_picker = __toESM(require("../../../../../date-picker"));
+var import_locales = require("../../../../../../locales");
 var { RangePicker } = import_date_picker.default;
 var defaultFormat = "YYYY-MM-DD HH:mm:ss";
 var Edit = (props, ref) => {
@@ -64,32 +65,32 @@ var Edit = (props, ref) => {
     return value;
   }, [value]);
   const rangePresets = [
-    { label: "Today", value: [(0, import_dayjs.default)().startOf("day"), (0, import_dayjs.default)().endOf("day")] },
+    { label: (0, import_locales.getText)("table-action-range-picker-presets-today"), value: [(0, import_dayjs.default)().startOf("day"), (0, import_dayjs.default)().endOf("day")] },
     {
-      label: "Yesterday",
+      label: (0, import_locales.getText)("table-action-range-picker-presets-yesterday"),
       value: [
         (0, import_dayjs.default)().add(-1, "d").startOf("day"),
         (0, import_dayjs.default)().add(-1, "d").endOf("day")
       ]
     },
     {
-      label: "Last 3 Days",
+      label: (0, import_locales.getText)("table-action-range-picker-presets-last-3-day"),
       value: [(0, import_dayjs.default)().add(-3, "d").startOf("day"), (0, import_dayjs.default)().endOf("day")]
     },
     {
-      label: "Last 7 Days",
+      label: (0, import_locales.getText)("table-action-range-picker-presets-last-7-day"),
       value: [(0, import_dayjs.default)().add(-7, "d").startOf("day"), (0, import_dayjs.default)().endOf("day")]
     },
     {
-      label: "Last 14 Days",
+      label: (0, import_locales.getText)("table-action-range-picker-presets-last-14-day"),
       value: [(0, import_dayjs.default)().add(-14, "d").startOf("day"), (0, import_dayjs.default)().endOf("day")]
     },
     {
-      label: "Last 30 Days",
+      label: (0, import_locales.getText)("table-action-range-picker-presets-last-30-day"),
       value: [(0, import_dayjs.default)().add(-30, "d").startOf("day"), (0, import_dayjs.default)().endOf("day")]
     },
     {
-      label: "Last 90 Days",
+      label: (0, import_locales.getText)("table-action-range-picker-presets-last-90-day"),
       value: [(0, import_dayjs.default)().add(-90, "d").startOf("day"), (0, import_dayjs.default)().endOf("day")]
     }
   ];

package/lib/components/table/Table/index.js

@@ -83,7 +83,8 @@ var GridViewTable = ({ tableProps, filter, setTableSetting, onDataSourceChange }
     localPagination: !!((_a = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _a.localPagination),
     handleResize,
     handleSave,
-    dragSort: tableProps == null ? void 0 : tableProps.dragSort
+    dragSort: tableProps == null ? void 0 : tableProps.dragSort,
+    bordered: tableProps.bordered
   });
   const dataSource = (0, import_useTransDataSource.default)({
     dataSource: originDataSource,