@vtx/cs-map-layer 1.0.17 → 1.0.18

package/lib/_components/Template/DeviceCustomContent.js

@@ -1,7 +1,9 @@
+import { QuestionCircleOutlined } from '@ant-design/icons';
 import { getVtxToken } from '@vtx/utils';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
+import { Tooltip } from "antd";
 function CustomContent(props) {
   var _ref = getVtxToken() || {},
     token = _ref.token,
@@ -64,8 +66,16 @@ function CustomContent(props) {
     }), /*#__PURE__*/React.createElement("span", {
       className: classnames(handleClassName('keyIndicators-item-left-name'))
     }, v.name || ''), /*#__PURE__*/React.createElement("span", null, v.unit ? "\uFF08".concat(v.unit, "\uFF09") : '', ":"), /*#__PURE__*/React.createElement("span", {
-      className: classnames(handleClassName('keyIndicators-item-left-value'))
-    }, v.value || v.value == 0 ? v.value : '')));
+      className: classnames(handleClassName('keyIndicators-item-left-value'), {
+        'is-alarm': v.onAlarm
+      })
+    }, v.value || v.value == 0 ? v.value : '', v.onAlarm ? /*#__PURE__*/React.createElement(React.Fragment, null, " (".concat(v.alarmLevel, "\u7EA7\u62A5\u8B66) "), /*#__PURE__*/React.createElement(Tooltip, {
+      title: v.alarmDescription
+    }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, {
+      style: {
+        color: '#fff'
+      }
+    }))) : '')));
   })) : null));
 }
 CustomContent.propTypes = {

package/lib/_components/Template/DeviceTemplateV2.js

@@ -1,3 +1,9 @@
+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 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(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -96,13 +102,12 @@ var DeviceTemplate = function DeviceTemplate(props) {
         res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 || _res$data2.map(function (item) {
           var _item$factorValues;
           item === null || item === void 0 || (_item$factorValues = item.factorValues) === null || _item$factorValues === void 0 || _item$factorValues.map(function (v) {
-            data.push({
-              // name: v?.factorName,
+            data.push(_objectSpread(_objectSpread({}, v), {}, {
               name: v === null || v === void 0 ? void 0 : v.monitorItemName,
               unit: v === null || v === void 0 ? void 0 : v.unit,
               value: v === null || v === void 0 ? void 0 : v.formatValue,
               updateTime: v === null || v === void 0 ? void 0 : v.timeDesc
-            });
+            }));
           });
         });
       }

package/lib/_components/Template/indexV2.less

@@ -164,7 +164,7 @@
                 &-name {
                     white-space: nowrap;
                 }
-                
+
                 &-value {
                     margin-left: 8px;
                 }
@@ -546,6 +546,11 @@
 
                     &-value {
                         margin-left: 8px;
+
+                        &.is-alarm {
+                          color: #FF2F2F;
+                          flex: 1;
+                        }
                     }
                 }
 
@@ -559,4 +564,4 @@
             }
         }
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/cs-map-layer",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "React components for Vortex",
   "license": "MIT",
   "module": "lib/index.js",