amis-core 3.5.2 → 3.6.0

package/lib/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -43,14 +43,17 @@ function safeSub(arg1, arg2) {
     return (arg1 * maxDigits - arg2 * maxDigits) / maxDigits;
 }
 function numberFormatter(num, precision) {
-    if (precision === void 0) { precision = 0; }
+    var _a;
     var ZERO = 0;
     var number = +num;
+    var finalP = typeof precision === 'number'
+        ? precision
+        : ((_a = number.toString().split('.')[1]) === null || _a === void 0 ? void 0 : _a.length) || 0;
     if (typeof number === 'number' && !isNaN(number)) {
-        var regexp = precision ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(\d{3})+$)/g;
-        return number.toFixed(precision).replace(regexp, '$1,');
+        var regexp = finalP ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(\d{3})+$)/g;
+        return number.toFixed(finalP).replace(regexp, '$1,');
     }
-    return ZERO.toFixed(precision);
+    return ZERO.toFixed(finalP);
 }
 /**
  * 判断一个数字是否为整数，且在给定范围内

package/lib/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -108,7 +108,9 @@ function setVariable(data, key, value, convertKeyToPath) {
     }
     var parts = convertKeyToPath !== false ? keyToPath.keyToPath(key) : [key];
     var last = parts.pop();
+    var stack = [];
     while (parts.length) {
+        var host = data;
         var key_1 = parts.shift();
         if (isPlainObject__default["default"](data[key_1])) {
             data = data[key_1] = tslib.__assign({}, data[key_1]);
@@ -124,9 +126,21 @@ function setVariable(data, key, value, convertKeyToPath) {
             data = data[key_1];
         }
         else {
+            // 如果是数字，那么就是数组
+            if (/^\d+$/.test(key_1) && stack.length) {
+                var prev = stack[stack.length - 1];
+                if (!Array.isArray(prev.host[prev.key]) &&
+                    !Object.keys(prev.host[prev.key]).length) {
+                    host = data = prev.host[prev.key] = [];
+                }
+            }
             data[key_1] = {};
             data = data[key_1];
         }
+        stack.push({
+            host: host,
+            key: key_1
+        });
     }
     data[last] = value;
 }

package/lib/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -8,9 +8,14 @@ export interface debounceConfig {
     leading?: boolean;
     trailing?: boolean;
 }
+export interface trackConfig {
+    id: string;
+    name: string;
+}
 export interface EventListeners {
     [propName: string]: {
         debounce?: debounceConfig;
+        track?: trackConfig;
         weight?: number;
         actions: ListenerAction[];
     };
@@ -21,6 +26,7 @@ export interface OnEventProps {
             weight?: number;
             actions: ListenerAction[];
             debounce?: debounceConfig;
+            track?: trackConfig;
         };
     };
 }
@@ -29,6 +35,7 @@ export interface RendererEventListener {
     type: string;
     weight: number;
     debounce: debounceConfig | null;
+    track: trackConfig | null;
     actions: ListenerAction[];
     executing?: boolean;
     debounceInstance?: any;

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -65,6 +65,7 @@ var bindEvent = function (renderer) {
                         renderer: renderer,
                         type: key,
                         debounce: listener.debounce || null,
+                        track: listeners[key].track || null,
                         weight: listener.weight || 0,
                         actions: listener.actions
                     });
@@ -74,6 +75,7 @@ var bindEvent = function (renderer) {
                     renderer: renderer,
                     type: key,
                     debounce: listeners[key].debounce || null,
+                    track: listeners[key].track || null,
                     weight: listeners[key].weight || 0,
                     actions: listeners[key].actions
                 });
@@ -106,13 +108,13 @@ var bindEvent = function (renderer) {
 };
 // 触发事件
 function dispatchEvent(e, renderer, scoped, data, broadcast) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    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, _j;
+        var e_2, _l;
         var _this = this;
-        return tslib.__generator(this, function (_k) {
-            switch (_k.label) {
+        return tslib.__generator(this, function (_m) {
+            switch (_m.label) {
                 case 0:
                     unbindEvent = null;
                     eventName = typeof e === 'string' ? e : e.type;
@@ -153,11 +155,11 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                         }
                     };
                     _loop_2 = function (listener) {
-                        var _l, _m, wait, _o, trailing, _p, leading, _q, maxWait, debounced_1;
-                        return tslib.__generator(this, function (_r) {
-                            switch (_r.label) {
+                        var _o, _p, wait, _q, trailing, _r, leading, _s, maxWait, debounced_1, _t, trackId, trackName;
+                        return tslib.__generator(this, function (_u) {
+                            switch (_u.label) {
                                 case 0:
-                                    _l = (listener === null || listener === void 0 ? void 0 : listener.debounce) || {}, _m = _l.wait, wait = _m === void 0 ? 100 : _m, _o = _l.trailing, trailing = _o === void 0 ? true : _o, _p = _l.leading, leading = _p === void 0 ? false : _p, _q = _l.maxWait, maxWait = _q === void 0 ? 10000 : _q;
+                                    _o = (listener === null || listener === void 0 ? void 0 : listener.debounce) || {}, _p = _o.wait, wait = _p === void 0 ? 100 : _p, _q = _o.trailing, trailing = _q === void 0 ? true : _q, _r = _o.leading, leading = _r === void 0 ? false : _r, _s = _o.maxWait, maxWait = _s === void 0 ? 10000 : _s;
                                     if (!(listener === null || listener === void 0 ? void 0 : listener.debounce)) return [3 /*break*/, 1];
                                     debounced_1 = debounce__default["default"](function () { return tslib.__awaiter(_this, void 0, void 0, function () {
                                         return tslib.__generator(this, function (_a) {
@@ -186,10 +188,20 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                                     return [3 /*break*/, 3];
                                 case 1: return [4 /*yield*/, Action.runActions(listener.actions, listener.renderer, rendererEvent)];
                                 case 2:
-                                    _r.sent();
+                                    _u.sent();
                                     checkExecuted();
-                                    _r.label = 3;
+                                    _u.label = 3;
                                 case 3:
+                                    if (listener === null || listener === void 0 ? void 0 : listener.track) {
+                                        _t = listener.track, trackId = _t.id, trackName = _t.name;
+                                        (_k = (_j = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _j === void 0 ? void 0 : _j.env) === null || _k === void 0 ? void 0 : _k.tracker({
+                                            eventType: listener.type,
+                                            eventData: {
+                                                trackId: trackId,
+                                                trackName: trackName
+                                            }
+                                        });
+                                    }
                                     // 停止后续监听器执行
                                     if (rendererEvent.stoped) {
                                         return [2 /*return*/, "break"];
@@ -198,31 +210,31 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                             }
                         });
                     };
-                    _k.label = 1;
+                    _m.label = 1;
                 case 1:
-                    _k.trys.push([1, 6, 7, 8]);
+                    _m.trys.push([1, 6, 7, 8]);
                     listeners_1 = tslib.__values(listeners), listeners_1_1 = listeners_1.next();
-                    _k.label = 2;
+                    _m.label = 2;
                 case 2:
                     if (!!listeners_1_1.done) return [3 /*break*/, 5];
                     listener = listeners_1_1.value;
                     return [5 /*yield**/, _loop_2(listener)];
                 case 3:
-                    state_1 = _k.sent();
+                    state_1 = _m.sent();
                     if (state_1 === "break")
                         return [3 /*break*/, 5];
-                    _k.label = 4;
+                    _m.label = 4;
                 case 4:
                     listeners_1_1 = listeners_1.next();
                     return [3 /*break*/, 2];
                 case 5: return [3 /*break*/, 8];
                 case 6:
-                    e_2_1 = _k.sent();
+                    e_2_1 = _m.sent();
                     e_2 = { error: e_2_1 };
                     return [3 /*break*/, 8];
                 case 7:
                     try {
-                        if (listeners_1_1 && !listeners_1_1.done && (_j = listeners_1.return)) _j.call(listeners_1);
+                        if (listeners_1_1 && !listeners_1_1.done && (_l = listeners_1.return)) _l.call(listeners_1);
                     }
                     finally { if (e_2) throw e_2.error; }
                     return [7 /*endfinally*/];

package/lib/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -163,7 +163,7 @@ function formatStyle(themeCss, classNames, id, defaultData) {
             var styles = [];
             var fn = function (key, value) {
                 key = valueMap[key] || key;
-                styles.push("".concat(kebabCase__default["default"](key), ": ").concat(value, ";"));
+                styles.push("".concat(kebabCase__default["default"](key), ": ").concat(value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''), ";"));
             };
             Object.keys(statusMap[status]).forEach(function (key) {
                 if (key !== '$$id') {
@@ -175,14 +175,16 @@ function formatStyle(themeCss, classNames, id, defaultData) {
                                 style_1['top-left-border-radius'] || 0,
                                 style_1['top-right-border-radius'] || 0,
                                 style_1['bottom-right-border-radius'] || 0,
-                                style_1['bottom-left-border-radius'] || 0
+                                style_1['bottom-left-border-radius'] || 0,
+                                (weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''
                             ].join(' '));
                         }
                         else {
                             Object.keys(style_1).forEach(function (k) {
                                 if (k !== '$$id') {
                                     var value = style_1[k];
-                                    value && fn(k, value);
+                                    value &&
+                                        fn(k, value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
                                 }
                             });
                         }
@@ -190,13 +192,12 @@ function formatStyle(themeCss, classNames, id, defaultData) {
                     else {
                         var value = style_1;
                         if (key === 'iconSize') {
-                            fn('width', value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
-                            fn('height', value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
-                            fn('font-size', value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
+                            fn('width', value);
+                            fn('height', value);
+                            fn('font-size', value);
                         }
                         else {
-                            value &&
-                                fn(key, value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
+                            value && fn(key, value);
                         }
                     }
                 }
@@ -241,12 +242,8 @@ function insertCustomStyle(themeCss, classNames, id, defaultData, customStyleCla
         return;
     }
     var value = formatStyle(themeCss, classNames, id, defaultData).value;
-    if (value) {
-        value = customStyleClassPrefix
-            ? "".concat(customStyleClassPrefix, " ").concat(value)
-            : value;
-        insertStyle(value, id.replace('u:', ''), doc);
-    }
+    value = customStyleClassPrefix ? "".concat(customStyleClassPrefix, " ").concat(value) : value;
+    insertStyle(value, id.replace('u:', ''), doc);
 }
 /**
  * 根据路径获取默认值

package/lib/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -59,7 +59,8 @@ function buildStyle(style, data) {
                     styleVar.radius['bottom-left-border-radius'];
             delete styleVar['radius'];
         }
-        if (key.indexOf('-') !== -1) {
+        // 将属性短横线命名转换为驼峰命名，如background-color => backgroundColor。但不处理css variable，如--colors-brand-5
+        if (key.indexOf('-') > 0) {
             styleVar[camelCase__default["default"](styleHelper.valueMap[key] || key)] = styleVar[key];
             delete styleVar[key];
         }

package/lib/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "3.5.2",
+  "version": "3.6.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -46,7 +46,7 @@
     "esm"
   ],
   "dependencies": {
-    "amis-formula": "^3.5.2",
+    "amis-formula": "^3.6.0",
     "classnames": "2.3.2",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",
@@ -107,5 +107,5 @@
       "/.rollup.cache/"
     ]
   },
-  "gitHead": "d235e068521b027eb08fef79792a68fceb63002d"
+  "gitHead": "7fcb81d2c01a1134c8d953b819f136ad4b1a9dfa"
 }