coolcare-lite-scada-component 2.0.36 → 2.0.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 (5) hide show
  1. package/es/element/ElePointValue/Component.js +3 -3
  2. package/es/element/EleSwitch/Component.js +2 -3
  3. package/es/element/EleSwitch/index.css +3 -0
  4. package/es/pages/display/Player/index.js +5 -3
  5. package/package.json +3 -3
package/es/element/ElePointValue/Component.js CHANGED
@@ -17,7 +17,7 @@ var directionClassNameMap = {
17
17
  bottom: 'flex-col-reverse'
18
18
  };
19
19
  var ElePointValueComponent = function ElePointValueComponent(_ref) {
20
- var _payload$pointList, _payload$label, _payload$unit, _payload$unit2, _payload$value, _payload$value2, _payload$mittMeta$nam, _payload$mittMeta, _payload$mittMeta2, _pointData$aggregateD, _pointData$aggregateD2, _pointData$aggregateD3, _pointData$aggregateD4, _payload$label2, _pointValue, _payload$unit3;
20
+ var _payload$pointList, _payload$label, _payload$unit, _payload$unit2, _payload$value, _payload$value2, _payload$mittMeta$nam, _payload$mittMeta, _payload$mittMeta2, _pointData$aggregateD, _pointData$aggregateD2, _pointData$aggregateD3, _pointData$aggregateD4, _payload$label2, _payload$unit3;
21
21
  var node = _ref.node;
22
22
  var payload = node === null || node === void 0 ? void 0 : node.getData();
23
23
  var configPoint = payload === null || payload === void 0 ? void 0 : (_payload$pointList = payload.pointList) === null || _payload$pointList === void 0 ? void 0 : _payload$pointList[0];
@@ -36,7 +36,7 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
36
36
  }
37
37
  });
38
38
  var pointData = usePointWatch(configPoint, payload === null || payload === void 0 ? void 0 : (_payload$mittMeta2 = payload.mittMeta) === null || _payload$mittMeta2 === void 0 ? void 0 : _payload$mittMeta2.namespace);
39
- var value = (pointData === null || pointData === void 0 ? void 0 : pointData.value) || (pointData === null || pointData === void 0 ? void 0 : (_pointData$aggregateD = pointData.aggregateDataList) === null || _pointData$aggregateD === void 0 ? void 0 : (_pointData$aggregateD2 = _pointData$aggregateD[0]) === null || _pointData$aggregateD2 === void 0 ? void 0 : _pointData$aggregateD2.val) || '-';
39
+ var value = (pointData === null || pointData === void 0 ? void 0 : pointData.value) === null ? (pointData === null || pointData === void 0 ? void 0 : (_pointData$aggregateD = pointData.aggregateDataList) === null || _pointData$aggregateD === void 0 ? void 0 : (_pointData$aggregateD2 = _pointData$aggregateD[0]) === null || _pointData$aggregateD2 === void 0 ? void 0 : _pointData$aggregateD2.val) || '-' : pointData === null || pointData === void 0 ? void 0 : pointData.value;
40
40
  if (pointData === null || pointData === void 0 ? void 0 : (_pointData$aggregateD3 = pointData.aggregateDataList) === null || _pointData$aggregateD3 === void 0 ? void 0 : (_pointData$aggregateD4 = _pointData$aggregateD3[0]) === null || _pointData$aggregateD4 === void 0 ? void 0 : _pointData$aggregateD4.val) {
41
41
  value = Number(value.toFixed(1));
42
42
  }
@@ -83,7 +83,7 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
83
83
  style: _objectSpread(_objectSpread({}, valueStyle), {}, {
84
84
  color: typeof numberColor === 'string' ? numberColor : valueStyle === null || valueStyle === void 0 ? void 0 : valueStyle.color
85
85
  })
86
- }, (_pointValue = pointValue) !== null && _pointValue !== void 0 ? _pointValue : '-'), (payload === null || payload === void 0 ? void 0 : (_payload$unit3 = payload.unit) === null || _payload$unit3 === void 0 ? void 0 : _payload$unit3.isShow) ? /*#__PURE__*/React.createElement("span", {
86
+ }, pointValue === null ? '-' : pointValue), (payload === null || payload === void 0 ? void 0 : (_payload$unit3 = payload.unit) === null || _payload$unit3 === void 0 ? void 0 : _payload$unit3.isShow) ? /*#__PURE__*/React.createElement("span", {
87
87
  style: unitStyle,
88
88
  className: styles.unit
89
89
  }, (payload === null || payload === void 0 ? void 0 : payload.unit.text) || (pointData === null || pointData === void 0 ? void 0 : pointData.unit)) : null)));
package/es/element/EleSwitch/Component.js CHANGED
@@ -11,7 +11,6 @@ import Switch from "../../components/Switch";
11
11
  import { usePointWatch } from "../../hooks";
12
12
  import { isNumber } from "../../utils";
13
13
  import { pointWrite } from "../utils";
14
- import "../../elementCss.css";
15
14
  import styles from "./index.css";
16
15
  import { ExclamationCircleOutlined } from '@ant-design/icons';
17
16
  var confirm = Modal.confirm;
@@ -23,6 +22,7 @@ var EleSwitchComponent = function EleSwitchComponent(_ref) {
23
22
  value = _useState2[0],
24
23
  setValue = _useState2[1];
25
24
  var payload = node === null || node === void 0 ? void 0 : node.getData();
25
+ var premission = payload === null || payload === void 0 ? void 0 : payload.premission;
26
26
  var configPoint = payload === null || payload === void 0 ? void 0 : (_payload$pointList = payload.pointList) === null || _payload$pointList === void 0 ? void 0 : _payload$pointList[0];
27
27
  var pointData = usePointWatch(configPoint, payload === null || payload === void 0 ? void 0 : (_payload$mittMeta = payload.mittMeta) === null || _payload$mittMeta === void 0 ? void 0 : _payload$mittMeta.namespace);
28
28
  var tooltipTitle = null;
@@ -37,7 +37,6 @@ var EleSwitchComponent = function EleSwitchComponent(_ref) {
37
37
  title: "操作警告",
38
38
  icon: /*#__PURE__*/React.createElement(ExclamationCircleOutlined, null),
39
39
  content: "确定执行操作吗？",
40
- className: "big",
41
40
  getContainer: function getContainer() {
42
41
  return document.getElementById("scada-body");
43
42
  },
@@ -73,7 +72,7 @@ var EleSwitchComponent = function EleSwitchComponent(_ref) {
73
72
  }
74
73
  }, [pointData === null || pointData === void 0 ? void 0 : pointData.value, payload === null || payload === void 0 ? void 0 : payload.checkedValue]);
75
74
  return /*#__PURE__*/React.createElement("div", {
76
- className: styles.wrap,
75
+ className: "".concat(styles.wrap, " ").concat(premission.includes("49") ? "" : styles.hide),
77
76
  onClick: function onClick(e) {
78
77
  return e.stopPropagation();
79
78
  }
package/es/element/EleSwitch/index.css CHANGED
@@ -4,3 +4,6 @@
4
4
  cursor: pointer;
5
5
  user-select: none;
6
6
  }
7
+ .hide {
8
+ display: none;
9
+ }
package/es/pages/display/Player/index.js CHANGED
@@ -441,9 +441,9 @@ var Player = function Player(_ref) {
441
441
  _context7.next = 2;
442
442
  return GetTdIndicatorAggregateData(ids.map(function (v) {
443
443
  var productNo = {
444
- emqktt: 'energy',
445
- mrwtn4: 'steamc',
446
- kf78l3: 'waterc'
444
+ r5onwf: 'energy',
445
+ p4snlw: 'steamc',
446
+ rommzw: 'waterc'
447
447
  };
448
448
  var str = v.split('_');
449
449
  return {
@@ -555,7 +555,9 @@ var Player = function Player(_ref) {
555
555
  var _jsonConfig$cells2;
556
556
  jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$cells2 = jsonConfig.cells) === null || _jsonConfig$cells2 === void 0 ? void 0 : _jsonConfig$cells2.forEach(function (v) {
557
557
  if (v.data) {
558
+ var _query$premission;
558
559
  v.data.mittMeta = mittMeta;
560
+ v.data.premission = ((_query$premission = query.premission) === null || _query$premission === void 0 ? void 0 : _query$premission.split(',')) || [];
559
561
  }
560
562
  });
561
563
  graph.fromJSON(jsonConfig);
package/package.json CHANGED
@@ -1,11 +1,11 @@
1
1
  {
2
2
  "name": "coolcare-lite-scada-component",
3
- "version": "2.0.36",
3
+ "version": "2.0.38",
4
4
  "scripts": {
5
5
  "start": " umi dev",
6
6
  "build:prod": "UMI_ENV=prod umi build",
7
7
  "build:generalfushi": "UMI_ENV=prod REACT_APP_PLATFORM=generalfushi umi build",
8
- "build:yimin": "UMI_ENV=prod REACT_APP_PLATFORM=yimin umi build",
8
+ "build:yimin": "export NODE_OPTIONS=--openssl-legacy-provider && UMI_ENV=prod REACT_APP_PLATFORM=yimin umi build",
9
9
  "build:staging": "UMI_ENV=staging umi build",
10
10
  "build:component": "father build",
11
11
  "postinstall": "umi generate tmp",
@@ -13,7 +13,7 @@
13
13
  "test": "umi-test",
14
14
  "test:coverage": "umi-test --coverage",
15
15
  "analyze": "ANALYZE=1 umi build",
16
- "deploy:prod": "docker build -t xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2024-12-2 . && docker push xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2024-12-2"
16
+ "deploy:prod": "docker build -t xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2025-4-23-3 . && docker push xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2025-4-23-3"
17
17
  },
18
18
  "main": "./es/componentIndex.js",
19
19
  "module": "./es/componentIndex.js",