amis-core 3.6.4 → 6.1.0

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/keyToPath.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/labelToString.d.ts

@@ -0,0 +1 @@
+export declare function labelToString(label: any): string;

package/lib/utils/labelToString.js

@@ -0,0 +1,46 @@
+/**
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var isPlainObject = require('lodash/isPlainObject');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
+
+function labelToString(label) {
+    var e_1, _a;
+    var type = typeof label;
+    if (type === 'string') {
+        return label;
+    }
+    else if (type === 'number') {
+        return "".concat(label);
+    }
+    if (isPlainObject__default["default"](label)) {
+        try {
+            for (var _b = tslib.__values(['__title', 'label', Object.keys(label)[0]]), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var key = _c.value;
+                if (typeof label[key] === 'string') {
+                    return label[key];
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+    }
+    return 'invalid label';
+}
+
+exports.labelToString = labelToString;

package/lib/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -19,7 +19,7 @@ var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
 var rendererEventListeners = [];
 // 创建渲染器事件对象
 function createRendererEvent(type, context) {
-    var rendererEvent = {
+    var rendererEvent = Object.defineProperties({
         context: object.extendObject({ pristineData: context.data }, context),
         type: type,
         prevented: false,
@@ -39,7 +39,23 @@ function createRendererEvent(type, context) {
         setData: function (data) {
             rendererEvent.context.data = data;
         }
-    };
+    }, {
+        context: {
+            enumerable: false
+        },
+        pristineData: {
+            enumerable: false
+        },
+        preventDefault: {
+            enumerable: false
+        },
+        stopPropagation: {
+            enumerable: false
+        },
+        setData: {
+            enumerable: false
+        }
+    });
     return rendererEvent;
 }
 // 绑定事件

package/lib/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,19 +8,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var cloneDeep = require('lodash/cloneDeep');
 var helper = require('./helper.js');
 var object = require('./object.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
-
 function replaceText(schema, replaceText, replaceTextIgnoreKeys) {
     // 进行文本替换
     if (replaceText && object.isObject(replaceText)) {
-        var replicaSchema = cloneDeep__default["default"](schema);
         var replaceKeys_1 = Object.keys(replaceText);
+        if (!replaceKeys_1.length) {
+            return schema;
+        }
         replaceKeys_1.sort(function (a, b) { return b.length - a.length; }); // 避免用户将短的放前面
         var IgnoreKeys_1 = new Set(Array.isArray(replaceTextIgnoreKeys) ? replaceTextIgnoreKeys : []);
         var ignore_1 = typeof replaceTextIgnoreKeys === 'function'
@@ -28,17 +25,14 @@ function replaceText(schema, replaceText, replaceTextIgnoreKeys) {
             : function (key) {
                 return IgnoreKeys_1.has(key);
             };
-        helper.JSONTraverse(replicaSchema, function (value, key, object) {
+        return helper.JSONValueMap(schema, function (value, key, object) {
             var e_1, _a;
-            var descriptor = Object.getOwnPropertyDescriptor(object, key);
-            if (typeof value === 'string' &&
-                (descriptor === null || descriptor === void 0 ? void 0 : descriptor.writable) &&
-                !ignore_1(key, value, object)) {
+            if (typeof value === 'string' && !ignore_1(key, value, object)) {
                 try {
                     for (var replaceKeys_2 = tslib.__values(replaceKeys_1), replaceKeys_2_1 = replaceKeys_2.next(); !replaceKeys_2_1.done; replaceKeys_2_1 = replaceKeys_2.next()) {
                         var replaceKey = replaceKeys_2_1.value;
                         if (~value.indexOf(replaceKey)) {
-                            value = object[key] = value.replaceAll(replaceKey, replaceText[replaceKey]);
+                            return value.replaceAll(replaceKey, replaceText[replaceKey]);
                         }
                     }
                 }
@@ -50,8 +44,8 @@ function replaceText(schema, replaceText, replaceTextIgnoreKeys) {
                     finally { if (e_1) throw e_1.error; }
                 }
             }
+            return value;
         });
-        return replicaSchema;
     }
     return schema;
 }

package/lib/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/string2regExp.d.ts

@@ -1 +1 @@
-export declare function string2regExp(value: string, caseSensitive?: boolean): RegExp;
+export declare function string2regExp(value: string, caseSensitive?: boolean, globalSearch?: boolean): RegExp;

package/lib/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -7,12 +7,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function string2regExp(value, caseSensitive) {
+function string2regExp(value, caseSensitive, globalSearch) {
     if (caseSensitive === void 0) { caseSensitive = false; }
+    if (globalSearch === void 0) { globalSearch = false; }
     if (typeof value !== 'string') {
         throw new TypeError('Expected a string');
     }
-    return new RegExp(value.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d'), !caseSensitive ? 'i' : '');
+    return new RegExp(value.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d'), "".concat(!caseSensitive ? 'i' : '').concat(globalSearch ? 'g' : ''));
 }
 
 exports.string2regExp = string2regExp;

package/lib/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

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

@@ -10,7 +10,7 @@ interface extra {
 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?: CustomStyleClassName[], id?: string, defaultData?: any): {
+export declare function formatStyle(themeCss: any, classNames?: CustomStyleClassName[], id?: string, defaultData?: any, data?: any): {
     value: string;
     origin: {
         className: string;
@@ -26,7 +26,15 @@ export interface CustomStyleClassName {
         disabled?: extra;
     };
 }
-export declare function insertCustomStyle(themeCss: any, classNames: CustomStyleClassName[], id: string, defaultData?: any, customStyleClassPrefix?: string, doc?: Document): void;
+export declare function insertCustomStyle(prams: {
+    themeCss: any;
+    classNames: CustomStyleClassName[];
+    id: string;
+    defaultData?: any;
+    customStyleClassPrefix?: string;
+    doc?: Document;
+    [propName: string]: any;
+}): void;
 /**
  * 根据路径获取默认值
  */
@@ -34,7 +42,12 @@ export declare function getValueByPath(path: string, data: any): any;
 /**
  * 设置源码编辑自定义样式
  */
-export declare function insertEditCustomStyle(customStyle: any, id?: string, doc?: Document): void;
+export declare function insertEditCustomStyle(params: {
+    customStyle: any;
+    id?: string;
+    doc?: Document;
+    [propName: string]: any;
+}): void;
 export interface InsertCustomStyle {
     themeCss: any;
     classNames: CustomStyleClassName[];
@@ -46,7 +59,13 @@ export interface InsertCustomStyle {
 /**
  * 移除自定义样式
  */
-export declare function removeCustomStyle(type: string, id: string, doc?: Document): void;
+export declare function removeCustomStyle(type: string, id: string, doc?: Document, data?: any): void;
 export declare function formatInputThemeCss(themeCss: any): any;
-export declare function setThemeClassName(name: string, id?: string, themeCss?: any, extra?: string): string;
+export declare function setThemeClassName(params: {
+    name: string;
+    id?: string;
+    themeCss: any;
+    extra?: string;
+    [propName: string]: any;
+}): string;
 export {};

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,6 +14,7 @@ var isObject = require('lodash/isObject');
 var map = require('lodash/map');
 var isEmpty = require('lodash/isEmpty');
 var kebabCase = require('lodash/kebabCase');
+var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -112,7 +113,7 @@ function handleInheritData(statusMap, data) {
         });
     });
 }
-function formatStyle(themeCss, classNames, id, defaultData) {
+function formatStyle(themeCss, classNames, id, defaultData, data) {
     var e_1, _a;
     // 没有具体的样式，或者没有对应的classname
     if (!themeCss || !classNames) {
@@ -132,6 +133,9 @@ function formatStyle(themeCss, classNames, id, defaultData) {
         }
         var className = item.key + '-' + (id === null || id === void 0 ? void 0 : id.replace('u:', ''));
         var weightsList = item.weights || {};
+        if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+            className += "-".concat(data.index);
+        }
         var statusMap = {
             default: {},
             hover: {},
@@ -163,7 +167,8 @@ 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 + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''), ";"));
+                value = resolveVariableAndFilter.resolveVariableAndFilter(value, data, '| raw') || value;
+                styles.push("".concat(key.startsWith('--') ? key : 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,16 +180,14 @@ 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,
-                                (weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''
+                                style_1['bottom-left-border-radius'] || 0
                             ].join(' '));
                         }
                         else {
                             Object.keys(style_1).forEach(function (k) {
                                 if (k !== '$$id') {
                                     var value = style_1[k];
-                                    value &&
-                                        fn(k, value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
+                                    value && fn(k, value);
                                 }
                             });
                         }
@@ -237,13 +240,18 @@ function formatStyle(themeCss, classNames, id, defaultData) {
         origin: res
     };
 }
-function insertCustomStyle(themeCss, classNames, id, defaultData, customStyleClassPrefix, doc) {
+function insertCustomStyle(prams) {
+    var themeCss = prams.themeCss, classNames = prams.classNames, id = prams.id, defaultData = prams.defaultData, customStyleClassPrefix = prams.customStyleClassPrefix, doc = prams.doc, data = prams.data;
     if (!themeCss) {
         return;
     }
-    var value = formatStyle(themeCss, classNames, id, defaultData).value;
+    var value = formatStyle(themeCss, classNames, id, defaultData, data).value;
     value = customStyleClassPrefix ? "".concat(customStyleClassPrefix, " ").concat(value) : value;
-    insertStyle(value, id.replace('u:', ''), doc);
+    var classId = id.replace('u:', '');
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+        classId += "-".concat(data.index);
+    }
+    insertStyle(value, classId, doc);
 }
 /**
  * 根据路径获取默认值
@@ -286,38 +294,53 @@ function traverseStyle(style, path, result) {
 /**
  * 设置源码编辑自定义样式
  */
-function insertEditCustomStyle(customStyle, id, doc) {
+function insertEditCustomStyle(params) {
+    var customStyle = params.customStyle, id = params.id, doc = params.doc, data = params.data;
     var styles = {};
     traverseStyle(customStyle, '', styles);
     var content = '';
+    var index = '';
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+        index = "-".concat(data.index);
+    }
     if (!isEmpty__default["default"](styles)) {
-        var className_1 = "wrapperCustomStyle-".concat(id === null || id === void 0 ? void 0 : id.replace('u:', ''));
+        var className_1 = "wrapperCustomStyle-".concat(id === null || id === void 0 ? void 0 : id.replace('u:', '')).concat(index);
         Object.keys(styles).forEach(function (key) {
             if (!isObject__default["default"](styles[key])) {
-                content += "\n.".concat(className_1, " {\n  ").concat(key, ": ").concat(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(value, ";"); });
+                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)) {
-                var res = map__default["default"](styles[key], function (value, key) { return "".concat(key, ": ").concat(value, ";"); });
+                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}");
             }
             else {
-                var res = map__default["default"](styles[key], function (value, key) { return "".concat(key, ": ").concat(value, ";"); });
+                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}");
             }
         });
     }
-    insertStyle(content, 'wrapperCustomStyle-' + ((id === null || id === void 0 ? void 0 : id.replace('u:', '')) || helper.uuid()), doc);
+    insertStyle(content, 'wrapperCustomStyle-' + ((id === null || id === void 0 ? void 0 : id.replace('u:', '')) || helper.uuid()) + index, doc);
 }
 /**
  * 移除自定义样式
  */
-function removeCustomStyle(type, id, doc) {
-    var style = (doc || document).getElementById('amis-' + (type ? type + '-' : '') + id.replace('u:', ''));
+function removeCustomStyle(type, id, doc, data) {
+    var styleId = 'amis-' + (type ? type + '-' : '') + id.replace('u:', '');
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+        styleId += "-".concat(data.index);
+    }
+    var style = (doc || document).getElementById(styleId);
     if (style) {
         style.remove();
     }
@@ -336,14 +359,19 @@ function formatInputThemeCss(themeCss) {
     });
     return inputFontThemeCss;
 }
-function setThemeClassName(name, id, themeCss, extra) {
+function setThemeClassName(params) {
+    var name = params.name, id = params.id, themeCss = params.themeCss, extra = params.extra, data = params.data;
     if (!id || !themeCss) {
         return '';
     }
     if (name !== 'wrapperCustomStyle' && !themeCss[name]) {
         return '';
     }
-    return "".concat(name, "-").concat(id.replace('u:', '')) + (extra ? "-".concat(extra) : '');
+    var index = '';
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+        index = "-".concat(data.index);
+    }
+    return "".concat(name, "-").concat(id.replace('u:', '')) + (extra ? "-".concat(extra) : '') + index;
 }
 
 exports.addStyle = addStyle;

package/lib/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tokenize.d.ts

@@ -1 +1,2 @@
+export declare function memoParse(str: string, options?: any): any;
 export declare const tokenize: (str: string, data: object, defaultFilter?: string) => string;

package/lib/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -9,13 +9,20 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var amisFormula = require('amis-formula');
 
+var AST_CACHE = {};
+function memoParse(str, options) {
+    var key = "".concat(str).concat((options === null || options === void 0 ? void 0 : options.evalMode) ? '-eval' : '').concat((options === null || options === void 0 ? void 0 : options.allowFilter) ? '-filter' : '').concat((options === null || options === void 0 ? void 0 : options.variableMode) ? '-variable' : '');
+    var ast = AST_CACHE[key] || amisFormula.parse(str, options);
+    AST_CACHE[key] = ast;
+    return ast;
+}
 var tokenize = function (str, data, defaultFilter) {
     if (defaultFilter === void 0) { defaultFilter = '| html'; }
     if (!str || typeof str !== 'string') {
         return str;
     }
     try {
-        var ast = amisFormula.parse(str, {
+        var ast = memoParse(str, {
             evalMode: false,
             allowFilter: true
         });
@@ -30,4 +37,5 @@ var tokenize = function (str, data, defaultFilter) {
     }
 };
 
+exports.memoParse = memoParse;
 exports.tokenize = tokenize;

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */