amis-core 6.14.0-beta.1 → 6.14.0-beta.11

package/lib/utils/renderer-event.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="react" />
-import { ListenerAction } from '../actions/Action';
 import { RendererProps } from '../factory';
 import { IScopedContext } from '../Scoped';
 import { TreeItem } from './helper';
 import type { PlainObject } from '../types';
+import { AMISAction } from '../schema';
 export interface debounceConfig {
     maxWait?: number;
     wait?: number;
@@ -19,14 +18,14 @@ export interface EventListeners {
         debounce?: debounceConfig;
         track?: trackConfig;
         weight?: number;
-        actions: ListenerAction[];
+        actions: AMISAction[];
     };
 }
 export interface OnEventProps {
     onEvent?: {
         [propName: string]: {
             weight?: number;
-            actions: ListenerAction[];
+            actions: AMISAction[];
             debounce?: debounceConfig;
             track?: trackConfig;
         };
@@ -38,7 +37,7 @@ export interface RendererEventListener {
     weight: number;
     debounce: debounceConfig | null;
     track: trackConfig | null;
-    actions: ListenerAction[];
+    actions: AMISAction[];
     executing?: boolean;
     debounceInstance?: any;
 }

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -214,11 +214,11 @@ var bindGlobalEvent = function (eventName, callback) {
 };
 // 触发事件
 function dispatchEvent(e, renderer, scoped, data, broadcast) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     return tslib.__awaiter(this, void 0, void 0, function () {
         var unbindEvent, eventName, from, eventConfig, rendererEvent, listeners, executedCount, checkExecuted, _loop_3, listeners_1, listeners_1_1, listener, state_2, e_3_1;
-        var e_3, _l;
+        var e_3, _a;
         var _this = this;
+        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         return tslib.__generator(this, function (_m) {
             switch (_m.label) {
                 case 0:
@@ -226,10 +226,10 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                     eventName = typeof e === 'string' ? e : e.type;
                     from = (renderer === null || renderer === void 0 ? void 0 : renderer.props.id) || (renderer === null || renderer === void 0 ? void 0 : renderer.props.name) || '';
                     debug.debug('event', "dispatch `".concat(eventName, "` from \u300C").concat((renderer === null || renderer === void 0 ? void 0 : renderer.props.type) || 'unknown').concat(from ? "#".concat(from) : '', "\u300D"), data);
-                    (_c = (_b = (_a = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _a === void 0 ? void 0 : _a.env) === null || _b === void 0 ? void 0 : _b.beforeDispatchEvent) === null || _c === void 0 ? void 0 : _c.call(_b, e, renderer, scoped, data, broadcast);
-                    broadcast && ((_e = (_d = renderer.props).onBroadcast) === null || _e === void 0 ? void 0 : _e.call(_d, e, broadcast, data));
+                    (_d = (_c = (_b = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _b === void 0 ? void 0 : _b.env) === null || _c === void 0 ? void 0 : _c.beforeDispatchEvent) === null || _d === void 0 ? void 0 : _d.call(_c, e, renderer, scoped, data, broadcast);
+                    broadcast && ((_f = (_e = renderer.props).onBroadcast) === null || _f === void 0 ? void 0 : _f.call(_e, e, broadcast, data));
                     if (!broadcast) {
-                        eventConfig = (_g = (_f = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _f === void 0 ? void 0 : _f.onEvent) === null || _g === void 0 ? void 0 : _g[eventName];
+                        eventConfig = (_h = (_g = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _g === void 0 ? void 0 : _g.onEvent) === null || _h === void 0 ? void 0 : _h[eventName];
                         if (!eventConfig) {
                             // 没命中也没关系
                             return [2 /*return*/, Promise.resolve()];
@@ -242,7 +242,7 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                     }
                     rendererEvent = broadcast ||
                         createRendererEvent(eventName, {
-                            env: (_h = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _h === void 0 ? void 0 : _h.env,
+                            env: (_j = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _j === void 0 ? void 0 : _j.env,
                             nativeEvent: e,
                             data: data,
                             scoped: scoped
@@ -306,7 +306,7 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                                 case 3:
                                     if (listener === null || listener === void 0 ? void 0 : listener.track) {
                                         _t = listener.track, trackId = _t.id, trackName = _t.name;
-                                        (_k = (_j = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _j === void 0 ? void 0 : _j.env) === null || _k === void 0 ? void 0 : _k.tracker({
+                                        (_l = (_k = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _k === void 0 ? void 0 : _k.env) === null || _l === void 0 ? void 0 : _l.tracker({
                                             eventType: listener.type,
                                             eventData: {
                                                 trackId: trackId,
@@ -346,7 +346,7 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                     return [3 /*break*/, 8];
                 case 7:
                     try {
-                        if (listeners_1_1 && !listeners_1_1.done && (_l = listeners_1.return)) _l.call(listeners_1);
+                        if (listeners_1_1 && !listeners_1_1.done && (_a = listeners_1.return)) _a.call(listeners_1);
                     }
                     finally { if (e_3) throw e_3.error; }
                     return [7 /*endfinally*/];
@@ -356,9 +356,9 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
     });
 }
 function dispatchGlobalEventForRenderer(eventName, renderer, scoped, data, broadcast) {
-    var _a, _b, _c, _d, _e;
     return tslib.__awaiter(this, void 0, void 0, function () {
         var from;
+        var _a, _b, _c, _d, _e;
         return tslib.__generator(this, function (_f) {
             from = (renderer === null || renderer === void 0 ? void 0 : renderer.props.id) || (renderer === null || renderer === void 0 ? void 0 : renderer.props.name) || '';
             debug.debug('event', "dispatch `".concat(eventName, "` from \u300C").concat((renderer === null || renderer === void 0 ? void 0 : renderer.props.type) || 'unknown').concat(from ? "#".concat(from) : '', "\u300D"), data);

package/lib/utils/replaceText.js

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

package/lib/utils/resize-sensor.js

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

package/lib/utils/resolveCondition.d.ts

@@ -2,6 +2,6 @@ export declare function resolveConditionAsync(conditions: any, data: any, defaul
 export declare function resolveCondition(conditions: any, data: any, defaultResult?: boolean): boolean | Promise<boolean>;
 export declare function registerConditionComputer(op: string, func: (left: any, right: any, fieldType?: string) => boolean, fieldType?: string): void;
 export declare function getConditionComputers(): {
-    [op: string]: (left: any, right: any, fieldType?: string | undefined) => boolean;
+    [op: string]: (left: any, right: any, fieldType?: string) => boolean;
 };
 export declare function setConditionComputeErrorHandler(fn: (conditions: any, data: any, defaultResult: boolean) => boolean | Promise<boolean>): void;

package/lib/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -37,10 +37,10 @@ var capitalize__default = /*#__PURE__*/_interopDefaultLegacy(capitalize);
 var conditionResolverMap = {};
 var DEFAULT_RESULT = true;
 var conditionComputeErrorHandler;
-function resolveConditionAsync(conditions, data, defaultResult) {
-    if (defaultResult === void 0) { defaultResult = true; }
-    return tslib.__awaiter(this, void 0, void 0, function () {
+function resolveConditionAsync(conditions_1, data_1) {
+    return tslib.__awaiter(this, arguments, void 0, function (conditions, data, defaultResult) {
         var e_1;
+        if (defaultResult === void 0) { defaultResult = true; }
         return tslib.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -85,10 +85,10 @@ function resolveCondition(conditions, data, defaultResult) {
         return defaultResult;
     }
 }
-function computeConditionsAsync(conditions, conjunction, data) {
-    if (conjunction === void 0) { conjunction = 'and'; }
-    return tslib.__awaiter(this, void 0, void 0, function () {
+function computeConditionsAsync(conditions_1) {
+    return tslib.__awaiter(this, arguments, void 0, function (conditions, conjunction, data) {
         var computeResult, index, len, item, result, _a;
+        if (conjunction === void 0) { conjunction = 'and'; }
         return tslib.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -140,9 +140,9 @@ function computeConditions(conditions, conjunction, data) {
     return computeResult;
 }
 function computeConditionAsync(rule, index, data) {
-    var _a;
     return tslib.__awaiter(this, void 0, void 0, function () {
         var leftValue, rightValue, func;
+        var _a;
         return tslib.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:

package/lib/utils/resolveVariable.js

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

package/lib/utils/resolveVariableAndFilter.js

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

package/lib/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -19,13 +19,17 @@ var formulaEvalErrorHandler;
 function setFormulaEvalErrorHandler(fn) {
     formulaEvalErrorHandler = fn;
 }
-var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fallbackValue, skipFormulaEvalErrorHandler) {
-    if (data === void 0) { data = {}; }
-    if (defaultFilter === void 0) { defaultFilter = '| html'; }
-    if (fallbackValue === void 0) { fallbackValue = function (value) { return value; }; }
-    if (skipFormulaEvalErrorHandler === void 0) { skipFormulaEvalErrorHandler = false; }
-    return tslib.__awaiter(void 0, void 0, void 0, function () {
+var resolveVariableAndFilterForAsync = function (path_1) {
+    var args_1 = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args_1[_i - 1] = arguments[_i];
+    }
+    return tslib.__awaiter(void 0, tslib.__spreadArray([path_1], tslib.__read(args_1), false), void 0, function (path, data, defaultFilter, fallbackValue, skipFormulaEvalErrorHandler) {
         var ast, ret, e_1;
+        if (data === void 0) { data = {}; }
+        if (defaultFilter === void 0) { defaultFilter = '| html'; }
+        if (fallbackValue === void 0) { fallbackValue = function (value) { return value; }; }
+        if (skipFormulaEvalErrorHandler === void 0) { skipFormulaEvalErrorHandler = false; }
         return tslib.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:

package/lib/utils/scrollPosition.js

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

package/lib/utils/string2regExp.js

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

package/lib/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * 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.1
+ * amis-core v6.14.0-beta.11
  * 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.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/toNumber.js

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

package/lib/utils/tokenize.js

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

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

@@ -17,4 +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;
+export declare const testResolveVariableAndFilter: (path?: string, data?: object, defaultFilter?: string, fallbackValue?: (value: any) => any) => any;

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -61,9 +61,13 @@ function register() {
                 return "error: ".concat(e.message);
             }
         },
-        asyncCompile: function (str, data, defaultFilter) {
-            if (defaultFilter === void 0) { defaultFilter = '| html'; }
-            return tslib.__awaiter(_this, void 0, void 0, function () {
+        asyncCompile: function (str_1, data_1) {
+            var args_1 = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
+            }
+            return tslib.__awaiter(_this, tslib.__spreadArray([str_1, data_1], tslib.__read(args_1), false), void 0, function (str, data, defaultFilter) {
+                if (defaultFilter === void 0) { defaultFilter = '| html'; }
                 return tslib.__generator(this, function (_a) {
                     try {
                         return [2 /*return*/, resolveVariableAndFilterForAsync.resolveVariableAndFilterForAsync(str, data, defaultFilter)];

package/lib/utils/tpl-lodash.js

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

package/lib/utils/tpl.d.ts

@@ -22,6 +22,6 @@ export declare function evalExpressionWithConditionBuilderAsync(expression: any,
  * @param data 上下文
  * @returns
  */
-export declare function evalExpressionWithConditionBuilder(expression: any, data?: object, defaultResult?: boolean): boolean | Promise<boolean>;
+export declare function evalExpressionWithConditionBuilder(expression: any, data?: object, defaultResult?: boolean): boolean;
 export declare function setCustomEvalJs(fn: (expression: string, data?: any) => any): void;
 export declare function evalJS(js: string, data: object): any;

package/lib/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -138,7 +138,11 @@ function evalExpressionWithConditionBuilderAsync(expression, data, defaultResult
 function evalExpressionWithConditionBuilder(expression, data, defaultResult) {
     // 支持ConditionBuilder
     if (Object.prototype.toString.call(expression) === '[object Object]') {
-        return resolveCondition.resolveCondition(expression, data, defaultResult);
+        var ret = resolveCondition.resolveCondition(expression, data, defaultResult);
+        if (ret === null || ret === void 0 ? void 0 : ret.then) {
+            return false;
+        }
+        return !!ret;
     }
     return evalExpression(String(expression), data);
 }

package/lib/utils/uncontrollable.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare function uncontrollable<T extends React.ComponentType<any>, P extends {
     [propName: string]: any;
 }>(arg: T, config: P, mapping?: Array<string>): T;

package/lib/utils/uncontrollable.js

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

package/lib/utils/validateId.js

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

package/lib/utils/validations.js

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

package/lib/utils/visitedCache.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "6.14.0-beta.1",
+  "version": "6.14.0-beta.11",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -42,7 +42,7 @@
     "rollup-plugin-auto-external": "^2.0.0",
     "rollup-plugin-license": "^2.7.0",
     "ts-jest": "^29.0.2",
-    "typescript": "^4.6.4"
+    "typescript": "^5.8.3"
   },
   "scripts": {
     "build": "npm run clean-dist && cross-env NODE_ENV=production rollup -c ",
@@ -59,7 +59,7 @@
   ],
   "dependencies": {
     "@rc-component/mini-decimal": "^1.0.1",
-    "amis-formula": "^6.14.0-beta.1",
+    "amis-formula": "^6.14.0-beta.11",
     "classnames": "2.3.2",
     "cross-env": "^7.0.3",
     "file-saver": "^2.0.2",
@@ -74,6 +74,7 @@
     "path-to-regexp": "6.2.0",
     "qs": "6.9.7",
     "react-intersection-observer": "9.5.2",
+    "react-is": ">=16.8.6",
     "react-json-view": "1.21.3",
     "react-overlays": "5.1.1",
     "tslib": "^2.3.1",
@@ -82,8 +83,7 @@
   "peerDependencies": {
     "amis-formula": "*",
     "react": ">=16.8.6",
-    "react-dom": ">=16.8.6",
-    "react-is": ">=16.8.6"
+    "react-dom": ">=16.8.6"
   },
   "jest": {
     "testEnvironment": "jsdom",