@riil-frontend/component-topology 2.15.41 → 2.15.44

package/es/common/components/ColorPicker/ColorPicker.js

@@ -21,9 +21,11 @@ var ColorPicker = /*#__PURE__*/function (_Component) {
       var _this$props = _this.props,
           prevValue = _this$props.value,
           onChange = _this$props.onChange;
+      var value = color.hex; // const rgb = color.rgb;
+      // const rgba = `rgba(${rgb.r},${rgb.g},${rgb.b},${rgb.a})`
 
-      if (prevValue !== color.hex) {
-        onChange(color.hex);
+      if (value !== prevValue) {
+        onChange(value);
       }
     };
 
@@ -58,6 +60,7 @@ var ColorPicker = /*#__PURE__*/function (_Component) {
     }, /*#__PURE__*/React.createElement(SketchPicker, {
       color: value // width={230}
       ,
+      disableAlpha: true,
       styles: {
         'default': {
           picker: {

package/es/core/editor/components/BackgroundView/index.js

@@ -1,11 +1,11 @@
 import _Message from "@alifd/next/es/message";
 import _Loading from "@alifd/next/es/loading";
 import _extends from "@babel/runtime/helpers/extends";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _Dialog from "@alifd/next/es/dialog";
 import _Tag from "@alifd/next/es/tag";
 import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
-import _Dialog from "@alifd/next/es/dialog";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useState } from 'react';
 import styles from "./index.module.scss";
@@ -21,20 +21,56 @@ function List(props) {
       dataSource = props.dataSource,
       onRemove = props.onRemove;
 
-  function remove(e, id) {
-    e.stopPropagation();
-
-    _Dialog.confirm({
-      title: '删除',
-      messageProps: {
-        type: 'warning'
-      },
-      content: '若执行相关操作，此背景将会从背景库删除，确定删除吗？',
-      onOk: function onOk() {
-        return onRemove(id);
-      },
-      onCancel: function onCancel() {}
-    });
+  function remove(_x, _x2) {
+    return _remove.apply(this, arguments);
+  }
+
+  function _remove() {
+    _remove = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(e, id) {
+      var canDelete;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              e.stopPropagation();
+              _context.next = 3;
+              return api.canDeleteBackground(id);
+
+            case 3:
+              canDelete = _context.sent;
+              console.log('canDelete', canDelete);
+
+              if (canDelete) {
+                _Dialog.confirm({
+                  title: '删除',
+                  messageProps: {
+                    type: 'warning'
+                  },
+                  content: '若执行相关操作，此背景将会从背景库删除，确定删除吗？',
+                  onOk: function onOk() {
+                    return onRemove(id);
+                  }
+                });
+              } else {
+                _Dialog.confirm({
+                  title: '提示',
+                  messageProps: {
+                    type: 'warning'
+                  },
+                  content: '此背景被占用，不能删除。',
+                  footerActions: ['ok'],
+                  onOk: function onOk() {}
+                });
+              }
+
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _remove.apply(this, arguments);
   }
 
   return /*#__PURE__*/React.createElement("div", {
@@ -95,46 +131,46 @@ export default function BackgroundView(props) {
   }
 
   function _getBackground() {
-    _getBackground = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    _getBackground = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
       var res;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
-              _context2.next = 2;
+              _context3.next = 2;
               return api.getBackgroundList();
 
             case 2:
-              res = _context2.sent;
+              res = _context3.sent;
               setBgList(res);
 
             case 4:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return _getBackground.apply(this, arguments);
   }
 
-  function removeBg(_x) {
+  function removeBg(_x3) {
     return _removeBg.apply(this, arguments);
   } // 同步拓扑图展示
 
 
   function _removeBg() {
-    _removeBg = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
+    _removeBg = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id) {
       var res;
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.next = 2;
+              _context4.next = 2;
               return api.deleteBackground(id);
 
             case 2:
-              res = _context3.sent;
+              res = _context4.sent;
 
               // 删除当前选中
               if (id === (current === null || current === void 0 ? void 0 : current.id)) {
@@ -148,10 +184,10 @@ export default function BackgroundView(props) {
 
             case 6:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return _removeBg.apply(this, arguments);
   }
@@ -161,46 +197,46 @@ export default function BackgroundView(props) {
   }
 
   var handleSelect = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(currentBg) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(currentBg) {
       var imgUrl, size;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               if (!(currentBg !== null && currentBg !== void 0 && currentBg.id && currentBg.id !== (current === null || current === void 0 ? void 0 : current.id))) {
-                _context.next = 16;
+                _context2.next = 16;
                 break;
               }
 
               setLoadingBackground(true);
               imgUrl = getBackgroundImageUrl(currentBg);
-              _context.prev = 3;
-              _context.next = 6;
+              _context2.prev = 3;
+              _context2.next = 6;
               return getImageSize(imgUrl);
 
             case 6:
-              size = _context.sent;
+              size = _context2.sent;
               rlog.debug('获取图片大小', size);
               setBackground(_extends({}, currentBg, size));
               topo.getHtTopo().setBackgroundImgUrl(imgUrl, size.width, size.height);
               setLoadingBackground(false);
-              _context.next = 16;
+              _context2.next = 16;
               break;
 
             case 13:
-              _context.prev = 13;
-              _context.t0 = _context["catch"](3);
+              _context2.prev = 13;
+              _context2.t0 = _context2["catch"](3);
               setLoadingBackground(false);
 
             case 16:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, null, [[3, 13]]);
+      }, _callee2, null, [[3, 13]]);
     }));
 
-    return function handleSelect(_x2) {
+    return function handleSelect(_x4) {
       return _ref.apply(this, arguments);
     };
   }();

package/es/core/editor/components/settings/propertyViews/node/NodePropertyView.js

@@ -5,7 +5,7 @@ import _Field from "@alifd/next/es/field";
 import _extends from "@babel/runtime/helpers/extends";
 import _Collapse from "@alifd/next/es/collapse";
 import _Select from "@alifd/next/es/select";
-import React, { useState, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import NodeSizeInput from "../../common/NodeSizeInput/NodeSizeInput";
 import textStyles from "../../../../../common/text.module.scss";
 import NodeIconSelect from "./NodeIconSelect";
@@ -73,8 +73,9 @@ export default function NodePropertyView(props) {
   };
 
   var handleBindTopoChange = function handleBindTopoChange(value, data) {
-    // 设置名称为拓扑名称
-    node.a('name', data.label); // node.a('customName', null);
+    // 设置名称为拓扑名称，清空自定义名称
+    node.a('name', data.label);
+    node.a('customName', null);
   };
 
   var renderData = function renderData() {

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "2.15.41" === 'string' ? "2.15.41" : null;
+var version = typeof "2.15.44" === 'string' ? "2.15.44" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/services/background.js

@@ -107,5 +107,30 @@ export default {
   /**
    * 背景图导出
    */
-  EXPORT_BG_ZIP: EXPORT_BG_ZIP
+  EXPORT_BG_ZIP: EXPORT_BG_ZIP,
+
+  /**
+   * 校验背景图是否被占用
+   * @param {*} params id
+   */
+  canDeleteBackground: function canDeleteBackground(id) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return getRequest()("/topo/v1/api/background/" + id);
+
+            case 2:
+              return _context4.abrupt("return", _context4.sent);
+
+            case 3:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee4);
+    }))();
+  }
 };

package/lib/common/components/ColorPicker/ColorPicker.js

@@ -37,9 +37,11 @@ var ColorPicker = /*#__PURE__*/function (_Component) {
       var _this$props = _this.props,
           prevValue = _this$props.value,
           onChange = _this$props.onChange;
+      var value = color.hex; // const rgb = color.rgb;
+      // const rgba = `rgba(${rgb.r},${rgb.g},${rgb.b},${rgb.a})`
 
-      if (prevValue !== color.hex) {
-        onChange(color.hex);
+      if (value !== prevValue) {
+        onChange(value);
       }
     };
 
@@ -76,6 +78,7 @@ var ColorPicker = /*#__PURE__*/function (_Component) {
     }, /*#__PURE__*/_react["default"].createElement(_reactColor.SketchPicker, {
       color: value // width={230}
       ,
+      disableAlpha: true,
       styles: {
         'default': {
           picker: {

package/lib/core/editor/components/BackgroundView/index.js

@@ -13,7 +13,7 @@ var _loading = _interopRequireDefault(require("@alifd/next/lib/loading"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 
 var _tag = _interopRequireDefault(require("@alifd/next/lib/tag"));
 
@@ -21,7 +21,7 @@ var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
-var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -47,20 +47,56 @@ function List(props) {
       dataSource = props.dataSource,
       onRemove = props.onRemove;
 
-  function remove(e, id) {
-    e.stopPropagation();
-
-    _dialog["default"].confirm({
-      title: '删除',
-      messageProps: {
-        type: 'warning'
-      },
-      content: '若执行相关操作，此背景将会从背景库删除，确定删除吗？',
-      onOk: function onOk() {
-        return onRemove(id);
-      },
-      onCancel: function onCancel() {}
-    });
+  function remove(_x, _x2) {
+    return _remove.apply(this, arguments);
+  }
+
+  function _remove() {
+    _remove = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(e, id) {
+      var canDelete;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              e.stopPropagation();
+              _context.next = 3;
+              return _background["default"].canDeleteBackground(id);
+
+            case 3:
+              canDelete = _context.sent;
+              console.log('canDelete', canDelete);
+
+              if (canDelete) {
+                _dialog["default"].confirm({
+                  title: '删除',
+                  messageProps: {
+                    type: 'warning'
+                  },
+                  content: '若执行相关操作，此背景将会从背景库删除，确定删除吗？',
+                  onOk: function onOk() {
+                    return onRemove(id);
+                  }
+                });
+              } else {
+                _dialog["default"].confirm({
+                  title: '提示',
+                  messageProps: {
+                    type: 'warning'
+                  },
+                  content: '此背景被占用，不能删除。',
+                  footerActions: ['ok'],
+                  onOk: function onOk() {}
+                });
+              }
+
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _remove.apply(this, arguments);
   }
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -121,46 +157,46 @@ function BackgroundView(props) {
   }
 
   function _getBackground() {
-    _getBackground = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    _getBackground = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       var res;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
-              _context2.next = 2;
+              _context3.next = 2;
               return _background["default"].getBackgroundList();
 
             case 2:
-              res = _context2.sent;
+              res = _context3.sent;
               setBgList(res);
 
             case 4:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return _getBackground.apply(this, arguments);
   }
 
-  function removeBg(_x) {
+  function removeBg(_x3) {
     return _removeBg.apply(this, arguments);
   } // 同步拓扑图展示
 
 
   function _removeBg() {
-    _removeBg = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
+    _removeBg = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(id) {
       var res;
-      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:
-              _context3.next = 2;
+              _context4.next = 2;
               return _background["default"].deleteBackground(id);
 
             case 2:
-              res = _context3.sent;
+              res = _context4.sent;
 
               // 删除当前选中
               if (id === (current === null || current === void 0 ? void 0 : current.id)) {
@@ -174,10 +210,10 @@ function BackgroundView(props) {
 
             case 6:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return _removeBg.apply(this, arguments);
   }
@@ -187,48 +223,48 @@ function BackgroundView(props) {
   }
 
   var handleSelect = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(currentBg) {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(currentBg) {
       var imgUrl, size;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               if (!(currentBg !== null && currentBg !== void 0 && currentBg.id && currentBg.id !== (current === null || current === void 0 ? void 0 : current.id))) {
-                _context.next = 16;
+                _context2.next = 16;
                 break;
               }
 
               setLoadingBackground(true);
               imgUrl = (0, _backgroundUtil.getBackgroundImageUrl)(currentBg);
-              _context.prev = 3;
-              _context.next = 6;
+              _context2.prev = 3;
+              _context2.next = 6;
               return (0, _imageUtil.getImageSize)(imgUrl);
 
             case 6:
-              size = _context.sent;
+              size = _context2.sent;
 
               _rlog["default"].debug('获取图片大小', size);
 
               setBackground((0, _extends2["default"])({}, currentBg, size));
               topo.getHtTopo().setBackgroundImgUrl(imgUrl, size.width, size.height);
               setLoadingBackground(false);
-              _context.next = 16;
+              _context2.next = 16;
               break;
 
             case 13:
-              _context.prev = 13;
-              _context.t0 = _context["catch"](3);
+              _context2.prev = 13;
+              _context2.t0 = _context2["catch"](3);
               setLoadingBackground(false);
 
             case 16:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, null, [[3, 13]]);
+      }, _callee2, null, [[3, 13]]);
     }));
 
-    return function handleSelect(_x2) {
+    return function handleSelect(_x4) {
       return _ref.apply(this, arguments);
     };
   }();

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

@@ -99,8 +99,9 @@ function NodePropertyView(props) {
   };
 
   var handleBindTopoChange = function handleBindTopoChange(value, data) {
-    // 设置名称为拓扑名称
-    node.a('name', data.label); // node.a('customName', null);
+    // 设置名称为拓扑名称，清空自定义名称
+    node.a('name', data.label);
+    node.a('customName', null);
   };
 
   var renderData = function renderData() {

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.41" === 'string' ? "2.15.41" : null;
+var version = typeof "2.15.44" === 'string' ? "2.15.44" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/services/background.js

@@ -117,6 +117,31 @@ var _default = {
   /**
    * 背景图导出
    */
-  EXPORT_BG_ZIP: EXPORT_BG_ZIP
+  EXPORT_BG_ZIP: EXPORT_BG_ZIP,
+
+  /**
+   * 校验背景图是否被占用
+   * @param {*} params id
+   */
+  canDeleteBackground: function canDeleteBackground(id) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return (0, _request.getRequest)()("/topo/v1/api/background/" + id);
+
+            case 2:
+              return _context4.abrupt("return", _context4.sent);
+
+            case 3:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee4);
+    }))();
+  }
 };
 exports["default"] = _default;

package/package.json

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