amis-core 6.9.0 → 6.10.0-beta.0

package/lib/utils/optionValueCompare.js

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

package/lib/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -44,15 +44,20 @@ function position(node, offsetParent$1) {
         }
         if (nodeName(parent_1) !== 'html')
             parentOffset = offset.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 tslib.__assign(tslib.__assign({}, offset$1), { top: offset$1.top - parentOffset.top - (parseInt(marginTop, 10) || 0), left: offset$1.left - parentOffset.left - (parseInt(marginLeft, 10) || 0) });
+    return tslib.__assign(tslib.__assign({}, offset$1), { top: offset$1.top - parentOffset.top /*- (parseInt(marginTop, 10) || 0)*/, left: offset$1.left - parentOffset.left /* - (parseInt(marginLeft, 10) || 0)*/ });
 }
 
 exports["default"] = position;

package/lib/utils/prettyBytes.js

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

package/lib/utils/printElement.js

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

package/lib/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/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -139,12 +139,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
+                });
+                Action.runActions(listener.actions, renderer, rendererEvent);
+            };
+        };
+        try {
+            for (var _b = tslib.__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 tslib.__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 tslib.__generator(this, function (_m) {
             switch (_m.label) {
@@ -187,7 +255,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 tslib.__generator(this, function (_u) {
                             switch (_u.label) {
@@ -251,10 +319,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:
@@ -262,20 +330,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 tslib.__awaiter(this, void 0, void 0, function () {
+        var bc;
+        return tslib.__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;
 };
@@ -388,8 +474,11 @@ function getMatchedEventTargets(tree, ctx, index, condition, oldCondition) {
 }
 
 exports.bindEvent = bindEvent;
+exports.bindGlobalEvent = bindGlobalEvent;
+exports.bindGlobalEventForRenderer = bindGlobalEventForRenderer;
 exports.createRendererEvent = createRendererEvent;
 exports.dispatchEvent = dispatchEvent;
+exports.dispatchGlobalEvent = dispatchGlobalEvent;
 exports.getMatchedEventTargets = getMatchedEventTargets;
 exports.getRendererEventListeners = getRendererEventListeners;
 exports.resolveEventData = resolveEventData;

package/lib/utils/replaceText.js

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

package/lib/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/lib/utils/resolveCondition.js

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

package/lib/utils/resolveVariable.js

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

package/lib/utils/resolveVariableAndFilter.js

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

package/lib/utils/resolveVariableAndFilterForAsync.js

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

package/lib/utils/scrollPosition.js

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

package/lib/utils/string2regExp.js

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

package/lib/utils/stripNumber.js

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

package/lib/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/lib/utils/style.js

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

package/lib/utils/toNumber.js

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

package/lib/utils/tokenize.js

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

package/lib/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/lib/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/lib/utils/tpl.js

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

package/lib/utils/uncontrollable.js

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

package/lib/utils/validateId.js

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

package/lib/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -221,12 +221,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/lib/utils/visitedCache.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "6.9.0",
+  "version": "6.10.0-beta.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -35,8 +35,8 @@
     "typescript": "^4.6.4"
   },
   "scripts": {
-    "build": "npm run clean-dist && NODE_ENV=production rollup -c ",
-    "build-esm": "npm run clean-dist && NODE_ENV=production rollup -c rollup.esm.config.js",
+    "build": "npm run clean-dist && cross-env NODE_ENV=production rollup -c ",
+    "build-esm": "npm run clean-dist && cross-env NODE_ENV=production rollup -c rollup.esm.config.js",
     "dev": "rollup -c -w",
     "test": "jest",
     "update-snapshot": "jest --updateSnapshot",
@@ -49,8 +49,9 @@
   ],
   "dependencies": {
     "@rc-component/mini-decimal": "^1.0.1",
-    "amis-formula": "^6.9.0",
+    "amis-formula": "^6.10.0-beta.0",
     "classnames": "2.3.2",
+    "cross-env": "^7.0.3",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",
     "lodash": "^4.17.15",