coolcare-lite-scada-component 1.0.64 → 1.0.66

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.
@@ -255,6 +255,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
255
255
  }),
256
256
  smooth: false,
257
257
  showAllSymbol: true,
258
+ identifierName: item.identifierName,
258
259
  symbolSize: 1.5,
259
260
  data: (_ref4 = item.pointDataList || item.indicatorDataList) === null || _ref4 === void 0 ? void 0 : _ref4.map(function (dataItem) {
260
261
  return [new Date(dataItem.ts).getTime(), dataItem.val];
@@ -271,7 +271,7 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
271
271
  pointList: pointList
272
272
  });
273
273
  }
274
- })), form.getFieldValue(['pointList', name, 'valueType']) == 'point' ? /*#__PURE__*/React.createElement(Form.Item, _extends({}, restField, {
274
+ })), form.getFieldValue(['pointList', name, 'valueType']) != 'indicator' ? /*#__PURE__*/React.createElement(Form.Item, _extends({}, restField, {
275
275
  label: "\u70B9\u4F4D\xA0",
276
276
  name: [name, 'identifierName'],
277
277
  className: "!ml-3",
@@ -44,15 +44,15 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
44
44
  if ('value' in (pointData || {})) {
45
45
  var _pointData;
46
46
  value = (_pointData = pointData) === null || _pointData === void 0 ? void 0 : _pointData.value;
47
- } else if ('indicatorData' in (pointData || {})) {
48
- var _pointData2, _pointData2$indicator;
49
- value = (_pointData2 = pointData) === null || _pointData2 === void 0 ? void 0 : (_pointData2$indicator = _pointData2.indicatorData) === null || _pointData2$indicator === void 0 ? void 0 : _pointData2$indicator.val;
50
47
  } else if ('aggregateDataList' in (pointData || {})) {
51
- var _pointData3, _pointData3$aggregate, _pointData3$aggregate2;
52
- value = (_pointData3 = pointData) === null || _pointData3 === void 0 ? void 0 : (_pointData3$aggregate = _pointData3.aggregateDataList) === null || _pointData3$aggregate === void 0 ? void 0 : (_pointData3$aggregate2 = _pointData3$aggregate[0]) === null || _pointData3$aggregate2 === void 0 ? void 0 : _pointData3$aggregate2.val;
48
+ var _pointData2, _pointData2$aggregate, _pointData2$aggregate2;
49
+ value = (_pointData2 = pointData) === null || _pointData2 === void 0 ? void 0 : (_pointData2$aggregate = _pointData2.aggregateDataList) === null || _pointData2$aggregate === void 0 ? void 0 : (_pointData2$aggregate2 = _pointData2$aggregate[0]) === null || _pointData2$aggregate2 === void 0 ? void 0 : _pointData2$aggregate2.val;
53
50
  if (typeof value === 'number') {
54
51
  value = Number(value.toFixed(1));
55
52
  }
53
+ } else if ('indicatorData' in (pointData || {})) {
54
+ var _pointData3, _pointData3$indicator;
55
+ value = (_pointData3 = pointData) === null || _pointData3 === void 0 ? void 0 : (_pointData3$indicator = _pointData3.indicatorData) === null || _pointData3$indicator === void 0 ? void 0 : _pointData3$indicator.val;
56
56
  } else if ('metricsList' in (pointData || {})) {
57
57
  var _pointData4, _pointData4$metricsLi, _pointData5;
58
58
  value = Number((_pointData4 = pointData) === null || _pointData4 === void 0 ? void 0 : (_pointData4$metricsLi = _pointData4.metricsList) === null || _pointData4$metricsLi === void 0 ? void 0 : _pointData4$metricsLi.reduce(function (a, b) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "coolcare-lite-scada-component",
3
- "version": "1.0.64",
3
+ "version": "1.0.66",
4
4
  "scripts": {
5
5
  "start": " PORT=8000 UMI_ENV=prod umi dev",
6
6
  "build:prod": "UMI_ENV=prod umi build",