amis-core 6.11.0-beta.1 → 6.11.0-beta.2

package/lib/store/table.d.ts

@@ -224,6 +224,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         resetDefered(): void;
         updateData({ children, ...rest }: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+    fullItems: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>, [undefined]>;
+    fullSelectedItems: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>, [undefined]>;
     selectedRows: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IReferenceType<import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
         id: import("mobx-state-tree").ISimpleType<string>;
@@ -294,6 +296,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     draggable: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     dragging: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     selectable: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+    showIndex: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     multiple: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     footable: import("mobx-state-tree").IType<any, any, any>;
     expandConfig: import("mobx-state-tree").IType<any, any, any>;
@@ -664,7 +667,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -1199,7 +1202,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -1738,7 +1741,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -2273,7 +2276,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -2817,7 +2820,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -3352,7 +3355,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -3891,7 +3894,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -4426,7 +4429,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -4965,7 +4968,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -5500,7 +5503,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -6162,7 +6165,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -6697,7 +6700,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -7236,7 +7239,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -7771,7 +7774,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -8315,7 +8318,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -8850,7 +8853,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -9389,7 +9392,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -9924,7 +9927,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -10463,7 +10466,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -10998,7 +11001,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 closeDialog: (confirmed?: any, result?: any) => void;
                 openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closePopOver: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "formInited" | "defaultValue" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -12810,7 +12813,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     /** 已选择item是否达到数量上限 */
     readonly isSelectionThresholdReached: boolean;
     readonly firstToggledColumnIndex: number | null;
-    getData: (superData: any) => any;
+    getData(superData: any): any;
     readonly columnGroup: {
         rowSpan: number;
         label: any;
@@ -13233,6 +13236,17 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         updateData({ children, ...rest }: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
     buildStyles(style: any): any;
+    /**
+     * 构建事件的上下文数据
+     * @param buildChain
+     * @returns
+     */
+    readonly eventContext: {
+        selectedItems: any[];
+        selectedIndexes: string[];
+        items: any[];
+        unSelectedItems: any[];
+    };
 } & {
     setTable: (ref: HTMLElement | null) => void;
     getTable: () => HTMLElement | null;
@@ -13242,7 +13256,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     updateColumns: (columns: Array<SColumn>) => void;
     initTableWidth: () => void;
     syncTableWidth: () => void;
-    initRows: (rows: Array<any>, getEntryId?: ((entry: any, index: number) => string) | undefined, reUseRow?: boolean | 'match') => void;
+    initRows: (rows: Array<any>, getEntryId?: ((entry: any, index: number) => string) | undefined, reUseRow?: boolean | 'match', fullItems?: Array<any>, fullSelectedItems?: Array<any>) => void;
     updateSelected: (selected: Array<any>, valueField?: string) => void;
     toggleAll: () => void;
     getSelectedRows: () => ({

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
@@ -239,14 +239,9 @@ var Row = mobxStateTree.types
         }
         var table = mobxStateTree.getParent(self, self.depth * 2);
         var parent = mobxStateTree.getParent(self, 2);
-        return object.createObject(object.extendObject(mobxStateTree.getParent(self, self.depth * 2).data, {
-            index: self.index,
+        return object.createObject(object.extendObject(mobxStateTree.getParent(self, self.depth * 2).data, tslib.__assign({ index: self.index, path: self.path, 
             // todo 以后再支持多层，目前先一层
-            parent: parent.storeType === Row.name ? parent.data : undefined,
-            // 只有table时，也可以获取选中行
-            selectedItems: table.selectedRows.map(function (item) { return item.data; }),
-            unSelectedItems: table.unSelectedRows.map(function (item) { return item.data; })
-        }), children
+            parent: parent.storeType === Row.name ? parent.data : undefined }, table.eventContext)), children
             ? tslib.__assign(tslib.__assign({}, self.data), { children: children }) : self.data);
     },
     get checkable() {
@@ -296,8 +291,12 @@ var Row = mobxStateTree.types
         var table = self.table;
         var row = self;
         table.toggle(row, checked);
-        table.toggleAncestors(row);
-        table.toggleDescendants(row, checked);
+        // 多选才需要处理祖先和后代
+        // 单选只处理自己就行了
+        if (table.multiple) {
+            table.toggleAncestors(row);
+            table.toggleDescendants(row, checked);
+        }
     },
     toggleExpanded: function () {
         mobxStateTree.getParent(self, self.depth * 2).toggleExpanded(self);
@@ -306,8 +305,16 @@ var Row = mobxStateTree.types
         mobxStateTree.getParent(self, self.depth * 2).setExpanded(self, expanded);
     },
     change: function (values, savePristine) {
-        self.data = helper.immutableExtends(self.data, values);
-        savePristine && (self.pristine = self.data);
+        var data = helper.immutableExtends(self.data, values);
+        Object.isExtensible(data) &&
+            Object.defineProperty(data, '__pristine', {
+                value: savePristine ? data : self.pristine,
+                enumerable: false,
+                configurable: false,
+                writable: false
+            });
+        self.data = data;
+        savePristine && (self.pristine = data);
     },
     reset: function () {
         self.newIndex = self.index;
@@ -369,9 +376,17 @@ var Row = mobxStateTree.types
     },
     updateData: function (_a) {
         var children = _a.children, rest = tslib.__rest(_a, ["children"]);
-        self.data = tslib.__assign(tslib.__assign({}, self.data), rest);
+        var data = tslib.__assign(tslib.__assign({}, self.data), rest);
+        Object.isExtensible(data) &&
+            Object.defineProperty(data, '__pristine', {
+                value: self.data.__pristine || self.pristine,
+                enumerable: false,
+                configurable: false,
+                writable: false
+            });
+        self.data = data;
         if (Array.isArray(children)) {
-            this.replaceChildren(initChildren(children, self.depth, self.index, self.id, self.path));
+            this.replaceChildren(initChildren(children, self.depth, self.index, self.id, "".concat(self.path, ".")));
         }
     }
 }); });
@@ -380,6 +395,11 @@ var TableStore = iRenderer.iRendererStore
     .props({
     columns: mobxStateTree.types.array(Column),
     rows: mobxStateTree.types.array(Row),
+    // 记录原始列表和原始选中的列表
+    // 因为如果是前端分页，上层 crud 或者 input-table 下发到这层的
+    // 是某个页区间的数据，这个时候 items 和 selectedItems 会少很多条
+    fullItems: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), []),
+    fullSelectedItems: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), []),
     selectedRows: mobxStateTree.types.array(mobxStateTree.types.reference(Row)),
     expandedRows: mobxStateTree.types.array(mobxStateTree.types.string),
     primaryField: 'id',
@@ -390,6 +410,7 @@ var TableStore = iRenderer.iRendererStore
     draggable: false,
     dragging: false,
     selectable: false,
+    showIndex: false,
     multiple: true,
     footable: mobxStateTree.types.frozen(),
     expandConfig: mobxStateTree.types.frozen(),
@@ -513,13 +534,6 @@ var TableStore = iRenderer.iRendererStore
     function getUnSelectedRows() {
         return helper.flattenTree(self.rows).filter(function (item) { return !item.checked; });
     }
-    function getData(superData) {
-        return object.createObject(superData, {
-            items: self.rows.map(function (item) { return item.data; }),
-            selectedItems: self.selectedRows.map(function (item) { return item.data; }),
-            unSelectedItems: getUnSelectedRows().map(function (item) { return item.data; })
-        });
-    }
     function hasColumnHidden() {
         return self.columns.findIndex(function (column) { return !column.toggled; }) !== -1;
     }
@@ -693,7 +707,9 @@ var TableStore = iRenderer.iRendererStore
         get firstToggledColumnIndex() {
             return getFirstToggledColumnIndex();
         },
-        getData: getData,
+        getData: function (superData) {
+            return object.createObject(superData, this.eventContext);
+        },
         get columnGroup() {
             return getColumnGroup();
         },
@@ -786,6 +802,37 @@ var TableStore = iRenderer.iRendererStore
                     column.realWidth + 'px';
             });
             return style;
+        },
+        /**
+         * 构建事件的上下文数据
+         * @param buildChain
+         * @returns
+         */
+        get eventContext() {
+            var context = {
+                selectedItems: self.selectedRows.map(function (item) { return item.data; }),
+                selectedIndexes: self.selectedRows.map(function (item) { return item.path; }),
+                items: self.rows.map(function (item) { return item.data; }),
+                unSelectedItems: this.unSelectedRows.map(function (item) { return item.data; })
+            };
+            // 如果是前端分页情况，需要根据全量数据计算
+            // 如果不是前端分页，数据都没有返回，那种就没办法支持全量数据信息了
+            if (self.fullItems.length > self.rows.length) {
+                // todo 这里的选择顺序会一直变，这个有影响吗?
+                var selectedItems_1 = self.fullSelectedItems
+                    .filter(function (item) {
+                    return !self.rows.find(function (row) { return row.pristine === (item.__pristine || item); });
+                })
+                    .concat(context.selectedItems);
+                context.selectedItems = selectedItems_1;
+                context.items = self.fullItems.concat();
+                context.unSelectedItems = self.fullItems.filter(function (item) { return !selectedItems_1.includes(item); });
+                context.selectedIndexes = selectedItems_1.map(function (item) {
+                    var _a;
+                    return ((_a = helper.findTreeIndex(self.fullItems, function (i) { return (item.__pristine || item) === (i.__pristine || i); })) === null || _a === void 0 ? void 0 : _a.join('.')) || '-1';
+                });
+            }
+            return context;
         }
     };
 })
@@ -844,6 +891,7 @@ var TableStore = iRenderer.iRendererStore
             (self.lazyRenderAfter = config.lazyRenderAfter);
         typeof config.tableLayout === 'string' &&
             (self.tableLayout = config.tableLayout);
+        config.showIndex !== undefined && (self.showIndex = config.showIndex);
         if (config.columns && Array.isArray(config.columns)) {
             var columns = config.columns
                 .map(function (column) {
@@ -885,6 +933,12 @@ var TableStore = iRenderer.iRendererStore
                     label: '空'
                 });
             }
+            if (self.showIndex) {
+                columns.unshift({
+                    type: '__index',
+                    width: 50
+                });
+            }
             columns.unshift({
                 type: '__expandme',
                 toggable: false,
@@ -1061,7 +1115,7 @@ var TableStore = iRenderer.iRendererStore
         }
         return combineCell(arr, keys);
     }
-    function initRows(rows, getEntryId, reUseRow) {
+    function initRows(rows, getEntryId, reUseRow, fullItems, fullSelectedItems) {
         self.selectedRows.clear();
         // self.expandedRows.clear();
         /* 避免输入内容为非数组挂掉 */
@@ -1081,7 +1135,7 @@ var TableStore = iRenderer.iRendererStore
                 depth: 1,
                 index: index,
                 newIndex: index,
-                pristine: item,
+                pristine: item.__pristine || item,
                 path: "".concat(index),
                 data: item,
                 rowSpans: {},
@@ -1120,6 +1174,9 @@ var TableStore = iRenderer.iRendererStore
             }
         }
         self.dragging = false;
+        Array.isArray(fullItems) && self.fullItems.replace(fullItems);
+        Array.isArray(fullSelectedItems) &&
+            self.fullSelectedItems.replace(fullSelectedItems);
     }
     // 获取所有层级的子节点id
     function getExpandAllRows(arr) {
@@ -1315,7 +1372,7 @@ var TableStore = iRenderer.iRendererStore
             return;
         }
         var maxLength = self.getSelectionUpperLimit();
-        var selectedItems = self.data.selectedItems;
+        var selectedItems = self.selectedRows.map(function (item) { return item.data; });
         self.selectedRows.map(function (item) { return item.setCheckdisable(false); });
         if (maxLength !== Infinity && maxLength <= selectedItems.length) {
             self.unSelectedRows.map(function (item) { return !item.checked && item.setCheckdisable(true); });

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/theme.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/types.d.ts

@@ -2,7 +2,7 @@
 import type { JSONSchema7 } from 'json-schema';
 import { ListenerAction } from './actions/Action';
 import { debounceConfig, trackConfig } from './utils/renderer-event';
-import type { TestIdBuilder } from './utils/helper';
+import type { TestIdBuilder, ValidateError } from './utils/helper';
 import { AnimationsProps } from './utils/animations';
 export interface Option {
     /**
@@ -281,7 +281,7 @@ export interface Definitions {
     [propName: string]: SchemaNode;
 }
 export interface ActionObject extends ButtonObject {
-    actionType?: 'submit' | 'copy' | 'reload' | 'ajax' | 'saveAs' | 'dialog' | 'drawer' | 'confirmDialog' | 'jump' | 'link' | 'url' | 'email' | 'close' | 'confirm' | 'add' | 'remove' | 'delete' | 'edit' | 'cancel' | 'next' | 'prev' | 'reset' | 'validate' | 'reset-and-submit' | 'clear' | 'clear-and-submit' | 'toast' | 'goto-step' | 'goto-image' | 'expand' | 'collapse' | 'step-submit' | 'select' | 'selectAll' | 'clearAll' | 'changeTabKey' | 'clearSearch' | 'submitQuickEdit' | 'initDrag' | 'cancelDrag' | 'toggleExpanded' | 'setExpanded';
+    actionType?: 'submit' | 'copy' | 'reload' | 'ajax' | 'saveAs' | 'dialog' | 'drawer' | 'confirmDialog' | 'jump' | 'link' | 'url' | 'email' | 'close' | 'confirm' | 'add' | 'remove' | 'delete' | 'edit' | 'cancel' | 'next' | 'prev' | 'reset' | 'validate' | 'reset-and-submit' | 'clear' | 'clear-and-submit' | 'toast' | 'goto-step' | 'goto-image' | 'expand' | 'collapse' | 'step-submit' | 'select' | 'selectAll' | 'clearAll' | 'changeTabKey' | 'clearSearch' | 'submitQuickEdit' | 'initDrag' | 'cancelDrag' | 'toggleExpanded' | 'setExpanded' | 'clearError';
     api?: BaseApiObject | string;
     asyncApi?: BaseApiObject | string;
     payload?: any;
@@ -390,6 +390,7 @@ export type ToastConf = {
     className?: string;
     items?: Array<any>;
     useMobileUI?: boolean;
+    validateError?: ValidateError;
 };
 export interface OptionProps {
     className?: string;

package/lib/utils/Animation.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/ColorScale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/DataSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/DataScope.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/RootClose.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/SimpleMap.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/animations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/api.d.ts

@@ -48,6 +48,7 @@ export declare function isApiOutdatedWithData(prevApi: Api | undefined, nextApi:
 export declare function isApiOutdated(prevApi: Api | undefined, nextApi: Api | undefined, prevData: any, nextData: any): nextApi is Api;
 export declare function isValidApi(api: string): boolean;
 export declare function isEffectiveApi(api?: Api, data?: any, initFetch?: boolean, initFetchOn?: string): api is Api;
+export declare function shouldBlockedBySendOnApi(api?: Api, data?: any): boolean;
 export declare function isSameApi(apiA: ApiObject | ApiCacheConfig, apiB: ApiObject | ApiCacheConfig): boolean;
 export declare function getApiCache(api: ApiObject): ApiCacheConfig | undefined;
 export declare function setApiCache(api: ApiObject, promise: Promise<any>): Promise<any>;

package/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
@@ -169,9 +169,13 @@ function buildApi(api, data, options) {
         }
         return apiObject;
     };
+    var queryMapped = false;
     if (~idx) {
         var hashIdx = url.indexOf('#');
         var params = helper.qsparse(url.substring(idx + 1, ~hashIdx && hashIdx > idx ? hashIdx : undefined));
+        // 合并 api.query 的配置
+        params = dataMapping.dataMapping(Object.assign(params, api.query), data, undefined, api.convertKeyToPath);
+        queryMapped = true;
         // 将里面的表达式运算完
         helper.JSONTraverse(params, function (value, key, host) {
             var _a;
@@ -183,13 +187,12 @@ function buildApi(api, data, options) {
                 host[key] = replaceExpression(host[key], 'raw', '');
             }
         });
+        api.query = params;
         var left = replaceExpression(url.substring(0, idx), 'raw', '');
-        // 追加
-        Object.assign(params, api.query);
         api.url =
             left +
                 (~left.indexOf('?') ? '&' : '?') +
-                queryStringify((api.query = dataMapping.dataMapping(params, data, undefined, api.convertKeyToPath))) +
+                queryStringify(api.query) +
                 (~hashIdx && hashIdx > idx
                     ? replaceExpression(url.substring(hashIdx))
                     : '');
@@ -210,7 +213,7 @@ function buildApi(api, data, options) {
         api.body = api.data = data;
     }
     // 给 query 做数据映射
-    if (api.query) {
+    if (api.query && !queryMapped) {
         api.query = dataMapping.dataMapping(api.query, data, undefined, api.convertKeyToPath);
     }
     // get 类请求，把 data 附带到 url 上。
@@ -778,6 +781,15 @@ function isEffectiveApi(api, data, initFetch, initFetchOn) {
     }
     return false;
 }
+// 判断api是否存在，且SendOn为不发送
+function shouldBlockedBySendOnApi(api, data) {
+    if (object.isObject(api) && api.url) {
+        if (api.sendOn && data) {
+            return !tpl.evalExpression(api.sendOn, data);
+        }
+    }
+    return false;
+}
 function isSameApi(apiA, apiB) {
     return (apiA.method === apiB.method &&
         apiA.url === apiB.url &&
@@ -843,6 +855,7 @@ exports.removeApiRequestAdaptor = removeApiRequestAdaptor;
 exports.removeApiResponseAdaptor = removeApiResponseAdaptor;
 exports.responseAdaptor = responseAdaptor;
 exports.setApiCache = setApiCache;
+exports.shouldBlockedBySendOnApi = shouldBlockedBySendOnApi;
 exports.str2AsyncFunction = str2AsyncFunction;
 exports.str2function = str2function;
 exports.wrapAdaptor = wrapAdaptor;

package/lib/utils/arraySlice.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */