amis-core 3.1.1 → 3.3.0

package/esm/store/form.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
-import { __spreadArray, __read, __generator, __assign } from 'tslib';
+import { __generator, __assign, __read, __spreadArray } from 'tslib';
 import { types, flow, isAlive, getEnv } from 'mobx-state-tree';
 import debounce from 'lodash/debounce';
 import throttle from 'lodash/throttle';
@@ -11,7 +11,7 @@ import toPairs from 'lodash/toPairs';
 import pick from 'lodash/pick';
 import { ServiceStore } from './service.js';
 import { ServerError } from '../utils/errors.js';
-import { isEmpty, difference, mapObject } from '../utils/helper.js';
+import { isEmpty, difference, ValidateError, mapObject } from '../utils/helper.js';
 import isEqual from 'lodash/isEqual';
 import flatten from 'lodash/flatten';
 import find from 'lodash/find';
@@ -48,7 +48,7 @@ var FormStore = ServiceStore.named('FormStore')
             if (current.storeType === 'FormItemStore') {
                 formItems.push(current);
             }
-            else {
+            else if (!['ComboStore', 'TableStore', 'FormStore'].includes(current.storeType)) {
                 pool.push.apply(pool, __spreadArray([], __read(current.children), false));
             }
         }
@@ -61,30 +61,11 @@ var FormStore = ServiceStore.named('FormStore')
         get items() {
             return getItems();
         },
-        /**
-         * 相对于 items(), 只收集直接子formItem
-         * 避免 子form 表单项的重复验证
-         */
-        get directItems() {
-            var formItems = [];
-            // 查找孩子节点中是 formItem 的表单项
-            var pool = self.children.concat();
-            while (pool.length) {
-                var current = pool.shift();
-                if (current.storeType === 'FormItemStore') {
-                    formItems.push(current);
-                }
-                else if (!['ComboStore', 'TableStore'].includes(current.storeType)) {
-                    pool.push.apply(pool, __spreadArray([], __read(current.children), false));
-                }
-            }
-            return formItems;
-        },
         /** 获取InputGroup的子元素 */
         get inputGroupItems() {
             var _a, _b;
             var formItems = {};
-            var children = self.children.concat();
+            var children = this.items.concat();
             while (children.length) {
                 var current = children.shift();
                 if (current.inputGroupControl && ((_a = current.inputGroupControl) === null || _a === void 0 ? void 0 : _a.name)) {
@@ -154,11 +135,27 @@ var FormStore = ServiceStore.named('FormStore')
         self.updateData(values, tag, replace);
         // 如果数据域中有数据变化，就都reset一下，去掉之前残留的验证消息
         self.items.forEach(function (item) {
-            var value = item.value;
-            if (typeof value !== 'undefined' && value !== item.tmpValue) {
-                item.changeTmpValue(value);
+            if (item.extraName) {
+                var value = [
+                    getVariable(values, item.name, false),
+                    getVariable(values, item.extraName, false)
+                ];
+                if (value.some(function (item) { return item !== undefined; }) &&
+                    !isEqual(value, item.tmpValue)) {
+                    var origin_1 = item.splitExtraValue(item.tmpValue);
+                    item.changeTmpValue(value.map(function (item, idx) { return item !== null && item !== void 0 ? item : origin_1[idx]; }), 'dataChanged');
+                    item.changeEmitedValue(undefined);
+                }
+            }
+            else {
+                var value = getVariable(values, item.name, false);
+                if (value !== undefined && value !== item.tmpValue) {
+                    item.changeTmpValue(value, 'dataChanged');
+                    item.changeEmitedValue(undefined);
+                }
             }
             item.reset();
+            item.validateOnChange && item.validate(self.data);
         });
         // 同步 options
         syncOptions();
@@ -270,33 +267,33 @@ var FormStore = ServiceStore.named('FormStore')
     }
     var saveRemote = flow(function saveRemote(api, data, options) {
         var ret, json, ret, e_1, ret, result;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         if (options === void 0) { options = {}; }
-        return __generator(this, function (_q) {
-            switch (_q.label) {
+        return __generator(this, function (_r) {
+            switch (_r.label) {
                 case 0:
                     clearRestError();
-                    _q.label = 1;
+                    _r.label = 1;
                 case 1:
-                    _q.trys.push([1, 12, , 15]);
+                    _r.trys.push([1, 12, , 15]);
                     options = __assign({ method: 'post' }, options);
                     if (!(options && options.beforeSend)) return [3 /*break*/, 4];
                     ret = options.beforeSend(data);
                     if (!(ret && ret.then)) return [3 /*break*/, 3];
                     return [4 /*yield*/, ret];
                 case 2:
-                    ret = _q.sent();
-                    _q.label = 3;
+                    ret = _r.sent();
+                    _r.label = 3;
                 case 3:
                     if (ret === false) {
                         return [2 /*return*/];
                     }
-                    _q.label = 4;
+                    _r.label = 4;
                 case 4:
                     self.markSaving(true);
                     return [4 /*yield*/, getEnv(self).fetcher(api, data, options)];
                 case 5:
-                    json = _q.sent();
+                    json = _r.sent();
                     // 失败也同样修改数据，如果有数据的话。
                     if (!isEmpty(json.data) || json.ok) {
                         self.updatedAt = Date.now();
@@ -317,24 +314,24 @@ var FormStore = ServiceStore.named('FormStore')
                     throw new ServerError(self.msg, json);
                 case 6:
                     updateSavedData();
-                    ret = options && options.onSuccess && options.onSuccess(json);
+                    ret = (_h = options === null || options === void 0 ? void 0 : options.onSuccess) === null || _h === void 0 ? void 0 : _h.call(options, json, json.data);
                     if (!(ret === null || ret === void 0 ? void 0 : ret.then)) return [3 /*break*/, 8];
                     return [4 /*yield*/, ret];
                 case 7:
-                    ret = _q.sent();
-                    _q.label = 8;
+                    ret = _r.sent();
+                    _r.label = 8;
                 case 8:
-                    if (!((_h = ret === null || ret === void 0 ? void 0 : ret.cbResult) === null || _h === void 0 ? void 0 : _h.then)) return [3 /*break*/, 10];
+                    if (!((_j = ret === null || ret === void 0 ? void 0 : ret.cbResult) === null || _j === void 0 ? void 0 : _j.then)) return [3 /*break*/, 10];
                     return [4 /*yield*/, ret.cbResult];
                 case 9:
-                    _q.sent();
-                    _q.label = 10;
+                    _r.sent();
+                    _r.label = 10;
                 case 10:
                     self.markSaving(false);
-                    self.updateMessage((_m = (_l = (_k = (_j = api === null || api === void 0 ? void 0 : api.messages) === null || _j === void 0 ? void 0 : _j.success) !== null && _k !== void 0 ? _k : json.msg) !== null && _l !== void 0 ? _l : (options.successMessage === 'saveSuccess'
+                    self.updateMessage((_o = (_m = (_l = (_k = api === null || api === void 0 ? void 0 : api.messages) === null || _k === void 0 ? void 0 : _k.success) !== null && _l !== void 0 ? _l : json.msg) !== null && _m !== void 0 ? _m : (options.successMessage === 'saveSuccess'
                         ? json.defaultMsg
-                        : self.__(options && options.successMessage))) !== null && _m !== void 0 ? _m : json.defaultMsg);
-                    if (!((_o = ret === null || ret === void 0 ? void 0 : ret.dispatcher) === null || _o === void 0 ? void 0 : _o.prevented)) {
+                        : self.__(options && options.successMessage))) !== null && _o !== void 0 ? _o : json.defaultMsg);
+                    if (!((_p = ret === null || ret === void 0 ? void 0 : ret.dispatcher) === null || _p === void 0 ? void 0 : _p.prevented)) {
                         self.msg &&
                             getEnv(self).notify('success', self.msg, json.msgTimeout !== undefined
                                 ? {
@@ -346,19 +343,19 @@ var FormStore = ServiceStore.named('FormStore')
                     return [2 /*return*/, json.data];
                 case 11: return [3 /*break*/, 15];
                 case 12:
-                    e_1 = _q.sent();
+                    e_1 = _r.sent();
                     self.markSaving(false);
                     ret = options && options.onFailed && options.onFailed(e_1.response || {});
                     if (!(ret === null || ret === void 0 ? void 0 : ret.then)) return [3 /*break*/, 14];
                     return [4 /*yield*/, ret];
                 case 13:
-                    ret = _q.sent();
-                    _q.label = 14;
+                    ret = _r.sent();
+                    _r.label = 14;
                 case 14:
                     if (!isAlive(self) || self.disposed) {
                         return [2 /*return*/];
                     }
-                    if ((_p = ret === null || ret === void 0 ? void 0 : ret.dispatcher) === null || _p === void 0 ? void 0 : _p.prevented) {
+                    if ((_q = ret === null || ret === void 0 ? void 0 : ret.dispatcher) === null || _q === void 0 ? void 0 : _q.prevented) {
                         return [2 /*return*/];
                     }
                     if (e_1.type === 'ServerError') {
@@ -427,8 +424,8 @@ var FormStore = ServiceStore.named('FormStore')
         trailing: false,
         leading: true
     });
-    var submit = flow(function submit(fn, hooks, failedMessage, validateErrCb) {
-        var valid, msg, dispatcher, diff, result;
+    var submit = flow(function submit(fn, hooks, failedMessage, validateErrCb, throwErrors) {
+        var diff, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -436,53 +433,35 @@ var FormStore = ServiceStore.named('FormStore')
                     self.submiting = true;
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, , 8, 9]);
-                    return [4 /*yield*/, validate(hooks)];
+                    _a.trys.push([1, , 5, 6]);
+                    return [4 /*yield*/, validate(hooks, undefined, true, failedMessage, validateErrCb)];
                 case 2:
-                    valid = _a.sent();
-                    if (!((!valid &&
-                        self.items.some(function (item) {
-                            return item.errorData.some(function (e) { return e.tag !== 'remote'; });
-                        })) ||
-                        self.restError.length)) return [3 /*break*/, 5];
-                    msg = failedMessage !== null && failedMessage !== void 0 ? failedMessage : self.__('Form.validateFailed');
-                    dispatcher = validateErrCb && validateErrCb();
-                    if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.then)) return [3 /*break*/, 4];
-                    return [4 /*yield*/, dispatcher];
-                case 3:
-                    dispatcher = _a.sent();
-                    _a.label = 4;
-                case 4:
-                    if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
-                        msg && toastValidateError(msg);
-                    }
-                    throw new Error(msg);
-                case 5:
-                    if (!fn) return [3 /*break*/, 7];
+                    _a.sent();
+                    if (!fn) return [3 /*break*/, 4];
                     diff = difference(self.data, self.pristine);
                     return [4 /*yield*/, fn(createObject(createObject(self.data.__super, {
                             diff: diff,
                             __diff: diff,
                             pristine: self.pristine
                         }), self.data))];
-                case 6:
+                case 3:
                     result = _a.sent();
                     return [2 /*return*/, result !== null && result !== void 0 ? result : self.data];
-                case 7: return [2 /*return*/, self.data];
-                case 8:
+                case 4: return [2 /*return*/, self.data];
+                case 5:
                     self.submiting = false;
                     return [7 /*endfinally*/];
-                case 9: return [2 /*return*/];
+                case 6: return [2 /*return*/];
             }
         });
     });
-    var validate = flow(function validate(hooks, forceValidate) {
-        var items, i, len, item, i, len;
+    var validate = flow(function validate(hooks, forceValidate, throwErrors, failedMessage, validateErrCb) {
+        var items, i, len, item, i, len, msg, dispatcher;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     self.validated = true;
-                    items = self.directItems.concat();
+                    items = self.items.concat();
                     i = 0, len = items.length;
                     _a.label = 1;
                 case 1:
@@ -533,7 +512,30 @@ var FormStore = ServiceStore.named('FormStore')
                 case 7:
                     i++;
                     return [3 /*break*/, 5];
-                case 8: return [2 /*return*/, self.valid];
+                case 8:
+                    if (!!self.valid) return [3 /*break*/, 12];
+                    if (!(self.items.some(function (item) {
+                        return item.errorData.some(function (e) { return e.tag !== 'remote'; });
+                    }) ||
+                        self.restError.length)) return [3 /*break*/, 11];
+                    msg = failedMessage !== null && failedMessage !== void 0 ? failedMessage : self.__('Form.validateFailed');
+                    dispatcher = validateErrCb && validateErrCb();
+                    if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.then)) return [3 /*break*/, 10];
+                    return [4 /*yield*/, dispatcher];
+                case 9:
+                    dispatcher = _a.sent();
+                    _a.label = 10;
+                case 10:
+                    if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
+                        msg && toastValidateError(msg);
+                    }
+                    _a.label = 11;
+                case 11:
+                    if (throwErrors) {
+                        throw new ValidateError(failedMessage || self.__('Form.validateFailed'), self.errors);
+                    }
+                    _a.label = 12;
+                case 12: return [2 /*return*/, self.valid];
             }
         });
     });

package/esm/store/formItem.d.ts

@@ -17,6 +17,7 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     isValueSchemaExp: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ISimpleType<boolean>, [undefined]>;
     tmpValue: import("mobx-state-tree").IType<any, any, any>;
     emitedValue: import("mobx-state-tree").IType<any, any, any>;
+    changeMotivation: import("mobx-state-tree").IType<string | undefined, string, string>;
     rules: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     messages: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     errorData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IModelType<{
@@ -25,6 +26,7 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
         rule: import("mobx-state-tree").IType<string | undefined, string, string>;
     }, {}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>, [undefined]>;
     name: import("mobx-state-tree").ISimpleType<string>;
+    extraName: import("mobx-state-tree").IType<string | undefined, string, string>;
     itemId: import("mobx-state-tree").IType<string | undefined, string, string>;
     unsetValueOnInvisible: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     itemsRef: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
@@ -71,10 +73,12 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     readonly errClassNames: string;
     readonly lastSelectValue: string;
     getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any[];
+    splitExtraValue(value: any): any[];
 } & {
     focus: () => void;
     blur: () => void;
-    config: ({ required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl }: {
+    config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl }: {
+        extraName?: string | undefined;
         required?: boolean | undefined;
         unique?: boolean | undefined;
         value?: any;
@@ -131,7 +135,7 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     resetValidationStatus: (tag?: string) => void;
     openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
     closeDialog: (result?: any) => void;
-    changeTmpValue: (value: any) => void;
+    changeTmpValue: (value: any, changeReason?: 'initialValue' | 'formInited' | 'dataChanged' | 'formulaChanged' | 'controlled' | 'input' | 'defaultValue') => void;
     changeEmitedValue: (value: any) => void;
     addSubFormItem: (item: IFormItemStore) => void;
     removeSubFormItem: (item: IFormItemStore) => void;

package/esm/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -40,10 +40,12 @@ var FormItemStore = StoreNode.named('FormItemStore')
     isValueSchemaExp: types.optional(types.boolean, false),
     tmpValue: types.frozen(),
     emitedValue: types.frozen(),
+    changeMotivation: 'input',
     rules: types.optional(types.frozen(), {}),
     messages: types.optional(types.frozen(), {}),
     errorData: types.optional(types.array(ErrorDetail), []),
     name: types.string,
+    extraName: '',
     itemId: '',
     unsetValueOnInvisible: false,
     itemsRef: types.optional(types.array(types.string), []),
@@ -166,6 +168,15 @@ var FormItemStore = StoreNode.named('FormItemStore')
                 }
             });
             return selectedOptions;
+        },
+        splitExtraValue: function (value) {
+            var delimiter = self.delimiter || ',';
+            var values = Array.isArray(value)
+                ? value
+                : typeof value === 'string'
+                    ? value.split(delimiter || ',')
+                    : [];
+            return values;
         }
     };
 })
@@ -174,10 +185,11 @@ var FormItemStore = StoreNode.named('FormItemStore')
     var dialogCallbacks = new SimpleMap();
     var loadAutoUpdateCancel = null;
     function config(_a) {
-        var required = _a.required, unique = _a.unique; _a.value; var isValueSchemaExp = _a.isValueSchemaExp, rules = _a.rules, messages = _a.messages, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, labelField = _a.labelField, joinValues = _a.joinValues, extractValue = _a.extractValue, type = _a.type, id = _a.id, selectFirst = _a.selectFirst, autoFill = _a.autoFill, clearValueOnHidden = _a.clearValueOnHidden, validateApi = _a.validateApi, maxLength = _a.maxLength, minLength = _a.minLength, validateOnChange = _a.validateOnChange, label = _a.label, inputGroupControl = _a.inputGroupControl;
+        var extraName = _a.extraName, required = _a.required, unique = _a.unique; _a.value; var isValueSchemaExp = _a.isValueSchemaExp, rules = _a.rules, messages = _a.messages, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, labelField = _a.labelField, joinValues = _a.joinValues, extractValue = _a.extractValue, type = _a.type, id = _a.id, selectFirst = _a.selectFirst, autoFill = _a.autoFill, clearValueOnHidden = _a.clearValueOnHidden, validateApi = _a.validateApi, maxLength = _a.maxLength, minLength = _a.minLength, validateOnChange = _a.validateOnChange, label = _a.label, inputGroupControl = _a.inputGroupControl;
         if (typeof rules === 'string') {
             rules = str2rules(rules);
         }
+        typeof extraName !== 'undefined' && (self.extraName = extraName);
         typeof type !== 'undefined' && (self.type = type);
         typeof id !== 'undefined' && (self.itemId = id);
         typeof messages !== 'undefined' && (self.messages = messages);
@@ -839,8 +851,12 @@ var FormItemStore = StoreNode.named('FormItemStore')
             setTimeout(function () { return callback(result); }, 200);
         }
     }
-    function changeTmpValue(value) {
+    function changeTmpValue(value, changeReason // 默认值
+    ) {
         self.tmpValue = value;
+        if (changeReason) {
+            self.changeMotivation = changeReason;
+        }
     }
     function changeEmitedValue(value) {
         self.emitedValue = value;

package/esm/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -29,8 +29,8 @@ import 'classnames';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
-import 'lodash';
 import '../utils/image.js';
+import 'lodash/isEqual';
 import '../actions/Action.js';
 import 'lodash/debounce';
 import 'lodash/cloneDeep';
@@ -42,6 +42,7 @@ import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';
 import '../utils/resolveCondition.js';
+import 'mobx';
 import '../utils/Animation.js';
 
 var iRendererStore = StoreNode.named('iRendererStore')

package/esm/store/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/list.d.ts

@@ -80,6 +80,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
     draggable: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     dragging: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     multiple: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+    strictMode: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     selectable: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     itemCheckableOn: import("mobx-state-tree").IType<string | undefined, string, string>;
     itemDraggableOn: import("mobx-state-tree").IType<string | undefined, string, string>;

package/esm/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -78,6 +78,7 @@ var ListStore = iRendererStore
     draggable: false,
     dragging: false,
     multiple: true,
+    strictMode: false,
     selectable: false,
     itemCheckableOn: '',
     itemDraggableOn: '',
@@ -131,6 +132,7 @@ var ListStore = iRendererStore
         config.selectable === void 0 || (self.selectable = config.selectable);
         config.draggable === void 0 || (self.draggable = config.draggable);
         config.multiple === void 0 || (self.multiple = config.multiple);
+        config.strictMode === void 0 || (self.strictMode = config.strictMode);
         config.hideCheckToggler === void 0 ||
             (self.hideCheckToggler = config.hideCheckToggler);
         if (typeof config.orderBy !== 'undefined') {
@@ -169,7 +171,11 @@ var ListStore = iRendererStore
                 self.selectedItems.push(item);
             }
             else if (find(selected, function (a) {
-                return a[valueField || 'value'] == item.pristine[valueField || 'value'];
+                var selectValue = a[valueField || 'value'];
+                var itemValue = item.pristine[valueField || 'value'];
+                return self.strictMode
+                    ? selectValue === itemValue
+                    : selectValue == itemValue;
             })) {
                 self.selectedItems.push(item);
             }

package/esm/store/manager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/node.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -26,8 +26,8 @@ import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
-import 'lodash';
 import '../utils/image.js';
+import 'lodash/isEqual';
 import '../actions/Action.js';
 import 'lodash/debounce';
 import 'lodash/cloneDeep';
@@ -40,6 +40,7 @@ import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';
 import '../utils/resolveCondition.js';
+import 'mobx';
 import '../utils/Animation.js';
 
 var RootStore = ServiceStore.named('RootStore')

package/esm/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -94,7 +94,7 @@ var ServiceStore = iRendererStore
                     reInitData(data_1, replace);
                     self.hasRemoteData = true;
                     if (!(options && options.onSuccess)) return [3 /*break*/, 4];
-                    ret = options.onSuccess(json);
+                    ret = options.onSuccess(json, data_1);
                     if (!(ret && ret.then)) return [3 /*break*/, 4];
                     return [4 /*yield*/, ret];
                 case 3:
@@ -171,7 +171,7 @@ var ServiceStore = iRendererStore
                     return [3 /*break*/, 5];
                 case 2:
                     if (!(options && options.onSuccess)) return [3 /*break*/, 4];
-                    ret = options.onSuccess(json);
+                    ret = options.onSuccess(json, json.data);
                     if (!(ret && ret.then)) return [3 /*break*/, 4];
                     return [4 /*yield*/, ret];
                 case 3:
@@ -242,7 +242,7 @@ var ServiceStore = iRendererStore
                     throw new ServerError(self.msg, json);
                 case 4:
                     if (!(options && options.onSuccess)) return [3 /*break*/, 6];
-                    ret = options.onSuccess(json);
+                    ret = options.onSuccess(json, json.data);
                     if (!(ret && ret.then)) return [3 /*break*/, 6];
                     return [4 /*yield*/, ret];
                 case 5:
@@ -287,12 +287,12 @@ var ServiceStore = iRendererStore
     });
     var fetchSchema = flow(function fetchSchema(api, data, options) {
         var json, env, e_4, env, message;
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (options === void 0) { options = {}; }
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        return __generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
-                    _h.trys.push([0, 2, , 3]);
+                    _j.trys.push([0, 2, , 3]);
                     options = __assign(__assign({ method: 'post' }, options), { cancelExecutor: function (executor) { return (fetchSchemaCancel = executor); } });
                     if (fetchSchemaCancel) {
                         fetchSchemaCancel();
@@ -313,7 +313,7 @@ var ServiceStore = iRendererStore
                     }
                     return [4 /*yield*/, getEnv(self).fetcher(api, data, options)];
                 case 1:
-                    json = _h.sent();
+                    json = _j.sent();
                     fetchSchemaCancel = null;
                     if (!json.ok) {
                         updateMessage((_d = (_c = (_b = (_a = api === null || api === void 0 ? void 0 : api.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : json.msg) !== null && _c !== void 0 ? _c : (options && options.errorMessage)) !== null && _d !== void 0 ? _d : self.__('fetchFailed'), true);
@@ -330,12 +330,17 @@ var ServiceStore = iRendererStore
                             json.data = replaceText(json.data, env.replaceText, env.replaceTextIgnoreKeys);
                             self.schema = Array.isArray(json.data)
                                 ? json.data
-                                : __assign({ type: 'wrapper', wrap: false }, normalizeApiResponseData(json.data));
+                                : Object.assign(((_e = json.data) === null || _e === void 0 ? void 0 : _e.type)
+                                    ? {}
+                                    : {
+                                        type: 'wrapper',
+                                        wrap: false
+                                    }, normalizeApiResponseData(json.data));
                             self.schemaKey = '' + Date.now();
                             isObject(json.data.data) &&
                                 self.updateData(json.data.data, undefined, !!api.replaceData);
                         }
-                        updateMessage((_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 && options.successMessage));
+                        updateMessage((_h = (_g = (_f = api === null || api === void 0 ? void 0 : api.messages) === null || _f === void 0 ? void 0 : _f.success) !== null && _g !== void 0 ? _g : json.msg) !== null && _h !== void 0 ? _h : (options && options.successMessage));
                         // 配置了获取成功提示后提示，默认是空不会提示。
                         options &&
                             options.successMessage &&
@@ -344,7 +349,7 @@ var ServiceStore = iRendererStore
                     self.initializing = false;
                     return [2 /*return*/, json.data];
                 case 2:
-                    e_4 = _h.sent();
+                    e_4 = _j.sent();
                     env = getEnv(self);
                     self.initializing = false;
                     if (!isAlive(self) || self.disposed) {

package/esm/store/status.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */