@riil-frontend/component-topology 10.0.57 → 10.0.59

package/lib/components/ResourceList/ResourceSelect.js

@@ -35,79 +35,75 @@ var _ResourceSelectModule = _interopRequireDefault(require("./ResourceSelect.mod
 
 var _ResourceTypeLimit = require("../../constants/ResourceTypeLimit");
 
+var _ref;
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 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 PRIMARY_KEY = 'id';
 
-var getTableData = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
+var getTableData = function getTableData(_x) {
+  return (_ref = _ref || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
     var _params$current, current, _params$pageSize, pageSize, _params$sortBy, sortBy, _params$sortOrder, sortOrder, like, typeCode, condition, ciType, data, dataSource;
 
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _params$current = params.current, current = _params$current === void 0 ? 1 : _params$current, _params$pageSize = params.pageSize, pageSize = _params$pageSize === void 0 ? 20 : _params$pageSize, _params$sortBy = params.sortBy, sortBy = _params$sortBy === void 0 ? 'displayName' : _params$sortBy, _params$sortOrder = params.sortOrder, sortOrder = _params$sortOrder === void 0 ? 'asc' : _params$sortOrder, like = params.like, typeCode = params.typeCode;
-            condition = "type('" + _ResourceTypeLimit.RESOURCE_LIMIT_TYPES.join('\',\'') + "') && category('resource')";
-
-            if (like) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _params$current = params.current, current = _params$current === void 0 ? 1 : _params$current, _params$pageSize = params.pageSize, pageSize = _params$pageSize === void 0 ? 20 : _params$pageSize, _params$sortBy = params.sortBy, sortBy = _params$sortBy === void 0 ? 'displayName' : _params$sortBy, _params$sortOrder = params.sortOrder, sortOrder = _params$sortOrder === void 0 ? 'asc' : _params$sortOrder, like = params.like, typeCode = params.typeCode;
+          condition = "type('" + _ResourceTypeLimit.RESOURCE_LIMIT_TYPES.join('\',\'') + "') && category('resource')";
+
+          if (like) {
+            condition = {
+              conditions: condition,
+              searchValue: like,
+              searchIndexArray: ['display_name', 'ipv4_address']
+            };
+          }
+
+          if (typeCode) {
+            ciType = typeCode.split(',');
+
+            if (typeof condition === 'string') {
               condition = {
                 conditions: condition,
-                searchValue: like,
-                searchIndexArray: ['display_name', 'ipv4_address']
+                ciType: ciType
               };
+            } else {
+              condition.ciType = ciType;
             }
-
-            if (typeCode) {
-              ciType = typeCode.split(',');
-
-              if (typeof condition === 'string') {
-                condition = {
-                  conditions: condition,
-                  ciType: ciType
-                };
-              } else {
-                condition.ciType = ciType;
-              }
-            }
-
-            _context.next = 6;
-            return (0, _cmdb.fetchCommonQuery)(condition, sortBy, sortOrder, current, pageSize, '', {
-              usingExtraConditions: false // 绕过权限过滤
-
-            });
-
-          case 6:
-            data = _context.sent;
-            dataSource = data.content && data.content.map(function (item) {
-              var _item$operation;
-
-              return {
-                id: item.id,
-                displayName: item.attributes.displayName || item.attributes.display_name,
-                ipAddress: item.attributes.ipAddress || item.attributes.ipv4_address,
-                company: item.attributes.company,
-                typeCode: item.typeCode,
-                operation: (_item$operation = item.operation) !== null && _item$operation !== void 0 ? _item$operation : null // 权限字段
-
-              };
-            });
-            return _context.abrupt("return", (0, _format.formatDataForTable)(dataSource, data.totalRecord, data.pageIndex, data.pageSize));
-
-          case 9:
-          case "end":
-            return _context.stop();
-        }
+          }
+
+          _context.next = 6;
+          return (0, _cmdb.fetchCommonQuery)(condition, sortBy, sortOrder, current, pageSize, '', {
+            usingExtraConditions: false // 绕过权限过滤
+
+          });
+
+        case 6:
+          data = _context.sent;
+          dataSource = data.content && data.content.map(function (item) {
+            var _item$operation;
+
+            return {
+              id: item.id,
+              displayName: item.attributes.displayName || item.attributes.display_name,
+              ipAddress: item.attributes.ipAddress || item.attributes.ipv4_address,
+              company: item.attributes.company,
+              typeCode: item.typeCode,
+              operation: (_item$operation = item.operation) !== null && _item$operation !== void 0 ? _item$operation : null // 权限字段
+
+            };
+          });
+          return _context.abrupt("return", (0, _format.formatDataForTable)(dataSource, data.totalRecord, data.pageIndex, data.pageSize));
+
+        case 9:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
-  }));
-
-  return function getTableData(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+  }))).apply(this, arguments);
+};
 
 var ResourceList = function ResourceList(props, ref) {
   var customGetTableData = props.getTableData,

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -33,6 +33,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * @constructor
  */
 function ResourceSelectDrawer(props) {
+  var _ref;
+
   var visible = props.visible,
       title = props.title,
       selectionMode = props.selectionMode,
@@ -54,50 +56,44 @@ function ResourceSelectDrawer(props) {
     }
   }, [visible]);
 
-  var handleOk = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  var handleOk = function handleOk() {
+    return (_ref = _ref || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var selected, shouldClose;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              setLoading(true);
-              _context.prev = 1;
-              selected = resourceSelectRef.current.getSelectedRowKeys();
-              _context.next = 5;
-              return onOk(selectionMode === 'single' ? selected[0] : selected);
-
-            case 5:
-              shouldClose = _context.sent;
-
-              if (shouldClose !== false) {
-                onClose();
-              } else {
-                setLoading(false);
-              }
-
-              _context.next = 13;
-              break;
-
-            case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](1);
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setLoading(true);
+            _context.prev = 1;
+            selected = resourceSelectRef.current.getSelectedRowKeys();
+            _context.next = 5;
+            return onOk(selectionMode === 'single' ? selected[0] : selected);
+
+          case 5:
+            shouldClose = _context.sent;
+
+            if (shouldClose !== false) {
+              onClose();
+            } else {
               setLoading(false);
+            }
+
+            _context.next = 13;
+            break;
 
-              _rlog["default"].error('ResourceSelectDrawer.handleOk', _context.t0);
+          case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](1);
+            setLoading(false);
 
-            case 13:
-            case "end":
-              return _context.stop();
-          }
+            _rlog["default"].error('ResourceSelectDrawer.handleOk', _context.t0);
+
+          case 13:
+          case "end":
+            return _context.stop();
         }
       }, _callee, null, [[1, 9]]);
-    }));
-
-    return function handleOk() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   var finalExcludeIds = [];
 

package/lib/components/SingleResourceDrawer/SelectDrawer.js

@@ -20,42 +20,38 @@ 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 SingleSelectDrawer = function SingleSelectDrawer(props) {
+  var _ref;
+
   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) {
+  var onDrawerSave = function onDrawerSave(_x) {
+    return (_ref = _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();
-          }
+        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);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
     visible: visible,

package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -28,6 +28,8 @@ 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; }
 
 function DisplaySettingDrawer(props) {
+  var _ref;
+
   var visible = props.visible,
       topo = props.topo,
       displaySettingProps = props.displaySettingProps,
@@ -45,49 +47,43 @@ function DisplaySettingDrawer(props) {
     isEditor: isEditor
   }));
 
-  var handleOk = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  var handleOk = function handleOk() {
+    return (_ref = _ref || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              setLoading(true);
-              _context.prev = 1;
-              _context.next = 4;
-              return displaySetting.save();
-
-            case 4:
-              setLoading(false);
-              onClose();
-
-              if (!isEditor) {
-                _message["default"].success('保存成功');
-              }
-
-              _context.next = 14;
-              break;
-
-            case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](1);
-              setLoading(false);
-
-              _rlog["default"].error('DisplaySettingDrawer.handleOk', _context.t0);
-
-              _message["default"].warn('保存失败');
-
-            case 14:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setLoading(true);
+            _context.prev = 1;
+            _context.next = 4;
+            return displaySetting.save();
+
+          case 4:
+            setLoading(false);
+            onClose();
+
+            if (!isEditor) {
+              _message["default"].success('保存成功');
+            }
+
+            _context.next = 14;
+            break;
+
+          case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](1);
+            setLoading(false);
+
+            _rlog["default"].error('DisplaySettingDrawer.handleOk', _context.t0);
+
+            _message["default"].warn('保存失败');
+
+          case 14:
+          case "end":
+            return _context.stop();
         }
       }, _callee, null, [[1, 9]]);
-    }));
-
-    return function handleOk() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   var DisplaySettingWidget = displaySettingRender || _DisplaySetting["default"];
   return /*#__PURE__*/_react["default"].createElement(_Drawer["default"], {

package/lib/core/components/DisplaySettingDrawer/ResourceDisplay/useElementTagTipConfig.js

@@ -10,6 +10,8 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 function _default() {
+  var _ref, _ref2, _ref3, _ref4;
+
   var a = {
     nodeTag: {
       name: 'nodeTag',
@@ -30,123 +32,99 @@ function _default() {
    * 获取节点
    */
 
-  var getNodeCiTypes = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  var getNodeCiTypes = function getNodeCiTypes() {
+    return (_ref = _ref || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              return _context.abrupt("return", [{
-                typeCode: 'switch',
-                typeName: '交换机'
-              }]);
-
-            case 1:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            return _context.abrupt("return", [{
+              typeCode: 'switch',
+              typeName: '交换机'
+            }]);
+
+          case 1:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function getNodeCiTypes() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
-  var getNodeBasicCiTypeOptions = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+  var getNodeBasicCiTypeOptions = function getNodeBasicCiTypeOptions() {
+    return (_ref2 = _ref2 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              return _context2.abrupt("return", [{
-                typeCode: 'switch',
-                typeName: '',
-                options: [{
-                  value: 'typeCode',
-                  label: '资源类型'
-                } // 属性
-                // 指标
-                ]
-              }]);
-
-            case 1:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            return _context2.abrupt("return", [{
+              typeCode: 'switch',
+              typeName: '',
+              options: [{
+                value: 'typeCode',
+                label: '资源类型'
+              } // 属性
+              // 指标
+              ]
+            }]);
+
+          case 1:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
-    }));
-
-    return function getNodeBasicCiTypeOptions() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
-  var getNodeTagCiTypeOptions = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+  var getNodeTagCiTypeOptions = function getNodeTagCiTypeOptions() {
+    return (_ref3 = _ref3 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              return _context3.abrupt("return", [{
-                typeCode: 'switch',
-                typeName: '',
-                options: [{
-                  value: 'graph:name',
-                  label: '图片名称'
-                }, {
-                  value: 'typeCode',
-                  label: '资源类型'
-                } // 属性
-                // 指标
-                ]
-              }]);
-
-            case 1:
-            case "end":
-              return _context3.stop();
-          }
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            return _context3.abrupt("return", [{
+              typeCode: 'switch',
+              typeName: '',
+              options: [{
+                value: 'graph:name',
+                label: '图片名称'
+              }, {
+                value: 'typeCode',
+                label: '资源类型'
+              } // 属性
+              // 指标
+              ]
+            }]);
+
+          case 1:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3);
-    }));
-
-    return function getNodeTagCiTypeOptions() {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
-  var getNodeTipCiTypeOptions = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+  var getNodeTipCiTypeOptions = function getNodeTipCiTypeOptions() {
+    return (_ref4 = _ref4 || (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:
-              return _context4.abrupt("return", [{
-                typeCode: 'switch',
-                typeName: '',
-                options: [{
-                  value: 'graph:name',
-                  label: '图片名称'
-                }, {
-                  value: 'typeCode',
-                  label: '资源类型'
-                } // 属性
-                // 指标
-                ]
-              }]);
-
-            case 1:
-            case "end":
-              return _context4.stop();
-          }
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            return _context4.abrupt("return", [{
+              typeCode: 'switch',
+              typeName: '',
+              options: [{
+                value: 'graph:name',
+                label: '图片名称'
+              }, {
+                value: 'typeCode',
+                label: '资源类型'
+              } // 属性
+              // 指标
+              ]
+            }]);
+
+          case 1:
+          case "end":
+            return _context4.stop();
         }
       }, _callee4);
-    }));
-
-    return function getNodeTipCiTypeOptions() {
-      return _ref4.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 }