amis 1.5.6-beta.0 → 1.5.7

package/src/store/formItem.ts

@@ -590,8 +590,8 @@ export const FormItemStore = StoreNode.named('FormItemStore')
 
       let options: Array<IOption> =
         json.data?.options ||
-        json.data.items ||
-        json.data.rows ||
+        json.data?.items ||
+        json.data?.rows ||
         json.data ||
         [];
 
@@ -712,6 +712,21 @@ export const FormItemStore = StoreNode.named('FormItemStore')
         data
       );
 
+      // 插入新的子节点，用于之后BaseSelection.resolveSelected查找
+      if (Array.isArray(self.options[0].children)) {
+        const children = self.options[0].children.concat();
+
+        flattenTree(self.options[0].leftOptions).forEach(item => {
+          if (
+            !findTree(self.options[0].children, node => node.ref === item.value)
+          ) {
+            children.push({ref: item.value, defer: true});
+          }
+        });
+
+        setOptions([{...self.options[0], children}], undefined, data);
+      }
+
       return json;
     });
 

package/src/store/table.ts

@@ -751,7 +751,8 @@ export const TableStore = iRendererStore
           pristine: item,
           toggled: item.toggled !== false,
           breakpoint: item.breakpoint,
-          isPrimary: index === 3
+          isPrimary: index === 3,
+          className: item.className || ''
         }));
 
         self.columns.replace(columns as any);

package/src/utils/api.ts

@@ -98,14 +98,17 @@ export function buildApi(
   if (~idx) {
     const hashIdx = api.url.indexOf('#');
     const params = qsparse(
-      api.url.substring(idx + 1, ~hashIdx ? hashIdx : undefined)
+      api.url.substring(
+        idx + 1,
+        ~hashIdx && hashIdx > idx ? hashIdx : undefined
+      )
     );
     api.url =
       tokenize(api.url.substring(0, idx + 1), data, '| url_encode') +
       qsstringify(
         (api.query = dataMapping(params, data, undefined, api.convertKeyToPath))
       ) +
-      (~hashIdx ? api.url.substring(hashIdx) : '');
+      (~hashIdx && hashIdx > idx ? api.url.substring(hashIdx) : '');
   } else {
     api.url = tokenize(api.url, data, '| url_encode');
   }

package/src/utils/helper.ts

@@ -891,11 +891,7 @@ export function filterTree<T extends TreeItem>(
           ? filterTree(item.children, iterator, level + 1, depthFirst)
           : undefined;
 
-        if (
-          Array.isArray(children) &&
-          Array.isArray(item.children) &&
-          children.length !== item.children.length
-        ) {
+        if (Array.isArray(children) && Array.isArray(item.children)) {
           item = {...item, children: children};
         }
 
@@ -915,11 +911,7 @@ export function filterTree<T extends TreeItem>(
           depthFirst
         );
 
-        if (
-          Array.isArray(children) &&
-          Array.isArray(item.children) &&
-          children.length !== item.children.length
-        ) {
+        if (Array.isArray(children) && Array.isArray(item.children)) {
           item = {...item, children: children};
         }
       }
@@ -1593,13 +1585,12 @@ export function JSONTraverse(
   });
 }
 
-
 export function convertDateArrayToDate(
   value: number[],
   types: string[],
   date: moment.Moment
 ): moment.Moment | null {
-  if (value.length === 0) return date
+  if (value.length === 0) return date;
   for (let i = 0; i < types.length; i++) {
     const type = types[i];
     // @ts-ignore
@@ -1622,7 +1613,7 @@ export function convertDateToObject(value: moment.Moment) {
 export function getRange(min: number, max: number, step: number = 1) {
   const arr = [];
   for (let i = min; i <= max; i += step) {
-      arr.push(i);
+    arr.push(i);
   }
   return arr;
-};
+}