@qn-pandora/pandora-component 2.2.1 → 3.0.2

package/es/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/es/components/SolidRadioGroup/index.js

@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { isArray } from 'lodash';
+import { isArray, isUndefined } from 'lodash';
 import Radio from 'antd/es/radio';
 import classnames from 'classnames';
 import { SDK_PREFIX } from '../../constants/style';
 var useCallback = React.useCallback, useMemo = React.useMemo;
 export default 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);
@@ -19,8 +19,11 @@ export default function SolidRadioGroup(props) {
     return (React.createElement(Radio.Group, { className: classnames(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.Button, { key: value.toString(), value: value, disabled: disabled, className: classnames((_a = {}, _a[SDK_PREFIX + "-solid-radio-item"] = !disabled, _a), buttonClassName) }, item));
+            var value = option.value, item = option.item;
+            var disableRealVal = isUndefined(option.disabled)
+                ? disabled
+                : option.disabled;
+            return (React.createElement(Radio.Button, { key: value.toString(), value: value, disabled: disableRealVal, className: classnames((_a = {}, _a[SDK_PREFIX + "-solid-radio-item"] = !disableRealVal, _a), buttonClassName) }, item));
         }),
         children));
 }

package/es/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/es/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/es/components/Steps/index.js

@@ -44,7 +44,7 @@ import Step from './Step';
 import ControlButton from './ControlButton';
 import { Provider } from './context';
 var useMemo = React.useMemo, useState = React.useState, useCallback = React.useCallback;
