@riil-frontend/component-topology 2.12.2 → 2.12.3

package/lib/core/editor/components/settings/{group/GroupNodeList/GroupNodeList.js → layer/NodeList.js}

@@ -9,11 +9,11 @@ exports["default"] = GroupNodeList;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _ResourceList = _interopRequireDefault(require("./ResourceList"));
+var _ResourceList = _interopRequireDefault(require("../common/GroupNodeList/ResourceList"));
 
-var _htElementUtils = require("../../../../../../utils/htElementUtils");
+var _htElementUtils = require("../../../../../utils/htElementUtils");
 
-var _icon = require("./icon");
+var _icon = require("../common/GroupNodeList/icon");
 
 function GroupNodeList(props) {
   var topo = props.topo,

package/lib/core/editor/components/settings/link/LinkPropertyView.js

@@ -29,11 +29,11 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _ColorPicker = _interopRequireDefault(require("../../LinkDynamicStyleSettingDrawer/rule/ColorPicker"));
 
-var _GroupNodeList = _interopRequireDefault(require("../group/GroupNodeList/GroupNodeList"));
+var _GroupNodeList = _interopRequireDefault(require("../group/DataTab/GroupNodeList"));
 
-var _ResourceSelectButton = _interopRequireDefault(require("../group/GroupNodeList/ResourceSelectButton"));
+var _ResourceSelectButton = _interopRequireDefault(require("../common/GroupNodeList/ResourceSelectButton"));
 
-var _icon = require("../group/GroupNodeList/icon");
+var _icon = require("../common/GroupNodeList/icon");
 
 var _LineType = _interopRequireDefault(require("../common/LineType"));
 

package/lib/core/editor/components/settings/node/NodeIconSelect.js

@@ -7,7 +7,7 @@ exports["default"] = NodeIconSelect;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _icon = require("../group/GroupNodeList/icon");
+var _icon = require("../common/GroupNodeList/icon");
 
 var _componentTopoIconSelect = _interopRequireDefault(require("@riil-frontend/component-topo-icon-select"));
 

package/lib/core/editor/components/settings/propertyViews.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _SettingsForm = _interopRequireDefault(require("./SettingsForm"));
+
+var _NodePropertyView = _interopRequireDefault(require("./node/NodePropertyView"));
+
+var _LayerSettingsForm = _interopRequireDefault(require("./layer/LayerSettingsForm"));
+
+var _TextPropertyView = _interopRequireDefault(require("./text/TextPropertyView"));
+
+var _LinkPropertyView = _interopRequireDefault(require("./link/LinkPropertyView"));
+
+var _ViewPropertyView = _interopRequireDefault(require("./view/ViewPropertyView"));
+
+var _GroupPropertyView = _interopRequireDefault(require("./group/GroupPropertyView"));
+
+var propertyPanelMap = {
+  // view: SettingsForm,
+  node: _NodePropertyView["default"],
+  layer: _LayerSettingsForm["default"],
+  text: _TextPropertyView["default"],
+  group: _GroupPropertyView["default"]
+};
+
+if (localStorage.getItem('topo.debug') === 'true') {
+  Object.assign(propertyPanelMap, {
+    line: _LinkPropertyView["default"],
+    view: _ViewPropertyView["default"]
+  });
+}
+
+var _default = propertyPanelMap;
+exports["default"] = _default;

package/lib/hooks/useTopoEdit.js

@@ -35,6 +35,8 @@ var _template = require("../utils/template");
 
 var _topoPermissionUtil = _interopRequireDefault(require("../utils/topoPermissionUtil"));
 
+var _htElementUtils = require("../utils/htElementUtils");
+
 var useTopoEdit = function useTopoEdit(params) {
   var topoApp = params.topoApp,
       topoId = params.topoId,
@@ -91,6 +93,10 @@ var useTopoEdit = function useTopoEdit(params) {
       deletedNodes = _useDynamicList.list,
       addDeletedNode = _useDynamicList.push,
       clearDeletedNodes = _useDynamicList.resetList;
+  /**
+   * 拓扑图全局已选固定资源
+   */
+
 
   var resSelections = (0, _react.useMemo)(function () {
     var sel = staticRes.selected && staticRes.data || [];
@@ -213,9 +219,9 @@ var useTopoEdit = function useTopoEdit(params) {
         id = _ref4.id;
 
     if (!(0, _utils.isNull)(id)) {
-      setSingleResKey([id]);
+      setSingleResKey(id);
     } else {
-      setSingleResKey([]);
+      setSingleResKey(null);
     }
 
     setShowSingleResDrawer(true);
@@ -339,9 +345,7 @@ var useTopoEdit = function useTopoEdit(params) {
     var id = data.id,
         tag = data.tag; // 新加的容器 tag 格式为 group_${id}
 
-    var group = topoApp.getDataModel().getDataById(tag) || topoApp.getDataModel().getDataByTag(id) || topoApp.getDataModel().getDatas().toArray().filter(function (item) {
-      return item.a('tag') === tag;
-    })[0];
+    var group = topoApp.getDataModel().getDataById(tag) || topoApp.getDataModel().getDataByTag(id) || (0, _htElementUtils.getGroupElementByTag)(topoApp.getDataModel(), tag);
 
     if (!group) {
       return;
@@ -491,11 +495,11 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   function _bindGroupResourcesConfig() {
-    _bindGroupResourcesConfig = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(group, data) {
+    _bindGroupResourcesConfig = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(group, data) {
       var id, tag, name, index, newGroup;
-      return _regenerator["default"].wrap(function _callee5$(_context5) {
+      return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
               id = group.id, tag = group.tag, name = group.name;
               index = findGroupIndex(groups, {
@@ -504,18 +508,18 @@ var useTopoEdit = function useTopoEdit(params) {
               });
 
               if (!(index > -1)) {
-                _context5.next = 7;
+                _context6.next = 7;
                 break;
               }
 
-              _context5.next = 5;
+              _context6.next = 5;
               return editDispatchers.updateGroupResourcesByIndex({
                 index: index,
                 resources: data
               });
 
             case 5:
-              _context5.next = 8;
+              _context6.next = 8;
               break;
 
             case 7:
@@ -531,10 +535,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 8:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
         }
-      }, _callee5);
+      }, _callee6);
     }));
     return _bindGroupResourcesConfig.apply(this, arguments);
   }
@@ -548,27 +552,26 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   function _bindGroupResources() {
-    _bindGroupResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(group, data) {
+    _bindGroupResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(group, data) {
       var id, tag, _yield$editDispatcher, elements, groupElement;
 
-      return _regenerator["default"].wrap(function _callee6$(_context6) {
+      return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               id = group.id, tag = group.tag;
-              _context6.next = 3;
+              _context7.next = 3;
               return bindGroupResourcesConfig(group, data);
 
             case 3:
-              _context6.next = 5;
+              _context7.next = 5;
               return editDispatchers.refreshDataByConfig();
 
             case 5:
-              _yield$editDispatcher = _context6.sent;
+              _yield$editDispatcher = _context7.sent;
               elements = _yield$editDispatcher.topoDataTrans;
-              debugger;
 
-              _rlog["default"].debug('useUpdateEffect--id, tag', id, tag);
+              _rlog["default"].debug('bindGroupResources--id, tag', id, tag);
 
               if (id) {
                 groupElement = (0, _format.filterGroupById)(elements, id);
@@ -582,12 +585,12 @@ var useTopoEdit = function useTopoEdit(params) {
 
               setFocusedGroup(null);
 
-            case 12:
+            case 11:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
         }
-      }, _callee6);
+      }, _callee7);
     }));
     return _bindGroupResources.apply(this, arguments);
   }
@@ -597,31 +600,31 @@ var useTopoEdit = function useTopoEdit(params) {
   }
 
   function _bindViewResources() {
-    _bindViewResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(data) {
+    _bindViewResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(data) {
       var _yield$editDispatcher2, elements;
 
-      return _regenerator["default"].wrap(function _callee7$(_context7) {
+      return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
-              _context7.next = 2;
+              _context8.next = 2;
               return editDispatchers.updateViewResources(data);
 
             case 2:
-              _context7.next = 4;
+              _context8.next = 4;
               return editDispatchers.refreshDataByConfig();
 
             case 4:
-              _yield$editDispatcher2 = _context7.sent;
+              _yield$editDispatcher2 = _context8.sent;
               elements = _yield$editDispatcher2.topoDataTrans;
               saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements);
 
             case 7:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
         }
-      }, _callee7);
+      }, _callee8);
     }));
     return _bindViewResources.apply(this, arguments);
   }
@@ -631,12 +634,12 @@ var useTopoEdit = function useTopoEdit(params) {
   }
 
   function _addResourceToFirstLayer() {
-    _addResourceToFirstLayer = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(data) {
+    _addResourceToFirstLayer = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(data) {
       var group, config, _yield$editDispatcher3, topoData;
 
-      return _regenerator["default"].wrap(function _callee8$(_context8) {
+      return _regenerator["default"].wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
               group = groups[0];
               config = {
@@ -650,50 +653,84 @@ var useTopoEdit = function useTopoEdit(params) {
                   data: [].concat(group.resources["static"].data, data)
                 }
               };
-              _context8.next = 4;
+              _context9.next = 4;
               return bindGroupResourcesConfig(group, config);
 
             case 4:
-              _context8.next = 6;
+              _context9.next = 6;
               return editDispatchers.refreshDataByConfig();
 
             case 6:
-              _yield$editDispatcher3 = _context8.sent;
+              _yield$editDispatcher3 = _context9.sent;
               topoData = _yield$editDispatcher3.topoData;
               topoApp.updateElements(topoData);
 
             case 9:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
         }
-      }, _callee8);
+      }, _callee9);
     }));
     return _addResourceToFirstLayer.apply(this, arguments);
   }
 
-  var onSaveComboRes = function onSaveComboRes(data) {
-    _rlog["default"].debug('关联资源-----onSaveComboRes', data, focusedGroup);
+  var onSaveComboRes = /*#__PURE__*/function () {
+    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(data) {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _rlog["default"].debug('关联资源-----onSaveComboRes', data, focusedGroup);
 
-    if (topoShowType !== 'layers') {
-      if (focusedGroup) {
-        bindGroupResources(focusedGroup, data);
-      } else {
-        bindViewResources(data);
-      }
-    } else {
-      // 分层拓扑，添加到第一层
-      addResourceToFirstLayer(data);
-    }
-  };
+              if (!(topoShowType === 'layers')) {
+                _context3.next = 6;
+                break;
+              }
+
+              _context3.next = 4;
+              return addResourceToFirstLayer(data);
 
-  var onSaveSingleRes = function onSaveSingleRes(resource) {
-    _rlog["default"].debug('onSaveSingleRes', resource);
+            case 4:
+              _context3.next = 13;
+              break;
+
+            case 6:
+              if (!focusedGroup) {
+                _context3.next = 11;
+                break;
+              }
+
+              _context3.next = 9;
+              return bindGroupResources(focusedGroup, data);
+
+            case 9:
+              _context3.next = 13;
+              break;
+
+            case 11:
+              _context3.next = 13;
+              return bindViewResources(data);
+
+            case 13:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }));
+
+    return function onSaveComboRes(_x7) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+
+  var onSaveSingleRes = function onSaveSingleRes(selectedResKey) {
+    _rlog["default"].debug('onSaveSingleRes', selectedResKey);
 
-    var selectedRes = resource[0];
     var selected = staticRes.selected,
         data = staticRes.data;
-    var exist = data.indexOf(selectedRes) !== -1;
+    var exist = data.indexOf(selectedResKey) !== -1;
 
     if (selected && exist) {
       // 资源已被选
@@ -705,15 +742,15 @@ var useTopoEdit = function useTopoEdit(params) {
 
       if (singleResKey) {
         list = list.filter(function (item) {
-          return item !== singleResKey[0];
+          return item !== singleResKey;
         });
       }
 
       if (!exist) {
-        list = list.concat(selectedRes);
+        list = [].concat(list, [selectedResKey]);
       }
 
-      setSingleResKey(resource);
+      setSingleResKey(selectedResKey);
       editDispatchers.updateResources({
         "static": {
           selected: true,
@@ -724,32 +761,32 @@ var useTopoEdit = function useTopoEdit(params) {
     }
   };
 
-  function checkSavePermission(_x7) {
+  function checkSavePermission(_x8) {
     return _checkSavePermission.apply(this, arguments);
   }
 
   function _checkSavePermission() {
-    _checkSavePermission = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(id) {
+    _checkSavePermission = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(id) {
       var permission;
-      return _regenerator["default"].wrap(function _callee9$(_context9) {
+      return _regenerator["default"].wrap(function _callee10$(_context10) {
         while (1) {
-          switch (_context9.prev = _context9.next) {
+          switch (_context10.prev = _context10.next) {
             case 0:
-              _context9.next = 2;
+              _context10.next = 2;
               return topoDispatchers.getTopoPermission({
                 id: id,
                 update: false
               });
 
             case 2:
-              permission = _context9.sent;
+              permission = _context10.sent;
 
               if (!_topoPermissionUtil["default"].isEditable(permission)) {
-                _context9.next = 5;
+                _context10.next = 5;
                 break;
               }
 
-              return _context9.abrupt("return", true);
+              return _context10.abrupt("return", true);
 
             case 5:
               _dialog["default"].alert({
@@ -761,43 +798,43 @@ var useTopoEdit = function useTopoEdit(params) {
                 onOk: function onOk() {}
               });
 
-              return _context9.abrupt("return", false);
+              return _context10.abrupt("return", false);
 
             case 7:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
         }
-      }, _callee9);
+      }, _callee10);
     }));
     return _checkSavePermission.apply(this, arguments);
   }
 
   var onSaveTopo = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(data) {
+    var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(data) {
       var id, config, global, serialize, saveConfig, valid, _config$layout2, template, layout;
 
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               id = data.id, config = data.config, global = data.global, serialize = data.serialize;
 
               if (!onSave) {
-                _context4.next = 5;
+                _context5.next = 5;
                 break;
               }
 
               saveConfig = /*#__PURE__*/function () {
-                var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+                var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
                   var _config$layout, template, layout;
 
-                  return _regenerator["default"].wrap(function _callee3$(_context3) {
+                  return _regenerator["default"].wrap(function _callee4$(_context4) {
                     while (1) {
-                      switch (_context3.prev = _context3.next) {
+                      switch (_context4.prev = _context4.next) {
                         case 0:
                           _config$layout = config === null || config === void 0 ? void 0 : config.layout, template = _config$layout.type, layout = _config$layout.layout;
-                          _context3.next = 3;
+                          _context4.next = 3;
                           return editDispatchers.saveTopo({
                             id: id,
                             template: template,
@@ -808,14 +845,14 @@ var useTopoEdit = function useTopoEdit(params) {
 
                         case 3:
                         case "end":
-                          return _context3.stop();
+                          return _context4.stop();
                       }
                     }
-                  }, _callee3);
+                  }, _callee4);
                 }));
 
                 return function saveConfig() {
-                  return _ref6.apply(this, arguments);
+                  return _ref7.apply(this, arguments);
                 };
               }();
 
@@ -823,7 +860,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 data: data,
                 saveConfig: saveConfig
               });
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
 
             case 5:
               // TODO 以下逻辑移到拓扑中心
@@ -831,26 +868,26 @@ var useTopoEdit = function useTopoEdit(params) {
                 saving: true
               }); // 检查权限
 
-              _context4.next = 8;
+              _context5.next = 8;
               return checkSavePermission(id);
 
             case 8:
-              valid = _context4.sent;
+              valid = _context5.sent;
 
               if (valid) {
-                _context4.next = 12;
+                _context5.next = 12;
                 break;
               }
 
               topoEditDispatchers.update({
                 saving: false
               });
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
 
             case 12:
               // 保存
               _config$layout2 = config === null || config === void 0 ? void 0 : config.layout, template = _config$layout2.type, layout = _config$layout2.layout;
-              _context4.next = 15;
+              _context5.next = 15;
               return editDispatchers.saveTopo({
                 id: id,
                 template: template,
@@ -862,7 +899,7 @@ var useTopoEdit = function useTopoEdit(params) {
               });
 
             case 15:
-              _context4.next = 17;
+              _context5.next = 17;
               return editDispatchers.addToBlockList({
                 id: topoId,
                 ciIdList: deletedNodes
@@ -879,14 +916,14 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 20:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4);
+      }, _callee5);
     }));
 
-    return function onSaveTopo(_x8) {
-      return _ref5.apply(this, arguments);
+    return function onSaveTopo(_x9) {
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -954,22 +991,22 @@ var useTopoEdit = function useTopoEdit(params) {
    * @return {Promise<void>}
    */
 
-  function refreshDataByConfig(_x9) {
+  function refreshDataByConfig(_x10) {
     return _refreshDataByConfig.apply(this, arguments);
   }
 
   function _refreshDataByConfig() {
-    _refreshDataByConfig = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(config) {
+    _refreshDataByConfig = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(config) {
       var resources, groups, dRes, sRes, query;
-      return _regenerator["default"].wrap(function _callee10$(_context10) {
+      return _regenerator["default"].wrap(function _callee11$(_context11) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context11.prev = _context11.next) {
             case 0:
               resources = config.resources, groups = config.groups;
               dRes = resources.dynamic, sRes = resources["static"];
 
               if (!(dRes.selected && dRes.condition || sRes.selected && (0, _utils.isAvailableArray)(sRes.data) || (0, _utils.isAvailableArray)(groups))) {
-                _context10.next = 7;
+                _context11.next = 7;
                 break;
               }
 
@@ -982,15 +1019,15 @@ var useTopoEdit = function useTopoEdit(params) {
               _rlog["default"].debug('useEffect', editState, isEditing, topoId, resources, groups); // editDispatchers.update({ resources, groups });
 
 
-              _context10.next = 7;
+              _context11.next = 7;
               return editDispatchers.getTopoByConditions(query);
 
             case 7:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
         }
-      }, _callee10);
+      }, _callee11);
     }));
     return _refreshDataByConfig.apply(this, arguments);
   }
@@ -1013,7 +1050,7 @@ var useTopoEdit = function useTopoEdit(params) {
     if (showSingleResDrawer) {
       if ((0, _utils.isAvailableArray)(topo)) {
         // 需要过滤出单选的节点及其相关连线
-        var nodeId = singleResKey && singleResKey[0] || null;
+        var nodeId = singleResKey;
         var data = (0, _format.filterNode)(topo, nodeId);
         saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_SINGLE, data);
       }

package/lib/style.js

@@ -20,11 +20,11 @@ require('@alifd/next/lib/box/style');
 require('@alifd/next/lib/dropdown/style');
 require('@alifd/next/lib/menu/style');
 require('@alifd/next/lib/tab/style');
-require('@alifd/next/lib/radio/style');
 require('@alifd/next/lib/collapse/style');
-require('@alifd/next/lib/list/style');
 require('@alifd/next/lib/tree-select/style');
 
+require('@alifd/next/lib/radio/style');
+require('@alifd/next/lib/list/style');
 require('@alifd/next/lib/tag/style');
 
 require('./index.scss');