amis-core 6.9.0-rc.2 → 6.9.0-rc.4

package/esm/Root.js

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

package/esm/RootRenderer.js

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

package/esm/SchemaRenderer.js

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

package/esm/Scoped.js

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

package/esm/StatusScoped.js

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

package/esm/WithRootStore.js

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

package/esm/WithStore.js

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

package/esm/actions/Action.js

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

package/esm/actions/AjaxAction.js

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

package/esm/actions/BreakAction.js

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

package/esm/actions/BroadcastAction.js

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

package/esm/actions/CmptAction.js

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

package/esm/actions/ContinueAction.js

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

package/esm/actions/CopyAction.js

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

package/esm/actions/CustomAction.js

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

package/esm/actions/DialogAction.js

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

package/esm/actions/DrawerAction.js

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

package/esm/actions/EmailAction.js

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

package/esm/actions/EventAction.js

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

package/esm/actions/LinkAction.js

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

package/esm/actions/LoopAction.js

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

package/esm/actions/PageAction.js

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

package/esm/actions/ParallelAction.js

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

package/esm/actions/PrintAction.js

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

package/esm/actions/StatusAction.js

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

package/esm/actions/SwitchAction.js

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

package/esm/actions/ToastAction.js

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

package/esm/actions/WaitAction.js

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

package/esm/components/CustomStyle.js

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

package/esm/components/ErrorBoundary.js

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

package/esm/components/LazyComponent.js

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

package/esm/components/Overlay.js

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

package/esm/components/PopOver.js

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

package/esm/env.js

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

package/esm/envOverwrite.js

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

package/esm/factory.d.ts

@@ -24,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;
@@ -54,7 +55,6 @@ export interface RendererConfig extends RendererBasicConfig {
     getComponent?: () => Promise<{
         default: RendererComponent;
     } | any>;
-    override?: boolean;
     Renderer?: RendererComponent;
 }
 export interface RenderSchemaFilter {

package/esm/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.2
+ * amis-core v6.9.0-rc.4
  * Copyright 2018-2024 fex
  */
 
@@ -36,6 +36,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) {
@@ -43,7 +63,7 @@ function rendererToComponent(component, config) {
             storeType: config.storeType,
             extendsData: config.storeExtendsData,
             shouldSyncSuperStore: config.shouldSyncSuperStore
-        })(observer(component));
+        })(observer(fixMobxInjectRender(component)));
     }
     if (config.isolateScope) {
         component = HocScoped(component, config.type);

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.2
+ * amis-core v6.9.0-rc.4
  * Copyright 2018-2024 fex
  */
 
@@ -148,10 +148,10 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '6.9.0-rc.2';
+var version = '6.9.0-rc.4';
 window.amisVersionInfo = {
-    version: '6.9.0-rc.2',
-    buildTime: '2024-09-27T09:57:21.661Z'
+    version: '6.9.0-rc.4',
+    buildTime: '2024-10-15T12:37:30.983Z'
 };
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }

package/esm/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/esm/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.2
+ * amis-core v6.9.0-rc.4
  * Copyright 2018-2024 fex
  */
 
@@ -86,7 +86,7 @@ function setDefaultLocale(locale) {
     defaultLocale = locale;
 }
 var LocaleContext = React.createContext('');
