@zat-design/sisyphus-react 3.4.10-beta.2 → 3.4.10-beta.3

package/dist/index.esm.css

@@ -4233,6 +4233,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-left: var(--zaui-space-size-xs, 4px);
   cursor: pointer;
 }
+.pro-edit-table .drag-wrapper.no-check .anticon {
+  margin-right: 0;
+}
 .pro-edit-table.pro-table-no-stripe .ant-table-tbody tr:nth-child(n) > td {
   background-color: var(--zaui-base-bg, #fff);
 }

package/dist/less.esm.css

@@ -4233,6 +4233,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-left: var(--zaui-space-size-xs, 4px);
   cursor: pointer;
 }
+.pro-edit-table .drag-wrapper.no-check .anticon {
+  margin-right: 0;
+}
 .pro-edit-table.pro-table-no-stripe .ant-table-tbody tr:nth-child(n) > td {
   background-color: var(--zaui-base-bg, #fff);
 }

package/es/ProEditTable/components/DndWrapper/index.d.ts

@@ -2,6 +2,7 @@ import React, { FC } from 'react';
 interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     'data-row-key': string;
     disabled?: boolean;
+    isShowCheckBox?: boolean;
 }
 export declare const Row: FC<RowProps>;
 declare const DndWrapper: ({ draggable, value, onChange, disabled, children }: {

package/es/ProEditTable/components/DndWrapper/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["disabled", "children"];
+var _excluded = ["disabled", "isShowCheckBox", "children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { DndContext } from '@dnd-kit/core';
@@ -9,6 +9,7 @@ import { CSS } from '@dnd-kit/utilities';
 import ProIcon from '../../../ProIcon';
 export var Row = function Row(props) {
   var disabled = props.disabled,
+    isShowCheckBox = props.isShowCheckBox,
     children = props.children,
     restProps = _objectWithoutProperties(props, _excluded);
   var data = useSortable({
@@ -42,7 +43,7 @@ export var Row = function Row(props) {
           renderIndex = _ref.renderIndex;
         return /*#__PURE__*/React.cloneElement(child, {
           children: _jsxs("span", {
-            className: "drag-wrapper",
+            className: "drag-wrapper".concat(isShowCheckBox ? '' : ' no-check'),
             children: [_jsx(ProIcon, _objectSpread({
               className: "drag-icon",
               style: {
@@ -51,7 +52,7 @@ export var Row = function Row(props) {
               },
               type: "drag",
               size: 20
-            }, listeners)), render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+            }, listeners)), isShowCheckBox ? render === null || render === void 0 ? void 0 : render(null, record, renderIndex) : null]
           })
         });
       }

package/es/ProEditTable/index.js

@@ -248,7 +248,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     if (disabled || isView) {
       return null;
     }
-    return isForbiddenBtn('mulDelete') ? rowSelection : _rowSelection;
+    return _rowSelection;
   };
   var setColumns = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -315,6 +315,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       rowSelection: renderRowSelection()
     });
   } : summary;
+  // 是否展示勾选框
+  var isShowCheckBox = !isForbiddenBtn('mulDelete');
   return _jsxs(_Fragment, {
     children: [_jsxs(_ConfigProvider, {
       renderEmpty: (value === null || value === void 0 ? void 0 : value.length) ? undefined : empty,
@@ -341,6 +343,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           onRow: function onRow() {
             return {
               disabled: disabled || virtualKey && !!editingKeys.length,
+              isShowCheckBox: isShowCheckBox,
               onClick: function onClick() {}
             };
           }

package/es/ProEditTable/style/index.less

@@ -71,6 +71,11 @@
       cursor: pointer;
     }
   }
+  .drag-wrapper.no-check {
+    .anticon {
+      margin-right: 0;
+    }
+  }
 
   &.pro-table-no-stripe {
     .@{ant-prefix}-table-tbody tr:nth-child(n)>td {

package/lib/ProEditTable/components/DndWrapper/index.d.ts

@@ -2,6 +2,7 @@ import React, { FC } from 'react';
 interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     'data-row-key': string;
     disabled?: boolean;
+    isShowCheckBox?: boolean;
 }
 export declare const Row: FC<RowProps>;
 declare const DndWrapper: ({ draggable, value, onChange, disabled, children }: {

package/lib/ProEditTable/components/DndWrapper/index.js

@@ -13,9 +13,10 @@ var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
 var _utilities = require("@dnd-kit/utilities");
 var _ProIcon = _interopRequireDefault(require("../../../ProIcon"));
-var _excluded = ["disabled", "children"];
+var _excluded = ["disabled", "isShowCheckBox", "children"];
 var Row = exports.Row = function Row(props) {
   var disabled = props.disabled,
+    isShowCheckBox = props.isShowCheckBox,
     children = props.children,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var data = (0, _sortable.useSortable)({
@@ -49,7 +50,7 @@ var Row = exports.Row = function Row(props) {
           renderIndex = _ref.renderIndex;
         return /*#__PURE__*/_react.default.cloneElement(child, {
           children: (0, _jsxRuntime.jsxs)("span", {
-            className: "drag-wrapper",
+            className: "drag-wrapper".concat(isShowCheckBox ? '' : ' no-check'),
             children: [(0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
               className: "drag-icon",
               style: {
@@ -58,7 +59,7 @@ var Row = exports.Row = function Row(props) {
               },
               type: "drag",
               size: 20
-            }, listeners)), render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+            }, listeners)), isShowCheckBox ? render === null || render === void 0 ? void 0 : render(null, record, renderIndex) : null]
           })
         });
       }

package/lib/ProEditTable/index.js

@@ -251,7 +251,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     if (disabled || isView) {
       return null;
     }
-    return isForbiddenBtn('mulDelete') ? rowSelection : _rowSelection;
+    return _rowSelection;
   };
   var setColumns = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
@@ -318,6 +318,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       rowSelection: renderRowSelection()
     });
   } : summary;
+  // 是否展示勾选框
+  var isShowCheckBox = !isForbiddenBtn('mulDelete');
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [(0, _jsxRuntime.jsxs)(_antd.ConfigProvider, {
       renderEmpty: (value === null || value === void 0 ? void 0 : value.length) ? undefined : empty,
@@ -344,6 +346,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           onRow: function onRow() {
             return {
               disabled: disabled || virtualKey && !!editingKeys.length,
+              isShowCheckBox: isShowCheckBox,
               onClick: function onClick() {}
             };
           }

package/lib/ProEditTable/style/index.less

@@ -71,6 +71,11 @@
       cursor: pointer;
     }
   }
+  .drag-wrapper.no-check {
+    .anticon {
+      margin-right: 0;
+    }
+  }
 
   &.pro-table-no-stripe {
     .@{ant-prefix}-table-tbody tr:nth-child(n)>td {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.10-beta.2",
+  "version": "3.4.10-beta.3",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",