@riil-frontend/component-topology 2.12.4 → 2.12.6-alpha.0

package/es/models/topoMod.js

@@ -17,7 +17,6 @@ export default function (topoApp) {
       loading: true,
       // 额外参数
       urlParams: {},
-      topoLoading: true,
       topoLoadError: false,
       viewState: 'view',
       // view, create, 2种模式
@@ -275,61 +274,56 @@ export default function (topoApp) {
          * @param props {{topoId}}
          * @param props.linkTo {?} 关联拓扑
          * @param props.refresh {?boolean} 是否刷新
+         * @param props.clear {?boolean} 是否清空
          * @return {Promise<void>}
          */
         initTopoData: function initTopoData(props, state) {
           var _this5 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-            var startTime, topoId, data, linkToData, refresh, linkTo, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, _combTopoData, topoData, resAndMetrics, endTime;
 
             return _regeneratorRuntime.wrap(function _callee6$(_context6) {
               while (1) {
                 switch (_context6.prev = _context6.next) {
                   case 0:
                     startTime = moment();
-                    topoId = props.topoId, data = props.data, linkToData = props.linkTo, refresh = props.refresh; // 关联拓扑图
+                    topoId = props.topoId, data = props.data, linkToData = props.linkTo, refresh = props.refresh, clear = props.clear; // 关联拓扑图
 
-                    if (refresh !== true) {
-                      linkTo = linkToData || null;
-
-                      _this5.update({
-                        linkTo: linkTo
-                      });
-                    } else {
-                      linkTo = state.topoMod.linkTo;
-                    }
+                    linkTo = refresh === true ? state.topoMod.linkTo : linkToData || null;
+                    startState = {
+                      loading: true,
+                      topoLoadError: false,
+                      linkTo: linkTo
+                    };
 
-                    if (topoId < 0) {
-                      _this5.update({
+                    if (clear === true || topoId < 0) {
+                      Object.assign(startState, {
                         topoData: null
                       });
                     }
 
-                    _this5.update({
-                      loading: true,
-                      topoLoadError: false
-                    });
+                    _this5.update(startState);
 
                     topoApp.options.onLoadStart(); // TODO 待移走
 
                     permission = 'write';
 
                     if (!topoApp.options.usePermission) {
-                      _context6.next = 15;
+                      _context6.next = 16;
                       break;
                     }
 
-                    _context6.next = 10;
+                    _context6.next = 11;
                     return _this5.getTopoPermission({
                       id: topoId
                     });
 
-                  case 10:
+                  case 11:
                     permission = _context6.sent;
 
                     if (topoPermissonUtil.isReadable(permission)) {
-                      _context6.next = 15;
+                      _context6.next = 16;
                       break;
                     }
 
@@ -342,46 +336,46 @@ export default function (topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 15:
+                  case 16:
                     if (!data) {
-                      _context6.next = 26;
+                      _context6.next = 27;
                       break;
                     }
 
                     if (!topoId) {
-                      _context6.next = 23;
+                      _context6.next = 24;
                       break;
                     }
 
-                    _context6.next = 19;
+                    _context6.next = 20;
                     return topoApp.options.loadData(topoId);
 
-                  case 19:
+                  case 20:
                     topoConfig = _context6.sent;
                     result = _extends({}, data, {
                       global: topoConfig.global,
                       serialize: topoConfig.serialize
                     });
-                    _context6.next = 24;
+                    _context6.next = 25;
                     break;
 
-                  case 23:
+                  case 24:
                     result = _extends({}, data);
 
-                  case 24:
-                    _context6.next = 29;
+                  case 25:
+                    _context6.next = 30;
                     break;
 
-                  case 26:
-                    _context6.next = 28;
+                  case 27:
+                    _context6.next = 29;
                     return topoApp.options.loadData(topoId);
 
-                  case 28:
+                  case 29:
                     result = _context6.sent;
 
-                  case 29:
+                  case 30:
                     if (result) {
-                      _context6.next = 33;
+                      _context6.next = 34;
                       break;
                     }
 
@@ -393,12 +387,12 @@ export default function (topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 33:
+                  case 34:
                     rlog.debug('topoMod.initTopoData 获取拓扑数据', topoId, linkTo, result);
-                    _context6.next = 36;
+                    _context6.next = 37;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(result)), dispatch.iconManage.getIcons()]);
 
-                  case 36:
+                  case 37:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     customIcons = _yield$Promise$all[1];
@@ -435,7 +429,7 @@ export default function (topoApp) {
                     rlog.info('topoMod.initTopoData 初始化拓扑图数据. 耗时: ', endTime.diff(startTime, 'seconds', true));
                     topoApp.options.onLoad();
 
-                  case 50:
+                  case 51:
                   case "end":
                     return _context6.stop();
                 }
@@ -451,17 +445,25 @@ export default function (topoApp) {
           var _this6 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+            var _payload, clear;
+
             return _regeneratorRuntime.wrap(function _callee7$(_context7) {
               while (1) {
                 switch (_context7.prev = _context7.next) {
                   case 0:
-                    _context7.next = 2;
+                    if (payload === void 0) {
+                      payload = {};
+                    }
+
+                    _payload = payload, clear = _payload.clear;
+                    _context7.next = 4;
                     return _this6.initTopoData({
                       topoId: rootState.topoMod.topoId,
-                      refresh: true
+                      refresh: true,
+                      clear: clear
                     });
 
-                  case 2:
+                  case 4:
                   case "end":
                     return _context7.stop();
                 }

package/es/style.js

@@ -1,11 +1,7 @@
-
 import '@alifd/next/lib/message/style';
 import '@alifd/next/lib/dialog/style';
 import '@alifd/next/lib/drawer/style';
 import '@alifd/next/lib/button/style';
-import '@alifd/next/lib/table/style';
-import '@alifd/next/lib/search/style';
-
 import '@alifd/next/lib/loading/style';
 import '@alifd/next/lib/upload/style';
 import '@alifd/next/lib/icon/style';
@@ -15,16 +11,17 @@ import '@alifd/next/lib/form/style';
 import '@alifd/next/lib/number-picker/style';
 import '@alifd/next/lib/select/style';
 import '@alifd/next/lib/balloon/style';
+import '@alifd/next/lib/table/style';
 import '@alifd/next/lib/grid/style';
 import '@alifd/next/lib/box/style';
 import '@alifd/next/lib/dropdown/style';
 import '@alifd/next/lib/menu/style';
+import '@alifd/next/lib/search/style';
 import '@alifd/next/lib/tab/style';
 import '@alifd/next/lib/collapse/style';
 import '@alifd/next/lib/tree-select/style';
-
 import '@alifd/next/lib/radio/style';
 import '@alifd/next/lib/list/style';
 import '@alifd/next/lib/tag/style';
-
+import '@riil-frontend/component-topology-utils/es/style';
 import './index.scss';

package/es/utils/htElementUtils.js

@@ -91,6 +91,30 @@ export function getGroupNodes(dataModel, groupIdOrTag) {
     return element.groupId === groupIdOrTag || element.groupTag === groupIdOrTag;
   });
 }
+/**
+ * 获取容器里的节点列表
+ *
+ * @param group
+ * @return {*}
+ */
+
+export function getGroupChildren(group) {
+  if (!group) {
+    return [];
+  } // HT为了支持区域内无节点可展开增加了站位节点，因此 节点的layer等于container_blank的过滤掉就可以了
+
+
+  return group.getChildren().getArray().filter(function (node) {
+    return node._layer !== 'container_blank';
+  });
+}
+/**
+ * 获取容器里的节点数据列表
+ *
+ * @param group
+ * @return {*}
+ */
+
 export function getGroupChildrenData(group) {
-  return group.getChildren().getArray().map(getNodeData);
+  return getGroupChildren(group).map(getNodeData);
 }

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

@@ -1,5 +1,5 @@
-@import '@riil-frontend/css/lib/index.scss';
-@import "@alifd/next/variables";
+//@import '@riil-frontend/css/lib/index.scss';
+@import "~@alifd/next/variables";
 
 .layout {
   height: 100%;

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -50,7 +50,7 @@ function ResourceSelectDrawer(props) {
               setLoading(true);
               selected = resourceSelectRef.current.getSelectedRowKeys();
               _context.next = 4;
-              return onOk(selected);
+              return onOk(selectionMode === 'single' ? selected[0] : selected);
 
             case 4:
               shouldClose = _context.sent;

package/lib/components/SingleResourceDrawer/SingleResourceDrawer.js

@@ -0,0 +1,72 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _utils = require("@riil-frontend/utils");
+
+var _Drawer = _interopRequireDefault(require("../Drawer"));
+
+var _ResourceList = _interopRequireDefault(require("../ResourceList"));
+
+/**
+ * 旧版单选
+ * @param props
+ * @return {*}
+ * @constructor
+ */
+var SingleResourceDrawer = function SingleResourceDrawer(props) {
+  var store = props.store,
+      visible = props.visible,
+      loading = props.loading,
+      selectedKey = props.selectedKey,
+      totalSelection = props.totalSelection,
+      onSave = props.onSave,
+      onClose = props.onClose;
+  var ref = (0, _react.useRef)();
+
+  var onDrawerSave = function onDrawerSave() {
+    var data = ref.current.getSelectedData();
+
+    if (!(0, _utils.isAvailableArray)(data)) {
+      _message["default"].error('请选择一项资源。');
+
+      return;
+    }
+
+    var intercept = onSave(data[0]);
+
+    if (!intercept) {
+      onClose();
+    }
+  };
+
+  var initialData = {
+    selected: [selectedKey],
+    total: totalSelection
+  };
+  return /*#__PURE__*/_react["default"].createElement(_Drawer["default"], {
+    title: "\u9009\u62E9\u8D44\u6E90",
+    visible: visible,
+    loading: loading,
+    onSave: onDrawerSave,
+    onClose: onClose,
+    buttons: ['确定', '取消']
+  }, /*#__PURE__*/_react["default"].createElement(_ResourceList["default"], {
+    ref: ref,
+    store: store,
+    initialData: initialData,
+    selectionMode: "single"
+  }));
+};
+
+var _default = SingleResourceDrawer;
+exports["default"] = _default;

package/lib/components/SingleResourceDrawer/index.js

@@ -1,66 +1,11 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _utils = require("@riil-frontend/utils");
-
-var _Drawer = _interopRequireDefault(require("../Drawer"));
-
-var _ResourceList = _interopRequireDefault(require("../ResourceList"));
-
-var SingleResourceDrawer = function SingleResourceDrawer(props) {
-  var store = props.store,
-      visible = props.visible,
-      loading = props.loading,
-      selectedKey = props.selectedKey,
-      totalSelection = props.totalSelection,
-      onSave = props.onSave,
-      onClose = props.onClose;
-  var ref = (0, _react.useRef)();
-
-  var onDrawerSave = function onDrawerSave() {
-    var data = ref.current.getSelectedData();
-
-    if (!(0, _utils.isAvailableArray)(data)) {
-      _message["default"].error('请选择一项资源。');
-
-      return;
-    }
-
-    var intercept = onSave(data[0]);
-
-    if (!intercept) {
-      onClose();
-    }
-  };
-
-  var initialData = {
-    selected: [selectedKey],
-    total: totalSelection
-  };
-  return /*#__PURE__*/_react["default"].createElement(_Drawer["default"], {
-    title: "\u9009\u62E9\u8D44\u6E90",
-    visible: visible,
-    loading: loading,
-    onSave: onDrawerSave,
-    onClose: onClose,
-    buttons: ['确定', '取消']
-  }, /*#__PURE__*/_react["default"].createElement(_ResourceList["default"], {
-    ref: ref,
-    store: store,
-    initialData: initialData,
-    selectionMode: "single"
-  }));
-};
+var _SelectDrawer = _interopRequireDefault(require("./SelectDrawer"));
 
-var _default = SingleResourceDrawer;
+var _default = _SelectDrawer["default"];
 exports["default"] = _default;

package/lib/core/components/TopoView/topoView.js

@@ -101,16 +101,8 @@ var TopoView = function TopoView(props) {
     onLineDelete: onLineDelete,
     topoShowType: topoShowType
   });
-  var topoLoading = topoEditApi.topoLoading,
-      showSingleResDrawer = topoEditApi.showSingleResDrawer,
-      initialSingleRes = topoEditApi.initialSingleRes,
-      showComboResDrawer = topoEditApi.showComboResDrawer,
-      initialComboRes = topoEditApi.initialComboRes,
-      resSelections = topoEditApi.resSelections,
-      onExitEdit = topoEditApi.onExitEdit,
+  var onExitEdit = topoEditApi.onExitEdit,
       onBindData = topoEditApi.onBindData,
-      onSaveSingleRes = topoEditApi.onSaveSingleRes,
-      onCloseSigleResDrawer = topoEditApi.onCloseSigleResDrawer,
       onSaveComboRes = topoEditApi.onSaveComboRes,
       onCloseComboResDrawer = topoEditApi.onCloseComboResDrawer,
       onDeleteElement = topoEditApi.onDeleteElement,
@@ -275,20 +267,12 @@ var TopoView = function TopoView(props) {
     topoEditApi: topoEditApi,
     selection: selection,
     editorProps: props.editorProps
-  })), /*#__PURE__*/_react["default"].createElement(_SingleResourceDrawer["default"], {
-    visible: showSingleResDrawer,
-    loading: topoLoading,
-    store: store,
-    selectedKey: initialSingleRes,
-    totalSelection: resSelections,
-    onSave: onSaveSingleRes,
-    onClose: onCloseSigleResDrawer
-  }), /*#__PURE__*/_react["default"].createElement(_MultiResourceDrawer["default"], {
-    visible: showComboResDrawer,
-    loading: topoLoading,
-    initialData: initialComboRes,
-    totalSelection: resSelections,
-    isLayerTopo: topoShowType === 'layers',
+  })), /*#__PURE__*/_react["default"].createElement(_MultiResourceDrawer["default"], {
+    visible: topoEditApi.showComboResDrawer,
+    loading: topoEditApi.topoLoading,
+    initialData: topoEditApi.initialComboRes,
+    totalSelection: topoEditApi.resSelections,
+    isLayerTopo: topoEditApi.topoShowType === 'layers',
     onSave: onSaveComboRes,
     onClose: onCloseComboResDrawer
   }), /*#__PURE__*/_react["default"].createElement(_ViewerPlugin["default"], {

package/lib/core/editor/components/EditorPlugin.js

@@ -19,7 +19,8 @@ var _Link = _interopRequireDefault(require("../../../components/Link"));
 
 function TopoEditPlugin(props) {
   var topo = props.topo,
-      topoContext = props.topoContext;
+      topoContext = props.topoContext,
+      topoEditApi = props.topoEditApi;
   var store = topo.store;
 
   var _store$useModel = store.useModel('topoEdit'),

package/lib/core/editor/components/LinkDynamicStyleSettingDrawer/rule/ColorPicker.module.scss

@@ -1,4 +1,4 @@
-@import "@alifd/theme-19926/variables";
+@import "~@alifd/theme-19926/variables.scss";
 
 .swatch {
   background: #fff;

package/lib/core/editor/components/resource/SingleResourceDrawer/SelectDrawer.js

@@ -0,0 +1,68 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _ResourceSelectDrawer = _interopRequireDefault(require("../../../../../components/ResourceSelectDrawer"));
+
+var SingleSelectDrawer = function SingleSelectDrawer(props) {
+  var visible = props.visible,
+      totalSelection = props.totalSelection,
+      onSave = props.onSave,
+      onClose = props.onClose;
+
+  var onDrawerSave = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (selected.length) {
+                _context.next = 3;
+                break;
+              }
+
+              _message["default"].error('请选择一项资源。');
+
+              return _context.abrupt("return", false);
+
+            case 3:
+              _context.next = 5;
+              return onSave(selected[0]);
+
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function onDrawerSave(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  return /*#__PURE__*/_react["default"].createElement(_ResourceSelectDrawer["default"], {
+    visible: visible,
+    excludeIds: totalSelection,
+    selectionMode: "single",
+    onOk: onDrawerSave,
+    onClose: onClose
+  });
+};
+
+var _default = SingleSelectDrawer;
+exports["default"] = _default;

package/lib/core/editor/components/resource/SingleResourceDrawer/SingleResourceDrawer.js

@@ -0,0 +1,72 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _utils = require("@riil-frontend/utils");
+
+var _Drawer = _interopRequireDefault(require("../Drawer"));
+
+var _ResourceList = _interopRequireDefault(require("../ResourceList"));
+
+/**
+ * 旧版单选
+ * @param props
+ * @return {*}
+ * @constructor
+ */
+var SingleResourceDrawer = function SingleResourceDrawer(props) {
+  var store = props.store,
+      visible = props.visible,
+      loading = props.loading,
+      selectedKey = props.selectedKey,
+      totalSelection = props.totalSelection,
+      onSave = props.onSave,
+      onClose = props.onClose;
+  var ref = (0, _react.useRef)();
+
+  var onDrawerSave = function onDrawerSave() {
+    var data = ref.current.getSelectedData();
+
+    if (!(0, _utils.isAvailableArray)(data)) {
+      _message["default"].error('请选择一项资源。');
+
+      return;
+    }
+
+    var intercept = onSave(data[0]);
+
+    if (!intercept) {
+      onClose();
+    }
+  };
+
+  var initialData = {
+    selected: [selectedKey],
+    total: totalSelection
+  };
+  return /*#__PURE__*/_react["default"].createElement(_Drawer["default"], {
+    title: "\u9009\u62E9\u8D44\u6E90",
+    visible: visible,
+    loading: loading,
+    onSave: onDrawerSave,
+    onClose: onClose,
+    buttons: ['确定', '取消']
+  }, /*#__PURE__*/_react["default"].createElement(_ResourceList["default"], {
+    ref: ref,
+    store: store,
+    initialData: initialData,
+    selectionMode: "single"
+  }));
+};
+
+var _default = SingleResourceDrawer;
+exports["default"] = _default;

package/lib/core/editor/components/resource/SingleResourceDrawer/index.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _SelectDrawer = _interopRequireDefault(require("./SelectDrawer"));
+
+var _default = _SelectDrawer["default"];
+exports["default"] = _default;

package/lib/core/editor/components/settings/common/GroupNodeList/ResourceList.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -9,7 +7,7 @@ exports["default"] = void 0;
 
 var _list = _interopRequireDefault(require("@alifd/next/lib/list"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _ResourceListModule = _interopRequireDefault(require("./ResourceList.module.scss"));
 

package/lib/core/editor/components/settings/common/text/FontStyleCheckbox.module.scss

@@ -1,4 +1,4 @@
-@import "@alifd/theme-19926/variables";
+@import "~@alifd/theme-19926/variables.scss";
 
 .buttonGroup {
   display: flex;

package/lib/core/editor/components/settings/group/DataTab/GroupNodeList.js

@@ -18,7 +18,7 @@ var _icon = require("../../common/GroupNodeList/icon");
 function GroupNodeList(props) {
   var topo = props.topo,
       group = props.group;
-  var nodes = (0, _htElementUtils.getGroupChildrenData)(topo.getDataModel().getDataById(group.id));
+  var nodes = (0, _htElementUtils.getGroupChildrenData)(group);
   var data = nodes.map(function (node) {
     return {
       title: node.name,