amis-core 6.3.0 → 6.4.1

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -68,6 +68,7 @@ var Form = /** @class */ (function (_super) {
         // 如果开启了 lazyChange，需要一个 flush 方法把队列中值应用上。
         _this.flushing = false;
         _this.emittedData = null;
+        _this.emitting = false;
         _this.onInit = _this.onInit.bind(_this);
         _this.handleAction = _this.handleAction.bind(_this);
         _this.handleQuery = _this.handleQuery.bind(_this);
@@ -184,7 +185,6 @@ var Form = /** @class */ (function (_super) {
                     return until(function () { return store.checkRemote(initAsyncApi, store.data); }, function (ret) { return ret && ret[initFinishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); }, initCheckInterval);
                 }
             })
-                .then(this.dispatchInited)
                 .then(this.initInterval)
                 .then(this.onInit);
         }
@@ -205,8 +205,8 @@ var Form = /** @class */ (function (_super) {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed
             })
-                .then(this.dispatchInited)
-                .then(this.initInterval);
+                .then(this.initInterval)
+                .then(this.dispatchInited);
         }
     };
     Form.prototype.componentWillUnmount = function () {
@@ -236,20 +236,18 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.dispatchInited = function (value) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var _b, data, store, dispatchEvent;
+            var _b, data, store, dispatchEvent, result;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         _b = this.props, data = _b.data, store = _b.store, dispatchEvent = _b.dispatchEvent;
-                        if (store.fetching) {
+                        if (!isAlive(store) || store.fetching) {
                             return [2 /*return*/, value];
                         }
-                        // 派发init事件，参数为初始化数据
                         return [4 /*yield*/, dispatchEvent('inited', createObject(data, __assign(__assign({}, value === null || value === void 0 ? void 0 : value.data), { responseData: (_a = value === null || value === void 0 ? void 0 : value.data) !== null && _a !== void 0 ? _a : {}, responseStatus: store.error ? 1 : 0, responseMsg: store.msg })))];
                     case 1:
-                        // 派发init事件，参数为初始化数据
-                        _c.sent();
-                        return [2 /*return*/, value];
+                        result = _c.sent();
+                        return [2 /*return*/, result];
                 }
             });
         });
@@ -270,7 +268,7 @@ var Form = /** @class */ (function (_super) {
     };
     Form.prototype.onInit = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onInit, store, persistData, submitOnInit, data, initedAt, hooks, groupedHooks;
+            var _a, onInit, store, persistData, submitOnInit, data, initedAt, hooks, groupedHooks, dispatch;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -315,6 +313,13 @@ var Form = /** @class */ (function (_super) {
                             data = cloneObject(store.data);
                         }
                         onInit && onInit(data, this.props);
+                        return [4 /*yield*/, this.dispatchInited({ data: data })];
+                    case 4:
+                        dispatch = _b.sent();
+                        if (dispatch === null || dispatch === void 0 ? void 0 : dispatch.prevented) {
+                            return [2 /*return*/];
+                        }
+                        // submitOnInit
                         submitOnInit &&
                             this.handleAction(undefined, {
                                 type: 'submit'
@@ -340,7 +345,8 @@ var Form = /** @class */ (function (_super) {
                             store.updateData((_c = {},
                                 _c[initFinishedField || 'finished'] = false,
                                 _c));
-                        if (!isEffectiveApi(initApi, store.data)) return [3 /*break*/, 3];
+                        result = undefined;
+                        if (!isEffectiveApi(initApi, store.data)) return [3 /*break*/, 2];
                         return [4 /*yield*/, store.fetchInitData(initApi, store.data, {
                                 successMessage: fetchSuccess,
                                 errorMessage: fetchFailed,
@@ -356,20 +362,18 @@ var Form = /** @class */ (function (_super) {
                             })];
                     case 1:
                         result = _d.sent();
-                        // 派发初始化接口请求完成事件
-                        return [4 /*yield*/, this.dispatchInited(result)];
-                    case 2:
-                        // 派发初始化接口请求完成事件
-                        _d.sent();
                         if (result === null || result === void 0 ? void 0 : result.ok) {
                             this.initInterval(result);
                             store.reset(undefined, false);
                         }
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 3];
+                    case 2:
                         store.reset(undefined, false);
-                        _d.label = 4;
-                    case 4: return [2 /*return*/];
+                        _d.label = 3;
+                    case 3:
+                        // 派发初始化接口请求完成事件
+                        this.dispatchInited(result);
+                        return [2 /*return*/];
                 }
             });
         });
@@ -471,7 +475,7 @@ var Form = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, , 3, 4]);
+                        _a.trys.push([0, , 4, 5]);
                         if (this.flushing) {
                             return [2 /*return*/];
                         }
@@ -480,14 +484,16 @@ var Form = /** @class */ (function (_super) {
                         return [4 /*yield*/, Promise.all(hooks.map(function (fn) { return fn(); }))];
                     case 1:
                         _a.sent();
+                        if (!!this.emitting) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.lazyEmitChange.flush()];
                     case 2:
                         _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
+                        _a.label = 3;
+                    case 3: return [3 /*break*/, 5];
+                    case 4:
                         this.flushing = false;
                         return [7 /*endfinally*/];
-                    case 4: return [2 /*return*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -541,32 +547,34 @@ var Form = /** @class */ (function (_super) {
         var dispatchEvent = this.props.dispatchEvent;
         return dispatchEvent(type, data);
     };
-    Form.prototype.emitChange = function (submit, skipIfNothingChanges) {
-        if (skipIfNothingChanges === void 0) { skipIfNothingChanges = false; }
+    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, data, diff, changeProps, dispatcher;
+            var _a, onChange, store, submitOnChange, dispatchEvent_1, data, diff, changeProps, dispatcher;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onChange = _a.onChange, store = _a.store, submitOnChange = _a.submitOnChange, dispatchEvent = _a.dispatchEvent, data = _a.data;
+                        _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;
                         if (!isAlive(store)) {
                             return [2 /*return*/];
                         }
                         diff = difference(store.data, store.pristine);
-                        if (skipIfNothingChanges &&
+                        if (emitedFromWatch &&
                             (!Object.keys(diff).length || isEqual(store.data, this.emittedData))) {
                             return [2 /*return*/];
                         }
                         this.emittedData = store.data;
                         changeProps = [store.data, diff, this.props];
-                        return [4 /*yield*/, dispatchEvent('change', createObject(data, store.data))];
+                        return [4 /*yield*/, dispatchEvent_1('change', createObject(data, store.data))];
                     case 1:
                         dispatcher = _b.sent();
                         if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
                             onChange && onChange.apply(null, changeProps);
                         }
                         store.clearRestError();
-                        if (!(submit || (submitOnChange && store.inited))) return [3 /*break*/, 3];
+                        if (!(!emitedFromWatch && (submit || (submitOnChange && store.inited)))) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.handleAction(undefined, {
                                 type: 'submit',
                                 // 如果这里不跳过，会相互依赖死循环，flush 会 让 emiteChange 立即执行
@@ -576,7 +584,11 @@ var Form = /** @class */ (function (_super) {
                     case 2:
                         _b.sent();
                         _b.label = 3;
-                    case 3: return [2 /*return*/];
+                    case 3: return [3 /*break*/, 5];
+                    case 4:
+                        this.emitting = false;
+                        return [7 /*endfinally*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -621,7 +633,7 @@ var Form = /** @class */ (function (_super) {
         var _a, _b;
         if (throwErrors === void 0) { throwErrors = false; }
         return __awaiter(this, void 0, void 0, function () {
-            var _c, store, onSubmit, api, asyncApi, finishedField, checkInterval, _d, saveSuccess, saveFailed, resetAfterSubmit, clearAfterSubmit, onAction, onSaved, onReset, onFinished, onFailed, redirect, reload, target, env, onChange, clearPersistDataAfterSubmit, trimValues, dispatchEvent, __, fields, validationRes, dispatcher, _e, dispatchEvent_1, onEvent, submitEvent, dispatcher, successMsg, failMsg;
+            var _c, store, onSubmit, api, asyncApi, finishedField, checkInterval, _d, saveSuccess, saveFailed, resetAfterSubmit, clearAfterSubmit, onAction, onSaved, onReset, onFinished, onFailed, redirect, reload, target, env, onChange, clearPersistDataAfterSubmit, trimValues, dispatchEvent, __, fields, validationRes, dispatcher, _e, dispatchEvent_2, onEvent, submitEvent, dispatcher, successMsg, failMsg;
             var _this = this;
             return __generator(this, function (_f) {
                 switch (_f.label) {
@@ -669,9 +681,9 @@ var Form = /** @class */ (function (_super) {
                             action.actionType === 'confirm' ||
                             action.actionType === 'reset-and-submit' ||
                             action.actionType === 'clear-and-submit')) return [3 /*break*/, 8];
-                        _e = this.props, dispatchEvent_1 = _e.dispatchEvent, onEvent = _e.onEvent;
+                        _e = this.props, dispatchEvent_2 = _e.dispatchEvent, onEvent = _e.onEvent;
                         submitEvent = (_b = (_a = onEvent === null || onEvent === void 0 ? void 0 : onEvent.submit) === null || _a === void 0 ? void 0 : _a.actions) === null || _b === void 0 ? void 0 : _b.length;
-                        return [4 /*yield*/, dispatchEvent_1('submit', this.props.data)];
+                        return [4 /*yield*/, dispatchEvent_2('submit', this.props.data)];
                     case 7:
                         dispatcher = _f.sent();
                         if ((dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) || submitEvent) {
@@ -701,12 +713,12 @@ var Form = /** @class */ (function (_super) {
                                             _b.label = 2;
                                         case 2:
                                             // 走到这里代表校验成功了
-                                            dispatchEvent_1('validateSucc', this.props.data);
+                                            dispatchEvent_2('validateSucc', this.props.data);
                                             if (target) {
                                                 this.submitToTarget(filterTarget(target, values), values);
                                                 /** 可能配置页面跳转事件，页面路由变化导致persistKey不一致，无法清除持久化数据，所以提交成功事件之前先清理一下 */
                                                 clearPersistDataAfterSubmit && store.clearLocalPersistData();
-                                                dispatchEvent_1('submitSucc', createObject(this.props.data, values));
+                                                dispatchEvent_2('submitSucc', createObject(this.props.data, values));
                                             }
                                             else if (action.actionType === 'reload') {
                                                 action.target &&
@@ -757,7 +769,7 @@ var Form = /** @class */ (function (_super) {
                                                                 switch (_a.label) {
                                                                     case 0:
                                                                         clearPersistDataAfterSubmit && store.clearLocalPersistData();
-                                                                        return [4 /*yield*/, dispatchEvent_1('submitSucc', createObject(this.props.data, { result: result }))];
+                                                                        return [4 /*yield*/, dispatchEvent_2('submitSucc', createObject(this.props.data, { result: result }))];
                                                                     case 1:
                                                                         dispatcher = _a.sent();
                                                                         if (!isEffectiveApi(finnalAsyncApi_1, store.data) ||
@@ -769,7 +781,7 @@ var Form = /** @class */ (function (_super) {
                                                                         }
                                                                         cbResult = until(function () { return store.checkRemote(finnalAsyncApi_1, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); }, checkInterval).then(function (value) {
                                                                             // 派发asyncApiFinished事件
-                                                                            dispatchEvent_1('asyncApiFinished', store.data);
+                                                                            dispatchEvent_2('asyncApiFinished', store.data);
                                                                         });
                                                                         return [2 /*return*/, {
                                                                                 cbResult: cbResult,
@@ -782,7 +794,7 @@ var Form = /** @class */ (function (_super) {
                                                             var dispatcher;
                                                             return __generator(this, function (_a) {
                                                                 switch (_a.label) {
-                                                                    case 0: return [4 /*yield*/, dispatchEvent_1('submitFail', createObject(this.props.data, { error: result }))];
+                                                                    case 0: return [4 /*yield*/, dispatchEvent_2('submitFail', createObject(this.props.data, { error: result }))];
                                                                     case 1:
                                                                         dispatcher = _a.sent();
                                                                         return [2 /*return*/, {
@@ -822,7 +834,7 @@ var Form = /** @class */ (function (_super) {
                                             else {
                                                 clearPersistDataAfterSubmit && store.clearLocalPersistData();
                                                 // type为submit，但是没有配api以及target时，只派发事件
-                                                dispatchEvent_1('submitSucc', createObject(this.props.data, values));
+                                                dispatchEvent_2('submitSucc', createObject(this.props.data, values));
                                             }
                                             return [2 /*return*/, Promise.resolve(null)];
                                     }
@@ -1454,8 +1466,7 @@ var FormRenderer = /** @class */ (function (_super) {
             onChange(store.data, difference(store.data, store.pristine), this.props);
     };
     FormRenderer.prototype.getData = function () {
-        var store = this.props.store;
-        return store.data;
+        return this.getValues();
     };
     FormRenderer.contextType = ScopedContext;
     FormRenderer = __decorate([

package/esm/renderers/Item.js

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

package/esm/renderers/Options.js

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

package/esm/renderers/Placeholder.js

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

package/esm/renderers/builtin.js

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

package/esm/renderers/register.js

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

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -283,25 +283,27 @@ function wrapControl(ComposedComponent) {
                 var model = this.model;
                 var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData;
                 var isExp = isExpression(value);
-                if (isExp) {
-                    model.changeTmpValue(FormulaExec['formula'](value, data), // 对组件默认值进行运算
-                    'formulaChanged');
-                }
-                else {
-                    var initialValue = model.extraName
-                        ? [
-                            getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),
-                            getVariable(data, model.extraName, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData)
-                        ]
-                        : getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData);
-                    if (model.extraName &&
-                        initialValue.every(function (item) { return item === undefined; })) {
-                        initialValue = undefined;
-                    }
-                    model.changeTmpValue(initialValue !== null && initialValue !== void 0 ? initialValue : replaceExpression(value), typeof initialValue !== 'undefined'
-                        ? 'initialValue'
+                var initialValue = model.extraName
+                    ? [
+                        getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),
+                        getVariable(data, model.extraName, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData)
+                    ]
+                    : getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData);
+                if (model.extraName &&
+                    initialValue.every(function (item) { return item === undefined; })) {
+                    initialValue = undefined;
+                }
+                if (typeof initialValue === 'undefined') {
+                    value = isExp
+                        ? FormulaExec['formula'](value, data)
+                        : replaceExpression(value);
+                }
+                model.changeTmpValue(initialValue !== null && initialValue !== void 0 ? initialValue : value, // 对组件默认值进行运算
+                typeof initialValue !== 'undefined'
+                    ? 'initialValue'
+                    : isExp
+                        ? 'formulaChanged'
                         : 'defaultValue');
-                }
             };
             class_1.prototype.disposeModel = function () {
                 var _a;
@@ -378,14 +380,15 @@ function wrapControl(ComposedComponent) {
                 }
             };
             class_1.prototype.validate = function () {
+                var _a, _b;
                 return __awaiter(this, void 0, void 0, function () {
-                    var _a, form, data, formItemDispatchEvent, result, combo, group, validPromises, valid;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
+                    var _c, form, data, formItemDispatchEvent, result, combo, group, validPromises, valid;
+                    return __generator(this, function (_d) {
+                        switch (_d.label) {
                             case 0:
                                 if (!this.model)
                                     return [2 /*return*/];
-                                _a = this.props, form = _a.formStore, data = _a.data, formItemDispatchEvent = _a.formItemDispatchEvent;
+                                _c = this.props, form = _c.formStore, data = _c.data, formItemDispatchEvent = _c.formItemDispatchEvent;
                                 if (!(this.model.unique &&
                                     (form === null || form === void 0 ? void 0 : form.parentStore) &&
                                     form.parentStore.storeType === ComboStore.name)) return [3 /*break*/, 2];
@@ -396,15 +399,16 @@ function wrapControl(ComposedComponent) {
                                 });
                                 return [4 /*yield*/, Promise.all(validPromises)];
                             case 1:
-                                result = _b.sent();
+                                result = _d.sent();
                                 return [3 /*break*/, 4];
                             case 2: return [4 /*yield*/, this.model.validate(data)];
                             case 3:
-                                result = [_b.sent()];
-                                _b.label = 4;
+                                result = [_d.sent()];
+                                _d.label = 4;
                             case 4:
                                 valid = !result.some(function (item) { return item === false; });
-                                formItemDispatchEvent === null || formItemDispatchEvent === void 0 ? void 0 : formItemDispatchEvent(valid ? 'formItemValidateSucc' : 'formItemValidateError', data);
+                                (_a = (formItemDispatchEvent !== null && formItemDispatchEvent !== void 0 ? formItemDispatchEvent : this.props.dispatchEvent)) === null || _a === void 0 ? void 0 : _a(valid ? 'formItemValidateSucc' : 'formItemValidateError', (_b = form === null || form === void 0 ? void 0 : form.data) !== null && _b !== void 0 ? _b : this.props.data // form里的一定是最新的数据
+                                );
                                 return [2 /*return*/, valid];
                         }
                     });

package/esm/store/app.js

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

package/esm/store/combo.js

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

package/esm/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -23,9 +23,10 @@ import { TableStore } from './table.js';
 
 var ServerError = /** @class */ (function (_super) {
     __extends(ServerError, _super);
-    function ServerError() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+    function ServerError(msg, response) {
+        var _this = _super.call(this, msg) || this;
         _this.type = 'ServerError';
+        _this.response = response;
         return _this;
     }
     return ServerError;
@@ -396,7 +397,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                                     timeout: json.msgTimeout
                                 }
                                 : undefined);
-                        throw new ServerError(self.msg);
+                        throw new ServerError(self.msg, json);
                     }
                     else {
                         self.updateMessage((_h = (_g = (_f = (_e = api === null || api === void 0 ? void 0 : api.messages) === null || _e === void 0 ? void 0 : _e.success) !== null && _f !== void 0 ? _f : json.msg) !== null && _g !== void 0 ? _g : options.successMessage) !== null && _h !== void 0 ? _h : json.defaultMsg);
@@ -408,13 +409,18 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                                 }
                                 : undefined);
                     }
-                    return [2 /*return*/, json.data];
+                    // 补一个空对象是为了区别于被取消的请求
+                    // 请求被取消时会返回 undefined
+                    return [2 /*return*/, json.data || {}];
                 case 2:
                     e_3 = _j.sent();
-                    self.markSaving(false);
                     if (!isAlive(self) || self.disposed) {
                         return [2 /*return*/];
                     }
+                    self.markSaving(false);
+                    if (getEnv(self).isCancel(e_3)) {
+                        return [2 /*return*/];
+                    }
                     !(api === null || api === void 0 ? void 0 : api.silent) &&
                         e_3.type !== 'ServerError' &&
                         getEnv(self).notify('error', e_3.message);

package/esm/store/form.js

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

package/esm/store/formItem.js

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

package/esm/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -8,7 +8,7 @@ import { types } from 'mobx-state-tree';
 import '../utils/helper.js';
 import 'amis-formula';
 import 'moment';
-import { createObject, extendObject, cloneObject, setVariable, deleteVariable, extractObjectChain, createObjectFromChain } from '../utils/object.js';
+import { injectObjectChain, createObject, extendObject, cloneObject, setVariable, deleteVariable, extractObjectChain, createObjectFromChain } from '../utils/object.js';
 import { getVariable } from '../utils/getVariable.js';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';
@@ -84,6 +84,9 @@ var iRendererStore = StoreNode.named('iRendererStore')
             if (data === void 0) { data = {}; }
             if (skipSetPristine === void 0) { skipSetPristine = false; }
             self.initedAt = Date.now();
+            if (self.data.__tag) {
+                data = injectObjectChain(data, self.data.__tag);
+            }
             !skipSetPristine && (self.pristine = data);
             self.data = data;
         },
@@ -98,7 +101,7 @@ var iRendererStore = StoreNode.named('iRendererStore')
             var prev = self.data;
             var newData;
             if (tag) {
-                var proto = createObject(self.data.__super || null, tag);
+                var proto = createObject(self.data.__super || null, __assign(__assign({}, tag), { __tag: tag }));
                 newData = createObject(proto, __assign(__assign({}, (replace ? {} : self.data)), data));
             }
             else {

package/esm/store/index.js

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

package/esm/store/list.d.ts

@@ -1,5 +1,6 @@
 import { SnapshotIn, Instance } from 'mobx-state-tree';
 export declare const Item: import("mobx-state-tree").IModelType<{
+    storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
     id: import("mobx-state-tree").ISimpleType<string>;
     pristine: import("mobx-state-tree").IType<any, any, any>;
     data: import("mobx-state-tree").IType<any, any, any>;
@@ -40,6 +41,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
     drawerData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
 } & {
     items: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IModelType<{
+        storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
@@ -59,6 +61,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
         updateData({ children, ...rest }: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
     selectedItems: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IReferenceType<import("mobx-state-tree").IModelType<{
+        storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
@@ -118,6 +121,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
 } & {
     readonly allChecked: boolean;
     readonly checkableItems: ({
+        storeType: string;
         id: string;
         pristine: any;
         data: any;
@@ -136,6 +140,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
         reset(): void;
         updateData({ children, ...rest }: any): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+        storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
@@ -155,6 +160,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
         updateData({ children, ...rest }: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
     readonly unSelectedItems: ({
+        storeType: string;
         id: string;
         pristine: any;
         data: any;
@@ -173,6 +179,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
         reset(): void;
         updateData({ children, ...rest }: any): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+        storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
@@ -194,6 +201,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
     isSelected: (item: IItem) => boolean;
     readonly modified: number;
     readonly modifiedItems: ({
+        storeType: string;
         id: string;
         pristine: any;
         data: any;
@@ -212,6 +220,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
         reset(): void;
         updateData({ children, ...rest }: any): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+        storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
@@ -232,6 +241,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
     readonly moved: number;
     readonly movedItems: ({
+        storeType: string;
         id: string;
         pristine: any;
         data: any;
@@ -250,6 +260,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
         reset(): void;
         updateData({ children, ...rest }: any): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+        storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
         pristine: import("mobx-state-tree").IType<any, any, any>;
         data: import("mobx-state-tree").IType<any, any, any>;
@@ -269,6 +280,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
         updateData({ children, ...rest }: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
 } & {
+    getData: (superData: any) => any;
     update: (config: Partial<SListStore>) => void;
     initItems: (items: Array<object>) => void;
     updateSelected: (selected: Array<any>, valueField?: string) => void;
@@ -280,6 +292,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
     setOrderByInfo: (key: string, direction: 'asc' | 'desc') => void;
     reset: () => void;
     toggleDragging: () => void;
+    startDragging: () => void;
     stopDragging: () => void;
     exchange: (fromIndex: number, toIndex: number) => void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;