amis-core 6.11.0 → 6.12.0-ab.2

package/lib/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/dom.d.ts

@@ -14,3 +14,4 @@ export declare function calculatePosition(placement: any, overlayNode: any, targ
 export declare function getStyleNumber(element: HTMLElement, styleName: string): number;
 /** 根据关键字高亮显示文本内容 */
 export declare function renderTextByKeyword(rendererText: string, curKeyword: string): string | React.JSX.Element;
+export declare function calculateHeight(element: HTMLElement, excludeElement: HTMLElement): number;

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -300,7 +300,45 @@ function renderTextByKeyword(rendererText, curKeyword) {
         return rendererText;
     }
 }
+// 计算除去某个元素后，父元素剩余部分的高度总和（padding、margin、border、height）
+function calculateHeight(element, excludeElement) {
+    var parentRect = element.getBoundingClientRect();
+    var childRect = excludeElement.getBoundingClientRect();
+    var topDifference = Math.abs(childRect.top - parentRect.top);
+    var bottomDifference = 0;
+    var selfNode = excludeElement;
+    var parentNode = selfNode.parentElement;
+    while (parentNode) {
+        var paddingBottom = getStyleNumber(parentNode, 'padding-bottom');
+        var borderBottom = getStyleNumber(parentNode, 'border-bottom-width');
+        var nextSiblingHeight = 0;
+        var nextSibling = selfNode.nextElementSibling;
+        while (nextSibling) {
+            var positon = getComputedStyle(nextSibling).position;
+            if (positon !== 'absolute' && positon !== 'fixed') {
+                var rect1 = selfNode.getBoundingClientRect();
+                var rect2 = nextSibling.getBoundingClientRect();
+                if (rect1.bottom <= rect2.top) {
+                    nextSiblingHeight +=
+                        nextSibling.offsetHeight +
+                            getStyleNumber(nextSibling, 'margin-bottom');
+                }
+            }
+            nextSibling = nextSibling.nextElementSibling;
+        }
+        var marginBottom = getStyleNumber(selfNode, 'margin-bottom');
+        bottomDifference +=
+            paddingBottom + borderBottom + marginBottom + nextSiblingHeight;
+        selfNode = parentNode;
+        parentNode = selfNode.parentElement;
+        if (element === selfNode) {
+            break;
+        }
+    }
+    return topDifference + bottomDifference;
+}
 
+exports.calculateHeight = calculateHeight;
 exports.calculatePosition = calculatePosition;
 exports.getContainer = getContainer;
 exports.getStyleNumber = getStyleNumber;

package/lib/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/helper.d.ts

@@ -12,6 +12,7 @@ import type { IStatusStore } from '../store/status';
 export { createObject, cloneObject, isObject, string2regExp, getVariable, setVariable, deleteVariable, keyToPath, extendObject };
 export declare function preventDefault(event: TouchEvent | Event): void;
 export declare function isMobile(): any;
+export declare function isMobileDevice(): boolean;
 export declare function range(num: number, min: number, max: number): number;
 /**
  * 给目标对象添加其他属性，可读取但是不会被遍历。

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -53,10 +53,17 @@ function preventDefault(event) {
         event.preventDefault();
     }
 }
+// isMobile根据media宽度判断是否是移动端
 function isMobile() {
     var _a, _b;
     return (_b = (_a = window).matchMedia) === null || _b === void 0 ? void 0 : _b.call(_a, '(max-width: 768px)').matches;
 }
+// isMobileDevice根据userAgent判断是否为移动端设备
+function isMobileDevice() {
+    var userAgent = navigator.userAgent;
+    var isMobileUA = /Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone|Opera Mini|IEMobile|Mobile/i.test(userAgent);
+    return isMobileUA;
+}
 function range(num, min, max) {
     return Math.min(Math.max(num, min), max);
 }
@@ -1867,6 +1874,7 @@ exports.isClickOnInput = isClickOnInput;
 exports.isDisabled = isDisabled;
 exports.isEmpty = isEmpty;
 exports.isMobile = isMobile;
+exports.isMobileDevice = isMobileDevice;
 exports.isNumeric = isNumeric;
 exports.isObjectShallowModified = isObjectShallowModified;
 exports.isSuperDataModified = isSuperDataModified;

package/lib/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/image.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -9,6 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var api = require('./api.js');
 require('tslib');
+require('file-saver');
 var browser = require('./browser.js');
 var ColorScale = require('./ColorScale.js');
 var columnsSplit = require('./columnsSplit.js');
@@ -105,6 +106,7 @@ exports.disableDebug = debug.disableDebug;
 exports.enableDebug = debug.enableDebug;
 exports.traceProps = debug.traceProps;
 exports.warning = debug.warning;
+exports.calculateHeight = dom.calculateHeight;
 exports.calculatePosition = dom.calculatePosition;
 exports.getContainer = dom.getContainer;
 exports.getStyleNumber = dom.getStyleNumber;
@@ -179,6 +181,7 @@ exports.isClickOnInput = helper.isClickOnInput;
 exports.isDisabled = helper.isDisabled;
 exports.isEmpty = helper.isEmpty;
 exports.isMobile = helper.isMobile;
+exports.isMobileDevice = helper.isMobileDevice;
 exports.isNumeric = helper.isNumeric;
 exports.isObjectShallowModified = helper.isObjectShallowModified;
 exports.isSuperDataModified = helper.isSuperDataModified;

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/json-schema-2-amis-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/keyToPath.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/labelToString.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/loopTooMuch.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/printElement.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/style-helper.d.ts

@@ -67,6 +67,7 @@ export declare function insertEditCustomStyle(params: {
     customStyle: any;
     id?: string;
     doc?: Document;
+    customStyleClassPrefix?: string;
     [propName: string]: any;
 }): void;
 export interface InsertCustomStyle {

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -343,7 +343,7 @@ function traverseStyle(style, path, result) {
  */
 function insertEditCustomStyle(params) {
     var _a, _b;
-    var customStyle = params.customStyle, doc = params.doc, data = params.data;
+    var customStyle = params.customStyle, doc = params.doc, data = params.data, customStyleClassPrefix = params.customStyleClassPrefix;
     var id = ((_b = (_a = params.id) === null || _a === void 0 ? void 0 : _a.replace) === null || _b === void 0 ? void 0 : _b.call(_a, 'u:', '')) || params.id + '';
     var styles = {};
     traverseStyle(customStyle, '', styles);
@@ -353,29 +353,32 @@ function insertEditCustomStyle(params) {
         index = "-".concat(data.index);
     }
     if (!isEmpty__default["default"](styles)) {
-        var className_1 = "wrapperCustomStyle-".concat(id).concat(index);
+        var className_1 = ".wrapperCustomStyle-".concat(id).concat(index);
+        if (customStyleClassPrefix) {
+            className_1 = "".concat(customStyleClassPrefix, " ").concat(className_1);
+        }
         Object.keys(styles).forEach(function (key) {
             if (!isObject__default["default"](styles[key])) {
-                content += "\n.".concat(className_1, " {\n  ").concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(styles[key].replace(/['|"]/g, ''), data, '| raw') || styles[key], "\n}");
+                content += "\n".concat(className_1, " {\n  ").concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(styles[key].replace(/['|"]/g, ''), data, '| raw') || styles[key], "\n}");
             }
             else if (key === 'root') {
                 var res = map__default["default"](styles[key], function (value, key) {
                     return "".concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(value.replace(/['|"]/g, ''), data, '| raw') || value, ";");
                 });
-                content += "\n.".concat(className_1, " {\n  ").concat(res.join('\n  '), "\n}");
+                content += "\n".concat(className_1, " {\n  ").concat(res.join('\n  '), "\n}");
             }
             else if (/^root:/.test(key)) {
                 var res = map__default["default"](styles[key], function (value, key) {
                     return "".concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(value.replace(/['|"]/g, ''), data, '| raw') || value, ";");
                 });
                 var nowKey = key.replace('root', '');
-                content += "\n.".concat(className_1).concat(nowKey, " {\n  ").concat(res.join('\n  '), "\n}");
+                content += "\n".concat(className_1).concat(nowKey, " {\n  ").concat(res.join('\n  '), "\n}");
             }
             else {
                 var res = map__default["default"](styles[key], function (value, key) {
                     return "".concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(value.replace(/['|"]/g, ''), data, '| raw') || value, ";");
                 });
-                content += "\n.".concat(className_1, " ").concat(key, " {\n  ").concat(res.join('\n  '), "\n}");
+                content += "\n".concat(className_1, " ").concat(key, " {\n  ").concat(res.join('\n  '), "\n}");
             }
         });
     }

package/lib/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/validateId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/visitedCache.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "6.11.0",
+  "version": "6.12.0-ab.2",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -59,7 +59,7 @@
   ],
   "dependencies": {
     "@rc-component/mini-decimal": "^1.0.1",
-    "amis-formula": "^6.11.0",
+    "amis-formula": "*",
     "classnames": "2.3.2",
     "cross-env": "^7.0.3",
     "file-saver": "^2.0.2",