amis-core 3.4.0 → 3.4.2

package/esm/utils/resize-sensor.js

@@ -1,10 +1,8 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 
-import { __spreadArray, __read } from 'tslib';
-
 /**
  * @file resize-sensor.js.
  * @author fex
@@ -13,16 +11,22 @@ var EventQueue = /** @class */ (function () {
     function EventQueue() {
         this.q = [];
     }
-    EventQueue.prototype.add = function (cb) {
-        this.q.push(cb);
+    EventQueue.prototype.add = function (cb, type) {
+        if (type === void 0) { type = 'both'; }
+        this.q.push({
+            fn: cb,
+            type: type
+        });
     };
-    EventQueue.prototype.call = function () {
+    EventQueue.prototype.call = function (type) {
         var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            args[_i - 1] = arguments[_i];
         }
-        this.q.forEach(function (fn) {
-            fn.apply(void 0, __spreadArray([], __read(args), false));
+        this.q.forEach(function (item) {
+            if (item.type === type || item.type === 'both' || type === 'both') {
+                item.fn.apply(null, args);
+            }
         });
     };
     return EventQueue;
@@ -39,16 +43,17 @@ function getComputedStyle(element, prop) {
         return element.style[prop];
     }
 }
-function attachResizeEvent(element, resized) {
+function attachResizeEvent(element, resized, type) {
+    if (type === void 0) { type = 'both'; }
     if (!element) {
         return;
     }
     if (!element.resizedAttached) {
         element.resizedAttached = new EventQueue();
-        element.resizedAttached.add(resized);
+        element.resizedAttached.add(resized, type);
     }
     else if (element.resizedAttached) {
-        element.resizedAttached.add(resized);
+        element.resizedAttached.add(resized, type);
         return;
     }
     var resizeSensor = (element.resizeSensor =
@@ -90,9 +95,10 @@ function attachResizeEvent(element, resized) {
         }
     };
     reset();
-    var changed = function () {
+    var changed = function (type) {
+        if (type === void 0) { type = 'both'; }
         if (element.resizedAttached) {
-            element.resizedAttached.call();
+            element.resizedAttached.call(type);
         }
     };
     var addEvent = function (el, name, cb) {
@@ -112,9 +118,14 @@ function attachResizeEvent(element, resized) {
         }
     };
     var onScroll = function (e) {
-        if (element.offsetWidth != lastWidth ||
-            element.offsetHeight != lastHeight) {
-            changed();
+        var widthChanged = element.offsetWidth != lastWidth;
+        var heightChanged = element.offsetHeight != lastHeight;
+        if (widthChanged || heightChanged) {
+            changed(widthChanged && heightChanged
+                ? 'both'
+                : widthChanged
+                    ? 'width'
+                    : 'height');
         }
         reset();
     };
@@ -146,8 +157,9 @@ function detach(element) {
         delete element.originPosition;
     }
 }
-function resizeSensor(element, callback, once) {
+function resizeSensor(element, callback, once, type) {
     if (once === void 0) { once = false; }
+    if (type === void 0) { type = 'both'; }
     if (!element) {
         return function () { };
     }
@@ -157,10 +169,10 @@ function resizeSensor(element, callback, once) {
             callback.apply(this, arguments);
             disposeEvent === null || disposeEvent === void 0 ? void 0 : disposeEvent();
             detach(element);
-        });
-        return;
+        }, type);
+        return function () { };
     }
-    disposeEvent = attachResizeEvent(element, callback);
+    disposeEvent = attachResizeEvent(element, callback, type);
     var detached = false;
     return function () {
         if (detached)

package/esm/utils/resolveCondition.js

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

package/esm/utils/resolveVariable.js

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

package/esm/utils/resolveVariableAndFilter.js

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

package/esm/utils/resolveVariableAndFilterForAsync.js

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

package/esm/utils/scrollPosition.js

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

package/esm/utils/string2regExp.js

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

package/esm/utils/stripNumber.js

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

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

@@ -7,19 +7,10 @@ interface extra {
     pre?: string;
     suf?: string;
 }
-export declare function findOrCreactStyle(id: string): HTMLElement;
-export declare function insertStyle(style: string, id: string): void;
+export declare function findOrCreateStyle(id: string, doc?: Document): HTMLElement;
+export declare function insertStyle(style: string, id: string, doc?: Document): void;
 export declare function addStyle(style: string, id: string): void;
-export declare function formatStyle(themeCss: any, classNames: {
-    key: string;
-    value?: string;
-    weights?: {
-        default?: extra;
-        hover?: extra;
-        active?: extra;
-        disabled?: extra;
-    };
-}[], id?: string, defaultData?: any): {
+export declare function formatStyle(themeCss: any, classNames?: CustomStyleClassName[], id?: string, defaultData?: any): {
     value: string;
     origin: {
         className: string;
@@ -28,7 +19,6 @@ export declare function formatStyle(themeCss: any, classNames: {
 };
 export interface CustomStyleClassName {
     key: string;
-    value?: string;
     weights?: {
         default?: extra;
         hover?: extra;
@@ -36,9 +26,27 @@ export interface CustomStyleClassName {
         disabled?: extra;
     };
 }
-export declare function insertCustomStyle(themeCss: any, classNames: CustomStyleClassName[], id?: string, defaultData?: any, customStyleClassPrefix?: string): void;
+export declare function insertCustomStyle(themeCss: any, classNames: CustomStyleClassName[], id: string, defaultData?: any, customStyleClassPrefix?: string, doc?: Document): void;
 /**
  * 根据路径获取默认值
  */
 export declare function getValueByPath(path: string, data: any): any;
+/**
+ * 设置源码编辑自定义样式
+ */
+export declare function insertEditCustomStyle(customStyle: any, id?: string, doc?: Document): void;
+export interface InsertCustomStyle {
+    themeCss: any;
+    classNames: CustomStyleClassName[];
+    id?: string;
+    defaultData?: any;
+    customStyleClassPrefix?: string;
+    doc?: Document;
+}
+/**
+ * 移除自定义样式
+ */
+export declare function removeCustomStyle(type: string, id: string, doc?: Document): void;
+export declare function formatInputThemeCss(themeCss: any): any;
+export declare function setThemeClassName(name: string, id?: string, themeCss?: any, extra?: string): string;
 export {};

package/esm/utils/style-helper.js

@@ -1,11 +1,14 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 
 import { __values } from 'tslib';
 import { uuid } from './helper.js';
 import cloneDeep from 'lodash/cloneDeep';
+import isObject from 'lodash/isObject';
+import map from 'lodash/map';
+import isEmpty from 'lodash/isEmpty';
 
 var valueMap = {
     'marginTop': 'margin-top',
@@ -36,22 +39,26 @@ var inheritValueMap = {
     background: 'bg-color',
     radius: 'border'
 };
-function findOrCreactStyle(id) {
-    var varStyleTag = document.getElementById(id);
+function findOrCreateStyle(id, doc) {
+    doc = doc || document;
+    var varStyleTag = doc.getElementById(id);
     if (!varStyleTag) {
-        varStyleTag = document.createElement('style');
+        varStyleTag = doc.createElement('style');
         varStyleTag.id = id;
-        document.body.appendChild(varStyleTag);
+        doc.body.appendChild(varStyleTag);
     }
     return varStyleTag;
 }
-function insertStyle(style, id) {
-    var varStyleTag = findOrCreactStyle(id);
+function insertStyle(style, id, doc) {
+    var varStyleTag = findOrCreateStyle(id, doc);
     // bca-disable-line
     varStyleTag.innerHTML = style;
+    if (!style) {
+        varStyleTag.remove();
+    }
 }
 function addStyle(style, id) {
-    var varStyleTag = findOrCreactStyle(id);
+    var varStyleTag = findOrCreateStyle(id);
     // bca-disable-line
     varStyleTag.innerHTML += style;
 }
@@ -62,9 +69,9 @@ function handleInheritData(statusMap, data) {
     }
     // 检查是否存在inherit
     ['hover', 'active'].forEach(function (status) {
-        for (var key in statusMap[status]) {
+        Object.keys(statusMap[status]).forEach(function (key) {
             if (typeof statusMap[status][key] === 'object') {
-                for (var style in statusMap[status][key]) {
+                Object.keys(statusMap[status][key]).forEach(function (style) {
                     if (statusMap[status][key][style] === 'inherit') {
                         // 值为inherit时设置为default的值或者主题中的default值
                         if (statusMap['default'][key] && statusMap['default'][key][style]) {
@@ -76,7 +83,7 @@ function handleInheritData(statusMap, data) {
                                 data['default'].body[value][style];
                         }
                     }
-                }
+                });
             }
             else {
                 if (statusMap[status][key] === 'inherit') {
@@ -89,13 +96,13 @@ function handleInheritData(statusMap, data) {
                     }
                 }
             }
-        }
+        });
     });
 }
 function formatStyle(themeCss, classNames, id, defaultData) {
     var e_1, _a;
-    var _b;
-    if (!themeCss) {
+    // 没有具体的样式，或者没有对应的classname
+    if (!themeCss || !classNames) {
         return { value: '', origin: [] };
     }
     var res = [];
@@ -106,124 +113,97 @@ function formatStyle(themeCss, classNames, id, defaultData) {
         disabled: '.is-disabled'
     };
     var _loop_1 = function (item) {
-        var e_2, _c;
         var body = themeCss[item.key];
-        var list = (_b = item.value) === null || _b === void 0 ? void 0 : _b.split(' ');
-        var classNameList = [];
         if (!body) {
             return "continue";
         }
-        list === null || list === void 0 ? void 0 : list.forEach(function (n) {
-            if (/(\S*[C|c]lassName-\S*)/.test(n) &&
-                !!~n.indexOf((id === null || id === void 0 ? void 0 : id.replace('u:', '').replace('-label', '').replace('-description', '').replace('-addOn', '').replace('-icon', '').replace('-inner', '')) || '')) {
-                classNameList.push(n);
-            }
-        });
+        var className = item.key + '-' + (id === null || id === void 0 ? void 0 : id.replace('u:', ''));
         var weightsList = item.weights || {};
-        try {
-            for (var classNameList_1 = (e_2 = void 0, __values(classNameList)), classNameList_1_1 = classNameList_1.next(); !classNameList_1_1.done; classNameList_1_1 = classNameList_1.next()) {
-                var className = classNameList_1_1.value;
-                // 没有具体的样式，或者没有对应的classname
-                var statusMap = {
-                    default: {},
-                    hover: {},
-                    active: {},
-                    disabled: {}
-                };
-                for (var key in body) {
-                    if (key === '$$id') {
-                        continue;
-                    }
-                    if (!!~key.indexOf(':default')) {
-                        statusMap.default[key.replace(':default', '')] = body[key];
-                    }
-                    else if (!!~key.indexOf(':hover')) {
-                        statusMap.hover[key.replace(':hover', '')] = body[key];
-                    }
-                    else if (!!~key.indexOf(':active')) {
-                        statusMap.active[key.replace(':active', '')] = body[key];
-                    }
-                    else if (!!~key.indexOf(':disabled')) {
-                        statusMap.disabled[key.replace(':disabled', '')] = body[key];
-                    }
-                    else {
-                        statusMap.default[key] = body[key];
-                    }
+        var statusMap = {
+            default: {},
+            hover: {},
+            active: {},
+            disabled: {}
+        };
+        Object.keys(body).forEach(function (key) {
+            if (key !== '$$id' && body[key]) {
+                if (!!~key.indexOf(':default')) {
+                    statusMap.default[key.replace(':default', '')] = body[key];
                 }
-                handleInheritData(statusMap, defaultData);
-                var _loop_2 = function (status_1) {
-                    var weights = weightsList[status_1];
-                    var styles = [];
-                    var fn = function (key, value) {
-                        key = valueMap[key] || key;
-                        styles.push("".concat(key, ": ").concat(value, ";"));
-                    };
-                    for (var key in statusMap[status_1]) {
-                        if (key === '$$id') {
-                            continue;
+                else if (!!~key.indexOf(':hover')) {
+                    statusMap.hover[key.replace(':hover', '')] = body[key];
+                }
+                else if (!!~key.indexOf(':active')) {
+                    statusMap.active[key.replace(':active', '')] = body[key];
+                }
+                else if (!!~key.indexOf(':disabled')) {
+                    statusMap.disabled[key.replace(':disabled', '')] = body[key];
+                }
+                else {
+                    statusMap.default[key] = body[key];
+                }
+            }
+        });
+        handleInheritData(statusMap, defaultData);
+        Object.keys(statusMap).forEach(function (status) {
+            var weights = weightsList[status];
+            var styles = [];
+            var fn = function (key, value) {
+                key = valueMap[key] || key;
+                styles.push("".concat(key, ": ").concat(value, ";"));
+            };
+            Object.keys(statusMap[status]).forEach(function (key) {
+                if (key !== '$$id') {
+                    var style_1 = statusMap[status][key];
+                    if (typeof style_1 === 'object') {
+                        // 圆角特殊处理
+                        if (key === 'radius') {
+                            fn('border-radius', [
+                                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
+                            ].join(' '));
                         }
-                        var style = statusMap[status_1][key];
-                        if (typeof style === 'object') {
-                            // 圆角特殊处理
-                            if (key === 'radius') {
-                                fn('border-radius', [
-                                    style['top-left-border-radius'],
-                                    style['top-right-border-radius'],
-                                    style['bottom-right-border-radius'],
-                                    style['bottom-left-border-radius']
-                                ].join(' '));
-                            }
-                            else {
-                                for (var k in style) {
-                                    if (k === '$$id') {
-                                        continue;
-                                    }
-                                    var value = style[k];
+                        else {
+                            Object.keys(style_1).forEach(function (k) {
+                                if (k !== '$$id') {
+                                    var value = style_1[k];
                                     value && fn(k, value);
                                 }
-                            }
+                            });
+                        }
+                    }
+                    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' : ''));
                         }
                         else {
-                            var value = style;
-                            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' : ''));
-                            }
-                            else {
-                                value &&
-                                    fn(key, value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
-                            }
+                            value &&
+                                fn(key, value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
                         }
                     }
-                    if (styles.length > 0) {
-                        var cx = ((weights === null || weights === void 0 ? void 0 : weights.pre) || '') + className + ((weights === null || weights === void 0 ? void 0 : weights.suf) || '');
-                        var inner = (weights === null || weights === void 0 ? void 0 : weights.inner) || '';
-                        res.push({
-                            className: cx + status2string[status_1] + inner,
-                            content: ".".concat(cx + status2string[status_1], " ").concat(inner, "{\n  ").concat(styles.join('\n  '), "\n}")
-                        });
-                        // TODO:切换状态暂时先不改变组件的样式
-                        // if (['hover', 'active', 'disabled'].includes(status)) {
-                        //   res.push({
-                        //     className: cx + '.' + status,
-                        //     content: `.${cx}.${status} {\n  ${styles.join('\n  ')}\n}`
-                        //   });
-                        // }
-                    }
-                };
-                for (var status_1 in statusMap) {
-                    _loop_2(status_1);
                 }
+            });
+            if (styles.length > 0) {
+                var cx = ((weights === null || weights === void 0 ? void 0 : weights.pre) || '') + className + ((weights === null || weights === void 0 ? void 0 : weights.suf) || '');
+                var inner = (weights === null || weights === void 0 ? void 0 : weights.inner) || '';
+                res.push({
+                    className: cx + status2string[status] + inner,
+                    content: ".".concat(cx + status2string[status], " ").concat(inner, "{\n  ").concat(styles.join('\n  '), "\n}")
+                });
+                // TODO:切换状态暂时先不改变组件的样式
+                // if (['hover', 'active', 'disabled'].includes(status)) {
+                //   res.push({
+                //     className: cx + '.' + status,
+                //     content: `.${cx}.${status} {\n  ${styles.join('\n  ')}\n}`
+                //   });
+                // }
             }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (classNameList_1_1 && !classNameList_1_1.done && (_c = classNameList_1.return)) _c.call(classNameList_1);
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
+        });
     };
     try {
         for (var classNames_1 = __values(classNames), classNames_1_1 = classNames_1.next(); !classNames_1_1.done; classNames_1_1 = classNames_1.next()) {
@@ -243,7 +223,7 @@ function formatStyle(themeCss, classNames, id, defaultData) {
         origin: res
     };
 }
-function insertCustomStyle(themeCss, classNames, id, defaultData, customStyleClassPrefix) {
+function insertCustomStyle(themeCss, classNames, id, defaultData, customStyleClassPrefix, doc) {
     if (!themeCss) {
         return;
     }
@@ -252,7 +232,7 @@ function insertCustomStyle(themeCss, classNames, id, defaultData, customStyleCla
         value = customStyleClassPrefix
             ? "".concat(customStyleClassPrefix, " ").concat(value)
             : value;
-        insertStyle(value, (id === null || id === void 0 ? void 0 : id.replace('u:', '')) || uuid());
+        insertStyle(value, id.replace('u:', ''), doc);
     }
 }
 /**
@@ -274,5 +254,86 @@ function getValueByPath(path, data) {
         return null;
     }
 }
+// 递归处理嵌套的样式，转化成一维对象
+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;
+                traverseStyle(style[key], nowPath, result);
+            }
+            else if (path === '') {
+                !result[key] && (result[key] = {});
+                result[key] = style[key];
+            }
+            else {
+                !result[path] && (result[path] = {});
+                result[path][key] = style[key];
+            }
+        }
+    });
+}
+/**
+ * 设置源码编辑自定义样式
+ */
+function insertEditCustomStyle(customStyle, id, doc) {
+    var styles = {};
+    traverseStyle(customStyle, '', styles);
+    var content = '';
+    if (!isEmpty(styles)) {
+        var className_1 = "wrapperCustomStyle-".concat(id === null || id === void 0 ? void 0 : id.replace('u:', ''));
+        Object.keys(styles).forEach(function (key) {
+            if (!isObject(styles[key])) {
+                content += "\n.".concat(className_1, " {\n  ").concat(key, ": ").concat(styles[key], "\n}");
+            }
+            else if (key === 'root') {
+                var res = map(styles[key], function (value, key) { return "".concat(key, ": ").concat(value, ";"); });
+                content += "\n.".concat(className_1, " {\n  ").concat(res.join('\n  '), "\n}");
+            }
+            else if (/^root:/.test(key)) {
+                var res = map(styles[key], function (value, key) { return "".concat(key, ": ").concat(value, ";"); });
+                var nowKey = key.replace('root', '');
+                content += "\n.".concat(className_1, " ").concat(nowKey, " {\n  ").concat(res.join('\n  '), "\n}");
+            }
+            else {
+                var res = map(styles[key], function (value, key) { return "".concat(key, ": ").concat(value, ";"); });
+                content += "\n.".concat(className_1, " ").concat(key, " {\n  ").concat(res.join('\n  '), "\n}");
+            }
+        });
+    }
+    insertStyle(content, 'wrapperCustomStyle-' + ((id === null || id === void 0 ? void 0 : id.replace('u:', '')) || uuid()), doc);
+}
+/**
+ * 移除自定义样式
+ */
+function removeCustomStyle(type, id, doc) {
+    var style = (doc || document).getElementById((type ? type + '-' : '') + id.replace('u:', ''));
+    if (style) {
+        style.remove();
+    }
+}
+function formatInputThemeCss(themeCss) {
+    if (!themeCss) {
+        return;
+    }
+    var inputFontThemeCss = { inputControlClassName: {} };
+    var inputControlClassNameObject = (themeCss === null || themeCss === void 0 ? void 0 : themeCss.inputControlClassName) || {};
+    Object.keys(inputControlClassNameObject).forEach(function (key) {
+        if (~key.indexOf('font')) {
+            inputFontThemeCss.inputControlClassName[key] =
+                inputControlClassNameObject[key];
+        }
+    });
+    return inputFontThemeCss;
+}
+function setThemeClassName(name, id, themeCss, extra) {
+    if (!id || !themeCss) {
+        return '';
+    }
+    if (name !== 'wrapperCustomStyle' && !themeCss[name]) {
+        return '';
+    }
+    return "".concat(name, "-").concat(id.replace('u:', '')) + (extra ? "-".concat(extra) : '');
+}
 
-export { addStyle, findOrCreactStyle, formatStyle, getValueByPath, inheritValueMap, insertCustomStyle, insertStyle, valueMap };
+export { addStyle, findOrCreateStyle, formatInputThemeCss, formatStyle, getValueByPath, inheritValueMap, insertCustomStyle, insertEditCustomStyle, insertStyle, removeCustomStyle, setThemeClassName, valueMap };

package/esm/utils/style.js

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

package/esm/utils/toNumber.js

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

package/esm/utils/tokenize.js

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

package/esm/utils/tpl-builtin.js

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

package/esm/utils/tpl-lodash.js

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