amis-core 3.6.2 → 6.0.0

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -27,6 +27,7 @@ var findIndex = require('lodash/findIndex');
 var isPlainObject = require('lodash/isPlainObject');
 var normalizeOptions = require('../utils/normalizeOptions.js');
 var optionValueCompare = require('../utils/optionValueCompare.js');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
 require('../utils/DataSchema.js');
@@ -160,7 +161,7 @@ function registerOptionsControl(config) {
             var _this = this;
             var props = this.props;
             var formItem = props.formItem;
-            if (prevProps.options !== props.options && formItem) {
+            if (!props.source && prevProps.options !== props.options && formItem) {
                 formItem.setOptions(normalizeOptions.normalizeOptions(props.options || [], undefined, props.valueField), this.changeOptionValue, props.data);
                 this.normalizeValue();
             }
@@ -194,7 +195,8 @@ function registerOptionsControl(config) {
             this.toDispose.forEach(function (fn) { return fn(); });
             this.toDispose = [];
         };
-        FormOptionsItem.prototype.dispatchOptionEvent = function (eventName, eventData) {
+        // 不推荐使用，缺少组件值
+        FormOptionsItem.prototype.oldDispatchOptionEvent = function (eventName, eventData) {
             if (eventData === void 0) { eventData = ''; }
             return tslib.__awaiter(this, void 0, void 0, function () {
                 var _a, dispatchEvent, options, rendererEvent$1;
@@ -212,6 +214,23 @@ function registerOptionsControl(config) {
                 });
             });
         };
+        FormOptionsItem.prototype.dispatchOptionEvent = function (eventName, eventData) {
+            if (eventData === void 0) { eventData = ''; }
+            return tslib.__awaiter(this, void 0, void 0, function () {
+                var _a, dispatchEvent, options, value, rendererEvent$1;
+                return tslib.__generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options, value = _a.value;
+                            return [4 /*yield*/, dispatchEvent(eventName, rendererEvent.resolveEventData(this.props, tslib.__assign({ value: value, options: options, items: options }, eventData)))];
+                        case 1:
+                            rendererEvent$1 = _b.sent();
+                            // 返回阻塞标识
+                            return [2 /*return*/, !!(rendererEvent$1 === null || rendererEvent$1 === void 0 ? void 0 : rendererEvent$1.prevented)];
+                    }
+                });
+            });
+        };
         FormOptionsItem.prototype.doAction = function (action, data, throwErrors) {
             var _a = this.props, resetValue = _a.resetValue, onChange = _a.onChange;
             var actionType = action === null || action === void 0 ? void 0 : action.actionType;
@@ -297,7 +316,9 @@ function registerOptionsControl(config) {
                                 return [2 /*return*/];
                             }
                             newValue = this.toggleValue(option, value);
-                            return [4 /*yield*/, this.dispatchOptionEvent('change', newValue)];
+                            return [4 /*yield*/, this.dispatchOptionEvent('change', {
+                                    value: newValue
+                                })];
                         case 1:
                             isPrevented = _b.sent();
                             isPrevented ||
@@ -368,7 +389,9 @@ function registerOptionsControl(config) {
                                 ? []
                                 : formItem.filteredOptions.concat();
                             newValue = this.formatValueArray(valueArray);
-                            return [4 /*yield*/, this.dispatchOptionEvent('change', newValue)];
+                            return [4 /*yield*/, this.dispatchOptionEvent('change', {
+                                    value: newValue
+                                })];
                         case 1:
                             isPrevented = _b.sent();
                             isPrevented || (onChange && onChange(newValue));
@@ -451,7 +474,10 @@ function registerOptionsControl(config) {
                         case 1:
                             json = _b.sent();
                             // 触发事件通知,加载完成
-                            this.dispatchOptionEvent('loadFinished', json);
+                            // 废弃，不推荐使用
+                            this.oldDispatchOptionEvent('loadFinished', json);
+                            // 避免产生breakchange，增加新事件名，用来更正之前的设计问题
+                            this.dispatchOptionEvent('deferLoadFinished', { result: json });
                             return [2 /*return*/];
                     }
                 });
@@ -533,8 +559,9 @@ function registerOptionsControl(config) {
             if (idx === void 0) { idx = -1; }
             if (skipForm === void 0) { skipForm = false; }
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, deferField, model, createBtnLabel, env, __, parent, ctx, result, _d, payload, e_1, isPrevented, options;
+                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, deferField, model, createBtnLabel, env, __, parent, ctx, customAddPrevent, result, _d, prevent, payload, e_1, isPrevented, options;
                 var _e;
+                var _this = this;
                 return tslib.__generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -560,6 +587,7 @@ function registerOptionsControl(config) {
                                 : undefined;
                             ctx = object.createObject(data, Array.isArray(idx)
                                 ? tslib.__assign({ parent: parent }, value) : value);
+                            customAddPrevent = false;
                             if (!skipForm) return [3 /*break*/, 1];
                             _d = ctx;
                             return [3 /*break*/, 3];
@@ -577,21 +605,59 @@ function registerOptionsControl(config) {
                                             name: 'parent',
                                             value: parent
                                         }
-                                    ], tslib.__read((addControls || [])), false)
+                                    ], tslib.__read((addControls || [])), false),
+                                    onSubmit: function (payload) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                                        var labelKey, valueKey;
+                                        var _a;
+                                        var _b;
+                                        return tslib.__generator(this, function (_c) {
+                                            switch (_c.label) {
+                                                case 0:
+                                                    labelKey = labelField || 'label';
+                                                    valueKey = valueField || 'value';
+                                                    return [4 /*yield*/, this.dispatchOptionEvent('addConfirm', {
+                                                            item: (_a = {},
+                                                                _a[labelKey] = payload[labelKey],
+                                                                _a[valueKey] = (_b = payload[valueKey]) !== null && _b !== void 0 ? _b : payload[labelKey],
+                                                                _a)
+                                                        })];
+                                                case 1:
+                                                    // 派发确认添加事件
+                                                    customAddPrevent = _c.sent();
+                                                    return [2 /*return*/, !customAddPrevent];
+                                            }
+                                        });
+                                    }); }
                                 } }), ctx)];
                         case 2:
                             _d = _f.sent();
                             _f.label = 3;
                         case 3:
                             result = _d;
-                            if (!(skipForm && addApi)) return [3 /*break*/, 7];
-                            _f.label = 4;
+                            if (!skipForm) return [3 /*break*/, 5];
+                            return [4 /*yield*/, this.dispatchOptionEvent('addConfirm', {
+                                    item: result
+                                })];
                         case 4:
-                            _f.trys.push([4, 6, , 7]);
+                            prevent = _f.sent();
+                            if (prevent) {
+                                return [2 /*return*/];
+                            }
+                            return [3 /*break*/, 6];
+                        case 5:
+                            if (customAddPrevent) {
+                                return [2 /*return*/];
+                            }
+                            _f.label = 6;
+                        case 6:
+                            if (!(skipForm && addApi)) return [3 /*break*/, 10];
+                            _f.label = 7;
+                        case 7:
+                            _f.trys.push([7, 9, , 10]);
                             return [4 /*yield*/, env.fetcher(addApi, result, {
                                     method: 'post'
                                 })];
-                        case 5:
+                        case 8:
                             payload = _f.sent();
                             if (!payload.ok) {
                                 !addApi.silent &&
@@ -601,14 +667,14 @@ function registerOptionsControl(config) {
                             else {
                                 result = payload.data || result;
                             }
-                            return [3 /*break*/, 7];
-                        case 6:
+                            return [3 /*break*/, 10];
+                        case 9:
                             e_1 = _f.sent();
                             result = null;
                             console.error(e_1);
                             !addApi.silent && env.notify('error', e_1.message);
-                            return [3 /*break*/, 7];
-                        case 7:
+                            return [3 /*break*/, 10];
+                        case 10:
                             // 有 result 说明弹框点了确认。否则就是取消了。
                             if (!result) {
                                 return [2 /*return*/];
@@ -617,19 +683,19 @@ function registerOptionsControl(config) {
                             if (!result.hasOwnProperty(valueField || 'value')) {
                                 result = tslib.__assign(tslib.__assign({}, result), (_e = {}, _e[valueField || 'value'] = result[labelField || 'label'], _e));
                             }
-                            return [4 /*yield*/, this.dispatchOptionEvent('add', tslib.__assign(tslib.__assign({}, result), { idx: idx }))];
-                        case 8:
+                            return [4 /*yield*/, this.oldDispatchOptionEvent('add', tslib.__assign(tslib.__assign({}, result), { idx: idx }))];
+                        case 11:
                             isPrevented = _f.sent();
                             if (isPrevented) {
                                 return [2 /*return*/];
                             }
                             if (!(((parent === null || parent === void 0 ? void 0 : parent.hasOwnProperty(deferField)) && parent[deferField]) ||
-                                (parent === null || parent === void 0 ? void 0 : parent.defer))) return [3 /*break*/, 10];
+                                (parent === null || parent === void 0 ? void 0 : parent.defer))) return [3 /*break*/, 13];
                             return [4 /*yield*/, this.deferLoad(parent)];
-                        case 9:
+                        case 12:
                             _f.sent();
-                            return [3 /*break*/, 11];
-                        case 10:
+                            return [3 /*break*/, 14];
+                        case 13:
                             if (source && addApi) {
                                 // 如果配置了 source 且配置了 addApi 直接重新拉取接口就够了
                                 // 不能不判断 addApi 就刷新，因为有些场景就是临时添加的。
@@ -647,8 +713,8 @@ function registerOptionsControl(config) {
                                 }
                                 model.setOptions(options, this.changeOptionValue, data);
                             }
-                            _f.label = 11;
-                        case 11: return [2 /*return*/];
+                            _f.label = 14;
+                        case 14: return [2 /*return*/];
                     }
                 });
             });
@@ -658,11 +724,12 @@ function registerOptionsControl(config) {
             if (origin === void 0) { origin = value; }
             if (skipForm === void 0) { skipForm = false; }
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _c, editControls, editDialog, disabled, labelField, onOpenDialog, editApi, editInitApi, env, source, data, model, optionLabel, __, result, _d, payload, e_2, isPrevented, indexes;
+                var _c, editControls, editDialog, disabled, labelField, valueField, onOpenDialog, editApi, editInitApi, env, source, data, model, optionLabel, __, customEditPrevent, result, _d, prevent, payload, e_2, isPrevented, indexes;
+                var _this = this;
                 return tslib.__generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
-                            _c = this.props, editControls = _c.editControls, editDialog = _c.editDialog, disabled = _c.disabled, labelField = _c.labelField, onOpenDialog = _c.onOpenDialog, editApi = _c.editApi, editInitApi = _c.editInitApi, env = _c.env, source = _c.source, data = _c.data, model = _c.formItem, optionLabel = _c.optionLabel, __ = _c.translate;
+                            _c = this.props, editControls = _c.editControls, editDialog = _c.editDialog, disabled = _c.disabled, labelField = _c.labelField, valueField = _c.valueField, onOpenDialog = _c.onOpenDialog, editApi = _c.editApi, editInitApi = _c.editInitApi, env = _c.env, source = _c.source, data = _c.data, model = _c.formItem, optionLabel = _c.optionLabel, __ = _c.translate;
                             if (disabled || !model) {
                                 return [2 /*return*/];
                             }
@@ -676,6 +743,7 @@ function registerOptionsControl(config) {
                                     }
                                 ];
                             }
+                            customEditPrevent = false;
                             if (!skipForm) return [3 /*break*/, 1];
                             _d = value;
                             return [3 /*break*/, 3];
@@ -685,21 +753,59 @@ function registerOptionsControl(config) {
                                     type: 'form',
                                     initApi: editInitApi,
                                     api: editApi,
-                                    controls: editControls
+                                    controls: editControls,
+                                    onSubmit: function (payload) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                                        var labelKey, valueKey;
+                                        var _a;
+                                        var _b;
+                                        return tslib.__generator(this, function (_c) {
+                                            switch (_c.label) {
+                                                case 0:
+                                                    labelKey = labelField || 'label';
+                                                    valueKey = valueField || 'value';
+                                                    return [4 /*yield*/, this.dispatchOptionEvent('editConfirm', {
+                                                            item: (_a = {},
+                                                                _a[labelKey] = payload[labelKey],
+                                                                _a[valueKey] = (_b = payload[valueKey]) !== null && _b !== void 0 ? _b : payload[labelKey],
+                                                                _a)
+                                                        })];
+                                                case 1:
+                                                    // 避免产生breakchange，增加新事件名，用来更正之前的设计问题
+                                                    customEditPrevent = _c.sent();
+                                                    return [2 /*return*/, !customEditPrevent];
+                                            }
+                                        });
+                                    }); }
                                 } }), object.createObject(data, value))];
                         case 2:
                             _d = _e.sent();
                             _e.label = 3;
                         case 3:
                             result = _d;
-                            if (!(skipForm && editApi)) return [3 /*break*/, 7];
-                            _e.label = 4;
+                            if (!skipForm) return [3 /*break*/, 5];
+                            return [4 /*yield*/, this.dispatchOptionEvent('editConfirm', {
+                                    item: result
+                                })];
                         case 4:
-                            _e.trys.push([4, 6, , 7]);
+                            prevent = _e.sent();
+                            if (prevent) {
+                                return [2 /*return*/];
+                            }
+                            return [3 /*break*/, 6];
+                        case 5:
+                            if (customEditPrevent) {
+                                return [2 /*return*/];
+                            }
+                            _e.label = 6;
+                        case 6:
+                            if (!(skipForm && editApi)) return [3 /*break*/, 10];
+                            _e.label = 7;
+                        case 7:
+                            _e.trys.push([7, 9, , 10]);
                             return [4 /*yield*/, env.fetcher(editApi, object.createObject(data, result), {
                                     method: 'post'
                                 })];
-                        case 5:
+                        case 8:
                             payload = _e.sent();
                             if (!payload.ok) {
                                 !editApi.silent &&
@@ -709,20 +815,20 @@ function registerOptionsControl(config) {
                             else {
                                 result = payload.data || result;
                             }
-                            return [3 /*break*/, 7];
-                        case 6:
+                            return [3 /*break*/, 10];
+                        case 9:
                             e_2 = _e.sent();
                             result = null;
                             console.error(e_2);
                             !editApi.silent && env.notify('error', e_2.message);
-                            return [3 /*break*/, 7];
-                        case 7:
+                            return [3 /*break*/, 10];
+                        case 10:
                             // 没有结果，说明取消了。
                             if (!result) {
                                 return [2 /*return*/];
                             }
-                            return [4 /*yield*/, this.dispatchOptionEvent('edit', result)];
-                        case 8:
+                            return [4 /*yield*/, this.oldDispatchOptionEvent('edit', result)];
+                        case 11:
                             isPrevented = _e.sent();
                             if (isPrevented) {
                                 return [2 /*return*/];
@@ -744,7 +850,7 @@ function registerOptionsControl(config) {
         FormOptionsItem.prototype.handleOptionDelete = function (value) {
             var _a, _b;
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _c, deleteConfirmText, disabled, data, deleteApi, onDelete, env, model, source, valueField, __, ctx, confirmed, _d, isPrevented, result, options, indexes, e_3;
+                var _c, deleteConfirmText, disabled, data, deleteApi, onDelete, env, model, source, valueField, __, ctx, confirmed, _d, isPrevented, delConfirmPrevent, result, options, indexes, e_3;
                 return tslib.__generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -766,28 +872,36 @@ function registerOptionsControl(config) {
                             if (!confirmed) {
                                 return [2 /*return*/];
                             }
-                            return [4 /*yield*/, this.dispatchOptionEvent('delete', ctx)];
+                            return [4 /*yield*/, this.oldDispatchOptionEvent('delete', ctx)];
                         case 4:
                             isPrevented = _e.sent();
                             if (isPrevented) {
                                 return [2 /*return*/];
                             }
-                            _e.label = 5;
+                            return [4 /*yield*/, this.dispatchOptionEvent('deleteConfirm', {
+                                    item: value
+                                })];
                         case 5:
-                            _e.trys.push([5, 8, , 9]);
-                            if (!deleteApi) return [3 /*break*/, 7];
+                            delConfirmPrevent = _e.sent();
+                            if (delConfirmPrevent) {
+                                return [2 /*return*/];
+                            }
+                            _e.label = 6;
+                        case 6:
+                            _e.trys.push([6, 9, , 10]);
+                            if (!deleteApi) return [3 /*break*/, 8];
                             return [4 /*yield*/, env.fetcher(deleteApi, ctx, {
                                     method: 'delete'
                                 })];
-                        case 6:
+                        case 7:
                             result = _e.sent();
                             if (!result.ok) {
                                 !deleteApi.silent &&
                                     env.notify('error', (_b = (_a = deleteApi === null || deleteApi === void 0 ? void 0 : deleteApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (result.msg || __('deleteFailed')));
                                 return [2 /*return*/];
                             }
-                            _e.label = 7;
-                        case 7:
+                            _e.label = 8;
+                        case 8:
                             // 由外部代码实现删除逻辑
                             if (onDelete) {
                                 onDelete(ctx);
@@ -802,13 +916,13 @@ function registerOptionsControl(config) {
                                     model.setOptions(helper.spliceTree(options, indexes, 1), this.changeOptionValue, data);
                                 }
                             }
-                            return [3 /*break*/, 9];
-                        case 8:
+                            return [3 /*break*/, 10];
+                        case 9:
                             e_3 = _e.sent();
                             console.error(e_3);
                             !deleteApi.silent && env.notify('error', e_3.message);
-                            return [3 /*break*/, 9];
-                        case 9: return [2 /*return*/];
+                            return [3 /*break*/, 10];
+                        case 10: return [2 /*return*/];
                     }
                 });
             });

package/lib/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -23,12 +23,13 @@ var WithRootStore = require('../WithRootStore.js');
 var table = require('../store/table.js');
 var pick = require('lodash/pick');
 var api = require('../utils/api.js');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
+var getVariable = require('../utils/getVariable.js');
+require('lodash/isPlainObject');
 require('amis-formula');
 var tokenize = require('../utils/tokenize.js');
-require('lodash/isPlainObject');
-var getVariable = require('../utils/getVariable.js');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
 require('moment');

package/lib/store/app.d.ts

@@ -52,7 +52,7 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
-    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
+    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
     setCurrentAction(action: object): void;
     openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -69,7 +69,7 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     markBusying: (busying?: boolean) => void;
     fetchInitData: (api: import("../types").Api, data?: object | undefined, options?: import("../types").fetchOptions | undefined) => Promise<any>;
     fetchData: (api: import("../types").Api, data?: object | undefined, options?: import("../types").fetchOptions | undefined) => Promise<any>;
-    reInitData: (data: object | undefined, replace?: boolean) => void;
+    reInitData: (data: object | undefined, replace?: boolean, concatFields?: string | string[] | undefined) => void;
     updateMessage: (msg?: string | undefined, error?: boolean) => void;
     clearMessage: () => void;
     setHasRemoteData: () => void;

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -12,11 +12,12 @@ var mobxStateTree = require('mobx-state-tree');
 var helper = require('../utils/helper.js');
 var service = require('./service.js');
 require('../utils/api.js');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
+var object = require('../utils/object.js');
 require('amis-formula');
 require('lodash/isPlainObject');
-var object = require('../utils/object.js');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
 require('moment');

package/lib/store/combo.d.ts

@@ -2106,7 +2106,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
-    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
+    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
     setCurrentAction(action: object): void;
     openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -2168,7 +2168,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         setTopStore(value: any): void;
         initData(data?: object, skipSetPristine?: boolean): void;
         reset(): void;
-        updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
+        updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
         changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
         setCurrentAction(action: object): void;
         openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -2185,7 +2185,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         markBusying: (busying?: boolean) => void;
         fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
         fetchData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
-        reInitData: (data: object | undefined, replace?: boolean) => void;
+        reInitData: (data: object | undefined, replace?: boolean, concatFields?: string | string[] | undefined) => void;
         updateMessage: (msg?: string | undefined, error?: boolean) => void;
         clearMessage: () => void;
         setHasRemoteData: () => void;
@@ -7316,7 +7316,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         readonly persistKey: string;
     } & {
         setInited: (value: boolean) => void;
-        setValues: (values: object, tag?: object | undefined, replace?: boolean | undefined) => void;
+        setValues: (values: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined) => void;
         setValueByName: (name: string, value: any, isPristine?: boolean, force?: boolean) => void;
         trimValues: () => void;
         submit: (fn?: ((values: object) => Promise<any>) | undefined, hooks?: (() => Promise<any>)[] | undefined, failedMessage?: string | undefined, validateErrCb?: (() => void) | undefined, throwErrors?: boolean | undefined) => Promise<any>;
@@ -7402,7 +7402,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         setTopStore(value: any): void;
         initData(data?: object, skipSetPristine?: boolean): void;
         reset(): void;
-        updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
+        updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
         changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
         setCurrentAction(action: object): void;
         openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -7419,7 +7419,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         markBusying: (busying?: boolean) => void;
         fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
         fetchData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
-        reInitData: (data: object | undefined, replace?: boolean) => void;
+        reInitData: (data: object | undefined, replace?: boolean, concatFields?: string | string[] | undefined) => void;
         updateMessage: (msg?: string | undefined, error?: boolean) => void;
         clearMessage: () => void;
         setHasRemoteData: () => void;
@@ -12550,7 +12550,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         readonly persistKey: string;
     } & {
         setInited: (value: boolean) => void;
-        setValues: (values: object, tag?: object | undefined, replace?: boolean | undefined) => void;
+        setValues: (values: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined) => void;
         setValueByName: (name: string, value: any, isPristine?: boolean, force?: boolean) => void;
         trimValues: () => void;
         submit: (fn?: ((values: object) => Promise<any>) | undefined, hooks?: (() => Promise<any>)[] | undefined, failedMessage?: string | undefined, validateErrCb?: (() => void) | undefined, throwErrors?: boolean | undefined) => Promise<any>;

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/store/crud.d.ts

@@ -77,7 +77,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
-    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
+    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
     setCurrentAction(action: object): void;
     openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -94,7 +94,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     markBusying: (busying?: boolean) => void;
     fetchInitData: (api: Api, data?: object | undefined, options?: fetchOptions | undefined) => Promise<any>;
     fetchData: (api: Api, data?: object | undefined, options?: fetchOptions | undefined) => Promise<any>;
-    reInitData: (data: object | undefined, replace?: boolean) => void;
+    reInitData: (data: object | undefined, replace?: boolean, concatFields?: string | string[] | undefined) => void;
     updateMessage: (msg?: string | undefined, error?: boolean) => void;
     clearMessage: () => void;
     setHasRemoteData: () => void;
@@ -149,6 +149,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     }) => Promise<void>;
     updateColumns: (columns: Array<any>) => void;
     updateTotal: (total: number) => void;
+    resetSelection: () => void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type ICRUDStore = Instance<typeof CRUDStore>;
 export {};