antd-management-fast-framework 1.11.20 → 1.11.21

package/es/utils/tools.d.ts

@@ -408,6 +408,14 @@ export function getValueByKey({ data, key, defaultValue, convert, convertBuilder
     format?: any;
     formatBuilder?: any;
 }): any;
+export function convertTarget({ target, convert }: {
+    target: any;
+    convert: any;
+}): any;
+export function formatTarget({ target, format }: {
+    target: any;
+    format: any;
+}): any;
 /**
  * 通过 path 获取对应得值
  */

package/es/utils/tools.js

@@ -14,6 +14,7 @@ exports.checkLocalhost = checkLocalhost;
 exports.clearLocalStorage = clearLocalStorage;
 exports.clearSessionStorage = clearSessionStorage;
 exports.cloneWithoutMethod = cloneWithoutMethod;
+exports.convertTarget = convertTarget;
 exports.copyToClipboard = copyToClipboard;
 exports.corsTarget = corsTarget;
 exports.dateToMoment = dateToMoment;
@@ -38,6 +39,7 @@ exports.formatDatetime = formatDatetime;
 exports.formatDecimal = formatDecimal;
 exports.formatMoney = formatMoney;
 exports.formatMoneyToChinese = formatMoneyToChinese;
+exports.formatTarget = formatTarget;
 exports.getAppInitConfigData = getAppInitConfigData;
 exports.getBrowserInfo = getBrowserInfo;
 exports.getDerivedStateFromPropsForUrlParams = getDerivedStateFromPropsForUrlParams;
