coolcare-lite-scada-component 1.0.73 → 1.0.74

package/es/components/IconFont/index.js

@@ -0,0 +1,6 @@
+import { createFromIconfontCN } from '@ant-design/icons';
+var IconFont = createFromIconfontCN({
+  // scriptUrl: '//at.alicdn.com/t/c/font_3235821_qypojfizzen.js',
+  scriptUrl: 'https://coolcare-lite-assets.oss-cn-shanghai.aliyuncs.com/pc-common/iconfont/iconfont.js'
+});
+export default IconFont;

package/es/components/ModalChangePointValue.js

@@ -0,0 +1,273 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return r; }; var t, r = {}, e = Object.prototype, n = e.hasOwnProperty, o = "function" == typeof Symbol ? Symbol : {}, i = o.iterator || "@@iterator", a = o.asyncIterator || "@@asyncIterator", u = o.toStringTag || "@@toStringTag"; function c(t, r, e, n) { return Object.defineProperty(t, r, { value: e, enumerable: !n, configurable: !n, writable: !n }); } try { c({}, ""); } catch (t) { c = function c(t, r, e) { return t[r] = e; }; } function h(r, e, n, o) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype); return c(a, "_invoke", function (r, e, n) { var o = 1; return function (i, a) { if (3 === o) throw Error("Generator is already running"); if (4 === o) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var u = n.delegate; if (u) { var c = d(u, n); if (c) { if (c === f) continue; return c; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (1 === o) throw o = 4, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = 3; var h = s(r, e, n); if ("normal" === h.type) { if (o = n.done ? 4 : 2, h.arg === f) continue; return { value: h.arg, done: n.done }; } "throw" === h.type && (o = 4, n.method = "throw", n.arg = h.arg); } }; }(r, n, new Context(o || [])), !0), a; } function s(t, r, e) { try { return { type: "normal", arg: t.call(r, e) }; } catch (t) { return { type: "throw", arg: t }; } } r.wrap = h; var f = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var l = {}; c(l, i, function () { return this; }); var p = Object.getPrototypeOf, y = p && p(p(x([]))); y && y !== e && n.call(y, i) && (l = y); var v = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(l); function g(t) { ["next", "throw", "return"].forEach(function (r) { c(t, r, function (t) { return this._invoke(r, t); }); }); } function AsyncIterator(t, r) { function e(o, i, a, u) { var c = s(t[o], t, i); if ("throw" !== c.type) { var h = c.arg, f = h.value; return f && "object" == _typeof(f) && n.call(f, "__await") ? r.resolve(f.__await).then(function (t) { e("next", t, a, u); }, function (t) { e("throw", t, a, u); }) : r.resolve(f).then(function (t) { h.value = t, a(h); }, function (t) { return e("throw", t, a, u); }); } u(c.arg); } var o; c(this, "_invoke", function (t, n) { function i() { return new r(function (r, o) { e(t, n, r, o); }); } return o = o ? o.then(i, i) : i(); }, !0); } function d(r, e) { var n = e.method, o = r.i[n]; if (o === t) return e.delegate = null, "throw" === n && r.i.return && (e.method = "return", e.arg = t, d(r, e), "throw" === e.method) || "return" !== n && (e.method = "throw", e.arg = new TypeError("The iterator does not provide a '" + n + "' method")), f; var i = s(o, r.i, e.arg); if ("throw" === i.type) return e.method = "throw", e.arg = i.arg, e.delegate = null, f; var a = i.arg; return a ? a.done ? (e[r.r] = a.value, e.next = r.n, "return" !== e.method && (e.method = "next", e.arg = t), e.delegate = null, f) : a : (e.method = "throw", e.arg = new TypeError("iterator result is not an object"), e.delegate = null, f); } function w(t) { this.tryEntries.push(t); } function m(r) { var e = r[4] || {}; e.type = "normal", e.arg = t, r[4] = e; } function Context(t) { this.tryEntries = [[-1]], t.forEach(w, this), this.reset(!0); } function x(r) { if (null != r) { var e = r[i]; if (e) return e.call(r); if ("function" == typeof r.next) return r; if (!isNaN(r.length)) { var o = -1, a = function e() { for (; ++o < r.length;) if (n.call(r, o)) return e.value = r[o], e.done = !1, e; return e.value = t, e.done = !0, e; }; return a.next = a; } } throw new TypeError(_typeof(r) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, c(v, "constructor", GeneratorFunctionPrototype), c(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = c(GeneratorFunctionPrototype, u, "GeneratorFunction"), r.isGeneratorFunction = function (t) { var r = "function" == typeof t && t.constructor; return !!r && (r === GeneratorFunction || "GeneratorFunction" === (r.displayName || r.name)); }, r.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, c(t, u, "GeneratorFunction")), t.prototype = Object.create(v), t; }, r.awrap = function (t) { return { __await: t }; }, g(AsyncIterator.prototype), c(AsyncIterator.prototype, a, function () { return this; }), r.AsyncIterator = AsyncIterator, r.async = function (t, e, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(h(t, e, n, o), i); return r.isGeneratorFunction(e) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, g(v), c(v, u, "Generator"), c(v, i, function () { return this; }), c(v, "toString", function () { return "[object Generator]"; }), r.keys = function (t) { var r = Object(t), e = []; for (var n in r) e.unshift(n); return function t() { for (; e.length;) if ((n = e.pop()) in r) return t.value = n, t.done = !1, t; return t.done = !0, t; }; }, r.values = x, Context.prototype = { constructor: Context, reset: function reset(r) { if (this.prev = this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(m), !r) for (var e in this) "t" === e.charAt(0) && n.call(this, e) && !isNaN(+e.slice(1)) && (this[e] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0][4]; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(r) { if (this.done) throw r; var e = this; function n(t) { a.type = "throw", a.arg = r, e.next = t; } for (var o = e.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i[4], u = this.prev, c = i[1], h = i[2]; if (-1 === i[0]) return n("end"), !1; if (!c && !h) throw Error("try statement without catch or finally"); if (null != i[0] && i[0] <= u) { if (u < c) return this.method = "next", this.arg = t, n(c), !0; if (u < h) return n(h), !1; } } }, abrupt: function abrupt(t, r) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var n = this.tryEntries[e]; if (n[0] > -1 && n[0] <= this.prev && this.prev < n[2]) { var o = n; break; } } o && ("break" === t || "continue" === t) && o[0] <= r && r <= o[2] && (o = null); var i = o ? o[4] : {}; return i.type = t, i.arg = r, o ? (this.method = "next", this.next = o[2], f) : this.complete(i); }, complete: function complete(t, r) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && r && (this.next = r), f; }, finish: function finish(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[2] === t) return this.complete(e[4], e[3]), m(e), f; } }, catch: function _catch(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[0] === t) { var n = e[4]; if ("throw" === n.type) { var o = n.arg; m(e); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(r, e, n) { return this.delegate = { i: x(r), r: e, n: n }, "next" === this.method && (this.arg = t), f; } }, r; }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+import React from "react";
+import { Modal, Form, InputNumber, message, Space, Button, Switch, Select } from 'antd';
+import { CommonMqttWritePointData, ModbusMqttWritePointData } from "../services/gateway/Point";
+import { useState, useEffect } from 'react';
+var Option = Select.Option;
+var layout = {
+  labelCol: {
+    span: 0
+  },
+  wrapperCol: {
+    span: 24
+  }
+};
+var tailLayout = {
+  wrapperCol: {
+    offset: 2,
+    span: 22
+  }
+};
+var ModalChangePointValue = function ModalChangePointValue(_ref) {
+  var _ref$protocol = _ref.protocol,
+    protocol = _ref$protocol === void 0 ? 0 : _ref$protocol,
+    pointValue = _ref.pointValue,
+    _ref$pointIdList = _ref.pointIdList,
+    pointIdList = _ref$pointIdList === void 0 ? [] : _ref$pointIdList,
+    _ref$pointEnumItemLis = _ref.pointEnumItemList,
+    pointEnumItemList = _ref$pointEnumItemLis === void 0 ? [] : _ref$pointEnumItemLis,
+    visible = _ref.visible,
+    onSubmit = _ref.onSubmit,
+    onCancel = _ref.onCancel;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  /** 点位写入弹框  */
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  /** 点位类型 1：数值类型  */
+  var _useState3 = useState(1),
+    _useState4 = _slicedToArray(_useState3, 2),
+    pointEnumId = _useState4[0],
+    setPointEnumId = _useState4[1];
+  /** 枚举类型选择方式是否为开关  */
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isSwitch = _useState6[0],
+    setIsSwitch = _useState6[1];
+  var closeModal = function closeModal() {
+    setPointEnumId(1);
+    setIsSwitch(false);
+    form.resetFields();
+    onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+  };
+  useEffect(function () {
+    if (visible && form) {
+      var switchFlag = false;
+      if (pointEnumItemList.length) {
+        var _pointEnumItemList$;
+        // 如果点位是枚举类型，并且为0:关,1:开，表单交互为开关
+        switchFlag = Boolean(pointEnumItemList[0].pointEnumId !== 1 && (pointEnumItemList[0].pointEnumItemKey === '开' && pointEnumItemList[0].pointEnumItemValue === 1 || pointEnumItemList[0].pointEnumItemKey === '关' && pointEnumItemList[0].pointEnumItemValue === 0));
+        setIsSwitch(switchFlag);
+
+        // 设置点位枚举id
+        setPointEnumId((pointEnumItemList === null || pointEnumItemList === void 0 ? void 0 : (_pointEnumItemList$ = pointEnumItemList[0]) === null || _pointEnumItemList$ === void 0 ? void 0 : _pointEnumItemList$.pointEnumId) || 1);
+      }
+      // 设置初始值
+      if (typeof pointValue === 'number') {
+        var _pointEnumItemList$2;
+        if ((pointEnumItemList === null || pointEnumItemList === void 0 ? void 0 : (_pointEnumItemList$2 = pointEnumItemList[0]) === null || _pointEnumItemList$2 === void 0 ? void 0 : _pointEnumItemList$2.pointEnumId) === 1) {
+          form.setFieldsValue({
+            value1: pointValue
+          });
+        } else if (switchFlag) {
+          form.setFieldsValue({
+            value2: Boolean(pointValue)
+          });
+        } else {
+          form.setFieldsValue({
+            value3: pointValue
+          });
+        }
+      }
+    }
+  }, [pointEnumItemList, visible, form, pointValue]);
+
+  /** 提交表单且数据验证成功后回调事件 */
+  var onFinish = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
+      var value1, value2, value3, data, value, res, _res$data, _res$data2, _res, _res$data3, _res$data4;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            value1 = values.value1, value2 = values.value2, value3 = values.value3;
+            data = {};
+            if (pointEnumId === 1) {
+              value = value1;
+            } else if (isSwitch) {
+              value = value2 ? 1 : 0;
+            } else {
+              value = value3;
+            }
+            if (!(typeof value !== 'number')) {
+              _context.next = 6;
+              break;
+            }
+            message.error('写入数据只能为数值类型');
+            return _context.abrupt("return");
+          case 6:
+            pointIdList.forEach(function (item) {
+              data[item] = value;
+            });
+            setLoading(true);
+            _context.prev = 8;
+            if (!(protocol === 0)) {
+              _context.next = 17;
+              break;
+            }
+            _context.next = 12;
+            return ModbusMqttWritePointData(data);
+          case 12:
+            res = _context.sent;
+            if (res.success) {
+              if ((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.key) {
+                message.info((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.key);
+              } else {
+                message.success(res.data);
+              }
+              message.success('写入成功，请等待下轮数据刷新');
+              onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(Number(value));
+              closeModal();
+            } else {
+              message.error(res.message);
+            }
+            setLoading(false);
+            _context.next = 26;
+            break;
+          case 17:
+            if (!(protocol === 1)) {
+              _context.next = 25;
+              break;
+            }
+            _context.next = 20;
+            return CommonMqttWritePointData(data);
+          case 20:
+            _res = _context.sent;
+            if (_res.success) {
+              if ((_res$data3 = _res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.key) {
+                message.info((_res$data4 = _res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.key);
+              } else {
+                message.success(_res.data);
+              }
+              onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(Number(value));
+              message.success('写入成功，请等待下轮数据刷新');
+              closeModal();
+            } else {
+              message.error(_res.message);
+            }
+            setLoading(false);
+            _context.next = 26;
+            break;
+          case 25:
+            message.info('暂不支持该协议网关的写入');
+          case 26:
+            _context.next = 32;
+            break;
+          case 28:
+            _context.prev = 28;
+            _context.t0 = _context["catch"](8);
+            message.error('写入数据失败');
+            setLoading(false);
+          case 32:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[8, 28]]);
+    }));
+    return function onFinish(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  return /*#__PURE__*/React.createElement(Modal, {
+    title: "\u5199\u5165\u6570\u636E",
+    visible: visible,
+    closable: false,
+    width: 330,
+    maskClosable: true,
+    footer: null,
+    onCancel: closeModal,
+    afterClose: closeModal,
+    wrapClassName: 'form-modal'
+  }, /*#__PURE__*/React.createElement(Form, _extends({}, layout, {
+    form: form,
+    name: "form",
+    onFinish: onFinish,
+    initialValues: {
+      value1: undefined,
+      value2: false,
+      value3: undefined
+    }
+  }), pointEnumId === 1 ? /*#__PURE__*/React.createElement(Form.Item, {
+    name: "value1",
+    rules: [{
+      required: true,
+      message: '请输入'
+    }]
+  }, /*#__PURE__*/React.createElement(InputNumber, {
+    placeholder: "\u8BF7\u8F93\u5165\u8981\u5199\u5165\u7684\u503C",
+    disabled: loading,
+    style: {
+      width: '100%'
+    }
+  })) : isSwitch ? /*#__PURE__*/React.createElement(Form.Item, {
+    name: "value2",
+    valuePropName: "checked",
+    rules: [{
+      required: true,
+      message: '请选择'
+    }]
+  }, /*#__PURE__*/React.createElement(Switch, {
+    checkedChildren: "\u5F00",
+    unCheckedChildren: "\u5173"
+  })) : /*#__PURE__*/React.createElement(Form.Item, {
+    name: "value3",
+    rules: [{
+      required: true,
+      message: '请选择'
+    }]
+  }, /*#__PURE__*/React.createElement(Select, {
+    style: {
+      width: '100%'
+    },
+    placeholder: '请选择'
+  }, pointEnumItemList === null || pointEnumItemList === void 0 ? void 0 : pointEnumItemList.map(function (item) {
+    return /*#__PURE__*/React.createElement(Option, {
+      value: item.pointEnumItemValue,
+      key: item.pointEnumItemValue
+    }, item.pointEnumItemKey);
+  }))), /*#__PURE__*/React.createElement(Form.Item, _extends({}, tailLayout, {
+    noStyle: true,
+    className: "modelFooterItem"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "form-modal-footer"
+  }, /*#__PURE__*/React.createElement(Space, {
+    align: "center",
+    size: 15
+  }, /*#__PURE__*/React.createElement(Button, {
+    onClick: onCancel,
+    htmlType: "button",
+    style: {
+      float: 'right'
+    }
+  }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
+    loading: loading,
+    type: "primary",
+    htmlType: "submit",
+    style: {
+      float: 'right'
+    }
+  }, "\u786E\u5B9A"))))));
+};
+export default ModalChangePointValue;

package/es/element/ElePointValue/Component.js

@@ -1,4 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return r; }; var t, r = {}, e = Object.prototype, n = e.hasOwnProperty, o = "function" == typeof Symbol ? Symbol : {}, i = o.iterator || "@@iterator", a = o.asyncIterator || "@@asyncIterator", u = o.toStringTag || "@@toStringTag"; function c(t, r, e, n) { return Object.defineProperty(t, r, { value: e, enumerable: !n, configurable: !n, writable: !n }); } try { c({}, ""); } catch (t) { c = function c(t, r, e) { return t[r] = e; }; } function h(r, e, n, o) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype); return c(a, "_invoke", function (r, e, n) { var o = 1; return function (i, a) { if (3 === o) throw Error("Generator is already running"); if (4 === o) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var u = n.delegate; if (u) { var c = d(u, n); if (c) { if (c === f) continue; return c; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (1 === o) throw o = 4, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = 3; var h = s(r, e, n); if ("normal" === h.type) { if (o = n.done ? 4 : 2, h.arg === f) continue; return { value: h.arg, done: n.done }; } "throw" === h.type && (o = 4, n.method = "throw", n.arg = h.arg); } }; }(r, n, new Context(o || [])), !0), a; } function s(t, r, e) { try { return { type: "normal", arg: t.call(r, e) }; } catch (t) { return { type: "throw", arg: t }; } } r.wrap = h; var f = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var l = {}; c(l, i, function () { return this; }); var p = Object.getPrototypeOf, y = p && p(p(x([]))); y && y !== e && n.call(y, i) && (l = y); var v = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(l); function g(t) { ["next", "throw", "return"].forEach(function (r) { c(t, r, function (t) { return this._invoke(r, t); }); }); } function AsyncIterator(t, r) { function e(o, i, a, u) { var c = s(t[o], t, i); if ("throw" !== c.type) { var h = c.arg, f = h.value; return f && "object" == _typeof(f) && n.call(f, "__await") ? r.resolve(f.__await).then(function (t) { e("next", t, a, u); }, function (t) { e("throw", t, a, u); }) : r.resolve(f).then(function (t) { h.value = t, a(h); }, function (t) { return e("throw", t, a, u); }); } u(c.arg); } var o; c(this, "_invoke", function (t, n) { function i() { return new r(function (r, o) { e(t, n, r, o); }); } return o = o ? o.then(i, i) : i(); }, !0); } function d(r, e) { var n = e.method, o = r.i[n]; if (o === t) return e.delegate = null, "throw" === n && r.i.return && (e.method = "return", e.arg = t, d(r, e), "throw" === e.method) || "return" !== n && (e.method = "throw", e.arg = new TypeError("The iterator does not provide a '" + n + "' method")), f; var i = s(o, r.i, e.arg); if ("throw" === i.type) return e.method = "throw", e.arg = i.arg, e.delegate = null, f; var a = i.arg; return a ? a.done ? (e[r.r] = a.value, e.next = r.n, "return" !== e.method && (e.method = "next", e.arg = t), e.delegate = null, f) : a : (e.method = "throw", e.arg = new TypeError("iterator result is not an object"), e.delegate = null, f); } function w(t) { this.tryEntries.push(t); } function m(r) { var e = r[4] || {}; e.type = "normal", e.arg = t, r[4] = e; } function Context(t) { this.tryEntries = [[-1]], t.forEach(w, this), this.reset(!0); } function x(r) { if (null != r) { var e = r[i]; if (e) return e.call(r); if ("function" == typeof r.next) return r; if (!isNaN(r.length)) { var o = -1, a = function e() { for (; ++o < r.length;) if (n.call(r, o)) return e.value = r[o], e.done = !1, e; return e.value = t, e.done = !0, e; }; return a.next = a; } } throw new TypeError(_typeof(r) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, c(v, "constructor", GeneratorFunctionPrototype), c(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = c(GeneratorFunctionPrototype, u, "GeneratorFunction"), r.isGeneratorFunction = function (t) { var r = "function" == typeof t && t.constructor; return !!r && (r === GeneratorFunction || "GeneratorFunction" === (r.displayName || r.name)); }, r.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, c(t, u, "GeneratorFunction")), t.prototype = Object.create(v), t; }, r.awrap = function (t) { return { __await: t }; }, g(AsyncIterator.prototype), c(AsyncIterator.prototype, a, function () { return this; }), r.AsyncIterator = AsyncIterator, r.async = function (t, e, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(h(t, e, n, o), i); return r.isGeneratorFunction(e) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, g(v), c(v, u, "Generator"), c(v, i, function () { return this; }), c(v, "toString", function () { return "[object Generator]"; }), r.keys = function (t) { var r = Object(t), e = []; for (var n in r) e.unshift(n); return function t() { for (; e.length;) if ((n = e.pop()) in r) return t.value = n, t.done = !1, t; return t.done = !0, t; }; }, r.values = x, Context.prototype = { constructor: Context, reset: function reset(r) { if (this.prev = this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(m), !r) for (var e in this) "t" === e.charAt(0) && n.call(this, e) && !isNaN(+e.slice(1)) && (this[e] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0][4]; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(r) { if (this.done) throw r; var e = this; function n(t) { a.type = "throw", a.arg = r, e.next = t; } for (var o = e.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i[4], u = this.prev, c = i[1], h = i[2]; if (-1 === i[0]) return n("end"), !1; if (!c && !h) throw Error("try statement without catch or finally"); if (null != i[0] && i[0] <= u) { if (u < c) return this.method = "next", this.arg = t, n(c), !0; if (u < h) return n(h), !1; } } }, abrupt: function abrupt(t, r) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var n = this.tryEntries[e]; if (n[0] > -1 && n[0] <= this.prev && this.prev < n[2]) { var o = n; break; } } o && ("break" === t || "continue" === t) && o[0] <= r && r <= o[2] && (o = null); var i = o ? o[4] : {}; return i.type = t, i.arg = r, o ? (this.method = "next", this.next = o[2], f) : this.complete(i); }, complete: function complete(t, r) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && r && (this.next = r), f; }, finish: function finish(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[2] === t) return this.complete(e[4], e[3]), m(e), f; } }, catch: function _catch(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[0] === t) { var n = e[4]; if ("throw" === n.type) { var o = n.arg; m(e); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(r, e, n) { return this.delegate = { i: x(r), r: e, n: n }, "next" === this.method && (this.arg = t), f; } }, r; }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -11,13 +14,16 @@ import { getValueByExpression } from "../utils";
 import { reactShapeNodeAreEqual } from "../utils";
 import { usePointWatch, useEleEventHandle } from "../../hooks";
 import styles from "./index.css";
+import IconFont from "../../components/IconFont";
+import { useRequest } from 'ahooks';
+import { GetDeviceInfo } from "../../services/gateway/Device";
 var directionClassNameMap = {
   top: 'flex-col',
   left: 'flex-row',
   bottom: 'flex-col-reverse'
 };
 var ElePointValueComponent = function ElePointValueComponent(_ref) {
-  var _payload$pointList, _payload$label, _payload$unit, _payload$unit2, _payload$value, _payload$value2, _payload$mittMeta$nam, _payload$mittMeta, _payload$mittMeta2, _payload$label2, _payload$unit3, _pointData10;
+  var _payload$pointList, _payload$label, _payload$unit, _payload$unit2, _payload$value, _payload$value2, _payload$mittMeta$nam, _payload$mittMeta, _payload$mittMeta2, _pointData12, _pointData13, _pointData14, _pointData15, _pointData16, _payload$mittMeta$nam2, _payload$mittMeta3, _payload$label2, _payload$unit3, _pointData17, _pointData18;
   var node = _ref.node;
   var payload = node === null || node === void 0 ? void 0 : node.getData();
   var configPoint = payload === null || payload === void 0 ? void 0 : (_payload$pointList = payload.pointList) === null || _payload$pointList === void 0 ? void 0 : _payload$pointList[0];
@@ -84,6 +90,59 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
     pointValue = ((_pointData1 = pointData) === null || _pointData1 === void 0 ? void 0 : _pointData1.pointEnumItemKey) || value;
   }
   var numberColor = getValueByExpression(value, payload === null || payload === void 0 ? void 0 : payload.colorExpressions);
+  var _useRequest = useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _pointData10, _pointData11;
+      var _yield$GetDeviceInfo, success, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if ((_pointData10 = pointData) === null || _pointData10 === void 0 ? void 0 : _pointData10.deviceId) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return");
+          case 2:
+            _context.next = 4;
+            return GetDeviceInfo({
+              deviceId: (_pointData11 = pointData) === null || _pointData11 === void 0 ? void 0 : _pointData11.deviceId
+            });
+          case 4:
+            _yield$GetDeviceInfo = _context.sent;
+            success = _yield$GetDeviceInfo.success;
+            data = _yield$GetDeviceInfo.data;
+            if (success) {
+              _context.next = 9;
+              break;
+            }
+            return _context.abrupt("return");
+          case 9:
+            return _context.abrupt("return", data);
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })), {
+      cacheKey: "device-info-".concat((_pointData12 = pointData) === null || _pointData12 === void 0 ? void 0 : _pointData12.deviceId),
+      onError: function onError(err) {
+        console.error(err);
+      },
+      refreshDeps: [(_pointData13 = pointData) === null || _pointData13 === void 0 ? void 0 : _pointData13.deviceId],
+      pollingInterval: 10 * 60 * 1000
+    }),
+    deviceInfo = _useRequest.data;
+  var eventHandles2 = useEleEventHandle({
+    events: payload === null || payload === void 0 ? void 0 : payload.events2,
+    payload: {
+      points: [{
+        pointIdList: [(_pointData14 = pointData) === null || _pointData14 === void 0 ? void 0 : _pointData14.pointId],
+        protocol: deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.protocol,
+        pointEnumItemList: (_pointData15 = pointData) === null || _pointData15 === void 0 ? void 0 : _pointData15.pointEnumItemList,
+        pointValue: (_pointData16 = pointData) === null || _pointData16 === void 0 ? void 0 : _pointData16.value
+      }],
+      namespace: (_payload$mittMeta$nam2 = payload === null || payload === void 0 ? void 0 : (_payload$mittMeta3 = payload.mittMeta) === null || _payload$mittMeta3 === void 0 ? void 0 : _payload$mittMeta3.namespace) !== null && _payload$mittMeta$nam2 !== void 0 ? _payload$mittMeta$nam2 : 0
+    }
+  });
   return /*#__PURE__*/React.createElement("div", {
     onClick: function onClick(e) {
       if ((payload === null || payload === void 0 ? void 0 : payload.pointList.length) && (payload === null || payload === void 0 ? void 0 : payload.pointList[0].deviceType) === 'virtual') {
@@ -117,6 +176,17 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
   }, 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", {
     style: unitStyle,
     className: styles.unit
-  }, (payload === null || payload === void 0 ? void 0 : payload.unit.text) || ((_pointData10 = pointData) === null || _pointData10 === void 0 ? void 0 : _pointData10.unit)) : null)));
+  }, (payload === null || payload === void 0 ? void 0 : payload.unit.text) || ((_pointData17 = pointData) === null || _pointData17 === void 0 ? void 0 : _pointData17.unit)) : null)), ((_pointData18 = pointData) === null || _pointData18 === void 0 ? void 0 : _pointData18.isWrite) ? /*#__PURE__*/React.createElement("div", {
+    className: styles.write,
+    onClick: function onClick(e) {
+      e.stopPropagation();
+      eventHandles2.current.onClick(e);
+    }
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: 'icon-edit_active',
+    style: {
+      fontSize: '18px'
+    }
+  })) : undefined);
 };
 export default /*#__PURE__*/memo(ElePointValueComponent, reactShapeNodeAreEqual);

package/es/element/ElePointValue/index.css

@@ -1,4 +1,5 @@
 .wrap {
+  position: relative;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -15,6 +16,16 @@
   white-space: nowrap;
   cursor: pointer;
 }
+.write {
+  position: absolute;
+  top: 4px;
+  right: -16px;
+  display: none;
+  cursor: pointer;
+}
+.wrap:hover .write {
+  display: block;
+}
 .unit {
   margin-left: 4px;
   font-size: 0.5em;

package/es/element/ElePointValue/index.js

@@ -50,6 +50,10 @@ export var defaultConfig = {
     events: [{
       type: 'click',
       action: 'show-point-history'
+    }],
+    events2: [{
+      type: 'click',
+      action: 'show-point-write'
     }]
   },
   component: registerComponentName

package/es/element/utils/handleEleEvent.js

@@ -53,6 +53,16 @@ export default function handleEleEvent() {
           return isString(v.identifierName);
         }));
         return;
+      // 点位写入2
+      case 'show-point-write':
+        if (!Array.isArray(payload.points)) {
+          return;
+        }
+        if (!payload.points.length) {
+          return;
+        }
+        emitter.emit("show-point-write-".concat(payload.namespace), payload.points);
+        return;
       case 'freedom-scene-switch':
         emitter.emit("freedom-scene-switch-".concat(payload.namespace), event.value ? Number(event.value) : undefined);
         return;

package/es/pages/display/Player/index.js

@@ -33,6 +33,7 @@ import "./index.css";
 import { GetTdIndicatorAggregateData } from "../../../services/gateway/Point";
 import dayjs from 'dayjs';
 import { GetEnergyByMeterList } from "../../../services/energy";
+import ModalChangePointValue from "../../../components/ModalChangePointValue";
 var Player = function Player(_ref) {
   var _jsonConfig$pageConfi;
   var jsonConfig = _ref.jsonConfig,
@@ -53,22 +54,30 @@ var Player = function Player(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     visibleDialogPointWrite = _useState6[0],
     setVisibleDialogPointWrite = _useState6[1];
-  var _useState7 = useState([]),
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    activePointIds = _useState8[0],
-    setActivePointIds = _useState8[1];
+    visibleModalChangePointValue = _useState8[0],
+    setVisibleModalChangePointValue = _useState8[1];
   var _useState9 = useState([]),
     _useState0 = _slicedToArray(_useState9, 2),
-    activeIndicatorNos = _useState0[0],
-    setActiveIndicatorNos = _useState0[1];
+    activePointIds = _useState0[0],
+    setActivePointIds = _useState0[1];
   var _useState1 = useState([]),
     _useState10 = _slicedToArray(_useState1, 2),
-    activePoints = _useState10[0],
-    setActivePoints = _useState10[1];
-  var _useState11 = useState(),
+    activeIndicatorNos = _useState10[0],
+    setActiveIndicatorNos = _useState10[1];
+  var _useState11 = useState({}),
     _useState12 = _slicedToArray(_useState11, 2),
-    activeDeviceId = _useState12[0],
-    setActiveDeviceId = _useState12[1];
+    changePointValueProps = _useState12[0],
+    setChangePointValueProps = _useState12[1];
+  var _useState13 = useState([]),
+    _useState14 = _slicedToArray(_useState13, 2),
+    activePoints = _useState14[0],
+    setActivePoints = _useState14[1];
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    activeDeviceId = _useState16[0],
+    setActiveDeviceId = _useState16[1];
   var wrapSize = useSize(wrapRef);
   var mittMeta = useMemo(function () {
     return getMittMeta(query);
@@ -266,32 +275,67 @@ var Player = function Player(_ref) {
     };
   }, [query, mittMeta]);
 
-  // 监听显示风机设备点位弹窗事件
+  // 监听显示点位写入弹窗事件2
   useEffect(function () {
     var handler = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
-        var deviceId, id;
+      var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(points) {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              deviceId = _ref4.deviceId;
               if (!(query.scene === 'product')) {
-                _context3.next = 3;
+                _context3.next = 2;
                 break;
               }
               return _context3.abrupt("return");
+            case 2:
+              setVisibleModalChangePointValue(true);
+              setChangePointValueProps(function () {
+                debugger;
+                return points[0];
+              });
+            case 4:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      return function handler(_x3) {
+        return _ref4.apply(this, arguments);
+      };
+    }();
+    var eventName = "show-point-write-".concat(mittMeta.namespace);
+    emitter.on(eventName, handler);
+    return function () {
+      emitter.off(eventName, handler);
+    };
+  }, [query, mittMeta]);
+
+  // 监听显示风机设备点位弹窗事件
+  useEffect(function () {
+    var handler = /*#__PURE__*/function () {
+      var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
+        var deviceId, id;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              deviceId = _ref5.deviceId;
+              if (!(query.scene === 'product')) {
+                _context4.next = 3;
+                break;
+              }
+              return _context4.abrupt("return");
             case 3:
               id = query.scene === 'device' ? Number(query.deviceId) : deviceId;
               setActiveDeviceId(id);
               setVisibleModalFanDevicePoint(true);
             case 6:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3);
+        }, _callee4);
       }));
