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

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
@@ -69,14 +69,10 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         // 包两层，主要是为了处理以下 case
         // 里面放了个 form，form 提交过来的时候不希望把 items 这些发送过来。
         // 因为会把数据呈现在地址栏上。
-        return object.createObject(object.createObject(self.data, {
-            items: self.items.concat(),
-            selectedItems: self.selectedItems.concat(),
-            unSelectedItems: self.unSelectedItems.concat()
-        }), tslib.__assign({}, self.query));
+        return object.createObject(object.createObject(self.data, this.eventContext), tslib.__assign({}, self.query));
     },
     get mergedData() {
-        return object.extendObject(self.data, tslib.__assign(tslib.__assign(tslib.__assign({}, self.query), self.data), { selectedItems: self.selectedItems, unSelectedItems: self.unSelectedItems }));
+        return object.extendObject(self.data, tslib.__assign(tslib.__assign(tslib.__assign({}, self.query), this.eventContext), self.data));
     },
     get hasModalOpened() {
         return self.dialogOpen || self.drawerOpen || self.hasInnerModalOpen;
@@ -84,9 +80,24 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
     get selectedItemsAsArray() {
         return self.selectedItems.concat();
     },
+    get itemsAsArray() {
+        return self.items.concat();
+    },
     fetchCtxOf: function (data, options) {
         var _a;
         return object.createObject(data, tslib.__assign(tslib.__assign(tslib.__assign({}, self.query), (_a = {}, _a[options.pageField || 'page'] = self.page, _a[options.perPageField || 'perPage'] = self.perPage, _a)), data));
+    },
+    get eventContext() {
+        var context = {
+            items: self.items.concat(),
+            selectedItems: self.selectedItems.concat(),
+            unSelectedItems: self.unSelectedItems.concat(),
+            selectedIndexes: self.selectedItems.map(function (item) {
+                var _a;
+                return ((_a = helper.findTreeIndex(self.items, function (i) { return (item.__pristine || item) === (i.__pristine || i); })) === null || _a === void 0 ? void 0 : _a.join('.')) || '-1';
+            })
+        };
+        return context;
     }
 }); })
     .actions(function (self) {
@@ -502,14 +513,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         });
     };
     var getData = function (superData) {
-        return object.createObject(superData, {
-            total: self.total,
-            page: self.page,
-            perPage: self.perPage,
-            items: self.items.concat(),
-            selectedItems: self.selectedItems.concat(),
-            unSelectedItems: self.unSelectedItems.concat()
-        });
+        return object.createObject(superData, tslib.__assign({ total: self.total, page: self.page, perPage: self.perPage }, self.eventContext));
     };
     var updateColumns = function (columns) {
         self.columns = columns;
@@ -548,7 +552,10 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         exportAsCSV: exportAsCSV,
         updateColumns: updateColumns,
         updateTotal: updateTotal,
-        resetSelection: resetSelection
+        resetSelection: resetSelection,
+        replaceItems: function (items) {
+            self.items.replace(items);
+        }
     };
 });
 

package/lib/store/form.d.ts

@@ -252,7 +252,7 @@ export declare const FormStore: 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;
@@ -787,7 +787,7 @@ export declare const FormStore: 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;
@@ -1327,7 +1327,7 @@ export declare const FormStore: 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;
@@ -1862,7 +1862,7 @@ export declare const FormStore: 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;
@@ -2406,7 +2406,7 @@ export declare const FormStore: 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;
@@ -2941,7 +2941,7 @@ export declare const FormStore: 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;
@@ -3480,7 +3480,7 @@ export declare const FormStore: 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;
@@ -4015,7 +4015,7 @@ export declare const FormStore: 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;
@@ -4554,7 +4554,7 @@ export declare const FormStore: 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;
@@ -5089,7 +5089,7 @@ export declare const FormStore: 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;

package/lib/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
@@ -453,9 +453,11 @@ var FormStore = service.ServiceStore.named('FormStore')
         }, [self]);
     };
     // 10s 内不要重复弹同一个错误
