@lemon-fe/kits 1.0.0-140 → 1.0.0-141

package/es/components/DataGrid/index.d.ts

@@ -100,10 +100,6 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
     private getMemoizedDetailCellParams;
     private getRowStyle;
     private cellFocused;
-    /**
-     *  防止点击checkbox之外的地方，导致其他行清空选中
-     */
-    private cellClicked;
     /**
      * 在表格失去焦点后，聚焦失去焦点的单元格
      * @returns

package/es/components/DataGrid/index.js

@@ -402,21 +402,6 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       };
     });
 
-    _defineProperty(_assertThisInitialized(_this), "cellClicked", function (evt) {
-      var _this$props4 = _this.props,
-          onCellClicked = _this$props4.onCellClicked,
-          suppressRowClickSelection = _this$props4.suppressRowClickSelection;
-      onCellClicked === null || onCellClicked === void 0 ? void 0 : onCellClicked(evt);
-
-      if (!suppressRowClickSelection && evt.node.selectable) {
-        if (evt.column.getColId() !== '__selection__') {
-          evt.node.setSelected(true, true);
-        } else if (!evt.node.isSelected()) {
-          evt.node.setSelected(true, false);
-        }
-      }
-    });
-
     _this.state = _objectSpread({
       colDefs: _this.getColumnDefs(),
       loading: false
@@ -440,9 +425,9 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   _createClass(DataGrid, [{
     key: "getPagination",
     value: function getPagination() {
-      var _this$props5 = this.props,
-          pagination = _this$props5.pagination,
-          fetch = _this$props5.fetch;
+      var _this$props4 = this.props,
+          pagination = _this$props4.pagination,
+          fetch = _this$props4.fetch;
       var page = 1;
       var pageSize = 50;
       var total = 0;
@@ -475,11 +460,11 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     value: function componentDidUpdate(prevProps) {
       var _prevProps$rowSelecti;
 
-      var _this$props6 = this.props,
-          columns = _this$props6.columns,
-          rowSelection = _this$props6.rowSelection,
-          dataSource = _this$props6.dataSource,
-          context = _this$props6.context;
+      var _this$props5 = this.props,
+          columns = _this$props5.columns,
+          rowSelection = _this$props5.rowSelection,
+          dataSource = _this$props5.dataSource,
+          context = _this$props5.context;
 
       if (columns !== prevProps.columns) {
         this.syncColRender();
@@ -622,13 +607,13 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     value: function getColumnDefs() {
       var _this3 = this;
 
-      var _this$props7 = this.props,
-          _this$props7$columns = _this$props7.columns,
-          columns = _this$props7$columns === void 0 ? [] : _this$props7$columns,
-          rowActions = _this$props7.rowActions,
-          rowSelection = _this$props7.rowSelection,
-          _this$props7$defaultC = _this$props7.defaultColDef,
-          defaultCol = _this$props7$defaultC === void 0 ? {} : _this$props7$defaultC;
+      var _this$props6 = this.props,
+          _this$props6$columns = _this$props6.columns,
+          columns = _this$props6$columns === void 0 ? [] : _this$props6$columns,
+          rowActions = _this$props6.rowActions,
+          rowSelection = _this$props6.rowSelection,
+          _this$props6$defaultC = _this$props6.defaultColDef,
+          defaultCol = _this$props6$defaultC === void 0 ? {} : _this$props6$defaultC;
 
       var map = function map(cols) {
         return cols.map(function (item) {
@@ -830,6 +815,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             suppressMovable: true,
             lockPinned: true,
             lockVisible: true,
+            cellClass: prefix('cell-selection'),
             pinned: rowSelection.fixed
           });
         }
@@ -1278,25 +1264,25 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this10 = this;
 
-      var _this$props8 = this.props,
-          rowKey = _this$props8.rowKey,
-          fetch = _this$props8.fetch,
-          dataSource = _this$props8.dataSource,
-          rowActions = _this$props8.rowActions,
-          columns = _this$props8.columns,
-          autoLoad = _this$props8.autoLoad,
-          loadingProp = _this$props8.loading,
-          summary = _this$props8.summary,
-          detailCell = _this$props8.detailCell,
-          pagination = _this$props8.pagination,
-          rowSelection = _this$props8.rowSelection,
-          columnTypesProp = _this$props8.columnTypes,
-          defaultColDefProp = _this$props8.defaultColDef,
-          componentsProp = _this$props8.components,
-          sideBarProp = _this$props8.sideBar,
-          detailCellRendererParams = _this$props8.detailCellRendererParams,
-          context = _this$props8.context,
-          restProps = _objectWithoutProperties(_this$props8, _excluded4);
+      var _this$props7 = this.props,
+          rowKey = _this$props7.rowKey,
+          fetch = _this$props7.fetch,
+          dataSource = _this$props7.dataSource,
+          rowActions = _this$props7.rowActions,
+          columns = _this$props7.columns,
+          autoLoad = _this$props7.autoLoad,
+          loadingProp = _this$props7.loading,
+          summary = _this$props7.summary,
+          detailCell = _this$props7.detailCell,
+          pagination = _this$props7.pagination,
+          rowSelection = _this$props7.rowSelection,
+          columnTypesProp = _this$props7.columnTypes,
+          defaultColDefProp = _this$props7.defaultColDef,
+          componentsProp = _this$props7.components,
+          sideBarProp = _this$props7.sideBar,
+          detailCellRendererParams = _this$props7.detailCellRendererParams,
+          context = _this$props7.context,
+          restProps = _objectWithoutProperties(_this$props7, _excluded4);
 
       var _this$state2 = this.state,
           colDefs = _this$state2.colDefs,
@@ -1363,7 +1349,6 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         singleClickEdit: true,
         suppressPaginationPanel: true,
         suppressCopyRowsToClipboard: true,
-        suppressRowClickSelection: true,
         enableCellEditingOnBackspace: true,
         loadingOverlayComponent: this.LoadingOverlay,
         noRowsOverlayComponent: this.NoRowsOverlay,
@@ -1380,7 +1365,6 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         onCellValueChanged: this.cellValueChanged,
         onCellEditingStopped: this.cellEditingStop,
         onCellFocused: this.cellFocused,
-        onCellClicked: this.cellClicked,
         pagination: enablePagination,
         paginationPageSize: pageSize,
         columnDefs: colDefs,

package/es/components/DataGrid/index.less

@@ -35,6 +35,24 @@
     text-align: center;
   }
 
+  &-cell-selection .ag-checkbox-input-wrapper {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    width: auto;
+    height: auto;
+    background-color: transparent;
+
+    &::after {
+      top: 50%;
+      left: 50%;
+      background-color: #fff;
+      transform: translate(-50%, -50%);
+    }
+  }
+
   &-editable-cell {
     padding-right: 0;
     padding-left: 0;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-140",
+  "version": "1.0.0-141",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
-    "docs:deploy": "scp -r kits-docs-next dev@47.111.99.207:/opt/app/",
+    "docs:deploy": "scp -r kits-docs-next root@47.111.99.207:/opt/app/",
     "build": "father build",
     "deploy": "npm run docs:build && npm run docs:deploy",
     "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",