amis-core 3.6.2 → 6.0.0

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -23,6 +23,7 @@ require('../utils/filter.js');
 var api = require('../utils/api.js');
 var matchSorter = require('match-sorter');
 var tpl = require('../utils/tpl.js');
+var table = require('./table.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -326,7 +327,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                             self.columns = options.columns;
                         }
                         self.items.replace(rowsData);
-                        self.reInitData(data_2, !!api$1.replaceData);
+                        self.reInitData(data_2, !!api$1.replaceData, api$1.concatDataFields);
                         options.syncResponse2Query !== false &&
                             updateQuery(pick__default["default"](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;
@@ -391,7 +392,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                     if (!helper.isEmpty(json.data) || json.ok) {
                         self.updateData(api.normalizeApiResponseData(json.data), {
                             __saved: Date.now()
-                        }, !!api$1 && api$1.replaceData);
+                        }, !!api$1 && api$1.replaceData, api$1 === null || api$1 === void 0 ? void 0 : api$1.concatDataFields);
                         self.updatedAt = Date.now();
                     }
                     if (!json.ok) {
@@ -610,6 +611,18 @@ var CRUDStore = service.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 === table.TableStore.name; });
+        if (tableStore) {
+            // 清空Table记录的已选择项目
+            (_d = (_c = tableStore).clear) === null || _d === void 0 ? void 0 : _d.call(_c);
+        }
+    };
     return {
         getData: getData,
         updateSelectData: updateSelectData,
@@ -628,7 +641,8 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         initFromScope: initFromScope,
         exportAsCSV: exportAsCSV,
         updateColumns: updateColumns,
-        updateTotal: updateTotal
+        updateTotal: updateTotal,
+        resetSelection: resetSelection
     };
 });
 

