@autobest-ui/components 1.1.2 → 1.1.9

package/lib/table/__stories__/style.scss

@@ -1,34 +1,34 @@
-.table-demo {
-  thead {
-    background-color: #2b5797;
-    color: #fff;
-  }
-
-  tbody tr {
-    &.ab-table-expand-row {
-      background-color: #fafafa;
-    }
-
-    &:hover {
-      background-color: #f3f3f3;
-    }
-  }
-
-  th, td {
-    padding: .16rem;
-    border-bottom: 1px solid #D0D0D0;
-
-    &.ab-table-checkbox {
-      padding: .16rem 0;
-    }
-  }
-
-  .merged-cell {
-    border-left: 1px solid #D0D0D0;
-    border-right: 1px solid #D0D0D0;
-  }
-}
-
-.table-demo-expanded {
-  font-size: .2rem;
+.table-demo {
+  thead {
+    background-color: #2b5797;
+    color: #fff;
+  }
+
+  tbody tr {
+    &.ab-table-expand-row {
+      background-color: #fafafa;
+    }
+
+    &:hover {
+      background-color: #f3f3f3;
+    }
+  }
+
+  th, td {
+    padding: .16rem;
+    border-bottom: 1px solid #D0D0D0;
+
+    &.ab-table-checkbox {
+      padding: .16rem 0;
+    }
+  }
+
+  .merged-cell {
+    border-left: 1px solid #D0D0D0;
+    border-right: 1px solid #D0D0D0;
+  }
+}
+
+.table-demo-expanded {
+  font-size: .2rem;
 }

package/lib/table/body/BodyRow.d.ts

@@ -1,13 +1,19 @@
 import React from 'react';
-import { Column } from '../interface';
+import { TableColumnInfo } from '../interface';
 export interface BodyRowProps<T> {
     className?: string;
     prefixCls: string;
     rowData: T;
     index: number;
-    columns: Column<T>[];
+    columns: TableColumnInfo<T>[];
     indent: number;
     CheckCell: React.ReactElement;
+    isExpand?: boolean;
+}
+declare function BodyRow<RowDataType>({ className, prefixCls: cls, rowData, index, columns, indent, CheckCell, isExpand }: BodyRowProps<RowDataType>): JSX.Element;
+declare namespace BodyRow {
+    var defaultProps: {
+        isExpand: boolean;
+    };
 }
-declare function BodyRow<RowDataType>({ className, prefixCls: cls, rowData, index, columns, indent, CheckCell }: BodyRowProps<RowDataType>): JSX.Element;
 export default BodyRow;

package/lib/table/body/BodyRow.js

@@ -51,7 +51,8 @@ function BodyRow(_a) {
       index = _a.index,
       columns = _a.columns,
       indent = _a.indent,
-      CheckCell = _a.CheckCell;
+      CheckCell = _a.CheckCell,
+      isExpand = _a.isExpand;
 
   var indentCell = _react.default.useMemo(function () {
     return getIndentCol(cls, indent);
@@ -83,7 +84,7 @@ function BodyRow(_a) {
       rowSpan: rowSpan === undefined ? 1 : rowSpan
     });
 
-    if (cellInfo.colSpan === 0 || cellInfo.rowSpan === 0 || !cellInfo.content) {
+    if (cellInfo.colSpan === 0 || cellInfo.rowSpan === 0 || isExpand && !cellInfo.content) {
       return;
     }
 
@@ -104,5 +105,8 @@ function BodyRow(_a) {
   return null;
 }
 
+BodyRow.defaultProps = {
+  isExpand: false
+};
 var _default = BodyRow;
 exports.default = _default;

package/lib/table/body/index.d.ts

@@ -1,12 +1,12 @@
 import React, { ReactText } from 'react';
 import { BodyRowProps } from './BodyRow';
 import { BodyCheckIconProps, BodyRowSelectionInfo } from './CheckIcon';
-import { ColumnOnRenderReturnObjectInfo } from '../interface';
+import { TableColumnOnRenderReturnObjectInfo } from '../interface';
 /**
  * 可展开子列表
  */
 export interface TableExpandableInfo<T> {
-    expandedRowRender: (rowData: T, index: number) => React.ReactNode | React.ReactNode[] | ColumnOnRenderReturnObjectInfo;
+    expandedRowRender: (rowData: T, index: number) => React.ReactNode | React.ReactNode[] | TableColumnOnRenderReturnObjectInfo;
 }
 export interface BodyProps<T> extends Pick<BodyRowProps<T>, 'prefixCls' | 'columns'>, Pick<BodyCheckIconProps<T>, 'selectedRowKeys'> {
     /**

package/lib/table/body/index.js

@@ -46,14 +46,14 @@ function Body(_a) {
       CheckCell: CheckCell,
       indent: 0
     }));
-    var expandedRowKey = rowKey + " expanded";
-    var expandedColumns = [{
-      title: null,
-      key: expandedRowKey,
-      onRender: expandedRowRenderer
-    }];
 
     if (expandable) {
+      var expandedRowKey = rowKey + " expanded";
+      var expandedColumns = [{
+        title: null,
+        key: expandedRowKey,
+        onRender: expandedRowRenderer
+      }];
       rows.push(_react.default.createElement(_BodyRow.default, {
         key: expandedRowKey,
         className: prefixCls + "-expand-row",
@@ -62,7 +62,8 @@ function Body(_a) {
         index: rowIndex,
         columns: expandedColumns,
         CheckCell: null,
-        indent: CheckCell ? 1 : 0
+        indent: CheckCell ? 1 : 0,
+        isExpand: true
       }));
     }
   });

package/lib/table/header/HeaderCell.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { Column } from '../interface';
-export interface HeaderCellProps<T> extends Column<T> {
+import { TableColumnInfo } from '../interface';
+export interface HeaderCellProps<T> extends TableColumnInfo<T> {
     prefixCls: string;
     isSort: boolean;
     isSortedDescending?: boolean;

package/lib/table/header/HeaderRow.d.ts

@@ -1,9 +1,9 @@
-import { Column } from '../interface';
+import { TableColumnInfo } from '../interface';
 import { HeaderCellProps } from './HeaderCell';
 import { HeaderRowSelectionInfo } from './CheckIcon';
 export interface HeaderRowProps<T> extends Pick<HeaderCellProps<T>, 'sortName' | 'isSortedDescending' | 'sortIcon'> {
     prefixCls: string;
-    columns: Column<T>[];
+    columns: TableColumnInfo<T>[];
     /**
      * 点击表头触发的排序函数
      * @param isSortedDescending

package/lib/table/index.d.ts

@@ -1,11 +1,11 @@
 import React, { ReactText } from 'react';
 import { AddListenerEventHandler } from '@autobest-ui/utils';
-import { Column } from './interface';
+import { TableColumnInfo } from './interface';
 import { HeaderRowProps } from './header/HeaderRow';
 import { BodyProps } from './body';
 import { HeaderRowSelectionInfo } from './header/CheckIcon';
 import { BodyRowSelectionInfo } from './body/CheckIcon';
-export interface RowSelectionInfo<T> extends Partial<Pick<HeaderRowSelectionInfo, 'selectAllVisible' | 'onSelectAll'>>, Partial<Pick<BodyRowSelectionInfo<T>, 'checkIcon'>> {
+export interface TableRowSelectionInfo<T> extends Partial<Pick<HeaderRowSelectionInfo, 'selectAllVisible' | 'onSelectAll'>>, Partial<Pick<BodyRowSelectionInfo<T>, 'checkIcon'>> {
     defaultSelectedRowKeys?: ReactText[];
     getDisabled?: (dataRow: any, selectedRowKeys: ReactText[], selectedRows: T[]) => boolean;
     onSelect?: (checked: boolean, rowData: T, selectedRows: T[]) => void;
@@ -21,7 +21,7 @@ export interface TableProps<T> extends Pick<HeaderRowProps<T>, 'sortName' | 'sor
      * 定义每一列数据的格式
      * 具体类型见Column
      */
-    columns: Column<T>[];
+    columns: TableColumnInfo<T>[];
     /**
      * 获取单条记录的唯一主键; 若是string类型，则取当前行数据中对应名称的属性值； 若是函数，则传入当前行数据，获取rowKey值；这也是勾选功能匹配时所用的key值
      */
@@ -41,7 +41,7 @@ export interface TableProps<T> extends Pick<HeaderRowProps<T>, 'sortName' | 'sor
     /**
      * 表格行是否可勾选，详见RowSelection
      */
-    rowSelection?: RowSelectionInfo<T>;
+    rowSelection?: TableRowSelectionInfo<T>;
     /**
      * 默认勾选项数组, 以primaryKey取值
      */

package/lib/table/index.js

@@ -88,9 +88,9 @@ function (_super) {
         return {
           selectedRowKeys: [],
           selectedRows: [],
-          rowSelection: __assign(__assign({}, prevState.rowSelection), {
+          rowSelection: prevState.rowSelection ? __assign(__assign({}, prevState.rowSelection), {
             selectAllChecked: false
-          })
+          }) : null
         };
       });
     };
@@ -257,7 +257,7 @@ function (_super) {
     };
 
     _this.getRowSelection = function () {
-      if (!('rowSelection' in _this.props)) {
+      if (!('rowSelection' in _this.props) || !_this.props.rowSelection) {
         return null;
       }
 

package/lib/table/interface.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export interface ColumnOnRenderReturnObjectInfo {
+export interface TableColumnOnRenderReturnObjectInfo {
     children: React.ReactNode | React.ReactNode[];
     props: {
         className?: string;
@@ -7,7 +7,7 @@ export interface ColumnOnRenderReturnObjectInfo {
         colSpan?: number;
     };
 }
-export interface Column<T> {
+export interface TableColumnInfo<T> {
     title: React.ReactNode | React.ReactNode[];
     key: string;
     dataIndex?: string;
@@ -18,5 +18,11 @@ export interface Column<T> {
     width?: string | number;
     className?: string;
     colSpan?: number;
-    onRender?: (rowData: T, rowIndex: number, colIndex: number) => React.ReactNode | React.ReactNode[] | ColumnOnRenderReturnObjectInfo;
+    /**
+     * 渲染单元格内容的方法，不传则默认用dataIndex去取当前行对应属性值；入参分别为当前行数据，行索引， 列索引
+     * @param rowData
+     * @param rowIndex
+     * @param colIndex
+     */
+    onRender?: (rowData: T, rowIndex: number, colIndex: number) => React.ReactNode | React.ReactNode[] | TableColumnOnRenderReturnObjectInfo;
 }

package/lib/table/style/index.scss

@@ -1,52 +1,52 @@
-$namespace: ab-table;
-
-.#{$namespace} {
-  overflow-x: auto;
-
-  table {
-    border-spacing: 0;
-    width: 100%;
-    table-layout: fixed;
-  }
-
-  &-header {
-    overflow: hidden;
-
-    table {
-      width: calc(100% - .17rem);
-    }
-  }
-
-  &-body {
-    overflow: auto scroll;
-  }
-
-  &-checkbox {
-    width: .32rem;
-    text-align: center;
-  }
-
-  &-title {
-    display: flex;
-    align-items: center;
-    text-align: left;
-
-    &.#{$namespace}-point {
-      cursor: pointer;
-    }
-  }
-
-  &-arrow {
-    padding: 0 .05rem;
-  }
-}
-
-@media only screen and (max-width: 767px) {
-  .#{$namespace} {
-    &-header {
-      table {
-        width: 100%;
-      }
-    }
-  }
+$namespace: ab-table;
+
+.#{$namespace} {
+  overflow-x: auto;
+
+  table {
+    border-spacing: 0;
+    width: 100%;
+    table-layout: fixed;
+  }
+
+  &-header {
+    overflow: hidden;
+
+    table {
+      width: calc(100% - .17rem);
+    }
+  }
+
+  &-body {
+    overflow: auto scroll;
+  }
+
+  &-checkbox {
+    width: .32rem;
+    text-align: center;
+  }
+
+  &-title {
+    display: flex;
+    align-items: center;
+    text-align: left;
+
+    &.#{$namespace}-point {
+      cursor: pointer;
+    }
+  }
+
+  &-arrow {
+    padding: 0 .05rem;
+  }
+}
+
+@media only screen and (max-width: 767px) {
+  .#{$namespace} {
+    &-header {
+      table {
+        width: 100%;
+      }
+    }
+  }
 }

package/lib/tabs/__stories__/style.scss

@@ -1,8 +1,8 @@
-.tabs-demo {
-  width: 500px;
-  margin: 20px auto;
-
-  .ab-tabs-item {
-    padding: 2px 6px;
-  }
-}
+.tabs-demo {
+  width: 500px;
+  margin: 20px auto;
+
+  .ab-tabs-item {
+    padding: 2px 6px;
+  }
+}

package/lib/tabs/style/index.scss

@@ -1,62 +1,62 @@
-$namespace: ab-tabs;
-
-.#{$namespace} {
-  position: relative;
-  display: flex;
-
-  &-item {
-    cursor: pointer;
-
-    &.#{$namespace}-active {
-      font-weight: bold;
-    }
-
-    &.#{$namespace}-disabled {
-      cursor: not-allowed;
-      opacity: 0.7;
-    }
-  }
-
-  &-bar {
-    position: absolute;
-    background-color: #b22222;
-    transition: all .25s;
-    width: 0;
-    height: 0;
-    overflow: hidden;
-    margin: 0;
-    padding: 0;
-  }
-
-  &-top, &-bottom {
-    flex-direction: row;
-
-    > .#{$namespace}-bar {
-      left: 0;
-    }
-  }
-
-  &-left, &-right {
-    flex-direction: column;
-
-    > .#{$namespace}-bar {
-      top: 0;
-    }
-  }
-
-  &-top > &-bar {
-    bottom: 0;
-  }
-
-  &-bottom > &-bar {
-    top: 0;
-  }
-
-  &-left > &-bar {
-    right: 0;
-  }
-
-  &-right > &-bar {
-    left: 0;
-  }
-}
+$namespace: ab-tabs;
+
+.#{$namespace} {
+  position: relative;
+  display: flex;
+
+  &-item {
+    cursor: pointer;
+
+    &.#{$namespace}-active {
+      font-weight: bold;
+    }
+
+    &.#{$namespace}-disabled {
+      cursor: not-allowed;
+      opacity: 0.7;
+    }
+  }
+
+  &-bar {
+    position: absolute;
+    background-color: #b22222;
+    transition: all .25s;
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+  }
+
+  &-top, &-bottom {
+    flex-direction: row;
+
+    > .#{$namespace}-bar {
+      left: 0;
+    }
+  }
+
+  &-left, &-right {
+    flex-direction: column;
+
+    > .#{$namespace}-bar {
+      top: 0;
+    }
+  }
+
+  &-top > &-bar {
+    bottom: 0;
+  }
+
+  &-bottom > &-bar {
+    top: 0;
+  }
+
+  &-left > &-bar {
+    right: 0;
+  }
+
+  &-right > &-bar {
+    left: 0;
+  }
+}

package/lib/tooltip/style/index.scss

@@ -1,62 +1,62 @@
-$namespace: ab-tooltip;
-
-.#{$namespace} {
-  &-wrap {
-    background-clip: padding-box;
-    padding: .08rem .11rem .05rem;
-    min-width: 210px;
-    border-radius: 4px;
-    line-height: 1.4;
-    border: 1px solid #906C00;
-    box-shadow: 1px 1px 5px -1px #000;
-    background-color: #FFFAEC;
-  }
-
-  &-inner {
-    position: relative;
-    width: 100%;
-    overflow: hidden;
-    font-size: .12rem;
-
-    &-expand {
-      padding-right: .1rem;
-    }
-  }
-
-  &-arrow {
-    position: absolute;
-    display: block;
-    width: 8px;
-    height: 8px;
-    border-top-color: transparent;
-    border-left-color: transparent;
-    border-style: solid;
-    box-shadow: 3px 3px 7px rgba(0, 0, 0, 0.07);
-    background-color: #FFFAEC;
-    border-right-color: #906C00;
-    border-bottom-color: #906C00;
-    border-width: 1px;
-  }
-
-  &-close {
-    position: absolute;
-    right: .02rem;
-    top: .05rem;
-    cursor: pointer;
-    padding: 0 .05rem;
-    color: #bfbfbf;
-    font-size: 0.2rem;
-    line-height: 1;
-    z-index: 2;
-
-    &:hover {
-      color: #4A4A4A;
-    }
-  }
-}
-
-@media only screen and (max-width: 767px) {
-  .#{$namespace}-wrap {
-    width: calc(100% - .3rem);
-  }
+$namespace: ab-tooltip;
+
+.#{$namespace} {
+  &-wrap {
+    background-clip: padding-box;
+    padding: .08rem .11rem .05rem;
+    min-width: 210px;
+    border-radius: 4px;
+    line-height: 1.4;
+    border: 1px solid #906C00;
+    box-shadow: 1px 1px 5px -1px #000;
+    background-color: #FFFAEC;
+  }
+
+  &-inner {
+    position: relative;
+    width: 100%;
+    overflow: hidden;
+    font-size: .12rem;
+
+    &-expand {
+      padding-right: .1rem;
+    }
+  }
+
+  &-arrow {
+    position: absolute;
+    display: block;
+    width: 8px;
+    height: 8px;
+    border-top-color: transparent;
+    border-left-color: transparent;
+    border-style: solid;
+    box-shadow: 3px 3px 7px rgba(0, 0, 0, 0.07);
+    background-color: #FFFAEC;
+    border-right-color: #906C00;
+    border-bottom-color: #906C00;
+    border-width: 1px;
+  }
+
+  &-close {
+    position: absolute;
+    right: .02rem;
+    top: .05rem;
+    cursor: pointer;
+    padding: 0 .05rem;
+    color: #bfbfbf;
+    font-size: 0.2rem;
+    line-height: 1;
+    z-index: 2;
+
+    &:hover {
+      color: #4A4A4A;
+    }
+  }
+}
+
+@media only screen and (max-width: 767px) {
+  .#{$namespace}-wrap {
+    width: calc(100% - .3rem);
+  }
 }