amis 1.9.0-beta.10 → 1.9.0-beta.12

package/src/actions/LinkAction.ts

@@ -1,3 +1,4 @@
+import {buildApi} from '../utils/api';
 import {isEmpty, isObject, qsstringify} from '../utils/helper';
 import {RendererEvent} from '../utils/renderer-event';
 import {filter} from '../utils/tpl';
@@ -10,7 +11,15 @@ import {
 
 export interface ILinkAction extends ListenerAction {
   link: string;
+  url?: never;
+  params?: {
+    [key: string]: string;
+  };
+}
+
+export interface IUrlAction extends ListenerAction {
   url: string;
+  link?: never;
   params?: {
     [key: string]: string;
   };
@@ -25,7 +34,7 @@ export interface ILinkAction extends ListenerAction {
  */
 export class LinkAction implements Action {
   async run(
-    action: ILinkAction,
+    action: ILinkAction | IUrlAction,
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
@@ -33,21 +42,19 @@ export class LinkAction implements Action {
       throw new Error('env.jumpTo is required!');
     }
 
-    let url = (action.url || action.link) as string;
-
-    // 处理参数
-    if (!isEmpty(action.params)) {
-      if (!isObject(action.params)) {
-        throw new Error('action.params must be an object');
+    // 通过buildApi兼容较复杂的url情况
+    let urlObj = buildApi(
+      {
+        url: (action.url || action.link) as string,
+        method: 'get'
+      },
+      {...action.params, ...action.args},
+      {
+        autoAppend: true
       }
-      url = `${/\?/.test(url) ? '&' : '?'}${qsstringify(action.params)}`;
-    }
-
-    renderer.props.env.jumpTo(
-      filter(url, action.args, '| raw'),
-      action,
-      action.args
     );
+
+    renderer.props.env.jumpTo(urlObj.url, action, action.args);
   }
 }
 

package/src/actions/ToastAction.ts

@@ -5,6 +5,7 @@ import {
   ListenerContext,
   registerAction
 } from './Action';
+import {resolveVariableAndFilter} from '../utils/tpl-builtin';
 
 export interface IToastAction extends ListenerAction {
   msg: string;
@@ -31,7 +32,11 @@ export class ToastAction implements Action {
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
-    event.context.env.notify?.(action.msgType || 'info', action.msg, action);
+    event.context.env.notify?.(
+      action.msgType || 'info',
+      resolveVariableAndFilter(action.msg, event?.data, '| raw'),
+      action
+    );
   }
 }
 

package/src/components/Tree.tsx

@@ -88,14 +88,21 @@ interface TreeSelectorProps extends ThemeProps, LocaleProps {
   pathSeparator?: string;
   // 已选择节点路径
   nodePath: any[];
-
-  // 这个配置名字没取好，目前的含义是，如果这个配置成true，点父级的时候，子级点不会自选中。
-  // 否则点击父级，子节点选中。
+  // ui级联关系，true代表级联选中，false代表不级联，默认为true
+  autoCheckChildren: boolean;
+
+  /*
+   * 该属性代表数据级联关系，autoCheckChildren为true时生效，默认为false，具体数据级联关系如下：
+   * 1.casacde为false，ui行为为级联选中子节点，子节点禁用；值只包含父节点的值
+   * 2.cascade为false，withChildren为true，ui行为为级联选中子节点，子节点禁用；值包含父子节点的值
+   * 3.cascade为true，ui行为级联选中子节点，子节点可反选，值包含父子节点的值，此时withChildren属性失效
+   * 4.cascade不论为true还是false，onlyChildren为true，ui行为级联选中子节点，子节点可反选，值只包含子节点的值
+  */
   cascade?: boolean;
+
   selfDisabledAffectChildren?: boolean;
   minLength?: number;
   maxLength?: number;
-
   // 是否为内建 增、改、删。当有复杂表单的时候直接抛出去让外层能统一处理
   bultinCUD?: boolean;
   rootCreatable?: boolean;
@@ -157,6 +164,7 @@ export class TreeSelector extends React.Component<
     hideRoot: true,
     rootLabel: 'Tree.root',
     rootValue: 0,
+    autoCheckChildren: true,
     cascade: false,
     selfDisabledAffectChildren: true,
     rootCreateTip: 'Tree.addRoot',
@@ -182,7 +190,6 @@ export class TreeSelector extends React.Component<
 
   constructor(props: TreeSelectorProps) {
     super(props);
-
     this.state = {
       value: value2array(
         props.value,
@@ -279,7 +286,7 @@ export class TreeSelector extends React.Component<
         } else if (foldedField && typeof node[foldedField] !== 'undefined') {
           ret = !node[foldedField];
         } else {
-          ret = !!props.initiallyOpen;
+          ret = !!props.initiallyOpen && !initFoldedLevel;
           if (!ret && level <= (expandLevel as number)) {
             ret = true;
           }
@@ -412,15 +419,12 @@ export class TreeSelector extends React.Component<
     const props = this.props;
     const value = this.state.value.concat();
     const idx = value.indexOf(item);
-    const onlyChildren = props.onlyChildren;
-
+    const {onlyChildren, withChildren, cascade, autoCheckChildren} = props;
     if (checked) {
       ~idx || value.push(item);
-
       // cascade 为 true 表示父节点跟子节点没有级联关系。
-      if (!props.cascade) {
+      if (autoCheckChildren) {
         const children = item.children ? item.children.concat([]) : [];
-
         if (onlyChildren) {
           // 父级选中的时候，子节点也都选中，但是自己不选中
           !~idx && children.length && value.pop();
@@ -445,7 +449,7 @@ export class TreeSelector extends React.Component<
               value.splice(index, 1);
             }
 
-            if (props.withChildren) {
+            if (withChildren || cascade) {
               value.push(child);
             }
 
@@ -464,7 +468,7 @@ export class TreeSelector extends React.Component<
               if (
                 parent.children.every((child: any) => ~value.indexOf(child))
               ) {
-                if (!props.withChildren) {
+                if (!cascade && !withChildren) {
                   parent.children.forEach((child: any) => {
                     const index = value.indexOf(child);
                     if (~index) {
@@ -483,19 +487,18 @@ export class TreeSelector extends React.Component<
       }
     } else {
       ~idx && value.splice(idx, 1);
-
-      if (!props.cascade && (props.withChildren || onlyChildren)) {
-        const children = item.children ? item.children.concat([]) : [];
-        while (children.length) {
-          let child = children.shift();
-          let index = value.indexOf(child);
-
-          if (~index) {
-            value.splice(index, 1);
-          }
-
-          if (child.children && child.children.length) {
-            children.push.apply(children, child.children);
+      if (autoCheckChildren) {
+        if (cascade || withChildren || onlyChildren) {
+          const children = item.children ? item.children.concat([]) : [];
+          while (children.length) {
+            let child = children.shift();
+            let index = value.indexOf(child);
+            if (~index) {
+              value.splice(index, 1);
+            }
+            if (child.children && child.children.length) {
+              children.push.apply(children, child.children);
+            }
           }
         }
       }
@@ -664,7 +667,6 @@ export class TreeSelector extends React.Component<
   @autobind
   getDropInfo(e: React.DragEvent<Element>, node: Option): IDropInfo {
     let rect = e.currentTarget.getBoundingClientRect();
-
     const dragNode = this.dragNode;
     const deltaX = Math.min(50, rect.width * 0.3);
     const gap = node?.children?.length ? 0 : 16;
@@ -676,7 +678,6 @@ export class TreeSelector extends React.Component<
     let top = targetOffset.top - offset.top;
 
     let {clientX, clientY} = e;
-
     let position: IDropInfo['position'] =
       clientY >= rect.top + rect.height / 2 ? 'bottom' : 'top';
     let indicator;
@@ -788,6 +789,7 @@ export class TreeSelector extends React.Component<
       valueField,
       iconField,
       disabledField,
+      autoCheckChildren,
       cascade,
       selfDisabledAffectChildren,
       onlyChildren,
@@ -818,7 +820,6 @@ export class TreeSelector extends React.Component<
       if (!isVisible(item as any, options)) {
         return null;
       }
-
       const checked = !!~value.indexOf(item);
       const selfDisabled = item[disabledField];
       let selfChecked = !!uncheckable || checked;
@@ -829,16 +830,15 @@ export class TreeSelector extends React.Component<
         childrenItems = this.renderList(
           item.children,
           value,
-          cascade
-            ? false
-            : uncheckable ||
-                (selfDisabledAffectChildren ? selfDisabled : false) ||
-                (multiple && checked)
+          (!autoCheckChildren || cascade)
+            ? false: (uncheckable
+            || (selfDisabledAffectChildren ? selfDisabled : false)
+            || (multiple && checked))
         );
         selfChildrenChecked = !!childrenItems.childrenChecked;
         if (
           !selfChecked &&
-          onlyChildren &&
+          onlyChildren && autoCheckChildren &&
           item.children.length === childrenItems.childrenChecked
         ) {
           selfChecked = true;
@@ -864,7 +864,7 @@ export class TreeSelector extends React.Component<
         <Checkbox
           size="sm"
           disabled={nodeDisabled}
-          checked={selfChecked || (!cascade && selfChildrenChecked)}
+          checked={selfChecked || (autoCheckChildren && selfChildrenChecked)}
           partial={!selfChecked}
           onChange={this.handleCheck.bind(this, item, !selfChecked)}
         />

package/src/renderers/Action.tsx

@@ -867,10 +867,7 @@ export class ActionRenderer extends React.Component<
     const {env, onAction, data, ignoreConfirm, dispatchEvent} = this.props;
 
     // 触发渲染器事件
-    const rendererEvent = await dispatchEvent(
-      e as React.MouseEvent<any>,
-      createObject(data, action)
-    );
+    const rendererEvent = await dispatchEvent(e as React.MouseEvent<any>, data);
 
     // 阻止原有动作执行
     if (rendererEvent?.prevented) {

package/src/renderers/CRUD.tsx

@@ -404,6 +404,8 @@ export default class CRUD extends React.Component<CRUDProps, any> {
 
   control: any;
   lastQuery: any;
+  lastData: any;
+
   timer: ReturnType<typeof setTimeout>;
   mounted: boolean;
   constructor(props: CRUDProps) {
@@ -571,15 +573,11 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     ) {
       dataInvalid = true;
     } else if (!props.api && isPureVariable(props.source)) {
-      const prev = resolveVariableAndFilter(
-        prevProps.source,
-        prevProps.data,
-        '| raw'
-      );
       const next = resolveVariableAndFilter(props.source, props.data, '| raw');
 
-      if (prev !== next) {
+      if (!this.lastData || this.lastData !== next) {
         store.initFromScope(props.data, props.source);
+        this.lastData = next;
       }
     }
 

package/src/renderers/Dialog.tsx

@@ -751,7 +751,7 @@ export class DialogRenderer extends Dialog {
     ) {
       const rendererEvent = await dispatchEvent(
         'cancel',
-        createObject(this.props.data, {data})
+        createObject(this.props.data, data)
       );
       if (rendererEvent?.prevented) {
         return;
@@ -762,7 +762,7 @@ export class DialogRenderer extends Dialog {
     } else if (action.actionType === 'confirm') {
       const rendererEvent = await dispatchEvent(
         'confirm',
-        createObject(this.props.data, {data})
+        createObject(this.props.data, data)
       );
       if (rendererEvent?.prevented) {
         return;

package/src/renderers/Drawer.tsx

@@ -849,7 +849,7 @@ export class DrawerRenderer extends Drawer {
     if (action.actionType === 'close' || action.actionType === 'cancel') {
       const rendererEvent = await dispatchEvent(
         'cancel',
-        createObject(this.props.data, {data})
+        createObject(this.props.data, data)
       );
       if (rendererEvent?.prevented) {
         return;
@@ -860,7 +860,7 @@ export class DrawerRenderer extends Drawer {
     } else if (action.actionType === 'confirm') {
       const rendererEvent = await dispatchEvent(
         'confirm',
-        createObject(this.props.data, {data})
+        createObject(this.props.data, data)
       );
       if (rendererEvent?.prevented) {
         return;

package/src/renderers/Form/InputFile.tsx

@@ -2,8 +2,6 @@ import React from 'react';
 import {FormItem, FormControlProps, FormBaseControl} from './Item';
 import find from 'lodash/find';
 import isPlainObject from 'lodash/isPlainObject';
-// @ts-ignore
-import mapLimit from 'async/mapLimit';
 import ImageControl from './InputImage';
 import {Payload, ApiObject, ApiString, Action} from '../../types';
 import {filter} from '../../utils/tpl';
@@ -83,6 +81,11 @@ export interface FileControlSchema extends FormBaseControl {
    */
   chunkSize?: number;
 
+  /**
+   * 分块上传的并发数
+   */
+  concurrency?: number;
+
   /**
    * 分割符
    */
@@ -302,6 +305,7 @@ export default class FileControl extends React.Component<FileProps, FileState> {
     startChunkApi: '/api/upload/startChunk',
     chunkApi: '/api/upload/chunk',
     finishChunkApi: '/api/upload/finishChunk',
+    concurrency: 3,
     accept: '',
     multiple: false,
     autoUpload: true,
@@ -979,6 +983,7 @@ export default class FileControl extends React.Component<FileProps, FileState> {
     onProgress: (progress: number) => void
   ): Promise<Payload> {
     const chunkSize = config.chunkSize || 5 * 1024 * 1024;
+    const concurrency = this.props.concurrency;
     const self = this;
     let startProgress = 0.2;
     let endProgress = 0.9;
@@ -1020,7 +1025,7 @@ export default class FileControl extends React.Component<FileProps, FileState> {
 
       self._send(file, startApi).then(startChunk).catch(reject);
 
-      function startChunk(ret: Payload) {
+      async function startChunk(ret: Payload) {
         onProgress(startProgress);
         const tasks = getTasks(file);
         progressArr = tasks.map(() => 0);
@@ -1036,18 +1041,25 @@ export default class FileControl extends React.Component<FileProps, FileState> {
           total: tasks.length
         };
 
-        mapLimit(
-          tasks,
-          3,
-          uploadPartFile(state, config),
-          function (err: any, results: any) {
-            if (err) {
-              reject(err);
-            } else {
-              finishChunk(results, state);
-            }
-          }
-        );
+        let results: any[] = [];
+        while (tasks.length) {
+          const res = await Promise.all(
+            tasks.splice(0, concurrency).map(async task => {
+              return await uploadPartFile(state, config)(
+                task,
+                (err: any, value: any) => {
+                  if (err) {
+                    reject(err);
+                    throw new Error(err);
+                  }
+                  return value;
+                }
+              );
+            })
+          );
+          results = results.concat(res);
+        }
+        finishChunk(results, state);
       }
 
       function updateProgress(partNumber: number, progress: number) {

package/src/renderers/Form/InputTree.tsx

@@ -39,7 +39,16 @@ export interface TreeControlSchema extends FormOptionsControl {
   showIcon?: boolean;
 
   /**
-   * 父子之间是否完全独立。
+   * ui级联关系，true代表级联选中，false代表不级联，默认为true
+   */
+  autoCheckChildren?: boolean;
+
+  /**
+   * 该属性代表数据级联关系，autoCheckChildren为true时生效，默认为false，具体数据级联关系如下：
+   * 1.casacde为false，ui行为为级联选中子节点，子节点禁用；值只包含父节点的值
+   * 2.cascade为false，withChildren为true，ui行为为级联选中子节点，子节点禁用；值包含父子节点的值
+   * 3.cascade为true，ui行为级联选中子节点，子节点可反选，值包含父子节点的值，此时withChildren属性失效
+   * 4.cascade不论为true还是false，onlyChildren为true，ui行为级联选中子节点，子节点可反选，值只包含子节点的值
    */
   cascade?: boolean;
 
@@ -166,6 +175,7 @@ export default class TreeControl extends React.Component<TreeProps> {
       loading,
       hideRoot,
       rootLabel,
+      autoCheckChildren,
       cascade,
       rootValue,
       showIcon,
@@ -222,6 +232,7 @@ export default class TreeControl extends React.Component<TreeProps> {
             showIcon={showIcon}
             showRadio={showRadio}
             showOutline={showOutline}
+            autoCheckChildren={autoCheckChildren}
             cascade={cascade}
             foldedField="collapsed"
             value={value || ''}

package/src/renderers/Form/Picker.tsx

@@ -22,7 +22,11 @@ import Html from '../../components/Html';
 import {filter} from '../../utils/tpl';
 import {Icon} from '../../components/icons';
 import {isEmpty} from '../../utils/helper';
-import {dataMapping} from '../../utils/tpl-builtin';
+import {
+  dataMapping,
+  isPureVariable,
+  resolveVariableAndFilter
+} from '../../utils/tpl-builtin';
 import {SchemaCollection, SchemaTpl} from '../../Schema';
 import {CRUDSchema} from '../CRUD';
 import {isApiOutdated, isEffectiveApi} from '../../utils/api';
@@ -162,13 +166,18 @@ export default class PickerControl extends React.PureComponent<
       op: 'loadOptions'
     });
 
-    isEffectiveApi(source, ctx) &&
+    if (isPureVariable(source)) {
+      formItem.setOptions(resolveVariableAndFilter(source, data, '| raw'));
+    } else if (isEffectiveApi(source, ctx)) {
       formItem.loadOptions(source, ctx, {
         autoAppend: true
       });
+    }
   }
 
   buildSchema(props: PickerProps) {
+    const isScopeData = isPureVariable(props.source);
+
     return {
       checkOnItemClick: true,
       ...props.pickerSchema,
@@ -176,7 +185,8 @@ export default class PickerControl extends React.PureComponent<
       type: 'crud',
       pickerMode: true,
       syncLocation: false,
-      api: props.source,
+      api: isScopeData ? null : props.source,
+      source: isScopeData ? props.source : null,
       keepItemSelectionOnPageChange: true,
       valueField: props.valueField,
       labelField: props.labelField,

package/src/renderers/Form/index.tsx

@@ -657,12 +657,15 @@ export default class Form extends React.Component<FormProps, object> {
       };
     }
 
-    persistData && store.getLocalPersistData();
+    if (persistData) {
+      store.getLocalPersistData();
+      data = cloneObject(store.data);
+    }
 
     // 派发init事件，参数为初始化数据
     const dispatcher = dispatchEvent(
       'inited',
-      createObject(this.props.data, {formData: data})
+      createObject(this.props.data, data)
     );
     if (!dispatcher?.prevented) {
       onInit && onInit(data, this.props);
@@ -874,10 +877,7 @@ export default class Form extends React.Component<FormProps, object> {
     if (!isAlive(store)) {
       return;
     }
-    const dispatcher = dispatchEvent(
-      'change',
-      createObject(data, {formData: store.data})
-    );
+    const dispatcher = dispatchEvent('change', createObject(data, store.data));
     if (!dispatcher?.prevented) {
       onChange &&
         onChange(

package/src/renderers/Service.tsx

@@ -31,6 +31,9 @@ import {
 } from '../Schema';
 import {IIRendererStore} from '../store';
 
+import type {ScopedComponentType} from '../Scoped';
+import type {ListenerAction} from '../actions/Action';
+
 /**
  * Service 服务类控件。
  * 文档：https://baidu.gitee.io/amis/docs/components/service
@@ -209,6 +212,32 @@ export default class Service extends React.Component<ServiceProps> {
     }
   }
 
+  doAction(action: ListenerAction, args: any) {
+    if (action?.actionType === 'rebuild') {
+      const {
+        schemaApi,
+        store,
+        dataProvider,
+        messages: {fetchSuccess, fetchFailed}
+      } = this.props;
+
+      store.updateData(args);
+      clearTimeout(this.timer);
+      if (isEffectiveApi(schemaApi, store.data)) {
+        store
+          .fetchSchema(schemaApi, store.data, {
+            successMessage: fetchSuccess,
+            errorMessage: fetchFailed
+          })
+          .then(this.afterSchemaFetch);
+      }
+
+      if (dataProvider) {
+        this.runDataProvider();
+      }
+    }
+  }
+
   @autobind
   initFetch() {
     const {
@@ -331,7 +360,10 @@ export default class Service extends React.Component<ServiceProps> {
     // 初始化接口返回的是整个 response，
     // 保存 ajax 请求的时候返回时数据部分。
     const data = result?.hasOwnProperty('ok') ? result.data : result;
-    const {onBulkChange} = this.props;
+    const {onBulkChange, dispatchEvent} = this.props;
+
+    dispatchEvent?.('fetchInited', data);
+
     if (!isEmpty(data) && onBulkChange) {
       onBulkChange(data);
     }
@@ -340,7 +372,10 @@ export default class Service extends React.Component<ServiceProps> {
   }
 
   afterSchemaFetch(schema: any) {
-    const {onBulkChange, formStore} = this.props;
+    const {onBulkChange, formStore, dispatchEvent} = this.props;
+
+    dispatchEvent?.('fetchSchemaInited', schema);
+
     if (formStore && schema?.data && onBulkChange) {
       onBulkChange && onBulkChange(schema.data);
     }
@@ -586,7 +621,7 @@ export class ServiceRenderer extends Service {
     super(props);
 
     const scoped = context;
-    scoped.registerComponent(this);
+    scoped.registerComponent(this as ScopedComponentType);
   }
 
   reload(subpath?: string, query?: any, ctx?: any, silent?: boolean) {
@@ -613,7 +648,7 @@ export class ServiceRenderer extends Service {
   componentWillUnmount() {
     super.componentWillUnmount();
     const scoped = this.context as IScopedContext;
-    scoped.unRegisterComponent(this);
+    scoped.unRegisterComponent(this as ScopedComponentType);
   }
 
   reloadTarget(target: string, data?: any) {
@@ -622,6 +657,6 @@ export class ServiceRenderer extends Service {
   }
 
   setData(values: object) {
-    return super.afterDataFetch(values);
+    return this.props.store.updateData(values);
   }
 }

package/src/renderers/Wizard.tsx

@@ -342,7 +342,7 @@ export default class Wizard extends React.Component<WizardProps, WizardState> {
 
     const rendererEvent = await dispatchEvent(
       action,
-      createObject(data, value ? value : {})
+      value ? createObject(data, value) : data
     );
 
     return rendererEvent?.prevented ?? false;
@@ -350,9 +350,7 @@ export default class Wizard extends React.Component<WizardProps, WizardState> {
 
   async handleInitEvent(data: any) {
     const {onInit} = this.props;
-    (await this.dispatchEvent('inited', {formData: data})) &&
-      onInit &&
-      onInit(data);
+    (await this.dispatchEvent('inited', data)) && onInit && onInit(data);
   }
 
   @autobind
@@ -390,8 +388,7 @@ export default class Wizard extends React.Component<WizardProps, WizardState> {
     if (index != this.state.currentStep) {
       if (
         await this.dispatchEvent('stepChange', {
-          step: index,
-          formData: this.props.store.data
+          step: index
         })
       ) {
         return;
@@ -812,7 +809,7 @@ export default class Wizard extends React.Component<WizardProps, WizardState> {
         store
           .saveRemote(action.api || step.api!, store.data, {
             onSuccess: () => {
-              this.dispatchEvent('stepSubmitSucc', {formData: store.data});
+              this.dispatchEvent('stepSubmitSucc');
 
               if (
                 !isEffectiveApi(finnalAsyncApi, store.data) ||