-    var toastValidateError = throttle__default["default"](function (msg) {
+    var toastValidateError = throttle__default["default"](function (msg, validateError) {
         var env = mobxStateTree.getEnv(self);
-        env.notify('error', msg);
+        env.notify('error', msg, {
+            validateError: validateError
+        });
     }, 10000, {
         trailing: false,
         leading: true
@@ -492,7 +494,7 @@ var FormStore = service.ServiceStore.named('FormStore')
         });
     });
     var validate = mobxStateTree.flow(function validate(hooks, forceValidate, throwErrors, failedMessage, validateErrCb) {
-        var items, i, len, item, i, len, msg, e_2, msg, dispatcher;
+        var items, i, len, item, i, len, msg, e_2, msg, dispatcher, validateError;
         return tslib.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -581,7 +583,14 @@ var FormStore = service.ServiceStore.named('FormStore')
                     _a.label = 12;
                 case 12:
                     if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
-                        msg && toastValidateError(msg);
+                        validateError = new helper.ValidateError(failedMessage || self.__('Form.validateFailed'), self.errors, {
+                            items: self.items,
+                            msg: {
+                                customMsg: failedMessage,
+                                defaultMsg: self.__('Form.validateFailed')
+                            }
+                        });
+                        msg && toastValidateError(msg, validateError);
                     }
                     _a.label = 13;
                 case 13:

package/lib/store/formItem.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/store/iRenderer.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/store/index.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/store/list.d.ts

@@ -62,6 +62,8 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
         reset(): 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]>;
     selectedItems: 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>;
@@ -282,10 +284,21 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
         reset(): void;
         updateData({ children, ...rest }: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
+    /**
+     * 构建事件的上下文数据
+     * @param buildChain
+     * @returns
+     */
+    readonly eventContext: {
+        selectedItems: any[];
+        selectedIndexes: number[];
+        items: any[];
+        unSelectedItems: any[];
+    };
 } & {
     getData: (superData: any) => any;
     update: (config: Partial<SListStore>) => void;
-    initItems: (items: Array<object>) => void;
+    initItems: (items: Array<object>, fullItems?: Array<any>, fullSelectedItems?: Array<any>) => void;
     updateSelected: (selected: Array<any>, valueField?: string) => void;
     toggleAll: () => void;
     clearAll: () => void;

package/lib/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
@@ -43,12 +43,7 @@ var Item = mobxStateTree.types
     },
     get locals() {
         var listStore = mobxStateTree.getParent(self, 2);
-        return object.createObject(object.extendObject(listStore.data, {
-            index: self.index,
-            // 只有table时，也可以获取选中行
-            selectedItems: listStore.selectedItems.map(function (item) { return item.data; }),
-            unSelectedItems: listStore.unSelectedItems.map(function (item) { return item.data; })
-        }), self.data);
+        return object.createObject(object.extendObject(listStore.data, tslib.__assign({ index: self.index }, listStore.eventContext)), self.data);
     },
     get checkable() {
         var table = mobxStateTree.getParent(self, 2);
@@ -86,6 +81,11 @@ var ListStore = iRenderer.iRendererStore
     .named('ListStore')
     .props({
     items: mobxStateTree.types.array(Item),
+    // 记录原始列表和原始选中的列表
+    // 因为如果是前端分页，上层 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()), []),
     selectedItems: mobxStateTree.types.array(mobxStateTree.types.reference(Item)),
     primaryField: 'id',
     orderBy: '',
@@ -139,6 +139,36 @@ var ListStore = iRenderer.iRendererStore
         },
         get movedItems() {
             return getMovedItems();
+        },
+        /**
+         * 构建事件的上下文数据
+         * @param buildChain
+         * @returns
+         */
+        get eventContext() {
+            var context = {
+                selectedItems: self.selectedItems.map(function (item) { return item.data; }),
+                selectedIndexes: self.selectedItems.map(function (item) { return item.index; }),
+                items: self.items.map(function (item) { return item.data; }),
+                unSelectedItems: this.unSelectedItems.map(function (item) { return item.data; })
+            };
+            // 如果是前端分页情况，需要根据全量数据计算
+            // 如果不是前端分页，数据都没有返回，那种就没办法支持全量数据信息了
+            if (self.fullItems.length > self.items.length) {
+                // todo 这里的选择顺序会一直变，这个有影响吗?
+                var selectedItems_1 = self.fullSelectedItems
+                    .filter(function (item) {
+                    return !self.items.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) {
+                    return self.fullItems.indexOf(item.__pristine || item);
+                });
+            }
+            return context;
         }
     };
 })
@@ -158,7 +188,7 @@ var ListStore = iRenderer.iRendererStore
         config.itemDraggableOn === void 0 ||
             (self.itemDraggableOn = config.itemDraggableOn);
     }
-    function initItems(items) {
+    function initItems(items, fullItems, fullSelectedItems) {
         var arr = items.map(function (item, key) {
             item = object.isObject(item)
                 ? item
@@ -170,14 +200,16 @@ var ListStore = iRenderer.iRendererStore
                 id: helper.guid(),
                 index: key,
                 newIndex: key,
-                pristine: item,
-                data: item,
-                modified: false
+                pristine: item.__pristine || item,
+                data: item
             };
         });
         self.selectedItems.clear();
         self.items.replace(arr);
         self.dragging = false;
+        Array.isArray(fullItems) && self.fullItems.replace(fullItems);
+        Array.isArray(fullSelectedItems) &&
+            self.fullSelectedItems.replace(fullSelectedItems);
     }
     function updateSelected(selected, valueField) {
         self.selectedItems.clear();
@@ -261,11 +293,7 @@ var ListStore = iRenderer.iRendererStore
         self.items.replace(newItems);
     }
     function getData(superData) {
-        return object.createObject(superData, {
-            items: self.items.map(function (item) { return item.data; }),
-            selectedItems: self.selectedItems.map(function (item) { return item.data; }),
-            unSelectedItems: self.unSelectedItems.map(function (item) { return item.data; })
-        });
+        return object.createObject(superData, tslib.__assign({}, self.eventContext));
     }
     return {
         getData: getData,

package/lib/store/manager.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/store/modal.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/store/node.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/store/pagination.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/store/root.d.ts

@@ -1,4 +1,5 @@
 import { Instance } from 'mobx-state-tree';
+import { GlobalVariableItem, GlobalVariableState, GlobalVariableItemFull } from '../globalVar';
 export declare const RootStore: import("mobx-state-tree").IModelType<{
     id: import("mobx-state-tree").ISimpleType<string>;
     path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -34,6 +35,7 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     runtimeErrorStack: import("mobx-state-tree").IType<any, any, any>;
     query: import("mobx-state-tree").IType<any, any, any>;
     ready: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+    globalVarStates: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IMapType<import("mobx-state-tree").IType<GlobalVariableState, GlobalVariableState, GlobalVariableState>>, [undefined]>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -79,12 +81,23 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     checkRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
 } & {
     context: {};
+    globalVars: GlobalVariableItemFull[];
+    globalData: any;
 } & {
     readonly downStream: any;
 } & {
     updateContext(context: any): void;
+    updateGlobalVarState(key: string, state: Partial<GlobalVariableState>): void;
+    setGlobalVars: (vars?: Array<GlobalVariableItem>) => Promise<any>;
+    updateGlobalVarValue: (key: string, value: any) => void;
+    modifyGlobalVarValue: (key: string, options: {
+        op: 'set' | 'merge' | 'push' | 'unshift' | 'remove' | 'toggle' | 'empty' | 'sort' | 'reverse' | 'refresh';
+        value: any;
+    }) => void;
+    saveGlobalVarValues: import("lodash").DebouncedFunc<(key?: string) => Promise<void>>;
     setRuntimeError(error: any, errorStack: any): void;
     updateLocation(location?: any, parseFn?: Function): void;
     init: (schema: any) => Promise<any>;
+    afterDestroy(): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type IRootStore = Instance<typeof RootStore>;