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

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -10,7 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var memoryParse = require('./memoryParse.js');
 
 function isPureVariable(path) {
-    if (typeof path === 'string') {
+    if (typeof path === 'string' && path.includes('$')) {
         try {
             var ast = memoryParse.memoryParse(path);
             // 只有一个成员说明是纯表达式模式

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

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

package/lib/utils/keyToPath.js

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

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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
  */
 
@@ -72,7 +72,11 @@ function normalizeOptions(options, share, valueField) {
             }
             var option = tslib.__assign(tslib.__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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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
  */
 
@@ -161,41 +161,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
@@ -219,5 +253,7 @@ function resizeSensor(element, callback, once, type) {
     };
 }
 
+exports.appearSensor = appearSensor;
 exports.getComputedStyle = getComputedStyle;
 exports.resizeSensor = resizeSensor;
+exports.resizeSensorV2 = resizeSensorV2;

package/lib/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
  */
 
@@ -19,9 +19,9 @@ var capitalize = require('lodash/capitalize');
 require('amis-formula');
 require('lodash/isPlainObject');
 require('./memoryParse.js');
+var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 var isPureVariable = require('./isPureVariable.js');
 require('@rc-component/mini-decimal');
-var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -8,6 +8,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var amisFormula = require('amis-formula');
+var tokenize = require('./tokenize.js');
 
 var resolveVariableAndFilter = function (path, data, defaultFilter, fallbackValue) {
     if (data === void 0) { data = {}; }
@@ -17,7 +18,7 @@ var resolveVariableAndFilter = function (path, data, defaultFilter, fallbackValu
         return undefined;
     }
     try {
-        var ast = amisFormula.parse(path, {
+        var ast = tokenize.memoParse(path, {
             evalMode: false,
             allowFilter: true
         });

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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
  */
 
@@ -324,7 +324,15 @@ function traverseStyle(style, path, result) {
     Object.keys(style).forEach(function (key) {
         if (key !== '$$id') {
             if (isObject__default["default"](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 === '') {
@@ -338,12 +346,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);
@@ -361,33 +366,40 @@ function insertEditCustomStyle(params) {
             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}");
             }
-            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}");
-            }
-            else if (/^root:/.test(key)) {
+            else if (key.startsWith('root')) {
                 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(key.replace(/root/g, className_1), " {\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}");
+                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 || helper.uuid()) + index,
         doc: doc,
         id: id.replace(/(-.*)/, '')
     });
+    return content;
 }
 /**
  * 移除自定义样式
@@ -445,6 +457,7 @@ function setThemeClassName(params) {
 
 exports.addStyle = addStyle;
 exports.findOrCreateStyle = findOrCreateStyle;
+exports.formatCustomStyle = formatCustomStyle;
 exports.formatInputThemeCss = formatInputThemeCss;
 exports.formatStyle = formatStyle;
 exports.getValueByPath = getValueByPath;

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -7,13 +7,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('tslib');
+var tslib = require('tslib');
 require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
 require('./memoryParse.js');
-require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
+require('@rc-component/mini-decimal');
 require('./filter.js');
 var mapValues = require('lodash/mapValues');
 var camelCase = require('lodash/camelCase');
@@ -78,5 +78,47 @@ 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 = tslib.__read(item.split(':').map(function (item) { return item.trim(); }), 2), key = _a[0], value = _a[1];
+            if (key && value) {
+                acc[camelCase__default["default"](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));
+}
 
 exports.buildStyle = buildStyle;
+exports.mergeStyle = mergeStyle;
+exports.normalizeStyle = normalizeStyle;

package/lib/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/lib/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/lib/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/lib/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
  */
 
@@ -12,8 +12,9 @@ var amisFormula = require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
 require('./memoryParse.js');
-var tokenize = require('./tokenize.js');
+var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('@rc-component/mini-decimal');
+var tokenize = require('./tokenize.js');
 var resolveVariableAndFilterForAsync = require('./resolveVariableAndFilterForAsync.js');
 require('./filter.js');
 
@@ -76,6 +77,8 @@ function register() {
         }
     };
 }
+// 避免 resolveVariableAndFilter 被摇了
+var testResolveVariableAndFilter = resolveVariableAndFilter.resolveVariableAndFilter;
 
 Object.defineProperty(exports, 'getFilters', {
     enumerable: true,
@@ -89,6 +92,8 @@ Object.defineProperty(exports, 'registerFunction', {
     enumerable: true,
     get: function () { return amisFormula.registerFunction; }
 });
+exports.resolveVariableAndFilter = resolveVariableAndFilter.resolveVariableAndFilter;
 exports.tokenize = tokenize.tokenize;
 exports.resolveVariableAndFilterForAsync = resolveVariableAndFilterForAsync.resolveVariableAndFilterForAsync;
 exports.register = register;
+exports.testResolveVariableAndFilter = testResolveVariableAndFilter;

package/lib/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
  */