@riil-frontend/component-topology 0.2.2 → 0.2.3

package/es/hooks/useTopoEdit.js

@@ -1,9 +1,10 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _Message from "@alifd/next/es/message";
+import _Dialog from "@alifd/next/es/dialog";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useUpdateEffect, useDynamicList } from 'ahooks';
-import { Message, Dialog } from '@alifd/next';
 import { isAvailableArray, isNull } from '@riil-frontend/utils';
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 import * as cmdbService from '@riil-frontend/component-topology-utils/es/services/cmdb';
@@ -265,7 +266,7 @@ var useTopoEdit = function useTopoEdit(params) {
   };
 
   var deleteLink = function deleteLink(data) {
-    Dialog.confirm({
+    _Dialog.confirm({
       title: '确定要删除链路？',
       content: '若执行相关操作，此链路将会从数据库删除，建议您谨慎操作。',
       okProps: {
@@ -289,10 +290,11 @@ var useTopoEdit = function useTopoEdit(params) {
                   success = result === 0;
 
                   if (success) {
-                    Message.success('删除成功');
+                    _Message.success('删除成功');
+
                     emitEvent(TopoEvent.EVENT_TRIGGER_DELETE, data);
                   } else {
-                    Message.error('删除失败');
+                    _Message.error('删除失败');
                   }
 
                 case 5:
@@ -438,7 +440,8 @@ var useTopoEdit = function useTopoEdit(params) {
 
     if (selected && exist) {
       // 资源已被选
-      Message.warning('所选资源在图上已存在，请重新选择一个。');
+      _Message.warning('所选资源在图上已存在，请重新选择一个。');
+
       return false;
     } else {
       var list = data;
@@ -492,7 +495,7 @@ var useTopoEdit = function useTopoEdit(params) {
               return _context4.abrupt("return", true);
 
             case 5:
-              Dialog.alert({
+              _Dialog.alert({
                 title: '没有权限进行此操作',
                 content: '您的权限发生了变化，请联系相关管理员。',
                 okProps: {
@@ -500,6 +503,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 },
                 onOk: function onOk() {}
               });
+
               return _context4.abrupt("return", false);
 
             case 7:
@@ -568,7 +572,8 @@ var useTopoEdit = function useTopoEdit(params) {
               topoEditDispatchers.update({
                 saving: false
               });
-              Message.success('保存成功！');
+
+              _Message.success('保存成功！');
 
             case 16:
             case "end":
@@ -613,7 +618,8 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var onTopoRelatedImage = function onTopoRelatedImage(eventData) {
     setFocusedGroup(eventData.data);
-    Dialog.confirm({
+
+    _Dialog.confirm({
       title: '确定要关联拓扑图？',
       content: '关联拓扑图后，容器中关联的资源会被清除。确定要继续吗？',
       onClose: function onClose() {

package/es/models/iconManage.js

@@ -1,3 +1,5 @@
+import _Message from "@alifd/next/es/message";
+import _Dialog from "@alifd/next/es/dialog";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -7,7 +9,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  */
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
-import { Dialog, Message } from '@alifd/next';
 export default function (engine) {
   return {
     // 定义 model 的初始 state
@@ -128,7 +129,8 @@ export default function (engine) {
         },
         deleteIcon: function deleteIcon(id, rootState) {
           rlog.debug("\u5220\u9664\u56FE\u6807: " + id);
-          Dialog.confirm({
+
+          _Dialog.confirm({
             title: '确定要删除图标？',
             okProps: {
               children: '确定'
@@ -152,10 +154,11 @@ export default function (engine) {
                         success = _context3.sent;
 
                         if (success) {
-                          Message.success('删除成功');
+                          _Message.success('删除成功');
+
                           engine.view.topoClient.emitEvent('topo_shape_delete_finish', id);
                         } else {
-                          Message.error('删除失败');
+                          _Message.error('删除失败');
                         }
 
                         _context3.next = 10;
@@ -209,7 +212,8 @@ export default function (engine) {
                     return topoService.icon.rename(payload);
 
                   case 2:
-                    Message.success('重命名成功');
+                    _Message.success('重命名成功');
+
                     engine.view.topoClient.emitEvent('topo_shape_rename_finish', payload);
 
                     _this2.closeRenameDialog();

package/es/models/linkDynamicStyleConfig.js

@@ -1,7 +1,7 @@
+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 { Message } from '@alifd/next';
 import clone from 'lodash/cloneDeep';
 var ruleKey = 0;
 export default {
@@ -160,10 +160,11 @@ export default {
                     break;
                   }
 
-                  Message.show({
+                  _Message.show({
                     type: 'error',
                     title: error
                   });
+
                   return _context.abrupt("return");
 
                 case 7:

package/es/models/linkManager.js

@@ -7,7 +7,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  */
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
-import { Dialog, Message } from '@alifd/next';
 export default function (topoApp) {
   return {
     // 定义 model 的初始 state

package/es/models/resourceWebControllUrlSetting.js

@@ -5,7 +5,6 @@ import _extends from "@babel/runtime/helpers/extends";
  */
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
-import { Dialog, Message } from '@alifd/next';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/models/topoAlarm.js

@@ -7,7 +7,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  */
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
-import { Dialog, Message } from '@alifd/next';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/models/topoBizMod.js

@@ -51,7 +51,7 @@ export default function (engine) {
           var _this = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-            var ciTypes, ciTypesDoc, ciDoc, bindingCiSet, allMetrics, allAttrs, allCiSet, metrics, attrs;
+            var ciTypes, ciTypesDoc, ciDoc, bindingCiSet, allMetrics, allAttrs, newCiDoc, allCiSet, metrics, attrs;
             return _regeneratorRuntime.wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
@@ -62,6 +62,7 @@ export default function (engine) {
                     });
 
                     ciTypes = conditions.ciTypes, ciTypesDoc = conditions.ciTypesDoc, ciDoc = conditions.ciDoc, bindingCiSet = conditions.bindingCiSet, allMetrics = conditions.allMetrics, allAttrs = conditions.allAttrs;
+                    newCiDoc = _extends({}, ciDoc);
                     allCiSet = {}; // const metrics = await topoServer.getBatchCiMetric({ ciTypes });
 
                     metrics = allMetrics; // const attrs = await topoServer.getBatchCi({ ciTypes });
@@ -122,11 +123,13 @@ export default function (engine) {
 
                       ciTypesDoc[item].map(function (ciItem) {
                         // rlog.debug('ciDoc-before', item, ciItem);
-                        ciDoc[ciItem.ciId].list = allArray.map(function (codeItem) {
-                          return _extends({}, codeItem, {
-                            tag: findItemIndex(ciDoc[ciItem.ciId].tag, 'code', codeItem.code) >= 0,
-                            tip: findItemIndex(ciDoc[ciItem.ciId].tip, 'code', codeItem.code) >= 0
-                          });
+                        newCiDoc[ciItem.ciId] = _extends({}, newCiDoc[ciItem.ciId], {
+                          list: allArray.map(function (codeItem) {
+                            return _extends({}, codeItem, {
+                              tag: findItemIndex(newCiDoc[ciItem.ciId].tag, 'code', codeItem.code) >= 0,
+                              tip: findItemIndex(newCiDoc[ciItem.ciId].tip, 'code', codeItem.code) >= 0
+                            });
+                          })
                         });
                         return '';
                       });
@@ -135,13 +138,13 @@ export default function (engine) {
 
                     _this.update({
                       allCiSet: allCiSet,
-                      ciSetDoc: ciDoc,
+                      ciSetDoc: newCiDoc,
                       pollingSwitch: true
                     });
 
                     return _context.abrupt("return", {});
 
-                  case 10:
+                  case 11:
                   case "end":
                     return _context.stop();
                 }

package/es/models/topoEdit.js

@@ -7,7 +7,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  */
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
-import { Dialog, Message } from '@alifd/next';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/models/topoGraphView.js

@@ -7,7 +7,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  */
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
-import { Dialog, Message } from '@alifd/next';
 export default {
   // 定义 model 的初始 state
   state: {},

package/es/models/topoMod.js

@@ -129,36 +129,38 @@ export default function (topoApp) {
           var _this2 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-            var id, viewState, linkTo;
+            var id, data, viewState, linkTo, topoId;
             return _regeneratorRuntime.wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
-                    id = playload.id, viewState = playload.viewState, linkTo = playload.linkTo;
-                    _context2.next = 3;
-                    return topoApp.open(id);
+                    id = playload.id, data = playload.data, viewState = playload.viewState, linkTo = playload.linkTo;
+                    topoId = id || data.config.id;
+                    _context2.next = 4;
+                    return topoApp.open(topoId);
 
-                  case 3:
+                  case 4:
                     _this2.update({
                       viewState: viewState || 'view',
                       currentTopo: playload,
-                      topoId: id,
+                      topoId: topoId,
                       topoPermission: undefined
                     });
 
-                    _context2.next = 6;
+                    _context2.next = 7;
                     return _this2.initTopoData({
-                      topoId: id,
+                      topoId: topoId,
+                      data: data,
                       linkTo: linkTo
                     });
 
-                  case 6:
+                  case 7:
                     if (viewState === 'edit') {
                       // TODO 待优化进入编辑模式方式
                       _this2.enterEditMode();
                     }
 
-                  case 7:
+                  case 8:
                   case "end":
                     return _context2.stop();
                 }
@@ -273,14 +275,14 @@ export default function (topoApp) {
           var _this5 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-            var startTime, topoId, linkToData, refresh, linkTo, permission, result, _yield$Promise$all, ciTypeMap, links, icons, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, linkTo, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, icons, _combTopoData, topoData, resAndMetrics, endTime;
 
             return _regeneratorRuntime.wrap(function _callee6$(_context6) {
               while (1) {
                 switch (_context6.prev = _context6.next) {
                   case 0:
                     startTime = moment();
-                    topoId = props.topoId, linkToData = props.linkTo, refresh = props.refresh; // 关联拓扑图
+                    topoId = props.topoId, data = props.data, linkToData = props.linkTo, refresh = props.refresh; // 关联拓扑图
 
                     if (refresh !== true) {
                       linkTo = linkToData || null;
@@ -303,18 +305,25 @@ export default function (topoApp) {
                       topoLoadError: false
                     });
 
-                    topoApp.options.onLoadStart(); // 查询权限
+                    topoApp.options.onLoadStart(); // 待移走
 
-                    _context6.next = 8;
+                    permission = 'write';
+
+                    if (!topoApp.options.usePermission) {
+                      _context6.next = 15;
+                      break;
+                    }
+
+                    _context6.next = 10;
                     return _this5.getTopoPermission({
                       id: topoId
                     });
 
-                  case 8:
+                  case 10:
                     permission = _context6.sent;
 
                     if (topoPermissonUtil.isReadable(permission)) {
-                      _context6.next = 13;
+                      _context6.next = 15;
                       break;
                     }
 
@@ -327,15 +336,33 @@ export default function (topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 13:
-                    _context6.next = 15;
+                  case 15:
+                    if (!data) {
+                      _context6.next = 22;
+                      break;
+                    }
+
+                    _context6.next = 18;
                     return topoApp.options.loadData(topoId);
 
-                  case 15:
+                  case 18:
+                    topoConfig = _context6.sent;
+                    result = _extends({}, data, {
+                      serialize: topoConfig.serialize
+                    });
+                    _context6.next = 25;
+                    break;
+
+                  case 22:
+                    _context6.next = 24;
+                    return topoApp.options.loadData(topoId);
+
+                  case 24:
                     result = _context6.sent;
 
+                  case 25:
                     if (result) {
-                      _context6.next = 20;
+                      _context6.next = 29;
                       break;
                     }
 
@@ -347,22 +374,19 @@ export default function (topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 20:
+                  case 29:
                     rlog.debug('topoMod.initTopoData 获取拓扑数据', topoId, linkTo, result);
-                    _context6.next = 23;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(result)), getLinksDetail(result.links), dispatch.iconManage.getIcons()]);
+                    _context6.next = 32;
+                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(result)), dispatch.iconManage.getIcons()]);
 
-                  case 23:
+                  case 32:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
-                    links = _yield$Promise$all[1];
-                    icons = _yield$Promise$all[2];
+                    icons = _yield$Promise$all[1];
                     rlog.debug('topoMod.initTopoData Ci属性指标元数据', ciTypeMap);
                     _combTopoData = combTopoData({
                       engine: topoApp,
-                      data: _extends({}, result, {
-                        links: links
-                      }),
+                      data: result,
                       linkTo: linkTo,
                       globalSetting: null,
                       ciTypeMap: ciTypeMap,
@@ -388,7 +412,7 @@ export default function (topoApp) {
                     rlog.info('topoMod.initTopoData 初始化拓扑图数据. 耗时: ', endTime.diff(startTime, 'seconds', true));
                     topoApp.options.onLoad();
 
-                  case 37:
+                  case 45:
                   case "end":
                     return _context6.stop();
                 }

package/es/models/topoView.js

@@ -7,7 +7,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  */
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
-import { Dialog, Message } from '@alifd/next';
 export default {
   // 定义 model 的初始 state
   state: {},

package/es/models/topocenter/functionAuth.js

@@ -7,7 +7,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  */
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
-import { Dialog, Message } from '@alifd/next';
 import authServices from '@riil-frontend/component-topology-utils/es/services/authorization';
 export default {
   // 定义 model 的初始 state

package/es/models/topocenter/topoCenter.js

@@ -9,7 +9,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  */
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
-import { Dialog, Message } from '@alifd/next';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/style.js

@@ -1,17 +1,41 @@
 import '@riil-frontend/component-topology-graph/es/style';
+import '@alifd/next/es/message/style';
+import '@alifd/next/es/dialog/style';
 import '@riil-frontend/utils/es/style';
-
 import '@riil-frontend/component-riil-event-emitter/es/style';
+import '@alifd/next/es/drawer/style';
+import '@alifd/next/es/button/style';
+import '@alifd/next/es/table/style';
+import '@alifd/next/es/search/style';
 import '@riil-frontend/component-pager/es/style';
 import '@riil-frontend/component-more-buttons-menu/es/style';
 import '@riil-frontend/component-table-filter-tags/es/style';
 import '@riil-frontend/component-table-layout/es/style';
 import '@riil-frontend/component-res-advanced-search/es/style';
+import '@alifd/next/es/card/style';
+import '@alifd/next/es/checkbox/style';
+import '@alifd/next/es/loading/style';
+import '@alifd/next/es/upload/style';
+import '@alifd/next/es/icon/style';
+import '@alifd/next/es/input/style';
+import '@alifd/next/es/field/style';
+import '@alifd/next/es/form/style';
+import '@alifd/next/es/number-picker/style';
+import '@alifd/next/es/select/style';
 import '@riil-frontend/component-riil-rule-tree/es/style';
+import '@alifd/next/es/balloon/style';
+import '@alifd/next/es/grid/style';
 import '@riil-frontend/component-action-tree/es/style';
 import '@riil-frontend/hooks/es/style';
 import '@riil-frontend/component-extra-title/es/style';
 import '@riil-frontend/next-collapse/es/style';
+import '@alifd/next/es/box/style';
+import '@alifd/next/es/menu-button/style';
+import '@alifd/next/es/tab/style';
+import '@alifd/next/es/radio/style';
+import '@alifd/next/es/collapse/style';
+import '@alifd/next/es/avatar/style';
+import '@alifd/next/es/cascader-select/style';
 import '@riil-frontend/component-no-data-page/es/style';
 import '@riil-frontend/component-topology-utils/es/style';
 import './index.scss';

package/es/topoCenter/getTopoData.js

@@ -0,0 +1,41 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import topoService from "@riil-frontend/component-topology-utils/es/services/topo";
+import { getLinksDetail } from "../core/models/utils/linkUtils";
+export default function getTopoData(_x) {
+  return _getTopoData.apply(this, arguments);
+}
+
+function _getTopoData() {
+  _getTopoData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
+    var data, links;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return topoService.getTopoData(id);
+
+          case 2:
+            data = _context.sent;
+            console.error(111, data);
+            _context.next = 6;
+            return getLinksDetail(data.links);
+
+          case 6:
+            links = _context.sent;
+            console.error(111, data, links);
+            return _context.abrupt("return", _extends({}, data, {
+              links: links
+            }));
+
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _getTopoData.apply(this, arguments);
+}

package/es/topoCenter/models/TopoCenter.js

@@ -0,0 +1,104 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _extends from "@babel/runtime/helpers/extends";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import TopoApp from "../../core/models/TopoApp";
+import createMenuCommands from "../../contextmenu/createMenuCommands";
+import getTopoData from "../getTopoData";
+
+var TopoCenter = /*#__PURE__*/function (_TopoApp) {
+  _inheritsLoose(TopoCenter, _TopoApp);
+
+  function TopoCenter(options) {
+    var _this;
+
+    _this = _TopoApp.call(this, _extends({
+      loadData: getTopoData
+    }, options, {
+      usePermission: true
+    })) || this;
+    var menuCommands = createMenuCommands(_assertThisInitialized(_this));
+
+    _this.view.contextMenu.registerCommands(menuCommands);
+
+    return _this;
+  }
+  /**
+   * TODO 移除
+   * @param params
+   * @return {Promise<void>}
+   */
+
+
+  var _proto = TopoCenter.prototype;
+
+  _proto.initData =
+  /*#__PURE__*/
+  function () {
+    var _initData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
+      var topoDispatchers;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              topoDispatchers = this.store.getModelDispatchers('topoCenter');
+              _context.next = 3;
+              return topoDispatchers.initData(params);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, this);
+    }));
+
+    function initData(_x) {
+      return _initData.apply(this, arguments);
+    }
+
+    return initData;
+  }();
+
+  _proto.openTopo = function openTopo(params) {
+    var topoDispatchers = this.store.getModelDispatchers('topoCenter');
+    topoDispatchers.openTopoPage(params);
+  }
+  /**
+   * TODO 移除
+   */
+  ;
+
+  _proto.exit =
+  /*#__PURE__*/
+  function () {
+    var _exit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var topoDispatchers;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              topoDispatchers = this.store.getModelDispatchers('topoMod');
+              _context2.next = 3;
+              return topoDispatchers.exit();
+
+            case 3:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, this);
+    }));
+
+    function exit() {
+      return _exit.apply(this, arguments);
+    }
+
+    return exit;
+  }();
+
+  return TopoCenter;
+}(TopoApp);
+
+export { TopoCenter as default };

package/es/topoCenter/viewer/TitleBar.js

@@ -0,0 +1,10 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import TopoViewerTitleBar from '../../components/TopoView/toolbar/TopoViewerTitleBar';
+export default function TitleBar(props) {
+  return /*#__PURE__*/React.createElement(TopoViewerTitleBar, _extends({
+    showEditButton: false,
+    disableEditMode: true
+  }, props));
+}
+;