amis-core 2.3.0 → 2.3.2-beta.1

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 
@@ -84,7 +84,6 @@ require('./actions/EmailAction.js');
 require('./actions/LinkAction.js');
 require('./actions/ToastAction.js');
 require('./actions/PageAction.js');
-var Decorators = require('./actions/Decorators.js');
 var Action = require('./actions/Action.js');
 var Item = require('./renderers/Item.js');
 var Options = require('./renderers/Options.js');
@@ -335,6 +334,7 @@ exports.bindEvent = rendererEvent.bindEvent;
 exports.createRendererEvent = rendererEvent.createRendererEvent;
 exports.dispatchEvent = rendererEvent.dispatchEvent;
 exports.getRendererEventListeners = rendererEvent.getRendererEventListeners;
+exports.resolveEventData = rendererEvent.resolveEventData;
 exports.replaceText = replaceText.replaceText;
 exports.getComputedStyle = resizeSensor.getComputedStyle;
 exports.resizeSensor = resizeSensor.resizeSensor;
@@ -379,8 +379,6 @@ exports.makeClassnames = theme.makeClassnames;
 exports.setDefaultTheme = theme.setDefaultTheme;
 exports.theme = theme.theme;
 exports.themeable = theme.themeable;
-exports.bindRendererEvent = Decorators.bindRendererEvent;
-exports.rendererEventDispatcher = Decorators.rendererEventDispatcher;
 Object.defineProperty(exports, 'LoopStatus', {
     enumerable: true,
     get: function () { return Action.LoopStatus; }

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/@restart/hooks/esm/useCommittedRef.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/@restart/hooks/esm/useEventCallback.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/addEventListener.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/canUseDOM.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/contains.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/listen.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/ownerDocument.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/removeEventListener.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/object-assign/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/checkPropTypes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/factoryWithThrowingShims.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/factoryWithTypeCheckers.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/lib/ReactPropTypesSecret.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/lib/has.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/node_modules/react-is/cjs/react-is.development.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/node_modules/react-is/cjs/react-is.production.min.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/node_modules/react-is/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/react-overlays/esm/Portal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/react-overlays/esm/ownerDocument.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/react-overlays/esm/safeFindDOMNode.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/react-overlays/esm/useRootClose.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/react-overlays/esm/useWaitForDOMRef.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/warning/warning.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/renderers/Form.d.ts

@@ -320,14 +320,14 @@ export default class Form extends React.Component<FormProps, object> {
     beforePageUnload(e: any): any;
     onInit(): Promise<void>;
     reload(subPath?: string, query?: any, ctx?: any, silent?: boolean): void;
-    receive(values: object): void;
+    receive(values: object, name?: string, replace?: boolean): void;
     silentReload(target?: string, query?: any): void;
     initInterval(value: any): any;
     isValidated(): boolean;
     validate(forceValidate?: boolean): Promise<boolean>;
     clearErrors(): void;
     getValues(): any;
-    setValues(value: any): void;
+    setValues(value: any, replace?: boolean): void;
     submit(fn?: (values: object) => Promise<any>): Promise<any>;
     flush(): void;
     reset(): void;
@@ -369,7 +369,7 @@ export declare class FormRenderer extends Form {
     submitToTarget(target: string, values: object): void;
     reloadTarget(target: string, data: any): void;
     closeTarget(target: string): void;
-    reload(target?: string, query?: any, ctx?: any, silent?: boolean): void;
-    receive(values: object, name?: string): void;
-    setData(values: object): void;
+    reload(target?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
+    receive(values: object, name?: string, replace?: boolean): void;
+    setData(values: object, replace?: boolean): void;
 }

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 
@@ -275,9 +275,9 @@ var Form = /** @class */ (function (_super) {
             })
             : store.reset(undefined, false);
     };
-    Form.prototype.receive = function (values) {
+    Form.prototype.receive = function (values, name, replace) {
         var store = this.props.store;
-        store.updateData(values);
+        store.updateData(values, undefined, replace);
         this.reload();
     };
     Form.prototype.silentReload = function (target, query) {
@@ -319,10 +319,10 @@ var Form = /** @class */ (function (_super) {
         this.flush();
         return store.data;
     };
-    Form.prototype.setValues = function (value) {
+    Form.prototype.setValues = function (value, replace) {
         var store = this.props.store;
         this.flush();
-        store.setValues(value);
+        store.setValues(value, undefined, replace);
     };
     Form.prototype.submit = function (fn) {
         var _a = this.props, store = _a.store, messages = _a.messages, __ = _a.translate, dispatchEvent = _a.dispatchEvent, data = _a.data;
@@ -1117,9 +1117,9 @@ var FormRenderer = /** @class */ (function (_super) {
         var scoped = this.context;
         scoped.close(target);
     };
-    FormRenderer.prototype.reload = function (target, query, ctx, silent) {
+    FormRenderer.prototype.reload = function (target, query, ctx, silent, replace) {
         if (query) {
-            return this.receive(query);
+            return this.receive(query, undefined, replace);
         }
         var scoped = this.context;
         var subPath = '';
@@ -1151,7 +1151,7 @@ var FormRenderer = /** @class */ (function (_super) {
             _super.prototype.reload.call(this, target, query, ctx, silent);
         }
     };
-    FormRenderer.prototype.receive = function (values, name) {
+    FormRenderer.prototype.receive = function (values, name, replace) {
         if (name) {
             var scoped = this.context;
             var idx = name.indexOf('.');
@@ -1164,9 +1164,9 @@ var FormRenderer = /** @class */ (function (_super) {
             component && component.receive && component.receive(values, subPath);
             return;
         }
-        return _super.prototype.receive.call(this, values);
+        return _super.prototype.receive.call(this, values, undefined, replace);
     };
-    FormRenderer.prototype.setData = function (values) {
+    FormRenderer.prototype.setData = function (values, replace) {
         return _super.prototype.setValues.call(this, values);
     };
     FormRenderer.contextType = Scoped.ScopedContext;

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 
@@ -27,7 +27,30 @@ var findIndex = require('lodash/findIndex');
 var isPlainObject = require('lodash/isPlainObject');
 var normalizeOptions = require('../utils/normalizeOptions.js');
 var optionValueCompare = require('../utils/optionValueCompare.js');
+require('../utils/ColorScale.js');
+require('lodash/chunk');
+require('../utils/DataSchema.js');
+require('../utils/DataScope.js');
+require('../utils/debug.js');
+require('react-dom');
+require('../utils/errors.js');
+require('classnames');
+require('lodash/isObject');
+require('lodash/isString');
+require('lodash/isBoolean');
+require('../utils/image.js');
 var keyToPath = require('../utils/keyToPath.js');
+var rendererEvent = require('../utils/renderer-event.js');
+require('../utils/resize-sensor.js');
+require('../node_modules/dom-helpers/esm/addEventListener.js');
+require('../node_modules/warning/warning.js');
+require('../utils/SimpleMap.js');
+require('lodash/mapValues');
+require('lodash/camelCase');
+require('uncontrollable');
+require('hoist-non-react-statics');
+require('../utils/validations.js');
+require('../utils/Animation.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -160,19 +183,17 @@ function registerOptionsControl(config) {
         FormOptionsItem.prototype.dispatchOptionEvent = function (eventName, eventData) {
             if (eventData === void 0) { eventData = ''; }
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _a, dispatchEvent, options, data, rendererEvent;
+                var _a, dispatchEvent, options, rendererEvent$1;
                 return tslib.__generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options, data = _a.data;
-                            return [4 /*yield*/, dispatchEvent(eventName, object.createObject(data, {
-                                    value: eventData,
-                                    options: options
-                                }))];
+                            _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options;
+                            return [4 /*yield*/, dispatchEvent(eventName, rendererEvent.resolveEventData(this.props, { value: eventData, options: options, items: options }, // 为了保持名字统一
+                                'value'))];
                         case 1:
-                            rendererEvent = _b.sent();
+                            rendererEvent$1 = _b.sent();
                             // 返回阻塞标识
-                            return [2 /*return*/, !!(rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented)];
+                            return [2 /*return*/, !!(rendererEvent$1 === null || rendererEvent$1 === void 0 ? void 0 : rendererEvent$1.prevented)];
                     }
                 });
             });
@@ -205,19 +226,21 @@ function registerOptionsControl(config) {
                         })
                     }
                     : object.createObject(tslib.__assign(tslib.__assign({}, data), { ancestors: helper.getTreeAncestors(formItem.filteredOptions, selectedOptions[0], true) }), selectedOptions[0]));
+                var tmpData_1 = tslib.__assign({}, data);
+                var result_1 = tslib.__assign({}, toSync_1);
                 Object.keys(autoFill).forEach(function (key) {
                     var keys = keyToPath.keyToPath(key);
                     // 如果左边的 key 是一个路径
                     // 这里不希望直接把原始对象都给覆盖没了
                     // 而是保留原始的对象，只修改指定的属性
-                    if (keys.length > 1 && isPlainObject__default["default"](data[keys[0]])) {
-                        var obj = tslib.__assign({}, data[keys[0]]);
+                    if (keys.length > 1 && isPlainObject__default["default"](tmpData_1[keys[0]])) {
                         var value = getVariable.getVariable(toSync_1, key);
-                        toSync_1[keys[0]] = obj;
-                        object.setVariable(toSync_1, key, value);
+                        // 存在情况：依次更新同一子路径的多个key，eg: a.b.c1 和 a.b.c2，所以需要同步更新data
+                        object.setVariable(tmpData_1, key, value);
+                        result_1[keys[0]] = tmpData_1[keys[0]];
                     }
                 });
-                onBulkChange(toSync_1);
+                onBulkChange(result_1);
             }
         };
         // 当前值，跟设置预期的值格式不一致时自动转换。

package/lib/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/manager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/node.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/store/table.d.ts

@@ -344,14 +344,14 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         } & {
             readonly loading: boolean;
         } & {
-            markFetching: (fetching?: boolean) => void;
+            markFetching: (fetching?: boolean) => void; /** Group单元格显示名称，从1开始 */
             markSaving: (saving?: boolean) => void;
             markBusying: (busying?: boolean) => void;
-            fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
+            fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>; /** Group单元格包含的首列的索引值，范围[1, columns.length] */
             fetchData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
             reInitData: (data: object | undefined, replace?: boolean) => void;
             updateMessage: (msg?: string | undefined, error?: boolean) => void;
-            clearMessage: () => void;
+            clearMessage: () => void; /** Group单元格包含列数 */
             setHasRemoteData: () => void;
             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>;
@@ -4585,14 +4585,14 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         } & {
             readonly loading: boolean;
         } & {
-            markFetching: (fetching?: boolean) => void;
+            markFetching: (fetching?: boolean) => void; /** Group单元格显示名称，从1开始 */
             markSaving: (saving?: boolean) => void;
             markBusying: (busying?: boolean) => void;
-            fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
+            fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>; /** Group单元格包含的首列的索引值，范围[1, columns.length] */
             fetchData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
             reInitData: (data: object | undefined, replace?: boolean) => void;
             updateMessage: (msg?: string | undefined, error?: boolean) => void;
-            clearMessage: () => void;
+            clearMessage: () => void; /** Group单元格包含列数 */
             setHasRemoteData: () => void;
             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>;

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 
@@ -256,16 +256,8 @@ var TableStore = iRenderer.iRendererStore
         return self.columns.filter(function (item) {
             return (item &&
                 helper.isVisible(item.pristine, helper.hasVisibleExpression(item.pristine) ? self.data : {}) &&
-                (item.type === '__checkme'
-                    ? self.selectable &&
-                        !self.dragging &&
-                        !self.hideCheckToggler &&
-                        self.rows.length
-                    : item.type === '__dragme'
-                        ? self.dragging
-                        : item.type === '__expandme'
-                            ? (getFootableColumns().length || self.isNested) && !self.dragging
-                            : item.toggled || !item.toggable));
+                (item.toggled || !item.toggable) &&
+                !/^__/.test(item.type));
         });
     }
     function getFilteredColumns() {

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 

package/lib/theme.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.0
+ * amis-core v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */