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

package/esm/renderers/Item.d.ts

@@ -726,12 +726,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     } & {
         addStore(store: {
             [propName: string]: any;
-            storeType: string; /**
-             * 不设置时，当表单提交过后表单项每次修改都会触发重新验证，
-             * 如果设置了，则由此配置项来决定要不要每次修改都触发验证。
-             */
+            storeType: string;
             id: string;
-            path: string;
+            path: string; /**
+             * 是否只读
+             */
             parentId?: string | undefined;
         }): {
             id: string;
@@ -806,9 +805,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
-        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void; /**
-         * 配置 input className
-         */
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
     }, {
@@ -895,12 +892,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     } & {
         addStore(store: {
             [propName: string]: any;
-            storeType: string; /**
-             * 不设置时，当表单提交过后表单项每次修改都会触发重新验证，
-             * 如果设置了，则由此配置项来决定要不要每次修改都触发验证。
-             */
+            storeType: string;
             id: string;
-            path: string;
+            path: string; /**
+             * 是否只读
+             */
             parentId?: string | undefined;
         }): {
             id: string;
@@ -975,15 +971,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
-        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void; /**
-         * 配置 input className
-         */
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     ComposedComponent: React.ComponentType<any>;
 } & hoistNonReactStatic.NonReactStatics<any, {}> & {
-    ComposedComponent: any; /**
-     * label自定义宽度，默认单位为px
-     */
+    ComposedComponent: any;
 } & {
     ComposedComponent: any;
 };

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.3
  * Copyright 2018-2024 fex
  */
 
@@ -8,6 +8,8 @@ import React from 'react';
 import hoistNonReactStatic from 'hoist-non-react-statics';
 import { reaction } from 'mobx';
 import { isAlive } from 'mobx-state-tree';
+import { isGlobalVarExpression } from '../globalVar.js';
+import { resolveVariableAndFilter } from '../utils/resolveVariableAndFilter.js';
 import { registerRenderer, renderersMap } from '../factory.js';
 import { isEmpty, getTreeAncestors, ucFirst, getWidthRate, autobind, anyChanged } from '../utils/helper.js';
 import { observer } from 'mobx-react';
@@ -1099,7 +1101,20 @@ function asFormItem(config) {
 }
 function registerFormItem(config) {
     var Control = asFormItem(config)(config.component);
-    return registerRenderer(__assign(__assign({}, config), { weight: typeof config.weight !== 'undefined' ? config.weight : -100, component: Control, isFormItem: true }));
+    return registerRenderer(__assign(__assign({}, config), { weight: typeof config.weight !== 'undefined' ? config.weight : -100, component: Control, isFormItem: true, onGlobalVarChanged: function (instance, schema, data) {
+            var _a, _b, _c;
+            if (((_a = config.onGlobalVarChanged) === null || _a === void 0 ? void 0 : _a.apply(this, arguments)) === false) {
+                return false;
+            }
+            if (isGlobalVarExpression(schema.source)) {
+                (_c = (_b = instance.props).reloadOptions) === null || _c === void 0 ? void 0 : _c.call(_b);
+            }
+            // 目前表单项的全局变量更新要靠这个方式
+            if (isGlobalVarExpression(schema.value)) {
+                instance.props.onChange(resolveVariableAndFilter(schema.value, data, '| raw'));
+                return false;
+            }
+        } }));
 }
 function FormItem(config) {
     return function (component) {

package/esm/renderers/Options.js

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

package/esm/renderers/Placeholder.js

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

package/esm/renderers/builtin.js

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

package/esm/renderers/register.js

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

package/esm/renderers/wrapControl.js

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

package/esm/store/app.js

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

package/esm/store/combo.js

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

package/esm/store/crud.d.ts

@@ -111,10 +111,17 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     readonly mergedData: any;
     readonly hasModalOpened: boolean;
     readonly selectedItemsAsArray: any[];
+    readonly itemsAsArray: any[];
     fetchCtxOf(data: any, options: {
         pageField?: string;
         perPageField?: string;
     }): object;
+    readonly eventContext: {
+        items: any[];
+        selectedItems: any[];
+        unSelectedItems: any[];
+        selectedIndexes: string[];
+    };
 } & {
     getData: (superData: any) => any;
     updateSelectData: (selected: Array<any>, unSelected: Array<any>) => void;
@@ -155,6 +162,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     updateColumns: (columns: Array<any>) => void;
     updateTotal: (total: number) => void;
     resetSelection: () => void;
+    replaceItems(items: Array<any>): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type ICRUDStore = Instance<typeof CRUDStore>;
 export {};

package/esm/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.3
  * Copyright 2018-2024 fex
  */
 
@@ -7,7 +7,7 @@ import { __extends, __assign, __generator, __rest, __values, __awaiter } from 't
 import { saveAs } from 'file-saver';
 import { types, flow, getEnv, isAlive } from 'mobx-state-tree';
 import { ServiceStore } from './service.js';
-import { applyFilters, sortArray, isEmpty, isObjectShallowModified, qsstringify } from '../utils/helper.js';
+import { findTreeIndex, applyFilters, sortArray, isEmpty, isObjectShallowModified, qsstringify } from '../utils/helper.js';
 import pick from 'lodash/pick';
 import 'amis-formula';
 import 'moment';
@@ -61,14 +61,10 @@ var CRUDStore = ServiceStore.named('CRUDStore')
         // 包两层，主要是为了处理以下 case
         // 里面放了个 form，form 提交过来的时候不希望把 items 这些发送过来。
         // 因为会把数据呈现在地址栏上。
-        return createObject(createObject(self.data, {
-            items: self.items.concat(),
-            selectedItems: self.selectedItems.concat(),
-            unSelectedItems: self.unSelectedItems.concat()
-        }), __assign({}, self.query));
+        return createObject(createObject(self.data, this.eventContext), __assign({}, self.query));
     },
     get mergedData() {
-        return extendObject(self.data, __assign(__assign(__assign({}, self.query), self.data), { selectedItems: self.selectedItems, unSelectedItems: self.unSelectedItems }));
+        return extendObject(self.data, __assign(__assign(__assign({}, self.query), this.eventContext), self.data));
     },
     get hasModalOpened() {
         return self.dialogOpen || self.drawerOpen || self.hasInnerModalOpen;
@@ -76,9 +72,24 @@ var CRUDStore = ServiceStore.named('CRUDStore')
     get selectedItemsAsArray() {
         return self.selectedItems.concat();
     },
+    get itemsAsArray() {
+        return self.items.concat();
+    },
     fetchCtxOf: function (data, options) {
         var _a;
         return createObject(data, __assign(__assign(__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 = 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) {
@@ -494,14 +505,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
         });
     };
     var getData = function (superData) {
-        return createObject(superData, {
-            total: self.total,
-            page: self.page,
-            perPage: self.perPage,
-            items: self.items.concat(),
-            selectedItems: self.selectedItems.concat(),
-            unSelectedItems: self.unSelectedItems.concat()
-        });
+        return createObject(superData, __assign({ total: self.total, page: self.page, perPage: self.perPage }, self.eventContext));
     };
     var updateColumns = function (columns) {
         self.columns = columns;
@@ -540,7 +544,10 @@ var CRUDStore = ServiceStore.named('CRUDStore')
         exportAsCSV: exportAsCSV,
         updateColumns: updateColumns,
         updateTotal: updateTotal,
-        resetSelection: resetSelection
+        resetSelection: resetSelection,
+        replaceItems: function (items) {
+            self.items.replace(items);
+        }
     };
 });
 

package/esm/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.3
  * Copyright 2018-2024 fex
  */
 
@@ -439,9 +439,11 @@ var FormStore = ServiceStore.named('FormStore')
         }, [self]);
     };
     // 10s 内不要重复弹同一个错误
-    var toastValidateError = throttle(function (msg) {
+    var toastValidateError = throttle(function (msg, validateError) {
         var env = getEnv(self);
-        env.notify('error', msg);
+        env.notify('error', msg, {
+            validateError: validateError
+        });
     }, 10000, {
         trailing: false,
         leading: true
@@ -478,7 +480,7 @@ var FormStore = ServiceStore.named('FormStore')
         });
     });
     var validate = 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 __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -567,7 +569,14 @@ var FormStore = ServiceStore.named('FormStore')
                     _a.label = 12;
                 case 12:
                     if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
-                        msg && toastValidateError(msg);
+                        validateError = new 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/esm/store/formItem.js

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

package/esm/store/iRenderer.js

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

package/esm/store/index.js

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

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

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.3
  * Copyright 2018-2024 fex
  */
 
-import { __rest, __assign } from 'tslib';
+import { __assign, __rest } from 'tslib';
 import { types, getParent } from 'mobx-state-tree';
 import { iRendererStore } from './iRenderer.js';
 import isEqual from 'lodash/isEqual';
@@ -35,12 +35,7 @@ var Item = types
     },
     get locals() {
         var listStore = getParent(self, 2);
-        return createObject(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 createObject(extendObject(listStore.data, __assign({ index: self.index }, listStore.eventContext)), self.data);
     },
     get checkable() {
         var table = getParent(self, 2);
@@ -78,6 +73,11 @@ var ListStore = iRendererStore
     .named('ListStore')
     .props({
     items: types.array(Item),
+    // 记录原始列表和原始选中的列表
+    // 因为如果是前端分页，上层 crud 或者 input-table 下发到这层的
+    // 是某个页区间的数据，这个时候 items 和 selectedItems 会少很多条
+    fullItems: types.optional(types.array(types.frozen()), []),
+    fullSelectedItems: types.optional(types.array(types.frozen()), []),
     selectedItems: types.array(types.reference(Item)),
     primaryField: 'id',
     orderBy: '',
@@ -131,6 +131,36 @@ var ListStore = 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;
         }
     };
 })
@@ -150,7 +180,7 @@ var ListStore = 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 = isObject(item)
                 ? item
@@ -162,14 +192,16 @@ var ListStore = iRendererStore
                 id: 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();
@@ -253,11 +285,7 @@ var ListStore = iRendererStore
         self.items.replace(newItems);
     }
     function getData(superData) {
-        return 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 createObject(superData, __assign({}, self.eventContext));
     }
     return {
         getData: getData,

package/esm/store/manager.js

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

package/esm/store/modal.js

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

package/esm/store/node.js

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

package/esm/store/pagination.js

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

package/esm/store/root.d.ts

@@ -1,4 +1,6 @@
+/// <reference types="lodash" />
 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 +36,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 +82,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>;