amis 1.4.1 → 1.4.2-beta.13

package/src/renderers/CRUD.tsx

@@ -1,43 +1,28 @@
 import React from 'react';
 
-import PropTypes from 'prop-types';
 import {Renderer, RendererProps} from '../factory';
-import {
-  SchemaNode,
-  Schema,
-  Action,
-  Api,
-  ApiObject,
-  PlainObject
-} from '../types';
+import {SchemaNode, Schema, Action, PlainObject} from '../types';
 import {CRUDStore, ICRUDStore} from '../store/crud';
 import {
   createObject,
   extendObject,
   anyChanged,
   isObjectShallowModified,
-  noop,
   isVisible,
   getPropValue,
   getVariable,
   qsstringify,
-  qsparse
+  qsparse,
+  isArrayChildrenModified
 } from '../utils/helper';
-import {observer} from 'mobx-react';
-import partition from 'lodash/partition';
-import Scoped, {ScopedContext, IScopedContext} from '../Scoped';
+import {ScopedContext, IScopedContext} from '../Scoped';
 import Button from '../components/Button';
 import Select from '../components/Select';
 import getExprProperties from '../utils/filter-schema';
 import pick from 'lodash/pick';
 import {findDOMNode} from 'react-dom';
 import {evalExpression, filter} from '../utils/tpl';
-import {
-  isValidApi,
-  buildApi,
-  isEffectiveApi,
-  isApiOutdated
-} from '../utils/api';
+import {isEffectiveApi, isApiOutdated, str2function} from '../utils/api';
 import omit from 'lodash/omit';
 import find from 'lodash/find';
 import findIndex from 'lodash/findIndex';
@@ -48,7 +33,6 @@ import {
   BaseSchema,
   SchemaApi,
   SchemaClassName,
-  SchemaCollection,
   SchemaExpression,
   SchemaMessage,
   SchemaName,
@@ -298,6 +282,16 @@ export interface CRUDCommonSchema extends BaseSchema {
    * 默认只有当分页数大于 1 是才显示，如果总是想显示请配置。
    */
   alwaysShowPagination?: boolean;
+
+  /**
+   * 开启查询区域，会根据列元素的searchable属性值，自动生成查询条件表单
+   */
+  autoGenerateFilter?: boolean;
+
+  /**
+   * 内容区域占满屏幕剩余空间
+   */
+  autoFillHeight?: boolean;
 }
 
 export type CRUDCardsSchema = CRUDCommonSchema & {
@@ -362,6 +356,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     'footerToolbar',
     'filterTogglable',
     'filterDefaultVisible',
+    'autoGenerateFilter',
     'syncResponse2Query',
     'keepItemSelectionOnPageChange',
     'labelTpl',
@@ -376,7 +371,8 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     'onInit',
     'onSaved',
     'onQuery',
-    'formStore'
+    'formStore',
+    'autoFillHeight'
   ];
   static defaultProps = {
     toolbarInline: true,
@@ -392,7 +388,8 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     filterTogglable: false,
     filterDefaultVisible: true,
     loadDataOnce: false,
-    loadDataOnceFetchOnFilter: true
+    loadDataOnceFetchOnFilter: true,
+    autoFillHeight: false
   };
 
   control: any;
@@ -478,8 +475,8 @@ export default class CRUD extends React.Component<CRUDProps, any> {
       this.handleFilterInit({});
     }
 
-    const val = getPropValue(this.props);
-    if (this.props.pickerMode && val) {
+    let val: any;
+    if (this.props.pickerMode && (val = getPropValue(this.props))) {
       store.setSelectedItems(val);
     }
   }
@@ -500,8 +497,14 @@ export default class CRUD extends React.Component<CRUDProps, any> {
       this.renderFooterToolbar = this.renderFooterToolbar.bind(this);
     }
 
-    const val = getPropValue(this.props);
-    if (this.props.pickerMode && val !== getPropValue(prevProps)) {
+    let val: any;
+    if (
+      this.props.pickerMode &&
+      isArrayChildrenModified(
+        (val = getPropValue(this.props)),
+        getPropValue(prevProps)
+      )
+    ) {
       store.setSelectedItems(val);
     }
 
@@ -654,6 +657,13 @@ export default class CRUD extends React.Component<CRUDProps, any> {
       return Promise.resolve({
         items: store.selectedItems.concat()
       });
+    } else if (action.onClick) {
+      store.setCurrentAction(action);
+      let onClick = action.onClick;
+      if (typeof onClick === 'string') {
+        onClick = str2function(onClick, 'event', 'props', 'data');
+      }
+      onClick && onClick(e, this.props, ctx);
     } else {
       onAction(e, action, ctx, throwErrors, delegate || this.context);
     }
@@ -1792,6 +1802,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
       return null;
     }
 
+    const {render, store, translate: __} = this.props;
     const type = (toolbar as Schema).type || toolbar;
 
     if (type === 'bulkActions' || type === 'bulk-actions') {
@@ -1808,8 +1819,25 @@ export default class CRUD extends React.Component<CRUDProps, any> {
       return this.renderFilterToggler();
     } else if (type === 'export-csv') {
       return this.renderExportCSV(toolbar as Schema);
+    } else if (type === 'reload') {
+      let reloadButton = {
+        label: '',
+        icon: 'fa fa-sync',
+        tooltip: __('reload'),
+        tooltipPlacement: 'top',
+        type: 'button'
+      };
+      if (typeof toolbar === 'object') {
+        reloadButton = {...reloadButton, ...omit(toolbar, ['type', 'align'])};
+      }
+      return render(`toolbar/${index}`, reloadButton, {
+        onAction: () => {
+          this.reload();
+        }
+      });
     } else if (Array.isArray(toolbar)) {
       const children: Array<any> = toolbar
+        .filter((toolbar: any) => isVisible(toolbar, store.filterData))
         .map((toolbar, index) => ({
           dom: this.renderToolbar(toolbar, index, childProps, toolbarRenderer),
           toolbar
@@ -1851,7 +1879,6 @@ export default class CRUD extends React.Component<CRUDProps, any> {
       return result;
     }
 
-    const {render, store} = this.props;
     const $$editable = childProps.$$editable;
 
     return render(`toolbar/${index}`, toolbar, {
@@ -1994,6 +2021,9 @@ export default class CRUD extends React.Component<CRUDProps, any> {
       popOverContainer,
       translate: __,
       onQuery,
+      autoGenerateFilter,
+      onSelect,
+      autoFillHeight,
       ...rest
     } = this.props;
 
@@ -2044,6 +2074,8 @@ export default class CRUD extends React.Component<CRUDProps, any> {
             key: 'body',
             className: cx('Crud-body', bodyClassName),
             ref: this.controlRef,
+            autoGenerateFilter: !filter && autoGenerateFilter,
+            autoFillHeight: autoFillHeight,
             selectable: !!(
               (this.hasBulkActionsToolbar() && this.hasBulkActions()) ||
               pickerMode
@@ -2076,6 +2108,9 @@ export default class CRUD extends React.Component<CRUDProps, any> {
             onSelect: this.handleSelect,
             onPopOverOpened: this.handleChildPopOverOpen,
             onPopOverClosed: this.handleChildPopOverClose,
+            onSearchableFromReset: this.handleFilterReset,
+            onSearchableFromSubmit: this.handleFilterSubmit,
+            onSearchableFromInit: this.handleFilterInit,
             headerToolbarRender: this.renderHeaderToolbar,
             footerToolbarRender: this.renderFooterToolbar,
             data: store.mergedData

package/src/renderers/Card.tsx

@@ -166,6 +166,11 @@ export interface CardSchema extends BaseSchema {
    * 底部按钮集合。
    */
   actions?: Array<ActionSchema>;
+
+  /**
+   * 工具栏按钮
+   */
+  toolbar?: Array<ActionSchema>;
 }
 
 export interface CardProps
@@ -273,30 +278,47 @@ export class Card extends React.Component<CardProps> {
       multiple,
       hideCheckToggler,
       classnames: cx,
-      classPrefix: ns
+      classPrefix: ns,
+      toolbar,
+      render
     } = this.props;
-
-    if (dragging) {
-      return (
-        <div className={cx('Card-dragBtn')}>
-          <Icon icon="drag-bar" className="icon" />
-        </div>
+    const toolbars: Array<JSX.Element> = [];
+
+    if (selectable && !hideCheckToggler) {
+      toolbars.push(
+        <Checkbox
+          key="check"
+          className={cx('Card-checkbox')}
+          type={multiple ? 'checkbox' : 'radio'}
+          disabled={!checkable}
+          checked={selected}
+          onChange={checkOnItemClick ? noop : this.handleCheck}
+        />
       );
-    } else if (selectable && !hideCheckToggler) {
-      return (
-        <div className={cx('Card-checkBtn')}>
-          <Checkbox
-            classPrefix={ns}
-            type={multiple ? 'checkbox' : 'radio'}
-            disabled={!checkable}
-            checked={selected}
-            onChange={checkOnItemClick ? noop : this.handleCheck}
-          />
-        </div>
+    }
+
+    if (Array.isArray(toolbar)) {
+      toolbar.forEach((action, index) =>
+        toolbars.push(
+          render(
+            `toolbar/${index}`,
+            {
+              type: 'button',
+              level: 'link',
+              size: 'sm',
+              ...(action as any)
+            },
+            {
+              key: index
+            }
+          )
+        )
       );
     }
 
-    return null;
+    return toolbars.length ? (
+      <div className={cx('Card-toolbar')}>{toolbars}</div>
+    ) : null;
   }
 
   renderActions() {
@@ -451,12 +473,14 @@ export class Card extends React.Component<CardProps> {
       imageClassName,
       avatarTextClassName,
       href,
-      itemAction
+      itemAction,
+      dragging
     } = this.props;
 
+    const toolbar = this.renderToolbar();
     let heading = null;
 
-    if (header) {
+    if (header || toolbar) {
       const {
         highlight: highlightTpl,
         avatar: avatarTpl,
@@ -465,31 +489,31 @@ export class Card extends React.Component<CardProps> {
         subTitle: subTitleTpl,
         subTitlePlaceholder,
         desc: descTpl
-      } = header;
+      } = header || {};
 
       const descPlaceholder =
-        header.descriptionPlaceholder || header.descPlaceholder;
+        header?.descriptionPlaceholder || header?.descPlaceholder;
 
       const highlight = !!evalExpression(highlightTpl!, data as object);
       const avatar = filter(avatarTpl, data, '| raw');
       const avatarText = filter(avatarTextTpl, data);
       const title = filter(titleTpl, data);
       const subTitle = filter(subTitleTpl, data);
-      const desc = filter(header.description || descTpl, data);
+      const desc = filter(header?.description || descTpl, data);
 
       heading = (
-        <div className={cx('Card-heading', header.className)}>
+        <div className={cx('Card-heading', header?.className)}>
           {avatar ? (
             <span
               className={cx(
                 'Card-avtar',
-                header.avatarClassName || avatarClassName
+                header?.avatarClassName || avatarClassName
               )}
             >
               <img
                 className={cx(
                   'Card-img',
-                  header.imageClassName || imageClassName
+                  header?.imageClassName || imageClassName
                 )}
                 src={avatar}
               />
@@ -498,7 +522,7 @@ export class Card extends React.Component<CardProps> {
             <span
               className={cx(
                 'Card-avtarText',
-                header.avatarTextClassName || avatarTextClassName
+                header?.avatarTextClassName || avatarTextClassName
               )}
             >
               {avatarText}
@@ -509,7 +533,7 @@ export class Card extends React.Component<CardProps> {
               <i
                 className={cx(
                   'Card-highlight',
-                  header.highlightClassName || highlightClassName
+                  header?.highlightClassName || highlightClassName
                 )}
               />
             ) : null}
@@ -518,7 +542,7 @@ export class Card extends React.Component<CardProps> {
               <div
                 className={cx(
                   'Card-title',
-                  header.titleClassName || titleClassName
+                  header?.titleClassName || titleClassName
                 )}
               >
                 {render('title', title)}
@@ -529,7 +553,7 @@ export class Card extends React.Component<CardProps> {
               <div
                 className={cx(
                   'Card-subTitle',
-                  header.subTitleClassName || subTitleClassName
+                  header?.subTitleClassName || subTitleClassName
                 )}
               >
                 {render('sub-title', subTitle || subTitlePlaceholder!, {
@@ -542,8 +566,8 @@ export class Card extends React.Component<CardProps> {
               <div
                 className={cx(
                   'Card-desc',
-                  header.descriptionClassName ||
-                    header.descClassName ||
+                  header?.descriptionClassName ||
+                    header?.descClassName ||
                     descClassName
                 )}
               >
@@ -553,6 +577,7 @@ export class Card extends React.Component<CardProps> {
               </div>
             ) : null}
           </div>
+          {toolbar}
         </div>
       );
     }
@@ -570,7 +595,11 @@ export class Card extends React.Component<CardProps> {
           'Card--link': href || itemAction
         })}
       >
-        {this.renderToolbar()}
+        {dragging ? (
+          <div className={cx('Card-dragBtn')}>
+            <Icon icon="drag-bar" className="icon" />
+          </div>
+        ) : null}
         {heading}
         {body ? (
           <div className={cx('Card-body', bodyClassName)}>{body}</div>

package/src/renderers/Chart.tsx

@@ -12,7 +12,11 @@ import {
   isPureVariable,
   dataMapping
 } from '../utils/tpl-builtin';
-import {isApiOutdated, isEffectiveApi} from '../utils/api';
+import {
+  isApiOutdated,
+  isEffectiveApi,
+  normalizeApiResponseData
+} from '../utils/api';
 import {ScopedContext, IScopedContext} from '../Scoped';
 import {createObject, findObjectsWithKey} from '../utils/helper';
 import Spinner from '../components/Spinner';
@@ -342,7 +346,7 @@ export class Chart extends React.Component<ChartProps> {
         }
         delete this.reloadCancel;
 
-        const data = result.data || {};
+        const data = normalizeApiResponseData(result.data);
         // 说明返回的是数据接口。
         if (!data.series && this.props.config) {
           const ctx = createObject(this.props.data, data);

package/src/renderers/Collapse.tsx

@@ -176,8 +176,10 @@ export default class Collapse extends React.Component<
           onClick={this.toggleCollapsed}
           className={cx(`Collapse-header`, headingClassName)}
         >
-          {render('heading', finalTitle)}
-          {collapsable && <span className={cx('Collapse-arrow')} />}
+          <div className={cx('Collapse-header-wrapper')}>
+            {render('heading', finalTitle, {className: 'Collapse-header-tpl'})}
+            {collapsable && <span className={cx('Collapse-arrow')} />}
+          </div>
         </HeadingComponent>
       ) : null,
 

package/src/renderers/Dialog.tsx

@@ -629,10 +629,6 @@ export class DialogRenderer extends Dialog {
   tryChildrenToHandle(action: Action, ctx: object, rawAction?: Action) {
     const scoped = this.context as IScopedContext;
 
-    if (action.fromDialog) {
-      return false;
-    }
-
     const targets: Array<any> = [];
     const {onConfirm, store} = this.props;
 

package/src/renderers/Drawer.tsx

@@ -687,10 +687,6 @@ export class DrawerRenderer extends Drawer {
   tryChildrenToHandle(action: Action, ctx: object, rawAction?: Action) {
     const scoped = this.context as IScopedContext;
 
-    if (action.fromDialog) {
-      return false;
-    }
-
     const targets: Array<any> = [];
     const {onConfirm, store} = this.props;
 

package/src/renderers/DropDownButton.tsx

@@ -7,10 +7,11 @@ import type {TooltipObject, Trigger} from '../components/TooltipWrapper';
 import {isDisabled, isVisible, noop} from '../utils/helper';
 import {filter} from '../utils/tpl';
 import {Icon} from '../components/icons';
-import {BaseSchema, SchemaClassName} from '../Schema';
+import {BaseSchema, SchemaClassName, SchemaIcon} from '../Schema';
 import {ActionSchema} from './Action';
 import {DividerSchema} from './Divider';
 import {RootClose} from '../utils/RootClose';
+import {generateIcon} from '../utils/icon';
 
 /**
  * 下拉按钮渲染器。
@@ -77,10 +78,16 @@ export interface DropdownButtonSchema extends BaseSchema {
    */
   iconOnly?: boolean;
 
+  /**
+   * 右侧图标
+   */
+  rightIcon?: SchemaIcon;
+
   /**
    * 触发条件，默认是 click
    */
   trigger?: 'click' | 'hover';
+
   /**
    * 是否显示下拉按钮
    */
@@ -274,12 +281,17 @@ export default class DropDownButton extends React.Component<
       align,
       iconOnly,
       icon,
+      rightIcon,
       isActived,
       trigger,
       data,
       hideCaret
     } = this.props;
 
+    const iconElement = generateIcon(cx, icon, 'm-r-xs');
+
+    const rightIconElement = generateIcon(cx, rightIcon, 'm-l-xs');
+
     return (
       <div
         className={cx(
@@ -322,21 +334,14 @@ export default class DropDownButton extends React.Component<
               size ? `Button--${size}` : ''
             )}
           >
-            {icon ? (
-              typeof icon === 'string' ? (
-                <i className={cx(icon, 'm-r-xs')} />
-              ) : (
-                icon
-              )
-            ) : null}
+            {iconElement}
             {typeof label === 'string' ? filter(label, data) : label}
-            {
-              !hideCaret
-              ? <span className={cx('DropDown-caret')} >
+            {rightIconElement}
+            {!hideCaret ? (
+              <span className={cx('DropDown-caret')}>
                 <Icon icon="caret" className="icon" />
               </span>
-              : null
-            }
+            ) : null}
           </button>
         </TooltipWrapper>
         {this.state.isOpened ? this.renderOuter() : null}

package/src/renderers/Form/Checkbox.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import {FormItem, FormControlProps, FormBaseControl} from './Item';
 import cx from 'classnames';
 import Checkbox from '../../components/Checkbox';
+import {withBadge, BadgeSchema} from '../../components/Badge';
 
 /**
  * Checkbox 勾选框。
@@ -27,6 +28,11 @@ export interface CheckboxControlSchema extends FormBaseControl {
    * 选项说明
    */
   option?: string;
+
+  /**
+   * 角标
+   */
+  badge?: BadgeSchema;
 }
 
 export interface CheckboxProps
@@ -78,4 +84,6 @@ export default class CheckboxControl extends React.Component<
   type: 'checkbox',
   sizeMutable: false
 })
+// @ts-ignore
+@withBadge
 export class CheckboxControlRenderer extends CheckboxControl {}

package/src/renderers/Form/Combo.tsx

@@ -251,7 +251,6 @@ export interface ComboControlSchema extends FormBaseControl {
     /**
      * 最大值验证错误提示
      */
-
     maxLengthValidateFailed?: string;
   };
 }
@@ -1010,7 +1009,7 @@ export default class ComboControl extends React.Component<ComboProps> {
                 {deleteIcon ? (
                   <i className={deleteIcon} />
                 ) : (
-                  <Icon icon="close" className="icon" />
+                  <Icon icon="status-close" className="icon" />
                 )}
               </div>
             );
@@ -1189,7 +1188,7 @@ export default class ComboControl extends React.Component<ComboProps> {
                     {deleteIcon ? (
                       <i className={deleteIcon} />
                     ) : (
-                      <Icon icon="close" className="icon" />
+                      <Icon icon="status-close" className="icon" />
                     )}
                   </a>
                 );

package/src/renderers/Form/InputCity.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import {FormItem, FormControlProps, FormBaseControl} from './Item';
 import {ClassNamesFn, themeable, ThemeProps} from '../../theme';
-import {Select, Spinner} from '../../components';
+import Spinner from '../../components/Spinner';
+import Select from '../../components/Select';
 import {autobind} from '../../utils/helper';
 import {Option} from './Options';
 import {localeable, LocaleProps} from '../../locale';
@@ -293,13 +294,8 @@ export class CityPicker extends React.Component<
 
   @autobind
   syncOut() {
-    const {
-      onChange,
-      allowStreet,
-      joinValues,
-      extractValue,
-      delimiter
-    } = this.props;
+    const {onChange, allowStreet, joinValues, extractValue, delimiter} =
+      this.props;
 
     const {code, province, city, district, street} = this.state;