amis-core 6.0.0 → 6.1.0

package/esm/components/PopOver.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __rest, __assign, __decorate, __metadata } from 'tslib';
@@ -28,12 +28,12 @@ import '../utils/image.js';
 import 'lodash/isEqual';
 import '../actions/Action.js';
 import 'lodash/debounce';
-import 'lodash/cloneDeep';
 import '../utils/resize-sensor.js';
 import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';
@@ -103,7 +103,9 @@ var PopOver = /** @class */ (function (_super) {
             closeOnOutside &&
             target &&
             this.wrapperRef.current &&
-            !this.wrapperRef.current.getAttribute(SubPopoverDisplayedID) &&
+            !this.wrapperRef.current
+                .getAttributeNames()
+                .find(function (n) { return n.startsWith(SubPopoverDisplayedID); }) &&
             ((!this.wrapperRef.current.contains(target) &&
                 !target.closest('[role=dialog]')) ||
                 (target.matches(".".concat(ns, "Modal")) && target === this.wrapperRef.current))); // 干脆过滤掉来自弹框里面的点击
@@ -149,7 +151,7 @@ var PopOver = /** @class */ (function (_super) {
         });
     };
     PopOver.prototype.render = function () {
-        var _a = this.props; _a.placement; var activePlacement = _a.activePlacement, positionTop = _a.positionTop, positionLeft = _a.positionLeft; _a.arrowOffsetLeft; _a.arrowOffsetTop; var style = _a.style, children = _a.children; _a.offset; var overlay = _a.overlay, onHide = _a.onHide, ns = _a.classPrefix, cx = _a.classnames, className = _a.className, rest = __rest(_a, ["placement", "activePlacement", "positionTop", "positionLeft", "arrowOffsetLeft", "arrowOffsetTop", "style", "children", "offset", "overlay", "onHide", "classPrefix", "classnames", "className"]);
+        var _a = this.props; _a.placement; var activePlacement = _a.activePlacement, positionTop = _a.positionTop, positionLeft = _a.positionLeft; _a.arrowOffsetLeft; _a.arrowOffsetTop; var style = _a.style, children = _a.children; _a.offset; var overlay = _a.overlay, onHide = _a.onHide, ns = _a.classPrefix, cx = _a.classnames, className = _a.className; _a.componentId; var rest = __rest(_a, ["placement", "activePlacement", "positionTop", "positionLeft", "arrowOffsetLeft", "arrowOffsetTop", "style", "children", "offset", "overlay", "onHide", "classPrefix", "classnames", "className", "componentId"]);
         var _b = this.state, xOffset = _b.xOffset, yOffset = _b.yOffset;
         var outerStyle = __assign(__assign({ display: 'block' }, style), { top: positionTop + yOffset, left: positionLeft + xOffset });
         var placements = typeof activePlacement === 'string' ? activePlacement.split('-') : [];

package/esm/env.d.ts

@@ -86,6 +86,10 @@ export interface RendererEnv {
      * 是否开启 amis 调试
      */
     enableAMISDebug?: boolean;
+    /**
+     * 是否开启 testid 定位
+     */
+    enableTestid?: boolean;
     /**
      * 替换文本，用于实现 URL 替换、语言替换等
      */

package/esm/env.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import 'tslib';

package/esm/envOverwrite.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { JSONValueMap } from './utils/helper.js';

package/esm/factory.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign } from 'tslib';
@@ -151,6 +151,19 @@ var defaultOptions = {
             action.blank === false ? (window.location.href = to) : window.open(to);
             return;
         }
+        // link动作新增了targetType属性，默认是内容区打开(page),在新窗口打开(blank);在当前页签打开(self)
+        if ((action === null || action === void 0 ? void 0 : action.actionType) === 'link' &&
+            ['blank', 'self'].includes(action === null || action === void 0 ? void 0 : action.targetType)) {
+            if (action.targetType === 'self') {
+                // 当前页签打开，需要刷新页面
+                window.history.pushState(null, '', to);
+                location.reload();
+            }
+            else {
+                window.open(to);
+            }
+            return;
+        }
         if (/^https?:\/\//.test(to)) {
             window.location.replace(to);
         }

package/esm/index.d.ts

@@ -19,7 +19,7 @@ import { RegisterStore } from './store';
 import type { IColumn, IColumn2, IRow, IRow2 } from './store';
 import { setDefaultLocale, getDefaultLocale, makeTranslator, register as registerLocale, extendLocale, removeLocaleData, localeable } from './locale';
 import type { LocaleProps, TranslateFn } from './locale';
-import Scoped, { ScopedContext, filterTarget } from './Scoped';
+import Scoped, { ScopedContext, filterTarget, splitTarget } from './Scoped';
 import type { ScopedComponentType, IScopedContext } from './Scoped';
 import { classnames, getClassPrefix, setDefaultTheme, theme, getTheme, themeable, makeClassnames } from './theme';
 import type { ClassNamesFn, ThemeProps } from './theme';
@@ -50,5 +50,5 @@ import type { IItem } from './store/list';
 import CustomStyle from './components/CustomStyle';
 import { StatusScoped } from './StatusScoped';
 export declare const version = "__buildVersion";
-export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, StatusScoped, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, AsyncEvaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, evaluateForAsync, LazyComponent, Overlay, PopOver, ErrorBoundary, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, CustomStyle, enableDebug, disableDebug };
+export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, StatusScoped, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, AsyncEvaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, evaluateForAsync, LazyComponent, Overlay, PopOver, ErrorBoundary, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, splitTarget, CustomStyle, enableDebug, disableDebug };
 export declare function render(schema: Schema, props?: RootRenderProps, options?: RenderOptions, pathPrefix?: string): JSX.Element;

package/esm/index.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign, __rest } from 'tslib';
@@ -36,13 +36,14 @@ export { handleAction } from './utils/handleAction.js';
 import { promisify } from './utils/helper.js';
 import * as helper from './utils/helper.js';
 export { helper as utils };
-export { JSONTraverse, JSONValueMap, SkipOperation, ValidateError, __uri, anyChanged, autobind, buildTrackExpression, bulkBindFunctions, camel, chainEvents, chainFunctions, changedEffect, convertArrayValueToMoment, countTree, detectPropValueChanged, difference, differenceFromAll, eachTree, evalTrackExpression, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeAll, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, importLazyComponent, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, loadStyle, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parsePrimitiveQueryString, parseQuery, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, replaceUrlParams, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter } from './utils/helper.js';
+export { JSONTraverse, JSONValueMap, SkipOperation, TEST_ID_KEY, ValidateError, __uri, anyChanged, autobind, buildTestId, buildTrackExpression, bulkBindFunctions, camel, chainEvents, chainFunctions, changedEffect, convertArrayValueToMoment, countTree, detectPropValueChanged, difference, differenceFromAll, eachTree, evalTrackExpression, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeAll, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTestId, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, importLazyComponent, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, loadStyle, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parsePrimitiveQueryString, parseQuery, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, replaceUrlParams, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter } from './utils/helper.js';
 export { highlight } from './utils/highlight.js';
 export { generateIcon } from './utils/icon.js';
 export { getImageDimensions, toDataURL } from './utils/image.js';
 export { isPureVariable } from './utils/isPureVariable.js';
 export { JSONSchme2AMisSchema } from './utils/json-schema-2-amis-schema.js';
 export { keyToPath } from './utils/keyToPath.js';
+export { labelToString } from './utils/labelToString.js';
 export { makeSorter } from './utils/makeSorter.js';
 export { normalizeLink } from './utils/normalizeLink.js';
 export { normalizeOptions } from './utils/normalizeOptions.js';
@@ -64,7 +65,7 @@ export { scrollPosition } from './utils/scrollPosition.js';
 export { SimpleMap } from './utils/SimpleMap.js';
 export { string2regExp } from './utils/string2regExp.js';
 export { buildStyle } from './utils/style.js';
-export { tokenize } from './utils/tokenize.js';
+export { memoParse, tokenize } from './utils/tokenize.js';
 export { register } from './utils/tpl-builtin.js';
 export { asyncFilter, evalExpression, evalExpressionWithConditionBuilder, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs } from './utils/tpl.js';
 export { uncontrollable } from './utils/uncontrollable.js';
@@ -81,7 +82,7 @@ export { RegisterStore, RendererStore } from './store/index.js';
 import { getEnv } from 'mobx-state-tree';
 import { getDefaultLocale, makeTranslator } from './locale.js';
 export { extendLocale, getDefaultLocale, localeable, makeTranslator, register as registerLocale, removeLocaleData, setDefaultLocale } from './locale.js';
-export { HocScoped as Scoped, ScopedContext, filterTarget } from './Scoped.js';
+export { HocScoped as Scoped, ScopedContext, filterTarget, splitTarget } from './Scoped.js';
 import { getClassPrefix, getTheme } from './theme.js';
 export { classnames, getClassPrefix, getTheme, makeClassnames, setDefaultTheme, theme, themeable } from './theme.js';
 import './actions/LoopAction.js';
@@ -143,7 +144,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '6.0.0';
+var version = '6.1.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -202,8 +203,12 @@ function AMISRenderer(_a) {
         props.mobileUI = env.isMobile();
     }
     // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
-    schema = envOverwrite(schema, locale);
-    schema = replaceText(schema, options.replaceText, env.replaceTextIgnoreKeys);
+    schema = React.useMemo(function () {
+        schema = envOverwrite(schema, locale);
+        // todo 和 envOverwrite 一起处理，减少循环次数
+        schema = replaceText(schema, options.replaceText, env.replaceTextIgnoreKeys);
+        return schema;
+    }, [schema, locale]);
     return (React.createElement(EnvContext.Provider, { value: env },
         React.createElement(ScopedRootRenderer, __assign({}, props, { schema: schema, pathPrefix: pathPrefix, rootStore: store, env: env, theme: theme, locale: locale, translate: translate }))));
 }

package/esm/locale.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign, __extends, __spreadArray, __read } from 'tslib';

package/esm/polyfills.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 /**

package/esm/renderers/Form.d.ts

@@ -341,15 +341,16 @@ export default class Form extends React.Component<FormProps, object> {
     silentReload(target?: string, query?: any): void;
     initInterval(value: any): any;
     isValidated(): boolean;
-    validate(forceValidate?: boolean, throwErrors?: boolean, toastErrors?: boolean): Promise<boolean>;
+    validate(forceValidate?: boolean, throwErrors?: boolean, toastErrors?: boolean, skipFlush?: boolean): Promise<boolean>;
     setErrors(errors: {
         [propName: string]: string;
     }, tag?: string): void;
     clearErrors(): void;
     getValues(): any;
     setValues(value: any, replace?: boolean): void;
-    submit(fn?: (values: object) => Promise<any>, throwErrors?: boolean): Promise<any>;
-    flush(): void;
+    submit(fn?: (values: object) => Promise<any>, throwErrors?: boolean, skipFlush?: boolean): Promise<any>;
+    flushing: boolean;
+    flush(): Promise<void>;
     reset(): void;
     addHook(fn: () => any, type?: 'validate' | 'init' | 'flush'): () => void;
     removeHook(fn: () => any, type?: string): void;

package/esm/renderers/Form.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
@@ -37,12 +37,12 @@ import '../utils/image.js';
 import 'lodash/isPlainObject';
 import 'lodash/isEqual';
 import '../actions/Action.js';
-import 'lodash/cloneDeep';
 import '../utils/resize-sensor.js';
 import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';
@@ -64,6 +64,8 @@ var Form = /** @class */ (function (_super) {
             trailing: true,
             leading: false
         });
+        // 如果开启了 lazyChange，需要一个 flush 方法把队列中值应用上。
+        _this.flushing = false;
         _this.onInit = _this.onInit.bind(_this);
         _this.handleAction = _this.handleAction.bind(_this);
         _this.handleQuery = _this.handleQuery.bind(_this);
@@ -376,22 +378,27 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.isValidated = function () {
         return this.props.store.validated;
     };
