@riil-frontend/component-topology 2.3.20 → 2.4.2

package/es/plugins/useSelectionPlugin.d.ts

@@ -0,0 +1,23 @@
+export default useTableSelectionPlugin;
+/**
+ * Modified version of @ahooksjs/use-selection-plugin.
+ * Selected keys can be persistent across page changes, if not be reset.
+ */
+declare function useTableSelectionPlugin(options?: {}): {
+    middlewares: (ctx: any, next: any) => any;
+    props: () => {
+        tableProps: {
+            rowSelection: {
+                onChange: (selectedRowKeys: any, records: any) => void;
+                selectedRowKeys: any;
+                mode: any;
+                getProps: (record: any) => {
+                    disabled: any;
+                };
+            };
+            primaryKey: any;
+        };
+        getSelectedRowKeys: () => any;
+        setSelectedRowKeys: (selectedRowKeys: any) => void;
+    };
+};

package/es/plugins/useSelectionPlugin.js

@@ -0,0 +1,84 @@
+import { useState } from 'react';
+/**
+ * Modified version of @ahooksjs/use-selection-plugin.
+ * Selected keys can be persistent across page changes, if not be reset.
+ */
+
+var useTableSelectionPlugin = function useTableSelectionPlugin(options) {
+  if (options === void 0) {
+    options = {};
+  }
+
+  var _useState = useState({
+    selectedRowKeys: options.defaultSelectedRowKeys || []
+  }),
+      state = _useState[0],
+      setSelectedRowKeys = _useState[1];
+
+  var _options = options,
+      _options$primaryKey = _options.primaryKey,
+      primaryKey = _options$primaryKey === void 0 ? 'id' : _options$primaryKey,
+      _options$mode = _options.mode,
+      mode = _options$mode === void 0 ? 'multiple' : _options$mode,
+      _options$checkIsNeedR = _options.checkIsNeedReset,
+      checkIsNeedReset = _options$checkIsNeedR === void 0 ? function () {
+    return true;
+  } : _options$checkIsNeedR,
+      checkIsDisabled = _options.checkIsDisabled;
+
+  var onChange = function onChange(selectedRowKeys, records) {
+    setSelectedRowKeys({
+      selectedRowKeys: selectedRowKeys
+    });
+  };
+
+  var getSelectedRowKeys = function getSelectedRowKeys() {
+    return state.selectedRowKeys;
+  };
+
+  var $setSelectedRowKeys = function $setSelectedRowKeys(selectedRowKeys) {
+    setSelectedRowKeys({
+      selectedRowKeys: selectedRowKeys
+    });
+  };
+
+  return {
+    middlewares: function middlewares(ctx, next) {
+      var isNeedReset = checkIsNeedReset(ctx);
+
+      if (isNeedReset) {
+        return next().then(function () {
+          setSelectedRowKeys({
+            selectedRowKeys: []
+          });
+        });
+      }
+
+      return next();
+    },
+    props: function props() {
+      var getProps = checkIsDisabled ? function (record) {
+        return {
+          disabled: checkIsDisabled(record)
+        };
+      } : undefined;
+      return {
+        tableProps: {
+          rowSelection: {
+            // onSelect,
+            // onSelectAll,
+            onChange: onChange,
+            selectedRowKeys: state.selectedRowKeys,
+            mode: mode,
+            getProps: getProps
+          },
+          primaryKey: primaryKey
+        },
+        getSelectedRowKeys: getSelectedRowKeys,
+        setSelectedRowKeys: $setSelectedRowKeys
+      };
+    }
+  };
+};
+
+export default useTableSelectionPlugin;

package/es/style.js

@@ -25,6 +25,7 @@ import '@alifd/next/lib/tab/style';
 import '@alifd/next/lib/radio/style';
 import '@alifd/next/lib/collapse/style';
 import '@alifd/next/lib/list/style';
+import '@alifd/next/lib/tree-select/style';
 import '@alifd/next/lib/avatar/style';
 
 import './index.scss';