@@ -171,8 +173,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); }
-
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -965,8 +965,12 @@ function sortedUnique(array) {
 
 
 function roundToTarget(v, len) {
+  if (!isMoney(v)) {
+    return 0;
+  }
+
   var temp = Math.pow(10, len);
-  return Math.round(v * temp) / temp;
+  return Math.round(toMoney(v) * temp) / temp;
 }
 /**
  * 判断是否是数字字符串
@@ -1025,77 +1029,105 @@ function getValueByKey(_ref14) {
   var v = getPathValue(data, key, defaultValue);
   var result = v;
 
-  if (isFunction(convertBuilder)) {
-    result = convertBuilder(v);
-  } else if ((convert || null) != null) {
+  if ((convertBuilder || null) != null || (convert || null) != null) {
+    if (isFunction(convertBuilder)) {
+      result = convertTarget({
+        target: v,
+        convert: convertBuilder
+      });
+    } else {
+      result = convertTarget({
+        target: v,
+        convert: convert
+      });
+    }
+  }
+
+  if ((formatBuilder || null) != null || (format || null) != null) {
+    if (isFunction(formatBuilder)) {
+      result = formatTarget({
+        target: v,
+        format: formatBuilder
+      });
+    } else {
+      result = formatTarget({
+        target: v,
+        format: format
+      });
+    }
+  }
+
+  return result;
+}
+
+function convertTarget(_ref15) {
+  var target = _ref15.target,
+      convert = _ref15.convert;
+
+  if (isFunction(convert)) {
+    return convert(target);
+  }
+
+  if (isString(convert)) {
     switch (convert) {
       case _constants.convertCollection.number:
-        result = toNumber(v);
-        break;
+        return toNumber(target);
 
       case _constants.convertCollection.datetime:
-        result = toDatetime(v);
-        break;
+        return toDatetime(target);
 
       case _constants.convertCollection.string:
-        result = toString(v);
-        break;
+        return toString(target);
 
       case _constants.convertCollection.moment:
-        result = toMoment({
-          data: toString(v)
+        return toMoment({
+          data: toString(target)
         });
-        break;
 
       case _constants.convertCollection.money:
-        result = toMoney(v);
-        break;
+        return toMoney(target);
 
       case _constants.convertCollection.array:
-        result = (v || null) == null ? [] : isArray(v) ? v : [v];
-        break;
+        return (target || null) == null ? [] : isArray(target) ? target : [target];
 
       default:
-        result = v;
-        break;
+        return target;
     }
   }
 
-  if (isFunction(formatBuilder)) {
-    result = formatBuilder(v);
-  } else if ((format || null) != null) {
+  return target;
+}
+
+function formatTarget(_ref16) {
+  var target = _ref16.target,
+      format = _ref16.format;
+
+  if (isFunction(format)) {
+    return format(target);
+  }
+
+  if (isString(format)) {
     switch (format) {
       case _constants.formatCollection.money:
-        result = formatMoney(v);
-        break;
+        return formatMoney(target);
 
       case _constants.formatCollection.datetime:
-        result = formatDatetime({
-          data: v
+        return formatDatetime({
+          data: target
         });
-        break;
 
       case _constants.formatCollection.chineseMoney:
-        result = formatMoneyToChinese(v);
-        break;
+        return formatMoneyToChinese(target);
 
       case _constants.formatCollection.percentage:
-        var d = 0;
-
-        if (!isMoney(v)) {
-          roundToTarget(v * 100, 1), _readOnlyError("d");
-        }
-
-        result = "".concat(d, "%");
-        break;
+        return "".concat(roundToTarget(target * 100, 1), "%");
 
       default:
-        result = v;
-        break;
+        return target;
     }
   }
 
-  return result;
+  return target;
 }
 /**
  * 通过 path 获取对应得值
@@ -1345,10 +1377,10 @@ function formatMoneyToChinese(v) {
   return ChineseString;
 }
 
-function seededRandom(_ref15) {
-  var seed = _ref15.seed,
-      min = _ref15.min,
-      max = _ref15.max;
+function seededRandom(_ref17) {
+  var seed = _ref17.seed,
+      min = _ref17.min,
+      max = _ref17.max;
   var maxValue = max || 1;
   var minValue = min || 0;
   var seedValue = (seed * 9301 + 49297) % 233280;
@@ -1364,18 +1396,18 @@ function seededRandom(_ref15) {
  */
 
 
-function getRandomColor(_ref16) {
-  var seed = _ref16.seed,
-      _ref16$hue = _ref16.hue,
-      hue = _ref16$hue === void 0 ? null : _ref16$hue,
-      _ref16$luminosity = _ref16.luminosity,
-      luminosity = _ref16$luminosity === void 0 ? null : _ref16$luminosity,
-      _ref16$count = _ref16.count,
-      count = _ref16$count === void 0 ? null : _ref16$count,
-      _ref16$format = _ref16.format,
-      format = _ref16$format === void 0 ? null : _ref16$format,
-      _ref16$alpha = _ref16.alpha,
-      alpha = _ref16$alpha === void 0 ? null : _ref16$alpha;
+function getRandomColor(_ref18) {
+  var seed = _ref18.seed,
+      _ref18$hue = _ref18.hue,
+      hue = _ref18$hue === void 0 ? null : _ref18$hue,
+      _ref18$luminosity = _ref18.luminosity,
+      luminosity = _ref18$luminosity === void 0 ? null : _ref18$luminosity,
+      _ref18$count = _ref18.count,
+      count = _ref18$count === void 0 ? null : _ref18$count,
+      _ref18$format = _ref18.format,
+      format = _ref18$format === void 0 ? null : _ref18$format,
+      _ref18$alpha = _ref18.alpha,
+      alpha = _ref18$alpha === void 0 ? null : _ref18$alpha;
   return (0, _randomcolor.default)({
     seed: seed,
     hue: hue,
@@ -2078,8 +2110,8 @@ function removeNearestLocalhostNotifyCache() {
  */
 
 
-function trySendNearestLocalhostNotify(_ref17) {
-  var text = _ref17.text;
+function trySendNearestLocalhostNotify(_ref19) {
+  var text = _ref19.text;
   var needSend = false;
   var nearestTime = 0;
 
@@ -2140,11 +2172,11 @@ function notifySuccess(text) {
  */
 
 
-function notify(_ref18) {
-  var type = _ref18.type,
-      placementValue = _ref18.placement,
-      messageValue = _ref18.message,
-      descriptionValue = _ref18.description;
+function notify(_ref20) {
+  var type = _ref20.type,
+      placementValue = _ref20.placement,
+      messageValue = _ref20.message,
+      descriptionValue = _ref20.description;
 
   var _placement$message$de = _objectSpread(_objectSpread({}, {
     placement: 'bottomRight',
@@ -2218,10 +2250,10 @@ function notify(_ref18) {
   }, 600);
 }
 
-function checkFromConfig(_ref19) {
-  var label = _ref19.label,
-      name = _ref19.name,
-      helper = _ref19.helper;
+function checkFromConfig(_ref21) {
+  var label = _ref21.label,
+      name = _ref21.name,
+      helper = _ref21.helper;
   var labelText = 'object';
   var nameText = 'object';
   var helperText = 'object';
@@ -2280,13 +2312,13 @@ var requestAnimFrame = requestAnimFrameCustom;
 
 exports.requestAnimFrame = requestAnimFrame;
 
-function sortCollectionByKey(_ref20) {
-  var operate = _ref20.operate,
-      item = _ref20.item,
-      list = _ref20.list,
-      sortKey = _ref20.sortKey,
-      _ref20$sortMin = _ref20.sortMin,
-      sortMin = _ref20$sortMin === void 0 ? 0 : _ref20$sortMin;
+function sortCollectionByKey(_ref22) {
+  var operate = _ref22.operate,
+      item = _ref22.item,
+      list = _ref22.list,
+      sortKey = _ref22.sortKey,
+      _ref22$sortMin = _ref22.sortMin,
+      sortMin = _ref22$sortMin === void 0 ? 0 : _ref22$sortMin;
 
   if ((item || null) == null) {
     return list;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.11.20",
+  "version": "1.11.21",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"