amis-core 6.4.1 → 6.6.0

package/lib/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -58,7 +58,8 @@ function getExprProperties(schema, data, ignoreList, props) {
         var type = parts === null || parts === void 0 ? void 0 : parts[2];
         var value = schema[key];
         if (value &&
-            typeof value === 'string' &&
+            (typeof value === 'string' ||
+                Object.prototype.toString.call(value) === '[object Object]') &&
             (parts === null || parts === void 0 ? void 0 : parts[1]) &&
             (type === 'On' || type === 'Expr')) {
             key = parts[1];
@@ -72,7 +73,9 @@ function getExprProperties(schema, data, ignoreList, props) {
                     });
                 }
                 if (type === 'On') {
-                    value = (props === null || props === void 0 ? void 0 : props[key]) || tpl.evalExpression(value, ctx || data);
+                    value =
+                        (props === null || props === void 0 ? void 0 : props[key]) ||
+                            tpl.evalExpressionWithConditionBuilder(value, ctx || data);
                 }
                 else {
                     value = tpl.filter(value, ctx || data);

package/lib/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -16,6 +16,7 @@ require('tslib');
 require('moment');
 require('lodash/isPlainObject');
 var getVariable = require('./getVariable.js');
+require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');
 var grammar = require('./grammar.js');

package/lib/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/helper.d.ts

@@ -68,7 +68,7 @@ export declare function visibilityFilter(items: any, data?: object): any;
 export declare function isDisabled(schema: {
     disabledOn?: string;
     disabled?: boolean;
-}, data?: object): boolean | "" | undefined;
+}, data?: object): boolean | "" | Promise<boolean> | undefined;
 export declare function hasAbility(schema: any, ability: string, data?: object, defaultValue?: boolean): boolean;
 export declare function makeHorizontalDeeper(horizontal: {
     left: string;

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -25,6 +25,7 @@ require('moment');
 var object = require('./object.js');
 var tokenize = require('./tokenize.js');
 var isPureVariable = require('./isPureVariable.js');
+require('@rc-component/mini-decimal');
 var resolveVariable = require('./resolveVariable.js');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');
@@ -294,8 +295,10 @@ function hasVisibleExpression(schema) {
 function isVisible(schema, data) {
     return !(schema.hidden ||
         schema.visible === false ||
-        (schema.hiddenOn && tpl.evalExpression(schema.hiddenOn, data)) ||
-        (schema.visibleOn && !tpl.evalExpression(schema.visibleOn, data)));
+        (schema.hiddenOn &&
+            tpl.evalExpressionWithConditionBuilder(schema.hiddenOn, data)) ||
+        (schema.visibleOn &&
+            !tpl.evalExpressionWithConditionBuilder(schema.visibleOn, data)));
 }
 function isUnfolded(node, config) {
     var foldedField = config.foldedField, unfoldedField = config.unfoldedField;
@@ -319,14 +322,15 @@ function visibilityFilter(items, data) {
 }
 function isDisabled(schema, data) {
     return (schema.disabled ||
-        (schema.disabledOn && tpl.evalExpression(schema.disabledOn, data)));
+        (schema.disabledOn &&
+            tpl.evalExpressionWithConditionBuilder(schema.disabledOn, data)));
 }
 function hasAbility(schema, ability, data, defaultValue) {
     if (defaultValue === void 0) { defaultValue = true; }
     return schema.hasOwnProperty(ability)
         ? schema[ability]
         : schema.hasOwnProperty("".concat(ability, "On"))
-            ? tpl.evalExpression(schema["".concat(ability, "On")], data || schema)
+            ? tpl.evalExpressionWithConditionBuilder(schema["".concat(ability, "On")], data || schema)
             : defaultValue;
 }
 function makeHorizontalDeeper(horizontal, count) {

package/lib/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/image.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/keyToPath.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/labelToString.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/normalizeOptions.d.ts

@@ -1,7 +1,7 @@
 import { Options } from '../types';
 export declare function normalizeOptions(options: string | {
     [propName: string]: string;
-} | Array<string> | Options, share?: {
+} | Array<string | number> | Options, share?: {
     values: Array<any>;
     options: Array<any>;
 }, valueField?: string): Options;

package/lib/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -40,7 +40,8 @@ function normalizeOptions(options, share, valueField) {
         });
     }
     else if (Array.isArray(options) &&
-        typeof options[0] === 'string') {
+        (typeof options[0] === 'string' ||
+            typeof options[0] === 'number')) {
         return options.map(function (item) {
             var _a;
             var idx = share.values.indexOf(item);

package/lib/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/printElement.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -130,9 +130,10 @@ var bindEvent = function (renderer) {
         return function (eventName) {
             // eventName用来避免过滤广播事件
             rendererEventListeners = rendererEventListeners.filter(function (item) {
-                return item.renderer === renderer && eventName !== undefined
-                    ? item.type !== eventName
-                    : true;
+                // 如果 eventName 为 undefined，表示全部解绑，否则解绑指定事件
+                return eventName === undefined
+                    ? item.renderer !== renderer
+                    : item.renderer !== renderer || item.type !== eventName;
             });
         };
     }
@@ -341,7 +342,7 @@ function getMatchedEventTargets(tree, ctx, index, condition, oldCondition) {
                             var result;
                             return tslib.__generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(condition, object.createObject(ctx, data))];
+                                    case 0: return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(condition, object.createObject(ctx, data))];
                                     case 1:
                                         result = _a.sent();
                                         result && targets.push(item);

package/lib/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveCondition.d.ts

@@ -1,4 +1,5 @@
-export declare function resolveCondition(conditions: any, data: any, defaultResult?: boolean): Promise<boolean>;
+export declare function resolveConditionAsync(conditions: any, data: any, defaultResult?: boolean): Promise<boolean>;
+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;

package/lib/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -16,6 +16,12 @@ var startsWith = require('lodash/startsWith');
 var resolveVariableAndFilterForAsync = require('./resolveVariableAndFilterForAsync.js');
 var moment = require('moment');
 var capitalize = require('lodash/capitalize');
+require('amis-formula');
+require('lodash/isPlainObject');
+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 }; }
 
@@ -30,7 +36,7 @@ var capitalize__default = /*#__PURE__*/_interopDefaultLegacy(capitalize);
 var conditionResolverMap = {};
 var DEFAULT_RESULT = true;
 var conditionComputeErrorHandler;
-function resolveCondition(conditions, data, defaultResult) {
+function resolveConditionAsync(conditions, data, defaultResult) {
     if (defaultResult === void 0) { defaultResult = true; }
     return tslib.__awaiter(this, void 0, void 0, function () {
         var e_1;
@@ -46,7 +52,7 @@ function resolveCondition(conditions, data, defaultResult) {
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 6]);
-                    return [4 /*yield*/, computeConditions(conditions.children, conditions.conjunction, data)];
+                    return [4 /*yield*/, computeConditionsAsync(conditions.children, conditions.conjunction, data)];
                 case 2: return [2 /*return*/, _a.sent()];
                 case 3:
                     e_1 = _a.sent();
@@ -59,7 +65,26 @@ function resolveCondition(conditions, data, defaultResult) {
         });
     });
 }
-function computeConditions(conditions, conjunction, data) {
+function resolveCondition(conditions, data, defaultResult) {
+    if (defaultResult === void 0) { defaultResult = true; }
+    if (!conditions ||
+        !conditions.conjunction ||
+        !Array.isArray(conditions.children) ||
+        !conditions.children.length) {
+        return defaultResult;
+    }
+    try {
+        return computeConditions(conditions.children, conditions.conjunction, data);
+    }
+    catch (e) {
+        // 如果函数未定义，则交给handler
+        if (e.name === 'FormulaEvalError') {
+            return conditionComputeErrorHandler === null || conditionComputeErrorHandler === void 0 ? void 0 : conditionComputeErrorHandler(conditions.children, conditions.conjunction, data);
+        }
+        return defaultResult;
+    }
+}
+function computeConditionsAsync(conditions, conjunction, data) {
     if (conjunction === void 0) { conjunction = 'and'; }
     return tslib.__awaiter(this, void 0, void 0, function () {
         var computeResult, index, len, item, result, _a;
@@ -73,11 +98,11 @@ function computeConditions(conditions, conjunction, data) {
                     if (!(index < len)) return [3 /*break*/, 7];
                     item = conditions[index];
                     if (!(item.conjunction && Array.isArray(item.children) && item.children.length)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, computeConditions(item.children, item.conjunction, data)];
+                    return [4 /*yield*/, computeConditionsAsync(item.children, item.conjunction, data)];
                 case 2:
                     _a = _b.sent();
                     return [3 /*break*/, 5];
-                case 3: return [4 /*yield*/, computeCondition(item, index, data)];
+                case 3: return [4 /*yield*/, computeConditionAsync(item, index, data)];
                 case 4:
                     _a = _b.sent();
                     _b.label = 5;
@@ -97,7 +122,23 @@ function computeConditions(conditions, conjunction, data) {
         });
     });
 }
-function computeCondition(rule, index, data) {
+function computeConditions(conditions, conjunction, data) {
+    if (conjunction === void 0) { conjunction = 'and'; }
+    var computeResult = true;
+    for (var index = 0, len = conditions.length; index < len; index++) {
+        var item = conditions[index];
+        var result = item.conjunction && Array.isArray(item.children) && item.children.length
+            ? computeConditions(item.children, item.conjunction, data)
+            : computeCondition(item, index, data);
+        computeResult = !!result;
+        if ((result && conjunction === 'or') ||
+            (!result && conjunction === 'and')) {
+            break;
+        }
+    }
+    return computeResult;
+}
+function computeConditionAsync(rule, index, data) {
     var _a;
     return tslib.__awaiter(this, void 0, void 0, function () {
         var leftValue, rightValue, func;
@@ -114,6 +155,17 @@ function computeCondition(rule, index, data) {
         });
     });
 }
+function computeCondition(rule, index, data) {
+    var _a;
+    var leftValue = get__default["default"](data, rule.left.field);
+    var rightValue = isPureVariable.isPureVariable(rule.right)
+        ? resolveVariableAndFilter.resolveVariableAndFilter(rule.right, data)
+        : rule.right;
+    var func = (_a = conditionResolverMap["".concat(rule.op, "For").concat(capitalize__default["default"](rule.left.type))]) !== null && _a !== void 0 ? _a : conditionResolverMap[rule.op];
+    return func && typeof func === 'function'
+        ? func(leftValue, rightValue, rule.left.type)
+        : DEFAULT_RESULT;
+}
 function startsWithFunc(left, right) {
     if (left === undefined || right === undefined) {
         return DEFAULT_RESULT;
@@ -335,4 +387,5 @@ registerConditionComputer('ends_with', endsWithFunc);
 exports.getConditionComputers = getConditionComputers;
 exports.registerConditionComputer = registerConditionComputer;
 exports.resolveCondition = resolveCondition;
+exports.resolveConditionAsync = resolveConditionAsync;
 exports.setConditionComputeErrorHandler = setConditionComputeErrorHandler;

package/lib/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -7,14 +7,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var MiniDecimal = require('../node_modules/@rc-component/mini-decimal/es/MiniDecimal.js');
+var miniDecimal = require('@rc-component/mini-decimal');
 
 // 主要用于解决 0.1+0.2 结果的精度问题导致太长
 function stripNumber(number, precision) {
     if (precision === void 0) { precision = 16; }
     if (typeof number === 'number' && !Number.isInteger(number)) {
         // return parseFloat(number.toPrecision(precision));
-        return parseFloat(MiniDecimal.toFixed(number.toString(), '.', precision));
+        return parseFloat(miniDecimal.toFixed(number.toString(), '.', precision));
     }
     else {
         return number;