amis-core 2.9.0 → 3.1.0

package/esm/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -114,9 +114,25 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                                     // value可能为null、undefined、''、0
                                     value = getVariable(self.query, key);
                                     if (value != null) {
-                                        items_1 = matchSorter(items_1, value, {
-                                            keys: [key]
-                                        });
+                                        if (Array.isArray(value)) {
+                                            if (value.length > 0) {
+                                                var arr_1 = __spreadArray([], __read(items_1), false);
+                                                var arrItems_1 = [];
+                                                value.forEach(function (item) {
+                                                    arrItems_1 = __spreadArray(__spreadArray([], __read(arrItems_1), false), __read(matchSorter(arr_1, item, {
+                                                        keys: [key]
+                                                    })), false);
+                                                });
+                                                items_1 = items_1.filter(function (item) {
+                                                    return arrItems_1.find(function (a) { return a === item; });
+                                                });
+                                            }
+                                        }
+                                        else {
+                                            items_1 = matchSorter(items_1, value, {
+                                                keys: [key]
+                                            });
+                                        }
                                     }
                                 }
                             });
@@ -218,14 +234,16 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                                         (value = getVariable(self.query, key))) {
                                         if (Array.isArray(value)) {
                                             if (value.length > 0) {
-                                                var arr_1 = __spreadArray([], __read(filteredItems_1), false);
-                                                var arrItems_1 = [];
+                                                var arr_2 = __spreadArray([], __read(filteredItems_1), false);
+                                                var arrItems_2 = [];
                                                 value.forEach(function (item) {
-                                                    arrItems_1 = __spreadArray(__spreadArray([], __read(arrItems_1), false), __read(matchSorter(arr_1, item, {
+                                                    arrItems_2 = __spreadArray(__spreadArray([], __read(arrItems_2), false), __read(matchSorter(arr_2, item, {
                                                         keys: [key]
                                                     })), false);
                                                 });
-                                                filteredItems_1 = filteredItems_1.filter(function (item) { return arrItems_1.find(function (a) { return a === item; }); });
+                                                filteredItems_1 = filteredItems_1.filter(function (item) {
+                                                    return arrItems_2.find(function (a) { return a === item; });
+                                                });
                                             }
                                         }
                                         else {
@@ -462,6 +480,9 @@ var CRUDStore = ServiceStore.named('CRUDStore')
     var updateColumns = function (columns) {
         self.columns = columns;
     };
+    var updateTotal = function (total) {
+        self.total = total || 0;
+    };
     return {
         getData: getData,
         updateSelectData: updateSelectData,
@@ -479,7 +500,8 @@ var CRUDStore = ServiceStore.named('CRUDStore')
         setInnerModalOpened: setInnerModalOpened,
         initFromScope: initFromScope,
         exportAsCSV: exportAsCSV,
-        updateColumns: updateColumns
+        updateColumns: updateColumns,
+        updateTotal: updateTotal
     };
 });
 

package/esm/store/form.d.ts

@@ -54,6 +54,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;

package/esm/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -153,7 +153,13 @@ var FormStore = ServiceStore.named('FormStore')
     function setValues(values, tag, replace) {
         self.updateData(values, tag, replace);
         // 如果数据域中有数据变化，就都reset一下，去掉之前残留的验证消息
-        self.items.forEach(function (item) { return item.reset(); });
+        self.items.forEach(function (item) {
+            var value = item.value;
+            if (typeof value !== 'undefined' && value !== item.tmpValue) {
+                item.changeTmpValue(value);
+            }
+            item.reset();
+        });
         // 同步 options
         syncOptions();
     }
@@ -165,7 +171,7 @@ var FormStore = ServiceStore.named('FormStore')
         var prev = self.data;
         var data = cloneObject(self.data);
         if (value !== origin) {
-            if (prev.__prev) {
+            if (prev.hasOwnProperty('__prev')) {
                 // 基于之前的 __prev 改
                 var prevData = cloneObject(prev.__prev);
                 setVariable(prevData, name, origin);
@@ -209,7 +215,7 @@ var FormStore = ServiceStore.named('FormStore')
     function deleteValueByName(name) {
         var prev = self.data;
         var data = cloneObject(self.data);
-        if (prev.__prev) {
+        if (prev.hasOwnProperty('__prev')) {
             // 基于之前的 __prev 改
             var prevData = cloneObject(prev.__prev);
             setVariable(prevData, name, getVariable(prev, name));

package/esm/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -729,7 +729,7 @@ var FormItemStore = StoreNode.named('FormItemStore')
                 ? evalExpression(item.visibleOn, data) !== false
                 : item.hiddenOn
                     ? evalExpression(item.hiddenOn, data) !== true
-                    : item.visible !== false || item.hidden !== true;
+                    : item.visible !== false && item.hidden !== true;
         })
             .map(function (item, index) {
             var disabled = evalExpression(item.disabledOn, data);

package/esm/store/iRenderer.d.ts

@@ -33,6 +33,7 @@ export declare const iRendererStore: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object, replace?: boolean): void;

package/esm/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,12 +8,41 @@ import { types } from 'mobx-state-tree';
 import '../utils/helper.js';
 import 'amis-formula';
 import 'moment';
-import { createObject, extendObject, cloneObject, setVariable, deleteVariable } from '../utils/object.js';
+import { createObject, extendObject, cloneObject, setVariable, deleteVariable, extractObjectChain, createObjectFromChain } from '../utils/object.js';
 import { getVariable } from '../utils/getVariable.js';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';
 import { SimpleMap } from '../utils/SimpleMap.js';
 import { StoreNode } from './node.js';
+import '../utils/api.js';
+import '../utils/ColorScale.js';
+import 'react';
+import 'lodash/chunk';
+import '../utils/DataSchema.js';
+import '../utils/DataScope.js';
+import '../utils/debug.js';
+import 'react-dom';
+import '../utils/errors.js';
+import '../utils/tpl.js';
+import 'lodash/isPlainObject';
+import 'classnames';
+import 'lodash/isObject';
+import 'lodash/isString';
+import 'lodash/isBoolean';
+import 'lodash';
+import '../utils/image.js';
+import '../actions/Action.js';
+import 'lodash/debounce';
+import 'lodash/cloneDeep';
+import '../utils/resize-sensor.js';
+import 'react-overlays/useRootClose';
+import 'lodash/mapValues';
+import 'lodash/camelCase';
+import 'uncontrollable';
+import 'hoist-non-react-statics';
+import '../utils/validations.js';
+import '../utils/resolveCondition.js';
+import '../utils/Animation.js';
 
 var iRendererStore = StoreNode.named('iRendererStore')
     .props({
@@ -41,7 +70,11 @@ var iRendererStore = StoreNode.named('iRendererStore')
     var dialogCallbacks = new SimpleMap();
     var dialogScoped = null;
     var drawerScoped = null;
+    var top = null;
     return {
+        setTopStore: function (value) {
+            top = value;
+        },
         initData: function (data, skipSetPristine) {
             if (data === void 0) { data = {}; }
             if (skipSetPristine === void 0) { skipSetPristine = false; }
@@ -81,7 +114,7 @@ var iRendererStore = StoreNode.named('iRendererStore')
             }
             var prev = self.data;
             var data = cloneObject(self.data);
-            if (prev.__prev) {
+            if (prev.hasOwnProperty('__prev')) {
                 // 基于之前的 __prev 改
                 var prevData = cloneObject(prev.__prev);
                 setVariable(prevData, name, origin);
@@ -127,13 +160,17 @@ var iRendererStore = StoreNode.named('iRendererStore')
             self.action = action;
         },
         openDialog: function (ctx, additonal, callback, scoped) {
-            var proto = ctx.__super ? ctx.__super : self.data;
+            var chain = extractObjectChain(ctx);
+            chain.length === 1 && chain.unshift(self.data);
             if (additonal) {
-                proto = createObject(proto, additonal);
+                chain.splice(chain.length - 1, 0, additonal);
             }
-            var data = createObject(proto, __assign({}, ctx));
+            var data = createObjectFromChain(chain);
             if (self.action.dialog && self.action.dialog.data) {
-                self.dialogData = dataMapping(self.action.dialog.data, data);
+                self.dialogData = createObjectFromChain([
+                    top === null || top === void 0 ? void 0 : top.context,
+                    dataMapping(self.action.dialog.data, data)
+                ]);
                 var clonedAction = __assign(__assign({}, self.action), { dialog: __assign({}, self.action.dialog) });
                 delete clonedAction.dialog.data;
                 self.action = clonedAction;
@@ -155,15 +192,19 @@ var iRendererStore = StoreNode.named('iRendererStore')
             }
         },
         openDrawer: function (ctx, additonal, callback, scoped) {
-            var proto = ctx.__super ? ctx.__super : self.data;
+            var chain = extractObjectChain(ctx);
+            chain.length === 1 && chain.unshift(self.data);
             if (additonal) {
-                proto = createObject(proto, additonal);
+                chain.splice(chain.length - 1, 0, additonal);
             }
-            var data = createObject(proto, __assign({}, ctx));
+            var data = createObjectFromChain(chain);
             if (self.action.drawer.data) {
-                self.drawerData = dataMapping(self.action.drawer.data, data);
-                var clonedAction = __assign(__assign({}, self.action), { dialog: __assign({}, self.action.dialog) });
-                delete clonedAction.dialog.data;
+                self.drawerData = createObjectFromChain([
+                    top === null || top === void 0 ? void 0 : top.context,
+                    dataMapping(self.action.drawer.data, data)
+                ]);
+                var clonedAction = __assign(__assign({}, self.action), { drawer: __assign({}, self.action.drawer) });
+                delete clonedAction.drawer.data;
                 self.action = clonedAction;
             }
             else {

package/esm/store/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/list.d.ts

@@ -99,6 +99,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;

package/esm/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -33,8 +33,12 @@ var Item = types
         return self.index !== self.newIndex;
     },
     get locals() {
-        return createObject(extendObject(getParent(self, 2).data, {
-            index: self.index
+        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);
     },
     get checkable() {

package/esm/store/manager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/modal.d.ts

@@ -47,6 +47,7 @@ export declare const ModalStore: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;

package/esm/store/modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/node.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/pagination.d.ts

@@ -38,6 +38,7 @@ export declare const PaginationStore: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;

package/esm/store/pagination.js

@@ -1,14 +1,14 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
 import '../utils/helper.js';
+import 'tslib';
 import 'amis-formula';
 import 'moment';
 import { createObject } from '../utils/object.js';
 import { resolveVariable } from '../utils/resolveVariable.js';
-import 'tslib';
 import 'lodash/isPlainObject';
 import '../utils/filter.js';
 import { iRendererStore } from './iRenderer.js';

package/esm/store/root.d.ts

@@ -31,9 +31,6 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     runtimeError: import("mobx-state-tree").IType<any, any, any>;
     runtimeErrorStack: import("mobx-state-tree").IType<any, any, any>;
     query: import("mobx-state-tree").IType<any, any, any>;
-    visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-    disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-    staticState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -49,6 +46,7 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
@@ -75,13 +73,13 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     saveRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
     fetchSchema: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
     checkRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
+} & {
+    context: {};
 } & {
     readonly downStream: any;
 } & {
+    setContext(context: any): void;
     setRuntimeError(error: any, errorStack: any): void;
     updateLocation(location?: any, parseFn?: Function): void;
-    setVisible(id: string, value: boolean): void;
-    setDisable(id: string, value: boolean): void;
-    setStatic(id: string, value: boolean): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type IRootStore = Instance<typeof RootStore>;

package/esm/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -7,46 +7,75 @@ import { __assign } from 'tslib';
 import { types } from 'mobx-state-tree';
 import { parseQuery } from '../utils/helper.js';
 import { ServiceStore } from './service.js';
-import { createObject, extendObject } from '../utils/object.js';
+import '../utils/api.js';
+import '../utils/ColorScale.js';
+import 'react';
+import 'lodash/chunk';
+import 'amis-formula';
+import 'lodash/isPlainObject';
+import { extractObjectChain, createObjectFromChain } from '../utils/object.js';
+import '../utils/DataSchema.js';
+import '../utils/DataScope.js';
+import 'moment';
+import '../utils/debug.js';
+import 'react-dom';
+import '../utils/errors.js';
+import '../utils/tpl.js';
+import 'classnames';
+import '../utils/filter.js';
+import 'lodash/isObject';
+import 'lodash/isString';
+import 'lodash/isBoolean';
+import 'lodash';
+import '../utils/image.js';
+import '../actions/Action.js';
+import 'lodash/debounce';
+import 'lodash/cloneDeep';
+import '../utils/resize-sensor.js';
+import 'react-overlays/useRootClose';
+import '../utils/SimpleMap.js';
+import 'lodash/mapValues';
+import 'lodash/camelCase';
+import 'uncontrollable';
+import 'hoist-non-react-statics';
+import '../utils/validations.js';
+import '../utils/resolveCondition.js';
+import '../utils/Animation.js';
 
 var RootStore = ServiceStore.named('RootStore')
     .props({
     runtimeError: types.frozen(),
     runtimeErrorStack: types.frozen(),
-    query: types.frozen(),
-    visibleState: types.optional(types.frozen(), {}),
-    disableState: types.optional(types.frozen(), {}),
-    staticState: types.optional(types.frozen(), {})
+    query: types.frozen()
+})
+    .volatile(function (self) {
+    return {
+        context: {}
+    };
 })
     .views(function (self) { return ({
     get downStream() {
-        return self.query
-            ? createObject(extendObject(self.data && self.data.__super ? self.data.__super : null, __assign(__assign({}, self.query), { __query: self.query })), self.data)
-            : self.data;
+        var result = self.data;
+        if (self.context || self.query) {
+            var chain = extractObjectChain(result);
+            self.context && chain.unshift(self.context);
+            self.query &&
+                chain.splice(chain.length - 1, 0, __assign(__assign({}, self.query), { __query: self.query }));
+            result = createObjectFromChain(chain);
+        }
+        return result;
     }
 }); })
     .actions(function (self) { return ({
+    setContext: function (context) {
+        self.context = context;
+    },
     setRuntimeError: function (error, errorStack) {
         self.runtimeError = error;
         self.runtimeErrorStack = errorStack;
     },
     updateLocation: function (location, parseFn) {
         self.query = parseFn ? parseFn(location) : parseQuery(location);
-    },
-    setVisible: function (id, value) {
-        var _a;
-        var state = __assign(__assign({}, self.visibleState), (_a = {}, _a[id] = value, _a));
-        self.visibleState = state;
-    },
-    setDisable: function (id, value) {
-        var _a;
-        var state = __assign(__assign({}, self.disableState), (_a = {}, _a[id] = value, _a));
-        self.disableState = state;
-    },
-    setStatic: function (id, value) {
-        var _a;
-        var state = __assign(__assign({}, self.staticState), (_a = {}, _a[id] = value, _a));
-        self.staticState = state;
     }
 }); });
 

package/esm/store/service.d.ts

@@ -43,6 +43,7 @@ export declare const ServiceStore: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;

package/esm/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/status.d.ts

@@ -0,0 +1,12 @@
+import { Instance } from 'mobx-state-tree';
+export declare const StatusStore: import("mobx-state-tree").IModelType<{
+    visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    staticState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+}, {
+    setVisible(key: string, value?: boolean): void;
+    setDisable(key: string, value?: boolean): void;
+    setStatic(key: string, value?: boolean): void;
+    resetAll(): void;
+}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
+export type IStatusStore = Instance<typeof StatusStore>;

package/esm/store/status.js

@@ -0,0 +1,38 @@
+/**
+ * amis-core v3.1.0
+ * Copyright 2018-2023 fex
+ */
+
+import { __assign } from 'tslib';
+import { types } from 'mobx-state-tree';
+
+var StatusStore = types
+    .model('StatusStore', {
+    visibleState: types.optional(types.frozen(), {}),
+    disableState: types.optional(types.frozen(), {}),
+    staticState: types.optional(types.frozen(), {})
+})
+    .actions(function (self) { return ({
+    setVisible: function (key, value) {
+        var _a;
+        var state = __assign(__assign({}, self.visibleState), (_a = {}, _a[key] = value, _a));
+        self.visibleState = state;
+    },
+    setDisable: function (key, value) {
+        var _a;
+        var state = __assign(__assign({}, self.disableState), (_a = {}, _a[key] = value, _a));
+        self.disableState = state;
+    },
+    setStatic: function (key, value) {
+        var _a;
+        var state = __assign(__assign({}, self.staticState), (_a = {}, _a[key] = value, _a));
+        self.staticState = state;
+    },
+    resetAll: function () {
+        self.visibleState = {};
+        self.disableState = {};
+        self.staticState = {};
+    }
+}); });
+
+export { StatusStore };