amis-core 6.14.0-beta.4 → 6.14.0-beta.5

package/lib/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

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

@@ -54,16 +54,19 @@ export declare function insertCustomStyle(params: {
     defaultData?: any;
     customStyleClassPrefix?: string;
     doc?: Document;
+    cssHasExpression?: boolean;
     [propName: string]: any;
 }): void;
 /**
  * 根据路径获取默认值
  */
 export declare function getValueByPath(path: string, data: any): any;
+export declare function hasExpression(customStyle: any): boolean;
 export declare function formatCustomStyle(params: {
     customStyle: any;
     id?: string;
     doc?: Document;
+    cssHasExpression?: boolean;
     customStyleClassPrefix?: string;
     [propName: string]: any;
 }): {
@@ -78,6 +81,7 @@ export declare function insertEditCustomStyle(params: {
     customStyle: any;
     id?: string;
     doc?: Document;
+    cssHasExpression?: boolean;
     customStyleClassPrefix?: string;
     [propName: string]: any;
 }): string;
@@ -92,7 +96,7 @@ export interface InsertCustomStyle {
 /**
  * 移除自定义样式
  */
-export declare function removeCustomStyle(type: string, id: string, doc?: Document, data?: any): void;
+export declare function removeCustomStyle(type: string, id: string, doc?: Document, data?: any, cssHasExpression?: boolean): void;
 export declare function formatInputThemeCss(themeCss: any): any;
 export declare function setThemeClassName(params: {
     name: string | string[];

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 
@@ -15,6 +15,8 @@ var map = require('lodash/map');
 var isEmpty = require('lodash/isEmpty');
 var kebabCase = require('lodash/kebabCase');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
+var some = require('lodash/some');
+var formula = require('./formula.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -23,6 +25,7 @@ var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
 var map__default = /*#__PURE__*/_interopDefaultLegacy(map);
 var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
 var kebabCase__default = /*#__PURE__*/_interopDefaultLegacy(kebabCase);
+var some__default = /*#__PURE__*/_interopDefaultLegacy(some);
 
 var valueMap = {
     'marginTop': 'margin-top',
@@ -167,7 +170,8 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
         }
         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') {
+        var cssHasExpression = hasExpression(body);
+        if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number' && cssHasExpression !== false) {
             className += "-".concat(data.index);
         }
         var statusMap = {
@@ -281,14 +285,14 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
 }
 function insertCustomStyle(params) {
     var _a;
-    var themeCss = params.themeCss, classNames = params.classNames, id = params.id, defaultData = params.defaultData, customStyleClassPrefix = params.customStyleClassPrefix, doc = params.doc, data = params.data;
+    var themeCss = params.themeCss, classNames = params.classNames, id = params.id, defaultData = params.defaultData, customStyleClassPrefix = params.customStyleClassPrefix, doc = params.doc, data = params.data, cssHasExpression = params.cssHasExpression;
     if (!themeCss) {
         return;
     }
     var value = formatStyle(themeCss, classNames, id, defaultData, data).value;
     value = customStyleClassPrefix ? "".concat(customStyleClassPrefix, " ").concat(value) : value;
     var classId = ((_a = id === null || id === void 0 ? void 0 : id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id + '';
-    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number' && cssHasExpression !== false) {
         classId += "-".concat(data.index);
     }
     // 这里需要插入到wrapperCustomStyle的前面
@@ -346,15 +350,27 @@ function traverseStyle(style, path, result) {
         }
     });
 }
+function hasExpression(customStyle) {
+    var styles = {};
+    traverseStyle(customStyle || {}, '', styles);
+    if (!isEmpty__default["default"](styles)) {
+        return some__default["default"](Object.keys(styles), function (key) {
+            return some__default["default"](styles[key], function (value, k) {
+                return formula.isExpression(value) || formula.isExpression(k);
+            });
+        });
+    }
+    return false;
+}
 function formatCustomStyle(params) {
     var _a, _b;
-    var customStyle = params.customStyle; params.doc; var data = params.data, customStyleClassPrefix = params.customStyleClassPrefix;
+    var customStyle = params.customStyle; params.doc; var data = params.data, cssHasExpression = params.cssHasExpression, 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);
     var content = '';
     var index = '';
-    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number' && cssHasExpression !== false) {
         index = "-".concat(data.index);
     }
     if (!isEmpty__default["default"](styles)) {
@@ -364,17 +380,18 @@ function formatCustomStyle(params) {
         }
         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], data, '| raw') || styles[key]).replace(/['|"]/g, ''), "\n}");
             }
             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, ";");
+                    return "".concat(key, ": ").concat((resolveVariableAndFilter.resolveVariableAndFilter(value, data, '| raw') || value).replace(/['|"]/g, ''), ";");
                 });
                 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, ";");
+                    return "".concat(key, ": ").concat((resolveVariableAndFilter.resolveVariableAndFilter(value, data, '| raw') || value).replace(/['|"]/g, ''), ";");
                 });
                 var keys = key.split(',');
                 content += "\n".concat(keys.map(function (key) { return "".concat(className_1, " ").concat(key); }), " {\n  ").concat(res.join('\n  '), "\n}");
@@ -404,10 +421,10 @@ function insertEditCustomStyle(params) {
 /**
  * 移除自定义样式
  */
-function removeCustomStyle(type, id, doc, data) {
+function removeCustomStyle(type, id, doc, data, cssHasExpression) {
     var _a;
     var styleId = 'amis-' + (type ? type + '-' : '') + (((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id + '');
-    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number' && cssHasExpression !== false) {
         styleId += "-".concat(data.index);
     }
     var style = (doc || document).getElementById(styleId);
@@ -434,8 +451,9 @@ function setThemeClassName(params) {
     if (!id || !themeCss) {
         return '';
     }
+    var cssHasExpression = hasExpression(themeCss || {});
     var index = '';
-    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number' && cssHasExpression !== false) {
         index = "-".concat(data.index);
     }
     function setClassName(name, id) {
@@ -461,6 +479,7 @@ exports.formatCustomStyle = formatCustomStyle;
 exports.formatInputThemeCss = formatInputThemeCss;
 exports.formatStyle = formatStyle;
 exports.getValueByPath = getValueByPath;
+exports.hasExpression = hasExpression;
 exports.inheritValueMap = inheritValueMap;
 exports.insertCustomStyle = insertCustomStyle;
 exports.insertEditCustomStyle = insertEditCustomStyle;

package/lib/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/validateId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/visitedCache.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "6.14.0-beta.4",
+  "version": "6.14.0-beta.5",
   "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.14.0-beta.4",
+    "amis-formula": "^6.14.0-beta.5",
     "classnames": "2.3.2",
     "cross-env": "^7.0.3",
     "file-saver": "^2.0.2",