@riil-frontend/component-topology 11.0.33 → 11.0.35

package/es/components/MultiResourceDrawer/index.js

@@ -4,6 +4,8 @@ import React, { useRef } from 'react';
 import NetworkTopoResourceSelectDrawer from "../NetworkTopoResourceSelectDrawer";
 
 var MultiResourceDrawer = function MultiResourceDrawer(props) {
+  var _ref;
+
   var visible = props.visible,
       mode = props.mode,
       initialData = props.initialData,
@@ -11,36 +13,30 @@ var MultiResourceDrawer = function MultiResourceDrawer(props) {
       onSave = props.onSave,
       onClose = props.onClose;
 
-  var onDrawerSave = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
+  var onDrawerSave = function onDrawerSave(_x) {
+    return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
       var result;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              result = selected;
-
-              if (mode === 'all') {
-                result = {
-                  "static": [].concat(initialData["static"], selected)
-                };
-              }
-
-              _context.next = 4;
-              return onSave(result);
-
-            case 4:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            result = selected;
+
+            if (mode === 'all') {
+              result = {
+                "static": [].concat(initialData["static"], selected)
+              };
+            }
+
+            _context.next = 4;
+            return onSave(result);
+
+          case 4:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function onDrawerSave(_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   return /*#__PURE__*/React.createElement(NetworkTopoResourceSelectDrawer, {
     visible: visible,

package/es/components/ResourceList/ResourceSelect.js

@@ -1,4 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+
+var _ref;
+
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useImperativeHandle } from 'react';
 import _ from 'lodash';
@@ -15,73 +18,67 @@ import styles from "./ResourceSelect.module.scss";
 import { RESOURCE_LIMIT_TYPES } from "../../constants/ResourceTypeLimit";
 var PRIMARY_KEY = 'id';
 
-var getTableData = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
+var getTableData = function getTableData(_x) {
+  return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
     var _params$current, current, _params$pageSize, pageSize, _params$sortBy, sortBy, _params$sortOrder, sortOrder, like, typeCode, condition, ciType, data, dataSource;
 
     return _regeneratorRuntime.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('" + 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('" + 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 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", formatDataForTable(dataSource, data.totalRecord, data.pageIndex, data.pageSize));
-
-          case 9:
-          case "end":
-            return _context.stop();
-        }
+          }
+
+          _context.next = 6;
+          return 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", 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/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -15,6 +15,8 @@ import styles from "./ResourceSelectDrawer.module.scss";
  */
 
 function ResourceSelectDrawer(props) {
+  var _ref;
+
   var visible = props.visible,
       title = props.title,
       selectionMode = props.selectionMode,
@@ -36,49 +38,43 @@ function ResourceSelectDrawer(props) {
     }
   }, [visible]);
 
-  var handleOk = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var handleOk = function handleOk() {
+    return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var selected, shouldClose;
       return _regeneratorRuntime.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);
+        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;
+          case 5:
+            shouldClose = _context.sent;
 
-              if (shouldClose !== false) {
-                onClose();
-              } else {
-                setLoading(false);
-              }
+            if (shouldClose !== false) {
+              onClose();
+            } else {
+              setLoading(false);
+            }
 
-              _context.next = 13;
-              break;
+            _context.next = 13;
+            break;
 
-            case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](1);
-              setLoading(false);
-              rlog.error('ResourceSelectDrawer.handleOk', _context.t0);
+          case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](1);
+            setLoading(false);
+            rlog.error('ResourceSelectDrawer.handleOk', _context.t0);
 
-            case 13:
-            case "end":
-              return _context.stop();
-          }
+          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/es/components/SingleResourceDrawer/SelectDrawer.js

@@ -5,42 +5,38 @@ import React, { useRef } from 'react';
 import ResourceSelectDrawer from "../NetworkTopoResourceSelectDrawer";
 
 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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
+  var onDrawerSave = function onDrawerSave(_x) {
+    return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (selected.length) {
-                _context.next = 3;
-                break;
-              }
-
-              _Message.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.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.createElement(ResourceSelectDrawer, {
     visible: visible,

package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -8,6 +8,8 @@ import Drawer from "../../../components/Drawer";
 import DisplaySetting from "./DisplaySetting";
 import useDisplaySetting from "./hooks/useDisplaySetting";
 export default function DisplaySettingDrawer(props) {
+  var _ref;
+
   var visible = props.visible,
       topo = props.topo,
       displaySettingProps = props.displaySettingProps,
@@ -25,48 +27,42 @@ export default function DisplaySettingDrawer(props) {
     isEditor: isEditor
   }));
 
-  var handleOk = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var handleOk = function handleOk() {
+    return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              setLoading(true);
-              _context.prev = 1;
-              _context.next = 4;
-              return displaySetting.save();
+        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();
+          case 4:
+            setLoading(false);
+            onClose();
 
-              if (!isEditor) {
-                _Message.success('保存成功');
-              }
+            if (!isEditor) {
+              _Message.success('保存成功');
+            }
 
-              _context.next = 14;
-              break;
+            _context.next = 14;
+            break;
 
-            case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](1);
-              setLoading(false);
-              rlog.error('DisplaySettingDrawer.handleOk', _context.t0);
+          case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](1);
+            setLoading(false);
+            rlog.error('DisplaySettingDrawer.handleOk', _context.t0);
 
-              _Message.warning('保存失败');
+            _Message.warning('保存失败');
 
-            case 14:
-            case "end":
-              return _context.stop();
-          }
+          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;
   return /*#__PURE__*/React.createElement(Drawer, {