amis 1.9.0-beta.13 → 1.9.0-beta.14

package/src/actions/AjaxAction.ts

@@ -1,9 +1,9 @@
+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 {
   RendererAction,
   ListenerAction,
@@ -12,12 +12,15 @@ import {
 } 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;
 }
 
 /**
@@ -33,17 +36,21 @@ export class AjaxAction implements RendererAction {
     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 RendererAction {
 
       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/BroadcastAction.ts

@@ -26,7 +26,7 @@ export class BroadcastAction implements RendererAction {
     event: RendererEvent<any>
   ) {
     if (!action.eventName) {
-      console.warn('eventName 未定义，请定义事件名称');
+      console.error('eventName 未定义，请定义事件名称');
       return;
     }
 

package/src/actions/CmptAction.ts

@@ -49,11 +49,10 @@ export class CmptAction implements RendererAction {
 
     // 数据更新
     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);
       }
     }
 

package/src/actions/CopyAction.ts

@@ -4,13 +4,15 @@ import {
   RendererAction,
   ListenerAction,
   ListenerContext,
-  LoopStatus,
   registerAction
 } from './Action';
 
 export interface ICopyAction extends ListenerAction {
-  content: string;
-  copyFormat?: string;
+  args: {
+    content: string;
+    copyFormat?: string;
+    [propName: string]: any;
+  };
 }
 
 /**
@@ -26,9 +28,13 @@ export class CopyAction implements RendererAction {
     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/DialogAction.ts

@@ -8,12 +8,18 @@ import {
 } 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 {
@@ -76,7 +82,7 @@ export class AlertAction implements RendererAction {
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
-    event.context.env.alert?.(action.msg);
+    event.context.env.alert?.(action.args?.msg);
   }
 }
 
@@ -89,7 +95,7 @@ export class ConfirmAction implements RendererAction {
     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/EmailAction.ts

@@ -11,11 +11,14 @@ import {
 } 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;
+  };
 }
 
 /**
@@ -31,11 +34,8 @@ export class EmailAction implements RendererAction {
     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

@@ -3,6 +3,7 @@ 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 {
   RendererAction,
   ListenerAction,
@@ -11,20 +12,26 @@ import {
 } from './Action';
 
 export interface ILinkAction extends ListenerAction {
-  link: string;
-  url?: never;
-  blank?: boolean;
-  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;
-  blank?: boolean;
-  params?: {
-    [key: string]: string;
+  args: {
+    url: string;
+    link?: never;
+    blank?: boolean;
+    params?: {
+      [key: string]: string;
+    };
+    [propName: string]: any;
   };
 }
 
@@ -37,7 +44,7 @@ export interface IUrlAction extends ListenerAction {
  */
 export class LinkAction implements RendererAction {
   async run(
-    action: ILinkAction | IUrlAction,
+    action: ListenerAction,
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
@@ -48,16 +55,26 @@ export class LinkAction implements RendererAction {
     // 通过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 as Action, action.args);
+    renderer.props.env.jumpTo(
+      urlObj.url,
+      {
+        actionType: action.actionType,
+        ...action.args
+      },
+      action.args
+    );
   }
 }
 

package/src/actions/LoopAction.ts

@@ -13,7 +13,10 @@ import {
 import {resolveVariable} from '../utils/tpl-builtin';
 
 export interface ILoopAction extends ListenerAction, LogicAction {
-  loopName: string;
+  args: {
+    loopName: string;
+    [propName: string]: any;
+  };
 }
 
 /**
@@ -30,18 +33,19 @@ export class LoopAction implements RendererAction {
     event: RendererEvent<any>,
     mergeData: any
   ) {
-    if (typeof action.loopName !== 'string') {
-      console.warn('loopName 必须是字符串类型');
+    const loopName = action.args?.loopName;
+    if (typeof loopName !== 'string') {
+      console.error('loopName 必须是字符串类型');
       return;
     }
 
-    const loopData = resolveVariable(action.loopName, mergeData) || [];
+    const loopData = resolveVariable(loopName, mergeData) || [];
 
     // 必须是数组
     if (!loopData) {
-      console.warn(`没有找到数据 ${action.loopName}`);
+      console.error(`没有找到数据 ${loopName}`);
     } else if (!Array.isArray(loopData)) {
-      console.warn(`${action.loopName} 数据不是数组`);
+      console.error(`${loopName} 数据不是数组`);
     } else if (action.children?.length) {
       // 暂存一下
       const protoData = event.data;
@@ -62,6 +66,7 @@ export class LoopAction implements RendererAction {
           if (renderer.loopStatus === LoopStatus.BREAK || event.stoped) {
             // 还原事件数据
             event.setData(protoData);
+            event.stopPropagation();
             break;
           }
         }

package/src/actions/PageAction.ts

@@ -7,7 +7,10 @@ import {
 } from './Action';
 
 export interface IPageGoAction extends ListenerAction {
-  delta?: number;
+  args: {
+    delta?: number;
+    [propName: string]: any;
+  };
 }
 
 /**
@@ -40,7 +43,7 @@ export class PageGoAction implements RendererAction {
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
-    window.history.go(action.delta || 0);
+    window.history.go(action.args?.delta || 0);
   }
 }
 

package/src/actions/ToastAction.ts

@@ -32,8 +32,15 @@ export class ToastAction implements RendererAction {
     renderer: ListenerContext,
     event: RendererEvent<any>
   ) {
-    const msg = resolveVariableAndFilter(action.msg, action.args, '| raw');
-    event.context.env.notify?.(action.msgType || 'info', String(msg), action);
+    if (!renderer.props.env?.notify) {
+      throw new Error('env.notify is required!');
+    }
+
+    event.context.env.notify?.(
+      action.args?.msgType || 'info',
+      String(action.args?.msg),
+      action.args
+    );
   }
 }
 

package/src/renderers/Action.tsx

@@ -614,7 +614,7 @@ export class Action extends React.Component<ActionProps, ActionState> {
     const {onAction, disabled, countDown, env} = this.props;
 
     // https://reactjs.org/docs/legacy-event-pooling.html
-    e.persist();
+    // e.persist(); // react 17之后去掉 event pooling 了，这个应该没用了
     let onClick = this.props.onClick;
 
     if (typeof onClick === 'string') {

package/src/renderers/Form/Combo.tsx

@@ -434,7 +434,7 @@ export default class ComboControl extends React.Component<ComboProps> {
   }
 
   getValueAsArray(props = this.props) {
-    const {flat, joinValues, delimiter} = props;
+    const {flat, joinValues, delimiter, type} = props;
     let value = props.value;
 
     if (joinValues && flat && typeof value === 'string') {
@@ -581,7 +581,7 @@ export default class ComboControl extends React.Component<ComboProps> {
   }
 
   handleChange(values: any, diff: any, {index}: any) {
-    const {flat, store, joinValues, delimiter, disabled, submitOnChange} =
+    const {flat, store, joinValues, delimiter, disabled, submitOnChange, type} =
       this.props;
 
     if (disabled) {
@@ -595,7 +595,23 @@ export default class ComboControl extends React.Component<ComboProps> {
       value = value.join(delimiter || ',');
     }
 
-    this.props.onChange(value, submitOnChange, true);
+    if (type === 'input-kv') {
+      let hasDuplicateKey = false;
+      const keys: {[key: string]: boolean} = {};
+      for (const item of value) {
+        if (keys[item.key]) {
+          hasDuplicateKey = true;
+        } else {
+          keys[item.key] = true;
+        }
+      }
+      // 有重复值就不触发修改，因为 KV 模式下无法支持重复值
+      if (!hasDuplicateKey) {
+        this.props.onChange(value, submitOnChange, true);
+      }
+    } else {
+      this.props.onChange(value, submitOnChange, true);
+    }
 
     store.forms.forEach(
       form =>

package/src/renderers/Form/InputTree.tsx

@@ -122,7 +122,7 @@ export default class TreeControl extends React.Component<TreeProps> {
       onChange && onChange(resetValue ?? '');
     }
     if (action.actionType === 'expand') {
-      this.treeRef.syncUnFolded(this.props, action.openLevel);
+      this.treeRef.syncUnFolded(this.props, action.args.openLevel);
     }
     if (action.actionType === 'collapse') {
       this.treeRef.syncUnFolded(this.props, 0);

package/src/renderers/Wizard.tsx

@@ -648,7 +648,7 @@ export default class Wizard extends React.Component<WizardProps, WizardState> {
     const previous = store.data;
     const final = {...previous, ...values};
 
-    if (await this.dispatchEvent('change', {formData: final})) {
+    if (await this.dispatchEvent('change', final)) {
       return;
     }
 
@@ -692,7 +692,7 @@ export default class Wizard extends React.Component<WizardProps, WizardState> {
       onFinished
     } = this.props;
 
-    if (await this.dispatchEvent('finished', {formData: store.data})) {
+    if (await this.dispatchEvent('finished', store.data)) {
       return;
     }
 
@@ -719,7 +719,7 @@ export default class Wizard extends React.Component<WizardProps, WizardState> {
       formStore
         .saveRemote(action.api || step.api || api!, store.data, {
           onSuccess: () => {
-            this.dispatchEvent('submitSucc', {formData: store.data});
+            this.dispatchEvent('submitSucc', store.data);
 
             if (
               !isEffectiveApi(finnalAsyncApi, store.data) ||

package/src/schemaExtend.ts

@@ -19,22 +19,15 @@ addSchemaFilter(function (schema: Schema, renderer, props?: any) {
         const arr: Array<any> = [];
         Object.keys(value).forEach(key => {
           const valueType = typeof value[key];
-          if (key.endsWith('___tmp')) {
-            arr.push({
-              key: key.replace('___tmp', ''),
-              value: ''
-            });
-          } else {
-            arr.push({
-              key: key || '',
-              value:
-                valueType === 'string' ||
-                valueType === 'number' ||
-                valueType === 'boolean'
-                  ? value[key]
-                  : JSON.stringify(value[key])
-            });
-          }
+          arr.push({
+            key: key || '',
+            value:
+              valueType === 'string' ||
+              valueType === 'number' ||
+              valueType === 'boolean'
+                ? value[key]
+                : JSON.stringify(value[key])
+          });
         });
         return arr;
       },
@@ -52,12 +45,7 @@ addSchemaFilter(function (schema: Schema, renderer, props?: any) {
             } catch (e) {}
           }
 
-          // 如果先输入了 a 作为 key，想输入 aa 的时候会先进入这里，导致无法输入 aa，因此当遇到 key 相同的时候加个 ___tmp 后缀
-          if (key in obj) {
-            obj[key + '___tmp'] = value;
-          } else {
-            obj[key] = value;
-          }
+          obj[key] = value;
         });
         return obj;
       },
@@ -67,7 +55,8 @@ addSchemaFilter(function (schema: Schema, renderer, props?: any) {
           type: 'input-text',
           unique: true,
           name: 'key',
-          required: true
+          required: true,
+          validateOnChange: true
         },
         {
           placeholder: schema.valuePlaceholder ?? 'Value',

package/src/store/table.ts

@@ -497,7 +497,7 @@ export const TableStore = iRendererStore
           prev.has.push(current);
         } else {
           groups.push({
-            label: current.groupName,
+            label: current.groupName || ' ', // 如果中间没有配置groupName，那么样式会错乱，这里加一个空白字符，当做一个占位表头
             colSpan: 1,
             rowSpan: 1,
             index: current.index,

package/src/utils/handleAction.ts

@@ -13,7 +13,7 @@ export default function handleAction(
   data?: any
 ) {
   // https://reactjs.org/docs/legacy-event-pooling.html
-  e.persist();
+  // e.persist(); // react 17之后去掉 event pooling 了，这个应该没用了
 
   const onAction = props.onAction;
   let onClick: any = action.onClick;