@riil-frontend/component-topology 8.0.0-a.1 → 8.0.0-a.2

package/es/core/common/icons/basicIcons.js

@@ -19,7 +19,7 @@ export default [{
   'name': '人员',
   'url': '/img/topo/basicIcon/人员平面.svg'
 }, {
-  'id': 'system.building',
+  'id': 'system.楼宇',
   'name': '楼宇',
   'url': '/img/topo/basicIcon/楼宇平面.svg'
 }, {

package/es/core/common/icons/icon.js

@@ -37,11 +37,15 @@ export function getResourceIcons(topo) {
  */
 
 export function getBasicIcons(topo, containsGroupIcon) {
+  var nodeIcons = topoManager.iconLibManager.getNodeIcons().filter(function (icon) {
+    return !icon.ciType;
+  });
+
   if (containsGroupIcon === false) {
-    return basicIcons;
+    return [].concat(nodeIcons, basicIcons);
   }
 
-  return [topoManager.iconLibManager.getGroupIcon()].concat(basicIcons);
+  return [topoManager.iconLibManager.getGroupIcon()].concat(nodeIcons, basicIcons);
 }
 export function getGroupDefaultIcons(topo) {
   return [].concat(topoManager.iconLibManager.getIcons());

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "8.0.0-a.1" === 'string' ? "8.0.0-a.1" : null;
+var version = typeof "8.0.0-a.2" === 'string' ? "8.0.0-a.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -385,7 +385,12 @@ export default function (topoApp) {
                       alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
                       extraConfig: JSON.stringify(_extends({}, displayConfig, {
                         // 背景图，便于加载拓扑直接显示背景图
-                        background: topoApp.store.getModelState("background").current
+                        background: topoApp.store.getModelState("background").current,
+                        // 增加保存日志，便于排查链路重复问题 2023-4-12 19:27:18
+                        saveHistories: [{
+                          date: new Date().toLocaleString(),
+                          version: topoApp.version
+                        }].concat(displayConfig.saveHistories || [])
                       }))
                     };
                     rlog.debug('saveGlobalConfig', config);

package/lib/core/common/icons/basicIcons.js

@@ -23,7 +23,7 @@ var _default = [{
   'name': '人员',
   'url': '/img/topo/basicIcon/人员平面.svg'
 }, {
-  'id': 'system.building',
+  'id': 'system.楼宇',
   'name': '楼宇',
   'url': '/img/topo/basicIcon/楼宇平面.svg'
 }, {

package/lib/core/common/icons/icon.js

@@ -62,11 +62,15 @@ function getResourceIcons(topo) {
 
 
 function getBasicIcons(topo, containsGroupIcon) {
+  var nodeIcons = _manager["default"].iconLibManager.getNodeIcons().filter(function (icon) {
+    return !icon.ciType;
+  });
+
   if (containsGroupIcon === false) {
-    return _basicIcons["default"];
+    return [].concat(nodeIcons, _basicIcons["default"]);
   }
 
-  return [_manager["default"].iconLibManager.getGroupIcon()].concat(_basicIcons["default"]);
+  return [_manager["default"].iconLibManager.getGroupIcon()].concat(nodeIcons, _basicIcons["default"]);
 }
 
 function getGroupDefaultIcons(topo) {

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "8.0.0-a.1" === 'string' ? "8.0.0-a.1" : null;
+var version = typeof "8.0.0-a.2" === 'string' ? "8.0.0-a.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/store/models/topoConfig.js

@@ -407,7 +407,12 @@ function _default(topoApp) {
                       alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
                       extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig, {
                         // 背景图，便于加载拓扑直接显示背景图
-                        background: topoApp.store.getModelState("background").current
+                        background: topoApp.store.getModelState("background").current,
+                        // 增加保存日志，便于排查链路重复问题 2023-4-12 19:27:18
+                        saveHistories: [{
+                          date: new Date().toLocaleString(),
+                          version: topoApp.version
+                        }].concat(displayConfig.saveHistories || [])
                       }))
                     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "8.0.0-a.1",
+  "version": "8.0.0-a.2",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.0-a.1/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@8.0.0-a.2/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }