@riil-frontend/component-topology 2.15.22 → 2.15.23

package/es/topoCenter/components/TopoView.js

@@ -2,8 +2,8 @@ import _Loading from "@alifd/next/es/loading";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["topo", "titleBar", "onEnterEdit"];
-import React, { useState, useEffect, useRef, useCallback } from 'react';
-import NodataPage from '@riil-frontend/component-topology-common/es/components/NoDataPage/index';
+import React, { useState, useEffect, useRef, useCallback } from "react";
+import NodataPage from "@riil-frontend/component-topology-common/es/components/NoDataPage/index";
 import BasicTopoView from "../../core/components/TopoView";
 import topoPermissonUtil from "../../utils/topoPermissionUtil";
 import Topo404 from "./Topo404";
@@ -20,7 +20,7 @@ function NetworkTopology(props) {
       onEnterEdit = props.onEnterEdit,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
-  var topoState = topo.store.useModelState('topoMod');
+  var topoState = topo.store.useModelState("topoMod");
   var loading = topoState.loading,
       topoId = topoState.topoId,
       topoData = topoState.topoData,
@@ -30,7 +30,8 @@ function NetworkTopology(props) {
     var viewerProps = _extends({}, props.viewerProps, {
       showLinkConfig: true,
       // 是否显示链路相关配置
-      plugins: [AlarmListPanel]
+      AlarmListPanel: AlarmListPanel,
+      plugins: []
     });
 
     return /*#__PURE__*/React.createElement(BasicTopoView, _extends({}, otherProps, {
@@ -69,9 +70,9 @@ function NetworkTopology(props) {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: styles['topo-center-view']
+    className: styles["topo-center-view"]
   }, /*#__PURE__*/React.createElement(_Loading, {
-    className: styles['topo-center-mask-loading'],
+    className: styles["topo-center-mask-loading"],
     visible: loading
   }, renderContent()));
 }

package/lib/core/components/AlarmListPanel/index.js

@@ -5,8 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
-
 var _list = _interopRequireDefault(require("@alifd/next/lib/list"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -21,6 +19,8 @@ var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var _mocks = require("./mocks");
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 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; }
@@ -29,18 +29,16 @@ function AlarmListPanel(props, ref) {
   // 传入参数
   var topo = props.topo,
       target = props.toolBarRef,
+      titleBarRef = props.titleBarRef,
       visible = props.visible;
-  var alarm = topo.alarm;
 
   var _useState = (0, _react.useState)([]),
       alarmList = _useState[0],
       setAlarmList = _useState[1];
 
-  var _topo$store$useModel = topo.store.useModel('topoAlarm'),
+  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
       alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1]; // const [topoState, topoDispatchers] = store.useModel('topoMod');
-  // const{  alarmPanelIsOpen }  = store.getState().topoMod;
-
+      alarmDispatchers = _topo$store$useModel[1];
 
   var alarmData = alarmState.alarmData,
       alarmPanelIsOpen = alarmState.alarmPanelIsOpen,
@@ -52,42 +50,20 @@ function AlarmListPanel(props, ref) {
   };
 
   (0, _react.useEffect)(function () {
-    // console.log(
-    //   "AlarmListPanel-useEffect",
-    //   topo,
-    //   alarmPanelIsOpen,
-    //   alarmIsOpened,
-    //   alarmData,
-    //   alarmList
-    // );
     if (alarmData) {
       var _alarmData$slice;
 
-      topo.alarm.switchAlarmPopPanel(alarmIsOpened && (alarmData === null || alarmData === void 0 ? void 0 : alarmData.length) > 0);
-      setAlarmList((_alarmData$slice = alarmData === null || alarmData === void 0 ? void 0 : alarmData.slice(0, 10)) !== null && _alarmData$slice !== void 0 ? _alarmData$slice : []); // setAlarmList(alarmListDemo);
+      _rlog["default"].debug("AlarmListPanel-useEffect", alarmIsOpened); // topo.alarm.switchAlarmPopPanel(alarmIsOpened && alarmData?.length > 0);
+
+
+      setAlarmList((_alarmData$slice = alarmData === null || alarmData === void 0 ? void 0 : alarmData.slice(0, 10)) !== null && _alarmData$slice !== void 0 ? _alarmData$slice : []);
     } else {
       setAlarmList([]);
     }
   }, [alarmData]);
-  return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
+  return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].AlarmListPanel,
-    id: "AlarmListPanel",
-    align: false,
-    top: 100,
-    overlayProps: {
-      style: {
-        right: 15,
-        top: 100
-      },
-      target: {
-        target: target
-      }
-    },
-    onClose: onClose,
-    hasMask: false,
-    closeMode: "close",
-    visible: alarmPanelIsOpen,
-    footer: false
+    id: "AlarmListPanel"
   }, /*#__PURE__*/_react["default"].createElement(_list["default"], {
     header: /*#__PURE__*/_react["default"].createElement("div", {
       style: {
@@ -98,7 +74,14 @@ function AlarmListPanel(props, ref) {
     }, "\u5173\u8054\u544A\u8B66\u4FE1\u606F"), /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
       className: _indexModule["default"].listTitleLink,
       to: "/default/alarmCenter/alarmList"
-    }, "\u67E5\u770B\u6240\u6709\u544A\u8B66")),
+    }, "\u67E5\u770B\u6240\u6709\u544A\u8B66"), /*#__PURE__*/_react["default"].createElement("a", {
+      role: "button",
+      "aria-label": "\u5173\u95ED",
+      className: "next-dialog-close",
+      onClick: onClose
+    }, /*#__PURE__*/_react["default"].createElement("i", {
+      className: "next-icon next-icon-close next-medium next-dialog-close-icon"
+    }))),
     dataSource: alarmList,
     emptyContent: /*#__PURE__*/_react["default"].createElement(_componentNoDataPage["default"], {
       className: _indexModule["default"].emptyContent,

package/lib/core/components/TopoView/topoView.js

@@ -93,6 +93,7 @@ var TopoView = function TopoView(props) {
       tData = _useState[0],
       setTData = _useState[1];
 
+  var titleBarRef = (0, _react.useRef)();
   var topoEdit = (0, _useTopoEdit["default"])({
     topo: topo,
     topoId: topoId,
@@ -300,6 +301,7 @@ var TopoView = function TopoView(props) {
   }), isEditMode && /*#__PURE__*/_react["default"].createElement(_EditorPlugin["default"], {
     topo: topo,
     topoEdit: topoEdit,
+    titleBarRef: titleBarRef,
     topoContext: {
       urlParams: urlParams
     },

package/lib/core/components/titlebar/TitleBar.js

@@ -30,11 +30,11 @@ function TitleBar(props) {
       otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
   var store = topo.store;
 
-  var _store$useModel = store.useModel('topoMod'),
+  var _store$useModel = store.useModel("topoMod"),
       topoState = _store$useModel[0];
 
   var viewState = topoState.viewState;
-  var isEditMode = viewState === 'edit';
+  var isEditMode = viewState === "edit";
 
   if (render) {
     return render({

package/lib/core/models/Alarm.js

@@ -237,12 +237,13 @@ var Alarm = /*#__PURE__*/function () {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              topoDispatchers = this.store.getModelDispatchers('topoAlarm');
+              console.log("switchAlarmPopPanel", flag);
+              topoDispatchers = this.topo.store.getModelDispatchers("topoAlarm");
               topoDispatchers.update({
                 alarmPanelIsOpen: flag
               });
 
-            case 2:
+            case 3:
             case "end":
               return _context3.stop();
           }
@@ -385,35 +386,13 @@ var Alarm = /*#__PURE__*/function () {
    * 打开\关闭告警列表弹窗
    *
    */
-  ;
-
-  _proto.switchAlarmPopPanel =
-  /*#__PURE__*/
-  function () {
-    var _switchAlarmPopPanel2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(flag) {
-      return _regenerator["default"].wrap(function _callee6$(_context6) {
-        while (1) {
-          switch (_context6.prev = _context6.next) {
-            case 0:
-              console.log("switchAlarmPopPanel", flag);
-              this.updateState({
-                alarmPanelIsOpen: flag
-              });
-
-            case 2:
-            case "end":
-              return _context6.stop();
-          }
-        }
-      }, _callee6, this);
-    }));
+  // async switchAlarmPopPanel(flag) {
+  //   console.log("switchAlarmPopPanel", flag);
+  //   this.updateState({
+  //     alarmPanelIsOpen: flag,
+  //   });
+  // }
 
-    function switchAlarmPopPanel(_x5) {
-      return _switchAlarmPopPanel2.apply(this, arguments);
-    }
-
-    return switchAlarmPopPanel;
-  }()
   /**
    * 当资源变化时，需要刷新。
    */
@@ -422,22 +401,22 @@ var Alarm = /*#__PURE__*/function () {
   _proto.restart =
   /*#__PURE__*/
   function () {
-    var _restart = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
+    var _restart = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
       var id;
-      return _regenerator["default"].wrap(function _callee7$(_context7) {
+      return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
               id = this.currentTopoId;
-              _context7.next = 3;
+              _context6.next = 3;
               return this.openTopoAlarm(id);
 
             case 3:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
         }
-      }, _callee7, this);
+      }, _callee6, this);
     }));
 
     function restart() {
@@ -455,12 +434,12 @@ var Alarm = /*#__PURE__*/function () {
   _proto.getAlarmByEE =
   /*#__PURE__*/
   function () {
-    var _getAlarmByEE = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(alertData) {
+    var _getAlarmByEE = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(alertData) {
       var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist;
 
-      return _regenerator["default"].wrap(function _callee8$(_context8) {
+      return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
               resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
@@ -470,7 +449,7 @@ var Alarm = /*#__PURE__*/function () {
               console.log("getAlarmByEE-接收到推送的原始告警信息", alertData);
 
               if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
-                _context8.next = 25;
+                _context7.next = 25;
                 break;
               }
 
@@ -503,20 +482,20 @@ var Alarm = /*#__PURE__*/function () {
               }); // rlog.debug("before-combAlarmData", al, bizState);
 
               if (!(sendAl.length > 0)) {
-                _context8.next = 25;
+                _context7.next = 25;
                 break;
               }
 
               _rlog["default"].debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
 
-              _context8.prev = 13;
-              _context8.next = 16;
+              _context7.prev = 13;
+              _context7.next = 16;
               return alarmDispatchers.combAlarmData({
                 alarmdata: sendAl
               });
 
             case 16:
-              _yield$alarmDispatche = _context8.sent;
+              _yield$alarmDispatche = _context7.sent;
               eqFlag = _yield$alarmDispatche.eqFlag;
               alarmlist = _yield$alarmDispatche.alarmlist;
 
@@ -525,24 +504,24 @@ var Alarm = /*#__PURE__*/function () {
                 this.hmGetTopoAlarm();
               }
 
-              _context8.next = 25;
+              _context7.next = 25;
               break;
 
             case 22:
-              _context8.prev = 22;
-              _context8.t0 = _context8["catch"](13);
+              _context7.prev = 22;
+              _context7.t0 = _context7["catch"](13);
 
-              _rlog["default"].error("告警发送异常", _context8.t0);
+              _rlog["default"].error("告警发送异常", _context7.t0);
 
             case 25:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
         }
-      }, _callee8, this, [[13, 22]]);
+      }, _callee7, this, [[13, 22]]);
     }));
 
-    function getAlarmByEE(_x6) {
+    function getAlarmByEE(_x5) {
       return _getAlarmByEE.apply(this, arguments);
     }
 

package/lib/core/models/AttributeMetricDisplay.js

@@ -530,20 +530,29 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                     attributeMap = ciData.attributeMap;
                 ciRefAttributeMap[id] = [];
 
-                _this5.topo.ciTyeCache.getCiType(ciType).attributes.filter(function (attributeMeta) {
-                  return !!attributeMeta.refCi;
-                }).forEach(function (attributeMeta) {
-                  var refId = attributeMap[attributeMeta.code];
-
-                  if (refId && !refIdMap[refId]) {
-                    refIdMap[refId] = true;
-                  }
-
-                  ciRefAttributeMap[id].push({
-                    attrCode: attributeMeta.code,
-                    id: refId
+                var ciTypeMeta = _this5.topo.ciTyeCache.getCiType(ciType);
+
+                if (ciTypeMeta) {
+                  ciTypeMeta.attributes.filter(function (attributeMeta) {
+                    return !!attributeMeta.refCi;
+                  }).forEach(function (attributeMeta) {
+                    var refId = attributeMap[attributeMeta.code];
+
+                    if (refId && !refIdMap[refId]) {
+                      refIdMap[refId] = true;
+                    }
+
+                    ciRefAttributeMap[id].push({
+                      attrCode: attributeMeta.code,
+                      id: refId
+                    });
                   });
-                });
+                } else {
+                  _rlog["default"].warn('推送属性指标数据：未查询到ciType', {
+                    ciData: ciData,
+                    ciType: ciType
+                  });
+                }
               });
               refIds = Object.keys(refIdMap);
 

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.22" === 'string' ? "2.15.22" : null;
+var version = typeof "2.15.23" === 'string' ? "2.15.23" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js

@@ -639,7 +639,7 @@ function ResourceOverview(props) {
   }
 
   var columns = [{
-    title: '事件',
+    title: '描述',
     dataIndex: 'title',
     key: 'title',
     cell: function cell(value, index, record) {

package/lib/core/viewer/components/plugins/BaseInfo/index.js

@@ -123,10 +123,6 @@ function BaseInfo(props) {
       userId = _useState4[0],
       setUserId = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(null),
-      paramData = _useState5[0],
-      setParamData = _useState5[1];
-
   (0, _react.useEffect)(function () {
     var notifier = topo.view.topoClient.notifier;
     notifier.on(_componentTopologyGraph.TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
@@ -143,111 +139,94 @@ function BaseInfo(props) {
   }, []); // 解决切换拓扑图隐藏概览
 
   (0, _react.useEffect)(function () {
-    setVisible(false);
-    setParamData(null); // TODO 其他数据重置
+    setVisible(false); // TODO 其他数据重置
   }, [topoId]);
 
   function getUser() {
     return _getUser.apply(this, arguments);
-  } // function changeOverview (node) {
-  //   const data = node.getAttrObject()
-  //   console.log('单击切换基本信息', data);
-  //   setVisible(prev => {
-  //     prev && openOverview(data)
-  //     return prev
-  //   })
-  // }
-  // function openOverview (data) {
-  //   console.log('双击打开基本信息', data);
-  //   const {
-  //     id,
-  //     name,
-  //     type,
-  //     ciType,
-  //     ciName,
-  //     operation,
-  //   } = data
-  //   // 仅展示资源和链路的概览
-  //   if (!['node', 'link', 'linkGroup'].includes(type)) return
-  //   // 应用拓扑中没有链路详情
-  //   if (topo.options.resourceOverviewDrawer?.getData && type === 'link') return
-  //   // 没有权限不显示
-  //   if (!operation) return
-  //   setActiveData({
-  //     id,
-  //     name,
-  //     type: type === 'linkGroup' ? 'link' : type,
-  //     ciType,
-  //     ciName
-  //   })
-  //   const { metrics } = topo.ciTyeCache.getCiType(ciType)
-  //   topoDispatchers.update({
-  //     id,
-  //     metricCodes: metrics.slice(0, 6).map(item => item.code), // 需要展示的关键指标 code
-  //   })
-  //   setVisible(true)
-  // }
+  } // select切换
 
 
   function _getUser() {
-    _getUser = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var res;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+    _getUser = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              _context.next = 2;
-              return _overview["default"].getUserId();
-
-            case 2:
-              res = _context.sent;
-              setUserId((res === null || res === void 0 ? void 0 : res.user_id) || '');
-
-            case 4:
+              setUserId( /*#__PURE__*/function () {
+                var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(prev) {
+                  var res;
+                  return _regenerator["default"].wrap(function _callee$(_context) {
+                    while (1) {
+                      switch (_context.prev = _context.next) {
+                        case 0:
+                          console.log('获取用户id', prev); // 如果已经获取过，就不再重新获取
+
+                          if (!prev) {
+                            _context.next = 3;
+                            break;
+                          }
+
+                          return _context.abrupt("return", prev);
+
+                        case 3:
+                          _context.next = 5;
+                          return _overview["default"].getUserId();
+
+                        case 5:
+                          res = _context.sent;
+                          return _context.abrupt("return", (res === null || res === void 0 ? void 0 : res.user_id) || '');
+
+                        case 7:
+                        case "end":
+                          return _context.stop();
+                      }
+                    }
+                  }, _callee);
+                }));
+
+                return function (_x) {
+                  return _ref2.apply(this, arguments);
+                };
+              }());
+
+            case 1:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
     return _getUser.apply(this, arguments);
   }
 
   function onChangeActive(activeNode) {
-    console.log('切换基本信息资源', activeNode);
-    activeNode && openOverview((0, _extends2["default"])({}, activeNode, {
+    activeNode && init((0, _extends2["default"])({}, activeNode, {
       type: 'node'
-    }));
-  }
+    }), 'select');
+  } // 单击切换
 
-  (0, _react.useEffect)(function () {
-    (visible || (paramData === null || paramData === void 0 ? void 0 : paramData.isVisible)) && paramData && init(paramData);
-  }, [paramData, visible]);
 
   function changeOverview(node) {
     var data = node.getAttrObject();
-    console.log('单击切换基本信息', data);
-    setParamData(data);
-  }
+    init(data, 'click');
+  } // 双击打开
+
 
   function openOverview(data) {
-    console.log('双击打开基本信息', data);
-    setParamData((0, _extends2["default"])({}, data, {
-      isVisible: true
-    }));
+    init(data, 'doubleClick');
   }
 
-  function init(data) {
+  function init(data, targetType) {
     var _topo$options$resourc;
 
-    console.log('初始化基本信息', data);
+    console.log('初始化基本信息', data, targetType);
     var id = data.id,
         name = data.name,
         type = data.type,
         ciType = data.ciType,
         ciName = data.ciName,
-        operation = data.operation,
-        isVisible = data.isVisible; // 仅展示资源和链路的概览
+        operation = data.operation; // 仅展示资源和链路的概览
 
     if (!['node', 'link', 'linkGroup'].includes(type)) return; // 应用拓扑中没有链路详情
 
@@ -273,9 +252,9 @@ function BaseInfo(props) {
 
     }); // 显示隐藏
 
-    isVisible && setVisible(true); // userId
+    targetType === 'doubleClick' && setVisible(true); // userId
 
-    userId || getUser();
+    getUser();
   }
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_drawer["default"], {
@@ -296,7 +275,7 @@ function BaseInfo(props) {
   }, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
     title: "\u8D44\u6E90\u6982\u89C8",
     key: "1"
-  }, /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
+  }, activeData.id && /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
     userId: userId
   }))))));
 }