cloud-b2b 1.1.32 → 1.1.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/es/SuperTable2/SuperTable2.js +1 -1
  2. package/es/SuperUpload/SuperUpload.js +1 -2
  3. package/es/helper.js +31 -21
  4. package/lib/SuperTable2/SuperTable2.js +1 -1
  5. package/lib/SuperUpload/SuperUpload.js +1 -2
  6. package/lib/helper.js +31 -21
  7. package/package.json +1 -1
package/es/SuperTable2/SuperTable2.js CHANGED
@@ -586,7 +586,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
586
586
  } else if (col.showPrice || col.decimalPlaces) {
587
587
  col.render = function (text, record, index) {
588
588
  if (col.showPrice && text) {
589
- text = helper.toThousands(text, col.decimalPlaces ? col.decimalPlaces : 2);
589
+ text = helper.toThousands(text, col.decimalPlaces ? col.decimalPlaces : 2, true);
590
590
  return "\uFFE5".concat(text);
591
591
  } else {
592
592
  return text;
package/es/SuperUpload/SuperUpload.js CHANGED
@@ -168,8 +168,7 @@ function UploadButton(_ref3) {
168
168
  }, /*#__PURE__*/React.createElement(_Button, {
169
169
  size: "small",
170
170
  style: {
171
- display: 'block',
172
- margin: '8px'
171
+ marginLeft: '-10px'
173
172
  }
174
173
  }, buttonLabel)) : listType === 'picture-card' ? null : /*#__PURE__*/React.createElement(Title, {
175
174
  title: title,
package/es/helper.js CHANGED
@@ -4,10 +4,10 @@ import _reduceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
4
4
  import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
5
5
  import _indexOfInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/index-of";
6
6
  import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
7
- import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
8
- import _parseFloat from "@babel/runtime-corejs3/core-js-stable/parse-float";
9
- import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
10
7
  import _Number$isInteger from "@babel/runtime-corejs3/core-js-stable/number/is-integer";
8
+ import _parseFloat from "@babel/runtime-corejs3/core-js-stable/parse-float";
9
+ import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
10
+ import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
11
11
  import message from 'antd/lib/message';
12
12
 
13
13
  /**
@@ -89,26 +89,36 @@ var isEmpty2 = function isEmpty2(value) {
89
89
  return !value;
90
90
  }
91
91
  };
92
- var toThousands = function toThousands(number, fractionDigits) {
93
- if (typeof number === 'string' && _includesInstanceProperty(number).call(number, '~')) {
94
- // 如果参数是形如 "1~5" 的字符串
95
- var range = number.split('~');
96
- var start = _parseFloat(range[0]);
97
- var end = _parseFloat(range[1]);
98
- if (!isNaN(start) && !isNaN(end)) {
99
- var _context3;
100
- var formattedStart = start.toFixed(fractionDigits).replace(/(\d)(?=(\d{3})+(\.\d+)?$)/g, '$1,');
101
- var formattedEnd = end.toFixed(fractionDigits).replace(/(\d)(?=(\d{3})+(\.\d+)?$)/g, '$1,');
102
- return _concatInstanceProperty(_context3 = "".concat(formattedStart, "~\uFFE5")).call(_context3, formattedEnd);
103
- }
104
- } else if (!isNaN(Number(number))) {
105
- // 其他数字类型的参数处理，与原函数逻辑保持一致
106
- if (!_Number$isInteger(_parseFloat(number)) && number.toString().split('.')[1].length > 2) {
107
- return Number(number).toFixed(5).replace(/(^|\s)\d+/g, function (m) {
108
- return m.replace(/(?=(?!\b)(\d{3})+$)/g, ',');
92
+ var toThousands = function toThousands(number) {
93
+ var fractionDigits = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
94
+ var removeTrailingZeros = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
95
+ if (!isNaN(Number(number))) {
96
+ var formattedNumber;
97
+ if (!_Number$isInteger(_parseFloat(number))) {
98
+ formattedNumber = Number(number).toFixed(fractionDigits);
99
+ formattedNumber = formattedNumber.replace(/(\.\d*?[1-9])0*$/, '$1').replace(/\.0*$/, '');
100
+ } else {
101
+ formattedNumber = Number(number).toLocaleString(undefined, {
102
+ minimumFractionDigits: fractionDigits,
103
+ maximumFractionDigits: fractionDigits
109
104
  });
105
+ if (removeTrailingZeros) {
106
+ //去除整数和小数部分末尾的零
107
+ formattedNumber = formattedNumber.replace(/(\.\d*?[1-9])0*$/, '$1').replace(/\.0*$/, '');
108
+ }
110
109
  }
111
- return Number(number).toFixed(fractionDigits).replace(/(\d)(?=(\d{3})+(\.\d+)?$)/g, '$1,');
110
+ return formattedNumber;
111
+ } else if (typeof number === 'string' && _includesInstanceProperty(number).call(number, '~')) {
112
+ var numberList = number.split('~');
113
+ var formattedArr = _mapInstanceProperty(numberList).call(numberList, function (num, index) {
114
+ if (index === numberList.length - 1) {
115
+ return _parseFloat(num).toFixed(fractionDigits);
116
+ } else {
117
+ return _parseFloat(num).toFixed(fractionDigits);
118
+ }
119
+ });
120
+ var result = formattedArr.join('~');
121
+ return result;
112
122
  }
113
123
  };
114
124
  var showError = function showError(msg) {
package/lib/SuperTable2/SuperTable2.js CHANGED
@@ -599,7 +599,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
599
599
  } else if (col.showPrice || col.decimalPlaces) {
600
600
  col.render = function (text, record, index) {
601
601
  if (col.showPrice && text) {
602
- text = _helper["default"].toThousands(text, col.decimalPlaces ? col.decimalPlaces : 2);
602
+ text = _helper["default"].toThousands(text, col.decimalPlaces ? col.decimalPlaces : 2, true);
603
603
  return "\uFFE5".concat(text);
604
604
  } else {
605
605
  return text;
package/lib/SuperUpload/SuperUpload.js CHANGED
@@ -180,8 +180,7 @@ function UploadButton(_ref3) {
180
180
  }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
181
181
  size: "small",
182
182
  style: {
183
- display: 'block',
184
- margin: '8px'
183
+ marginLeft: '-10px'
185
184
  }
186
185
  }, buttonLabel)) : listType === 'picture-card' ? null : /*#__PURE__*/_react["default"].createElement(_Title["default"], {
187
186
  title: title,
package/lib/helper.js CHANGED
@@ -12,10 +12,10 @@ var _reduce = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
12
12
  var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
13
13
  var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
14
14
  var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array"));
15
- var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
16
- var _parseFloat2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/parse-float"));
17
- var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
18
15
  var _isInteger = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/number/is-integer"));
16
+ var _parseFloat2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/parse-float"));
17
+ var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
18
+ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
19
19
  var _message = _interopRequireDefault(require("antd/lib/message"));
20
20
  /**
21
21
  * 功能：从obj中取出不包含keys指定的属性，并组成一个新的子对象
@@ -101,26 +101,36 @@ var isEmpty2 = function isEmpty2(value) {
101
101
  }
102
102
  };
103
103
  exports.isEmpty2 = isEmpty2;
104
- var toThousands = function toThousands(number, fractionDigits) {
105
- if (typeof number === 'string' && (0, _includes["default"])(number).call(number, '~')) {
106
- // 如果参数是形如 "1~5" 的字符串
107
- var range = number.split('~');
108
- var start = (0, _parseFloat2["default"])(range[0]);
109
- var end = (0, _parseFloat2["default"])(range[1]);
110
- if (!isNaN(start) && !isNaN(end)) {
111
- var _context3;
112
- var formattedStart = start.toFixed(fractionDigits).replace(/(\d)(?=(\d{3})+(\.\d+)?$)/g, '$1,');
113
- var formattedEnd = end.toFixed(fractionDigits).replace(/(\d)(?=(\d{3})+(\.\d+)?$)/g, '$1,');
114
- return (0, _concat["default"])(_context3 = "".concat(formattedStart, "~\uFFE5")).call(_context3, formattedEnd);
115
- }
116
- } else if (!isNaN(Number(number))) {
117
- // 其他数字类型的参数处理，与原函数逻辑保持一致
118
- if (!(0, _isInteger["default"])((0, _parseFloat2["default"])(number)) && number.toString().split('.')[1].length > 2) {
119
- return Number(number).toFixed(5).replace(/(^|\s)\d+/g, function (m) {
120
- return m.replace(/(?=(?!\b)(\d{3})+$)/g, ',');
104
+ var toThousands = function toThousands(number) {
105
+ var fractionDigits = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
106
+ var removeTrailingZeros = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
107
+ if (!isNaN(Number(number))) {
108
+ var formattedNumber;
109
+ if (!(0, _isInteger["default"])((0, _parseFloat2["default"])(number))) {
110
+ formattedNumber = Number(number).toFixed(fractionDigits);
111
+ formattedNumber = formattedNumber.replace(/(\.\d*?[1-9])0*$/, '$1').replace(/\.0*$/, '');
112
+ } else {
113
+ formattedNumber = Number(number).toLocaleString(undefined, {
114
+ minimumFractionDigits: fractionDigits,
115
+ maximumFractionDigits: fractionDigits
121
116
  });
117
+ if (removeTrailingZeros) {
118
+ //去除整数和小数部分末尾的零
119
+ formattedNumber = formattedNumber.replace(/(\.\d*?[1-9])0*$/, '$1').replace(/\.0*$/, '');
120
+ }
122
121
  }
123
- return Number(number).toFixed(fractionDigits).replace(/(\d)(?=(\d{3})+(\.\d+)?$)/g, '$1,');
122
+ return formattedNumber;
123
+ } else if (typeof number === 'string' && (0, _includes["default"])(number).call(number, '~')) {
124
+ var numberList = number.split('~');
125
+ var formattedArr = (0, _map["default"])(numberList).call(numberList, function (num, index) {
126
+ if (index === numberList.length - 1) {
127
+ return (0, _parseFloat2["default"])(num).toFixed(fractionDigits);
128
+ } else {
129
+ return (0, _parseFloat2["default"])(num).toFixed(fractionDigits);
130
+ }
131
+ });
132
+ var result = formattedArr.join('~');
133
+ return result;
124
134
  }
125
135
  };
126
136
  exports.toThousands = toThousands;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cloud-b2b",
3
- "version": "1.1.32",
3
+ "version": "1.1.34",
4
4
  "description": "A react component library dependent antd",
5
5
  "keywords": [
6
6
  "react",