amis 1.4.0 → 1.4.2-beta.12

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,20 @@ export interface DropdownButtonSchema extends BaseSchema {
    */
   iconOnly?: boolean;
 
+  /**
+   * 右侧图标
+   */
+  rightIcon?: SchemaIcon;
+
   /**
    * 触发条件，默认是 click
    */
   trigger?: 'click' | 'hover';
+
+  /**
+   * 是否显示下拉按钮
+   */
+  hideCaret?: boolean;
 }
 
 export interface DropDownButtonProps
@@ -270,11 +281,17 @@ export default class DropDownButton extends React.Component<
       align,
       iconOnly,
       icon,
+      rightIcon,
       isActived,
       trigger,
-      data
+      data,
+      hideCaret
     } = this.props;
 
+    const iconElement = generateIcon(cx, icon, 'm-r-xs');
+
+    const rightIconElement = generateIcon(cx, rightIcon, 'm-l-xs');
+
     return (
       <div
         className={cx(
@@ -317,17 +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}
-            <span className={cx('DropDown-caret')}>
-              <Icon icon="caret" className="icon" />
-            </span>
+            {rightIconElement}
+            {!hideCaret ? (
+              <span className={cx('DropDown-caret')}>
+                <Icon icon="caret" className="icon" />
+              </span>
+            ) : 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;
 

package/src/renderers/Form/InputFile.tsx

@@ -20,6 +20,7 @@ import {
   SchemaClassName,
   SchemaTokenizeableString
 } from '../../Schema';
+import merge from 'lodash/merge';
 
 /**
  * File 文件上传控件
@@ -356,11 +357,12 @@ export default class FileControl extends React.Component<FileProps, FileState> {
     if (value && value instanceof Blob) {
       files = [value as any];
     } else if (value) {
-      files = (Array.isArray(value)
-        ? value
-        : joinValues
-        ? `${(value as any)[valueField] || value}`.split(delimiter)
-        : [value as any]
+      files = (
+        Array.isArray(value)
+          ? value
+          : joinValues
+          ? `${(value as any)[valueField] || value}`.split(delimiter)
+          : [value as any]
       )
         .map(item => FileControl.valueToFile(item, props) as FileValue)
         .filter(item => item);
@@ -402,11 +404,12 @@ export default class FileControl extends React.Component<FileProps, FileState> {
       let files: Array<FileValue> = [];
 
       if (value) {
-        files = (Array.isArray(value)
-          ? value
-          : joinValues && typeof value === 'string'
-          ? value.split(delimiter)
-          : [value as any]
+        files = (
+          Array.isArray(value)
+            ? value
+            : joinValues && typeof value === 'string'
+            ? value.split(delimiter)
+            : [value as any]
         )
           .map(item => {
             let obj = FileControl.valueToFile(
@@ -851,8 +854,8 @@ export default class FileControl extends React.Component<FileProps, FileState> {
   }
 
   syncAutoFill() {
-    const {autoFill, multiple, onBulkChange} = this.props;
-    if (!isEmpty(autoFill)) {
+    const {autoFill, multiple, onBulkChange, data} = this.props;
+    if (!isEmpty(autoFill) && onBulkChange) {
       const files = this.state.files.filter(
         file => ~['uploaded', 'init', 'ready'].indexOf(file.state as string)
       );
@@ -864,7 +867,12 @@ export default class FileControl extends React.Component<FileProps, FileState> {
             }
           : files[0]
       );
-      onBulkChange && onBulkChange(toSync);
+      Object.keys(toSync).forEach(key => {
+        if (isPlainObject(toSync[key]) && isPlainObject(data[key])) {
+          toSync[key] = merge({}, data[key], toSync[key]);
+        }
+      });
+      onBulkChange(toSync);
     }
   }
 
@@ -1223,13 +1231,15 @@ export default class FileControl extends React.Component<FileProps, FileState> {
                       onClick={this.handleSelect}
                     >
                       <Icon icon="upload" className="icon" />
-                      {!multiple && files.length
-                        ? __('File.repick')
-                        : multiple && files.length
-                        ? __('File.continueAdd')
-                        : btnLabel
-                        ? btnLabel
-                        : __('File.upload')}
+                      <span>
+                        {!multiple && files.length
+                          ? __('File.repick')
+                          : multiple && files.length
+                          ? __('File.continueAdd')
+                          : btnLabel
+                          ? btnLabel
+                          : __('File.upload')}
+                      </span>
                     </Button>
                   ) : null}
 

package/src/renderers/Form/InputImage.tsx

@@ -29,6 +29,8 @@ import {
   SchemaUrlPath
 } from '../../Schema';
 import {filter} from '../../utils/tpl';
+import isPlainObject from 'lodash/isPlainObject';
+import merge from 'lodash/merge';
 
 /**
  * Image 图片上传控件
@@ -790,8 +792,8 @@ export default class ImageControl extends React.Component<
   }
 
   syncAutoFill() {
-    const {autoFill, multiple, onBulkChange} = this.props;
-    if (!isEmpty(autoFill)) {
+    const {autoFill, multiple, onBulkChange, data} = this.props;
+    if (!isEmpty(autoFill) && onBulkChange) {
       const files = this.state.files.filter(
         file => ~['uploaded', 'init', 'ready'].indexOf(file.state as string)
       );
@@ -803,7 +805,13 @@ export default class ImageControl extends React.Component<
             }
           : files[0]
       );
-      onBulkChange && onBulkChange(toSync);
+
+      Object.keys(toSync).forEach(key => {
+        if (isPlainObject(toSync[key]) && isPlainObject(data[key])) {
+          toSync[key] = merge({}, data[key], toSync[key]);
+        }
+      });
+      onBulkChange(toSync);
     }
   }
 
@@ -1377,7 +1385,6 @@ export default class ImageControl extends React.Component<
                                     fixedSize ? fixedSizeClassName : ''
                                   )}
                                 >
-                                  <p>{__('File.uploading')}</p>
                                   <div className={cx('ImageControl-progress')}>
                                     <span
                                       style={{
@@ -1390,6 +1397,7 @@ export default class ImageControl extends React.Component<
                                       )}
                                     />
                                   </div>
+                                  <p>{__('File.uploading')}</p>
                                 </div>
                               </>
                             ) : (
@@ -1524,7 +1532,10 @@ export default class ImageControl extends React.Component<
                             thumbRatio={thumbRatio}
                           />
                         ) : (
-                          <Icon icon="plus" className="icon" />
+                          <>
+                            <Icon icon="plus" className="icon" />
+                            <span>{__('File.upload')}</span>
+                          </>
                         )}
 
                         {isFocused ? (

package/src/renderers/Form/Item.tsx

@@ -314,7 +314,7 @@ export interface FormItemProps extends RendererProps {
     submitOnChange?: boolean,
     changeImmediately?: boolean
   ) => void;
-  onBulkChange: (
+  onBulkChange?: (
     values: {[propName: string]: any},
     submitOnChange?: boolean
   ) => void;

package/src/renderers/Form/Options.tsx

@@ -48,6 +48,8 @@ import {
   SchemaObject,
   SchemaTokenizeableString
 } from '../../Schema';
+import isPlainObject from 'lodash/isPlainObject';
+import merge from 'lodash/merge';
 
 export {Option};
 
@@ -270,7 +272,8 @@ export function registerOptionsControl(config: OptionsConfig) {
       : [];
     static ComposedComponent = Control;
 
-    reaction?: () => void;
+    toDispose: Array<() => void> = [];
+
     input: any;
     mounted = false;
 
@@ -302,9 +305,18 @@ export function registerOptionsControl(config: OptionsConfig) {
           data
         );
 
-        this.reaction = reaction(
-          () => JSON.stringify([formItem.loading, formItem.filteredOptions]),
-          () => this.mounted && this.forceUpdate()
+        this.toDispose.push(
+          reaction(
+            () => JSON.stringify([formItem.loading, formItem.filteredOptions]),
+            () => this.mounted && this.forceUpdate()
+          )
+        );
+
+        this.toDispose.push(
+          reaction(
+            () => JSON.stringify(formItem.options),
+            () => this.mounted && this.syncAutoFill(formItem.tmpValue)
+          )
         );
         // 默认全选。这里会和默认值\回填值逻辑冲突，所以如果有配置source则不执行默认全选
         if (
@@ -432,14 +444,20 @@ export function registerOptionsControl(config: OptionsConfig) {
 
     componentWillUnmount() {
       this.props.removeHook?.(this.reload, 'init');
-      this.reaction?.();
+      this.toDispose.forEach(fn => fn());
+      this.toDispose = [];
     }
 
     syncAutoFill(value: any) {
       const {autoFill, multiple, onBulkChange, data} = this.props;
       const formItem = this.props.formItem as IFormItemStore;
 
-      if (autoFill && !isEmpty(autoFill) && formItem.filteredOptions.length) {
+      if (
+        onBulkChange &&
+        autoFill &&
+        !isEmpty(autoFill) &&
+        formItem.filteredOptions.length
+      ) {
         const selectedOptions = formItem.getSelectedOptions(value);
         const toSync = dataMapping(
           autoFill,
@@ -471,7 +489,14 @@ export function registerOptionsControl(config: OptionsConfig) {
                 selectedOptions[0]
               )
         );
-        onBulkChange?.(toSync);
+
+        Object.keys(toSync).forEach(key => {
+          if (isPlainObject(toSync[key]) && isPlainObject(data[key])) {
+            toSync[key] = merge({}, data[key], toSync[key]);
+          }
+        });
+
+        onBulkChange(toSync);
       }
     }
 

package/src/renderers/Form/Picker.tsx

@@ -397,14 +397,15 @@ export default class PickerControl extends React.PureComponent<
       options,
       multiple,
       valueField,
-      embed
+      embed,
+      source
     } = this.props;
 
     return render('modal-body', this.state.schema, {
       value: selectedOptions,
       valueField,
       primaryField: valueField,
-      options: options,
+      options: source ? [] : options,
       multiple,
       onSelect: embed ? this.handleChange : undefined,
       ref: this.crudRef,