amis-core 6.13.0-beta.2 → 6.13.0-beta.21

package/esm/utils/labelToString.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/loopTooMuch.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -64,7 +64,11 @@ function normalizeOptions(options, share, valueField) {
             }
             var option = __assign(__assign({}, item), (_a = {}, _a[valueField] = value, _a));
             if (typeof option.children !== 'undefined') {
-                option.children = normalizeOptions(option.children, share, valueField);
+                // 用新的 share 避免 children 内部复用全局缓存
+                option.children = normalizeOptions(option.children, {
+                    values: [],
+                    options: []
+                }, valueField);
             }
             else if (value !== undefined) {
                 share.values.push(value);

package/esm/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/printElement.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/resize-sensor.d.ts

@@ -4,5 +4,7 @@
  */
 type EventType = 'both' | 'width' | 'height';
 export declare function getComputedStyle(element: HTMLElement, prop: string): any;
-export declare function resizeSensor(element: HTMLElement, callback: () => void, once?: boolean, type?: EventType): () => void;
+export declare function appearSensor(element: HTMLElement, callback: () => void, once?: boolean): () => void;
+export declare function resizeSensorV2(element: HTMLElement, callback: () => void, once?: boolean, type?: EventType): () => void;
+export declare function resizeSensor(element: HTMLElement, callback: () => void, once?: boolean, type?: EventType, triggerOnAppear?: boolean): () => void;
 export {};

package/esm/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -157,41 +157,75 @@ function detach(element) {
         delete element.originPosition;
     }
 }
-function resizeSensor(element, callback, once, type) {
+function appearSensor(element, callback, once) {
+    if (once === void 0) { once = false; }
+    if (once) {
+        callback = (function (original) {
+            return function () {
+                original();
+                dispose();
+            };
+        })(callback);
+    }
+    element.addEventListener('animationstart', callback);
+    var originalAnimationName = element.style.animationName;
+    var originalAnimationDuration = element.style.animationDuration;
+    element.style.cssText =
+        'animation-name: apearSensor; animation-duration: 0.2s;';
+    var dispose = function () {
+        element.style.animationName = originalAnimationName;
+        element.style.animationDuration = originalAnimationDuration;
+        element.removeEventListener('animationstart', callback);
+    };
+    return dispose;
+}
+function resizeSensorV2(element, callback, once, type) {
+    if (once === void 0) { once = false; }
+    if (type === void 0) { type = 'both'; }
+    var rect = element.getBoundingClientRect();
+    var originWidth = rect.width;
+    var originHeight = rect.height;
+    var observer = new ResizeObserver(function (entries) {
+        if (once) {
+            observer.disconnect();
+        }
+        var entry = entries[0];
+        var cr = entry.contentRect;
+        // 变化大于0.5px时才触发回调,允许一定的误差
+        var widthChanged = Math.abs(cr.width - originWidth) > 0.5;
+        var heightChanged = Math.abs(cr.height - originHeight) > 0.5;
+        if (widthChanged || heightChanged) {
+            if (type === 'both') {
+                callback();
+            }
+            else if ((type === 'width' && widthChanged) ||
+                (type === 'height' && heightChanged)) {
+                callback();
+            }
+            originWidth = cr.width;
+            originHeight = cr.height;
+        }
+    });
+    observer.observe(element);
+    return function () {
+        observer.disconnect();
+    };
+}
+function resizeSensor(element, callback, once, type, triggerOnAppear) {
     if (once === void 0) { once = false; }
     if (type === void 0) { type = 'both'; }
+    if (triggerOnAppear === void 0) { triggerOnAppear = false; }
     if (!element) {
         return function () { };
     }
     // 优先用 ResizeObserver
     if (typeof ResizeObserver !== 'undefined') {
-        var rect = element.getBoundingClientRect();
-        var originWidth_1 = rect.width;
-        var originHeight_1 = rect.height;
-        var observer_1 = new ResizeObserver(function (entries) {
-            if (once) {
-                observer_1.disconnect();
-            }
-            var entry = entries[0];
-            var cr = entry.contentRect;
-            // 变化大于0.5px时才触发回调,允许一定的误差
-            var widthChanged = Math.abs(cr.width - originWidth_1) > 0.5;
-            var heightChanged = Math.abs(cr.height - originHeight_1) > 0.5;
-            if (widthChanged || heightChanged) {
-                if (type === 'both') {
-                    callback();
-                }
-                else if ((type === 'width' && widthChanged) ||
-                    (type === 'height' && heightChanged)) {
-                    callback();
-                }
-                originWidth_1 = cr.width;
-                originHeight_1 = cr.height;
-            }
-        });
-        observer_1.observe(element);
+        var disposes_1 = [
+            resizeSensorV2(element, callback, once, type),
+            triggerOnAppear ? appearSensor(element, callback, true) : undefined
+        ];
         return function () {
-            observer_1.disconnect();
+            disposes_1.forEach(function (dispose) { return dispose === null || dispose === void 0 ? void 0 : dispose(); });
         };
     }
     // 不支持 ResizeObserver 的话，用 polyfill
@@ -215,4 +249,4 @@ function resizeSensor(element, callback, once, type) {
     };
 }
 
-export { getComputedStyle, resizeSensor };
+export { appearSensor, getComputedStyle, resizeSensor, resizeSensorV2 };

package/esm/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -15,9 +15,9 @@ import capitalize from 'lodash/capitalize';
 import 'amis-formula';
 import 'lodash/isPlainObject';
 import './memoryParse.js';
+import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
 import { isPureVariable } from './isPureVariable.js';
 import '@rc-component/mini-decimal';
-import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
 import './filter.js';
 
 var conditionResolverMap = {};

package/esm/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/resolveVariableAndFilter.js

@@ -1,9 +1,10 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
-import { parse, Evaluator } from 'amis-formula';
+import { Evaluator } from 'amis-formula';
+import { memoParse } from './tokenize.js';
 
 var resolveVariableAndFilter = function (path, data, defaultFilter, fallbackValue) {
     if (data === void 0) { data = {}; }
@@ -13,7 +14,7 @@ var resolveVariableAndFilter = function (path, data, defaultFilter, fallbackValu
         return undefined;
     }
     try {
-        var ast = parse(path, {
+        var ast = memoParse(path, {
             evalMode: false,
             allowFilter: true
         });

package/esm/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

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

@@ -60,6 +60,17 @@ export declare function insertCustomStyle(params: {
  * 根据路径获取默认值
  */
 export declare function getValueByPath(path: string, data: any): any;
+export declare function formatCustomStyle(params: {
+    customStyle: any;
+    id?: string;
+    doc?: Document;
+    customStyleClassPrefix?: string;
+    [propName: string]: any;
+}): {
+    content: string;
+    index?: string;
+    id: string;
+};
 /**
  * 设置源码编辑自定义样式
  */
@@ -69,7 +80,7 @@ export declare function insertEditCustomStyle(params: {
     doc?: Document;
     customStyleClassPrefix?: string;
     [propName: string]: any;
-}): void;
+}): string;
 export interface InsertCustomStyle {
     themeCss: any;
     classNames: CustomStyleClassName[];

package/esm/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -312,7 +312,15 @@ function traverseStyle(style, path, result) {
     Object.keys(style).forEach(function (key) {
         if (key !== '$$id') {
             if (isObject(style[key])) {
-                var nowPath = path ? "".concat(path, " ").concat(key) : key;
+                var keys = key.split(',');
+                var nowPath = path
+                    ? keys
+                        .map(function (key) {
+                        var paths = path.split(',');
+                        return paths.map(function (path) { return "".concat(path, " ").concat(key); }).join(',');
+                    })
+                        .join(',')
+                    : key;
                 traverseStyle(style[key], nowPath, result);
             }
             else if (path === '') {
@@ -326,12 +334,9 @@ function traverseStyle(style, path, result) {
         }
     });
 }
-/**
- * 设置源码编辑自定义样式
- */
-function insertEditCustomStyle(params) {
+function formatCustomStyle(params) {
     var _a, _b;
-    var customStyle = params.customStyle, doc = params.doc, data = params.data, customStyleClassPrefix = params.customStyleClassPrefix;
+    var customStyle = params.customStyle; params.doc; var 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);
@@ -349,33 +354,40 @@ function insertEditCustomStyle(params) {
             if (!isObject(styles[key])) {
                 content += "\n".concat(className_1, " {\n  ").concat(key, ": ").concat(resolveVariableAndFilter(styles[key].replace(/['|"]/g, ''), data, '| raw') || styles[key], "\n}");
             }
-            else if (key === 'root') {
-                var res = map(styles[key], function (value, key) {
-                    return "".concat(key, ": ").concat(resolveVariableAndFilter(value.replace(/['|"]/g, ''), data, '| raw') || value, ";");
-                });
-                content += "\n".concat(className_1, " {\n  ").concat(res.join('\n  '), "\n}");
-            }
-            else if (/^root:/.test(key)) {
+            else if (key.startsWith('root')) {
                 var res = map(styles[key], function (value, key) {
                     return "".concat(key, ": ").concat(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(key.replace(/root/g, className_1), " {\n  ").concat(res.join('\n  '), "\n}");
             }
             else {
                 var res = map(styles[key], function (value, key) {
                     return "".concat(key, ": ").concat(resolveVariableAndFilter(value.replace(/['|"]/g, ''), data, '| raw') || value, ";");
                 });
-                content += "\n".concat(className_1, " ").concat(key, " {\n  ").concat(res.join('\n  '), "\n}");
+                var keys = key.split(',');
+                content += "\n".concat(keys.map(function (key) { return "".concat(className_1, " ").concat(key); }), " {\n  ").concat(res.join('\n  '), "\n}");
             }
         });
     }
+    return {
+        content: content,
+        index: index,
+        id: id
+    };
+}
+/**
+ * 设置源码编辑自定义样式
+ */
+function insertEditCustomStyle(params) {
+    var doc = params.doc;
+    var _a = formatCustomStyle(params), content = _a.content, index = _a.index, id = _a.id;
     insertStyle({
         style: content,
         classId: 'wrapperCustomStyle-' + (id || uuid()) + index,
         doc: doc,
         id: id.replace(/(-.*)/, '')
     });
+    return content;
 }
 /**
  * 移除自定义样式
@@ -431,4 +443,4 @@ function setThemeClassName(params) {
     }
 }
 
-export { addStyle, findOrCreateStyle, formatInputThemeCss, formatStyle, getValueByPath, inheritValueMap, insertCustomStyle, insertEditCustomStyle, insertStyle, removeCustomStyle, setThemeClassName, valueMap };
+export { addStyle, findOrCreateStyle, formatCustomStyle, formatInputThemeCss, formatStyle, getValueByPath, inheritValueMap, insertCustomStyle, insertEditCustomStyle, insertStyle, removeCustomStyle, setThemeClassName, valueMap };

package/esm/utils/style.d.ts

@@ -8,3 +8,16 @@
  * 3. 针对 image 自动加 url
  */
 export declare function buildStyle(style: any, data: any): any;
+/**
+ * 将 style 转换为对象
+ * @param style
+ * @returns
+ */
+export declare function normalizeStyle(style: any): any;
+/**
+ * 合并 style
+ * @param to
+ * @param from
+ * @returns
+ */
+export declare function mergeStyle(to: any, from: any): any;

package/esm/utils/style.js

@@ -1,15 +1,15 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
-import 'tslib';
+import { __read } from 'tslib';
 import 'amis-formula';
 import 'moment';
 import 'lodash/isPlainObject';
 import './memoryParse.js';
-import '@rc-component/mini-decimal';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
+import '@rc-component/mini-decimal';
 import './filter.js';
 import mapValues from 'lodash/mapValues';
 import camelCase from 'lodash/camelCase';
@@ -69,5 +69,45 @@ function buildStyle(style, data) {
     }
     return styleVar;
 }
+/**
+ * 将 style 转换为对象
+ * @param style
+ * @returns
+ */
+function normalizeStyle(style) {
+    if (!style) {
+        return {};
+    }
+    else if (typeof style === 'string') {
+        return style.split(';').reduce(function (acc, item) {
+            var _a = __read(item.split(':').map(function (item) { return item.trim(); }), 2), key = _a[0], value = _a[1];
+            if (key && value) {
+                acc[camelCase(key)] = value;
+            }
+            return acc;
+        }, {});
+    }
+    else {
+        return style;
+    }
+}
+/**
+ * 合并 style
+ * @param to
+ * @param from
+ * @returns
+ */
+function mergeStyle(to, from) {
+    if (!to && !from) {
+        return {};
+    }
+    if (!to) {
+        return from;
+    }
+    if (!from) {
+        return to;
+    }
+    return Object.assign({}, normalizeStyle(to), normalizeStyle(from));
+}
 
-export { buildStyle };
+export { buildStyle, mergeStyle, normalizeStyle };

package/esm/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/tpl-builtin.d.ts

@@ -17,3 +17,4 @@ export { prettyBytes, escapeHtml, formatDuration, filterDate, relativeValueRe, p
 export declare function register(): Enginer & {
     name: string;
 };
+export declare const testResolveVariableAndFilter: (path?: string | undefined, data?: object, defaultFilter?: string, fallbackValue?: (value: any) => any) => any;

package/esm/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -8,9 +8,11 @@ export { getFilters, registerFilter, registerFunction } from 'amis-formula';
 import 'moment';
 import 'lodash/isPlainObject';
 import './memoryParse.js';
+import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
+export { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
+import '@rc-component/mini-decimal';
 import { tokenize } from './tokenize.js';
 export { tokenize } from './tokenize.js';
-import '@rc-component/mini-decimal';
 import { resolveVariableAndFilterForAsync } from './resolveVariableAndFilterForAsync.js';
 export { resolveVariableAndFilterForAsync } from './resolveVariableAndFilterForAsync.js';
 import './filter.js';
@@ -74,5 +76,7 @@ function register() {
         }
     };
 }
+// 避免 resolveVariableAndFilter 被摇了
+var testResolveVariableAndFilter = resolveVariableAndFilter;
 
-export { register };
+export { register, testResolveVariableAndFilter };

package/esm/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -58,6 +58,7 @@ function asyncFilter(tpl, data) {
 }
 // 缓存一下提升性能
 var EVAL_CACHE = {};
+var WARNING_CACHE = {};
 var customEvalExpressionFn;
 function setCustomEvalExpression(fn) {
     customEvalExpressionFn = fn;
@@ -98,7 +99,10 @@ function evalExpression(expression, data) {
         return fn.call(data, data, getFilters());
     }
     catch (e) {
-        console.warn(expression, e);
+        if (!WARNING_CACHE[expression]) {
+            console.warn(expression, e);
+            WARNING_CACHE[expression] = true;
+        }
         return false;
     }
 }

package/esm/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/validateId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */