amis-core 6.8.0 → 6.9.0-beta.0

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -30,6 +30,8 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var _a, _b;
 var renderers = [];
+// type 与 RendererConfig 的映射关系
+var renderersTypeMap = {};
 var renderersMap = {};
 var schemaFilters = [];
 var anonymousIndex = 1;
@@ -45,53 +47,124 @@ function Renderer(config) {
         return renderer.component;
     };
 }
+// mobx-react 的 observer 会修改原型链的 render 方法
+// 如果想继承覆盖组件的 render 方法，需要把原型链 render 还原回来
+// 否则无法调用 super.render 方法
+function fixMobxInjectRender(klass) {
+    var _a;
+    var target = klass.prototype;
+    // mobx-react 篡改之前先记录原始 render
+    if (target === null || target === void 0 ? void 0 : target.render) {
+        target.__originRender = target.render;
+    }
+    // 将父级类上面被 mobx 篡改的 render 方法还原回来
+    // 而且当前类的 render 也是会被篡改的，所以父级上的其实不需要篡改
+    if ((_a = target === null || target === void 0 ? void 0 : target.__proto__) === null || _a === void 0 ? void 0 : _a.hasOwnProperty('__originRender')) {
+        var originProto = target.__proto__;
+        target.__proto__ = Object.create(originProto.__proto__ || Object);
+        Object.assign(target.__proto__, originProto);
+        target.__proto__.render = originProto.__originRender;
+    }
+    return klass;
+}
+// 将 renderer 转成组件
+function rendererToComponent(component, config) {
+    if (config.storeType && config.component) {
+        component = WithStore.HocStoreFactory({
+            storeType: config.storeType,
+            extendsData: config.storeExtendsData,
+            shouldSyncSuperStore: config.shouldSyncSuperStore
+        })(mobxReact.observer(fixMobxInjectRender(component)));
+    }
+    if (config.isolateScope) {
+        component = Scoped.HocScoped(component, config.type);
+    }
+    return component;
+}
 function registerRenderer(config) {
     if (!config.test && !config.type) {
-        throw new TypeError('please set config.test or config.type');
+        throw new TypeError('please set config.type or config.test');
     }
-    else if (!config.component) {
-        throw new TypeError('config.component is required');
+    else if (!config.type && config.name !== 'static') {
+        // todo static 目前还没办法不用 test 来实现
+        console.warn("config.type is recommended for register renderer(".concat(config.test, ")"));
     }
     if (typeof config.type === 'string' && config.type) {
         config.type = config.type.toLowerCase();
         config.test =
-            config.test || new RegExp("(^|/)".concat(string2regExp.string2regExp(config.type), "$"), 'i');
+            config.test ||
+                new RegExp("(^|/)(?:".concat((config.alias || [])
+                    .concat(config.type)
+                    .map(function (type) { return string2regExp.string2regExp(type); })
+                    .join('|'), ")$"), 'i');
     }
-    config.weight = config.weight || 0;
-    config.Renderer = config.component;
-    config.name = config.name || config.type || "anonymous-".concat(anonymousIndex++);
-    if (renderersMap[config.name]) {
-        throw new Error("The renderer with name \"".concat(config.name, "\" has already exists, please try another name!"));
+    var exists = renderersTypeMap[config.type || ''];
+    var renderer = tslib.__assign({}, config);
+    if (exists &&
+        exists.component &&
+        exists.component !== Placeholder.Placeholder &&
+        config.component &&
+        !exists.origin &&
+        !config.override) {
+        throw new Error("The renderer with type \"".concat(config.type, "\" has already exists, please try another type!"));
     }
-    else if (renderersMap.hasOwnProperty(config.name)) {
-        // 后面补充的
-        var idx_1 = helper.findIndex(renderers, function (item) { return item.name === config.name; });
-        ~idx_1 && renderers.splice(idx_1, 0, config);
+    else if (exists) {
+        // 如果已经存在，合并配置，并用合并后的配置
+        Object.assign(exists, config);
+        renderer = exists;
     }
-    if (config.storeType && config.component) {
-        config.component = WithStore.HocStoreFactory({
-            storeType: config.storeType,
-            extendsData: config.storeExtendsData,
-            shouldSyncSuperStore: config.shouldSyncSuperStore
-        })(mobxReact.observer(config.component));
+    renderer.weight = renderer.weight || 0;
+    renderer.name =
+        renderer.name || renderer.type || "anonymous-".concat(anonymousIndex++);
+    if (config.component) {
+        renderer.Renderer = config.component;
+        renderer.component = rendererToComponent(config.component, renderer);
     }
-    if (config.isolateScope) {
-        config.component = Scoped.HocScoped(config.component, config.type);
+    if (!exists) {
+        var idx = helper.findIndex(renderers, function (item) { return config.weight < item.weight; });
+        ~idx ? renderers.splice(idx, 0, renderer) : renderers.push(renderer);
     }
-    var idx = helper.findIndex(renderers, function (item) { return config.weight < item.weight; });
-    ~idx ? renderers.splice(idx, 0, config) : renderers.push(config);
-    renderersMap[config.name] = config.component !== Placeholder.Placeholder;
-    return config;
+    renderersMap[renderer.name] = !!(renderer.component && renderer.component !== Placeholder.Placeholder);
+    renderer.type && (renderersTypeMap[renderer.type] = renderer);
+    (renderer.alias || []).forEach(function (alias) {
+        var fork = tslib.__assign(tslib.__assign({}, renderer), { type: alias, name: alias, alias: undefined, origin: renderer });
+        var idx = renderers.findIndex(function (item) { return item.name === alias; });
+        if (~idx) {
+            Object.assign(renderers[idx], fork);
+        }
+        else {
+            renderers.push(fork);
+        }
+        renderersTypeMap[alias] = fork;
+        renderersMap[alias] = true;
+    });
+    return renderer;
 }
 function unRegisterRenderer(config) {
+    var _a;
     var name = (typeof config === 'string' ? config : config.name);
     var idx = renderers.findIndex(function (item) { return item.name === name; });
-    ~idx && renderers.splice(idx, 1);
-    delete renderersMap[name];
-    // 清空渲染器定位缓存
-    cache = {};
+    if (~idx) {
+        var renderer_1 = renderers[idx];
+        renderers.splice(idx, 1);
+        delete renderersMap[name];
+        delete renderersTypeMap[renderer_1.type || ''];
+        (_a = renderer_1.alias) === null || _a === void 0 ? void 0 : _a.forEach(function (alias) {
+            var idx = renderers.findIndex(function (item) { return item.name === alias; });
+            idx > -1 && renderers.splice(idx, 1);
+            delete renderersTypeMap[alias];
+            delete renderersMap[alias];
+        });
+        // 清空渲染器定位缓存
+        Object.keys(cache).forEach(function (key) {
+            var value = cache[key];
+            if (value === renderer_1) {
+                delete cache[key];
+            }
+        });
+    }
 }
-function loadRenderer(schema, path) {
+function loadRendererError(schema, path) {
     return (_J$X_("div", { className: "RuntimeError" },
         _J$X_("p", null, "Error: \u627E\u4E0D\u5230\u5BF9\u5E94\u7684\u6E32\u67D3\u5668"),
         _J$X_("p", null,
@@ -100,12 +173,97 @@ function loadRenderer(schema, path) {
         _J$X_("pre", null,
             _J$X_("code", null, JSON.stringify(schema, null, 2)))));
 }
+function loadAsyncRenderer(renderer) {
+    return tslib.__awaiter(this, void 0, void 0, function () {
+        var result;
+        return tslib.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!isAsyncRenderer(renderer)) {
+                        // already loaded
+                        return [2 /*return*/];
+                    }
+                    return [4 /*yield*/, renderer.getComponent()];
+                case 1:
+                    result = _a.sent();
+                    // 如果异步加载的组件没有注册渲染器
+                    // 同时默认导出了一个组件，则自动注册
+                    if (!renderer.component && result.default) {
+                        registerRenderer(tslib.__assign(tslib.__assign({}, renderer), { component: result.default }));
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function isAsyncRenderer(item) {
+    return (item &&
+        (!item.component || item.component === Placeholder.Placeholder) &&
+        item.getComponent);
+}
+function hasAsyncRenderers() {
+    return renderers.some(isAsyncRenderer);
+}
+function loadAsyncRenderersByType(type, ignore) {
+    if (ignore === void 0) { ignore = false; }
+    return tslib.__awaiter(this, void 0, void 0, function () {
+        var types, asyncRenderers;
+        return tslib.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    types = Array.isArray(type) ? type : [type];
+                    asyncRenderers = types
+                        .map(function (type) {
+                        var renderer = renderersTypeMap[type];
+                        if (!renderer && !ignore) {
+                            throw new Error("Can not find the renderer by type: ".concat(type));
+                        }
+                        return renderer;
+                    })
+                        .filter(isAsyncRenderer);
+                    if (!asyncRenderers.length) return [3 /*break*/, 2];
+                    return [4 /*yield*/, Promise.all(asyncRenderers.map(function (item) { return loadAsyncRenderer(item); }))];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
+function loadAllAsyncRenderers() {
+    return tslib.__awaiter(this, void 0, void 0, function () {
+        var asyncRenderers;
+        var _this = this;
+        return tslib.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    asyncRenderers = renderers.filter(isAsyncRenderer);
+                    if (!asyncRenderers.length) return [3 /*break*/, 2];
+                    return [4 /*yield*/, Promise.all(renderers.map(function (renderer) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                            return tslib.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, loadAsyncRenderer(renderer)];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); }))];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2: return [2 /*return*/];
+            }
+        });
+    });
+}
 var defaultOptions = {
     session: 'global',
     richTextToken: '',
     useMobileUI: true,
     enableAMISDebug: (_b = (_a = window.enableAMISDebug) !== null && _a !== void 0 ? _a : location.search.indexOf('amisDebug=1') !== -1) !== null && _b !== void 0 ? _b : false,
-    loadRenderer: loadRenderer,
+    loadRenderer: loadRendererError,
     fetcher: function () {
         return Promise.reject('fetcher is required');
     },
@@ -272,8 +430,9 @@ function extendDefaultEnv(env) {
 var cache = {};
 function resolveRenderer(path, schema) {
     var type = typeof (schema === null || schema === void 0 ? void 0 : schema.type) == 'string' ? schema.type.toLowerCase() : '';
-    if (type && cache[type]) {
-        return cache[type];
+    // 直接匹配类型，后续注册渲染都应该用这个方式而不是之前的判断路径。
+    if (type && renderersTypeMap[type]) {
+        return renderersTypeMap[type];
     }
     else if (cache[path]) {
         return cache[path];
@@ -284,15 +443,7 @@ function resolveRenderer(path, schema) {
     var renderer = null;
     renderers.some(function (item) {
         var matched = false;
-        // 直接匹配类型，后续注册渲染都应该用这个方式而不是之前的判断路径。
-        if (item.type && type) {
-            matched = item.type === type;
-            // 如果是type来命中的，那么cache的key直接用 type 即可。
-            if (matched) {
-                cache[type] = item;
-            }
-        }
-        else if (typeof item.test === 'function') {
+        if (typeof item.test === 'function') {
             // 不应该搞得这么复杂的，让每个渲染器唯一 id，自己不晕别人用起来也不晕。
             matched = item.test(path, schema, resolveRenderer);
         }
@@ -322,6 +473,15 @@ function getRenderers() {
 function getRendererByName(name) {
     return find__default["default"](renderers, function (item) { return item.name === name; });
 }
+var GlobalOptions = {
+    pdfjsWorkerSrc: ''
+};
+function setGlobalOptions(options) {
+    Object.assign(GlobalOptions, options);
+}
+function getGlobalOptions() {
+    return GlobalOptions;
+}
 
 exports.Renderer = Renderer;
 exports.addSchemaFilter = addSchemaFilter;
@@ -329,12 +489,19 @@ exports.clearStoresCache = clearStoresCache;
 exports.defaultOptions = defaultOptions;
 exports.extendDefaultEnv = extendDefaultEnv;
 exports.filterSchema = filterSchema;
+exports.getGlobalOptions = getGlobalOptions;
 exports.getRendererByName = getRendererByName;
 exports.getRenderers = getRenderers;
-exports.loadRenderer = loadRenderer;
+exports.hasAsyncRenderers = hasAsyncRenderers;
+exports.isAsyncRenderer = isAsyncRenderer;
+exports.loadAllAsyncRenderers = loadAllAsyncRenderers;
+exports.loadAsyncRenderer = loadAsyncRenderer;
+exports.loadAsyncRenderersByType = loadAsyncRenderersByType;
+exports.loadRendererError = loadRendererError;
 exports.registerRenderer = registerRenderer;
 exports.renderersMap = renderersMap;
 exports.resolveRenderer = resolveRenderer;
+exports.setGlobalOptions = setGlobalOptions;
 exports.stores = stores;
 exports.unRegisterRenderer = unRegisterRenderer;
 exports.updateEnv = updateEnv;

package/lib/index.d.ts

@@ -6,8 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="react" />
-import { Renderer, getRendererByName, getRenderers, registerRenderer, unRegisterRenderer, resolveRenderer, filterSchema, clearStoresCache, updateEnv, addSchemaFilter, extendDefaultEnv } from './factory';
-import type { RenderOptions, RendererConfig, RendererProps } from './factory';
+import { Renderer, getRendererByName, getRenderers, loadAllAsyncRenderers, loadAsyncRenderersByType, loadAsyncRenderer, registerRenderer, unRegisterRenderer, resolveRenderer, filterSchema, clearStoresCache, updateEnv, addSchemaFilter, extendDefaultEnv, getGlobalOptions, setGlobalOptions } from './factory';
+import type { RenderOptions, RendererConfig, RendererProps, hasAsyncRenderers } from './factory';
 import './polyfills';
 import './renderers/builtin';
 import './renderers/register';
@@ -15,7 +15,7 @@ export * from './utils/index';
 export * from './types';
 export * from './store';
 import * as utils from './utils/helper';
-import { RegisterStore } from './store';
+import { RegisterStore, 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';
@@ -51,5 +51,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, splitTarget, CustomStyle, enableDebug, disableDebug, envOverwrite };
+export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, registerStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, loadAllAsyncRenderers, loadAsyncRenderersByType, loadAsyncRenderer, hasAsyncRenderers, 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, envOverwrite, getGlobalOptions, setGlobalOptions };
 export declare function render(schema: Schema, props?: RootRenderProps, options?: RenderOptions, pathPrefix?: string): JSX.Element;

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -139,7 +139,11 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '6.8.0';
+var version = '6.9.0-beta.0';
+window.amisVersionInfo = {
+    version: '6.9.0-beta.0',
+    buildTime: '2024-10-22T11:40:47.953Z'
+};
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -213,12 +217,19 @@ exports.addSchemaFilter = factory.addSchemaFilter;
 exports.clearStoresCache = factory.clearStoresCache;
 exports.extendDefaultEnv = factory.extendDefaultEnv;
 exports.filterSchema = factory.filterSchema;
+exports.getGlobalOptions = factory.getGlobalOptions;
 exports.getRendererByName = factory.getRendererByName;
 exports.getRenderers = factory.getRenderers;
+exports.loadAllAsyncRenderers = factory.loadAllAsyncRenderers;
+exports.loadAsyncRenderer = factory.loadAsyncRenderer;
+exports.loadAsyncRenderersByType = factory.loadAsyncRenderersByType;
 exports.registerRenderer = factory.registerRenderer;
 exports.resolveRenderer = factory.resolveRenderer;
+exports.setGlobalOptions = factory.setGlobalOptions;
 exports.unRegisterRenderer = factory.unRegisterRenderer;
 exports.updateEnv = factory.updateEnv;
+exports.addApiRequestAdaptor = api.addApiRequestAdaptor;
+exports.addApiResponseAdator = api.addApiResponseAdator;
 exports.buildApi = api.buildApi;
 exports.callStrFunction = api.callStrFunction;
 exports.clearApiCache = api.clearApiCache;
@@ -232,6 +243,8 @@ exports.jsFetcher = api.jsFetcher;
 exports.jsonpFetcher = api.jsonpFetcher;
 exports.normalizeApi = api.normalizeApi;
 exports.normalizeApiResponseData = api.normalizeApiResponseData;
+exports.removeApiRequestAdaptor = api.removeApiRequestAdaptor;
+exports.removeApiResponseAdaptor = api.removeApiResponseAdaptor;
 exports.responseAdaptor = api.responseAdaptor;
 exports.setApiCache = api.setApiCache;
 exports.str2AsyncFunction = api.str2AsyncFunction;
@@ -473,6 +486,7 @@ exports.safeSub = math.safeSub;
 exports.animation = Animation["default"];
 exports.RegisterStore = index.RegisterStore;
 exports.RendererStore = index.RendererStore;
+exports.registerStore = index.registerStore;
 exports.extendLocale = locale.extendLocale;
 exports.getDefaultLocale = locale.getDefaultLocale;
 exports.localeable = locale.localeable;

package/lib/locale.d.ts

@@ -16,7 +16,7 @@ export interface LocaleProps {
     translate: TranslateFn;
 }
 export declare const LocaleContext: React.Context<string>;
-export declare function localeable<T extends React.ComponentType<React.ComponentProps<T> & LocaleProps>>(ComposedComponent: T): {
+export declare function localeable<T extends React.ComponentType<React.ComponentProps<T> & LocaleProps>>(ComposedComponent: T, methods?: Array<string>): {
     new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof LocaleProps>> & {
         locale?: string | undefined;
         translate?: ((str: string, ...args: any[]) => string) | undefined;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -99,7 +99,7 @@ function setDefaultLocale(locale) {
     defaultLocale = locale;
 }
 var LocaleContext = React__default["default"].createContext('');
-function localeable(ComposedComponent) {
+function localeable(ComposedComponent, methods) {
     var _a;
     var result = hoistNonReactStatic__default["default"]((_a = /** @class */ (function (_super) {
             tslib.__extends(class_1, _super);
@@ -141,6 +141,17 @@ function localeable(ComposedComponent) {
         _a.contextType = LocaleContext,
         _a.ComposedComponent = ComposedComponent,
         _a), ComposedComponent);
+    if (Array.isArray(methods)) {
+        methods.forEach(function (method) {
+            if (ComposedComponent.prototype[method]) {
+                result.prototype[method] = function () {
+                    var _a;
+                    var fn = (_a = this.ref) === null || _a === void 0 ? void 0 : _a[method];
+                    return fn ? fn.apply(this.ref, arguments) : undefined;
+                };
+            }
+        });
+    }
     return result;
 }
 

package/lib/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/Form.d.ts

@@ -2,7 +2,7 @@
 import React from 'react';
 import { RendererProps } from '../factory';
 import { IFormStore } from '../store/form';
-import { SchemaNode, ActionObject, ClassName, BaseApiObject, SchemaExpression, SchemaClassName } from '../types';
+import { SchemaNode, ActionObject, ClassName, BaseApiObject, SchemaExpression, SchemaClassName, DataChangeReason } from '../types';
 import { IScopedContext } from '../Scoped';
 import type { LabelAlign } from './Item';
 export interface FormHorizontal {
@@ -263,7 +263,7 @@ export interface FormProps extends RendererProps, Omit<FormSchemaBase, 'mode' |
     onSubmit?: (values: object, action: any) => any;
     onChange?: (values: object, diff: object, props: any) => any;
     onFailed?: (reason: string, errors: any) => any;
-    onFinished: (values: object, action: any) => any;
+    onFinished: (values: object, action: ActionObject, store: IFormStore) => any;
     onValidate: (values: object, form: any) => any;
     onValidChange?: (valid: boolean, props: any) => void;
     messages: {
@@ -338,7 +338,7 @@ export default class Form extends React.Component<FormProps, object> {
     onInit(): Promise<void>;
     reload(subPath?: string, query?: any, ctx?: any, silent?: boolean): Promise<any>;
     receive(values: object, name?: string, replace?: boolean): Promise<any>;
-    silentReload(target?: string, query?: any): void;
+    silentReload(target?: string, query?: any): Promise<any>;
     initInterval(value: any): any;
     isValidated(): boolean;
     validate(forceValidate?: boolean, throwErrors?: boolean, toastErrors?: boolean, skipFlush?: boolean): Promise<boolean>;
@@ -354,12 +354,12 @@ export default class Form extends React.Component<FormProps, object> {
     reset(): void;
     addHook(fn: () => any, type?: 'validate' | 'init' | 'flush', enforce?: 'prev' | 'post'): () => void;
     removeHook(fn: () => any, type?: string): void;
-    handleChange(value: any, name: string, submit: boolean, changePristine?: boolean): void;
+    handleChange(value: any, name: string, submit: boolean, changePristine?: boolean, changeReason?: DataChangeReason): void;
     formItemDispatchEvent(type: string, data: any): Promise<import("../utils").RendererEvent<any, any>>;
     emittedData: any;
     emitting: boolean;
     emitChange(submit: boolean, emitedFromWatch?: boolean): Promise<void>;
-    handleBulkChange(values: Object, submit: boolean): void;
+    handleBulkChange(values: Object, submit: boolean, changeReason?: DataChangeReason): void;
     handleFormSubmit(e: React.UIEvent<any>): any;
     handleReset(action: any): (data: any) => void;
     handleAction(e: React.UIEvent<any> | void, action: ActionObject, data: object, throwErrors?: boolean, delegate?: IScopedContext): Promise<any>;

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -111,6 +111,7 @@ var Form = /** @class */ (function (_super) {
         _this.blockRouting = _this.blockRouting.bind(_this);
         _this.beforePageUnload = _this.beforePageUnload.bind(_this);
         _this.formItemDispatchEvent = _this.formItemDispatchEvent.bind(_this);
+        _this.flush = _this.flush.bind(_this);
         var store = props.store, canAccessSuperData = props.canAccessSuperData, persistData = props.persistData, simpleMode = props.simpleMode, formLazyChange = props.formLazyChange;
         store.setCanAccessSuperData(canAccessSuperData !== false);
         store.setPersistData(persistData);
@@ -196,7 +197,9 @@ var Form = /** @class */ (function (_super) {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed,
                 onSuccess: function (json, data) {
-                    store.setValues(data);
+                    store.setValues(data, undefined, undefined, undefined, {
+                        type: 'api'
+                    });
                     if (!api.isEffectiveApi(initAsyncApi, store.data) ||
                         store.data[initFinishedField || 'finished']) {
                         return;
@@ -392,7 +395,7 @@ var Form = /** @class */ (function (_super) {
                     case 3:
                         // 派发初始化接口请求完成事件
                         this.dispatchInited(result);
-                        return [2 /*return*/];
+                        return [2 /*return*/, store.data];
                 }
             });
         });
@@ -403,7 +406,7 @@ var Form = /** @class */ (function (_super) {
         return this.reload();
     };
     Form.prototype.silentReload = function (target, query) {
-        this.reload(target, query, undefined, true);
+        return this.reload(target, query, undefined, true);
     };
     Form.prototype.initInterval = function (value) {
         var _a = this.props, interval = _a.interval, silentPolling = _a.silentPolling, stopAutoRefreshWhen = _a.stopAutoRefreshWhen, data = _a.data;
@@ -463,7 +466,9 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.setValues = function (value, replace) {
         var store = this.props.store;
         this.flush();
-        store.setValues(value, undefined, replace);
+        store.setValues(value, undefined, replace, undefined, {
+            type: 'action'
+        });
     };
     Form.prototype.submit = function (fn, throwErrors, skipFlush) {
         if (throwErrors === void 0) { throwErrors = false; }
@@ -573,13 +578,15 @@ var Form = /** @class */ (function (_super) {
             }
         }
     };
-    Form.prototype.handleChange = function (value, name, submit, changePristine) {
+    Form.prototype.handleChange = function (value, name, submit, changePristine, changeReason) {
         if (changePristine === void 0) { changePristine = false; }
         var _a = this.props, store = _a.store, formLazyChange = _a.formLazyChange, persistDataKeys = _a.persistDataKeys;
         if (typeof name !== 'string') {
             return;
         }
-        store.changeValue(name, value, changePristine);
+        store.changeValue(name, value, changePristine, undefined, undefined, changeReason || {
+            type: 'input'
+        });
         if (!changePristine || typeof value !== 'undefined') {
             (formLazyChange === false ? this.emitChange : this.lazyEmitChange)(submit);
         }
@@ -617,7 +624,7 @@ var Form = /** @class */ (function (_super) {
                         if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
                             onChange && onChange.apply(null, changeProps);
                         }
-                        store.clearRestError();
+                        mobxStateTree.isAlive(store) && store.clearRestError();
                         if (!(!emitedFromWatch && (submit || (submitOnChange && store.inited)))) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.handleAction(undefined, {
                                 type: 'submit',
@@ -637,9 +644,11 @@ var Form = /** @class */ (function (_super) {
             });
         });
     };
-    Form.prototype.handleBulkChange = function (values, submit) {
+    Form.prototype.handleBulkChange = function (values, submit, changeReason) {
         var _a = this.props; _a.onChange; var store = _a.store, formLazyChange = _a.formLazyChange;
-        store.setValues(values);
+        store.setValues(values, undefined, undefined, undefined, changeReason || {
+            type: 'input'
+        });
         // store.updateData(values);
         // store.items.forEach(formItem => {
         //   const updatedValue = getVariable(values, formItem.name, false);
@@ -689,6 +698,9 @@ var Form = /** @class */ (function (_super) {
                         _f.sent();
                         _f.label = 2;
                     case 2:
+                        if (!mobxStateTree.isAlive(store)) {
+                            return [2 /*return*/];
+                        }
                         if (trimValues) {
                             store.trimValues();
                         }
@@ -889,7 +901,7 @@ var Form = /** @class */ (function (_super) {
                                 if (values === false) {
                                     return store.data;
                                 }
-                                if (onFinished && onFinished(values, action) === false) {
+                                if (onFinished && onFinished(values, action, store) === false) {
                                     return values;
                                 }
                                 resetAfterSubmit && store.reset(_this.handleReset(action));
@@ -1248,7 +1260,8 @@ var Form = /** @class */ (function (_super) {
             removeHook: this.removeHook,
             renderFormItems: this.renderFormItems,
             formItemDispatchEvent: this.formItemDispatchEvent,
-            formPristine: form.pristine
+            formPristine: form.pristine,
+            onFlushForm: this.flush
             // value: (control as any)?.name
             //   ? getVariable(form.data, (control as any)?.name, canAccessSuperData)
             //   : (control as any)?.value,