amis-core 6.9.0-rc.0 → 6.9.0-rc.10

package/lib/actions/ParallelAction.js

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

package/lib/actions/PrintAction.js

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

package/lib/actions/StatusAction.js

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

package/lib/actions/SwitchAction.js

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

package/lib/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 
@@ -23,7 +23,7 @@ var ToastAction = /** @class */ (function () {
                 if (!((_a = event.context.env) === null || _a === void 0 ? void 0 : _a.notify)) {
                     throw new Error('env.notify is required!');
                 }
-                (_c = (_b = event.context.env) === null || _b === void 0 ? void 0 : _b.notify) === null || _c === void 0 ? void 0 : _c.call(_b, ((_d = action.args) === null || _d === void 0 ? void 0 : _d.msgType) || 'info', String((_e = action.args) === null || _e === void 0 ? void 0 : _e.msg), action.args);
+                (_c = (_b = event.context.env) === null || _b === void 0 ? void 0 : _b.notify) === null || _c === void 0 ? void 0 : _c.call(_b, ((_d = action.args) === null || _d === void 0 ? void 0 : _d.msgType) || 'info', String((_e = action.args) === null || _e === void 0 ? void 0 : _e.msg), tslib.__assign(tslib.__assign({}, action.args), { mobileUI: renderer.props.mobileUI }));
                 return [2 /*return*/];
             });
         });

package/lib/actions/WaitAction.js

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

package/lib/components/CustomStyle.js

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

package/lib/components/ErrorBoundary.js

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

package/lib/components/LazyComponent.js

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

package/lib/components/Overlay.js

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

package/lib/components/PopOver.js

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

package/lib/env.d.ts

@@ -90,10 +90,6 @@ export interface RendererEnv {
      * 是否开启 testid 定位
      */
     enableTestid?: boolean;
-    /**
-     * pdfjs worker 地址，用于渲染 pdf
-     */
-    pdfjsWorkerSrc?: string;
     /**
      * 替换文本，用于实现 URL 替换、语言替换等
      */

package/lib/env.js

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

package/lib/envOverwrite.js

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

package/lib/factory.d.ts

@@ -15,6 +15,7 @@ export interface RendererBasicConfig {
     type?: string;
     alias?: Array<string>;
     name?: string;
+    origin?: RendererBasicConfig;
     storeType?: string;
     defaultProps?: (type: string, schema: any) => any;
     shouldSyncSuperStore?: (store: any, props: any, prevProps: any) => boolean | undefined;
@@ -23,6 +24,7 @@ export interface RendererBasicConfig {
     isolateScope?: boolean;
     isFormItem?: boolean;
     autoVar?: boolean;
+    override?: boolean;
 }
 export interface RendererProps extends ThemeProps, LocaleProps, OnEventProps, StatusScopedProps {
     render: (region: string, node: SchemaNode, props?: PlainObject) => JSX.Element;
@@ -53,7 +55,6 @@ export interface RendererConfig extends RendererBasicConfig {
     getComponent?: () => Promise<{
         default: RendererComponent;
     } | any>;
-    override?: boolean;
     Renderer?: RendererComponent;
 }
 export interface RenderSchemaFilter {
@@ -100,3 +101,8 @@ export declare function resolveRenderer(path: string, schema?: Schema): null | R
 export declare function getRenderers(): RendererConfig[];
 export declare function getRendererByName(name: string): RendererConfig | undefined;
 export { RendererEnv };
+export interface IGlobalOptions {
+    pdfjsWorkerSrc: string;
+}
+export declare function setGlobalOptions(options: Partial<IGlobalOptions>): void;
+export declare function getGlobalOptions(): IGlobalOptions;

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 
@@ -47,6 +47,26 @@ 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) {
@@ -54,7 +74,7 @@ function rendererToComponent(component, config) {
             storeType: config.storeType,
             extendsData: config.storeExtendsData,
             shouldSyncSuperStore: config.shouldSyncSuperStore
-        })(mobxReact.observer(component));
+        })(mobxReact.observer(fixMobxInjectRender(component)));
     }
     if (config.isolateScope) {
         component = Scoped.HocScoped(component, config.type);
@@ -84,6 +104,7 @@ function registerRenderer(config) {
         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!"));
     }
@@ -105,7 +126,18 @@ function registerRenderer(config) {
     }
     renderersMap[renderer.name] = !!(renderer.component && renderer.component !== Placeholder.Placeholder);
     renderer.type && (renderersTypeMap[renderer.type] = renderer);
-    (renderer.alias || []).forEach(function (alias) { return (renderersTypeMap[alias] = 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) {
@@ -117,7 +149,12 @@ function unRegisterRenderer(config) {
         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) { return delete renderersTypeMap[alias]; });
+        (_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];
@@ -160,7 +197,9 @@ function loadAsyncRenderer(renderer) {
     });
 }
 function isAsyncRenderer(item) {
-    return ((!item.component || item.component === Placeholder.Placeholder) && item.getComponent);
+    return (item &&
+        (!item.component || item.component === Placeholder.Placeholder) &&
+        item.getComponent);
 }
 function hasAsyncRenderers() {
     return renderers.some(isAsyncRenderer);
@@ -434,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;
@@ -441,6 +489,7 @@ exports.clearStoresCache = clearStoresCache;
 exports.defaultOptions = defaultOptions;
 exports.extendDefaultEnv = extendDefaultEnv;
 exports.filterSchema = filterSchema;
+exports.getGlobalOptions = getGlobalOptions;
 exports.getRendererByName = getRendererByName;
 exports.getRenderers = getRenderers;
 exports.hasAsyncRenderers = hasAsyncRenderers;
@@ -452,6 +501,7 @@ 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,12 +6,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="react" />
-import { Renderer, getRendererByName, getRenderers, loadAllAsyncRenderers, loadAsyncRenderersByType, loadAsyncRenderer, registerRenderer, unRegisterRenderer, resolveRenderer, filterSchema, clearStoresCache, updateEnv, addSchemaFilter, extendDefaultEnv } 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';
 export * from './utils/index';
+export * from './utils/animations';
 export * from './types';
 export * from './store';
 import * as utils from './utils/helper';
@@ -27,7 +28,7 @@ declare const classPrefix: string | undefined;
 export * from './actions';
 import FormItem, { FormItemWrap, registerFormItem, getFormItemByName } from './renderers/Item';
 import type { FormBaseControl, FormControlProps, FormItemProps } from './renderers/Item';
-import { OptionsControl, registerOptionsControl } from './renderers/Options';
+import { OptionsControl, registerOptionsControl, OptionsControlBase } from './renderers/Options';
 import type { OptionsControlProps } from './renderers/Options';
 import type { FormOptionsControl } from './renderers/Options';
 import { Schema } from './types';
@@ -43,13 +44,14 @@ import PopOver from './components/PopOver';
 import ErrorBoundary from './components/ErrorBoundary';
 import { FormRenderer } from './renderers/Form';
 import type { FormHorizontal, FormSchemaBase } from './renderers/Form';
-import { enableDebug, disableDebug } from './utils/index';
+import { enableDebug, disableDebug, wrapFetcher } from './utils/index';
 import type { OnEventProps } from './utils/index';
 import { valueMap as styleMap } from './utils/style-helper';
 import { RENDERER_TRANSMISSION_OMIT_PROPS } from './SchemaRenderer';
 import type { IItem } from './store/list';
 import CustomStyle from './components/CustomStyle';
 import { StatusScoped } from './StatusScoped';
+import styleManager from './StyleManager';
 export declare const version = "__buildVersion";
-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 };
+export { styleManager, 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, OptionsControlBase, 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, wrapFetcher };
 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.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 
@@ -42,6 +42,7 @@ var isPureVariable = require('./utils/isPureVariable.js');
 var jsonSchema2AmisSchema = require('./utils/json-schema-2-amis-schema.js');
 var keyToPath = require('./utils/keyToPath.js');
 var labelToString = require('./utils/labelToString.js');
+var loopTooMuch = require('./utils/loopTooMuch.js');
 var makeSorter = require('./utils/makeSorter.js');
 var normalizeLink = require('./utils/normalizeLink.js');
 var normalizeOptions = require('./utils/normalizeOptions.js');
@@ -74,6 +75,7 @@ var resolveCondition = require('./utils/resolveCondition.js');
 var arraySlice = require('./utils/arraySlice.js');
 var math = require('./utils/math.js');
 var Animation = require('./utils/Animation.js');
+var animations = require('./utils/animations.js');
 var index = require('./store/index.js');
 var mobxStateTree = require('mobx-state-tree');
 var locale = require('./locale.js');
@@ -115,6 +117,7 @@ var Form = require('./renderers/Form.js');
 var SchemaRenderer = require('./SchemaRenderer.js');
 var CustomStyle = require('./components/CustomStyle.js');
 var StatusScoped = require('./StatusScoped.js');
+var StyleManager = require('./StyleManager.js');
 var stripNumber = require('./utils/stripNumber.js');
 var iRenderer = require('./store/iRenderer.js');
 var service = require('./store/service.js');
@@ -139,7 +142,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.9.0-rc.0';
+var version = '6.9.0-rc.10';
+window.amisVersionInfo = {
+    version: '6.9.0-rc.10',
+    buildTime: '2024-11-02T03:02:35.763Z'
+};
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -213,6 +220,7 @@ 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;
@@ -220,9 +228,11 @@ 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.addApiResponseAdaptor = api.addApiResponseAdaptor;
 exports.addApiResponseAdator = api.addApiResponseAdator;
 exports.buildApi = api.buildApi;
 exports.callStrFunction = api.callStrFunction;
@@ -321,6 +331,7 @@ exports.findTreeAll = helper.findTreeAll;
 exports.findTreeIndex = helper.findTreeIndex;
 exports.flattenTree = helper.flattenTree;
 exports.flattenTreeWithLeafNodes = helper.flattenTreeWithLeafNodes;
+exports.formateId = helper.formateId;
 exports.getLevelFromClassName = helper.getLevelFromClassName;
 exports.getPropValue = helper.getPropValue;
 exports.getRange = helper.getRange;
@@ -394,6 +405,7 @@ exports.isPureVariable = isPureVariable.isPureVariable;
 exports.JSONSchme2AMisSchema = jsonSchema2AmisSchema.JSONSchme2AMisSchema;
 exports.keyToPath = keyToPath.keyToPath;
 exports.labelToString = labelToString.labelToString;
+exports.loopTooMuch = loopTooMuch.loopTooMuch;
 exports.makeSorter = makeSorter.makeSorter;
 exports.normalizeLink = normalizeLink.normalizeLink;
 exports.normalizeOptions = normalizeOptions.normalizeOptions;
@@ -478,6 +490,7 @@ exports.numberFormatter = math.numberFormatter;
 exports.safeAdd = math.safeAdd;
 exports.safeSub = math.safeSub;
 exports.animation = Animation["default"];
+exports.createAnimationStyle = animations.createAnimationStyle;
 exports.RegisterStore = index.RegisterStore;
 exports.RendererStore = index.RendererStore;
 exports.registerStore = index.registerStore;
@@ -512,6 +525,7 @@ exports.FormItemWrap = Item.FormItemWrap;
 exports.getFormItemByName = Item.getFormItemByName;
 exports.registerFormItem = Item.registerFormItem;
 exports.OptionsControl = Options.OptionsControl;
+exports.OptionsControlBase = Options.OptionsControlBase;
 exports.registerOptionsControl = Options.registerOptionsControl;
 exports.addRootWrapper = Root.addRootWrapper;
 exports.envOverwrite = envOverwrite.envOverwrite;
@@ -568,6 +582,7 @@ exports.FormRenderer = Form.FormRenderer;
 exports.RENDERER_TRANSMISSION_OMIT_PROPS = SchemaRenderer.RENDERER_TRANSMISSION_OMIT_PROPS;
 exports.CustomStyle = CustomStyle["default"];
 exports.StatusScoped = StatusScoped.StatusScoped;
+exports.styleManager = StyleManager["default"];
 exports.stripNumber = stripNumber.stripNumber;
 exports.iRendererStore = iRenderer.iRendererStore;
 exports.ServiceStore = service.ServiceStore;

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.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * 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.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * 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.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * 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,