amis-core 6.5.0 → 6.6.0

package/esm/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -36,6 +36,7 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'className',
     'style',
     'data',
+    'originData',
     'children',
     'ref',
     'visible',

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -148,6 +148,9 @@ function createScopedTools(path, parent, env, rendererType) {
         unRegisterComponent: function (component) {
             // 自己本身实际上注册在父级 Scoped 上。
             if (component.props.$path === path && parent) {
+                // 如果是自己，尝试把自己从父级 Scoped 上移除，否则在某些场景下会导致父级的 children 一直增长。
+                var idx_1 = parent.children.indexOf(self);
+                ~idx_1 && parent.children.splice(idx_1, 1);
                 return parent.unRegisterComponent(component);
             }
             var idx = components.indexOf(component);

package/esm/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -153,7 +153,7 @@ function HocStoreFactory(renderer) {
                             // 目前主要的问题是，如果 combo 中表单项名字和 combo 本身的名字一样，会导致里面的值会被覆盖成数组
                             ((_e = props.store) === null || _e === void 0 ? void 0 : _e.storeType) === 'ComboStore'
                                 ? undefined
-                                : syncDataFromSuper(__assign(__assign({}, store.data), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                                : syncDataFromSuper(__assign(__assign({}, store.pristineDiff), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                     else {
                         store.initData(createObject(props.scope, props.data), ((_g = props.updatePristineAfterStoreDataReInit) !== null && _g !== void 0 ? _g : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);

package/esm/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/EmailAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/EventAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/PrintAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/StatusAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/WaitAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -9,7 +9,8 @@ import { insertCustomStyle, removeCustomStyle, insertEditCustomStyle } from '../
 var styleIdCount = new Map();
 function CustomStyle (props) {
     var config = props.config, env = props.env, data = props.data;
-    var themeCss = config.themeCss, classNames = config.classNames, id = config.id, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
+    var themeCss = config.themeCss, classNames = config.classNames, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
+    var id = config.id ? "".concat(config.id) : config.id;
     useEffect(function () {
         if (styleIdCount.has(id)) {
             styleIdCount.set(id, styleIdCount.get(id) + 1);

package/esm/components/ErrorBoundary.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -148,7 +148,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '6.5.0';
+var version = '6.6.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.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -551,17 +551,17 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.emitChange = function (submit, emitedFromWatch) {
         if (emitedFromWatch === void 0) { emitedFromWatch = false; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onChange, store, submitOnChange, dispatchEvent_1, data, diff, changeProps, dispatcher;
+            var _a, onChange, store, submitOnChange, dispatchEvent_1, data, originData, diff, changeProps, dispatcher;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _b.trys.push([0, , 4, 5]);
                         this.emitting = true;
-                        _a = this.props, onChange = _a.onChange, store = _a.store, submitOnChange = _a.submitOnChange, dispatchEvent_1 = _a.dispatchEvent, data = _a.data;
+                        _a = this.props, onChange = _a.onChange, store = _a.store, submitOnChange = _a.submitOnChange, dispatchEvent_1 = _a.dispatchEvent, data = _a.data, originData = _a.originData;
                         if (!isAlive(store)) {
                             return [2 /*return*/];
                         }
-                        diff = difference(store.data, store.pristine);
+                        diff = difference(store.data, originData !== null && originData !== void 0 ? originData : store.upStreamData);
                         if (emitedFromWatch &&
                             (!Object.keys(diff).length || isEqual(store.data, this.emittedData))) {
                             return [2 /*return*/];

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -788,35 +788,36 @@ var FormItemWrap = /** @class */ (function (_super) {
                                     container: props.popOverContainer || env.getModalContainer
                                 })
                                 : null))) : null,
-                    renderControl(),
-                    caption
-                        ? render('caption', caption, {
-                            className: cx("Form-caption", captionClassName)
-                        })
-                        : null,
-                    remark
-                        ? render('remark', {
-                            type: 'remark',
-                            icon: remark.icon || 'warning-mark',
-                            className: cx("Form-remark"),
-                            tooltip: remark,
-                            container: props.popOverContainer || env.getModalContainer
-                        })
-                        : null),
-                hint && model && model.isFocused
-                    ? render('hint', hint, {
-                        className: cx("Form-hint")
-                    })
-                    : null,
-                model &&
-                    !model.valid &&
-                    showErrorMsg !== false &&
-                    Array.isArray(model.errors) ? (React.createElement("ul", { className: cx('Form-feedback') }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
-                description && renderDescription !== false
-                    ? render('description', description, {
-                        className: cx("Form-description", descriptionClassName, setThemeClassName(__assign(__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
-                    })
-                    : null));
+                    React.createElement("div", { className: cx("Form-value") },
+                        renderControl(),
+                        caption
+                            ? render('caption', caption, {
+                                className: cx("Form-caption", captionClassName)
+                            })
+                            : null,
+                        remark
+                            ? render('remark', {
+                                type: 'remark',
+                                icon: remark.icon || 'warning-mark',
+                                className: cx("Form-remark"),
+                                tooltip: remark,
+                                container: props.popOverContainer || env.getModalContainer
+                            })
+                            : null,
+                        hint && model && model.isFocused
+                            ? render('hint', hint, {
+                                className: cx("Form-hint")
+                            })
+                            : null,
+                        model &&
+                            !model.valid &&
+                            showErrorMsg !== false &&
+                            Array.isArray(model.errors) ? (React.createElement("ul", { className: cx('Form-feedback') }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
+                        description && renderDescription !== false
+                            ? render('description', description, {
+                                className: cx("Form-description", descriptionClassName, setThemeClassName(__assign(__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
+                            })
+                            : null))));
         }
     };
     __decorate([

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -92,21 +92,47 @@ function registerOptionsControl(config) {
                 _this.defaultCheckAll();
             }
             var loadOptions = initFetch !== false;
+            var setInitValue = null;
             if (joinValues === false && defaultValue) {
-                var selectedOptions = extractValue
-                    ? formItem
-                        .getSelectedOptions(value)
-                        .map(function (selectedOption) {
-                        return selectedOption[valueField || 'value'];
-                    })
-                    : formItem.getSelectedOptions(value);
-                setPrinstineValue(multiple ? selectedOptions.concat() : selectedOptions[0]);
+                setInitValue = function () {
+                    var selectedOptions = extractValue
+                        ? formItem
+                            .getSelectedOptions(value)
+                            .map(function (selectedOption) {
+                            return selectedOption[valueField || 'value'];
+                        })
+                        : formItem.getSelectedOptions(value);
+                    setPrinstineValue(multiple ? selectedOptions.concat() : selectedOptions[0]);
+                };
             }
-            loadOptions &&
-                config.autoLoadOptionsFromSource !== false &&
+            if (loadOptions && config.autoLoadOptionsFromSource !== false) {
                 _this.toDispose.push(formInited || !addHook
-                    ? formItem.addInitHook(_this.reload)
-                    : addHook(_this.initOptions, 'init'));
+                    ? formItem.addInitHook(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, this.reload()];
+                                case 1:
+                                    _a.sent();
+                                    setInitValue === null || setInitValue === void 0 ? void 0 : setInitValue();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })
+                    : addHook(function (data) { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, this.initOptions(data)];
+                                case 1:
+                                    _a.sent();
+                                    setInitValue === null || setInitValue === void 0 ? void 0 : setInitValue();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); }, 'init'));
+            }
+            else {
+                setInitValue === null || setInitValue === void 0 ? void 0 : setInitValue();
+            }
             return _this;
         }
         FormOptionsItem.prototype.componentDidMount = function () {

package/esm/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -461,14 +461,18 @@ function wrapControl(ComposedComponent) {
                 }
                 var model = this.model;
                 var value = this.model.tmpValue;
-                var oldValue = model.extraName
-                    ? [
-                        getVariable(data, model.name, false),
-                        getVariable(data, model.extraName, false)
-                    ]
-                    : getVariable(data, model.name, false);
-                if (model.extraName ? isEqual(oldValue, value) : oldValue === value) {
-                    return;
+                var oldValue = undefined;
+                // 受控的因为没有记录上一次 props 下发的 value，所以不做比较
+                if (!model.isControlled) {
+                    oldValue = model.extraName
+                        ? [
+                            getVariable(data, model.name, false),
+                            getVariable(data, model.extraName, false)
+                        ]
+                        : getVariable(data, model.name, false);
+                    if (model.extraName ? isEqual(oldValue, value) : oldValue === value) {
+                        return;
+                    }
                 }
                 if (type !== 'input-password') {
                     env === null || env === void 0 ? void 0 : env.tracker({

package/esm/store/app.d.ts

@@ -14,6 +14,7 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     initedAt: import("mobx-state-tree").IType<number | undefined, number, number>;
     updatedAt: import("mobx-state-tree").IType<number | undefined, number, number>;
     pristine: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    upStreamData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     action: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     dialogOpen: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     dialogData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -48,6 +49,7 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
 } & {
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
+    readonly pristineDiff: any;
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;

package/esm/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */