@pisell/materials 1.0.270 → 1.0.272

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/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,6 +29,7 @@ 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;
 
@@ -36,6 +37,11 @@ var CustomHeaderCell = function CustomHeaderCell(props) {
   if (isCheckbox) {
     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,
     height: 0,

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

@@ -175,7 +175,8 @@ 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
           });
         }
       });

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/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/lib/components/table/Table/tableConfig/header/index.js

@@ -80,6 +80,7 @@ var CustomHeaderCell = (props) => {
     lock,
     editable,
     dataIndex,
+    position,
     ...restProps
   } = props;
   const isCheckbox = !props.record;
@@ -89,6 +90,9 @@ var CustomHeaderCell = (props) => {
       // paddingInlineStart: 8,
     };
   }
+  if (position === "end") {
+    return /* @__PURE__ */ import_react.default.createElement("td", { ...restProps }, /* @__PURE__ */ import_react.default.createElement(import_CellProvider.default, { ...props }));
+  }
   return /* @__PURE__ */ import_react.default.createElement(
     ResizeCellStyle,
     {

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

@@ -186,7 +186,8 @@ var useTransColumns = (params) => {
         onHeaderCell: (record) => ({
           record,
           ...item,
-          onResize: handleResize == null ? void 0 : handleResize(index)
+          onResize: handleResize == null ? void 0 : handleResize(index),
+          position
         })
       };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.270",
+  "version": "1.0.272",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -62,9 +62,9 @@
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
-    "@pisell/utils": "1.0.25",
+    "@pisell/date-picker": "1.0.72",
     "@pisell/icon": "0.0.8",
-    "@pisell/date-picker": "1.0.72"
+    "@pisell/utils": "1.0.25"
   },
   "peerDependencies": {
     "react": "^18.0.0",