amis-core 6.9.0 → 6.10.0-beta.0

package/esm/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -40,15 +40,20 @@ function position(node, offsetParent$1) {
         }
         if (nodeName(parent_1) !== 'html')
             parentOffset = offset(parent_1);
-        var borderTop = String(getComputedStyle(parent_1).getPropertyValue('border-top-width') || 0);
+        var parentStyle = getComputedStyle(parent_1);
+        var borderTop = String(parentStyle.getPropertyValue('border-top-width') || 0);
         parentOffset.top += parseInt(borderTop, 10) - parent_1.scrollTop || 0;
-        var borderLeft = String(getComputedStyle(parent_1).getPropertyValue('border-left-width') || 0);
+        var borderLeft = String(parentStyle.getPropertyValue('border-left-width') || 0);
         parentOffset.left += parseInt(borderLeft, 10) - parent_1.scrollLeft || 0;
     }
-    var marginTop = String(getComputedStyle(node).getPropertyValue('margin-top') || 0);
-    var marginLeft = String(getComputedStyle(node).getPropertyValue('margin-left') || 0);
+    // const marginTop = String(
+    //   getComputedStyle(node).getPropertyValue('margin-top') || 0
+    // );
+    // const marginLeft = String(
+    //   getComputedStyle(node).getPropertyValue('margin-left') || 0
+    // );
     // Subtract parent offsets and node margins
-    return __assign(__assign({}, offset$1), { top: offset$1.top - parentOffset.top - (parseInt(marginTop, 10) || 0), left: offset$1.left - parentOffset.left - (parseInt(marginLeft, 10) || 0) });
+    return __assign(__assign({}, offset$1), { top: offset$1.top - parentOffset.top /*- (parseInt(marginTop, 10) || 0)*/, left: offset$1.left - parentOffset.left /* - (parseInt(marginLeft, 10) || 0)*/ });
 }
 
 export { position as default, position };

package/esm/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/printElement.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/renderer-event.d.ts

@@ -3,6 +3,7 @@ import { ListenerAction } from '../actions/Action';
 import { RendererProps } from '../factory';
 import { IScopedContext } from '../Scoped';
 import { TreeItem } from './helper';
+import type { PlainObject } from '../types';
 export interface debounceConfig {
     maxWait?: number;
     wait?: number;
@@ -59,7 +60,10 @@ export interface RendererEventContext {
 }
 export declare function createRendererEvent<T extends RendererEventContext>(type: string, context: T): RendererEvent<T>;
 export declare const bindEvent: (renderer: any) => ((eventName?: string) => void) | undefined;
+export declare const bindGlobalEventForRenderer: (renderer: any) => (() => void) | undefined;
+export declare const bindGlobalEvent: (eventName: string, callback: (data: PlainObject) => void) => (() => void) | undefined;
 export declare function dispatchEvent(e: string | React.MouseEvent<any>, renderer: React.Component<RendererProps>, scoped: IScopedContext, data: any, broadcast?: RendererEvent<any>): Promise<RendererEvent<any> | void>;
+export declare function dispatchGlobalEvent(eventName: string, data: any): Promise<void>;
 export declare const getRendererEventListeners: () => RendererEventListener[];
 /**
  * 兼容历史配置，追加对应name的值

package/esm/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -131,12 +131,80 @@ var bindEvent = function (renderer) {
     }
     return undefined;
 };
+var bindGlobalEventForRenderer = function (renderer) {
+    var e_2, _a;
+    if (!renderer) {
+        return undefined;
+    }
+    var listeners = renderer.props.$schema.onEvent;
+    var bcs = [];
+    if (listeners) {
+        var _loop_2 = function (key) {
+            var listener = listeners[key];
+            if (!BroadcastChannel) {
+                console.error('BroadcastChannel is not supported in your browser');
+                return { value: void 0 };
+            }
+            var bc = new BroadcastChannel(key);
+            bcs.push({
+                renderer: renderer,
+                bc: bc
+            });
+            bc.onmessage = function (e) {
+                var _a;
+                var _b = e.data, eventName = _b.eventName, data = _b.data;
+                var rendererEvent = createRendererEvent(eventName, {
+                    env: (_a = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _a === void 0 ? void 0 : _a.env,
+                    nativeEvent: eventName,
+                    scoped: renderer === null || renderer === void 0 ? void 0 : renderer.context,
+                    data: data
+                });
+                runActions(listener.actions, renderer, rendererEvent);
+            };
+        };
+        try {
+            for (var _b = __values(Object.keys(listeners)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var key = _c.value;
+                var state_1 = _loop_2(key);
+                if (typeof state_1 === "object")
+                    return state_1.value;
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        return function () {
+            bcs
+                .filter(function (item) { return item.renderer === renderer; })
+                .forEach(function (item) { return item.bc.close(); });
+        };
+    }
+    return void 0;
+};
+var bindGlobalEvent = function (eventName, callback) {
+    if (!BroadcastChannel) {
+        console.error('BroadcastChannel is not supported in your browser');
+        return;
+    }
+    var bc = new BroadcastChannel(eventName);
+    bc.onmessage = function (e) {
+        var _a = e.data, name = _a.eventName, data = _a.data;
+        if (name === eventName) {
+            callback(data);
+        }
+    };
+    return function () { return bc.close(); };
+};
 // 触发事件
 function dispatchEvent(e, renderer, scoped, data, broadcast) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     return __awaiter(this, void 0, void 0, function () {
-        var unbindEvent, eventName, eventConfig, rendererEvent, listeners, executedCount, checkExecuted, _loop_2, listeners_1, listeners_1_1, listener, state_1, e_2_1;
-        var e_2, _l;
+        var unbindEvent, eventName, eventConfig, rendererEvent, listeners, executedCount, checkExecuted, _loop_3, listeners_1, listeners_1_1, listener, state_2, e_3_1;
+        var e_3, _l;
         var _this = this;
         return __generator(this, function (_m) {
             switch (_m.label) {
@@ -179,7 +247,7 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                             unbindEvent === null || unbindEvent === void 0 ? void 0 : unbindEvent(eventName);
                         }
                     };
-                    _loop_2 = function (listener) {
+                    _loop_3 = function (listener) {
                         var _o, _p, wait, _q, trailing, _r, leading, _s, maxWait, debounced_1, _t, trackId, trackName;
                         return __generator(this, function (_u) {
                             switch (_u.label) {
@@ -243,10 +311,10 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                 case 2:
                     if (!!listeners_1_1.done) return [3 /*break*/, 5];
                     listener = listeners_1_1.value;
-                    return [5 /*yield**/, _loop_2(listener)];
+                    return [5 /*yield**/, _loop_3(listener)];
                 case 3:
-                    state_1 = _m.sent();
-                    if (state_1 === "break")
+                    state_2 = _m.sent();
+                    if (state_2 === "break")
                         return [3 /*break*/, 5];
                     _m.label = 4;
                 case 4:
@@ -254,20 +322,38 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                     return [3 /*break*/, 2];
                 case 5: return [3 /*break*/, 8];
                 case 6:
-                    e_2_1 = _m.sent();
-                    e_2 = { error: e_2_1 };
+                    e_3_1 = _m.sent();
+                    e_3 = { error: e_3_1 };
                     return [3 /*break*/, 8];
                 case 7:
                     try {
                         if (listeners_1_1 && !listeners_1_1.done && (_l = listeners_1.return)) _l.call(listeners_1);
                     }
-                    finally { if (e_2) throw e_2.error; }
+                    finally { if (e_3) throw e_3.error; }
                     return [7 /*endfinally*/];
                 case 8: return [2 /*return*/, Promise.resolve(rendererEvent)];
             }
         });
     });
 }
+function dispatchGlobalEvent(eventName, data) {
+    return __awaiter(this, void 0, void 0, function () {
+        var bc;
+        return __generator(this, function (_a) {
+            if (!BroadcastChannel) {
+                console.error('BroadcastChannel is not supported in your browser');
+                return [2 /*return*/];
+            }
+            bc = new BroadcastChannel(eventName);
+            bc.postMessage({
+                eventName: eventName,
+                data: data
+            });
+            bc.close();
+            return [2 /*return*/];
+        });
+    });
+}
 var getRendererEventListeners = function () {
     return rendererEventListeners;
 };
@@ -379,4 +465,4 @@ function getMatchedEventTargets(tree, ctx, index, condition, oldCondition) {
     });
 }
 
-export { bindEvent, createRendererEvent, dispatchEvent, getMatchedEventTargets, getRendererEventListeners, resolveEventData };
+export { bindEvent, bindGlobalEvent, bindGlobalEventForRenderer, createRendererEvent, dispatchEvent, dispatchGlobalEvent, getMatchedEventTargets, getRendererEventListeners, resolveEventData };

package/esm/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/validateId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -211,12 +211,14 @@ var validations = {
         return true;
     },
     isPhoneNumber: function (values, value) {
-        return (!isExisty(value) || isEmpty(value) || /^[1]([3-9])[0-9]{9}$/.test(value));
+        return (!isExisty(value) ||
+            isEmpty(value) ||
+            /^(\+\d{2}-)?[1]([3-9])[0-9]{9}$/.test(value));
     },
     isTelNumber: function (values, value) {
         return (!isExisty(value) ||
             isEmpty(value) ||
-            /^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/.test(value));
+            /^(\+\d{2}-)?(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/.test(value));
     },
     isZipcode: function (values, value) {
         return !isExisty(value) || isEmpty(value) || /^\d{6}$/.test(value);

package/esm/utils/visitedCache.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/RootRenderer.d.ts

@@ -30,5 +30,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
     renderError(): React.ReactNode;
     renderDialog(): React.ReactNode;
     renderDrawer(): React.ReactNode;
-    render(): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
+    render(): string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
 }

package/lib/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -72,7 +72,9 @@ var RootRenderer = /** @class */ (function (_super) {
                     }
                 }
             });
-            return factory.loadAsyncRenderersByType(types, true);
+            return factory.hasAsyncRenderers(types)
+                ? factory.loadAsyncRenderersByType(types, true)
+                : undefined;
         });
         return _this;
     }

package/lib/SchemaRenderer.d.ts

@@ -30,6 +30,7 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
     };
     toDispose: Array<() => any>;
     unbindEvent: (() => void) | undefined;
+    unbindGlobalEvent: (() => void) | undefined;
     isStatic: any;
     constructor(props: SchemaRendererProps);
     componentDidMount(): void;

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -95,6 +95,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         _this.animationClassNames = {};
         _this.toDispose = [];
         _this.unbindEvent = undefined;
+        _this.unbindGlobalEvent = undefined;
         _this.isStatic = undefined;
         var animations = (_a = props === null || props === void 0 ? void 0 : props.schema) === null || _a === void 0 ? void 0 : _a.animations;
         if (animations) {
@@ -138,10 +139,11 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }
     };
     SchemaRenderer.prototype.componentWillUnmount = function () {
-        var _a;
+        var _a, _b;
         this.toDispose.forEach(function (fn) { return fn(); });
         this.toDispose = [];
         (_a = this.unbindEvent) === null || _a === void 0 ? void 0 : _a.call(this);
+        (_b = this.unbindGlobalEvent) === null || _b === void 0 ? void 0 : _b.call(this);
         this.removeAnimationStyle();
     };
     // 限制：只有 schema 除外的 props 变化，或者 schema 里面的某个成员值发生变化才更新。
@@ -221,7 +223,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
     };
     SchemaRenderer.prototype.childRef = function (ref) {
         var _this = this;
-        var _a, _b;
+        var _a, _b, _c;
         // todo 这里有个问题，就是注意以下的这段注释
         // > // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
         // > 而 visibleOn 和 hiddenOn 是无效的，
@@ -240,7 +242,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
         if (ref) {
             // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
             (_b = this.unbindEvent) === null || _b === void 0 ? void 0 : _b.call(this);
+            (_c = this.unbindGlobalEvent) === null || _c === void 0 ? void 0 : _c.call(this);
             this.unbindEvent = rendererEvent.bindEvent(ref);
+            this.unbindGlobalEvent = rendererEvent.bindGlobalEventForRenderer(ref);
         }
         this.cRef = ref;
     };

package/lib/Scoped.d.ts

@@ -24,7 +24,7 @@ export interface ScopedComponentType extends React.Component<RendererProps> {
     focus?: () => void;
     doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean, args?: any) => void;
     receive?: (values: RendererData, subPath?: string, replace?: boolean) => void;
-    reload?: (subPath?: string, query?: RendererData | null, ctx?: RendererData, silent?: boolean, replace?: boolean, args?: any) => void;
+    reload?: (subpath?: string, query?: any, ctx?: RendererData, silent?: boolean, replace?: boolean, args?: any) => void;
     context: any;
     setData?: (value?: object, replace?: boolean, index?: number) => void;
 }

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/StyleManager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -18,6 +18,7 @@ require('../utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var dataMapping = require('../utils/dataMapping.js');
 require('../utils/filter.js');
+var debug = require('../utils/debug.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -285,6 +286,8 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                     : mergeData;
                 (_x = console.group) === null || _x === void 0 ? void 0 : _x.call(console, "run action ".concat(action.actionType));
                 console.debug("[".concat(action.actionType, "] action args, data"), args, data);
+                debug.debug('action', "run action ".concat(action.actionType, " with args"), args);
+                debug.debug('action', "run action ".concat(action.actionType, " with data"), data);
                 stopped = false;
                 return [4 /*yield*/, actionInstrance.run(tslib.__assign(tslib.__assign(tslib.__assign({}, action), { args: args, rawData: actionConfig.data, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
             case 5:

package/lib/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */