@pisell/materials 1.0.269 → 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/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/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]);
@@ -160,7 +164,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
           });
         },
@@ -173,7 +180,7 @@ var useTransColumns = function useTransColumns(params) {
         }
       });
     });
-  }, [columns, groupFieldRender, dragSort, groupField]);
+  }, [columns, groupFieldRender, dragSort, groupField, bordered]);
   return {
     columns: _columns
   };

package/es/components/table/index.less

@@ -69,10 +69,10 @@
   .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 {
@@ -80,6 +80,9 @@
     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;

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/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,

package/lib/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/lib/components/table/hooks/useTransColumns.js

@@ -41,25 +41,26 @@ var import_selectFilter = __toESM(require("../TableFilter/selectFilter"));
 var import_SortIcon = __toESM(require("../TableFilter/SortIcon"));
 var import_utils2 = require("../Table/fields/utils");
 var import_locales = require("../../../locales");
-var genOnCell = (position) => (_) => {
+var genOnCell = ({ bordered, position }) => (_) => {
   let styleObj = {};
   let notGroupStyle = {};
+  const 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 {
@@ -73,7 +74,7 @@ var genOnCell = (position) => (_) => {
 };
 var useTransColumns = (params) => {
   var _a;
-  const { columns, form, handleSave, handleResize, dragSort } = params;
+  const { columns, form, handleSave, handleResize, dragSort, bordered } = params;
   const group = import_antd.Form.useWatch("group_by", { form, preserve: true });
   const groupField = (_a = group == null ? void 0 : group[0]) == null ? void 0 : _a.field;
   const groupFieldRender = (0, import_react.useCallback)(
@@ -179,7 +180,7 @@ var useTransColumns = (params) => {
         onCell: (record) => ({
           record,
           ...item,
-          ...genOnCell(position)(record),
+          ...genOnCell({ position, bordered })(record),
           handleSave
         }),
         onHeaderCell: (record) => ({
@@ -189,7 +190,7 @@ var useTransColumns = (params) => {
         })
       };
     });
-  }, [columns, groupFieldRender, dragSort, groupField]);
+  }, [columns, groupFieldRender, dragSort, groupField, bordered]);
   return {
     columns: _columns
   };

package/lib/components/table/index.less

@@ -69,10 +69,10 @@
   .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 {
@@ -80,6 +80,9 @@
     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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.269",
+  "version": "1.0.271",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",