@riil-frontend/component-topology 7.0.0-dev.11 → 7.0.0-dev.13

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -1,16 +1,23 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["color", "background", "opacity", "bold", "italic"];
-import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 export function getTextStyle(element) {
+  var opacity = element.a('edge.tag.opacity');
+
+  if (opacity === null || opacity === undefined) {
+    opacity = 1;
+  }
+
   return _extends({
     color: parseColor(element.a('edge.tag.color')),
     fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
     fontSize: element.a('edge.tag.fontSize'),
     bold: !!element.a('edge.tag.fontBold'),
     italic: !!element.a('edge.tag.fontItalic')
-  }, parseBackground(element.a('edge.tag.background')));
+  }, parseBackground(element.a('edge.tag.background')), {
+    opacity: opacity
+  });
 }
 export function setTextStyle(element, style, topo) {
   var color = style.color,

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js

@@ -86,6 +86,11 @@ export function getTextStyle(htSelection, styleNames) {
 
     var val = fieldValueList[0];
     var different = fieldValueList.filter(function (item) {
+      // 如果是颜色，特殊处理
+      if (item && val && item.rgb) {
+        return item.rgb.r + "," + item.rgb.g + "," + item.rgb.b + "," + item.rgb.a !== val.rgb.r + "," + val.rgb.g + "," + val.rgb.b + "," + val.rgb.a;
+      }
+
       return item !== val;
     });
 

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "7.0.0-dev.11" === 'string' ? "7.0.0-dev.11" : null;
+var version = typeof "7.0.0-dev.13" === 'string' ? "7.0.0-dev.13" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -1,7 +1,6 @@
 import _Message from "@alifd/next/es/message";
 import _Table from "@alifd/next/es/table";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
@@ -56,30 +55,34 @@ function EventsCard(props) {
         title: moment(value).format('YYYY-MM-DD HH:mm:ss')
       }, moment(value).format('YYYY-MM-DD HH:mm:ss'));
     }
-  }, {
-    title: '操作',
-    dataIndex: 'status',
-    key: 'status',
-    width: 64,
-    cell: function cell(status, index, record) {
-      if (record.type === 'alarm') {
-        return status === 'toDeal' ? /*#__PURE__*/React.createElement(_Button, {
-          text: true,
-          type: "primary",
-          onClick: function onClick() {
-            return alarmRiskOperation(record.type, record.params);
-          }
-        }, "\u53D7\u7406") : /*#__PURE__*/React.createElement(_Button, {
-          disabled: true,
-          text: true,
-          type: "primary"
-        }, "\u5DF2\u53D7\u7406");
-      } else {
-        // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
-        return '';
-      }
-    }
-  }]; // 告警/风险 操作 (受理)
+  } // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
+  // {
+  //   title: '操作',
+  //   dataIndex: 'status',
+  //   key: 'status',
+  //   width: 64,
+  //   cell: (status, index, record) => {
+  //     if (record.type === 'alarm') {
+  //       return status === 'toDeal' ? (
+  //         <Button
+  //           text
+  //           type="primary"
+  //           onClick={() => alarmRiskOperation(record.type, record.params)}
+  //         >
+  //           受理
+  //         </Button>
+  //       ) : (
+  //         <Button disabled text type="primary">
+  //           已受理
+  //         </Button>
+  //       );
+  //     } else {
+  //       // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
+  //       return '';
+  //     }
+  //   },
+  // },
+  ]; // 告警/风险 操作 (受理)
 
   function alarmRiskOperation(_x, _x2) {
     return _alarmRiskOperation.apply(this, arguments);

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -101,6 +101,7 @@
 }
 .alarm {
   margin-top: 12px;
+  margin-bottom: 16px;
   .alarm-title {
     overflow: hidden;
     text-overflow: ellipsis;

package/es/networkTopo/components/editor/useEditorProps.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _useGroupSortResources from "../../hooks/editor/useGroupSortResources";
 import LayerConfigPlugin from "./plugins/LayerConfigPlugin";
-import AddLinkDrawer from "./propertyViews/edge/addLinkDrawer/AddLinkDrawer";
 import EdgePropertyView from "./propertyViews/edge/EdgePropertyView";
 import LinkPropertyView from "./propertyViews/edge/LinkPropertyView";
 import LayerRelatedResourceList from "./propertyViews/LayerRelatedResourceList";
@@ -27,6 +26,6 @@ export default function useEditorProps(props) {
     },
     showLinkConfig: true
   }, customEditorProps, {
-    plugins: [LayerConfigPlugin, AddLinkDrawer].concat((customEditorProps === null || customEditorProps === void 0 ? void 0 : customEditorProps.plugins) || [])
+    plugins: [LayerConfigPlugin].concat((customEditorProps === null || customEditorProps === void 0 ? void 0 : customEditorProps.plugins) || [])
   });
 }

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -13,20 +13,26 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
-
 var _colorUtil = require("../colorUtil");
 
 var _excluded = ["color", "background", "opacity", "bold", "italic"];
 
 function getTextStyle(element) {
+  var opacity = element.a('edge.tag.opacity');
+
+  if (opacity === null || opacity === undefined) {
+    opacity = 1;
+  }
+
   return (0, _extends2["default"])({
     color: (0, _colorUtil.parseColor)(element.a('edge.tag.color')),
     fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
     fontSize: element.a('edge.tag.fontSize'),
     bold: !!element.a('edge.tag.fontBold'),
     italic: !!element.a('edge.tag.fontItalic')
-  }, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')));
+  }, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')), {
+    opacity: opacity
+  });
 }
 
 function setTextStyle(element, style, topo) {

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js

@@ -102,6 +102,11 @@ function getTextStyle(htSelection, styleNames) {
 
     var val = fieldValueList[0];
     var different = fieldValueList.filter(function (item) {
+      // 如果是颜色，特殊处理
+      if (item && val && item.rgb) {
+        return item.rgb.r + "," + item.rgb.g + "," + item.rgb.b + "," + item.rgb.a !== val.rgb.r + "," + val.rgb.g + "," + val.rgb.b + "," + val.rgb.a;
+      }
+
       return item !== val;
     });
 

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.0-dev.11" === 'string' ? "7.0.0-dev.11" : null;
+var version = typeof "7.0.0-dev.13" === 'string' ? "7.0.0-dev.13" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -13,8 +13,6 @@ var _table = _interopRequireDefault(require("@alifd/next/lib/table"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
-
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -75,30 +73,34 @@ function EventsCard(props) {
         title: (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss')
       }, (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss'));
     }
-  }, {
-    title: '操作',
-    dataIndex: 'status',
-    key: 'status',
-    width: 64,
-    cell: function cell(status, index, record) {
-      if (record.type === 'alarm') {
-        return status === 'toDeal' ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
-          text: true,
-          type: "primary",
-          onClick: function onClick() {
-            return alarmRiskOperation(record.type, record.params);
-          }
-        }, "\u53D7\u7406") : /*#__PURE__*/_react["default"].createElement(_button["default"], {
-          disabled: true,
-          text: true,
-          type: "primary"
-        }, "\u5DF2\u53D7\u7406");
-      } else {
-        // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
-        return '';
-      }
-    }
-  }]; // 告警/风险 操作 (受理)
+  } // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
+  // {
+  //   title: '操作',
+  //   dataIndex: 'status',
+  //   key: 'status',
+  //   width: 64,
+  //   cell: (status, index, record) => {
+  //     if (record.type === 'alarm') {
+  //       return status === 'toDeal' ? (
+  //         <Button
+  //           text
+  //           type="primary"
+  //           onClick={() => alarmRiskOperation(record.type, record.params)}
+  //         >
+  //           受理
+  //         </Button>
+  //       ) : (
+  //         <Button disabled text type="primary">
+  //           已受理
+  //         </Button>
+  //       );
+  //     } else {
+  //       // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
+  //       return '';
+  //     }
+  //   },
+  // },
+  ]; // 告警/风险 操作 (受理)
 
   function alarmRiskOperation(_x, _x2) {
     return _alarmRiskOperation.apply(this, arguments);

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -101,6 +101,7 @@
 }
 .alarm {
   margin-top: 12px;
+  margin-bottom: 16px;
   .alarm-title {
     overflow: hidden;
     text-overflow: ellipsis;

package/lib/networkTopo/components/editor/useEditorProps.js

@@ -11,8 +11,6 @@ var _useGroupSortResources2 = _interopRequireDefault(require("../../hooks/editor
 
 var _LayerConfigPlugin = _interopRequireDefault(require("./plugins/LayerConfigPlugin"));
 
-var _AddLinkDrawer = _interopRequireDefault(require("./propertyViews/edge/addLinkDrawer/AddLinkDrawer"));
-
 var _EdgePropertyView = _interopRequireDefault(require("./propertyViews/edge/EdgePropertyView"));
 
 var _LinkPropertyView = _interopRequireDefault(require("./propertyViews/edge/LinkPropertyView"));
@@ -41,6 +39,6 @@ function useEditorProps(props) {
     },
     showLinkConfig: true
   }, customEditorProps, {
-    plugins: [_LayerConfigPlugin["default"], _AddLinkDrawer["default"]].concat((customEditorProps === null || customEditorProps === void 0 ? void 0 : customEditorProps.plugins) || [])
+    plugins: [_LayerConfigPlugin["default"]].concat((customEditorProps === null || customEditorProps === void 0 ? void 0 : customEditorProps.plugins) || [])
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "7.0.0-dev.11",
+  "version": "7.0.0-dev.13",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.11/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.13/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }