amis-core 3.6.3 → 6.0.0

package/esm/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -19,6 +19,7 @@ import '../utils/filter.js';
 import { normalizeApiResponseData } from '../utils/api.js';
 import { matchSorter } from 'match-sorter';
 import { filter } from '../utils/tpl.js';
+import { TableStore } from './table.js';
 
 var ServerError = /** @class */ (function (_super) {
     __extends(ServerError, _super);
@@ -318,7 +319,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                             self.columns = options.columns;
                         }
                         self.items.replace(rowsData);
-                        self.reInitData(data_2, !!api.replaceData);
+                        self.reInitData(data_2, !!api.replaceData, api.concatDataFields);
                         options.syncResponse2Query !== false &&
                             updateQuery(pick(rest, Object.keys(self.query)), undefined, options.pageField || 'page', options.perPageField || 'perPage');
                         self.total = parseInt((_k = data_2.total) !== null && _k !== void 0 ? _k : data_2.count, 10) || 0;
@@ -383,7 +384,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                     if (!isEmpty(json.data) || json.ok) {
                         self.updateData(normalizeApiResponseData(json.data), {
                             __saved: Date.now()
-                        }, !!api && api.replaceData);
+                        }, !!api && api.replaceData, api === null || api === void 0 ? void 0 : api.concatDataFields);
                         self.updatedAt = Date.now();
                     }
                     if (!json.ok) {
@@ -602,6 +603,18 @@ var CRUDStore = ServiceStore.named('CRUDStore')
     var updateTotal = function (total) {
         self.total = total || 0;
     };
+    /** 非Picker模式下，重置当前CRUD的所有的已选择项目 */
+    var resetSelection = function () {
+        var _a, _b, _c, _d;
+        // 初始化CRUD记录的已选择项目和未选择项目
+        setSelectedItems([]);
+        setUnSelectedItems([]);
+        var tableStore = (_b = (_a = self === null || self === void 0 ? void 0 : self.children) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, function (s) { return s.storeType === TableStore.name; });
+        if (tableStore) {
+            // 清空Table记录的已选择项目
+            (_d = (_c = tableStore).clear) === null || _d === void 0 ? void 0 : _d.call(_c);
+        }
+    };
     return {
         getData: getData,
         updateSelectData: updateSelectData,
@@ -620,7 +633,8 @@ var CRUDStore = ServiceStore.named('CRUDStore')
         initFromScope: initFromScope,
         exportAsCSV: exportAsCSV,
         updateColumns: updateColumns,
-        updateTotal: updateTotal
+        updateTotal: updateTotal,
+        resetSelection: resetSelection
     };
 });
 

package/esm/store/form.d.ts

@@ -57,7 +57,7 @@ export declare const FormStore: 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;
@@ -74,7 +74,7 @@ export declare const FormStore: 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;
@@ -5206,7 +5206,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
     readonly persistKey: string;
 } & {
     setInited: (value: boolean) => void;
-    setValues: (values: object, tag?: object, replace?: boolean) => void;
+    setValues: (values: object, tag?: object, replace?: boolean, concatFields?: string | string[]) => void;
     setValueByName: (name: string, value: any, isPristine?: boolean, force?: boolean) => void;
     trimValues: () => void;
     submit: (fn?: ((values: object) => Promise<any>) | undefined, hooks?: Array<() => Promise<any>>, failedMessage?: string, validateErrCb?: () => void, throwErrors?: boolean) => Promise<any>;

package/esm/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -131,8 +131,8 @@ var FormStore = ServiceStore.named('FormStore')
     };
 })
     .actions(function (self) {
-    function setValues(values, tag, replace) {
-        self.updateData(values, tag, replace);
+    function setValues(values, tag, replace, concatFields) {
+        self.updateData(values, tag, replace, concatFields);
         // 如果数据域中有数据变化，就都reset一下，去掉之前残留的验证消息
         self.items.forEach(function (item) {
             if (item.extraName) {
@@ -301,7 +301,7 @@ var FormStore = ServiceStore.named('FormStore')
                             ? {
                                 __saved: Date.now()
                             }
-                            : undefined, !!api.replaceData);
+                            : undefined, !!api.replaceData, api.concatDataFields);
                     }
                     if (!!json.ok) return [3 /*break*/, 6];
                     if (json.status === 422 && json.errors) {
@@ -436,7 +436,7 @@ var FormStore = ServiceStore.named('FormStore')
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, , 5, 6]);
-                    return [4 /*yield*/, validate(hooks, undefined, true, failedMessage, validateErrCb)];
+                    return [4 /*yield*/, validate(hooks, true, true, failedMessage, validateErrCb)];
                 case 2:
                     _a.sent();
                     if (!fn) return [3 /*break*/, 4];

package/esm/store/formItem.js

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

package/esm/store/iRenderer.d.ts

@@ -36,7 +36,7 @@ export declare const iRendererStore: import("mobx-state-tree").IModelType<{
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
-    updateData(data?: object, tag?: object, replace?: boolean): void;
+    updateData(data?: object, tag?: object, replace?: boolean, concatFields?: string | string[]): void;
     changeValue(name: string, value: any, changePristine?: boolean, force?: boolean, otherModifier?: ((data: Object) => void) | undefined): void;
     setCurrentAction(action: object): void;
     openDialog(ctx: any, additonal?: object, callback?: ((ret: any) => void) | undefined, scoped?: IScopedContext): void;

package/esm/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -15,9 +15,11 @@ import '../utils/filter.js';
 import { SimpleMap } from '../utils/SimpleMap.js';
 import { StoreNode } from './node.js';
 import '../utils/api.js';
+import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'react';
 import 'lodash/chunk';
+import { concatData } from '../utils/concatData.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import '../utils/debug.js';
@@ -88,8 +90,11 @@ var iRendererStore = StoreNode.named('iRendererStore')
         reset: function () {
             self.data = self.pristine;
         },
-        updateData: function (data, tag, replace) {
+        updateData: function (data, tag, replace, concatFields) {
             if (data === void 0) { data = {}; }
+            if (concatFields) {
+                data = concatData(data, self.data, concatFields);
+            }
             var prev = self.data;
             var newData;
             if (tag) {

package/esm/store/index.js

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

package/esm/store/list.d.ts

@@ -103,7 +103,7 @@ export declare const ListStore: 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;

package/esm/store/list.js

@@ -1,12 +1,11 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
 import { types, getParent } from 'mobx-state-tree';
 import { iRendererStore } from './iRenderer.js';
 import isEqual from 'lodash/isEqual';
-import find from 'lodash/find';
 import { immutableExtends, guid } from '../utils/helper.js';
 import { evalExpression } from '../utils/tpl.js';
 import { createObject, extendObject, isObject } from '../utils/object.js';
@@ -166,19 +165,25 @@ var ListStore = iRendererStore
     }
     function updateSelected(selected, valueField) {
         self.selectedItems.clear();
-        self.items.forEach(function (item) {
-            if (~selected.indexOf(item.pristine)) {
-                self.selectedItems.push(item);
+        selected.forEach(function (item) {
+            var resolved = self.items.find(function (a) { return a.pristine === item; });
+            // 先严格比较，
+            if (!resolved) {
+                resolved = self.items.find(function (a) {
+                    var selectValue = item[valueField || 'value'];
+                    var itemValue = a.pristine[valueField || 'value'];
+                    return selectValue === itemValue;
+                });
             }
-            else if (find(selected, function (a) {
-                var selectValue = a[valueField || 'value'];
-                var itemValue = item.pristine[valueField || 'value'];
-                return self.strictMode
-                    ? selectValue === itemValue
-                    : selectValue == itemValue;
-            })) {
-                self.selectedItems.push(item);
+            // 再宽松比较
+            if (!resolved) {
+                resolved = self.items.find(function (a) {
+                    var selectValue = item[valueField || 'value'];
+                    var itemValue = a.pristine[valueField || 'value'];
+                    return selectValue == itemValue;
+                });
             }
+            resolved && self.selectedItems.push(resolved);
         });
     }
     function toggleAll() {

package/esm/store/manager.js

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

package/esm/store/modal.d.ts

@@ -50,7 +50,7 @@ export declare const ModalStore: 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;
@@ -67,7 +67,7 @@ export declare const ModalStore: 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;

package/esm/store/modal.js

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

package/esm/store/node.js

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

package/esm/store/pagination.d.ts

@@ -23,6 +23,7 @@ export declare const PaginationStore: import("mobx-state-tree").IModelType<{
     inputName: import("mobx-state-tree").IType<string | undefined, string, string>;
     outputName: import("mobx-state-tree").IType<string | undefined, string, string>;
     mode: import("mobx-state-tree").IType<string | undefined, string, string>;
+    ellipsisPageGap: import("mobx-state-tree").IType<number | undefined, number, number>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -41,7 +42,7 @@ export declare const PaginationStore: 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;

package/esm/store/pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -20,7 +20,8 @@ var PaginationStore = iRendererStore
     perPage: 10,
     inputName: '',
     outputName: '',
-    mode: 'normal'
+    mode: 'normal',
+    ellipsisPageGap: 5
 })
     .views(function (self) { return ({
     get inputItems() {

package/esm/store/root.d.ts

@@ -49,7 +49,7 @@ export declare const RootStore: 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;
@@ -66,7 +66,7 @@ export declare const RootStore: 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;

package/esm/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,12 +8,13 @@ import { types } from 'mobx-state-tree';
 import { parseQuery, isObjectShallowModified } from '../utils/helper.js';
 import { ServiceStore } from './service.js';
 import '../utils/api.js';
+import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'react';
 import 'lodash/chunk';
+import { extractObjectChain, createObjectFromChain } from '../utils/object.js';
 import 'amis-formula';
 import 'lodash/isPlainObject';
-import { extractObjectChain, createObjectFromChain } from '../utils/object.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import 'moment';

package/esm/store/service.d.ts

@@ -46,7 +46,7 @@ export declare const ServiceStore: 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;
@@ -63,7 +63,7 @@ export declare const ServiceStore: import("mobx-state-tree").IModelType<{
     markBusying: (busying?: boolean) => void;
     fetchInitData: (api: Api, data?: object, options?: fetchOptions) => Promise<any>;
     fetchData: (api: Api, data?: object, options?: fetchOptions) => Promise<any>;
-    reInitData: (data: object | undefined, replace?: boolean) => void;
+    reInitData: (data: object | undefined, replace?: boolean, concatFields?: string | string[]) => void;
     updateMessage: (msg?: string, error?: boolean) => void;
     clearMessage: () => void;
     setHasRemoteData: () => void;

package/esm/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -10,6 +10,7 @@ import { isEmpty } from '../utils/helper.js';
 import { ServerError } from '../utils/errors.js';
 import { normalizeApiResponseData } from '../utils/api.js';
 import { replaceText } from '../utils/replaceText.js';
+import { concatData } from '../utils/concatData.js';
 import { isObject, extendObject } from '../utils/object.js';
 
 var ServiceStore = iRendererStore
@@ -45,8 +46,11 @@ var ServiceStore = iRendererStore
         if (busying === void 0) { busying = true; }
         self.busying = busying;
     }
-    function reInitData(data, replace) {
+    function reInitData(data, replace, concatFields) {
         if (replace === void 0) { replace = false; }
+        if (concatFields) {
+            data = concatData(data, self.data, concatFields);
+        }
         var newData = extendObject(self.pristine, data, !replace);
         self.data = self.pristine = newData;
     }
@@ -92,7 +96,7 @@ var ServiceStore = iRendererStore
                     self.updatedAt = Date.now();
                     replace = !!api.replaceData;
                     data_1 = __assign(__assign({}, (replace ? {} : self.data)), normalizeApiResponseData(json.data));
-                    reInitData(data_1, replace);
+                    reInitData(data_1, replace, api.concatDataFields);
                     self.hasRemoteData = true;
                     if (!(options && options.onSuccess)) return [3 /*break*/, 4];
                     ret = options.onSuccess(json, data_1);
@@ -158,7 +162,7 @@ var ServiceStore = iRendererStore
                     if (!isEmpty(json.data) || json.ok) {
                         self.updatedAt = Date.now();
                         json.data &&
-                            self.updateData(normalizeApiResponseData(json.data), undefined, !!api.replaceData);
+                            self.updateData(normalizeApiResponseData(json.data), undefined, !!api.replaceData, api.concatDataFields);
                         self.hasRemoteData = true;
                     }
                     if (!!json.ok) return [3 /*break*/, 2];
@@ -229,7 +233,7 @@ var ServiceStore = iRendererStore
                     if (!isEmpty(json.data) || json.ok) {
                         self.updatedAt = Date.now();
                         json.data &&
-                            self.updateData(normalizeApiResponseData(json.data), undefined, !!api.replaceData);
+                            self.updateData(normalizeApiResponseData(json.data), undefined, !!api.replaceData, api.concatDataFields);
                     }
                     if (!!json.ok) return [3 /*break*/, 4];
                     if (!(options && options.onFailed)) return [3 /*break*/, 3];
@@ -343,7 +347,7 @@ var ServiceStore = iRendererStore
                                     }, normalizeApiResponseData(json.data));
                             self.schemaKey = '' + Date.now();
                             isObject(json.data.data) &&
-                                self.updateData(json.data.data, undefined, !!api.replaceData);
+                                self.updateData(json.data.data, undefined, !!api.replaceData, api.concatDataFields);
                         }
                         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));
                         // 配置了获取成功提示后提示，默认是空不会提示。
@@ -390,7 +394,7 @@ var ServiceStore = iRendererStore
                 case 2:
                     json = _a.sent();
                     json.ok &&
-                        self.updateData(json.data, undefined, !!api.replaceData);
+                        self.updateData(json.data, undefined, !!api.replaceData, api.concatDataFields);
                     if (!json.ok) {
                         throw new Error(json.msg);
                     }

package/esm/store/status.js

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

package/esm/store/table.d.ts

@@ -324,7 +324,7 @@ export declare const TableStore: 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;
@@ -456,7 +456,7 @@ export declare const TableStore: 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;
@@ -473,7 +473,7 @@ export declare const TableStore: 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;
@@ -5604,7 +5604,7 @@ export declare const TableStore: 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>;
@@ -5690,7 +5690,7 @@ export declare const TableStore: 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;
@@ -5707,7 +5707,7 @@ export declare const TableStore: 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;
@@ -10838,7 +10838,7 @@ export declare const TableStore: 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/esm/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -14,7 +14,6 @@ import { resolveVariableAndFilter } from '../utils/resolveVariableAndFilter.js';
 import 'lodash/isPlainObject';
 import '../utils/filter.js';
 import isEqual from 'lodash/isEqual';
-import find from 'lodash/find';
 import sortBy from 'lodash/sortBy';
 import { immutableExtends, flattenTree, findTree, eachTree, guid, isVisible, hasVisibleExpression, isBreakpoint, difference, sortArray } from '../utils/helper.js';
 import { evalExpression } from '../utils/tpl.js';
@@ -864,11 +863,18 @@ var TableStore = iRendererStore
                 className: 'Table-dragCell'
             });
             var originColumns_1 = self.columns.concat();
+            var ids_1 = [];
             columns = columns.map(function (item, index) {
                 var origin = item.id
                     ? originColumns_1.find(function (column) { return column.pristine.id === item.id; })
                     : originColumns_1[index];
-                return __assign(__assign({}, item), { id: (origin === null || origin === void 0 ? void 0 : origin.id) || guid(), index: index, width: (origin === null || origin === void 0 ? void 0 : origin.width) || 0, minWidth: (origin === null || origin === void 0 ? void 0 : origin.minWidth) || 0, realWidth: (origin === null || origin === void 0 ? void 0 : origin.realWidth) || 0, rawIndex: index - PARTITION_INDEX, type: item.type || 'plain', pristine: item.pristine || item, toggled: item.toggled !== false, breakpoint: item.breakpoint, isPrimary: index === PARTITION_INDEX });
+                var id = (origin === null || origin === void 0 ? void 0 : origin.id) || guid();
+                // 还不知道为何会出现这个，先用这种方式避免 id 重复
+                if (ids_1.includes(id)) {
+                    id = guid();
+                }
+                ids_1.push(id);
+                return __assign(__assign({}, item), { id: id, index: index, width: (origin === null || origin === void 0 ? void 0 : origin.width) || 0, minWidth: (origin === null || origin === void 0 ? void 0 : origin.minWidth) || 0, realWidth: (origin === null || origin === void 0 ? void 0 : origin.realWidth) || 0, rawIndex: index - PARTITION_INDEX, type: item.type || 'plain', pristine: item.pristine || item, toggled: item.toggled !== false, breakpoint: item.breakpoint, isPrimary: index === PARTITION_INDEX });
             });
             self.columns.replace(columns);
         }
@@ -1111,16 +1117,25 @@ var TableStore = iRendererStore
     }
     function updateSelected(selected, valueField) {
         self.selectedRows.clear();
-        eachTree(self.rows, function (item) {
-            if (~selected.indexOf(item.pristine)) {
-                self.selectedRows.push(item.id);
+        selected.forEach(function (item) {
+            var resolved = self.rows.find(function (a) { return a.pristine === item; });
+            // 先严格比较，
+            if (!resolved) {
+                resolved = self.rows.find(function (a) {
+                    var selectValue = item[valueField || 'value'];
+                    var itemValue = a.pristine[valueField || 'value'];
+                    return selectValue === itemValue;
+                });
             }
-            else if (find(selected, function (a) {
-                return a[valueField || 'value'] &&
-                    a[valueField || 'value'] == item.pristine[valueField || 'value'];
-            })) {
-                self.selectedRows.push(item.id);
+            // 再宽松比较
+            if (!resolved) {
+                resolved = self.rows.find(function (a) {
+                    var selectValue = item[valueField || 'value'];
+                    var itemValue = a.pristine[valueField || 'value'];
+                    return selectValue == itemValue;
+                });
             }
+            resolved && self.selectedRows.push(resolved);
         });
         updateCheckDisable();
     }