package/es/topoCenter/store/topoTreeMod.d.ts

@@ -1,3 +1,6 @@
+/**
+ * TODO 导航树相关增删改移到拓扑中心
+ */
 export default function _default(topoApp: any): {
     state: {
         treeData: any[];
@@ -52,7 +55,6 @@ export default function _default(topoApp: any): {
         fetchTopoTree(payload: any, rootState: any): Promise<void>;
         getSelectedTopoId(payload: any, rootState: any): any;
         refreshTree(payload: any, rootState: any): Promise<void>;
-        addNewTopo(params: {}, state: any): Promise<void>;
         editTopoOnTree(conditions: {}, state: any): Promise<void>;
         /**
          * 节指定的点和子节点是否包含指定的拓扑
@@ -66,7 +68,6 @@ export default function _default(topoApp: any): {
         deleteTopoOnTree(conditions: any, state: any): Promise<any>;
         setDefTopoOnTree(conditions: {}, state: any): Promise<void>;
         setDefaultTopoId(defaultTopoId: any): void;
-        moveTopoOnTree(conditions: {}, state: any): Promise<void>;
         /**
          * 类型搜索
          * @param {string} value

package/es/topoCenter/store/topoTreeMod.js

@@ -29,6 +29,10 @@ function findSelectedParentIds(data, selectedId) {
     return ["" + node.item.id];
   }
 }
+/**
+ * TODO 导航树相关增删改移到拓扑中心
+ */
+
 
 export default function (topoApp) {
   return {
@@ -124,102 +128,25 @@ export default function (topoApp) {
             }, _callee2);
           }))();
         },
-        addNewTopo: function addNewTopo(params, state) {
+        editTopoOnTree: function editTopoOnTree(conditions, state) {
           var _this3 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-            var resTreeData, node, treeDataClone, updateData, newNode;
+            var resTreeData, treeData;
             return _regeneratorRuntime.wrap(function _callee3$(_context3) {
               while (1) {
                 switch (_context3.prev = _context3.next) {
-                  case 0:
-                    if (params === void 0) {
-                      params = {};
-                    }
-
-                    _context3.next = 3;
-                    return topoServer.addNewTopo(params);
-
-                  case 3:
-                    resTreeData = _context3.sent;
-
-                    if (resTreeData) {
-                      _context3.next = 6;
-                      break;
-                    }
-
-                    return _context3.abrupt("return");
-
-                  case 6:
-                    node = {
-                      id: "" + resTreeData,
-                      label: params.name,
-                      parentId: params.parentId,
-                      icon: iconImg[params.type],
-                      showDefault: false,
-                      type: params.type,
-                      permission: 'write'
-                    };
-                    treeDataClone = clone(state.topoTreeMod.treeData);
-
-                    if (params.parentId === -1) {
-                      treeDataClone.push(node);
-                    } else {
-                      loopTree(treeDataClone, params.parentId, function (parent, index, arr) {
-                        parent.children = [].concat(parent.children || [], [_extends({}, node)]);
-                      });
-                    }
-
-                    updateData = _extends({
-                      treeData: treeNodeCount(treeDataClone),
-                      selectedNode: ["" + resTreeData]
-                    }, params.type === 1 ? {
-                      expandedKeys: [].concat(state.topoTreeMod.expandedKeys || [], ["" + params.parentId])
-                    } : {});
-                    rlog.debug('addNewTopo', {
-                      updateData: updateData,
-                      state: state
-                    });
-
-                    _this3.update(updateData);
-
-                    if (params.type === 1) {
-                      newNode = {
-                        id: "" + resTreeData,
-                        name: params.name
-                      };
-                      dispatch.topoCenter.openCreateTopoPage(newNode);
-
-                      _this3.refreshTree();
-                    }
-
-                  case 13:
-                  case "end":
-                    return _context3.stop();
-                }
-              }
-            }, _callee3);
-          }))();
-        },
-        editTopoOnTree: function editTopoOnTree(conditions, state) {
-          var _this4 = this;
-
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-            var resTreeData, treeData;
-            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-              while (1) {
-                switch (_context4.prev = _context4.next) {
                   case 0:
                     if (conditions === void 0) {
                       conditions = {};
                     }
 
                     rlog.debug('editTopoOnTree', conditions);
-                    _context4.next = 4;
+                    _context3.next = 4;
                     return topoServer.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
 
                   case 4:
-                    resTreeData = _context4.sent;
+                    resTreeData = _context3.sent;
                     treeData = clone(state.topoTreeMod.treeData);
 
                     if (resTreeData) {
@@ -227,7 +154,7 @@ export default function (topoApp) {
                         arr[index].label = conditions.name;
                       });
 
-                      _this4.update({
+                      _this3.update({
                         treeData: treeData
                       });
 
@@ -241,10 +168,10 @@ export default function (topoApp) {
 
                   case 7:
                   case "end":
-                    return _context4.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee4);
+            }, _callee3);
           }))();
         },
 
@@ -276,34 +203,34 @@ export default function (topoApp) {
          * @param {*} state
          */
         deleteTopoOnTree: function deleteTopoOnTree(conditions, state) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
             var currentTopoId, isDeleteCurrentP;
-            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
               while (1) {
-                switch (_context5.prev = _context5.next) {
+                switch (_context4.prev = _context4.next) {
                   case 0:
                     rlog.debug('deleteTopoOnTree', conditions, state, dispatch.topoMod);
                     currentTopoId = state.topoMod.topoId;
 
                     if (!("" + conditions === "" + currentTopoId)) {
-                      _context5.next = 13;
+                      _context4.next = 13;
                       break;
                     }
 
                     rlog.debug('deleteTopo-currentTopo', conditions);
-                    _context5.next = 6;
+                    _context4.next = 6;
                     return dispatch.topoMod.updateDelId("" + conditions);
 
                   case 6:
-                    _context5.next = 8;
+                    _context4.next = 8;
                     return topoApp.alarm.close();
 
                   case 8:
-                    _context5.next = 10;
+                    _context4.next = 10;
                     return topoServer.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
-                    return _context5.abrupt("return", _context5.sent);
+                    return _context4.abrupt("return", _context4.sent);
 
                   case 13:
                     // 判断删除的拓扑或文件，是否包含当前拓扑，如果包含就先关闭告警
@@ -315,49 +242,49 @@ export default function (topoApp) {
                     });
 
                     if (!isDeleteCurrentP) {
-                      _context5.next = 18;
+                      _context4.next = 18;
                       break;
                     }
 
-                    _context5.next = 18;
+                    _context4.next = 18;
                     return topoApp.alarm.close();
 
                   case 18:
-                    _context5.next = 20;
+                    _context4.next = 20;
                     return topoServer.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
-                    return _context5.abrupt("return", _context5.sent);
+                    return _context4.abrupt("return", _context4.sent);
 
                   case 21:
                   case "end":
-                    return _context5.stop();
+                    return _context4.stop();
                 }
               }
-            }, _callee5);
+            }, _callee4);
           }))();
         },
         setDefTopoOnTree: function setDefTopoOnTree(conditions, state) {
-          var _this5 = this;
+          var _this4 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
             var resTreeData;
-            return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
               while (1) {
-                switch (_context6.prev = _context6.next) {
+                switch (_context5.prev = _context5.next) {
                   case 0:
                     if (conditions === void 0) {
                       conditions = {};
                     }
 
                     rlog.debug('setDefTopoOnTree', conditions);
-                    _context6.next = 4;
+                    _context5.next = 4;
                     return topoServer.setDefTopo(parseInt(conditions, 10));
 
                   case 4:
-                    resTreeData = _context6.sent;
+                    resTreeData = _context5.sent;
 
-                    _this5.refreshTree(); // let treeData = clone(state.topoTreeMod.treeData);
+                    _this4.refreshTree(); // let treeData = clone(state.topoTreeMod.treeData);
                     // loopTree(
                     //   treeData,
                     //   conditions,
@@ -376,10 +303,10 @@ export default function (topoApp) {
 
                   case 6:
                   case "end":
-                    return _context6.stop();
+                    return _context5.stop();
                 }
               }
-            }, _callee6);
+            }, _callee5);
           }))();
         },
         setDefaultTopoId: function setDefaultTopoId(defaultTopoId) {
@@ -387,79 +314,6 @@ export default function (topoApp) {
             defId: defaultTopoId
           });
         },
