amis-core 6.4.0 → 6.5.0

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

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

package/lib/utils/keyToPath.js

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

package/lib/utils/labelToString.js

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

package/lib/utils/makeSorter.js

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

package/lib/utils/math.js

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

package/lib/utils/memoryParse.js

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

package/lib/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.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.0
+ * amis-core v6.5.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.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/offset.js

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

package/lib/utils/offsetParent.js

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

package/lib/utils/optionValueCompare.js

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

package/lib/utils/position.js

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

package/lib/utils/prettyBytes.js

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

package/lib/utils/printElement.js

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

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -341,7 +341,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.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.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.0
+ * amis-core v6.5.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.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariableAndFilter.js

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

package/lib/utils/resolveVariableAndFilterForAsync.js

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

package/lib/utils/scrollPosition.js

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

package/lib/utils/string2regExp.js

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

package/lib/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -7,11 +7,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+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(number.toPrecision(precision));
+        return parseFloat(miniDecimal.toFixed(number.toString(), '.', precision));
     }
     else {
         return number;

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -372,9 +372,11 @@ function insertEditCustomStyle(params) {
     }
     insertStyle({
         style: content,
-        classId: 'wrapperCustomStyle-' + ((id === null || id === void 0 ? void 0 : id.replace('u:', '')) || helper.uuid()) + index,
+        classId: 'wrapperCustomStyle-' +
+            ((typeof id === 'string' ? id.replace('u:', '') : '') || helper.uuid()) +
+            index,
         doc: doc,
-        id: id === null || id === void 0 ? void 0 : id.replace('u:', '').replace(/(-.*)/, '')
+        id: typeof id === 'string' ? id.replace('u:', '').replace(/(-.*)/, '') : ''
     });
 }
 /**

package/lib/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,6 +11,7 @@ require('tslib');
 require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
+require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');
 var mapValues = require('lodash/mapValues');

package/lib/utils/toNumber.js

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

package/lib/utils/tokenize.js

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

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,6 +12,7 @@ var amisFormula = require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
 var tokenize = require('./tokenize.js');
+require('@rc-component/mini-decimal');
 var resolveVariableAndFilterForAsync = require('./resolveVariableAndFilterForAsync.js');
 require('./filter.js');
 

package/lib/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,6 +12,7 @@ var template = require('lodash/template');
 var amisFormula = require('amis-formula');
 var moment = require('moment');
 require('lodash/isPlainObject');
+require('@rc-component/mini-decimal');
 require('./filter.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/lib/utils/tpl.d.ts

@@ -15,6 +15,13 @@ export declare function evalExpression(expression: string, data?: object): boole
  * @param data 上下文
  * @returns
  */
-export declare function evalExpressionWithConditionBuilder(expression: any, data?: object, defaultResult?: boolean): Promise<boolean>;
+export declare function evalExpressionWithConditionBuilderAsync(expression: any, data?: object, defaultResult?: boolean): Promise<boolean>;
+/**
+ * 解析表达式（支持condition-builder）
+ * @param expression 表达式 or condition-builder对象
+ * @param data 上下文
+ * @returns
+ */
+export declare function evalExpressionWithConditionBuilder(expression: any, data?: object, defaultResult?: boolean): boolean | Promise<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.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -112,19 +112,32 @@ function evalExpression(expression, data) {
  * @param data 上下文
  * @returns
  */
-function evalExpressionWithConditionBuilder(expression, data, defaultResult) {
+function evalExpressionWithConditionBuilderAsync(expression, data, defaultResult) {
     return tslib.__awaiter(this, void 0, void 0, function () {
         return tslib.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (!(Object.prototype.toString.call(expression) === '[object Object]')) return [3 /*break*/, 2];
-                    return [4 /*yield*/, resolveCondition.resolveCondition(expression, data, defaultResult)];
+                    return [4 /*yield*/, resolveCondition.resolveConditionAsync(expression, data, defaultResult)];
                 case 1: return [2 /*return*/, _a.sent()];
                 case 2: return [2 /*return*/, evalExpression(String(expression), data)];
             }
         });
     });
 }
+/**
+ * 解析表达式（支持condition-builder）
+ * @param expression 表达式 or condition-builder对象
+ * @param data 上下文
+ * @returns
+ */
+function evalExpressionWithConditionBuilder(expression, data, defaultResult) {
+    // 支持ConditionBuilder
+    if (Object.prototype.toString.call(expression) === '[object Object]') {
+        return resolveCondition.resolveCondition(expression, data, defaultResult);
+    }
+    return evalExpression(String(expression), data);
+}
 function evalFormula(expression, data) {
     var ast = tokenize.memoParse(expression, {
         evalMode: false
@@ -175,6 +188,7 @@ function evalJS(js, data) {
 exports.asyncFilter = asyncFilter;
 exports.evalExpression = evalExpression;
 exports.evalExpressionWithConditionBuilder = evalExpressionWithConditionBuilder;
+exports.evalExpressionWithConditionBuilderAsync = evalExpressionWithConditionBuilderAsync;
 exports.evalJS = evalJS;
 exports.filter = filter;
 exports.registerTplEnginer = registerTplEnginer;

package/lib/utils/uncontrollable.js

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

package/lib/utils/validateId.js

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

package/lib/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,6 +13,7 @@ var tpl = require('./tpl.js');
 require('amis-formula');
 var isPlainObject = require('lodash/isPlainObject');
 var isPureVariable = require('./isPureVariable.js');
+require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');
 var memoize = require('lodash/memoize');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -48,7 +48,8 @@
     "esm"
   ],
   "dependencies": {
-    "amis-formula": "^6.4.0",
+    "@rc-component/mini-decimal": "^1.0.1",
+    "amis-formula": "^6.5.0",
     "classnames": "2.3.2",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",