amis 1.4.1 → 1.4.2-beta.13

package/src/renderers/List.tsx

@@ -1189,7 +1189,7 @@ export class ListItem extends React.Component<ListItemProps> {
   }
 
   renderFeild(region: string, field: any, key: any, props: any) {
-    const render = props.render || this.props.render;
+    const render = props?.render || this.props.render;
     const data = this.props.data;
     const cx = this.props.classnames;
     const itemIndex = this.props.itemIndex;

package/src/renderers/Log.tsx

@@ -6,7 +6,7 @@ import {Renderer, RendererProps} from '../factory';
 import {BaseSchema, SchemaTpl} from '../Schema';
 import Ansi from 'ansi-to-react';
 import {filter} from '../utils/tpl';
-import {buildApi} from '../utils/api';
+import {buildApi, isApiOutdated} from '../utils/api';
 
 /**
  * 日志展示组件
@@ -14,7 +14,7 @@ import {buildApi} from '../utils/api';
  */
 export interface LogSchema extends BaseSchema {
   /**
-   * 指定为 link 链接展示控件
+   * 指定为 log 链接展示控件
    */
   type: 'log';
 
@@ -100,10 +100,20 @@ export class Log extends React.Component<LogProps, LogState> {
     }
   }
 
-  componentDidUpdate() {
+  componentDidUpdate(prevProps: LogProps) {
     if (this.autoScroll && this.logRef && this.logRef.current) {
       this.logRef.current.scrollTop = this.logRef.current.scrollHeight;
     }
+    if (
+      isApiOutdated(
+        prevProps.source,
+        this.props.source,
+        prevProps.data,
+        this.props.data
+      )
+    ) {
+      this.loadLogs();
+    }
   }
 
   // 如果向上滚动就停止自动滚动，除非滚到底部
@@ -118,6 +128,9 @@ export class Log extends React.Component<LogProps, LogState> {
     const {source, data, env, translate: __, encoding} = this.props;
     // 因为这里返回结果是流式的，和普通 api 请求不一样，如果直接用 fetcher 经过 responseAdaptor 可能会导致出错，所以就直接 fetch 了
     const api = buildApi(source, data);
+    if (!api.url) {
+      return;
+    }
     const res = await fetch(api.url);
     if (res.status === 200) {
       const body = res.body;

package/src/renderers/Mapping.tsx

@@ -20,7 +20,8 @@ import {
   buildApi,
   isApiOutdated,
   isEffectiveApi,
-  normalizeApi
+  normalizeApi,
+  normalizeApiResponseData
 } from '../utils/api';
 
 /**
@@ -72,7 +73,7 @@ export const Store = StoreNode.named('MappingStore')
           const ret: Payload = yield env.fetcher(api, data);
 
           if (ret.ok) {
-            const data = ret.data || {};
+            const data = normalizeApiResponseData(ret.data);
             (self as any).setMap(data);
           } else {
             throw new Error(ret.msg || 'fetch error');
@@ -175,7 +176,7 @@ export const MappingField = withStore(props =>
       }
     }
 
-    render() {
+    renderSingleValue(key: any, reactKey?: number) {
       const {
         className,
         placeholder,
@@ -185,17 +186,13 @@ export const MappingField = withStore(props =>
         data,
         store
       } = this.props;
-      const map = store.map;
-
-      let key = getPropValue(this.props);
-
       let viewValue: React.ReactNode = (
         <span className="text-muted">{placeholder}</span>
       );
-
-      key = typeof key === 'string' ? key.trim() : key; // trim 一下，干掉一些空白字符。
+      const map = store.map;
       let value: any = undefined;
-
+      // trim 一下，干掉一些空白字符。
+      key = typeof key === 'string' ? key.trim() : key;
       if (
         typeof key !== 'undefined' &&
         map &&
@@ -210,7 +207,26 @@ export const MappingField = withStore(props =>
         viewValue = render('tpl', value);
       }
 
-      return <span className={cx('MappingField', className)}>{viewValue}</span>;
+      return (
+        <span key={`map-${reactKey}`} className={cx('MappingField', className)}>
+          {viewValue}
+        </span>
+      );
+    }
+
+    render() {
+      const mapKey = getPropValue(this.props);
+      if (Array.isArray(mapKey)) {
+        return (
+          <span>
+            {mapKey.map((singleKey: string, index: number) =>
+              this.renderSingleValue(singleKey, index)
+            )}
+          </span>
+        );
+      } else {
+        return this.renderSingleValue(mapKey, 0);
+      }
     }
   }
 );