@qn-pandora/pandora-component 2.2.1 → 3.0.2

package/lib/components/OptionList/style.css

@@ -527,100 +527,198 @@
   display: block;
   width: 8.48528137px;
   height: 8.48528137px;
+  overflow: hidden;
   background: transparent;
-  border-style: solid;
-  border-width: 4.24264069px;
-  -webkit-transform: rotate(45deg);
-          transform: rotate(45deg);
-}
-.ant-popover-placement-top > .ant-popover-content > .ant-popover-arrow,
-.ant-popover-placement-topLeft > .ant-popover-content > .ant-popover-arrow,
-.ant-popover-placement-topRight > .ant-popover-content > .ant-popover-arrow {
-  bottom: 6.2px;
-  border-top-color: transparent;
-  border-right-color: #ffffff;
-  border-bottom-color: #ffffff;
-  border-left-color: transparent;
+  pointer-events: none;
+}
+.ant-popover-arrow-content {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  display: block;
+  width: 6px;
+  height: 6px;
+  margin: auto;
+  background-color: #ffffff;
+  content: '';
+  pointer-events: auto;
+}
+.ant-popover-placement-top .ant-popover-arrow,
+.ant-popover-placement-topLeft .ant-popover-arrow,
+.ant-popover-placement-topRight .ant-popover-arrow {
+  bottom: 1.51471863px;
+}
+.ant-popover-placement-top .ant-popover-arrow-content,
+.ant-popover-placement-topLeft .ant-popover-arrow-content,
+.ant-popover-placement-topRight .ant-popover-arrow-content {
   -webkit-box-shadow: 3px 3px 7px rgba(0, 0, 0, 0.07);
           box-shadow: 3px 3px 7px rgba(0, 0, 0, 0.07);
+  -webkit-transform: translateY(-4.24264069px) rotate(45deg);
+          transform: translateY(-4.24264069px) rotate(45deg);
 }
-.ant-popover-placement-top > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-top .ant-popover-arrow {
   left: 50%;
-  -webkit-transform: translateX(-50%) rotate(45deg);
-          transform: translateX(-50%) rotate(45deg);
+  -webkit-transform: translateX(-50%);
+          transform: translateX(-50%);
 }
-.ant-popover-placement-topLeft > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-topLeft .ant-popover-arrow {
   left: 16px;
 }
-.ant-popover-placement-topRight > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-topRight .ant-popover-arrow {
   right: 16px;
 }
-.ant-popover-placement-right > .ant-popover-content > .ant-popover-arrow,
-.ant-popover-placement-rightTop > .ant-popover-content > .ant-popover-arrow,
-.ant-popover-placement-rightBottom > .ant-popover-content > .ant-popover-arrow {
-  left: 6px;
-  border-top-color: transparent;
-  border-right-color: transparent;
-  border-bottom-color: #ffffff;
-  border-left-color: #ffffff;
+.ant-popover-placement-right .ant-popover-arrow,
+.ant-popover-placement-rightTop .ant-popover-arrow,
+.ant-popover-placement-rightBottom .ant-popover-arrow {
+  left: 1.51471863px;
+}
+.ant-popover-placement-right .ant-popover-arrow-content,
+.ant-popover-placement-rightTop .ant-popover-arrow-content,
+.ant-popover-placement-rightBottom .ant-popover-arrow-content {
   -webkit-box-shadow: -3px 3px 7px rgba(0, 0, 0, 0.07);
           box-shadow: -3px 3px 7px rgba(0, 0, 0, 0.07);
+  -webkit-transform: translateX(4.24264069px) rotate(45deg);
+          transform: translateX(4.24264069px) rotate(45deg);
 }
-.ant-popover-placement-right > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-right .ant-popover-arrow {
   top: 50%;
-  -webkit-transform: translateY(-50%) rotate(45deg);
-          transform: translateY(-50%) rotate(45deg);
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
 }
-.ant-popover-placement-rightTop > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-rightTop .ant-popover-arrow {
   top: 12px;
 }
-.ant-popover-placement-rightBottom > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-rightBottom .ant-popover-arrow {
   bottom: 12px;
 }
-.ant-popover-placement-bottom > .ant-popover-content > .ant-popover-arrow,
-.ant-popover-placement-bottomLeft > .ant-popover-content > .ant-popover-arrow,
-.ant-popover-placement-bottomRight > .ant-popover-content > .ant-popover-arrow {
-  top: 6px;
-  border-top-color: #ffffff;
-  border-right-color: transparent;
-  border-bottom-color: transparent;
-  border-left-color: #ffffff;
+.ant-popover-placement-bottom .ant-popover-arrow,
+.ant-popover-placement-bottomLeft .ant-popover-arrow,
+.ant-popover-placement-bottomRight .ant-popover-arrow {
+  top: 1.51471863px;
+}
+.ant-popover-placement-bottom .ant-popover-arrow-content,
+.ant-popover-placement-bottomLeft .ant-popover-arrow-content,
+.ant-popover-placement-bottomRight .ant-popover-arrow-content {
   -webkit-box-shadow: -2px -2px 5px rgba(0, 0, 0, 0.06);
           box-shadow: -2px -2px 5px rgba(0, 0, 0, 0.06);
+  -webkit-transform: translateY(4.24264069px) rotate(45deg);
+          transform: translateY(4.24264069px) rotate(45deg);
 }
-.ant-popover-placement-bottom > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-bottom .ant-popover-arrow {
   left: 50%;
-  -webkit-transform: translateX(-50%) rotate(45deg);
-          transform: translateX(-50%) rotate(45deg);
+  -webkit-transform: translateX(-50%);
+          transform: translateX(-50%);
 }
-.ant-popover-placement-bottomLeft > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-bottomLeft .ant-popover-arrow {
   left: 16px;
 }
-.ant-popover-placement-bottomRight > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-bottomRight .ant-popover-arrow {
   right: 16px;
 }
-.ant-popover-placement-left > .ant-popover-content > .ant-popover-arrow,
-.ant-popover-placement-leftTop > .ant-popover-content > .ant-popover-arrow,
-.ant-popover-placement-leftBottom > .ant-popover-content > .ant-popover-arrow {
-  right: 6px;
-  border-top-color: #ffffff;
-  border-right-color: #ffffff;
-  border-bottom-color: transparent;
-  border-left-color: transparent;
+.ant-popover-placement-left .ant-popover-arrow,
+.ant-popover-placement-leftTop .ant-popover-arrow,
+.ant-popover-placement-leftBottom .ant-popover-arrow {
+  right: 1.51471863px;
+}
+.ant-popover-placement-left .ant-popover-arrow-content,
+.ant-popover-placement-leftTop .ant-popover-arrow-content,
+.ant-popover-placement-leftBottom .ant-popover-arrow-content {
   -webkit-box-shadow: 3px -3px 7px rgba(0, 0, 0, 0.07);
           box-shadow: 3px -3px 7px rgba(0, 0, 0, 0.07);
+  -webkit-transform: translateX(-4.24264069px) rotate(45deg);
+          transform: translateX(-4.24264069px) rotate(45deg);
 }
-.ant-popover-placement-left > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-left .ant-popover-arrow {
   top: 50%;
-  -webkit-transform: translateY(-50%) rotate(45deg);
-          transform: translateY(-50%) rotate(45deg);
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
 }
-.ant-popover-placement-leftTop > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-leftTop .ant-popover-arrow {
   top: 12px;
 }
-.ant-popover-placement-leftBottom > .ant-popover-content > .ant-popover-arrow {
+.ant-popover-placement-leftBottom .ant-popover-arrow {
   bottom: 12px;
 }
+.ant-popover-pink .ant-popover-inner {
+  background-color: #eb2f96;
+}
+.ant-popover-pink .ant-popover-arrow-content {
+  background-color: #eb2f96;
+}
+.ant-popover-magenta .ant-popover-inner {
+  background-color: #eb2f96;
+}
+.ant-popover-magenta .ant-popover-arrow-content {
+  background-color: #eb2f96;
+}
+.ant-popover-red .ant-popover-inner {
+  background-color: #f5222d;
+}
+.ant-popover-red .ant-popover-arrow-content {
+  background-color: #f5222d;
+}
+.ant-popover-volcano .ant-popover-inner {
+  background-color: #fa541c;
+}
+.ant-popover-volcano .ant-popover-arrow-content {
+  background-color: #fa541c;
+}
+.ant-popover-orange .ant-popover-inner {
+  background-color: #fa8c16;
+}
+.ant-popover-orange .ant-popover-arrow-content {
+  background-color: #fa8c16;
+}
+.ant-popover-yellow .ant-popover-inner {
+  background-color: #fadb14;
+}
+.ant-popover-yellow .ant-popover-arrow-content {
+  background-color: #fadb14;
+}
+.ant-popover-gold .ant-popover-inner {
+  background-color: #faad14;
+}
+.ant-popover-gold .ant-popover-arrow-content {
+  background-color: #faad14;
+}
+.ant-popover-cyan .ant-popover-inner {
+  background-color: #13c2c2;
+}
+.ant-popover-cyan .ant-popover-arrow-content {
+  background-color: #13c2c2;
+}
+.ant-popover-lime .ant-popover-inner {
+  background-color: #a0d911;
+}
+.ant-popover-lime .ant-popover-arrow-content {
+  background-color: #a0d911;
+}
+.ant-popover-green .ant-popover-inner {
+  background-color: #52c41a;
+}
+.ant-popover-green .ant-popover-arrow-content {
+  background-color: #52c41a;
+}
+.ant-popover-blue .ant-popover-inner {
+  background-color: #1890ff;
+}
+.ant-popover-blue .ant-popover-arrow-content {
+  background-color: #1890ff;
+}
+.ant-popover-geekblue .ant-popover-inner {
+  background-color: #2f54eb;
+}
+.ant-popover-geekblue .ant-popover-arrow-content {
+  background-color: #2f54eb;
+}
+.ant-popover-purple .ant-popover-inner {
+  background-color: #722ed1;
+}
+.ant-popover-purple .ant-popover-arrow-content {
+  background-color: #722ed1;
+}
 .ant-popover-rtl {
   direction: rtl;
   text-align: right;

package/lib/components/RangeInput/style.css

@@ -132,8 +132,8 @@ textarea.ant-input-affix-wrapper {
   outline: none;
 }
 .ant-input-affix-wrapper > input.ant-input:focus {
-  -webkit-box-shadow: none;
-          box-shadow: none;
+  -webkit-box-shadow: none !important;
+          box-shadow: none !important;
 }
 .ant-input-affix-wrapper::before {
   width: 0;
@@ -158,7 +158,7 @@ textarea.ant-input-affix-wrapper {
 .ant-input-suffix {
   margin-left: 4px;
 }
-.ant-input-clear-icon {
+.anticon.ant-input-clear-icon {
   margin: 0 4px;
   color: rgba(0, 0, 0, 0.25);
   font-size: 12px;
@@ -167,16 +167,16 @@ textarea.ant-input-affix-wrapper {
   -webkit-transition: color 0.3s;
   transition: color 0.3s;
 }
-.ant-input-clear-icon:hover {
+.anticon.ant-input-clear-icon:hover {
   color: rgba(0, 0, 0, 0.45);
 }
-.ant-input-clear-icon:active {
+.anticon.ant-input-clear-icon:active {
   color: rgba(0, 0, 0, 0.65);
 }
-.ant-input-clear-icon-hidden {
+.anticon.ant-input-clear-icon-hidden {
   visibility: hidden;
 }
-.ant-input-clear-icon:last-child {
+.anticon.ant-input-clear-icon:last-child {
   margin-right: 0;
 }
 .ant-input-affix-wrapper-textarea-with-clear-btn {
@@ -391,6 +391,16 @@ textarea.ant-input {
 .ant-input-group-addon .ant-select-focused .ant-select-selector {
   color: #7a869a;
 }
+.ant-input-group-addon .ant-cascader-picker {
+  margin: -9px -12px;
+  background-color: transparent;
+}
+.ant-input-group-addon .ant-cascader-picker .ant-cascader-input {
+  text-align: left;
+  border: 0;
+  -webkit-box-shadow: none;
+          box-shadow: none;
+}
 .ant-input-group > .ant-input:first-child,
 .ant-input-group-addon:first-child {
   border-top-right-radius: 0;
@@ -870,6 +880,7 @@ textarea.ant-input-number {
   font-weight: bold;
   line-height: 0;
   text-align: center;
+  border-left: 1px solid #e5e5e5;
   -webkit-transition: all 0.1s linear;
   transition: all 0.1s linear;
 }
@@ -1016,7 +1027,6 @@ textarea.ant-input-number {
   width: 22px;
   height: 100%;
   background: #ffffff;
-  border-left: 1px solid #e5e5e5;
   border-radius: 0 2px 2px 0;
   opacity: 0;
   -webkit-transition: opacity 0.24s linear 0.1s;

package/lib/components/RemarkName/index.d.ts

@@ -4,8 +4,6 @@ export interface IRemarkName {
     name: string;
     /** 备注 */
     remark?: string;
-    /** 名称展示最大长度 */
-    length: number;
 }
 export declare const IgnoreDesString = "\u7531logkit";
 /**

package/lib/components/RemarkName/index.js

@@ -11,20 +11,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = __importStar(require("react"));
-var style_1 = require("../../constants/style");
 var NameLimiter_1 = __importDefault(require("../../components/NameLimiter"));
 exports.IgnoreDesString = '由logkit';
 /**
  * 资源名称展示位'名称(备注)'
  */
 function RemarkName(props) {
-    var name = props.name, remark = props.remark, length = props.length;
+    var name = props.name, remark = props.remark;
     var getTooltip = function () {
         return remark && remark !== name && !remark.startsWith(exports.IgnoreDesString)
             ? name + "(" + (remark && remark.trim()) + ")"
             : '';
     };
-    return (React.createElement("span", { className: style_1.SDK_PREFIX + "-remark-name" },
-        React.createElement(NameLimiter_1.default, { name: name, title: getTooltip(), length: length })));
+    return React.createElement(NameLimiter_1.default, { name: name, title: getTooltip() });
 }
 exports.default = RemarkName;

package/lib/components/RemarkName/style.css

@@ -262,7 +262,15 @@
 .ant-tooltip-rtl .ant-tooltip-inner {
   text-align: right;
 }
-.pandora-sdk-name-tooltip .ant-tooltip-inner {
+.pandora-sdk-name-limit {
+  max-width: 100%;
+  display: inline-block;
+  vertical-align: top;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+.pandora-sdk-name-limit-tooltip .ant-tooltip-inner {
   max-width: 400px !important;
   max-height: 200px !important;
   overflow: auto;
@@ -275,7 +283,3 @@
 .ant-btn-sm {
   padding: 0 7px;
 }
-.pandora-sdk-remark-name {
-  word-break: break-all;
-  white-space: nowrap;
-}

package/lib/components/RemarkName/style.less

@@ -1,7 +1,2 @@
 @import '../NameLimiter/style.less';
 @import '../../style/theme.less';
-
-.@{sdk-prefix}-remark-name {
-  word-break: break-all;
-  white-space: nowrap;
-}

package/lib/components/Selector/style.css

@@ -457,7 +457,7 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   position: absolute;
-  top: 53%;
+  top: 50%;
   right: 11px;
   width: 12px;
   height: 12px;
@@ -638,6 +638,9 @@
   color: rgba(0, 0, 0, 0.25);
   cursor: not-allowed;
 }
+.ant-select-item-option-disabled.ant-select-item-option-selected {
+  background-color: #f5f5f5;
+}
 .ant-select-item-option-grouped {
   padding-left: 24px;
 }

package/lib/components/SolidRadioGroup/index.js

@@ -17,7 +17,7 @@ var classnames_1 = __importDefault(require("classnames"));
 var style_1 = require("../../constants/style");
 var useCallback = React.useCallback, useMemo = React.useMemo;
 function SolidRadioGroup(props) {
-    var className = props.className, buttonClassName = props.buttonClassName, value = props.value, size = props.size, onChange = props.onChange, children = props.children, _a = props.options, options = _a === void 0 ? {} : _a;
+    var className = props.className, buttonClassName = props.buttonClassName, value = props.value, size = props.size, onChange = props.onChange, children = props.children, disabled = props.disabled, _a = props.options, options = _a === void 0 ? {} : _a;
     var handleChange = useCallback(function (e) {
         if (onChange) {
             onChange(e.target.value);
@@ -31,8 +31,11 @@ function SolidRadioGroup(props) {
     return (React.createElement(radio_1.default.Group, { className: classnames_1.default(style_1.SDK_PREFIX + "-solid-radio-group", className), value: value, onChange: handleChange, size: size },
         radioOptions.map(function (option) {
             var _a;
-            var value = option.value, item = option.item, disabled = option.disabled;
-            return (React.createElement(radio_1.default.Button, { key: value.toString(), value: value, disabled: disabled, className: classnames_1.default((_a = {}, _a[style_1.SDK_PREFIX + "-solid-radio-item"] = !disabled, _a), buttonClassName) }, item));
+            var value = option.value, item = option.item;
+            var disableRealVal = lodash_1.isUndefined(option.disabled)
+                ? disabled
+                : option.disabled;
+            return (React.createElement(radio_1.default.Button, { key: value.toString(), value: value, disabled: disableRealVal, className: classnames_1.default((_a = {}, _a[style_1.SDK_PREFIX + "-solid-radio-item"] = !disableRealVal, _a), buttonClassName) }, item));
         }),
         children));
 }

package/lib/components/SolidRadioGroup/style.css

@@ -16,7 +16,6 @@
           font-feature-settings: 'tnum';
   display: inline-block;
   font-size: 0;
-  line-height: unset;
 }
 .ant-radio-group .ant-badge-count {
   z-index: 1;
@@ -399,6 +398,10 @@ span.ant-radio + * {
   border-color: #2c6dd2 !important;
   color: #2c6dd2 !important;
 }
+.pandora-sdk-solid-radio-group .ant-radio-button-wrapper-checked.ant-radio-button-wrapper-disabled {
+  border-color: #bfbfbf !important;
+  color: #333 !important;
+}
 .pandora-sdk-solid-radio-group .ant-radio-button-wrapper:not(:first-child)::before {
   background-color: #bfbfbf;
 }

package/lib/components/SolidRadioGroup/style.less

@@ -18,6 +18,11 @@
     color: @theme-color !important;
   }
 
+  .@{ant-prefix}-radio-button-wrapper-checked.@{ant-prefix}-radio-button-wrapper-disabled {
+    border-color: @input-border-color !important;
+    color: @heading-color!important;
+  }
+
   .@{ant-prefix}-radio-button-wrapper {
     &:not(:first-child) {
       &::before {

package/lib/components/Steps/index.js

@@ -80,6 +80,6 @@ function Steps(props) {
             }),
             children)));
 }
-exports.default = Steps;
 Steps.Step = Step_1.default;
 Steps.ControlButton = ControlButton_1.default;
+exports.default = Steps;

package/lib/components/Table/index.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { TableProps } from 'antd/es/table';
+import { TableRowSelection } from 'antd/es/table/interface';
 /**
  * 表格提供自定义多选, 通过 rowSelection对象的selectedRowKeys和onChange来控制多选的状态
  * 需要注意的是, 当在外部进行增删改或者外部需要控制选择状态时, 例如删除之后清空全选状态, 需要受控
@@ -17,7 +18,7 @@ export interface IOptionItem {
     /**
      * 禁用当前操作
      */
-    disabled?: boolean;
+    disabled?: boolean | ((selectItems: any[]) => boolean);
 }
 export interface ITableProps<T> extends TableProps<T> {
     /**
@@ -32,7 +33,7 @@ export interface ITableProps<T> extends TableProps<T> {
 /**
  * pandora2.0风格的表格
  */
-export default class Table<T = any> extends React.Component<ITableProps<T>, any> {
+declare class Table<T = any> extends React.Component<ITableProps<T>, any> {
     static Column: typeof import("antd/lib/table/Column").default;
     static ColumnTag: (props: {
         tags: any[];
@@ -43,35 +44,19 @@ export default class Table<T = any> extends React.Component<ITableProps<T>, any>
     checkAll: boolean;
     UNSAFE_componentWillReceiveProps(nextProps: ITableProps<T>): void;
     get selectedRowKeys(): React.ReactText[];
-    get rowSelection(): {
-        selectedRowKeys: React.ReactText[];
-        onChange: (selectedRowKeys: string[] | number[], selectedRowsOfCurrentPage: any[]) => void;
-        preserveSelectedRowKeys?: boolean | undefined;
-        type?: "checkbox" | "radio" | undefined;
-        defaultSelectedRowKeys?: React.ReactText[] | undefined;
-        getCheckboxProps?: ((record: T) => Partial<Pick<import("antd/es/checkbox").CheckboxProps, "type" | "onClick" | "className" | "id" | "style" | "tabIndex" | "children" | "onChange" | "onKeyDown" | "onKeyPress" | "onMouseEnter" | "onMouseLeave" | "autoFocus" | "disabled" | "name" | "value" | "prefixCls" | "indeterminate" | "skipGroup">>) | undefined;
-        onSelect?: import("antd/es/table/interface").SelectionSelectFn<T> | undefined;
-        onSelectMultiple?: ((selected: boolean, selectedRows: T[], changeRows: T[]) => void) | undefined;
-        onSelectAll?: ((selected: boolean, selectedRows: T[], changeRows: T[]) => void) | undefined;
-        onSelectInvert?: ((selectedRowKeys: React.ReactText[]) => void) | undefined;
-        onSelectNone?: (() => void) | undefined;
-        selections?: boolean | import("antd/es/table/hooks/useSelection").INTERNAL_SELECTION_ITEM[] | undefined;
-        hideSelectAll?: boolean | undefined;
-        fixed?: boolean | undefined;
-        columnWidth?: string | number | undefined;
-        columnTitle?: React.ReactNode;
-        checkStrictly?: boolean | undefined;
-        renderCell?: ((value: boolean, record: T, index: number, originNode: React.ReactNode) => string | number | boolean | {} | React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | React.ReactNodeArray | React.ReactPortal | import("rc-table/lib/interface").RenderedCell<T> | null | undefined) | undefined;
-    } | undefined;
+    get rowSelection(): TableRowSelection<T> | undefined;
+    get undisabledData(): readonly T[];
     get keysOfCurrentPage(): any[];
     getRowKey(row: any, index: number): any;
     setIndeterminate(indeterminate: boolean): void;
     setCheckAll(checkAll: boolean): void;
     setCheckboxStatus(selectedRowsOfCurrentPage?: T[], dataSource?: T[]): void;
-    handleSelectionChange(selectedRowKeys: string[] | number[], selectedRowsOfCurrentPage: any[]): void;
-    onRowSelectionChange(selectedRowKeys: string[] | number[], selectedRowsOfCurrentPage: any[]): void;
+    handleSelectionChange(selectedRowKeys: React.Key[], selectedRowsOfCurrentPage: any[]): void;
+    onRowSelectionChange(selectedRowKeys: React.Key[], selectedRowsOfCurrentPage: any[]): void;
     handleCheckAllChange(e: any): void;
     handleBatchOptionClick(option: IOptionItem): void;
     getRowClassName(record: any, index: number, indent: number): string;
+    getDisabledStatus(option: IOptionItem): boolean | undefined;
     render(): JSX.Element;
 }
+export default Table;

package/lib/components/Table/index.js

@@ -138,10 +138,23 @@ var Table = /** @class */ (function (_super) {
         enumerable: true,
         configurable: true
     });
+    Object.defineProperty(Table.prototype, "undisabledData", {
+        get: function () {
+            var _a = this.props, dataSource = _a.dataSource, rowSelection = _a.rowSelection;
+            var getCheckboxProps = (rowSelection || {}).getCheckboxProps;
+            var undisabledData = dataSource || [];
+            if (getCheckboxProps) {
+                // 如果checkbox有disabled的，要去掉这些rowItem
+                undisabledData = undisabledData.filter(function (data) { return !getCheckboxProps(data).disabled; });
+            }
+            return undisabledData;
+        },
+        enumerable: true,
+        configurable: true
+    });
     Object.defineProperty(Table.prototype, "keysOfCurrentPage", {
         get: function () {
-            var dataSource = this.props.dataSource;
-            return (dataSource || []).map(this.getRowKey);
+            return this.undisabledData.map(this.getRowKey);
         },
         enumerable: true,
         configurable: true
@@ -217,19 +230,29 @@ var Table = /** @class */ (function (_super) {
             ? rowClassName
             : rowClassName(record, index, indent));
     };
+    Table.prototype.getDisabledStatus = function (option) {
+        var noneSelected = this.selectedRowKeys.length === 0;
+        var disabled = typeof option.disabled === 'function'
+            ? option.disabled(__spread(this.undisabledData))
+            : option.disabled;
+        return noneSelected || disabled;
+    };
     Table.prototype.render = function () {
         var _a, _b;
         var _this = this;
         var _c = this.props, className = _c.className, batchOptions = _c.batchOptions, scroll = _c.scroll, restProps = __rest(_c, ["className", "batchOptions", "scroll"]);
         return (React.createElement("div", null,
-            React.createElement(antd_1.Table, __assign({ scroll: scroll }, restProps, { className: classnames_1.default(style_1.SDK_PREFIX + "-table-wrapper", (_a = {}, _a[style_1.SDK_PREFIX + "-table-scrollX"] = lodash_1.get(scroll, 'x'), _a), (_b = {}, _b[style_1.SDK_PREFIX + "-table-scrollY"] = lodash_1.get(scroll, 'y'), _b), className), rowSelection: batchOptions && this.props.rowSelection
+            React.createElement(antd_1.Table, __assign({ scroll: scroll }, restProps, { className: classnames_1.default(style_1.SDK_PREFIX + "-table-wrapper", (_a = {}, _a[style_1.SDK_PREFIX + "-table-scrollX"] = lodash_1.get(scroll, 'x'), _a), (_b = {}, _b[style_1.SDK_PREFIX + "-table-scrollY"] = lodash_1.get(scroll, 'y'), _b), className), 
+                // 涉及到权限
+                // getCheckboxProps只能放到tableBatchWrapper里，因为selectedRowKeys在那个组件计算
+                rowSelection: batchOptions && this.props.rowSelection
                     ? this.rowSelection
                     : this.props.rowSelection, rowClassName: this.getRowClassName })),
             this.props.batchOptions &&
                 this.props.rowSelection &&
                 this.props.dataSource &&
                 this.props.dataSource.length > 0 ? (React.createElement("div", { className: style_1.SDK_PREFIX + "-table-batch-opt" },
-                React.createElement(antd_1.Checkbox, { indeterminate: this.indeterminate, onChange: this.handleCheckAllChange, checked: this.checkAll, disabled: lodash_1.size(this.props.dataSource) === 0 }),
+                React.createElement(antd_1.Checkbox, { indeterminate: this.indeterminate, onChange: this.handleCheckAllChange, checked: this.checkAll, disabled: lodash_1.size(this.undisabledData) === 0 }),
                 React.createElement("span", { className: style_1.SDK_PREFIX + "-table-batch-opt-label" },
                     "\u5DF2\u9009 ",
                     this.selectedRowKeys.length),
@@ -237,9 +260,7 @@ var Table = /** @class */ (function (_super) {
                     var _a;
                     return (React.createElement("span", { key: index, className: classnames_1.default((_a = {},
                             _a[style_1.SDK_PREFIX + "-table-batch-opt-item"] = true,
-                            _a[style_1.SDK_PREFIX + "-table-batch-opt-disabled"] = lodash_1.isUndefined(option.disabled)
-                                ? _this.selectedRowKeys.length === 0
-                                : option.disabled,
+                            _a[style_1.SDK_PREFIX + "-table-batch-opt-disabled"] = _this.getDisabledStatus(option),
                             _a)), onClick: function () { return _this.handleBatchOptionClick(option); } }, option.text));
                 })))) : null));
     };
@@ -263,6 +284,11 @@ var Table = /** @class */ (function (_super) {
         __metadata("design:type", Object),
         __metadata("design:paramtypes", [])
     ], Table.prototype, "rowSelection", null);
+    __decorate([
+        mobx_1.computed,
+        __metadata("design:type", Object),
+        __metadata("design:paramtypes", [])
+    ], Table.prototype, "undisabledData", null);
     __decorate([
         mobx_1.computed,
         __metadata("design:type", Object),
@@ -324,6 +350,12 @@ var Table = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object, Number, Number]),
         __metadata("design:returntype", void 0)
     ], Table.prototype, "getRowClassName", null);
+    __decorate([
+        bind_1.default,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], Table.prototype, "getDisabledStatus", null);
     Table = __decorate([
         mobx_react_1.observer
     ], Table);