dlt-for-react 1.1.11 → 1.1.13

package/lib/utils/common.js

@@ -1,33 +1,33 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.specialParams = exports.isArrayFn = exports.deepCopy = exports.filterAuthMenus = exports.filterChildrenMenus = exports.findAuth = exports.handleMenus = exports.deepCheckField = exports.isEmpty = exports.updateDataSource = exports.exactAdd = exports.exactAdd1 = exports.summation = exports.deepTreeChildSum = exports.calcAfterBudgetSum = exports.setBudget = exports.setRowId = exports.deepTreeEditing = exports.deepTree = exports.removeTreeListItem = exports.formatFloat = exports.keepDecimal = exports.convertSmallHump = exports.ellipsis = exports.getOptions = exports.commonDataSource = exports.zipCodeRegExp = exports.emailRegExp = exports.officePhoneRegExp = exports.phoneRegExp = undefined;
+exports.specialParams = exports.isArrayFn = exports.deepCopy = exports.filterAuthMenus = exports.filterChildrenMenus = exports.findAuth = exports.handleMenus = exports.deepCheckField = exports.isEmpty = exports.updateDataSource = exports.countNumber = exports.exactAdd = exports.exactAdd1 = exports.summation = exports.deepTreeChildSum = exports.calcAfterBudgetSum = exports.setBudget = exports.setRowId = exports.deepTreeEditing = exports.deepTree = exports.removeTreeListItem = exports.formatFloat = exports.keepDecimal = exports.convertSmallHump = exports.ellipsis = exports.getOptions = exports.commonDataSource = exports.zipCodeRegExp = exports.emailRegExp = exports.officePhoneRegExp = exports.phoneRegExp = undefined;
 
-var _typeof2 = require('babel-runtime/helpers/typeof');
+var _typeof2 = require("babel-runtime/helpers/typeof");
 
 var _typeof3 = _interopRequireDefault(_typeof2);
 
-var _keys = require('babel-runtime/core-js/object/keys');
+var _keys = require("babel-runtime/core-js/object/keys");
 
 var _keys2 = _interopRequireDefault(_keys);
 
-var _extends2 = require('babel-runtime/helpers/extends');
+var _extends2 = require("babel-runtime/helpers/extends");
 
 var _extends3 = _interopRequireDefault(_extends2);
 
-var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
+var _toConsumableArray2 = require("babel-runtime/helpers/toConsumableArray");
 
 var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
 
-var _select = require('antd/lib/select');
+var _select = require("antd/lib/select");
 
 var _select2 = _interopRequireDefault(_select);
 
 var _arguments = arguments;
 
-require('antd/lib/select/style');
+require("antd/lib/select/style");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -38,17 +38,17 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @LastEditors: jiangzhongxin
  * @LastEditTime: 2023-09-28 16:31:07
  */