-      return function handler(_x3) {
-        return _ref5.apply(this, arguments);
+      return function handler(_x4) {
+        return _ref6.apply(this, arguments);
       };
     }();
     var eventName = "show-fan-device-point-modal-".concat(mittMeta.namespace);
@@ -304,9 +348,9 @@ var Player = function Player(_ref) {
   // 监听场景组态切换事件
   useEffect(function () {
     var handler = /*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(scadaId) {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(scadaId) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               onEvent === null || onEvent === void 0 ? void 0 : onEvent({
                 event: 'freedom-scene-switch',
@@ -322,12 +366,12 @@ var Player = function Player(_ref) {
               });
             case 2:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4);
+        }, _callee5);
       }));
-      return function handler(_x4) {
-        return _ref6.apply(this, arguments);
+      return function handler(_x5) {
+        return _ref7.apply(this, arguments);
       };
     }();
     var mittMeta = getMittMeta(query);
@@ -395,23 +439,23 @@ var Player = function Player(_ref) {
   // scene === 'device' 加载设备点位数据
   useEffect(function () {
     var fetchDevicePoints = /*#__PURE__*/function () {
-      var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(deviceId) {
+      var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(deviceId) {
         var res, pointList;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context5.next = 2;
+              _context6.next = 2;
               return GetDevicePoint({
                 deviceIdList: [deviceId]
               }, []);
             case 2:
-              res = _context5.sent;
+              res = _context6.sent;
               if (res.success) {
-                _context5.next = 6;
+                _context6.next = 6;
                 break;
               }
               message.error('设备点位数据获取失败');
-              return _context5.abrupt("return");
+              return _context6.abrupt("return");
             case 6:
               pointList = res.data || [];
               pointList.forEach(function (v) {
@@ -420,12 +464,12 @@ var Player = function Player(_ref) {
               });
             case 8:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5);
+        }, _callee6);
       }));
-      return function fetchDevicePoints(_x5) {
-        return _ref7.apply(this, arguments);
+      return function fetchDevicePoints(_x6) {
+        return _ref8.apply(this, arguments);
       };
     }();
     var timer;
@@ -445,23 +489,23 @@ var Player = function Player(_ref) {
   // scene === 'freedom' 加载设备点位数据
   useEffect(function () {
     var fetchDevicePoints = /*#__PURE__*/function () {
-      var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(ids) {
+      var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(ids) {
         var res, pointList;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context6.next = 2;
+              _context7.next = 2;
               return GetDevicePoint({
                 pointIdList: ids
               }, []);
             case 2:
-              res = _context6.sent;
+              res = _context7.sent;
               if (res.success) {
-                _context6.next = 6;
+                _context7.next = 6;
                 break;
               }
               message.error('设备点位数据获取失败');
-              return _context6.abrupt("return");
+              return _context7.abrupt("return");
             case 6:
               pointList = res.data || [];
               pointList.forEach(function (v) {
@@ -469,33 +513,33 @@ var Player = function Player(_ref) {
               });
             case 8:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6);
+        }, _callee7);
       }));
-      return function fetchDevicePoints(_x6) {
-        return _ref8.apply(this, arguments);
+      return function fetchDevicePoints(_x7) {
+        return _ref9.apply(this, arguments);
       };
     }();
     var fetchDeviceIndicator = /*#__PURE__*/function () {
-      var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(ids) {
+      var _ref0 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(ids) {
         var res, pointList;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context7.next = 2;
+              _context8.next = 2;
               return GetDeviceIndicator({
                 indicatorNoList: ids,
                 isGetIndicatorData: true
               }, []);
             case 2:
-              res = _context7.sent;
+              res = _context8.sent;
               if (res.success) {
-                _context7.next = 6;
+                _context8.next = 6;
                 break;
               }
               message.error('设备点位数据获取失败');
-              return _context7.abrupt("return");
+              return _context8.abrupt("return");
             case 6:
               pointList = res.data || [];
               pointList.forEach(function (v) {
@@ -503,21 +547,21 @@ var Player = function Player(_ref) {
               });
             case 8:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7);
+        }, _callee8);
       }));
-      return function fetchDeviceIndicator(_x7) {
-        return _ref9.apply(this, arguments);
+      return function fetchDeviceIndicator(_x8) {
+        return _ref0.apply(this, arguments);
       };
     }();
     var fetchDeviceSpecialPoint = /*#__PURE__*/function () {
-      var _ref0 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(ids, dateType) {
+      var _ref1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(ids, dateType) {
         var res, pointList;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context8.next = 2;
+              _context9.next = 2;
               return GetTdIndicatorAggregateData(ids.map(function (v) {
                 var productNo = {
                   emqktt: 'energy',
@@ -535,13 +579,13 @@ var Player = function Player(_ref) {
                 };
               }));
             case 2:
-              res = _context8.sent;
+              res = _context9.sent;
               if (res.success) {
-                _context8.next = 6;
+                _context9.next = 6;
                 break;
               }
               message.error('设备点位数据获取失败');
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 6:
               pointList = res.data || [];
               pointList.forEach(function (v) {
@@ -552,18 +596,18 @@ var Player = function Player(_ref) {
               });
             case 8:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8);
+        }, _callee9);
       }));
-      return function fetchDeviceSpecialPoint(_x8, _x9) {
-        return _ref0.apply(this, arguments);
+      return function fetchDeviceSpecialPoint(_x9, _x0) {
+        return _ref1.apply(this, arguments);
       };
     }();
     var fetchEnergyByMeterList = /*#__PURE__*/function () {
-      var _ref1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(type, ids, dateType) {
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0(type, ids, dateType) {
+        return _regeneratorRuntime().wrap(function _callee0$(_context0) {
+          while (1) switch (_context0.prev = _context0.next) {
             case 0:
               GetEnergyByMeterList({
                 dataType: type,
@@ -580,12 +624,12 @@ var Player = function Player(_ref) {
               });
             case 1:
             case "end":
-              return _context9.stop();
+              return _context0.stop();
           }
-        }, _callee9);
+        }, _callee0);
       }));
-      return function fetchEnergyByMeterList(_x0, _x1, _x10) {
-        return _ref1.apply(this, arguments);
+      return function fetchEnergyByMeterList(_x1, _x10, _x11) {
+        return _ref10.apply(this, arguments);
       };
     }();
     var timer;
@@ -747,6 +791,15 @@ var Player = function Player(_ref) {
     onCancel: function onCancel() {
       return setVisibleDialogPointWrite(false);
     }
+  }), /*#__PURE__*/React.createElement(ModalChangePointValue, {
+    visible: visibleModalChangePointValue,
+    protocol: changePointValueProps.protocol,
+    pointValue: changePointValueProps.pointValue,
+    pointIdList: changePointValueProps.pointIdList,
+    pointEnumItemList: changePointValueProps.pointEnumItemList,
+    onCancel: function onCancel() {
+      return setVisibleModalChangePointValue(false);
+    }
   }));
 };
 export default Player;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "1.0.73",
+  "version": "1.0.74",
   "scripts": {
     "start": " PORT=8000 UMI_ENV=prod umi dev",
     "build:prod": "UMI_ENV=prod umi build",