@riil-frontend/component-topology 2.15.16 → 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/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/models/AttributeMetricDisplay.js

@@ -486,7 +486,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }()
   /**
    * 临时由前端翻译引用属性名称
-   * @param {*} ciDatas 
+   * @param {array} ciDatas 
    * @returns 
    */
   ;
@@ -526,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', {
@@ -559,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.16" === 'string' ? "2.15.16" : 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/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/models/AttributeMetricDisplay.js

@@ -505,7 +505,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }()
   /**
    * 临时由前端翻译引用属性名称
-   * @param {*} ciDatas 
+   * @param {array} ciDatas 
    * @returns 
    */
   ;
@@ -545,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');
 
@@ -578,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.16" === 'string' ? "2.15.16" : 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.16",
+  "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.16/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.17/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }