@riil-frontend/component-topology 6.0.0-alpha.3 → 6.0.0-alpha.31

package/es/core/store/models/topoMod.js

@@ -1,8 +1,8 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 import moment from "moment";
+import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { combTopoData, getCiTypes, parseTopoData } from "../../../utils/topoData";
 import { loopTreeByKey } from "../../../utils/tree";
@@ -302,7 +302,7 @@ export default function (topoApp) {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
             var _result$config;
 
-            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
 
             return _regeneratorRuntime.wrap(function _callee6$(_context6) {
               while (1) {
@@ -370,46 +370,44 @@ export default function (topoApp) {
 
                   case 18:
                     if (!data) {
-                      _context6.next = 30;
+                      _context6.next = 29;
                       break;
                     }
 
+                    graphConfig = {};
+
                     if (!topoId) {
-                      _context6.next = 27;
+                      _context6.next = 26;
                       break;
                     }
 
-                    _context6.next = 22;
-                    return topoApp.options.loadData(topoId);
+                    _context6.next = 23;
+                    return topoService.getTopoData(topoId);
 
-                  case 22:
+                  case 23:
                     topoConfig = _context6.sent;
                     if (!topoConfig) rlog.error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
-                    result = _extends({}, data, {
+                    graphConfig = {
                       global: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.global,
                       customGlobal: data.global,
                       serialize: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.serialize
-                    });
-                    _context6.next = 28;
-                    break;
-
-                  case 27:
-                    result = _extends({}, data);
+                    };
 
-                  case 28:
-                    _context6.next = 33;
+                  case 26:
+                    result = _extends({}, data, graphConfig);
+                    _context6.next = 32;
                     break;
 
-                  case 30:
-                    _context6.next = 32;
+                  case 29:
+                    _context6.next = 31;
                     return topoApp.options.loadData(topoId);
 
-                  case 32:
+                  case 31:
                     result = _context6.sent;
 
-                  case 33:
+                  case 32:
                     if (result) {
-                      _context6.next = 37;
+                      _context6.next = 36;
                       break;
                     }
 
@@ -424,27 +422,27 @@ export default function (topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 37:
+                  case 36:
                     result = parseTopoData(result);
                     rlog.debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
-                    _context6.next = 41;
+                    _context6.next = 40;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(result)), dispatch.customIcon.loadCustomIcons(), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
                     ]);
 
-                  case 41:
+                  case 40:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     customIcons = _yield$Promise$all[1];
                     xxx = _yield$Promise$all[2];
                     rlog.debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
                     extraConfig = result.global.extraConfig;
-                    _context6.next = 49;
+                    _context6.next = 48;
                     return dispatch.displayConfig.setConfig(_extends({}, extraConfig, {
                       alarmSwitch: result.global.alarmSwitch,
                       alarmListDefaultOpen: result.global.alarmListDefaultOpen
                     }));
 
-                  case 49:
+                  case 48:
                     _combTopoData = combTopoData({
                       engine: topoApp,
                       data: result,
@@ -473,7 +471,7 @@ export default function (topoApp) {
                     rlog.info("topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ", endTime.diff(startTime, "seconds", true));
                     topoApp.options.onLoad();
 
-                  case 58:
+                  case 57:
                   case "end":
                     return _context6.stop();
                 }
@@ -604,7 +602,7 @@ export default function (topoApp) {
                     id = playload.id, update = playload.update;
                     _context11.prev = 1;
                     _context11.next = 4;
-                    return topoService.auth.getTopoPermission(id);
+                    return topoApp.serverApi.auth.getTopoPermission(id);
 
                   case 4:
                     topoPermission = _context11.sent;

package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/WebConsoleForm.js

@@ -18,46 +18,30 @@ export default function WebConsoleForm(props) {
       webConsoleUrl = _useWebConsole.webConsoleUrl,
       save = _useWebConsole.save;
 
-  var _useState = useState(true),
+  var _useState = useState(false),
       isEdit = _useState[0],
-      handleInput = _useState[1];
-
-  var _useState2 = useState(false),
-      isSave = _useState2[0],
-      handleSaveBtn = _useState2[1];
-
-  var _useState3 = useState(false),
-      isShow = _useState3[0],
-      handleEdit = _useState3[1];
+      setIsEdit = _useState[1];
 
   var field = _Field.useField({
     autoUnmount: true,
-    values: {},
-    onChange: function onChange(name, value) {
-      field.getValue('url').length > 0 ? handleSaveBtn(false) : handleSaveBtn(true);
-    }
+    values: {
+      url: webConsoleUrl || ''
+    },
+    onChange: function onChange(name, value) {}
   });
 
   useEffect(function () {
-    field.setValue('url', webConsoleUrl);
+    field.setValue('url', webConsoleUrl || '');
+    field.validate();
   }, [webConsoleUrl]);
-  useEffect(function () {
-    field.getError('url') == null ? handleSaveBtn(false) : handleSaveBtn(true);
-  }, [field.getError('url')]);
 
   function handleEditLink() {
-    handleInput(false);
-    handleEdit(true);
+    setIsEdit(true);
   }
 
   function saveData() {
     save(field.getValue('url'));
-    handleEdit(function (isShow) {
-      return !isShow;
-    });
-    handleInput(function (isEdit) {
-      return !isEdit;
-    });
+    setIsEdit(false);
   }
 
   return /*#__PURE__*/React.createElement(_Loading, {
@@ -85,10 +69,10 @@ export default function WebConsoleForm(props) {
     name: "url",
     placeholder: "\u8BF7\u8F93\u5165\u94FE\u63A5\u5730\u5740",
     trim: true,
-    disabled: isEdit
-  })), /*#__PURE__*/React.createElement(FormItem, null, isShow ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
+    disabled: !isEdit
+  })), /*#__PURE__*/React.createElement(FormItem, null, isEdit ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
     type: "primary",
-    disabled: isSave,
+    disabled: !!field.getError('url'),
     onClick: saveData,
     name: "baocun"
   }, "\u4FDD\u5B58")) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {

package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js

@@ -57,16 +57,17 @@ export default function useWebConsole(props) {
   var requestWebConsoleUrl = useRequest(queryWebConsoleUrlById, {
     manual: true,
     onSuccess: function onSuccess(result) {
-      if (ipv4Address != undefined) {
-        result = result === undefined ? "http://" + ipv4Address : result;
-      } else {
-        result = result === undefined ? null : result;
+      var url = result;
+
+      if (!url && ipv4Address) {
+        url = "http://" + ipv4Address;
       }
 
-      setWebConsoleUrl(result);
+      setWebConsoleUrl(url);
     }
   });
   useEffect(function () {
+    setWebConsoleUrl(null);
     requestWebConsoleUrl.run(ciId);
   }, [ciId]); // 保存Web控制台url
 

package/es/core/viewer/components/titlebar/widgets/SettingButton.js

@@ -11,7 +11,8 @@ import DisplaySettingDrawer from "../../../../components/DisplaySettingDrawer";
 export default function SettingButton(props) {
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
 
   var _useState = useState(false),
       visible = _useState[0],
@@ -40,6 +41,7 @@ export default function SettingButton(props) {
   })), /*#__PURE__*/React.createElement(DisplaySettingDrawer, {
     visible: visible,
     topo: topo,
+    isEditor: isEditor,
     displaySettingProps: displaySettingProps,
     onClose: function onClose() {
       setVisible(false);

package/es/core/viewer/components/titlebar/widgets/SettingButtonWidget.js

@@ -9,11 +9,13 @@ import SettingButton from "./SettingButton";
 export default function SettingButtonWidget(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
   return /*#__PURE__*/React.createElement(SettingButton, {
     topo: topo,
     displaySettingProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.displaySettingProps,
-    style: style
+    style: style,
+    isEditor: isEditor
   });
 }
 ;

package/es/networkTopo/createTopo.js

@@ -1,7 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import TopoCenter from "./models/TopoCenter";
+import services from "./services";
 export function createTopo(options) {
   var topoApp = new TopoCenter(_extends({}, options));
+  topoApp.serverApi = services;
   return topoApp;
 }
 export default createTopo;

package/es/networkTopo/services/link.js

@@ -156,10 +156,10 @@ export default {
               // const idtxt = `'${ids[0]}','${ids[1]}'`;
               stag = ids[0];
               ttag = ids[1];
-              condition = "type('network_link') && !network_link.destination_device_id && network_link.source_device_id ='" + stag + "'";
+              condition = "type('network_link') && !destination_id && network_link.source_device_id ='" + stag + "'";
 
               if (ttag) {
-                condition = "type('network_link') && !network_link.destination_device_id && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
+                condition = "type('network_link') && !destination_id && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
               }
 
               parm = {

package/es/networkTopo/store/topoTreeMod.js

@@ -2,7 +2,6 @@ import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "../services";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { formatTree, loopTree, loopTreeFun, findParentIdsById, treeNodeCount } from "../../utils/tree";
 
@@ -88,7 +87,7 @@ export default function (topoApp) {
                     }
 
                     _context2.next = 4;
-                    return topoService.getTopoTree();
+                    return topoApp.serverApi.getTopoTree();
 
                   case 4:
                     resTreeData = _context2.sent;
@@ -97,7 +96,7 @@ export default function (topoApp) {
 
                   case 7:
                     _context2.next = 9;
-                    return topoService.getTopoTreeByLoginUser();
+                    return topoApp.serverApi.getTopoTreeByLoginUser();
 
                   case 9:
                     resTreeData = _context2.sent;
@@ -163,7 +162,7 @@ export default function (topoApp) {
 
                     rlog.debug('editTopoOnTree', conditions);
                     _context4.next = 4;
-                    return topoService.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
+                    return topoApp.serverApi.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
 
                   case 4:
                     resTreeData = _context4.sent;
@@ -247,7 +246,7 @@ export default function (topoApp) {
 
                   case 8:
                     _context5.next = 10;
-                    return topoService.deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
                     return _context5.abrupt("return", _context5.sent);
@@ -271,7 +270,7 @@ export default function (topoApp) {
 
                   case 18:
                     _context5.next = 20;
-                    return topoService.deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
                     return _context5.abrupt("return", _context5.sent);
@@ -299,7 +298,7 @@ export default function (topoApp) {
 
                     rlog.debug('setDefTopoOnTree', conditions);
                     _context6.next = 4;
-                    return topoService.setDefTopo(parseInt(conditions, 10));
+                    return topoApp.serverApi.setDefTopo(parseInt(conditions, 10));
 
                   case 4:
                     resTreeData = _context6.sent;

package/es/style.js

@@ -41,4 +41,5 @@ import '@alifd/next/es/number-picker/style';
 
 import '@alifd/next/es/tag/style';
 import '@riil-frontend/component-riil-event-emitter/es/style';
+import '@alifd/next/es/range/style';
 import './index.scss';

package/es/utils/htElementUtils.js

@@ -50,6 +50,9 @@ export function isGroup(element) {
 export function isLayer(element) {
   return element instanceof ht.Grid;
 }
+export function isText(element) {
+  return element instanceof ht.Text && element.a('isText');
+}
 export function getElements(dataModel) {
   // console.error(111, dataModel.getDatas().getArray())
   return dataModel.getDatas().getArray();

package/es/utils/topoData.js

@@ -317,6 +317,7 @@ function buildGlobal(_ref2) {
       showLinkName: false,
       // 是否显示链路名称
       nodeLabelStyle: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.nodeLabelStyle,
+      defaultEdgeLabelStyle: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.defaultEdgeLabelStyle,
       edgeFlow: edgeFlow
     }, (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.topoDisplayConfig) || {}, (result === null || result === void 0 ? void 0 : (_result$customGlobal2 = result.customGlobal) === null || _result$customGlobal2 === void 0 ? void 0 : _result$customGlobal2.topoDisplayConfig) || {}),
     linkTo: linkTo,

package/lib/components/ColorPanel/components/ColorBlock/index.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _indexModule = _interopRequireDefault(require("./index.module.scss"));
+
+/**
+ * 颜色选择
+ *
+ * @param props
+ * @return {*}
+ * @constructor
+ */
+function ColorBlock(props) {
+  var color = props.color,
+      onChange = props.onChange,
+      index = props.index;
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      background: color.color,
+      borderColor: color.borderColor
+    },
+    className: _indexModule["default"].content,
+    onClick: function onClick() {
+      onChange(color.color, 'select', index);
+    }
+  }, "\xA0");
+}
+
+ColorBlock.propTypes = {
+  color: _propTypes["default"].object,
+  // eslint-disable-next-line react/no-unused-prop-types
+  onChange: _propTypes["default"].func
+};
+ColorBlock.defaultProps = {
+  color: {},
+  onChange: function onChange() {}
+};
+var _default = ColorBlock;
+exports["default"] = _default;

package/lib/components/ColorPanel/components/ColorBlock/index.module.scss

@@ -0,0 +1,8 @@
+@import '~@alifd/next/variables.scss';
+ 
+.content{
+    width: 25px;
+    height: 25px;
+    border-radius: 50%;
+    border: 1px solid;
+}

package/lib/components/ColorPanel/components/FontColorRange/index.js

@@ -0,0 +1,49 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _range = _interopRequireDefault(require("@alifd/next/lib/range"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _indexModule = _interopRequireDefault(require("./index.module.scss"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function FontColorRange(props) {
+  var onChange = props.onChange,
+      _props$unit = props.unit,
+      unit = _props$unit === void 0 ? 'px' : _props$unit,
+      list = props.list,
+      max = props.max,
+      min = props.min,
+      defaultValue = props.defaultValue;
+
+  var _useState = (0, _react.useState)(defaultValue),
+      value = _useState[0],
+      setValue = _useState[1];
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].content
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].range
+  }, /*#__PURE__*/_react["default"].createElement(_range["default"], {
+    defaultValue: value,
+    min: min,
+    max: max,
+    marks: list,
+    hasTip: false,
+    onChange: onChange,
+    onProcess: setValue
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].unit
+  }, value, unit));
+}
+
+var _default = FontColorRange;
+exports["default"] = _default;

package/lib/components/ColorPanel/components/FontColorRange/index.module.scss

@@ -0,0 +1,23 @@
+@import '~@alifd/next/variables.scss';
+
+
+.content {
+  display: flex;
+  flex-direction: row;
+  width: 84%;
+  margin-left: 6%;
+  overflow: hidden;
+  .range {
+    flex: 1;
+  }
+
+  .unit {
+    margin-left: 10px;
+  }
+
+  :global {
+    .#{$css-prefix}range .#{$css-prefix}range-mark {
+      display: none;
+    }
+  }
+}