-export default function Steps(props) {
+function Steps(props) {
     var _a = __read(useState(0), 2), stepLength = _a[0], setStepLength = _a[1];
     var current = props.current, _b = props.steps, steps = _b === void 0 ? [] : _b, className = props.className, children = props.children, otherProps = __rest(props, ["current", "steps", "className", "children"]);
     var handleAddSteps = useCallback(function () {
@@ -70,3 +70,4 @@ export default function Steps(props) {
 }
 Steps.Step = Step;
 Steps.ControlButton = ControlButton;
+export default Steps;

package/es/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/es/components/Table/index.js

@@ -66,7 +66,7 @@ import * as React from 'react';
 import { Table as AntTable, Checkbox } from 'antd';
 import classnames from 'classnames';
 import { observable, action, computed } from 'mobx';
-import { size, xor, union, unionBy, differenceBy, get, isUndefined } from 'lodash';
+import { size, xor, union, unionBy, differenceBy, get } from 'lodash';
 import { observer } from 'mobx-react';
 import bind from '../../utils/bind';
 import { SDK_PREFIX } from '../../constants/style';
@@ -126,10 +126,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
@@ -205,19 +218,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(AntTable, __assign({ scroll: scroll }, restProps, { className: classnames(SDK_PREFIX + "-table-wrapper", (_a = {}, _a[SDK_PREFIX + "-table-scrollX"] = get(scroll, 'x'), _a), (_b = {}, _b[SDK_PREFIX + "-table-scrollY"] = get(scroll, 'y'), _b), className), rowSelection: batchOptions && this.props.rowSelection
+            React.createElement(AntTable, __assign({ scroll: scroll }, restProps, { className: classnames(SDK_PREFIX + "-table-wrapper", (_a = {}, _a[SDK_PREFIX + "-table-scrollX"] = get(scroll, 'x'), _a), (_b = {}, _b[SDK_PREFIX + "-table-scrollY"] = 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: SDK_PREFIX + "-table-batch-opt" },
-                React.createElement(Checkbox, { indeterminate: this.indeterminate, onChange: this.handleCheckAllChange, checked: this.checkAll, disabled: size(this.props.dataSource) === 0 }),
+                React.createElement(Checkbox, { indeterminate: this.indeterminate, onChange: this.handleCheckAllChange, checked: this.checkAll, disabled: size(this.undisabledData) === 0 }),
                 React.createElement("span", { className: SDK_PREFIX + "-table-batch-opt-label" },
                     "\u5DF2\u9009 ",
                     this.selectedRowKeys.length),
@@ -225,9 +248,7 @@ var Table = /** @class */ (function (_super) {
                     var _a;
                     return (React.createElement("span", { key: index, className: classnames((_a = {},
                             _a[SDK_PREFIX + "-table-batch-opt-item"] = true,
-                            _a[SDK_PREFIX + "-table-batch-opt-disabled"] = isUndefined(option.disabled)
-                                ? _this.selectedRowKeys.length === 0
-                                : option.disabled,
+                            _a[SDK_PREFIX + "-table-batch-opt-disabled"] = _this.getDisabledStatus(option),
                             _a)), onClick: function () { return _this.handleBatchOptionClick(option); } }, option.text));
                 })))) : null));
     };
@@ -251,6 +272,11 @@ var Table = /** @class */ (function (_super) {
         __metadata("design:type", Object),
         __metadata("design:paramtypes", [])
     ], Table.prototype, "rowSelection", null);
+    __decorate([
+        computed,
+        __metadata("design:type", Object),
+        __metadata("design:paramtypes", [])
+    ], Table.prototype, "undisabledData", null);
     __decorate([
         computed,
         __metadata("design:type", Object),
@@ -312,6 +338,12 @@ var Table = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object, Number, Number]),
         __metadata("design:returntype", void 0)
     ], Table.prototype, "getRowClassName", null);
+    __decorate([
+        bind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], Table.prototype, "getDisabledStatus", null);
     Table = __decorate([
         observer
     ], Table);

package/es/components/Table/style.css

@@ -54,9 +54,7 @@
   border-bottom: 0;
 }
 .ant-table.ant-table-bordered > .ant-table-container {
-  border: 1px solid #ebecf0;
-  border-right: 0;
-  border-bottom: 0;
+  border-left: 1px solid #ebecf0;
 }
 .ant-table.ant-table-bordered > .ant-table-container > .ant-table-content > table > thead > tr > th,
 .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table > thead > tr > th,
@@ -119,6 +117,10 @@
   border-right: 1px solid #ebecf0;
   content: '';
 }
+.ant-table.ant-table-bordered > .ant-table-container > .ant-table-content > table,
+.ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table {
+  border-top: 1px solid #ebecf0;
+}
 .ant-table.ant-table-bordered.ant-table-scroll-horizontal > .ant-table-container > .ant-table-body > table > tbody > tr.ant-table-expanded-row > td,
 .ant-table.ant-table-bordered.ant-table-scroll-horizontal > .ant-table-container > .ant-table-body > table > tbody > tr.ant-table-placeholder > td {
   border-right: 0;
@@ -274,6 +276,8 @@
   background: #2a69ca;
 }
 .ant-table-summary {
+  position: relative;
+  z-index: 2;
   background: #ffffff;
 }
 div.ant-table-summary {
@@ -744,6 +748,7 @@ tr.ant-table-expanded-row .ant-descriptions-view table {
 .ant-table-sticky-holder {
   position: sticky;
   z-index: 3;
+  background: #ffffff;
 }
 .ant-table-sticky-scroll {
   position: sticky;
@@ -1340,11 +1345,10 @@ textarea.ant-pagination-options-quick-jumper input {
   cursor: not-allowed;
 }
 .ant-pagination.ant-pagination-disabled .ant-pagination-item-active {
-  background: #dbdbdb;
-  border-color: transparent;
+  background: #e6e6e6;
 }
 .ant-pagination.ant-pagination-disabled .ant-pagination-item-active a {
-  color: #fff;
+  color: rgba(0, 0, 0, 0.25);
 }
 .ant-pagination.ant-pagination-disabled .ant-pagination-item-link {
   color: rgba(0, 0, 0, 0.25);

package/es/components/Tabs/style.css

@@ -60,8 +60,15 @@
 .ant-tabs-rtl.ant-tabs-card.ant-tabs-bottom > .ant-tabs-nav .ant-tabs-tab + .ant-tabs-tab,
 .ant-tabs-rtl.ant-tabs-card.ant-tabs-top > div > .ant-tabs-nav .ant-tabs-tab + .ant-tabs-tab,
 .ant-tabs-rtl.ant-tabs-card.ant-tabs-bottom > div > .ant-tabs-nav .ant-tabs-tab + .ant-tabs-tab {
-  margin-right: 0;
-  margin-left: 2px;
+  margin-right: 2px;
+  margin-left: 0;
+}
+.ant-tabs-rtl.ant-tabs-card.ant-tabs-top > .ant-tabs-nav .ant-tabs-nav-add,
+.ant-tabs-rtl.ant-tabs-card.ant-tabs-bottom > .ant-tabs-nav .ant-tabs-nav-add,
+.ant-tabs-rtl.ant-tabs-card.ant-tabs-top > div > .ant-tabs-nav .ant-tabs-nav-add,
+.ant-tabs-rtl.ant-tabs-card.ant-tabs-bottom > div > .ant-tabs-nav .ant-tabs-nav-add {
+  margin-right: 2px;
+  margin-left: 0;
 }
 .ant-tabs-dropdown-rtl {
   direction: rtl;
@@ -538,6 +545,7 @@
 .ant-tabs > .ant-tabs-nav .ant-tabs-nav-add,
 .ant-tabs > div > .ant-tabs-nav .ant-tabs-nav-add {
   min-width: 40px;
+  margin-left: 2px;
   padding: 0 8px;
   background: #fafafa;
   border: 1px solid #e5e5e5;

package/es/components/TagList/Tag/style.css

@@ -9,7 +9,7 @@
   line-height: 24px;
   margin-right: 8px;
   border-radius: 1px;
-  color: #42526e;
+  color: #333;
   text-align: center;
   vertical-align: middle;
   border-radius: 2px;
@@ -47,8 +47,8 @@
   border-left: 1px solid rgba(44, 109, 210, 0.1);
 }
 .pandora-sdk-root .pandora-sdk-content {
-  padding: 0 4px;
-  max-width: 200px;
+  padding: 0 8px;
+  max-width: 150px;
   vertical-align: middle;
   overflow: hidden;
   white-space: nowrap;

package/es/components/TagList/Tag/style.less

@@ -5,7 +5,7 @@
   line-height: 24px;
   margin-right: 8px;
   border-radius: 1px;
-  color: @font-color-2;
+  color: @font-color-7;
   text-align: center;
   vertical-align: middle;
   border-radius: @border-radius-base;
@@ -45,8 +45,8 @@
   }
 
   .@{sdk-prefix}-content {
-    padding: 0 4px;
-    max-width: 200px;
+    padding: 0 8px;
+    max-width: 150px;
     vertical-align: middle;
     overflow: hidden;
     white-space: nowrap;

package/es/components/TagList/index.js

@@ -26,7 +26,7 @@ import { MoreCircle } from '@qn-pandora/pandora-component-icons';
 import Tag from './Tag';
 import TagSwitch from './TagSwitch';
 import { SDK_PREFIX } from '../../constants/style';
-export default function TagList(props) {
+function TagList(props) {
     var _a = props.mode, mode = _a === void 0 ? 'tag' : _a, className = props.className;
     var handleSwitchChange = function (active, value) {
         var values = props.values, onChange = props.onChange;
@@ -57,10 +57,11 @@ export default function TagList(props) {
         }
         return (React.createElement("div", { className: classnames(SDK_PREFIX + "-simplify", props.className) },
             React.Children.toArray(children).slice(0, simplifyTo),
-            React.createElement(Popover, { content: React.createElement("div", { className: SDK_PREFIX + "-popover" }, children), getPopupContainer: getPopupContainer },
+            React.createElement(Popover, { content: React.createElement("div", { className: SDK_PREFIX + "-popover" }, React.Children.toArray(children).slice(simplifyTo, childSize)), getPopupContainer: getPopupContainer },
                 React.createElement(MoreCircle, { className: SDK_PREFIX + "-icon" }))));
     };
     return (React.createElement("div", { className: classnames(SDK_PREFIX + "-taglist-containter", className) }, mode === 'tag' ? getTagList() : getTagSwitchList()));
 }
 TagList.Tag = Tag;
 TagList.TagSwitch = TagSwitch;
+export default TagList;

package/es/components/TagList/style.css

@@ -266,12 +266,12 @@
 .pandora-sdk-taglist-containter .pandora-sdk-simplify .pandora-sdk-icon:hover {
   color: #7a869a;
 }
-.pandora-sdk-taglist-containter .pandora-sdk-popover {
+.pandora-sdk-popover {
   max-width: 400px;
   max-height: 1000px;
   overflow: auto;
-  padding: 16px;
+  padding: 8px !important;
 }
-.pandora-sdk-taglist-containter .pandora-sdk-popover > div {
+.pandora-sdk-popover > div {
   margin: 4px;
 }

package/es/components/TagList/style.less

@@ -15,14 +15,14 @@
       }
     }
   }
+}
 
-  .@{sdk-prefix}-popover {
-    max-width: 400px;
-    max-height: 1000px;
-    overflow: auto;
-    padding: 16px;
-    > div {
-      margin: 4px;
-    }
+.@{sdk-prefix}-popover {
+  max-width: 400px;
+  max-height: 1000px;
+  overflow: auto;
+  padding: 8px !important;
+  > div {
+    margin: 4px;
   }
 }