amis-core 6.8.0 → 6.9.0-rc.0

package/esm/factory.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
-import { __assign } from 'tslib';
+import { __assign, __awaiter, __generator } from 'tslib';
 import React from 'react';
 import { RendererStore } from './store/index.js';
 import { destroy, getEnv } from 'mobx-state-tree';
@@ -19,6 +19,8 @@ import { string2regExp } from './utils/string2regExp.js';
 
 var _a, _b;
 var renderers = [];
+// type 与 RendererConfig 的映射关系
+var renderersTypeMap = {};
 var renderersMap = {};
 var schemaFilters = [];
 var anonymousIndex = 1;
@@ -34,53 +36,87 @@ function Renderer(config) {
         return renderer.component;
     };
 }
+// 将 renderer 转成组件
+function rendererToComponent(component, config) {
+    if (config.storeType && config.component) {
+        component = HocStoreFactory({
+            storeType: config.storeType,
+            extendsData: config.storeExtendsData,
+            shouldSyncSuperStore: config.shouldSyncSuperStore
+        })(observer(component));
+    }
+    if (config.isolateScope) {
+        component = 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(config.type), "$"), 'i');
+            config.test ||
+                new RegExp("(^|/)(?:".concat((config.alias || [])
+                    .concat(config.type)
+                    .map(function (type) { return 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 = __assign({}, config);
+    if (exists &&
+        exists.component &&
+        exists.component !== Placeholder &&
+        config.component &&
+        !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 = 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 = HocStoreFactory({
-            storeType: config.storeType,
-            extendsData: config.storeExtendsData,
-            shouldSyncSuperStore: config.shouldSyncSuperStore
-        })(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 = HocScoped(config.component, config.type);
+    if (!exists) {
+        var idx = findIndex(renderers, function (item) { return config.weight < item.weight; });
+        ~idx ? renderers.splice(idx, 0, renderer) : renderers.push(renderer);
     }
-    var idx = findIndex(renderers, function (item) { return config.weight < item.weight; });
-    ~idx ? renderers.splice(idx, 0, config) : renderers.push(config);
-    renderersMap[config.name] = config.component !== Placeholder;
-    return config;
+    renderersMap[renderer.name] = !!(renderer.component && renderer.component !== Placeholder);
+    renderer.type && (renderersTypeMap[renderer.type] = renderer);
+    (renderer.alias || []).forEach(function (alias) { return (renderersTypeMap[alias] = renderer); });
+    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) { return delete renderersTypeMap[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 (React.createElement("div", { className: "RuntimeError" },
         React.createElement("p", null, "Error: \u627E\u4E0D\u5230\u5BF9\u5E94\u7684\u6E32\u67D3\u5668"),
         React.createElement("p", null,
@@ -89,12 +125,95 @@ function loadRenderer(schema, path) {
         React.createElement("pre", null,
             React.createElement("code", null, JSON.stringify(schema, null, 2)))));
 }
+function loadAsyncRenderer(renderer) {
+    return __awaiter(this, void 0, void 0, function () {
+        var result;
+        return __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(__assign(__assign({}, renderer), { component: result.default }));
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function isAsyncRenderer(item) {
+    return ((!item.component || item.component === Placeholder) && item.getComponent);
+}
+function hasAsyncRenderers() {
+    return renderers.some(isAsyncRenderer);
+}
+function loadAsyncRenderersByType(type, ignore) {
+    if (ignore === void 0) { ignore = false; }
+    return __awaiter(this, void 0, void 0, function () {
+        var types, asyncRenderers;
+        return __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 __awaiter(this, void 0, void 0, function () {
+        var asyncRenderers;
+        var _this = this;
+        return __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 __awaiter(_this, void 0, void 0, function () {
+                            return __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');
     },
@@ -261,8 +380,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];
@@ -273,15 +393,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);
         }
@@ -312,4 +424,4 @@ function getRendererByName(name) {
     return find(renderers, function (item) { return item.name === name; });
 }
 
-export { Renderer, addSchemaFilter, clearStoresCache, defaultOptions, extendDefaultEnv, filterSchema, getRendererByName, getRenderers, loadRenderer, registerRenderer, renderersMap, resolveRenderer, stores, unRegisterRenderer, updateEnv };
+export { Renderer, addSchemaFilter, clearStoresCache, defaultOptions, extendDefaultEnv, filterSchema, getRendererByName, getRenderers, hasAsyncRenderers, isAsyncRenderer, loadAllAsyncRenderers, loadAsyncRenderer, loadAsyncRenderersByType, loadRendererError, registerRenderer, renderersMap, resolveRenderer, stores, unRegisterRenderer, updateEnv };

package/esm/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 } 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 };
 export declare function render(schema: Schema, props?: RootRenderProps, options?: RenderOptions, pathPrefix?: string): JSX.Element;

package/esm/index.js

@@ -1,16 +1,16 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
 import { __assign, __rest } from 'tslib';
 import { stores, defaultOptions } from './factory.js';
-export { Renderer, addSchemaFilter, clearStoresCache, extendDefaultEnv, filterSchema, getRendererByName, getRenderers, registerRenderer, resolveRenderer, unRegisterRenderer, updateEnv } from './factory.js';
+export { Renderer, addSchemaFilter, clearStoresCache, extendDefaultEnv, filterSchema, getRendererByName, getRenderers, loadAllAsyncRenderers, loadAsyncRenderer, loadAsyncRenderersByType, registerRenderer, resolveRenderer, unRegisterRenderer, updateEnv } from './factory.js';
 import './polyfills.js';
 import './renderers/builtin.js';
 import './renderers/register.js';
 import { wrapFetcher } from './utils/api.js';
-export { buildApi, callStrFunction, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './utils/api.js';
+export { addApiRequestAdaptor, addApiResponseAdator, buildApi, callStrFunction, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, removeApiRequestAdaptor, removeApiResponseAdaptor, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './utils/api.js';
 export { attachmentAdpator } from './utils/attachmentAdpator.js';
 export { autobindMethod, bind } from './utils/autobind.js';
 export { chromeVersion, isSafari } from './utils/browser.js';
@@ -78,7 +78,7 @@ export { arraySlice } from './utils/arraySlice.js';
 export { isIntegerInRange, numberFormatter, safeAdd, safeSub } from './utils/math.js';
 export { default as animation } from './utils/Animation.js';
 import { RendererStore } from './store/index.js';
-export { RegisterStore, RendererStore } from './store/index.js';
+export { RegisterStore, RendererStore, registerStore } 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';
@@ -148,7 +148,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '6.8.0';
+var version = '6.9.0-rc.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }

package/esm/locale.js

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

package/esm/polyfills.js

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

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -22,7 +22,7 @@ import '@rc-component/mini-decimal';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';
 import { isEffectiveApi, isApiOutdated } from '../utils/api.js';
-import LazyComponent from '../components/LazyComponent.js';
+import themedLazyComponent from '../components/LazyComponent.js';
 import { isAlive } from 'mobx-state-tree';
 import '../utils/browser.js';
 import '../utils/ColorScale.js';
@@ -1383,7 +1383,7 @@ var Form = /** @class */ (function (_super) {
             });
         }
         if (lazyLoad) {
-            body = React.createElement(LazyComponent, null, body);
+            body = React.createElement(themedLazyComponent, null, body);
         }
         return body;
     };

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -549,7 +549,7 @@ var FormItemWrap = /** @class */ (function (_super) {
             var labelAlign = (props.labelAlign !== 'inherit' && props.labelAlign) ||
                 props.formLabelAlign;
             var labelWidth = props.labelWidth || props.formLabelWidth;
-            return (React.createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--horizontal", isStatic && staticClassName ? staticClassName : className, (_a = {
+            return (React.createElement("div", { "data-role": "form-item", "data-amis-name": props.name, className: cx("Form-item Form-item--horizontal", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'Form-item--horizontal-justify': horizontal.justify
                     },
                     _a["is-error"] = model && !model.valid,
@@ -615,7 +615,7 @@ var FormItemWrap = /** @class */ (function (_super) {
             var _a;
             var className = props.className, style = props.style, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint; props.data; var showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, themeCss = props.themeCss, wrapperCustomStyle = props.wrapperCustomStyle, id = props.id;
             description = description || desc;
-            return (React.createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--normal", isStatic && staticClassName ? staticClassName : className, (_a = {
+            return (React.createElement("div", { "data-role": "form-item", "data-amis-name": props.name, className: cx("Form-item Form-item--normal", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'is-error': model && !model.valid
                     },
                     _a["is-required"] = required,
@@ -701,7 +701,7 @@ var FormItemWrap = /** @class */ (function (_super) {
             var className = props.className, style = props.style, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, remark = props.remark, labelRemark = props.labelRemark, env = props.env, hint = props.hint, renderLabel = props.renderLabel, renderDescription = props.renderDescription; props.data; var showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, themeCss = props.themeCss, wrapperCustomStyle = props.wrapperCustomStyle, id = props.id;
             var labelWidth = props.labelWidth || props.formLabelWidth;
             description = description || desc;
-            return (React.createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--inline", isStatic && staticClassName ? staticClassName : className, (_a = {
+            return (React.createElement("div", { "data-role": "form-item", "data-amis-name": props.name, className: cx("Form-item Form-item--inline", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'is-error': model && !model.valid
                     },
                     _a["is-required"] = required,
@@ -757,7 +757,7 @@ var FormItemWrap = /** @class */ (function (_super) {
             var className = props.className, style = props.style, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint; props.data; var showErrorMsg = props.showErrorMsg, mobileUI = props.mobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName, wrapperCustomStyle = props.wrapperCustomStyle, themeCss = props.themeCss, id = props.id;
             description = description || desc;
             var labelWidth = props.labelWidth || props.formLabelWidth;
-            return (React.createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--row", isStatic && staticClassName ? staticClassName : className, (_a = {
+            return (React.createElement("div", { "data-role": "form-item", "data-amis-name": props.name, className: cx("Form-item Form-item--row", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'is-error': model && !model.valid
                     },
                     _a["is-required"] = required,
@@ -814,7 +814,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                 props.formLabelAlign;
             var labelWidth = props.labelWidth || props.formLabelWidth;
             description = description || desc;
-            return (React.createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--flex", isStatic && staticClassName ? staticClassName : className, (_a = {
+            return (React.createElement("div", { "data-role": "form-item", "data-amis-name": props.name, className: cx("Form-item Form-item--flex", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'is-error': model && !model.valid
                     },
                     _a["is-required"] = required,

package/esm/renderers/Options.d.ts

@@ -138,9 +138,9 @@ export interface OptionsControlProps extends FormControlProps, Omit<FormOptionsC
     deferLoad: (option: Option) => void;
     leftDeferLoad: (option: Option, leftOptions: Option) => void;
     expandTreeOptions: (nodePathArr: any[]) => void;
-    onAdd?: (idx?: number | Array<number>, value?: any, skipForm?: boolean) => void;
-    onEdit?: (value: Option, origin?: Option, skipForm?: boolean) => void;
-    onDelete?: (value: Option) => void;
+    onAdd?: (idx?: number | Array<number>, value?: any, skipForm?: boolean, callback?: (value: any) => any) => void;
+    onEdit?: (value: Option, origin?: Option, skipForm?: boolean, callback?: (value: any) => any) => void;
+    onDelete?: (value: Option, callback?: (value: any) => any) => void;
 }
 export interface OptionsProps extends FormControlProps, Omit<OptionProps, 'className'> {
     source?: Api;

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -519,12 +519,12 @@ function registerOptionsControl(config) {
             var formItem = this.props.formItem;
             formItem && formItem.setLoading(value);
         };
-        FormOptionsItem.prototype.handleOptionAdd = function (idx, value, skipForm) {
+        FormOptionsItem.prototype.handleOptionAdd = function (idx, value, skipForm, callback) {
             var _a, _b;
             if (idx === void 0) { idx = -1; }
             if (skipForm === void 0) { skipForm = false; }
             return __awaiter(this, void 0, void 0, function () {
-                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, deferField, model, createBtnLabel, env, __, parent, ctx, customAddPrevent, result, _d, prevent, payload, e_1, isPrevented, options;
+                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, deferField, model, createBtnLabel, env, __, parent, ctx, customAddPrevent, result, _d, prevent, payload, e_1, isPrevented, ret, options;
                 var _e;
                 var _this = this;
                 return __generator(this, function (_f) {
@@ -654,13 +654,24 @@ function registerOptionsControl(config) {
                             if (isPrevented) {
                                 return [2 /*return*/];
                             }
-                            if (!(((parent === null || parent === void 0 ? void 0 : parent.hasOwnProperty(deferField)) && parent[deferField]) ||
-                                (parent === null || parent === void 0 ? void 0 : parent.defer))) return [3 /*break*/, 13];
-                            return [4 /*yield*/, this.deferLoad(parent)];
+                            return [4 /*yield*/, (callback === null || callback === void 0 ? void 0 : callback(result))];
                         case 12:
-                            _f.sent();
-                            return [3 /*break*/, 14];
+                            ret = _f.sent();
+                            if (!(ret === false)) return [3 /*break*/, 13];
+                            // 如果回调里面返回 false，就不继续了。
+                            return [2 /*return*/];
                         case 13:
+                            if (!
+                            // 如果是懒加载的，只懒加载当前节点。
+                            (((parent === null || parent === void 0 ? void 0 : parent.hasOwnProperty(deferField)) && parent[deferField]) ||
+                                (parent === null || parent === void 0 ? void 0 : parent.defer))) 
+                            // 如果是懒加载的，只懒加载当前节点。
+                            return [3 /*break*/, 15];
+                            return [4 /*yield*/, this.deferLoad(parent)];
+                        case 14:
+                            _f.sent();
+                            return [3 /*break*/, 16];
+                        case 15:
                             if (source && addApi) {
                                 // 如果配置了 source 且配置了 addApi 直接重新拉取接口就够了
                                 // 不能不判断 addApi 就刷新，因为有些场景就是临时添加的。
@@ -678,18 +689,18 @@ function registerOptionsControl(config) {
                                 }
                                 model.setOptions(options, this.changeOptionValue, data);
                             }
-                            _f.label = 14;
-                        case 14: return [2 /*return*/];
+                            _f.label = 16;
+                        case 16: return [2 /*return*/];
                     }
                 });
             });
         };
-        FormOptionsItem.prototype.handleOptionEdit = function (value, origin, skipForm) {
+        FormOptionsItem.prototype.handleOptionEdit = function (value, origin, skipForm, callback) {
             var _a, _b;
             if (origin === void 0) { origin = value; }
             if (skipForm === void 0) { skipForm = false; }
             return __awaiter(this, void 0, void 0, function () {
-                var _c, editControls, editDialog, disabled, labelField, valueField, onOpenDialog, editApi, editInitApi, env, source, data, model, optionLabel, __, customEditPrevent, result, _d, prevent, payload, e_2, isPrevented, indexes;
+                var _c, editControls, editDialog, disabled, labelField, valueField, onOpenDialog, editApi, editInitApi, env, source, data, model, optionLabel, __, customEditPrevent, result, _d, prevent, payload, e_2, isPrevented, ret, indexes;
                 var _this = this;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
@@ -798,7 +809,14 @@ function registerOptionsControl(config) {
                             if (isPrevented) {
                                 return [2 /*return*/];
                             }
-                            if (source && editApi) {
+                            return [4 /*yield*/, (callback === null || callback === void 0 ? void 0 : callback(result))];
+                        case 12:
+                            ret = _e.sent();
+                            if (ret === false) {
+                                // 如果回调里面返回 false，就不继续了。
+                                return [2 /*return*/];
+                            }
+                            else if (source && editApi) {
                                 this.reload();
                             }
                             else {
@@ -812,10 +830,10 @@ function registerOptionsControl(config) {
                 });
             });
         };
-        FormOptionsItem.prototype.handleOptionDelete = function (value) {
+        FormOptionsItem.prototype.handleOptionDelete = function (value, callback) {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var _c, deleteConfirmText, disabled, data, deleteApi, onDelete, env, model, source, valueField, __, ctx, confirmed, _d, isPrevented, delConfirmPrevent, result, options, indexes, e_3;
+                var _c, deleteConfirmText, disabled, data, deleteApi, onDelete, env, model, source, valueField, __, ctx, confirmed, _d, isPrevented, delConfirmPrevent, result, ret, options, indexes, e_3;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -871,7 +889,12 @@ function registerOptionsControl(config) {
                             if (onDelete) {
                                 onDelete(ctx);
                             }
-                            if (source) {
+                            ret = callback === null || callback === void 0 ? void 0 : callback(ctx);
+                            if (ret === false) {
+                                // 如果回调里面返回 false，就不继续了。
+                                return [2 /*return*/];
+                            }
+                            else if (source) {
                                 this.reload();
                             }
                             else {
@@ -985,19 +1008,19 @@ function registerOptionsControl(config) {
         __decorate([
             autobind,
             __metadata("design:type", Function),
-            __metadata("design:paramtypes", [Object, Object, Boolean]),
+            __metadata("design:paramtypes", [Object, Object, Boolean, Function]),
             __metadata("design:returntype", Promise)
         ], FormOptionsItem.prototype, "handleOptionAdd", null);
         __decorate([
             autobind,
             __metadata("design:type", Function),
-            __metadata("design:paramtypes", [Object, Object, Boolean]),
+            __metadata("design:paramtypes", [Object, Object, Boolean, Function]),
             __metadata("design:returntype", Promise)
         ], FormOptionsItem.prototype, "handleOptionEdit", null);
         __decorate([
             autobind,
             __metadata("design:type", Function),
-            __metadata("design:paramtypes", [Object]),
+            __metadata("design:paramtypes", [Object, Function]),
             __metadata("design:returntype", Promise)
         ], FormOptionsItem.prototype, "handleOptionDelete", null);
         return FormOptionsItem;

package/esm/renderers/Placeholder.js

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

package/esm/renderers/builtin.js

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

package/esm/renderers/register.js

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

package/esm/renderers/wrapControl.js

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

package/esm/store/app.js

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

package/esm/store/combo.js

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