coolcare-lite-scada-component 1.0.8 → 1.0.10

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 (4) hide show
  1. package/es/element/EleText/Component.js +21 -0
  2. package/es/pages/display/index.js +24 -10
  3. package/es/pages/editor/index.js +15 -2
  4. package/package.json +1 -1
package/es/element/EleText/Component.js CHANGED
@@ -7,12 +7,33 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
7
7
  import React from "react";
8
8
  import { memo } from 'react';
9
9
  import { reactShapeNodeAreEqual } from "../utils";
10
+ import { useEleEventHandle } from "../../hooks";
10
11
  import styles from "./index.css";
11
12
  var EleTextComponent = function EleTextComponent(_ref) {
13
+ var _payload$mittMeta$nam, _payload$mittMeta;
12
14
  var node = _ref.node;
13
15
  var payload = node === null || node === void 0 ? void 0 : node.getData();
16
+ var eventHandles = useEleEventHandle({
17
+ events: payload === null || payload === void 0 ? void 0 : payload.events,
18
+ payload: {
19
+ points: [],
20
+ namespace: (_payload$mittMeta$nam = payload === null || payload === void 0 ? void 0 : (_payload$mittMeta = payload.mittMeta) === null || _payload$mittMeta === void 0 ? void 0 : _payload$mittMeta.namespace) !== null && _payload$mittMeta$nam !== void 0 ? _payload$mittMeta$nam : 0
21
+ }
22
+ });
14
23
  return /*#__PURE__*/React.createElement("div", {
15
24
  className: "".concat(styles.wrap, " ele-text-wrap"),
25
+ onClick: function onClick(e) {
26
+ return eventHandles.current.onClick(e);
27
+ },
28
+ onContextMenu: function onContextMenu(e) {
29
+ return eventHandles.current.onContextMenu(e);
30
+ },
31
+ onMouseEnter: function onMouseEnter(e) {
32
+ return eventHandles.current.onMouseEnter(e);
33
+ },
34
+ onMouseLeave: function onMouseLeave(e) {
35
+ return eventHandles.current.onMouseLeave(e);
36
+ },
16
37
  style: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, payload === null || payload === void 0 ? void 0 : payload.fontStyles), payload === null || payload === void 0 ? void 0 : payload.borderStyles), payload === null || payload === void 0 ? void 0 : payload.fillStyles), payload === null || payload === void 0 ? void 0 : payload.margin_padding)
17
38
  }, (payload === null || payload === void 0 ? void 0 : payload.textContent) || '双击输入');
18
39
  };
package/es/pages/display/index.js CHANGED
@@ -170,7 +170,7 @@ var Display = function Display(_ref) {
170
170
  if (query.scene === 'freedom') {
171
171
  var _fetchDeviceScadaConfig = /*#__PURE__*/function () {
172
172
  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
173
- var _data$list, _yield$GetCompanyConf, success, data, scadaConfig;
173
+ var _data$list, _configJSON$cells, _yield$GetCompanyConf, success, data, scadaConfig, configJSON;
174
174
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
175
175
  while (1) switch (_context3.prev = _context3.next) {
176
176
  case 0:
@@ -194,25 +194,39 @@ var Display = function Display(_ref) {
194
194
  return _context3.abrupt("return");
195
195
  case 10:
196
196
  scadaConfig = data.list[0].config;
197
+ configJSON = JSON.parse(scadaConfig || '{}'); // 修复后端保存数据时，因json数据种存在"%"而导致的"%"数据丢失问题
198
+ if (configJSON === null || configJSON === void 0 ? void 0 : (_configJSON$cells = configJSON.cells) === null || _configJSON$cells === void 0 ? void 0 : _configJSON$cells.length) {
199
+ configJSON === null || configJSON === void 0 ? void 0 : configJSON.cells.forEach(function (item) {
200
+ var _item$attrs, _item$attrs$body, _item$attrs2, _item$attrs2$body, _item$attrs2$body$ref, _item$attrs3, _item$attrs3$body, _item$attrs5, _item$attrs5$body, _item$attrs6, _item$attrs6$body, _item$attrs6$body$ref, _item$attrs7, _item$attrs7$body;
201
+ if ((item === null || item === void 0 ? void 0 : (_item$attrs = item.attrs) === null || _item$attrs === void 0 ? void 0 : (_item$attrs$body = _item$attrs.body) === null || _item$attrs$body === void 0 ? void 0 : _item$attrs$body.refWidth) && (item === null || item === void 0 ? void 0 : (_item$attrs2 = item.attrs) === null || _item$attrs2 === void 0 ? void 0 : (_item$attrs2$body = _item$attrs2.body) === null || _item$attrs2$body === void 0 ? void 0 : (_item$attrs2$body$ref = _item$attrs2$body.refWidth) === null || _item$attrs2$body$ref === void 0 ? void 0 : _item$attrs2$body$ref.indexOf('%')) === -1 && !isNaN(Number(item === null || item === void 0 ? void 0 : (_item$attrs3 = item.attrs) === null || _item$attrs3 === void 0 ? void 0 : (_item$attrs3$body = _item$attrs3.body) === null || _item$attrs3$body === void 0 ? void 0 : _item$attrs3$body.refWidth))) {
202
+ var _item$attrs4, _item$attrs4$body;
203
+ item.attrs.body.refWidth = "".concat(item === null || item === void 0 ? void 0 : (_item$attrs4 = item.attrs) === null || _item$attrs4 === void 0 ? void 0 : (_item$attrs4$body = _item$attrs4.body) === null || _item$attrs4$body === void 0 ? void 0 : _item$attrs4$body.refWidth, "%");
204
+ }
205
+ if ((item === null || item === void 0 ? void 0 : (_item$attrs5 = item.attrs) === null || _item$attrs5 === void 0 ? void 0 : (_item$attrs5$body = _item$attrs5.body) === null || _item$attrs5$body === void 0 ? void 0 : _item$attrs5$body.refHeight) && (item === null || item === void 0 ? void 0 : (_item$attrs6 = item.attrs) === null || _item$attrs6 === void 0 ? void 0 : (_item$attrs6$body = _item$attrs6.body) === null || _item$attrs6$body === void 0 ? void 0 : (_item$attrs6$body$ref = _item$attrs6$body.refHeight) === null || _item$attrs6$body$ref === void 0 ? void 0 : _item$attrs6$body$ref.indexOf('%')) === -1 && !isNaN(Number(item === null || item === void 0 ? void 0 : (_item$attrs7 = item.attrs) === null || _item$attrs7 === void 0 ? void 0 : (_item$attrs7$body = _item$attrs7.body) === null || _item$attrs7$body === void 0 ? void 0 : _item$attrs7$body.refHeight))) {
206
+ var _item$attrs8, _item$attrs8$body;
207
+ item.attrs.body.refHeight = "".concat(item === null || item === void 0 ? void 0 : (_item$attrs8 = item.attrs) === null || _item$attrs8 === void 0 ? void 0 : (_item$attrs8$body = _item$attrs8.body) === null || _item$attrs8$body === void 0 ? void 0 : _item$attrs8$body.refHeight, "%");
208
+ }
209
+ });
210
+ }
197
211
  if (scadaConfig) {
198
- setJsonConfig(JSON.parse(scadaConfig || '{}'));
212
+ setJsonConfig(configJSON);
199
213
  }
200
- _context3.next = 18;
214
+ _context3.next = 20;
201
215
  break;
202
- case 14:
203
- _context3.prev = 14;
216
+ case 16:
217
+ _context3.prev = 16;
204
218
  _context3.t0 = _context3["catch"](0);
205
219
  console.error(_context3.t0);
206
220
  message.error('组态配置获取失败');
207
- case 18:
208
- _context3.prev = 18;
221
+ case 20:
222
+ _context3.prev = 20;
209
223
  setLoading(false);
210
- return _context3.finish(18);
211
- case 21:
224
+ return _context3.finish(20);
225
+ case 23:
212
226
  case "end":
213
227
  return _context3.stop();
214
228
  }
215
- }, _callee3, null, [[0, 14, 18, 21]]);
229
+ }, _callee3, null, [[0, 16, 20, 23]]);
216
230
  }));
217
231
  return function _fetchDeviceScadaConfig() {
218
232
  return _ref4.apply(this, arguments);
package/es/pages/editor/index.js CHANGED
@@ -183,7 +183,7 @@ export default (function () {
183
183
  if (query.scene === 'freedom') {
184
184
  var fetchScadaConfig = /*#__PURE__*/function () {
185
185
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
186
- var hideMsg, _data$list, _yield$GetCompanyConf, success, data, scadaConfig, configJSON, width, height;
186
+ var hideMsg, _data$list, _yield$GetCompanyConf, success, data, scadaConfig, _configJSON$cells, configJSON, width, height;
187
187
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
188
188
  while (1) switch (_context2.prev = _context2.next) {
189
189
  case 0:
@@ -208,7 +208,20 @@ export default (function () {
208
208
  case 10:
209
209
  scadaConfig = data.list[0].config;
210
210
  if (scadaConfig) {
211
- configJSON = JSON.parse(scadaConfig || '{}');
211
+ configJSON = JSON.parse(scadaConfig || '{}'); // 修复后端保存数据时，因json数据种存在"%"而导致的"%"数据丢失问题
212
+ if (configJSON === null || configJSON === void 0 ? void 0 : (_configJSON$cells = configJSON.cells) === null || _configJSON$cells === void 0 ? void 0 : _configJSON$cells.length) {
213
+ configJSON === null || configJSON === void 0 ? void 0 : configJSON.cells.forEach(function (item) {
214
+ var _item$attrs, _item$attrs$body, _item$attrs2, _item$attrs2$body, _item$attrs2$body$ref, _item$attrs3, _item$attrs3$body, _item$attrs5, _item$attrs5$body, _item$attrs6, _item$attrs6$body, _item$attrs6$body$ref, _item$attrs7, _item$attrs7$body;
215
+ if ((item === null || item === void 0 ? void 0 : (_item$attrs = item.attrs) === null || _item$attrs === void 0 ? void 0 : (_item$attrs$body = _item$attrs.body) === null || _item$attrs$body === void 0 ? void 0 : _item$attrs$body.refWidth) && (item === null || item === void 0 ? void 0 : (_item$attrs2 = item.attrs) === null || _item$attrs2 === void 0 ? void 0 : (_item$attrs2$body = _item$attrs2.body) === null || _item$attrs2$body === void 0 ? void 0 : (_item$attrs2$body$ref = _item$attrs2$body.refWidth) === null || _item$attrs2$body$ref === void 0 ? void 0 : _item$attrs2$body$ref.indexOf('%')) === -1 && !isNaN(Number(item === null || item === void 0 ? void 0 : (_item$attrs3 = item.attrs) === null || _item$attrs3 === void 0 ? void 0 : (_item$attrs3$body = _item$attrs3.body) === null || _item$attrs3$body === void 0 ? void 0 : _item$attrs3$body.refWidth))) {
216
+ var _item$attrs4, _item$attrs4$body;
217
+ item.attrs.body.refWidth = "".concat(item === null || item === void 0 ? void 0 : (_item$attrs4 = item.attrs) === null || _item$attrs4 === void 0 ? void 0 : (_item$attrs4$body = _item$attrs4.body) === null || _item$attrs4$body === void 0 ? void 0 : _item$attrs4$body.refWidth, "%");
218
+ }
219
+ if ((item === null || item === void 0 ? void 0 : (_item$attrs5 = item.attrs) === null || _item$attrs5 === void 0 ? void 0 : (_item$attrs5$body = _item$attrs5.body) === null || _item$attrs5$body === void 0 ? void 0 : _item$attrs5$body.refHeight) && (item === null || item === void 0 ? void 0 : (_item$attrs6 = item.attrs) === null || _item$attrs6 === void 0 ? void 0 : (_item$attrs6$body = _item$attrs6.body) === null || _item$attrs6$body === void 0 ? void 0 : (_item$attrs6$body$ref = _item$attrs6$body.refHeight) === null || _item$attrs6$body$ref === void 0 ? void 0 : _item$attrs6$body$ref.indexOf('%')) === -1 && !isNaN(Number(item === null || item === void 0 ? void 0 : (_item$attrs7 = item.attrs) === null || _item$attrs7 === void 0 ? void 0 : (_item$attrs7$body = _item$attrs7.body) === null || _item$attrs7$body === void 0 ? void 0 : _item$attrs7$body.refHeight))) {
220
+ var _item$attrs8, _item$attrs8$body;
221
+ item.attrs.body.refHeight = "".concat(item === null || item === void 0 ? void 0 : (_item$attrs8 = item.attrs) === null || _item$attrs8 === void 0 ? void 0 : (_item$attrs8$body = _item$attrs8.body) === null || _item$attrs8$body === void 0 ? void 0 : _item$attrs8$body.refHeight, "%");
222
+ }
223
+ });
224
+ }
212
225
  graphCore.graph.fromJSON(configJSON);
213
226
  if (configJSON.pageConfig) {
214
227
  setPageConfig(configJSON.pageConfig);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "coolcare-lite-scada-component",
3
- "version": "1.0.8",
3
+ "version": "1.0.10",
4
4
  "scripts": {
5
5
  "start": "umi dev",
6
6
  "build:prod": "UMI_ENV=prod umi build",