-function localeable(ComposedComponent) {
+function localeable(ComposedComponent, methods) {
     var _a;
     var result = hoistNonReactStatic((_a = /** @class */ (function (_super) {
             __extends(class_1, _super);
@@ -128,6 +128,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/esm/polyfills.js

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

package/esm/renderers/Form.js

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

package/esm/renderers/Item.d.ts

@@ -460,7 +460,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
      * @param ctx 上下文对象，类型为任意类型
      * @param skipIfExits 是否跳过已存在的属性，默认为 false
      */
-    applyMapping(mapping: any, ctx: any, skipIfExits?: boolean, ignoreSelf?: boolean): void;
+    applyMapping(mapping: any, ctx: any, skipIfExits?: boolean): void;
     buildAutoFillSchema(): {
         popOverContainer: any;
         popOverClassName: any;

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.2
+ * amis-core v6.9.0-rc.4
  * Copyright 2018-2024 fex
  */
 
@@ -20,7 +20,7 @@ import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'lodash/chunk';
 import { getVariable } from '../utils/getVariable.js';
-import { createObject, setVariable, createObjectFromChain, deleteVariable } from '../utils/object.js';
+import { createObject, setVariable, createObjectFromChain } from '../utils/object.js';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
@@ -118,7 +118,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                             if (!result) {
                                 return [2 /*return*/];
                             }
-                            this.applyMapping((_d = autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) !== null && _d !== void 0 ? _d : { '&': '$$' }, result, false, true);
+                            this.applyMapping((_d = autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) !== null && _d !== void 0 ? _d : { '&': '$$' }, result, false);
                             _e.label = 3;
                         case 3: return [3 /*break*/, 5];
                         case 4:
@@ -275,10 +275,9 @@ var FormItemWrap = /** @class */ (function (_super) {
      * @param ctx 上下文对象，类型为任意类型
      * @param skipIfExits 是否跳过已存在的属性，默认为 false
      */
-    FormItemWrap.prototype.applyMapping = function (mapping, ctx, skipIfExits, ignoreSelf) {
+    FormItemWrap.prototype.applyMapping = function (mapping, ctx, skipIfExits) {
         if (skipIfExits === void 0) { skipIfExits = false; }
-        if (ignoreSelf === void 0) { ignoreSelf = false; }
-        var _a = this.props, onBulkChange = _a.onBulkChange, data = _a.data, formItem = _a.formItem;
+        var _a = this.props, onBulkChange = _a.onBulkChange, data = _a.data; _a.formItem;
         var toSync = dataMapping(mapping, ctx);
         var tmpData = __assign({}, data);
         var result = __assign({}, toSync);
@@ -305,9 +304,9 @@ var FormItemWrap = /** @class */ (function (_super) {
             }
         });
         // 是否忽略自己的设置
-        if (ignoreSelf && (formItem === null || formItem === void 0 ? void 0 : formItem.name)) {
-            deleteVariable(result, formItem.name);
-        }
+        // if (ignoreSelf && formItem?.name) {
+        //   deleteVariable(result, formItem.name);
+        // }
         onBulkChange(result);
     };
     FormItemWrap.prototype.buildAutoFillSchema = function () {

package/esm/renderers/Options.js

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

package/esm/renderers/Placeholder.js

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

package/esm/renderers/builtin.js

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

package/esm/renderers/register.js

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

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.2
+ * amis-core v6.9.0-rc.4
  * Copyright 2018-2024 fex
  */
 
@@ -60,14 +60,14 @@ function wrapControl(ComposedComponent) {
             __extends(class_1, _super);
             function class_1(props) {
                 var _this = this;
-                var _a;
+                var _a, _b;
                 _this = _super.call(this, props) || this;
                 _this.value = undefined;
                 _this.lazyEmitChange = debounce(_this.emitChange.bind(_this), 250, {
                     trailing: true,
                     leading: false
                 });
-                var _b = _this.props, form = _b.formStore, formItem = _b.formItem, rootStore = _b.rootStore, store = _b.store, onChange = _b.onChange, data = _b.data, inputGroupControl = _b.inputGroupControl, colIndex = _b.colIndex, rowIndex = _b.rowIndex, _c = _b.$schema, id = _c.id, type = _c.type, required = _c.required, validations = _c.validations, validationErrors = _c.validationErrors, unique = _c.unique, value = _c.value, extraName = _c.extraName; _c.multiple; var delimiter = _c.delimiter, valueField = _c.valueField, labelField = _c.labelField, joinValues = _c.joinValues, extractValue = _c.extractValue, selectFirst = _c.selectFirst, autoFill = _c.autoFill, clearValueOnHidden = _c.clearValueOnHidden, validateApi = _c.validateApi, minLength = _c.minLength, maxLength = _c.maxLength, validateOnChange = _c.validateOnChange, label = _c.label, pagination = _c.pagination;
+                var _c = _this.props, form = _c.formStore, formItem = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, colIndex = _c.colIndex, rowIndex = _c.rowIndex, _d = _c.$schema, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, extraName = _d.extraName; _d.multiple; var delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label, pagination = _d.pagination;
                 _this.getValue = _this.getValue.bind(_this);
                 _this.setValue = _this.setValue.bind(_this);
                 _this.handleChange = _this.handleChange.bind(_this);
@@ -77,7 +77,8 @@ function wrapControl(ComposedComponent) {
                 _this.validate = _this.validate.bind(_this);
                 _this.flushChange = _this.flushChange.bind(_this);
                 _this.renderChild = _this.renderChild.bind(_this);
-                var name = _this.props.$schema.name;
+                var name = _this.props.$schema.name ||
+                    ((_a = ComposedComponent.defaultProps) === null || _a === void 0 ? void 0 : _a.name);
                 // 如果 name 是表达式
                 // 扩充 each 用法
                 if (isExpression(name)) {
@@ -102,7 +103,7 @@ function wrapControl(ComposedComponent) {
                 model.config(__assign(__assign({}, pick(__assign(__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: isExpression(value), rules: validations, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName, pagination: pagination }));
                 // issue 这个逻辑应该在 combo 里面自己实现。
                 if (_this.model.unique &&
-                    ((_a = form === null || form === void 0 ? void 0 : form.parentStore) === null || _a === void 0 ? void 0 : _a.storeType) === ComboStore.name) {
+                    ((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === ComboStore.name) {
                     var combo = form.parentStore;
                     combo.bindUniuqueItem(model);
                 }

package/esm/store/app.js

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

package/esm/store/combo.js

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

package/esm/store/crud.js

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

package/esm/store/form.js

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

package/esm/store/formItem.js

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

package/esm/store/iRenderer.js

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

package/esm/store/index.js

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

package/esm/store/list.js

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

package/esm/store/manager.js

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