-var phoneRegExp = exports.phoneRegExp = new RegExp('^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$'
+var phoneRegExp = exports.phoneRegExp = new RegExp("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$"
 // '(\\d{11})|^((\\d{7,8})|(\\d{4}|\\d{3})-(\\d{7,8})|(\\d{4}|\\d{3})-(\\d{7,8})-(\\d{4}|\\d{3}|\\d{2}|\\d{1})|(\\d{7,8})-(\\d{4}|\\d{3}|\\d{2}|\\d{1}))$'
 );
 
-var officePhoneRegExp = exports.officePhoneRegExp = new RegExp('^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))d{8}$|^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))d{8}$|^0d{2,3}-?d{7,8}$');
+var officePhoneRegExp = exports.officePhoneRegExp = new RegExp("^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))d{8}$|^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))d{8}$|^0d{2,3}-?d{7,8}$");
 
-var emailRegExp = exports.emailRegExp = new RegExp('^\\s*\\w+(?:\\.{0,1}[\\w-]+)*@[a-zA-Z0-9]+(?:[-.][a-zA-Z0-9]+)*\\.[a-zA-Z]+\\s*$');
+var emailRegExp = exports.emailRegExp = new RegExp("^\\s*\\w+(?:\\.{0,1}[\\w-]+)*@[a-zA-Z0-9]+(?:[-.][a-zA-Z0-9]+)*\\.[a-zA-Z]+\\s*$");
 
-var zipCodeRegExp = exports.zipCodeRegExp = new RegExp('^[1-9][0-9]{5}$');
+var zipCodeRegExp = exports.zipCodeRegExp = new RegExp("^[1-9][0-9]{5}$");
 
-var commonDataSource = exports.commonDataSource = [{ value: '1', label: '是' }, { value: '0', label: '否' }];
+var commonDataSource = exports.commonDataSource = [{ value: "1", label: "是" }, { value: "0", label: "否" }];
 
 var getOptions = exports.getOptions = function getOptions(data) {
   return data && data.length > 0 ? data.map(function (v, i) {
@@ -82,10 +82,10 @@ var keepDecimal = exports.keepDecimal = function keepDecimal(num) {
 var formatFloat = exports.formatFloat = function formatFloat(num, n) {
   if (num === 0) return Number(0).toFixed(n);
   var list = [].concat((0, _toConsumableArray3.default)(Math.round(num * Math.pow(10, n)).toString()));
-  if (num < 1) list.unshift('0');
+  if (num < 1) list.unshift("0");
   // 在数组的倒数第n位插入一个小数点
-  list.splice(-n, 0, '.');
-  return list.join('');
+  list.splice(-n, 0, ".");
+  return list.join("");
 };
 
 /**
@@ -96,8 +96,8 @@ var formatFloat = exports.formatFloat = function formatFloat(num, n) {
  * @param {*} keyField
  */
 var removeTreeListItem = exports.removeTreeListItem = function removeTreeListItem(treeList, key, childField, keyField) {
-  var childField = _arguments[2] ? _arguments[2] : 'children';
-  var keyField = _arguments[3] ? _arguments[3] : 'id';
+  var childField = _arguments[2] ? _arguments[2] : "children";
+  var keyField = _arguments[3] ? _arguments[3] : "id";
   if (!treeList || !treeList.length) {
     return;
   }
@@ -111,8 +111,8 @@ var removeTreeListItem = exports.removeTreeListItem = function removeTreeListIte
 };
 
 var deepTree = exports.deepTree = function deepTree(tree, arr) {
-  var key = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'id';
-  var children = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'children';
+  var key = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "id";
+  var children = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "children";
 
   tree && tree.length > 0 && tree.map(function (x) {
     if (x[key]) {
@@ -127,9 +127,9 @@ var deepTree = exports.deepTree = function deepTree(tree, arr) {
 };
 
 var deepTreeEditing = exports.deepTreeEditing = function deepTreeEditing(tree, arr) {
-  var key = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'editableOperationFlag';
-  var id = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'id';
-  var children = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'children';
+  var key = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "editableOperationFlag";
+  var id = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "id";
+  var children = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "children";
 
   tree && tree.length > 0 && tree.map(function (x) {
     if (x[key]) {
@@ -144,8 +144,8 @@ var deepTreeEditing = exports.deepTreeEditing = function deepTreeEditing(tree, a
 };
 
 var setRowId = exports.setRowId = function setRowId(tree) {
-  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'rowId';
-  var children = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
+  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "rowId";
+  var children = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "children";
 
   tree && tree.length > 0 && tree.map(function (x, i) {
     x[key] = i + 1;
@@ -157,9 +157,9 @@ var setRowId = exports.setRowId = function setRowId(tree) {
 };
 
 var setBudget = exports.setBudget = function setBudget(tree, id, value) {
-  var fieldName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'retentionBudget';
-  var key = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'id';
-  var children = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'children';
+  var fieldName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "retentionBudget";
+  var key = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "id";
+  var children = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : "children";
 
   tree && tree.length > 0 && tree.map(function (x, i) {
     if (x[key] === id) {
@@ -181,7 +181,7 @@ var setBudget = exports.setBudget = function setBudget(tree, id, value) {
  * @param {*} childField [所计算的目标字段名]
  */
 var calcAfterBudgetSum = exports.calcAfterBudgetSum = function calcAfterBudgetSum(list, parentId, childParentField, childField) {
-  var parentField = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'id';
+  var parentField = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "id";
 
   var loopNode = function loopNode(array) {
     array.some(function (item) {
@@ -213,8 +213,8 @@ var calcAfterBudgetSum = exports.calcAfterBudgetSum = function calcAfterBudgetSu
  */
 
 var deepTreeChildSum = exports.deepTreeChildSum = function deepTreeChildSum(list, sumList) {
-  var field = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'id';
-  var children = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'children';
+  var field = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "id";
+  var children = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "children";
 
   list.forEach(function (item) {
     if (item[children] && item[children].length > 0) {
@@ -239,8 +239,8 @@ var summation = exports.summation = function summation(sumList) {
  * 精确加法
  */
 var exactAdd1 = exports.exactAdd1 = function exactAdd1(num1, num2) {
-  var num1Digits = (num1.toString().split('.')[1] || '').length;
-  var num2Digits = (num2.toString().split('.')[1] || '').length;
+  var num1Digits = (num1.toString().split(".")[1] || "").length;
+  var num2Digits = (num2.toString().split(".")[1] || "").length;
   var baseNum = Math.pow(10, Math.max(num1Digits, num2Digits));
   return (num1 * baseNum + num2 * baseNum) / baseNum;
 };
@@ -262,12 +262,12 @@ var exactAdd = exports.exactAdd = function exactAdd(arg1, arg2) {
   arg2 = Number(arg2);
   var r1, r2, m, c;
   try {
-    r1 = arg1.toString().split('.')[1].length;
+    r1 = arg1.toString().split(".")[1].length;
   } catch (e) {
     r1 = 0;
   }
   try {
-    r2 = arg2.toString().split('.')[1].length;
+    r2 = arg2.toString().split(".")[1].length;
   } catch (e) {
     r2 = 0;
   }
@@ -276,22 +276,100 @@ var exactAdd = exports.exactAdd = function exactAdd(arg1, arg2) {
   if (c > 0) {
     var cm = Math.pow(10, c);
     if (r1 > r2) {
-      arg1 = Number(arg1.toString().replace('.', ''));
-      arg2 = Number(arg2.toString().replace('.', '')) * cm;
+      arg1 = Number(arg1.toString().replace(".", ""));
+      arg2 = Number(arg2.toString().replace(".", "")) * cm;
     } else {
-      arg1 = Number(arg1.toString().replace('.', '')) * cm;
-      arg2 = Number(arg2.toString().replace('.', ''));
+      arg1 = Number(arg1.toString().replace(".", "")) * cm;
+      arg2 = Number(arg2.toString().replace(".", ""));
     }
   } else {
-    arg1 = Number(arg1.toString().replace('.', ''));
-    arg2 = Number(arg2.toString().replace('.', ''));
+    arg1 = Number(arg1.toString().replace(".", ""));
+    arg2 = Number(arg2.toString().replace(".", ""));
   }
   return (arg1 + arg2) / m;
 };
 
+/*******
+ * @description: 计算两个数据
+ * @param {*} num1 [数字1]
+ * @param {*} num2 [数字2]
+ * @param {*} type [计算类型：sum-加、subtraction-减、multiplication-乘、division-除]
+ * @return {*}
+ */
+var countNumber = exports.countNumber = function countNumber(num1, num2) {
+  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "sum";
+
+  if (num1 === undefined || num2 === undefined) {
+    console.log("参数格式不正确");
+    return NaN;
+  }
+
+  if (isNaN(num1)) {
+    num1 = 0;
+  }
+  if (isNaN(num2)) {
+    num2 = 0;
+  }
+
+  // 转字符串类型
+  num1 = num1.toString();
+  num2 = num2.toString();
+
+  // 获取小数点位置
+  var index1 = num1.indexOf(".");
+  var index2 = num2.indexOf(".");
+
+  // 获取小数点位数
+  var ws1 = 0;
+  var ws2 = 0;
+  if (index1 !== -1) {
+    ws1 = num1.split(".")[1].length;
+  }
+  if (index2 !== -1) {
+    ws2 = num2.split(".")[1].length;
+  }
+  var bigger = ws1 > ws2 ? ws1 : ws2; //位数较大值
+  var small = ws1 < ws2 ? ws1 : ws2; //位数较小值
+  var zeroCount = bigger - small; //位数差
+
+  // 去除小数点
+  num1 = num1.replace(".", "");
+  num2 = num2.replace(".", "");
+
+  // 位数差额补0
+  if (ws1 === small) {
+    for (var i = 0; i < zeroCount; i++) {
+      num1 += "0";
+    }
+  } else {
+    for (var _i = 0; _i < zeroCount; _i++) {
+      num2 += "0";
+    }
+  }
+
+  var result = 0;
+  var beishu = 1;
+  for (var _i2 = 0; _i2 < bigger; _i2++) {
+    beishu = beishu * 10;
+  }
+  if (type === "sum") {
+    result = parseInt(num1) + parseInt(num2);
+    result = result / beishu;
+  } else if (type === "subtraction") {
+    result = parseInt(num1) - parseInt(num2);
+    result = result / beishu;
+  } else if (type === "multiplication") {
+    result = parseInt(num1) * parseInt(num2);
+    result = result / beishu / beishu;
+  } else if (type === "division") {
+    result = parseInt(num1) / parseInt(num2);
+  }
+  return result;
+};
+
 var updateDataSource = exports.updateDataSource = function updateDataSource(dataSource, updateObject, value) {
   var callback = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var name = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'id';
+  var name = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "id";
 
   var data = [].concat((0, _toConsumableArray3.default)(dataSource));
   var index = data.findIndex(function (r) {
@@ -317,7 +395,7 @@ var updateDataSource = exports.updateDataSource = function updateDataSource(data
 var isEmpty = exports.isEmpty = function isEmpty(params) {
   /* 检验字符串类型 */
   /* 空字符串/字符串null/字符串undefined/字符串{}/字符串[]==>判断为空 */
-  var array = ['', 'null', 'undefined', '{}', '[]'];
+  var array = ["", "null", "undefined", "{}", "[]"];
   if (array.some(function (element) {
     return params === element;
   })) return true;
@@ -366,10 +444,10 @@ var handleMenus = exports.handleMenus = function handleMenus(allMenu) {
   //一个菜单都没有，说明该用户没有访问这个服务的权限
   if (leftMenu.length <= 0) {
     leftMenu.push({
-      name: '首页',
-      key: '403',
-      url: '/403',
-      icon: 'home'
+      name: "首页",
+      key: "403",
+      url: "/403",
+      icon: "home"
     });
   }
   return leftMenu;
@@ -429,7 +507,7 @@ var filterAuthMenus = exports.filterAuthMenus = function filterAuthMenus(menus,
 };
 
 var deepCopy = exports.deepCopy = function deepCopy(obj) {
-  if ((typeof obj === 'undefined' ? 'undefined' : (0, _typeof3.default)(obj)) !== 'object') {
+  if ((typeof obj === "undefined" ? "undefined" : (0, _typeof3.default)(obj)) !== "object") {
     return obj;
   }
 
@@ -449,15 +527,15 @@ var deepCopy = exports.deepCopy = function deepCopy(obj) {
 };
 
 var isArrayFn = exports.isArrayFn = function isArrayFn(value) {
-  if (typeof value === 'function') {
+  if (typeof value === "function") {
     return Array.isArray(value);
   } else {
-    return Object.prototype.toString.call(value) === '[object Array]';
+    return Object.prototype.toString.call(value) === "[object Array]";
   }
 };
 
 var specialParams = exports.specialParams = {
   specialFunc: function specialFunc(dataIndex, record) {
-    return record.authorType === '1' && ['workCompany', 'title', 'degree'].includes(dataIndex);
+    return record.authorType === "1" && ["workCompany", "title", "degree"].includes(dataIndex);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlt-for-react",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "dlt for react",
   "main": "lib/index.js",
   "scripts": {
@@ -82,4 +82,4 @@
     "react-file-viewer": "^1.2.1",
     "react-pdf-js": "^5.1.0"
   }
-}
+}