amis 1.9.0-beta.12 → 1.9.0-beta.15

package/src/Schema.ts

@@ -117,6 +117,8 @@ import {UUIDControlSchema} from './renderers/Form/UUID';
 import {FormControlSchema} from './renderers/Form/Control';
 import {TransferPickerControlSchema} from './renderers/Form/TransferPicker';
 import {TabsTransferPickerControlSchema} from './renderers/Form/TabsTransferPicker';
+import {JSONSchemaEditorControlSchema} from './renderers/Form/JSONSchemaEditor';
+import {TableSchemaV2} from './renderers/Table-v2';
 
 // 每加个类型，这补充一下。
 export type SchemaType =
@@ -168,6 +170,7 @@ export type SchemaType =
   | 'static-image' // 这个几个跟表单项同名，再form下面用必须带前缀 static-
   | 'images'
   | 'static-images' // 这个几个跟表单项同名，再form下面用必须带前缀 static-
+  | 'json-schema-editor'
   | 'json'
   | 'static-json' // 这个几个跟表单项同名，再form下面用必须带前缀 static-
   | 'link'
@@ -198,6 +201,7 @@ export type SchemaType =
   | 'switch'
   | 'table'
   | 'static-table' // 这个几个跟表单项同名，再form下面用必须带前缀 static-
+  | 'table-v2'
   | 'tabs'
   | 'html'
   | 'tpl'
@@ -330,6 +334,7 @@ export type SchemaType =
   | 'table-view'
   | 'portlet'
   | 'grid-nav'
+  | 'tag'
 
   // 原生 input 类型
   | 'native-date'
@@ -389,6 +394,7 @@ export type SchemaObject =
   | StatusSchema
   | SpinnerSchema
   | TableSchema
+  | TableSchemaV2
   | TabsSchema
   | TasksSchema
   | VBoxSchema
@@ -432,6 +438,7 @@ export type SchemaObject =
   | ImageControlSchema
   | InputGroupControlSchema
   | ListControlSchema
+  | JSONSchemaEditorControlSchema
   | LocationControlSchema
   | UUIDControlSchema
   | MatrixControlSchema

package/src/SchemaRenderer.tsx

@@ -20,7 +20,7 @@ import getExprProperties from './utils/filter-schema';
 import {anyChanged, chainEvents, autobind} from './utils/helper';
 import {SimpleMap} from './utils/SimpleMap';
 
-import type {RendererEvent} from './utils/renderer-event';
+import {bindEvent, dispatchEvent, RendererEvent} from './utils/renderer-event';
 import {isAlive} from 'mobx-state-tree';
 import {reaction} from 'mobx';
 import {resolveVariableAndFilter} from './utils/tpl-builtin';
@@ -93,9 +93,8 @@ export class SchemaRenderer extends React.Component<SchemaRendererProps, any> {
   }
 
   componentDidMount() {
-    const {env} = this.props;
     // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
-    this.unbindEvent = env.bindEvent(this.cRef);
+    this.unbindEvent = bindEvent(this.cRef);
   }
 
   componentWillUnmount() {
@@ -206,8 +205,8 @@ export class SchemaRenderer extends React.Component<SchemaRendererProps, any> {
   async dispatchEvent(
     e: React.MouseEvent<any>,
     data: any
-  ): Promise<RendererEvent<any> | undefined> {
-    return await this.props.env.dispatchEvent(e, this.cRef, this.context, data);
+  ): Promise<RendererEvent<any> | void> {
+    return await dispatchEvent(e, this.cRef, this.context, data);
   }
 
   renderChild(

package/src/actions/Action.ts

@@ -1,3 +1,4 @@
+import {RendererProps} from '../factory';
 import {extendObject} from '../utils/helper';
 import {RendererEvent} from '../utils/renderer-event';
 import {evalExpression} from '../utils/tpl';
@@ -29,26 +30,26 @@ export interface LogicAction extends ListenerAction {
   children?: ListenerAction[]; // 子动作
 }
 
-export interface ListenerContext {
+export interface ListenerContext extends React.Component<RendererProps> {
   [propName: string]: any;
 }
 
 // Action 基础接口
-export interface Action {
+export interface RendererAction {
   // 运行这个 Action，每个类型的 Action 都只有一个实例，run 函数是个可重入的函数
   run: (
     action: ListenerAction,
     renderer: ListenerContext,
     event: RendererEvent<any>,
     mergeData?: any // 有些Action内部需要通过上下文数据处理专有逻辑，这里的数据是事件数据+渲染器数据
-  ) => Promise<void>;
+  ) => Promise<RendererEvent<any> | void>;
 }
 
 // 存储 Action 和类型的映射关系，用于后续查找
-const ActionTypeMap: {[key: string]: Action} = {};
+const ActionTypeMap: {[key: string]: RendererAction} = {};
 
 // 注册 Action
-export const registerAction = (type: string, action: Action) => {
+export const registerAction = (type: string, action: RendererAction) => {
   ActionTypeMap[type] = action;
 };
 
@@ -97,7 +98,7 @@ export const runActions = async (
 
 // 执行动作，与原有动作处理打通
 export const runAction = async (
-  actionInstrance: Action,
+  actionInstrance: RendererAction,
   actionConfig: ListenerAction,
   renderer: ListenerContext,
   event: any

package/src/actions/AjaxAction.ts

@@ -1,23 +1,26 @@
+import omit from 'lodash/omit';
 import {Api} from '../types';
 import {normalizeApiResponseData} from '../utils/api';
 import {ServerError} from '../utils/errors';
-import {createObject, isEmpty, isVisible} from '../utils/helper';
+import {createObject, isEmpty} from '../utils/helper';
 import {RendererEvent} from '../utils/renderer-event';
-import {filter} from '../utils/tpl';
 import {
-  Action,
+  RendererAction,
   ListenerAction,
   ListenerContext,
   registerAction
 } from './Action';
 
 export interface IAjaxAction extends ListenerAction {
-  api: Api;
-  messages: {
-    success: string;
-    failed: string;
+  args: {
+    api: Api;
+    messages: {
+      success: string;
+      failed: string;
+    };
+    options: object;
+    [propName: string]: any;
   };
-  options: object;
 }
 
 /**
@@ -27,23 +30,27 @@ export interface IAjaxAction extends ListenerAction {
  * @class AjaxAction
  * @implements {Action}
  */
-export class AjaxAction implements Action {
+export class AjaxAction implements RendererAction {
   async run(
     action: IAjaxAction,
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
+    if (!renderer.props.env?.fetcher) {
+      throw new Error('env.fetcher is required!');
+    }
+
     const env = event.context.env;
     try {
       const result = await env.fetcher(
-        action.api as string,
-        action.args,
-        action.options ?? {}
+        action.args?.api as string,
+        omit(action.args ?? {}, ['api', 'options', 'messages']),
+        action.args?.options ?? {}
       );
 
       if (!isEmpty(result.data) || result.ok) {
         const responseData = normalizeApiResponseData(result.data);
-        // 记录请求返回的数据
+        // 记录请求返回的数据
         event.setData(
           createObject(
             event.data,
@@ -58,20 +65,22 @@ export class AjaxAction implements Action {
 
       if (!result.ok) {
         throw new ServerError(
-          (action.messages && action.messages.failed) ?? result.msg,
+          action.args?.messages?.failed ?? result.msg,
           result
         );
       } else {
-        env.notify(
-          'success',
-          (action.messages && action.messages.success) ?? result.msg,
-          result.msgTimeout !== undefined
-            ? {
-                closeButton: true,
-                timeout: result.msgTimeout
-              }
-            : undefined
-        );
+        const msg = action.args?.messages?.success ?? result.msg;
+        msg &&
+          env.notify(
+            'success',
+            msg,
+            result.msgTimeout !== undefined
+              ? {
+                  closeButton: true,
+                  timeout: result.msgTimeout
+                }
+              : undefined
+          );
       }
 
       return result.data;

package/src/actions/BreakAction.ts

@@ -1,6 +1,6 @@
 import {RendererEvent} from '../utils/renderer-event';
 import {
-  Action,
+  RendererAction,
   ListenerAction,
   ListenerContext,
   LoopStatus,
@@ -14,7 +14,7 @@ import {
  * @class BreakAction
  * @implements {Action}
  */
-export class BreakAction implements Action {
+export class BreakAction implements RendererAction {
   async run(
     action: ListenerAction,
     renderer: ListenerContext,

package/src/actions/BroadcastAction.ts

@@ -1,7 +1,8 @@
+import {RendererProps} from '../factory';
 import {createObject} from '../utils/helper';
-import {RendererEvent} from '../utils/renderer-event';
+import {RendererEvent, dispatchEvent} from '../utils/renderer-event';
 import {
-  Action,
+  RendererAction,
   ListenerAction,
   ListenerContext,
   registerAction
@@ -18,14 +19,14 @@ export interface IBroadcastAction extends ListenerAction {
  * @class BroadcastAction
  * @implements {Action}
  */
-export class BroadcastAction implements Action {
+export class BroadcastAction implements RendererAction {
   async run(
     action: IBroadcastAction,
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
     if (!action.eventName) {
-      console.warn('eventName 未定义，请定义事件名称');
+      console.error('eventName 未定义，请定义事件名称');
       return;
     }
 
@@ -33,7 +34,7 @@ export class BroadcastAction implements Action {
     event.setData(createObject(event.data, action.args));
 
     // 直接触发对应的动作
-    return await event.context.env.dispatchEvent(
+    return await dispatchEvent(
       action.eventName,
       renderer,
       event.context.scoped,

package/src/actions/CmptAction.ts

@@ -1,7 +1,7 @@
 import {RendererEvent} from '../utils/renderer-event';
 import {dataMapping} from '../utils/tpl-builtin';
 import {
-  Action,
+  RendererAction,
   ListenerAction,
   ListenerContext,
   LoopStatus,
@@ -19,7 +19,7 @@ export interface ICmptAction extends ListenerAction {
  * @class CmptAction
  * @implements {Action}
  */
-export class CmptAction implements Action {
+export class CmptAction implements RendererAction {
   async run(
     action: ICmptAction,
     renderer: ListenerContext,
@@ -49,11 +49,10 @@ export class CmptAction implements Action {
 
     // 数据更新
     if (action.actionType === 'setValue') {
-      const value = dataMapping(action.value, event.data);
       if (component.setData) {
-        return component.setData(value);
+        return component.setData(action.args?.value);
       } else {
-        return component.props.onChange?.(value);
+        return component.props.onChange?.(action.args?.value);
       }
     }
 
@@ -63,7 +62,7 @@ export class CmptAction implements Action {
     }
 
     // 执行组件动作
-    return component.doAction?.(action, action.args);
+    return component?.doAction?.(action, action.args);
   }
 }
 

package/src/actions/ContinueAction.ts

@@ -1,6 +1,6 @@
 import {RendererEvent} from '../utils/renderer-event';
 import {
-  Action,
+  RendererAction,
   ListenerAction,
   ListenerContext,
   LoopStatus,
@@ -14,7 +14,7 @@ import {
  * @class ContinueAction
  * @implements {Action}
  */
-export class ContinueAction implements Action {
+export class ContinueAction implements RendererAction {
   async run(
     action: ListenerAction,
     renderer: ListenerContext,

package/src/actions/CopyAction.ts

@@ -1,16 +1,18 @@
 import {RendererEvent} from '../utils/renderer-event';
 import {filter} from '../utils/tpl';
 import {
-  Action,
+  RendererAction,
   ListenerAction,
   ListenerContext,
-  LoopStatus,
   registerAction
 } from './Action';
 
 export interface ICopyAction extends ListenerAction {
-  content: string;
-  copyFormat?: string;
+  args: {
+    content: string;
+    copyFormat?: string;
+    [propName: string]: any;
+  };
 }
 
 /**
@@ -20,15 +22,19 @@ export interface ICopyAction extends ListenerAction {
  * @class CopyAction
  * @implements {Action}
  */
-export class CopyAction implements Action {
+export class CopyAction implements RendererAction {
   async run(
     action: ICopyAction,
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
-    if (action.content) {
-      renderer.props.env.copy?.(filter(action.content, action.args, '| raw'), {
-        format: action.copyFormat
+    if (!renderer.props.env?.copy) {
+      throw new Error('env.copy is required!');
+    }
+
+    if (action.args?.content) {
+      renderer.props.env.copy?.(action.args.content, {
+        format: action.args?.copyFormat ?? 'text/html'
       });
     }
   }

package/src/actions/CustomAction.ts

@@ -1,6 +1,6 @@
 import {RendererEvent} from '../utils/renderer-event';
 import {
-  Action,
+  RendererAction,
   ListenerAction,
   ListenerContext,
   LoopStatus,
@@ -18,7 +18,7 @@ export interface ICustomAction extends ListenerAction {
  * @class CustomAction
  * @implements {Action}
  */
-export class CustomAction implements Action {
+export class CustomAction implements RendererAction {
   async run(
     action: ICustomAction,
     renderer: ListenerContext,

package/src/actions/DialogAction.ts

@@ -1,19 +1,25 @@
 import {SchemaNode} from '../types';
 import {RendererEvent} from '../utils/renderer-event';
 import {
-  Action,
+  RendererAction,
   ListenerAction,
   ListenerContext,
   registerAction
 } from './Action';
 
 export interface IAlertAction extends ListenerAction {
-  msg: string;
+  args: {
+    msg: string;
+    [propName: string]: any;
+  };
 }
 
 export interface IConfirmAction extends ListenerAction {
-  title: string;
-  msg: string;
+  args: {
+    title: string;
+    msg: string;
+    [propName: string]: any;
+  };
 }
 
 export interface IDialogAction extends ListenerAction {
@@ -27,7 +33,7 @@ export interface IDialogAction extends ListenerAction {
  * @class DialogAction
  * @implements {Action}
  */
-export class DialogAction implements Action {
+export class DialogAction implements RendererAction {
   async run(
     action: IDialogAction,
     renderer: ListenerContext,
@@ -44,7 +50,7 @@ export class DialogAction implements Action {
  * @class CloseDialogAction
  * @implements {Action}
  */
-export class CloseDialogAction implements Action {
+export class CloseDialogAction implements RendererAction {
   async run(
     action: ListenerAction,
     renderer: ListenerContext,
@@ -70,26 +76,26 @@ export class CloseDialogAction implements Action {
 /**
  * alert提示动作
  */
-export class AlertAction implements Action {
+export class AlertAction implements RendererAction {
   async run(
     action: IAlertAction,
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
-    event.context.env.alert?.(action.msg);
+    event.context.env.alert?.(action.args?.msg);
   }
 }
 
 /**
  * confirm确认提示动作
  */
-export class ConfirmAction implements Action {
+export class ConfirmAction implements RendererAction {
   async run(
     action: IConfirmAction,
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
-    event.context.env.confirm?.(action.msg, action.title);
+    event.context.env.confirm?.(action.args?.msg, action.args?.title);
   }
 }
 

package/src/actions/DrawerAction.ts

@@ -1,7 +1,7 @@
 import {SchemaNode} from '../types';
 import {RendererEvent} from '../utils/renderer-event';
 import {
-  Action,
+  RendererAction,
   ListenerAction,
   ListenerContext,
   registerAction
@@ -18,7 +18,7 @@ export interface IDrawerAction extends ListenerAction {
  * @class DrawerAction
  * @implements {Action}
  */
-export class DrawerAction implements Action {
+export class DrawerAction implements RendererAction {
   async run(
     action: IDrawerAction,
     renderer: ListenerContext,
@@ -35,7 +35,7 @@ export class DrawerAction implements Action {
  * @class CloseDrawerAction
  * @implements {Action}
  */
-export class CloseDrawerAction implements Action {
+export class CloseDrawerAction implements RendererAction {
   async run(
     action: ListenerAction,
     renderer: ListenerContext,

package/src/actions/EmailAction.ts

@@ -4,18 +4,21 @@ import pick from 'lodash/pick';
 import mapValues from 'lodash/mapValues';
 import qs from 'qs';
 import {
-  Action,
+  RendererAction,
   ListenerAction,
   ListenerContext,
   registerAction
 } from './Action';
 
 export interface IEmailAction extends ListenerAction {
-  to: string;
-  cc: string;
-  bcc: string;
-  subject: string;
-  body: string;
+  args: {
+    to: string;
+    cc: string;
+    bcc: string;
+    subject: string;
+    body: string;
+    [propName: string]: any;
+  };
 }
 
 /**
@@ -25,17 +28,14 @@ export interface IEmailAction extends ListenerAction {
  * @class EmailAction
  * @implements {Action}
  */
-export class EmailAction implements Action {
+export class EmailAction implements RendererAction {
   async run(
     action: IEmailAction,
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
-    const mailTo = filter(action.to, action.args);
-    const mailInfo = mapValues(
-      pick(action, 'cc', 'bcc', 'subject', 'body'),
-      val => filter(val, action.args)
-    );
+    const mailTo = action.args?.to;
+    const mailInfo = pick(action.args ?? {}, 'cc', 'bcc', 'subject', 'body');
     const mailStr = qs.stringify(mailInfo);
     const mailto = `mailto:${mailTo}?${mailStr}`;
 

package/src/actions/LinkAction.ts

@@ -1,27 +1,37 @@
+import {Action} from '../types';
 import {buildApi} from '../utils/api';
 import {isEmpty, isObject, qsstringify} from '../utils/helper';
 import {RendererEvent} from '../utils/renderer-event';
 import {filter} from '../utils/tpl';
+import omit from 'lodash/omit';
 import {
-  Action,
+  RendererAction,
   ListenerAction,
   ListenerContext,
   registerAction
 } from './Action';
 
 export interface ILinkAction extends ListenerAction {
-  link: string;
-  url?: never;
-  params?: {
-    [key: string]: string;
+  args: {
+    link: string;
+    url?: never;
+    blank?: boolean;
+    params?: {
+      [key: string]: string;
+    };
+    [propName: string]: any;
   };
 }
 
 export interface IUrlAction extends ListenerAction {
-  url: string;
-  link?: never;
-  params?: {
-    [key: string]: string;
+  args: {
+    url: string;
+    link?: never;
+    blank?: boolean;
+    params?: {
+      [key: string]: string;
+    };
+    [propName: string]: any;
   };
 }
 
@@ -32,9 +42,9 @@ export interface IUrlAction extends ListenerAction {
  * @class LinkAction
  * @implements {Action}
  */
-export class LinkAction implements Action {
+export class LinkAction implements RendererAction {
   async run(
-    action: ILinkAction | IUrlAction,
+    action: ListenerAction,
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
@@ -45,16 +55,26 @@ export class LinkAction implements Action {
     // 通过buildApi兼容较复杂的url情况
     let urlObj = buildApi(
       {
-        url: (action.url || action.link) as string,
+        url: (action.args?.url || action.args?.link) as string,
         method: 'get'
       },
-      {...action.params, ...action.args},
+      {
+        ...(action.args?.params ?? {}),
+        ...omit(action.args ?? {}, ['params', 'blank', 'url', 'link'])
+      },
       {
         autoAppend: true
       }
     );
 
-    renderer.props.env.jumpTo(urlObj.url, action, action.args);
+    renderer.props.env.jumpTo(
+      urlObj.url,
+      {
+        actionType: action.actionType,
+        ...action.args
+      },
+      action.args
+    );
   }
 }