-    Form.prototype.validate = function (forceValidate, throwErrors, toastErrors) {
+    Form.prototype.validate = function (forceValidate, throwErrors, toastErrors, skipFlush) {
         if (throwErrors === void 0) { throwErrors = false; }
         if (toastErrors === void 0) { toastErrors = true; }
+        if (skipFlush === void 0) { skipFlush = false; }
         return __awaiter(this, void 0, void 0, function () {
             var _a, store, dispatchEvent, data, messages, __, result;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = this.props, store = _a.store, dispatchEvent = _a.dispatchEvent, data = _a.data, messages = _a.messages, __ = _a.translate;
-                        this.flush();
-                        return [4 /*yield*/, store.validate(this.hooks['validate'] || [], forceValidate, throwErrors, toastErrors === false
-                                ? ''
-                                : typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
-                                    ? __(filter(messages.validateFailed, store.data))
-                                    : undefined)];
+                        if (!!skipFlush) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.flush()];
                     case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2: return [4 /*yield*/, store.validate(this.hooks['validate'] || [], forceValidate, throwErrors, toastErrors === false
+                            ? ''
+                            : typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
+                                ? __(filter(messages.validateFailed, store.data))
+                                : undefined)];
+                    case 3:
                         result = _b.sent();
                         dispatchEvent(result ? 'validateSucc' : 'validateError', data);
                         return [2 /*return*/, result];
@@ -418,20 +425,55 @@ var Form = /** @class */ (function (_super) {
         this.flush();
         store.setValues(value, undefined, replace);
     };
-    Form.prototype.submit = function (fn, throwErrors) {
+    Form.prototype.submit = function (fn, throwErrors, skipFlush) {
         if (throwErrors === void 0) { throwErrors = false; }
-        var _a = this.props, store = _a.store, messages = _a.messages, __ = _a.translate, dispatchEvent = _a.dispatchEvent, data = _a.data;
-        this.flush();
-        var validateErrCb = function () { return dispatchEvent('validateError', data); };
-        return store.submit(fn, this.hooks['validate'] || [], typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
-            ? __(filter(messages.validateFailed, store.data))
-            : undefined, validateErrCb, throwErrors);
+        if (skipFlush === void 0) { skipFlush = false; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, store, messages, __, dispatchEvent, data, validateErrCb;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, store = _a.store, messages = _a.messages, __ = _a.translate, dispatchEvent = _a.dispatchEvent, data = _a.data;
+                        if (!!skipFlush) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.flush()];
+                    case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2:
+                        validateErrCb = function () { return dispatchEvent('validateError', data); };
+                        return [2 /*return*/, store.submit(fn, this.hooks['validate'] || [], typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
+                                ? __(filter(messages.validateFailed, store.data))
+                                : undefined, validateErrCb, throwErrors)];
+                }
+            });
+        });
     };
-    // 如果开启了 lazyChange，需要一个 flush 方法把队列中值应用上。
     Form.prototype.flush = function () {
-        var hooks = this.hooks['flush'] || [];
-        hooks.forEach(function (fn) { return fn(); });
-        this.lazyEmitChange.flush();
+        return __awaiter(this, void 0, void 0, function () {
+            var hooks;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, , 3, 4]);
+                        if (this.flushing) {
+                            return [2 /*return*/];
+                        }
+                        this.flushing = true;
+                        hooks = this.hooks['flush'] || [];
+                        return [4 /*yield*/, Promise.all(hooks.map(function (fn) { return fn(); }))];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.lazyEmitChange.flush()];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        this.flushing = false;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
     };
     Form.prototype.reset = function () {
         var _a = this.props, store = _a.store, onReset = _a.onReset;
@@ -503,11 +545,17 @@ var Form = /** @class */ (function (_super) {
                             onChange && onChange.apply(null, changeProps);
                         }
                         store.clearRestError();
-                        (submit || (submitOnChange && store.inited)) &&
-                            this.handleAction(undefined, {
-                                type: 'submit'
-                            }, store.data);
-                        return [2 /*return*/];
+                        if (!(submit || (submitOnChange && store.inited))) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.handleAction(undefined, {
+                                type: 'submit',
+                                // 如果这里不跳过，会相互依赖死循环，flush 会 让 emiteChange 立即执行
+                                // handleAction 里面又会调用 flush
+                                skipFormFlush: true
+                            }, store.data)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3: return [2 /*return*/];
                 }
             });
         });
@@ -558,8 +606,12 @@ var Form = /** @class */ (function (_super) {
                 switch (_f.label) {
                     case 0:
                         _c = this.props, store = _c.store, onSubmit = _c.onSubmit, api = _c.api, asyncApi = _c.asyncApi, finishedField = _c.finishedField, checkInterval = _c.checkInterval, _d = _c.messages, saveSuccess = _d.saveSuccess, saveFailed = _d.saveFailed, resetAfterSubmit = _c.resetAfterSubmit, clearAfterSubmit = _c.clearAfterSubmit, onAction = _c.onAction, onSaved = _c.onSaved, onReset = _c.onReset, onFinished = _c.onFinished, onFailed = _c.onFailed, redirect = _c.redirect, reload = _c.reload, target = _c.target, env = _c.env, onChange = _c.onChange, clearPersistDataAfterSubmit = _c.clearPersistDataAfterSubmit, trimValues = _c.trimValues, dispatchEvent = _c.dispatchEvent, __ = _c.translate;
-                        // 做动作之前，先把数据同步一下。
-                        this.flush();
+                        if (!!action.skipFormFlush) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.flush()];
+                    case 1:
+                        _f.sent();
+                        _f.label = 2;
+                    case 2:
                         if (trimValues) {
                             store.trimValues();
                         }
@@ -567,7 +619,7 @@ var Form = /** @class */ (function (_super) {
                         if (data === this.props.data) {
                             data = store.data;
                         }
-                        if (!(Array.isArray(action.required) && action.required.length)) return [3 /*break*/, 4];
+                        if (!(Array.isArray(action.required) && action.required.length)) return [3 /*break*/, 6];
                         /** 如果是按钮指定了required，则校验前先清空一下遗留的校验报错 */
                         store.clearErrors();
                         fields = action.required.map(function (item) { return ({
@@ -575,31 +627,31 @@ var Form = /** @class */ (function (_super) {
                             rules: { isRequired: true }
                         }); });
                         return [4 /*yield*/, store.validateFields(fields)];
-                    case 1:
+                    case 3:
                         validationRes = _f.sent();
-                        if (!!validationRes) return [3 /*break*/, 3];
+                        if (!!validationRes) return [3 /*break*/, 5];
                         return [4 /*yield*/, dispatchEvent('validateError', this.props.data)];
-                    case 2:
+                    case 4:
                         dispatcher = _f.sent();
                         if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
                             env.notify('error', __('Form.validateFailed'));
                         }
                         /** 抛异常是为了在dialog中catch这个错误，避免弹窗直接关闭 */
                         return [2 /*return*/, Promise.reject(__('Form.validateFailed'))];
-                    case 3:
+                    case 5:
                         /** 重置validated状态，保证submit时触发表单中的校验项 */
                         store.clearErrors();
-                        _f.label = 4;
-                    case 4:
+                        _f.label = 6;
+                    case 6:
                         if (!(action.type === 'submit' ||
                             action.actionType === 'submit' ||
                             action.actionType === 'confirm' ||
                             action.actionType === 'reset-and-submit' ||
-                            action.actionType === 'clear-and-submit')) return [3 /*break*/, 6];
+                            action.actionType === 'clear-and-submit')) return [3 /*break*/, 8];
                         _e = this.props, dispatchEvent_1 = _e.dispatchEvent, onEvent = _e.onEvent;
                         submitEvent = (_b = (_a = onEvent === null || onEvent === void 0 ? void 0 : onEvent.submit) === null || _a === void 0 ? void 0 : _a.actions) === null || _b === void 0 ? void 0 : _b.length;
                         return [4 /*yield*/, dispatchEvent_1('submit', this.props.data)];
-                    case 5:
+                    case 7:
                         dispatcher = _f.sent();
                         if ((dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) || submitEvent) {
                             return [2 /*return*/];
@@ -736,7 +788,7 @@ var Form = /** @class */ (function (_super) {
                                             return [2 /*return*/, Promise.resolve(null)];
                                     }
                                 });
-                            }); }, throwErrors)
+                            }); }, throwErrors, true)
                                 .then(function (values) {
                                 // 有可能 onSubmit return false 了，那么后面的就不应该再执行了。
                                 if (values === false) {
@@ -764,7 +816,7 @@ var Form = /** @class */ (function (_super) {
                                     throw reason;
                                 }
                             })];
-                    case 6:
+                    case 8:
                         if (action.type === 'reset' || action.actionType === 'reset') {
                             store.setCurrentAction(action);
                             store.reset(onReset);
@@ -775,7 +827,7 @@ var Form = /** @class */ (function (_super) {
                         }
                         else if (action.actionType === 'validate') {
                             store.setCurrentAction(action);
-                            return [2 /*return*/, this.validate(true, throwErrors)];
+                            return [2 /*return*/, this.validate(true, throwErrors, true, true)];
                         }
                         else if (action.actionType === 'dialog') {
                             store.setCurrentAction(action);
@@ -851,8 +903,8 @@ var Form = /** @class */ (function (_super) {
                             // 不识别的丢给上层去处理。
                             return [2 /*return*/, onAction(e, action, data, throwErrors, delegate || this.context)];
                         }
-                        _f.label = 7;
-                    case 7: return [2 /*return*/];
+                        _f.label = 9;
+                    case 9: return [2 /*return*/];
                 }
             });
         });

package/esm/renderers/Item.d.ts

@@ -361,6 +361,7 @@ export interface FormItemProps extends RendererProps {
     };
     error?: string;
     showErrorMsg?: boolean;
+    testid?: string;
 }
 export type FormControlProps = RendererProps & {
     onOpenDialog: (schema: Schema, data: any) => Promise<any>;