amis 1.6.2 → 1.6.3

package/src/schemaExtend.ts

@@ -9,6 +9,7 @@ import {isObject} from './utils/helper';
 addSchemaFilter(function (schema: Schema, renderer, props?: any) {
   if (schema && schema.type === 'input-kv') {
     return {
+      draggable: true,
       ...schema,
       multiple: true,
       pipeIn: (value: any) => {
@@ -43,14 +44,17 @@ addSchemaFilter(function (schema: Schema, renderer, props?: any) {
         }
         const obj: any = {};
         value.forEach((item: any) => {
-          const key: string = item.key || '';
-          let value: any = item.value;
-          try {
-            value = JSON.parse(value);
-          } catch (e) {}
+          const key: string = item.key ?? '';
+          let value: any = item.value ?? schema.defaultValue ?? '';
+          if (typeof value === 'string' && value.startsWith('{')) {
+            try {
+              value = JSON.parse(value);
+            } catch (e) {}
+          }
+
           // 如果先输入了 a 作为 key，想输入 aa 的时候会先进入这里，导致无法输入 aa，因此当遇到 key 相同的时候加个 ___tmp 后缀
-          if (key in obj && typeof value === 'undefined') {
-            obj[key + '___tmp'] = '';
+          if (key in obj) {
+            obj[key + '___tmp'] = value;
           } else {
             obj[key] = value;
           }

package/src/utils/api.ts

@@ -207,18 +207,33 @@ export function responseAdaptor(ret: fetcherResult, api: ApiObject) {
     throw new Error('Response is empty');
   }
 
+  // 返回内容是 string，说明 content-type 不是 json，这时可能是返回了纯文本或 html
   if (typeof data === 'string') {
-    try {
-      data = JSON.parse(data);
-      if (typeof data === 'undefined') {
-        throw new Error('Response should be JSON');
+    // 如果是文本类型就尝试解析一下
+    if (
+      ret.headers &&
+      ((ret.headers as any)['content-type'] || '').startsWith('text/')
+    ) {
+      try {
+        data = JSON.parse(data);
+        if (typeof data === 'undefined') {
+          throw new Error('Response should be JSON');
+        }
+      } catch (e) {
+        const responseBrief =
+          typeof data === 'string'
+            ? escapeHtml((data as string).substring(0, 100))
+            : '';
+        throw new Error(`Response should be JSON\n ${responseBrief}`);
+      }
+    } else {
+      if (api.responseType === 'blob') {
+        throw new Error('Should have "Content-Disposition" in Header');
+      } else {
+        throw new Error(
+          `Content type is wrong "${(ret.headers as any)['content-type']}"`
+        );
       }
-    } catch (e) {
-      const responseBrief =
-        typeof data === 'string'
-          ? escapeHtml((data as string).substring(0, 100))
-          : '';
-      throw new Error(`Response should be JSON\n ${responseBrief}`);
     }
   }
 

package/src/utils/helper.ts

@@ -1599,7 +1599,6 @@ export function convertArrayValueToMoment(
   return mom;
 }
 
-
 export function getRange(min: number, max: number, step: number = 1) {
   const arr = [];
   for (let i = min; i <= max; i += step) {
@@ -1607,3 +1606,14 @@ export function getRange(min: number, max: number, step: number = 1) {
   }
   return arr;
 }
+
+export function repeatCount(count: number, iterator: (index: number) => any) {
+  let result: Array<any> = [];
+  let index = 0;
+
+  while (count--) {
+    result.push(iterator(index++));
+  }
+
+  return result;
+}