@pisell/materials 1.0.270 → 1.0.271

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/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/package.json

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