amis 1.9.1-beta.22 → 1.9.1-beta.25

package/src/renderers/CRUD.tsx

@@ -490,8 +490,8 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     // 另外autoGenerateFilter时，table 里面会单独处理这块逻辑
     // 所以这里应该忽略 autoGenerateFilter 情况
     if (
-      (!this.props.filter || (store.filterTogggable && !store.filterVisible)) &&
-      !autoGenerateFilter
+      (!this.props.filter && !autoGenerateFilter) ||
+      (store.filterTogggable && !store.filterVisible)
     ) {
       this.handleFilterInit({});
     }

package/src/renderers/Form/index.tsx

@@ -988,6 +988,8 @@ export default class Form extends React.Component<FormProps, object> {
       data = store.data;
     }
     if (Array.isArray(action.required) && action.required.length) {
+      store.clearErrors(); // 如果是按钮指定了required，则校验前先清空一下遗留的校验报错
+
       const fields = action.required.map(item => ({
         name: item,
         rules: {isRequired: true}

package/src/renderers/Table/exportExcel.ts

@@ -221,7 +221,7 @@ export async function exportExcel(
           text: text || absoluteURL,
           hyperlink: absoluteURL
         };
-      } else if (type === 'mapping') {
+      } else if (type === 'mapping' || (type as any) === 'static-mapping') {
         // 拷贝自 Mapping.tsx
         let map = column.pristine.map;
         const source = column.pristine.source;

package/src/utils/helper.ts

@@ -22,7 +22,7 @@ import {
   resolveVariable,
   resolveVariableAndFilter
 } from 'amis-formula';
-import {isObservable} from 'mobx';
+import {isObservable, isObservableArray} from 'mobx';
 
 export {
   createObject,
@@ -937,7 +937,7 @@ export function everyTree<T extends TreeItem>(
   paths: Array<T> = [],
   indexes: Array<number> = []
 ): boolean {
-  if (!Array.isArray(tree)) {
+  if (!Array.isArray(tree) && !isObservableArray(tree)) {
     return false;
   }
   return tree.every((item, index) => {