-        moveTopoOnTree: function moveTopoOnTree(conditions, state) {
-          var _this6 = this;
-
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-            var _conditions, dataSource, dragObj, newPid, subList, obj, resTreeData;
-
-            return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-              while (1) {
-                switch (_context7.prev = _context7.next) {
-                  case 0:
-                    if (conditions === void 0) {
-                      conditions = {};
-                    }
-
-                    rlog.debug('moveTopoOnTree', conditions);
-                    _conditions = conditions, dataSource = _conditions.dataSource, dragObj = _conditions.dragObj;
-                    newPid = '';
-                    subList = [];
-                    loopTree(dataSource, dragObj.parentId, function (parent) {
-                      rlog.debug('parentNode', parent); // parent.count = parent.children ? parent.children.length : 0;
-                    });
-                    loopTree(dataSource, dragObj.id, function (node, index, arr, pid) {
-                      // arr[index].showDefault= true;
-                      newPid = pid; // rlog.debug('dragNode', node, index, arr);
-
-                      /* if (pid > 0) {
-                        loopTree(dataSource, pid, (p, i, a, pi) => {
-                          p.count = p.children.length;
-                        });
-                      } */
-
-                      subList = arr.map(function (item, index, arr) {
-                        return parseInt(item.id, 10);
-                      });
-                    });
-                    obj = {
-                      id: parseInt(dragObj.id, 10),
-                      newPId: parseInt(newPid, 10),
-                      newSubList: subList
-                    };
-
-                    if (!(parseInt(newPid, 10) >= 0)) {
-                      _context7.next = 16;
-                      break;
-                    }
-
-                    _context7.next = 11;
-                    return topoServer.moveTopoOnTree(obj);
-
-                  case 11:
-                    resTreeData = _context7.sent;
-                    rlog.debug('resTreeData', resTreeData);
-
-                    _this6.update({
-                      treeData: treeNodeCount(clone(dataSource))
-                    });
-
-                    _context7.next = 17;
-                    break;
-
-                  case 16:
-                    _this6.update({
-                      treeData: treeNodeCount(clone(state.topoTreeMod.treeData))
-                    });
-
-                  case 17:
-                  case "end":
-                    return _context7.stop();
-                }
-              }
-            }, _callee7);
-          }))();
-        },
 
         /**
          * 类型搜索

package/es/utils/htElementDataUtil.js

@@ -11,5 +11,5 @@ export function isEdge(element) {
   return element.className === 'ht.Edge';
 }
 export function isText(element) {
-  return element.className === 'ht.Node' && element.attrObject.isText;
+  return element.className === 'ht.Text' && element.attrObject.isText;
 }

package/es/utils/topoData.js

@@ -4,7 +4,7 @@ import { isAvailableArray } from '@riil-frontend/utils';
 import _ from 'lodash';
 import topoPermissionUtil from "./topoPermissionUtil";
 import buildViewerContextMenu from "../core/viewer/contextmenu/buildContextmenu";
-import buildEditorContextMenu from "../core/editor/buildContextmenu";
+import buildEditorContextMenu from "../core/editor/contextmenu/buildContextmenu";
 import { getDefaultNodeIcon as _getDefaultNodeIcon } from "./topoIconUtil";
 import mergeContextmenu from "../core/common/contextmenu/mergeContextmenu";
 /**

package/es/utils/tree.js

@@ -129,7 +129,7 @@ export var treeNodeCount = function treeNodeCount(data) {
         children = item.children;
     var count = 0;
 
-    if (type === 0 && children !== null && children !== void 0 && children.length) {
+    if (children !== null && children !== void 0 && children.length) {
       loopTreeFun(children, function (item) {
         if (item.type === 1) {
           count++;

package/lib/components/Drawer/index.js

@@ -44,7 +44,8 @@ var Drawer = function Drawer(props) {
     width: "40%",
     headerStyle: headerStyle,
     bodyStyle: bodyStyle,
-    closeMode: ['close', 'esc']
+    closeMode: ['close', 'esc'],
+    className: _indexModule["default"].drawer
   }, drawerProps, {
     visible: visible,
     onClose: onClose

package/lib/components/Drawer/index.module.scss

@@ -1,3 +1,16 @@
+.drawer {
+  & > div {
+    display: flex;
+  }
+
+  :global {
+    .next-drawer-body {
+      flex: 1;
+    }
+  }
+}
+
+
 .footer {
   position: absolute;
   bottom: 0;

package/lib/components/ResourceList/ResourceSelect.js

@@ -21,7 +21,7 @@ var _useFilterPlugin = _interopRequireDefault(require("@ahooksjs/use-filter-plug
 
 var _useSortablePlugin = _interopRequireDefault(require("@ahooksjs/use-sortable-plugin"));
 
-var _useSelectionPlugin = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/plugins/useSelectionPlugin"));
+var _useSelectionPlugin = _interopRequireDefault(require("../../plugins/useSelectionPlugin"));
 
 var _cmdb = require("@riil-frontend/component-topology-utils/es/services/cmdb");
 
@@ -33,6 +33,8 @@ var _format = require("../../utils/format");
 
 var _FormTable = _interopRequireDefault(require("../FormTable"));
 
+var _ResourceSelectModule = _interopRequireDefault(require("./ResourceSelect.module.scss"));
+
 var PRIMARY_KEY = 'id';
 
 var getTableData = /*#__PURE__*/function () {
@@ -204,7 +206,7 @@ var ResourceList = function ResourceList(props, ref) {
     }
   }];
   return /*#__PURE__*/_react["default"].createElement(_FormTable["default"], {
-    className: className,
+    className: className || _ResourceSelectModule["default"].table,
     formProps: formProps,
     tableProps: tableProps,
     paginationProps: paginationProps,

package/lib/components/ResourceList/ResourceSelect.module.scss

@@ -0,0 +1,7 @@
+.table {
+  height: 100%;
+  :global {
+    .next-table-body {
+    }
+  }
+}

package/lib/components/ResourceSelect/ResourceSelectDrawer.js

@@ -19,7 +19,7 @@ var _Drawer = _interopRequireDefault(require("../Drawer"));
 
 var _ResourceSelectDrawerModule = _interopRequireDefault(require("./ResourceSelectDrawer.module.scss"));
 
-var _excluded = ["visible", "setVisible", "onAdd", "getTableData", "onOk"];
+var _excluded = ["visible", "setVisible", "onAdd", "getTableData", "onOk", "layer", "topo"];
 
 function ResourceSelectDrawer(props) {
   var visible = props.visible,
@@ -27,6 +27,8 @@ function ResourceSelectDrawer(props) {
       onAdd = props.onAdd,
       getTableData = props.getTableData,
       onOk = props.onOk,
+      layer = props.layer,
+      topo = props.topo,
       otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
   var tableRef = (0, _react.useRef)(); // TODO 默认处理
 

package/lib/core/{editor/components/settings/group/GroupNodeList → common}/icons/defaultIcons.d.ts

@@ -1,3 +1,18 @@
+export const DEFAULT_NODE_ICONS: ({
+    url: any;
+    id: string;
+    name: string;
+    ciType: string;
+    jsonUrl: string;
+    oldId: string;
+} | {
+    url: any;
+    id: string;
+    name: string;
+    jsonUrl: string;
+    oldId: string;
+    ciType?: undefined;
+})[];
 declare var _default: {
     'editor.icon.cloud.small': {
         url: string;