@riil-frontend/component-topology 2.15.14 → 2.15.17

package/demo-mock/basic/topo/v1/api/background/all

@@ -0,0 +1 @@
+[{"id":10000,"isSystem":1,"fileCode":"chinamap_light"},{"id":10001,"isSystem":1,"fileCode":"chinamap_dark"},{"id":10002,"isSystem":1,"fileCode":"test"}]

package/es/components/collapse/Panel.js

@@ -8,8 +8,13 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import styles from "./Panel.module.scss";
 var config = _ConfigProvider.config;
+/**
+ * 定制折叠面板Panel，支持标题右侧工具
+ * @param {*} props 
+ * @returns 
+ */
 
-function Panel(props) {
+function CollapsePanel(props) {
   var _classNames;
 
   var title = props.title,
@@ -56,7 +61,7 @@ function Panel(props) {
 }
 
 ;
-Panel.propTypes = {
+CollapsePanel.propTypes = {
   /**
    * 样式类名的品牌前缀
    */
@@ -87,10 +92,10 @@ Panel.propTypes = {
   onClick: PropTypes.func,
   id: PropTypes.string
 };
-Panel.defaultProps = {
+CollapsePanel.defaultProps = {
   prefix: 'next-',
   isExpanded: false,
   onClick: function onClick() {}
 };
-Panel.isNextPanel = true;
-export default config(Panel);
+CollapsePanel.isNextPanel = true;
+export default config(CollapsePanel);

package/es/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js

@@ -8,8 +8,11 @@ import ColorPicker from "../../../../../../common/components/ColorPicker";
 import LineType from "../../common/LineType";
 var CollapsePanel = _Collapse.Panel;
 
-function parseValues(values) {
-  return _extends({}, values);
+function parseValues(values, edge) {
+  return _extends({}, values, {
+    'styleMap.edge.width': edge.s('edge.width') // element.getStyleMap() 如果是默认值则不返回
+
+  });
 }
 
 export default function CommonEdgePropertyView(props) {
@@ -21,7 +24,7 @@ export default function CommonEdgePropertyView(props) {
 
   var field = _Field.useField({
     autoUnmount: false,
-    values: parseValues(values),
+    values: parseValues(values, edge),
     onChange: function onChange(name, value) {
       var newValues = field.getValues();
 
@@ -32,7 +35,7 @@ export default function CommonEdgePropertyView(props) {
   });
 
   useEffect(function () {
-    field.setValues(parseValues(values));
+    field.setValues(parseValues(values, edge));
   }, [values]);
 
   var setLineColor = function setLineColor(color) {

package/es/core/editor/components/settings/propertyViews/layer/DataTab/RelateData.js

@@ -3,7 +3,7 @@ import React from 'react';
 import NodeList from "./NodeList";
 import LayerAddResourceButton from "./LayerAddResourceButton";
 import CollapseFullheightStyles from "../../../common/GroupNodeList/CollapseFullheight.module.scss";
-var CollapsePanel = _Collapse.Panel;
+import CollapsePanel from "../../../../../../../components/collapse/Panel";
 export default function LayerRelateData(props) {
   var topo = props.topo,
       topoEditApi = props.topoEditApi,
@@ -15,16 +15,8 @@ export default function LayerRelateData(props) {
   var createResourcePanel = function createResourcePanel() {
     return /*#__PURE__*/React.createElement(CollapsePanel, {
       key: "\u5173\u8054\u8D44\u6E90",
-      title: /*#__PURE__*/React.createElement("div", {
-        style: {
-          display: 'flex',
-          paddingRight: 16
-        }
-      }, /*#__PURE__*/React.createElement("div", {
-        style: {
-          flex: 1
-        }
-      }, "\u5173\u8054\u8D44\u6E90"), /*#__PURE__*/React.createElement(LayerAddResourceButton, {
+      title: "\u5173\u8054\u8D44\u6E90",
+      extra: /*#__PURE__*/React.createElement(LayerAddResourceButton, {
         topo: topo,
         layer: layer,
         layerData: values,
@@ -33,7 +25,7 @@ export default function LayerRelateData(props) {
           /* TODO 刷新列表 refreshList */
         },
         addResourceDrawer: editorProps === null || editorProps === void 0 ? void 0 : editorProps.layerResourceSelectComponent
-      })),
+      }),
       className: CollapseFullheightStyles.panelFullHeight
     }, /*#__PURE__*/React.createElement(RelatedNodeList, {
       topo: topo,

package/es/core/models/AttributeMetricDisplay.js

@@ -445,7 +445,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
               // rlog.debug('AttributeMetricDisplay.loadAttributeAndMetric', data);
               topo = this.topo; // 设置ciType
 
-              ciDatas = data.map(function (item) {
+              ciDatas = data.filter(function (item) {
+                // 过滤不存在的ci，解决编辑模式删除资源后切换到显示模式报错
+                return !!topo.dataModel.getDataById(item.id);
+              }).map(function (item) {
                 return _extends({
                   ciType: topo.dataModel.getDataById(item.id).ciType
                 }, item);
@@ -483,7 +486,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }()
   /**
    * 临时由前端翻译引用属性名称
-   * @param {*} ciDatas 
+   * @param {array} ciDatas 
    * @returns 
    */
   ;
@@ -523,12 +526,20 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                   });
                 });
               });
-              refIds = Object.keys(refIdMap); // 查询引用对象
+              refIds = Object.keys(refIdMap);
 
-              _context3.next = 6;
-              return queryCisByIds(refIds);
+              if (refIds.length) {
+                _context3.next = 6;
+                break;
+              }
+
+              return _context3.abrupt("return", ciDatas);
 
             case 6:
+              _context3.next = 8;
+              return queryCisByIds(refIds);
+
+            case 8:
               refCis = _context3.sent;
               refCiMap = keyBy(refCis, 'id');
               rlog.debug('translateRefAttribute', {
@@ -556,7 +567,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 });
               }));
 
-            case 10:
+            case 12:
             case "end":
               return _context3.stop();
           }

package/es/core/models/TopoApp.js

@@ -19,7 +19,7 @@ import GraphDataModel from "./GraphDataModel";
 import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager"; // eslint-disable-next-line no-undef
 
-var version = typeof "2.15.14" === 'string' ? "2.15.14" : null;
+var version = typeof "2.15.17" === 'string' ? "2.15.17" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 var topoDebug = {};
 window.topoDebug = topoDebug;

package/lib/components/collapse/Panel.js

@@ -28,8 +28,13 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var config = _configProvider["default"].config;
+/**
+ * 定制折叠面板Panel，支持标题右侧工具
+ * @param {*} props 
+ * @returns 
+ */
 
-function Panel(props) {
+function CollapsePanel(props) {
   var _classNames;
 
   var title = props.title,
@@ -77,7 +82,7 @@ function Panel(props) {
 }
 
 ;
-Panel.propTypes = {
+CollapsePanel.propTypes = {
   /**
    * 样式类名的品牌前缀
    */
@@ -108,13 +113,13 @@ Panel.propTypes = {
   onClick: _propTypes["default"].func,
   id: _propTypes["default"].string
 };
-Panel.defaultProps = {
+CollapsePanel.defaultProps = {
   prefix: 'next-',
   isExpanded: false,
   onClick: function onClick() {}
 };
-Panel.isNextPanel = true;
+CollapsePanel.isNextPanel = true;
 
-var _default = config(Panel);
+var _default = config(CollapsePanel);
 
 exports["default"] = _default;

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

@@ -27,8 +27,11 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var CollapsePanel = _collapse["default"].Panel;
 
-function parseValues(values) {
-  return (0, _extends2["default"])({}, values);
+function parseValues(values, edge) {
+  return (0, _extends2["default"])({}, values, {
+    'styleMap.edge.width': edge.s('edge.width') // element.getStyleMap() 如果是默认值则不返回
+
+  });
 }
 
 function CommonEdgePropertyView(props) {
@@ -40,7 +43,7 @@ function CommonEdgePropertyView(props) {
 
   var field = _field["default"].useField({
     autoUnmount: false,
-    values: parseValues(values),
+    values: parseValues(values, edge),
     onChange: function onChange(name, value) {
       var newValues = field.getValues();
 
@@ -51,7 +54,7 @@ function CommonEdgePropertyView(props) {
   });
 
   (0, _react.useEffect)(function () {
-    field.setValues(parseValues(values));
+    field.setValues(parseValues(values, edge));
   }, [values]);
 
   var setLineColor = function setLineColor(color) {

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/RelateData.js

@@ -15,7 +15,7 @@ var _LayerAddResourceButton = _interopRequireDefault(require("./LayerAddResource
 
 var _CollapseFullheightModule = _interopRequireDefault(require("../../../common/GroupNodeList/CollapseFullheight.module.scss"));
 
-var CollapsePanel = _collapse["default"].Panel;
+var _Panel = _interopRequireDefault(require("../../../../../../../components/collapse/Panel"));
 
 function LayerRelateData(props) {
   var topo = props.topo,
@@ -26,18 +26,10 @@ function LayerRelateData(props) {
   var RelatedNodeList = (editorProps === null || editorProps === void 0 ? void 0 : editorProps.layerRelatedResourceList) || _NodeList["default"];
 
   var createResourcePanel = function createResourcePanel() {
-    return /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
+    return /*#__PURE__*/_react["default"].createElement(_Panel["default"], {
       key: "\u5173\u8054\u8D44\u6E90",
-      title: /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          display: 'flex',
-          paddingRight: 16
-        }
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          flex: 1
-        }
-      }, "\u5173\u8054\u8D44\u6E90"), /*#__PURE__*/_react["default"].createElement(_LayerAddResourceButton["default"], {
+      title: "\u5173\u8054\u8D44\u6E90",
+      extra: /*#__PURE__*/_react["default"].createElement(_LayerAddResourceButton["default"], {
         topo: topo,
         layer: layer,
         layerData: values,
@@ -46,7 +38,7 @@ function LayerRelateData(props) {
           /* TODO 刷新列表 refreshList */
         },
         addResourceDrawer: editorProps === null || editorProps === void 0 ? void 0 : editorProps.layerResourceSelectComponent
-      })),
+      }),
       className: _CollapseFullheightModule["default"].panelFullHeight
     }, /*#__PURE__*/_react["default"].createElement(RelatedNodeList, {
       topo: topo,

package/lib/core/models/AttributeMetricDisplay.js

@@ -464,7 +464,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
               // rlog.debug('AttributeMetricDisplay.loadAttributeAndMetric', data);
               topo = this.topo; // 设置ciType
 
-              ciDatas = data.map(function (item) {
+              ciDatas = data.filter(function (item) {
+                // 过滤不存在的ci，解决编辑模式删除资源后切换到显示模式报错
+                return !!topo.dataModel.getDataById(item.id);
+              }).map(function (item) {
                 return (0, _extends2["default"])({
                   ciType: topo.dataModel.getDataById(item.id).ciType
                 }, item);
@@ -502,7 +505,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }()
   /**
    * 临时由前端翻译引用属性名称
-   * @param {*} ciDatas 
+   * @param {array} ciDatas 
    * @returns 
    */
   ;
@@ -542,12 +545,20 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                   });
                 });
               });
-              refIds = Object.keys(refIdMap); // 查询引用对象
+              refIds = Object.keys(refIdMap);
 
-              _context3.next = 6;
-              return (0, _services.queryCisByIds)(refIds);
+              if (refIds.length) {
+                _context3.next = 6;
+                break;
+              }
+
+              return _context3.abrupt("return", ciDatas);
 
             case 6:
+              _context3.next = 8;
+              return (0, _services.queryCisByIds)(refIds);
+
+            case 8:
               refCis = _context3.sent;
               refCiMap = (0, _lodash.keyBy)(refCis, 'id');
 
@@ -575,7 +586,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 });
               }));
 
-            case 10:
+            case 12:
             case "end":
               return _context3.stop();
           }

package/lib/core/models/TopoApp.js

@@ -46,7 +46,7 @@ var _edgeUtil = require("../utils/edgeUtil");
 var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.14" === 'string' ? "2.15.14" : null;
+var version = typeof "2.15.17" === 'string' ? "2.15.17" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 var topoDebug = {};
 window.topoDebug = topoDebug;

package/package.json

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