amis-core 6.4.1 → 6.6.0

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -274,13 +274,14 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
     };
 }
 function insertCustomStyle(prams) {
+    var _a;
     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, data).value;
     value = customStyleClassPrefix ? "".concat(customStyleClassPrefix, " ").concat(value) : value;
-    var classId = id.replace('u:', '');
+    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') {
         classId += "-".concat(data.index);
     }
@@ -335,7 +336,9 @@ function traverseStyle(style, path, result) {
  * 设置源码编辑自定义样式
  */
 function insertEditCustomStyle(params) {
-    var customStyle = params.customStyle, id = params.id, doc = params.doc, data = params.data;
+    var _a, _b;
+    var customStyle = params.customStyle, doc = params.doc, data = params.data;
+    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 = '';
@@ -344,7 +347,7 @@ function insertEditCustomStyle(params) {
         index = "-".concat(data.index);
     }
     if (!isEmpty__default["default"](styles)) {
-        var className_1 = "wrapperCustomStyle-".concat(id === null || id === void 0 ? void 0 : id.replace('u:', '')).concat(index);
+        var className_1 = "wrapperCustomStyle-".concat(id).concat(index);
         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}");
@@ -372,16 +375,17 @@ function insertEditCustomStyle(params) {
     }
     insertStyle({
         style: content,
-        classId: 'wrapperCustomStyle-' + ((id === null || id === void 0 ? void 0 : id.replace('u:', '')) || helper.uuid()) + index,
+        classId: 'wrapperCustomStyle-' + (id || helper.uuid()) + index,
         doc: doc,
-        id: id === null || id === void 0 ? void 0 : id.replace('u:', '').replace(/(-.*)/, '')
+        id: id.replace(/(-.*)/, '')
     });
 }
 /**
  * 移除自定义样式
  */
 function removeCustomStyle(type, id, doc, data) {
-    var styleId = 'amis-' + (type ? type + '-' : '') + id.replace('u:', '');
+    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') {
         styleId += "-".concat(data.index);
     }
@@ -405,6 +409,7 @@ function formatInputThemeCss(themeCss) {
     return inputFontThemeCss;
 }
 function setThemeClassName(params) {
+    var _a;
     var name = params.name, id = params.id, themeCss = params.themeCss, extra = params.extra, data = params.data;
     if (!id || !themeCss) {
         return '';
@@ -416,7 +421,9 @@ function setThemeClassName(params) {
     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;
+    return ("".concat(name, "-").concat(((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id) +
+        (extra ? "-".concat(extra) : '') +
+        index);
 }
 
 exports.addStyle = addStyle;

package/lib/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.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.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tokenize.js

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

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.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.1
+ * amis-core v6.6.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.1
+ * amis-core v6.6.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.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/validateId.js

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

package/lib/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.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.1",
+  "version": "6.6.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -48,7 +48,8 @@
     "esm"
   ],
   "dependencies": {
-    "amis-formula": "^6.4.1",
+    "@rc-component/mini-decimal": "^1.0.1",
+    "amis-formula": "^6.6.0",
     "classnames": "2.3.2",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",

package/esm/node_modules/@babel/runtime/helpers/esm/classCallCheck.js

@@ -1,12 +0,0 @@
-/**
- * amis-core v6.4.1
- * Copyright 2018-2024 fex
- */
-
-function _classCallCheck(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
-}
-
-export { _classCallCheck as default };

package/esm/node_modules/@babel/runtime/helpers/esm/createClass.js

@@ -1,26 +0,0 @@
-/**
- * amis-core v6.4.1
- * Copyright 2018-2024 fex
- */
-
-import toPropertyKey from './toPropertyKey.js';
-
-function _defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, toPropertyKey(descriptor.key), descriptor);
-  }
-}
-function _createClass(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties(Constructor, staticProps);
-  Object.defineProperty(Constructor, "prototype", {
-    writable: false
-  });
-  return Constructor;
-}
-
-export { _createClass as default };

package/esm/node_modules/@babel/runtime/helpers/esm/defineProperty.js

@@ -1,23 +0,0 @@
-/**
- * amis-core v6.4.1
- * Copyright 2018-2024 fex
- */
-
-import toPropertyKey from './toPropertyKey.js';
-
-function _defineProperty(obj, key, value) {
-  key = toPropertyKey(key);
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-
-export { _defineProperty as default };

package/esm/node_modules/@babel/runtime/helpers/esm/toPrimitive.js

@@ -1,19 +0,0 @@
-/**
- * amis-core v6.4.1
- * Copyright 2018-2024 fex
- */
-
-import _typeof from './typeof.js';
-
-function toPrimitive(t, r) {
-  if ("object" != _typeof(t) || !t) return t;
-  var e = t[Symbol.toPrimitive];
-  if (void 0 !== e) {
-    var i = e.call(t, r || "default");
-    if ("object" != _typeof(i)) return i;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return ("string" === r ? String : Number)(t);
-}
-
-export { toPrimitive as default };

package/esm/node_modules/@babel/runtime/helpers/esm/toPropertyKey.js

@@ -1,14 +0,0 @@
-/**
- * amis-core v6.4.1
- * Copyright 2018-2024 fex
- */
-
-import _typeof from './typeof.js';
-import toPrimitive from './toPrimitive.js';
-
-function toPropertyKey(t) {
-  var i = toPrimitive(t, "string");
-  return "symbol" == _typeof(i) ? i : i + "";
-}
-
-export { toPropertyKey as default };

package/esm/node_modules/@babel/runtime/helpers/esm/typeof.js

@@ -1,16 +0,0 @@
-/**
- * amis-core v6.4.1
- * Copyright 2018-2024 fex
- */
-
-function _typeof(o) {
-  "@babel/helpers - typeof";
-
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
-    return typeof o;
-  } : function (o) {
-    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
-  }, _typeof(o);
-}
-
-export { _typeof as default };

package/esm/node_modules/@rc-component/mini-decimal/es/BigIntDecimal.js

@@ -1,184 +0,0 @@
-/**
- * amis-core v6.4.1
- * Copyright 2018-2024 fex
- */
-
-import _classCallCheck from '../../../@babel/runtime/helpers/esm/classCallCheck.js';
-import _createClass from '../../../@babel/runtime/helpers/esm/createClass.js';
-import _defineProperty from '../../../@babel/runtime/helpers/esm/defineProperty.js';
-import { trimNumber, isEmpty, isE, num2str, validateNumber } from './numberUtil.js';
-
-var BigIntDecimal = /*#__PURE__*/function () {
-  /** BigInt will convert `0009` to `9`. We need record the len of decimal */
-
-  function BigIntDecimal(value) {
-    _classCallCheck(this, BigIntDecimal);
-    _defineProperty(this, "origin", '');
-    _defineProperty(this, "negative", void 0);
-    _defineProperty(this, "integer", void 0);
-    _defineProperty(this, "decimal", void 0);
-    _defineProperty(this, "decimalLen", void 0);
-    _defineProperty(this, "empty", void 0);
-    _defineProperty(this, "nan", void 0);
-    if (isEmpty(value)) {
-      this.empty = true;
-      return;
-    }
-    this.origin = String(value);
-
-    // Act like Number convert
-    if (value === '-' || Number.isNaN(value)) {
-      this.nan = true;
-      return;
-    }
-    var mergedValue = value;
-
-    // We need convert back to Number since it require `toFixed` to handle this
-    if (isE(mergedValue)) {
-      mergedValue = Number(mergedValue);
-    }
-    mergedValue = typeof mergedValue === 'string' ? mergedValue : num2str(mergedValue);
-    if (validateNumber(mergedValue)) {
-      var trimRet = trimNumber(mergedValue);
-      this.negative = trimRet.negative;
-      var numbers = trimRet.trimStr.split('.');
-      this.integer = BigInt(numbers[0]);
-      var decimalStr = numbers[1] || '0';
-      this.decimal = BigInt(decimalStr);
-      this.decimalLen = decimalStr.length;
-    } else {
-      this.nan = true;
-    }
-  }
-  _createClass(BigIntDecimal, [{
-    key: "getMark",
-    value: function getMark() {
-      return this.negative ? '-' : '';
-    }
-  }, {
-    key: "getIntegerStr",
-    value: function getIntegerStr() {
-      return this.integer.toString();
-    }
-
-    /**
-     * @private get decimal string
-     */
-  }, {
-    key: "getDecimalStr",
-    value: function getDecimalStr() {
-      return this.decimal.toString().padStart(this.decimalLen, '0');
-    }
-
-    /**
-     * @private Align BigIntDecimal with same decimal length. e.g. 12.3 + 5 = 1230000
-     * This is used for add function only.
-     */
-  }, {
-    key: "alignDecimal",
-    value: function alignDecimal(decimalLength) {
-      var str = "".concat(this.getMark()).concat(this.getIntegerStr()).concat(this.getDecimalStr().padEnd(decimalLength, '0'));
-      return BigInt(str);
-    }
-  }, {
-    key: "negate",
-    value: function negate() {
-      var clone = new BigIntDecimal(this.toString());
-      clone.negative = !clone.negative;
-      return clone;
-    }
-  }, {
-    key: "cal",
-    value: function cal(offset, calculator, calDecimalLen) {
-      var maxDecimalLength = Math.max(this.getDecimalStr().length, offset.getDecimalStr().length);
-      var myAlignedDecimal = this.alignDecimal(maxDecimalLength);
-      var offsetAlignedDecimal = offset.alignDecimal(maxDecimalLength);
-      var valueStr = calculator(myAlignedDecimal, offsetAlignedDecimal).toString();
-      var nextDecimalLength = calDecimalLen(maxDecimalLength);
-
-      // We need fill string length back to `maxDecimalLength` to avoid parser failed
-      var _trimNumber = trimNumber(valueStr),
-        negativeStr = _trimNumber.negativeStr,
-        trimStr = _trimNumber.trimStr;
-      var hydrateValueStr = "".concat(negativeStr).concat(trimStr.padStart(nextDecimalLength + 1, '0'));
-      return new BigIntDecimal("".concat(hydrateValueStr.slice(0, -nextDecimalLength), ".").concat(hydrateValueStr.slice(-nextDecimalLength)));
-    }
-  }, {
-    key: "add",
-    value: function add(value) {
-      if (this.isInvalidate()) {
-        return new BigIntDecimal(value);
-      }
-      var offset = new BigIntDecimal(value);
-      if (offset.isInvalidate()) {
-        return this;
-      }
-      return this.cal(offset, function (num1, num2) {
-        return num1 + num2;
-      }, function (len) {
-        return len;
-      });
-    }
-  }, {
-    key: "multi",
-    value: function multi(value) {
-      var target = new BigIntDecimal(value);
-      if (this.isInvalidate() || target.isInvalidate()) {
-        return new BigIntDecimal(NaN);
-      }
-      return this.cal(target, function (num1, num2) {
-        return num1 * num2;
-      }, function (len) {
-        return len * 2;
-      });
-    }
-  }, {
-    key: "isEmpty",
-    value: function isEmpty() {
-      return this.empty;
-    }
-  }, {
-    key: "isNaN",
-    value: function isNaN() {
-      return this.nan;
-    }
-  }, {
-    key: "isInvalidate",
-    value: function isInvalidate() {
-      return this.isEmpty() || this.isNaN();
-    }
-  }, {
-    key: "equals",
-    value: function equals(target) {
-      return this.toString() === (target === null || target === void 0 ? void 0 : target.toString());
-    }
-  }, {
-    key: "lessEquals",
-    value: function lessEquals(target) {
-      return this.add(target.negate().toString()).toNumber() <= 0;
-    }
-  }, {
-    key: "toNumber",
-    value: function toNumber() {
-      if (this.isNaN()) {
-        return NaN;
-      }
-      return Number(this.toString());
-    }
-  }, {
-    key: "toString",
-    value: function toString() {
-      var safe = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-      if (!safe) {
-        return this.origin;
-      }
-      if (this.isInvalidate()) {
-        return '';
-      }
-      return trimNumber("".concat(this.getMark()).concat(this.getIntegerStr(), ".").concat(this.getDecimalStr())).fullStr;
-    }
-  }]);
-  return BigIntDecimal;
-}();
-
-export { BigIntDecimal as default };

package/esm/node_modules/@rc-component/mini-decimal/es/MiniDecimal.js

@@ -1,56 +0,0 @@
-/**
- * amis-core v6.4.1
- * Copyright 2018-2024 fex
- */
-
-import BigIntDecimal from './BigIntDecimal.js';
-export { default as BigIntDecimal } from './BigIntDecimal.js';
-import NumberDecimal from './NumberDecimal.js';
-export { default as NumberDecimal } from './NumberDecimal.js';
-import { trimNumber } from './numberUtil.js';
-import { supportBigInt } from './supportUtil.js';
-
-/* eslint-disable max-classes-per-file */
-function getMiniDecimal(value) {
-  // We use BigInt here.
-  // Will fallback to Number if not support.
-  if (supportBigInt()) {
-    return new BigIntDecimal(value);
-  }
-  return new NumberDecimal(value);
-}
-
-/**
- * Align the logic of toFixed to around like 1.5 => 2.
- * If set `cutOnly`, will just remove the over decimal part.
- */
-function toFixed(numStr, separatorStr, precision) {
-  var cutOnly = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  if (numStr === '') {
-    return '';
-  }
-  var _trimNumber = trimNumber(numStr),
-    negativeStr = _trimNumber.negativeStr,
-    integerStr = _trimNumber.integerStr,
-    decimalStr = _trimNumber.decimalStr;
-  var precisionDecimalStr = "".concat(separatorStr).concat(decimalStr);
-  var numberWithoutDecimal = "".concat(negativeStr).concat(integerStr);
-  if (precision >= 0) {
-    // We will get last + 1 number to check if need advanced number
-    var advancedNum = Number(decimalStr[precision]);
-    if (advancedNum >= 5 && !cutOnly) {
-      var advancedDecimal = getMiniDecimal(numStr).add("".concat(negativeStr, "0.").concat('0'.repeat(precision)).concat(10 - advancedNum));
-      return toFixed(advancedDecimal.toString(), separatorStr, precision, cutOnly);
-    }
-    if (precision === 0) {
-      return numberWithoutDecimal;
-    }
-    return "".concat(numberWithoutDecimal).concat(separatorStr).concat(decimalStr.padEnd(precision, '0').slice(0, precision));
-  }
-  if (precisionDecimalStr === '.0') {
-    return numberWithoutDecimal;
-  }
-  return "".concat(numberWithoutDecimal).concat(precisionDecimalStr);
-}
-
-export { getMiniDecimal as default, toFixed };