amis 1.3.5-beta.6 → 1.4.2-beta.1

package/src/renderers/Table/ColumnToggler.tsx

@@ -0,0 +1,544 @@
+import React from 'react';
+import {findDOMNode} from 'react-dom';
+import Sortable from 'sortablejs';
+import cloneDeep from 'lodash/cloneDeep';
+import {RendererProps} from '../../factory';
+import Overlay from '../../components/Overlay';
+import PopOver from '../../components/PopOver';
+import Modal from '../../components/Modal';
+import Button from '../../components/Button';
+import Checkbox from '../../components/Checkbox';
+import TooltipWrapper from '../../components/TooltipWrapper';
+import type {TooltipObject} from '../../components/TooltipWrapper';
+import {noop, autobind} from '../../utils/helper';
+import {filter} from '../../utils/tpl';
+import {Icon} from '../../components/icons';
+import {RootClose} from '../../utils/RootClose';
+import {IColumn} from '../../store/table';
+
+export interface ColumnTogglerProps extends RendererProps {
+  /**
+   * 按钮文字
+   */
+  label?: string | React.ReactNode;
+
+  /**
+   * 按钮提示文字，hover focus 时显示
+   */
+  tooltip?: string | TooltipObject;
+
+  /**
+   * 禁用状态下的提示
+   */
+  disabledTip?: string | TooltipObject;
+
+  /**
+   * 点击外部是否关闭
+   */
+  closeOnOutside?: boolean;
+
+  /**
+   * 点击内容是否关闭
+   */
+  closeOnClick?: boolean;
+
+  /**
+   * 下拉菜单对齐方式
+   */
+  align?: 'left' | 'right';
+
+  /**
+   *  ColumnToggler的CSS类名
+   */
+  className?: string;
+
+  /**
+   * 按钮的CSS类名
+   */
+  btnClassName?: string;
+
+  /**
+   * 按钮大小
+   */
+  size?: 'xs' | 'sm' | 'md' | 'lg';
+
+  /**
+   * 按钮级别，样式
+   */
+  level?: 'info' | 'success' | 'danger' | 'warning' | 'primary' | 'link';
+
+  /**
+   * 是否独占一行 `display: block`
+   */
+  block?: boolean;
+
+  /**
+   * 是否可通过拖拽排序
+   */
+  draggable?: boolean;
+
+  /**
+   * 默认是否展开
+   */
+  defaultIsOpened?: boolean;
+
+  /**
+   * 激活状态
+   */
+  isActived?: boolean;
+
+  /**
+   * ICON名称
+   */
+  icon?: string | React.ReactNode;
+
+  /**
+   * 是否只显示图标。
+   */
+  iconOnly?: boolean;
+
+  /**
+   * 是否隐藏展开的Icon
+   */
+  hideExpandIcon?: boolean;
+
+  /**
+   * 是否显示遮罩层
+   */
+  overlay?: boolean;
+
+  /**
+   * 列数据
+   */
+  columns: Array<IColumn>;
+
+  onColumnToggle: (columns: Array<IColumn>) => void;
+  modalContainer?: () => HTMLElement;
+}
+
+export interface ColumnTogglerState {
+  isOpened: boolean;
+  enableSorting: boolean;
+  tempColumns: any[];
+}
+
+export default class ColumnToggler extends React.Component<
+  ColumnTogglerProps,
+  ColumnTogglerState
+> {
+  state: ColumnTogglerState = {
+    isOpened: false,
+    enableSorting: false,
+    tempColumns: cloneDeep(this.props.columns)
+  };
+
+  static defaultProps: Pick<
+    ColumnTogglerProps,
+    'placement' | 'tooltipTrigger' | 'tooltipRootClose' | 'draggable'
+  > = {
+    placement: 'top',
+    tooltipTrigger: ['hover', 'focus'],
+    tooltipRootClose: false,
+    draggable: false
+  };
+
+  target: any;
+  sortable?: Sortable;
+  dragRefDOM: HTMLElement;
+
+  constructor(props: ColumnTogglerProps) {
+    super(props);
+
+    this.open = this.open.bind(this);
+    this.close = this.close.bind(this);
+    this.toggle = this.toggle.bind(this);
+    this.domRef = this.domRef.bind(this);
+    this.dragRef = this.dragRef.bind(this);
+  }
+
+  componentDidMount() {
+    if (this.props.defaultIsOpened) {
+      this.setState({
+        isOpened: true
+      });
+    }
+  }
+
+  componentWillUnmount() {
+    this.destroyDragging();
+  }
+
+  domRef(ref: any) {
+    this.target = ref;
+  }
+
+  toggle(e: React.MouseEvent<any>) {
+    e.preventDefault();
+
+    this.setState({
+      isOpened: !this.state.isOpened
+    });
+  }
+
+  open() {
+    this.setState({
+      isOpened: true
+    });
+  }
+
+  close() {
+    this.setState({
+      isOpened: false,
+      enableSorting: false,
+      tempColumns: cloneDeep(this.props.columns)
+    });
+  }
+
+  swapColumnPosition(oldIndex: number, newIndex: number) {
+    const columns = this.state.tempColumns;
+
+    columns[oldIndex] = columns.splice(newIndex, 1, columns[oldIndex])[0];
+    this.setState({tempColumns: columns});
+  }
+
+  updateToggledColumn(
+    column: IColumn,
+    index: number,
+    value: any,
+    shift?: boolean
+  ) {
+    const tempColumns = this.state.tempColumns.concat();
+
+    tempColumns.splice(index, 1, {
+      ...column,
+      toggled: value
+    });
+    this.setState({tempColumns});
+  }
+
+  @autobind
+  dragRef(ref: any) {
+    const {enableSorting} = this.state;
+    const {draggable} = this.props;
+
+    if (enableSorting && draggable && ref) {
+      this.initDragging();
+    }
+  }
+
+  initDragging() {
+    const dom = findDOMNode(this) as HTMLElement;
+    const ns = this.props.classPrefix;
+
+    this.sortable = new Sortable(
+      dom.querySelector(`.${ns}ColumnToggler-modal-content`) as HTMLElement,
+      {
+        group: `ColumnToggler-modal-content`,
+        animation: 150,
+        handle: `.${ns}ColumnToggler-menuItem-dragBar`,
+        ghostClass: `${ns}ColumnToggler-menuItem--dragging`,
+        onEnd: (e: any) => {
+          if (e.newIndex === e.oldIndex) {
+            return;
+          }
+
+          const parent = e.to as HTMLElement;
+          if (e.oldIndex < parent.childNodes.length - 1) {
+            parent.insertBefore(e.item, parent.childNodes[e.oldIndex]);
+          } else {
+            parent.appendChild(e.item);
+          }
+
+          this.swapColumnPosition(e.oldIndex, e.newIndex);
+        }
+      }
+    );
+  }
+
+  destroyDragging() {
+    this.sortable && this.sortable.destroy();
+  }
+
+  @autobind
+  onConfirm() {
+    const {tempColumns} = this.state;
+    const {onColumnToggle} = this.props;
+
+    onColumnToggle && onColumnToggle([...tempColumns]);
+    this.setState({
+      isOpened: false,
+      enableSorting: false
+    });
+  }
+
+  renderOuter() {
+    const {
+      popOverContainer,
+      classnames: cx,
+      classPrefix: ns,
+      children,
+      closeOnClick,
+      closeOnOutside
+    } = this.props;
+    const body = (
+      <RootClose
+        disabled={!this.state.isOpened}
+        onRootClose={closeOnOutside !== false ? this.close : noop}
+      >
+        {(ref: any) => {
+          return (
+            <ul
+              className={cx('ColumnToggler-menu')}
+              onClick={closeOnClick ? this.close : noop}
+              ref={ref}
+            >
+              {children}
+            </ul>
+          );
+        }}
+      </RootClose>
+    );
+
+    if (popOverContainer) {
+      return (
+        <Overlay container={popOverContainer} target={() => this.target} show>
+          <PopOver
+            overlay
+            onHide={this.close}
+            classPrefix={ns}
+            className={cx('ColumnToggler-popover')}
+            style={{minWidth: this.target?.offsetWidth}}
+          >
+            {body}
+          </PopOver>
+        </Overlay>
+      );
+    }
+
+    return body;
+  }
+
+  renderModal() {
+    const {
+      render,
+      classnames: cx,
+      classPrefix: ns,
+      modalContainer,
+      draggable,
+      overlay,
+      translate: __
+    } = this.props;
+
+    const {enableSorting, tempColumns} = this.state;
+
+    return (
+      <>
+        <Modal
+          closeOnEsc
+          onHide={this.close}
+          show={this.state.isOpened}
+          contentClassName={cx('ColumnToggler-modal')}
+          container={modalContainer || this.target}
+          overlay={typeof overlay === 'boolean' ? overlay : false}
+        >
+          <header className={cx('ColumnToggler-modal-header')}>
+            <span className={cx('ColumnToggler-modal-title')}>列设置</span>
+            <a
+              data-tooltip={__('Dialog.close')}
+              data-position="left"
+              className={cx('Modal-close')}
+              onClick={this.close}
+            >
+              <Icon icon="close" className="icon" />
+            </a>
+          </header>
+
+          <ul className={cx('ColumnToggler-modal-content')} ref={this.dragRef}>
+            {Array.isArray(tempColumns)
+              ? tempColumns.map((column, index) => (
+                  <TooltipWrapper
+                    tooltipClassName={cx('ColumnToggler-tooltip')}
+                    placement="top"
+                    tooltip={column.label || ''}
+                    trigger={enableSorting ? 'click' : 'hover'}
+                    key={column.index}
+                  >
+                    <li
+                      className={cx('ColumnToggler-menuItem')}
+                      key={column.index}
+                    >
+                      {enableSorting && draggable && tempColumns.length > 1 ? (
+                        <>
+                          <a className={cx('ColumnToggler-menuItem-dragBar')}>
+                            <Icon icon="drag-bar" className={cx('icon')} />
+                          </a>
+                          <span>
+                            {column.label ? render('tpl', column.label) : null}
+                          </span>
+                        </>
+                      ) : (
+                        <Checkbox
+                          size="sm"
+                          classPrefix={ns}
+                          checked={column.toggled}
+                          disabled={!column.toggable || enableSorting}
+                          onChange={this.updateToggledColumn.bind(
+                            this,
+                            column,
+                            index
+                          )}
+                        >
+                          <span>
+                            {column.label ? render('tpl', column.label) : null}
+                          </span>
+                        </Checkbox>
+                      )}
+                    </li>
+                  </TooltipWrapper>
+                ))
+              : null}
+          </ul>
+
+          <footer className={cx('ColumnToggler-modal-footer')}>
+            <div>
+              <Button
+                className={cx(`ColumnToggler-modeSelect`, {
+                  'is-actived': !enableSorting
+                })}
+                onClick={() => this.setState({enableSorting: false})}
+                level="link"
+              >
+                {__('Table.toggleColumn')}
+              </Button>
+              <Button
+                className={cx(`ColumnToggler-modeSelect`, {
+                  'is-actived': enableSorting
+                })}
+                onClick={() =>
+                  this.setState(
+                    {enableSorting: true},
+                    () =>
+                      this.state.enableSorting &&
+                      this.props.draggable &&
+                      this.initDragging()
+                  )
+                }
+                level="link"
+                disabled={tempColumns.length < 2}
+              >
+                {__('sort')}
+              </Button>
+            </div>
+            <div>
+              <Button className="mr-4" onClick={this.close}>
+                {__('cancel')}
+              </Button>
+              <Button level="primary" onClick={this.onConfirm}>
+                {__('confirm')}
+              </Button>
+            </div>
+          </footer>
+        </Modal>
+      </>
+    );
+  }
+
+  render() {
+    const {
+      tooltip,
+      placement,
+      tooltipContainer,
+      tooltipTrigger,
+      tooltipRootClose,
+      disabledTip,
+      block,
+      disabled,
+      btnDisabled,
+      btnClassName,
+      size,
+      label,
+      level,
+      primary,
+      className,
+      classnames: cx,
+      align,
+      iconOnly,
+      icon,
+      isActived,
+      data,
+      draggable,
+      hideExpandIcon
+    } = this.props;
+
+    const button = (
+      <button
+        onClick={this.toggle}
+        disabled={disabled || btnDisabled}
+        className={cx(
+          'Button',
+          btnClassName,
+          typeof level === 'undefined'
+            ? 'Button--default'
+            : level
+            ? `Button--${level}`
+            : '',
+          {
+            'Button--block': block,
+            'Button--primary': primary,
+            'Button--iconOnly': iconOnly
+          },
+          size ? `Button--${size}` : ''
+        )}
+      >
+        {icon ? (
+          typeof icon === 'string' ? (
+            <i className={cx(icon, 'm-r-xs')} />
+          ) : (
+            icon
+          )
+        ) : null}
+        {typeof label === 'string' ? filter(label, data) : label}
+        {hideExpandIcon || draggable ? null : (
+          <span className={cx('ColumnToggler-caret')}>
+            <Icon icon="caret" className="icon" />
+          </span>
+        )}
+      </button>
+    );
+
+    return (
+      <div
+        className={cx(
+          'ColumnToggler',
+          {
+            'ColumnToggler-block': block,
+            'ColumnToggler--alignRight': align === 'right',
+            'is-opened': this.state.isOpened,
+            'is-actived': isActived
+          },
+          className
+        )}
+        ref={this.domRef}
+      >
+        {draggable ? (
+          button
+        ) : (
+          <TooltipWrapper
+            placement={placement}
+            tooltip={disabled ? disabledTip : tooltip}
+            container={tooltipContainer}
+            trigger={tooltipTrigger}
+            rootClose={tooltipRootClose}
+          >
+            {button}
+          </TooltipWrapper>
+        )}
+        {this.state.isOpened
+          ? draggable
+            ? this.renderModal()
+            : this.renderOuter()
+          : null}
+      </div>
+    );
+  }
+}

