amis-core 2.9.0 → 3.1.0

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -122,9 +122,25 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                                     // value可能为null、undefined、''、0
                                     value = getVariable.getVariable(self.query, key);
                                     if (value != null) {
-                                        items_1 = matchSorter.matchSorter(items_1, value, {
-                                            keys: [key]
-                                        });
+                                        if (Array.isArray(value)) {
+                                            if (value.length > 0) {
+                                                var arr_1 = tslib.__spreadArray([], tslib.__read(items_1), false);
+                                                var arrItems_1 = [];
+                                                value.forEach(function (item) {
+                                                    arrItems_1 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_1), false), tslib.__read(matchSorter.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.matchSorter(items_1, value, {
+                                                keys: [key]
+                                            });
+                                        }
                                     }
                                 }
                             });
@@ -226,14 +242,16 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                                         (value = getVariable.getVariable(self.query, key))) {
                                         if (Array.isArray(value)) {
                                             if (value.length > 0) {
-                                                var arr_1 = tslib.__spreadArray([], tslib.__read(filteredItems_1), false);
-                                                var arrItems_1 = [];
+                                                var arr_2 = tslib.__spreadArray([], tslib.__read(filteredItems_1), false);
+                                                var arrItems_2 = [];
                                                 value.forEach(function (item) {
-                                                    arrItems_1 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_1), false), tslib.__read(matchSorter.matchSorter(arr_1, item, {
+                                                    arrItems_2 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_2), false), tslib.__read(matchSorter.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 {
@@ -470,6 +488,9 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
     var updateColumns = function (columns) {
         self.columns = columns;
     };
+    var updateTotal = function (total) {
+        self.total = total || 0;
+    };
     return {
         getData: getData,
         updateSelectData: updateSelectData,
@@ -487,7 +508,8 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         setInnerModalOpened: setInnerModalOpened,
         initFromScope: initFromScope,
         exportAsCSV: exportAsCSV,
-        updateColumns: updateColumns
+        updateColumns: updateColumns,
+        updateTotal: updateTotal
     };
 });
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -167,7 +167,13 @@ var FormStore = service.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();
     }
@@ -179,7 +185,7 @@ var FormStore = service.ServiceStore.named('FormStore')
         var prev = self.data;
         var data = object.cloneObject(self.data);
         if (value !== origin) {
-            if (prev.__prev) {
+            if (prev.hasOwnProperty('__prev')) {
                 // 基于之前的 __prev 改
                 var prevData = object.cloneObject(prev.__prev);
                 object.setVariable(prevData, name, origin);
@@ -223,7 +229,7 @@ var FormStore = service.ServiceStore.named('FormStore')
     function deleteValueByName(name) {
         var prev = self.data;
         var data = object.cloneObject(self.data);
-        if (prev.__prev) {
+        if (prev.hasOwnProperty('__prev')) {
             // 基于之前的 __prev 改
             var prevData = object.cloneObject(prev.__prev);
             object.setVariable(prevData, name, getVariable.getVariable(prev, name));

package/lib/store/formItem.js

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

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -18,6 +18,35 @@ var dataMapping = require('../utils/dataMapping.js');
 require('../utils/filter.js');
 var SimpleMap = require('../utils/SimpleMap.js');
 var node = require('./node.js');
+require('../utils/api.js');
+require('../utils/ColorScale.js');
+require('react');
+require('lodash/chunk');
+require('../utils/DataSchema.js');
+require('../utils/DataScope.js');
+require('../utils/debug.js');
+require('react-dom');
+require('../utils/errors.js');
+require('../utils/tpl.js');
+require('lodash/isPlainObject');
+require('classnames');
+require('lodash/isObject');
+require('lodash/isString');
+require('lodash/isBoolean');
+require('lodash');
+require('../utils/image.js');
+require('../actions/Action.js');
+require('lodash/debounce');
+require('lodash/cloneDeep');
+require('../utils/resize-sensor.js');
+require('react-overlays/useRootClose');
+require('lodash/mapValues');
+require('lodash/camelCase');
+require('uncontrollable');
+require('hoist-non-react-statics');
+require('../utils/validations.js');
+require('../utils/resolveCondition.js');
+require('../utils/Animation.js');
 
 var iRendererStore = node.StoreNode.named('iRendererStore')
     .props({
@@ -45,7 +74,11 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
     var dialogCallbacks = new SimpleMap.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; }
@@ -85,7 +118,7 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             }
             var prev = self.data;
             var data = object.cloneObject(self.data);
-            if (prev.__prev) {
+            if (prev.hasOwnProperty('__prev')) {
                 // 基于之前的 __prev 改
                 var prevData = object.cloneObject(prev.__prev);
                 object.setVariable(prevData, name, origin);
@@ -131,13 +164,17 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             self.action = action;
         },
         openDialog: function (ctx, additonal, callback, scoped) {
-            var proto = ctx.__super ? ctx.__super : self.data;
+            var chain = object.extractObjectChain(ctx);
+            chain.length === 1 && chain.unshift(self.data);
             if (additonal) {
-                proto = object.createObject(proto, additonal);
+                chain.splice(chain.length - 1, 0, additonal);
             }
-            var data = object.createObject(proto, tslib.__assign({}, ctx));
+            var data = object.createObjectFromChain(chain);
             if (self.action.dialog && self.action.dialog.data) {
-                self.dialogData = dataMapping.dataMapping(self.action.dialog.data, data);
+                self.dialogData = object.createObjectFromChain([
+                    top === null || top === void 0 ? void 0 : top.context,
+                    dataMapping.dataMapping(self.action.dialog.data, data)
+                ]);
                 var clonedAction = tslib.__assign(tslib.__assign({}, self.action), { dialog: tslib.__assign({}, self.action.dialog) });
                 delete clonedAction.dialog.data;
                 self.action = clonedAction;
@@ -159,15 +196,19 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
             }
         },
         openDrawer: function (ctx, additonal, callback, scoped) {
-            var proto = ctx.__super ? ctx.__super : self.data;
+            var chain = object.extractObjectChain(ctx);
+            chain.length === 1 && chain.unshift(self.data);
             if (additonal) {
-                proto = object.createObject(proto, additonal);
+                chain.splice(chain.length - 1, 0, additonal);
             }
-            var data = object.createObject(proto, tslib.__assign({}, ctx));
+            var data = object.createObjectFromChain(chain);
             if (self.action.drawer.data) {
-                self.drawerData = dataMapping.dataMapping(self.action.drawer.data, data);
-                var clonedAction = tslib.__assign(tslib.__assign({}, self.action), { dialog: tslib.__assign({}, self.action.dialog) });
-                delete clonedAction.dialog.data;
+                self.drawerData = object.createObjectFromChain([
+                    top === null || top === void 0 ? void 0 : top.context,
+                    dataMapping.dataMapping(self.action.drawer.data, data)
+                ]);
+                var clonedAction = tslib.__assign(tslib.__assign({}, self.action), { drawer: tslib.__assign({}, self.action.drawer) });
+                delete clonedAction.drawer.data;
                 self.action = clonedAction;
             }
             else {

package/lib/store/index.js

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

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

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

package/lib/store/manager.js

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

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

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

package/lib/store/node.js

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

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,11 +8,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('../utils/helper.js');
+require('tslib');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
 var resolveVariable = require('../utils/resolveVariable.js');
-require('tslib');
 require('lodash/isPlainObject');
 require('../utils/filter.js');
 var iRenderer = require('./iRenderer.js');

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

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

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

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

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

@@ -0,0 +1,42 @@
+/**
+ * amis-core v3.1.0
+ * Copyright 2018-2023 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var mobxStateTree = require('mobx-state-tree');
+
+var StatusStore = mobxStateTree.types
+    .model('StatusStore', {
+    visibleState: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {}),
+    disableState: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {}),
+    staticState: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {})
+})
+    .actions(function (self) { return ({
+    setVisible: function (key, value) {
+        var _a;
+        var state = tslib.__assign(tslib.__assign({}, self.visibleState), (_a = {}, _a[key] = value, _a));
+        self.visibleState = state;
+    },
+    setDisable: function (key, value) {
+        var _a;
+        var state = tslib.__assign(tslib.__assign({}, self.disableState), (_a = {}, _a[key] = value, _a));
+        self.disableState = state;
+    },
+    setStatic: function (key, value) {
+        var _a;
+        var state = tslib.__assign(tslib.__assign({}, self.staticState), (_a = {}, _a[key] = value, _a));
+        self.staticState = state;
+    },
+    resetAll: function () {
+        self.visibleState = {};
+        self.disableState = {};
+        self.staticState = {};
+    }
+}); });
+
+exports.StatusStore = StatusStore;