package/lib/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/lib/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -145,8 +145,8 @@ var FormStore = service.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) {
@@ -315,7 +315,7 @@ var FormStore = service.ServiceStore.named('FormStore')
                             ? {
                                 __saved: Date.now()
                             }
-                            : undefined, !!api$1.replaceData);
+                            : undefined, !!api$1.replaceData, api$1.concatDataFields);
                     }
                     if (!!json.ok) return [3 /*break*/, 6];
                     if (json.status === 422 && json.errors) {
@@ -450,7 +450,7 @@ var FormStore = service.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/lib/store/formItem.js

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

package/lib/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/lib/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -19,8 +19,10 @@ require('../utils/filter.js');
 var SimpleMap = require('../utils/SimpleMap.js');
 var node = require('./node.js');
 require('../utils/api.js');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
+var concatData = require('../utils/concatData.js');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
 require('../utils/debug.js');
@@ -95,8 +97,11 @@ var iRendererStore = node.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.concatData(data, self.data, concatFields);
+            }
             var prev = self.data;
             var newData;
             if (tag) {

package/lib/store/index.js

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

package/lib/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/lib/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -10,7 +10,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var mobxStateTree = require('mobx-state-tree');
 var iRenderer = require('./iRenderer.js');
 var isEqual = require('lodash/isEqual');
-var find = require('lodash/find');
 var helper = require('../utils/helper.js');
 var tpl = require('../utils/tpl.js');
 var object = require('../utils/object.js');
@@ -18,7 +17,6 @@ var object = require('../utils/object.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
-var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 
 var Item = mobxStateTree.types
     .model('Item', {
@@ -175,19 +173,25 @@ var ListStore = iRenderer.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__default["default"](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/lib/store/manager.js

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

package/lib/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/lib/store/modal.js

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

package/lib/store/node.js

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

package/lib/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/lib/store/pagination.js

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

package/lib/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/lib/store/root.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/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/lib/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -14,6 +14,7 @@ var helper = require('../utils/helper.js');
 var errors = require('../utils/errors.js');
 var api = require('../utils/api.js');
 var replaceText = require('../utils/replaceText.js');
+var concatData = require('../utils/concatData.js');
 var object = require('../utils/object.js');
 
 var ServiceStore = iRenderer.iRendererStore
@@ -49,8 +50,11 @@ var ServiceStore = iRenderer.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.concatData(data, self.data, concatFields);
+        }
         var newData = object.extendObject(self.pristine, data, !replace);
         self.data = self.pristine = newData;
     }
@@ -96,7 +100,7 @@ var ServiceStore = iRenderer.iRendererStore
                     self.updatedAt = Date.now();
                     replace = !!api$1.replaceData;
                     data_1 = tslib.__assign(tslib.__assign({}, (replace ? {} : self.data)), api.normalizeApiResponseData(json.data));
-                    reInitData(data_1, replace);
+                    reInitData(data_1, replace, api$1.concatDataFields);
                     self.hasRemoteData = true;
                     if (!(options && options.onSuccess)) return [3 /*break*/, 4];
                     ret = options.onSuccess(json, data_1);
@@ -162,7 +166,7 @@ var ServiceStore = iRenderer.iRendererStore
                     if (!helper.isEmpty(json.data) || json.ok) {
                         self.updatedAt = Date.now();
                         json.data &&
-                            self.updateData(api.normalizeApiResponseData(json.data), undefined, !!api$1.replaceData);
+                            self.updateData(api.normalizeApiResponseData(json.data), undefined, !!api$1.replaceData, api$1.concatDataFields);
                         self.hasRemoteData = true;
                     }
                     if (!!json.ok) return [3 /*break*/, 2];
@@ -233,7 +237,7 @@ var ServiceStore = iRenderer.iRendererStore
                     if (!helper.isEmpty(json.data) || json.ok) {
                         self.updatedAt = Date.now();
                         json.data &&
-                            self.updateData(api.normalizeApiResponseData(json.data), undefined, !!api$1.replaceData);
+                            self.updateData(api.normalizeApiResponseData(json.data), undefined, !!api$1.replaceData, api$1.concatDataFields);
                     }
                     if (!!json.ok) return [3 /*break*/, 4];
                     if (!(options && options.onFailed)) return [3 /*break*/, 3];
@@ -347,7 +351,7 @@ var ServiceStore = iRenderer.iRendererStore
                                     }, api.normalizeApiResponseData(json.data));
                             self.schemaKey = '' + Date.now();
                             object.isObject(json.data.data) &&
-                                self.updateData(json.data.data, undefined, !!api$1.replaceData);
+                                self.updateData(json.data.data, undefined, !!api$1.replaceData, api$1.concatDataFields);
                         }
                         updateMessage((_h = (_g = (_f = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _f === void 0 ? void 0 : _f.success) !== null && _g !== void 0 ? _g : json.msg) !== null && _h !== void 0 ? _h : (options && options.successMessage));
                         // 配置了获取成功提示后提示，默认是空不会提示。
@@ -394,7 +398,7 @@ var ServiceStore = iRenderer.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/lib/store/status.js

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

package/lib/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/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -18,7 +18,6 @@ var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 require('lodash/isPlainObject');
 require('../utils/filter.js');
 var isEqual = require('lodash/isEqual');
-var find = require('lodash/find');
 var sortBy = require('lodash/sortBy');
 var helper = require('../utils/helper.js');
 var tpl = require('../utils/tpl.js');
@@ -27,7 +26,6 @@ var manager = require('./manager.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
-var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 var sortBy__default = /*#__PURE__*/_interopDefaultLegacy(sortBy);
 
 /**
@@ -874,11 +872,18 @@ var TableStore = iRenderer.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 tslib.__assign(tslib.__assign({}, item), { id: (origin === null || origin === void 0 ? void 0 : origin.id) || helper.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) || helper.guid();
+                // 还不知道为何会出现这个，先用这种方式避免 id 重复
+                if (ids_1.includes(id)) {
+                    id = helper.guid();
+                }
+                ids_1.push(id);
+                return tslib.__assign(tslib.__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);
         }
@@ -1121,16 +1126,25 @@ var TableStore = iRenderer.iRendererStore
     }
     function updateSelected(selected, valueField) {
         self.selectedRows.clear();
-        helper.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__default["default"](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();
     }