cloud-b2b 1.1.36 → 1.1.38

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 +2 -1
  3. package/es/helper.js +3 -4
  4. package/lib/SuperTable2/SuperTable2.js +1 -1
  5. package/lib/SuperUpload/SuperUpload.js +2 -1
  6. package/lib/helper.js +3 -4
  7. package/package.json +1 -1
package/es/SuperTable2/SuperTable2.js CHANGED
@@ -589,7 +589,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
589
589
  text = helper.toThousands(text, col.decimalPlaces ? col.decimalPlaces : 2);
590
590
  return "\uFFE5".concat(text);
591
591
  } else {
592
- return text;
592
+ return "\uFFE5".concat(text.toFixed(2));
593
593
  }
594
594
  };
595
595
  }
package/es/SuperUpload/SuperUpload.js CHANGED
@@ -244,12 +244,13 @@ function SuperUpload(props) {
244
244
  readonly = props.readonly,
245
245
  title = props.title;
246
246
  var className = listType === 'picture-card' && fileList.length < limitNumber ? variables('SuperUpload') : variables('SuperUpload2');
247
+ var canUpload = fileList.length >= limitNumber;
247
248
  return loading ? /*#__PURE__*/React.createElement("div", null, "loading...") : /*#__PURE__*/React.createElement("div", {
248
249
  className: className
249
250
  }, (listType === 'picture-card' || readonly) && title ? /*#__PURE__*/React.createElement(Title, {
250
251
  title: props.title || '附件',
251
252
  required: props.required
252
- }) : null, /*#__PURE__*/React.createElement(_Upload, uploadProps, readonly ? null : /*#__PURE__*/React.createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
253
+ }) : null, /*#__PURE__*/React.createElement(_Upload, uploadProps, readonly || canUpload ? null : /*#__PURE__*/React.createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
253
254
  fileList: fileList
254
255
  }))), props.needText ? /*#__PURE__*/React.createElement("span", null, props.remark) : null);
255
256
  }
package/es/helper.js CHANGED
@@ -96,16 +96,15 @@ var toThousands = function toThousands(number) {
96
96
  var formattedNumber;
97
97
  if (!_Number$isInteger(_parseFloat(number))) {
98
98
  formattedNumber = Number(number).toFixed(fractionDigits);
99
+ }
100
+ if (removeTrailingZeros) {
101
+ //去除整数和小数部分末尾的零
99
102
  formattedNumber = formattedNumber.replace(/(\.\d*?[1-9])0*$/, '$1').replace(/\.0*$/, '');
100
103
  } else {
101
104
  formattedNumber = Number(number).toLocaleString(undefined, {
102
105
  minimumFractionDigits: fractionDigits,
103
106
  maximumFractionDigits: fractionDigits
104
107
  });
105
- if (removeTrailingZeros) {
106
- //去除整数和小数部分末尾的零
107
- formattedNumber = formattedNumber.replace(/(\.\d*?[1-9])0*$/, '$1').replace(/\.0*$/, '');
108
- }
109
108
  }
110
109
  return formattedNumber;
111
110
  } else if (typeof number === 'string' && _includesInstanceProperty(number).call(number, '~')) {
package/lib/SuperTable2/SuperTable2.js CHANGED
@@ -602,7 +602,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
602
602
  text = _helper["default"].toThousands(text, col.decimalPlaces ? col.decimalPlaces : 2);
603
603
  return "\uFFE5".concat(text);
604
604
  } else {
605
- return text;
605
+ return "\uFFE5".concat(text.toFixed(2));
606
606
  }
607
607
  };
608
608
  }
package/lib/SuperUpload/SuperUpload.js CHANGED
@@ -256,12 +256,13 @@ function SuperUpload(props) {
256
256
  readonly = props.readonly,
257
257
  title = props.title;
258
258
  var className = listType === 'picture-card' && fileList.length < limitNumber ? (0, _variables["default"])('SuperUpload') : (0, _variables["default"])('SuperUpload2');
259
+ var canUpload = fileList.length >= limitNumber;
259
260
  return loading ? /*#__PURE__*/_react["default"].createElement("div", null, "loading...") : /*#__PURE__*/_react["default"].createElement("div", {
260
261
  className: className
261
262
  }, (listType === 'picture-card' || readonly) && title ? /*#__PURE__*/_react["default"].createElement(_Title["default"], {
262
263
  title: props.title || '附件',
263
264
  required: props.required
264
- }) : null, /*#__PURE__*/_react["default"].createElement(_upload["default"], uploadProps, readonly ? null : /*#__PURE__*/_react["default"].createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
265
+ }) : null, /*#__PURE__*/_react["default"].createElement(_upload["default"], uploadProps, readonly || canUpload ? null : /*#__PURE__*/_react["default"].createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
265
266
  fileList: fileList
266
267
  }))), props.needText ? /*#__PURE__*/_react["default"].createElement("span", null, props.remark) : null);
267
268
  }
package/lib/helper.js CHANGED
@@ -108,16 +108,15 @@ var toThousands = function toThousands(number) {
108
108
  var formattedNumber;
109
109
  if (!(0, _isInteger["default"])((0, _parseFloat2["default"])(number))) {
110
110
  formattedNumber = Number(number).toFixed(fractionDigits);
111
+ }
112
+ if (removeTrailingZeros) {
113
+ //去除整数和小数部分末尾的零
111
114
  formattedNumber = formattedNumber.replace(/(\.\d*?[1-9])0*$/, '$1').replace(/\.0*$/, '');
112
115
  } else {
113
116
  formattedNumber = Number(number).toLocaleString(undefined, {
114
117
  minimumFractionDigits: fractionDigits,
115
118
  maximumFractionDigits: fractionDigits
116
119
  });
117
- if (removeTrailingZeros) {
118
- //去除整数和小数部分末尾的零
119
- formattedNumber = formattedNumber.replace(/(\.\d*?[1-9])0*$/, '$1').replace(/\.0*$/, '');
120
- }
121
120
  }
122
121
  return formattedNumber;
123
122
  } else if (typeof number === 'string' && (0, _includes["default"])(number).call(number, '~')) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cloud-b2b",
3
- "version": "1.1.36",
3
+ "version": "1.1.38",
4
4
  "description": "A react component library dependent antd",
5
5
  "keywords": [
6
6
  "react",