package/src/renderers/Table/ItemActionsWrapper.tsx

@@ -0,0 +1,44 @@
+import {observer} from 'mobx-react';
+import React, {useEffect, useRef} from 'react';
+import {ITableStore} from '../../store/table';
+import {ClassNamesFn} from '../../theme';
+
+export interface ItemActionsProps {
+  classnames: ClassNamesFn;
+  children: JSX.Element;
+  store: ITableStore;
+}
+
+function ItemActionsWrapper(props: ItemActionsProps) {
+  const cx = props.classnames;
+  const children = props.children;
+  const store = props.store;
+  const divRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const row = store.hoverRow!;
+    if (!row) {
+      return;
+    }
+
+    const frame = divRef.current!.parentElement?.querySelector(
+      'table'
+    ) as HTMLElement;
+    const dom = frame?.querySelector(`tr[data-id="${row.id}"]`) as HTMLElement;
+    if (!dom) {
+      return;
+    }
+    const rect = dom.getBoundingClientRect();
+    const height = rect.height;
+    const top = rect.top - frame.getBoundingClientRect().top;
+    divRef.current!.style.cssText += `top: ${top}px;height: ${height}px;`;
+  }, [store.hoverRow?.id]);
+
+  return (
+    <div className={cx('Table-itemActions-wrap')} ref={divRef}>
+      {children}
+    </div>
+  );
+}
+
+export default observer(ItemActionsWrapper);

package/src/renderers/Table/TableBody.tsx

@@ -24,7 +24,7 @@ export interface TableBodyProps extends LocaleProps {
     item: IRow,
     props: any
   ) => React.ReactNode;
-  onCheck: (item: IRow) => void;
+  onCheck: (item: IRow, value: boolean, shift?: boolean) => void;
   onQuickChange?: (
     item: IRow,
     values: object,
@@ -45,6 +45,7 @@ export interface TableBodyProps extends LocaleProps {
   itemAction?: ActionSchema;
 }
 
+@observer
 export class TableBody extends React.Component<TableBodyProps> {
   renderRows(
     rows: Array<any>,
@@ -128,7 +129,7 @@ export class TableBody extends React.Component<TableBodyProps> {
             />
           );
         }
-      } else if (item.children.length) {
+      } else if (item.children.length && item.expanded) {
         // 嵌套表格
         doms.push(
           ...this.renderRows(item.children, columns, {

package/src/renderers/Table/TableCell.tsx

@@ -6,11 +6,13 @@ import PopOverable from '../PopOver';
 import {observer} from 'mobx-react';
 import omit = require('lodash/omit');
 import {filter} from '../../utils/tpl';
+import {Badge} from '../../components/Badge';
 
 export interface TableCellProps extends RendererProps {
   wrapperComponent?: React.ReactType;
   column: object;
 }
+
 export class TableCell extends React.Component<RendererProps> {
   static defaultProps = {
     wrapperComponent: 'td'
@@ -51,9 +53,12 @@ export class TableCell extends React.Component<RendererProps> {
       prefix,
       affix,
       isHead,
+      colIndex,
+      row,
+      showBadge,
+      itemBadge,
       ...rest
     } = this.props;
-
     const schema = {
       ...column,
       className: innerClassName,
@@ -120,6 +125,16 @@ export class TableCell extends React.Component<RendererProps> {
         tabIndex={tabIndex}
         onKeyUp={onKeyUp}
       >
+        {showBadge ? (
+          <Badge
+            classnames={cx}
+            badge={{
+              ...itemBadge,
+              className: cx(`Table-badge`, itemBadge?.className)
+            }}
+            data={row.data}
+          />
+        ) : null}
         {prefix}
         {body}
         {affix}

package/src/renderers/Table/TableContent.tsx

@@ -4,6 +4,7 @@ import {IColumn, IRow} from '../../store/table';
 import {SchemaNode, Action} from '../../types';
 import {TableBody} from './TableBody';
 import {LocaleProps} from '../../locale';
+import {observer} from 'mobx-react';
 import {ActionSchema} from '../Action';
 
 export interface TableContentProps extends LocaleProps {
@@ -31,7 +32,7 @@ export interface TableContentProps extends LocaleProps {
     item: IRow,
     props: any
   ) => React.ReactNode;
-  onCheck: (item: IRow) => void;
+  onCheck: (item: IRow, value: boolean, shift?: boolean) => void;
   onQuickChange?: (
     item: IRow,
     values: object,
@@ -51,6 +52,7 @@ export interface TableContentProps extends LocaleProps {
   itemAction?: ActionSchema;
 }
 
+@observer
 export class TableContent extends React.Component<TableContentProps> {
   render() {
     const {