@riil-frontend/component-topology 6.0.0-alpha.5 → 6.0.0-alpha.51

package/es/core/editor/store/topoEdit.js

@@ -6,38 +6,48 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * 拓扑编辑 Model
  */
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-export default {
-  // 定义 model 的初始 state
-  state: {
-    saving: false,
-    // 选择/拖动模式模式。默认选择模式 select|move
-    viewMouseMode: 'select',
-    // 资源面板展开项
-    resourceTabactiveKey: null
-  },
-  // 定义改变该模型状态的纯函数
-  reducers: {
-    update: function update(prevState, payload) {
-      return _extends({}, prevState, payload);
-    }
-  },
-  // 定义处理该模型副作用的函数
-  effects: function effects(dispatch) {
-    return {
-      init: function init(payload, rootState) {
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }))();
+var initState = {
+  // 是否就绪
+  ready: false,
+  // 保存状态
+  saving: false,
+  // 选择/拖动模式模式。默认选择模式 select|move
+  viewMouseMode: 'select',
+  // 资源面板展开项
+  resourceTabActiveKey: null,
+  // 属性面板是否显示
+  propertyPanelVisible: false
+};
+export default function (topo) {
+  return {
+    // 定义 model 的初始 state
+    state: initState,
+    // 定义改变该模型状态的纯函数
+    reducers: {
+      update: function update(prevState, payload) {
+        return _extends({}, prevState, payload);
+      },
+      reset: function reset(prevState, payload) {
+        return _extends({}, initState);
       }
-    };
-  }
-};
+    },
+    // 定义处理该模型副作用的函数
+    effects: function effects(dispatch) {
+      return {
+        init: function init(payload, rootState) {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            return _regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }))();
+        }
+      };
+    }
+  };
+}

package/es/core/editor/utils/edgeTypeStyleUtil.js

@@ -0,0 +1,96 @@
+import { getEdges } from "../../../utils/htElementUtils";
+var ht = window.ht;
+export function getEdgesBySelection(topo) {
+  var getChildrenNodeIds = function getChildrenNodeIds(nodes) {
+    var nodeIds = nodes.map(function (node) {
+      return node.getId();
+    });
+    nodes.forEach(function (node) {
+      if (node instanceof ht.Group) {
+        var children = node.getChildren().toArray();
+        nodeIds.push.apply(nodeIds, getChildrenNodeIds(children));
+      }
+    });
+    return nodeIds;
+  };
+
+  var getSelectedEdges = function getSelectedEdges(topo) {
+    var gv = topo.getGraphView();
+    var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
+
+    var edges = selection.filter(function (element) {
+      return element instanceof ht.Edge;
+    }); // 查询选中节点间的连线
+
+    var nodes = selection.filter(function (element) {
+      return element instanceof ht.Node;
+    });
+    var nodeIds = getChildrenNodeIds(nodes);
+    var dm = gv.getDataModel();
+    getEdges(dm).forEach(function (edge) {
+      if (nodeIds.find(function (nodeId) {
+        return nodeId === edge.getSource().getId();
+      }) && nodeIds.find(function (nodeId) {
+        return nodeId === edge.getTarget().getId();
+      }) && !edges.find(function (item) {
+        return item === edge;
+      })) {
+        edges.push(edge);
+      }
+    });
+    return edges;
+  };
+
+  return getSelectedEdges(topo);
+}
+/**
+ * 遍历连线及子连线
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+export function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
+  var htTopo = topo.getHtTopo();
+  edges.forEach(function (edge) {
+    operateEdgeFn(edge);
+
+    if (edge.isEdgeGroupAgent()) {
+      // 连线组折叠时同时设置子连线
+      var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
+      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
+      edgeChildren.forEach(function (edgeChild) {
+        operateEdgeFn(edgeChild);
+      });
+      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
+    }
+  });
+}
+/**
+ * 设置连线及子连线。带回退事务控制
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+export function setEdgesAndChildren(topo, edges, operateEdgeFn) {
+  topo.historyManager.beginTransaction();
+  loopEdgesAndChildren(topo, edges, operateEdgeFn);
+  topo.historyManager.endTransaction();
+}
+/**
+ * 批量设置连线线形
+ * 
+ * @param {*} edges 
+ * @param {*} type 
+ * @param {*} topo 
+ */
+
+export function setEdgesType(edges, type, topo) {
+  var htTopo = topo.getHtTopo();
+  setEdgesAndChildren(topo, edges, function (edge) {
+    htTopo.setGraphLinear(edge, {
+      type: type
+    });
+  });
+}

package/es/core/hooks/useCanvasTheme.js

@@ -0,0 +1,61 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useEffect } from 'react';
+var themeMap = [{
+  name: 'white',
+  label: '白色',
+  color: null,
+  toolsTheme: 'lightgrayblue'
+}, {
+  name: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF',
+  toolsTheme: 'white'
+}, {
+  name: 'yellow',
+  label: '黄色',
+  color: '#FFFDE6'
+}, {
+  name: 'green',
+  label: '绿色',
+  color: '#EAFFE8'
+}, {
+  name: 'dark',
+  label: '深色',
+  color: '#031425',
+  toolsTheme: 'black'
+}].reduce(function (map, item) {
+  var _extends2;
+
+  return _extends({}, map, (_extends2 = {}, _extends2[item.name] = item, _extends2));
+}, {});
+export default function useCanvasTheme(props) {
+  var topo = props.topo,
+      canvasTheme = props.canvasTheme; // 拓扑图是否加载
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded;
+
+  useEffect(function () {
+    // 设置
+    var themeConfig = themeMap[canvasTheme || 'white'];
+
+    if (graphLoaded && themeConfig) {
+      var _topo$historyManager2;
+
+      try {
+        var _topo$historyManager;
+
+        (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '切换主题');
+        topo.getHtTopo().setToolsTheme(themeConfig.toolsTheme);
+        topo.getHtTopo().setTheme(canvasTheme);
+      } catch (error) {
+        console.error('切换主题失败', error);
+      }
+
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '切换主题');
+    }
+  }, [canvasTheme, graphLoaded]);
+  return {
+    canvasColor: themeMap[canvasTheme].color
+  };
+}

package/es/core/hooks/usePolling.js

@@ -61,11 +61,8 @@ var usePolling = function usePolling(props) {
 
 
   useEffect(function () {
-    var isViewer = topoState.viewState === 'view';
-
-    if (topo.options.enableDefaultMetricLoader && isViewer) {
+    if (topo.options.enableDefaultMetricLoader) {
       rlog.debug('usePolling.useEffect: 开始轮询', {
-        isViewer: isViewer,
         pollingSwitch: pollingSwitch,
         resIdsList: resIdsList,
         resourceOverviewState: resourceOverviewState,
@@ -80,7 +77,7 @@ var usePolling = function usePolling(props) {
         stopPoll();
       }
     };
-  }, [topoState.viewState, pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]);
+  }, [pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]);
   /**
    * 
    * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标

package/es/core/hooks/useTopoEdit.js

@@ -73,6 +73,10 @@ var useTopoEdit = function useTopoEdit(params) {
   var onExitEdit = function onExitEdit() {// editDispatchers.switchToViewMode(topoId);
   };
 
+  var reset = function reset() {
+    topoEditDispatchers.reset();
+  };
+
   var onBindData = function onBindData(eventData) {};
   /**
    * 增加资源到视图
@@ -439,14 +443,15 @@ var useTopoEdit = function useTopoEdit(params) {
             case 0:
               id = group.id, tag = group.tag;
               rlog.debug("bindGroupResources--id, tag", id, tag);
-              _context12.next = 4;
+              topo.historyManager.beginTransaction();
+              _context12.next = 5;
               return resourceConfig.updateGroupResources(group, resources);
 
-            case 4:
-              _context12.next = 6;
+            case 5:
+              _context12.next = 7;
               return editDispatchers.fetchDataByConfig();
 
-            case 6:
+            case 7:
               _yield$editDispatcher2 = _context12.sent;
               elements = _yield$editDispatcher2.elements;
               // 区域里的子区域及子区域的节点、新增的链路
@@ -462,7 +467,9 @@ var useTopoEdit = function useTopoEdit(params) {
                 }
               }
 
-            case 12:
+              topo.historyManager.endTransaction();
+
+            case 14:
             case "end":
               return _context12.stop();
           }
@@ -592,13 +599,14 @@ var useTopoEdit = function useTopoEdit(params) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-              topo.historyManager.endTransaction(); // 添加资源后隐藏资源面板
+              topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent(); // 添加资源后隐藏资源面板
 
               topoEditDispatchers.update({
-                resourceTabactiveKey: null
+                resourceTabActiveKey: null
               });
 
-            case 13:
+            case 14:
             case "end":
               return _context15.stop();
           }
@@ -652,6 +660,12 @@ var useTopoEdit = function useTopoEdit(params) {
   function getAddResourceDrawerMode() {
     return getAddResourceType() === "addToFirstLayer" ? "new" : "all";
   }
+  /**
+   * 未选中元素添加资源
+   * 
+   * @param {*} data 
+   */
+
 
   var onSaveComboRes = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
@@ -680,11 +694,12 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 9:
               topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent();
               topoEditDispatchers.update({
-                resourceTabactiveKey: null
+                resourceTabActiveKey: null
               });
 
-            case 11:
+            case 12:
             case "end":
               return _context7.stop();
           }
@@ -1073,12 +1088,14 @@ var useTopoEdit = function useTopoEdit(params) {
    * 设置视图鼠标模式
    */
 
-  var setViewMouseMode = useCallback(function (mode) {
+  var setViewMouseMode = function setViewMouseMode(mode) {
+    rlog.debug('设置视图鼠标模式', mode);
     topo.getHtTopo().setViewMouseMode(mode);
     topoEditDispatchers.update({
       viewMouseMode: mode
     });
-  }, []);
+  };
+
   return {
     resourceConfig: resourceConfig,
 
@@ -1118,6 +1135,7 @@ var useTopoEdit = function useTopoEdit(params) {
      * 退出编辑模式回调
      */
     onExitEdit: onExitEdit,
+    reset: reset,
     addLayerResources: addLayerResources,
 
     /**

package/es/core/models/Alarm.js

@@ -416,7 +416,7 @@ var Alarm = /*#__PURE__*/function () {
 
             case 8:
               _context6.next = 10;
-              return topoService.openTopoAlarm(id);
+              return this.topo.serverApi.openTopoAlarm(id);
 
             case 10:
               this.secretKey = _context6.sent;
@@ -482,7 +482,7 @@ var Alarm = /*#__PURE__*/function () {
                 alarmPanelIsOpen: false
               });
               _context7.next = 9;
-              return topoService.closeTopoAlarm(id, this.secretKey);
+              return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
 
             case 9:
             case "end":

package/es/core/models/AttributeMetricDisplay.js

@@ -650,7 +650,11 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
+      var _topo$historyManager, _topo$historyManager2;
+
+      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '加载标注');
       htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
     }
   }
   /**

package/es/core/models/HistoryManager.js

@@ -9,6 +9,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.storeHistory = [];
     this.topo = topo;
     this.htHistoryManager = htHistoryManager;
+    htHistoryManager.clear();
     rlog.info('HistoryManager 初始化', htHistoryManager);
     this.updateStore = this.updateStore.bind(this);
     this.init();
@@ -64,6 +65,10 @@ var HistoryManager = /*#__PURE__*/function () {
     var _this = this;
 
     this.htHistoryManager.beginTransaction();
+    var displayConfigProperties = [// 单多链路
+    'expandAllEdges', // 节点标注
+    'nodeLabelStyle', // 画布主题
+    'canvasTheme', 'linkTag', 'linkTip', 'nodeTag', 'nodeTip'];
     var items = [{
       modelName: 'topoMod',
       property: 'data'
@@ -71,16 +76,16 @@ var HistoryManager = /*#__PURE__*/function () {
     {
       modelName: 'topoMod',
       property: 'type'
-    }, {
-      modelName: 'displayConfig',
-      property: 'expandAllEdges'
-    }, {
-      modelName: 'displayConfig',
-      property: 'nodeLabelStyle'
-    }, {
+    }].concat(displayConfigProperties.map(function (property) {
+      return {
+        modelName: 'displayConfig',
+        property: property
+      };
+    }), [// 背景
+    {
       modelName: 'background',
       property: 'current'
-    }];
+    }]);
     this.storeHistory = items.map(function (item) {
       return _extends({}, item, {
         oldValue: _this.topo.store.getModelState(item.modelName)[item.property]

package/es/core/models/{SelectionManager.js → SelectionModel.js}

@@ -1,21 +1,15 @@
 import _extends from "@babel/runtime/helpers/extends";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import useHtElements from "../common/hooks/useHtElements";
+import ignoreList from "./selection/ignoreList";
 
-var SelectionManager = /*#__PURE__*/function () {
-  function SelectionManager(topo) {
+var SelectionModel = /*#__PURE__*/function () {
+  function SelectionModel(topo) {
     var _this = this;
 
     this.topo = null;
     this.inited = false;
 
-    this.setSelection = function (selection) {
-      var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
-
-      selectionDispatchers.update({
-        selection: selection
-      });
-    };
-
     this.updateSelection = function () {
       try {
         var selectionModel = _this.topo.getSelectionModel();
@@ -24,18 +18,30 @@ var SelectionManager = /*#__PURE__*/function () {
 
         var selectionArr = htSelection.map(getElementData); // rlog.info("updateSelection", selectionArr.map((element) => element.id));
 
-        _this.setSelection(selectionArr);
+        _this.updateStoreSelection(selectionArr);
       } catch (e) {
         rlog.error('updateSelection error', e);
       }
     };
 
+    this.updateStoreSelection = function (selection) {
+      var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
+
+      _this.selectionIds = selection.map(function (item) {
+        return item.id;
+      });
+      selectionDispatchers.update({
+        selection: selection,
+        selectionIds: _this.selectionIds
+      });
+    };
+
     this.topo = topo;
     this.handleSelectionChange = this.handleSelectionChange.bind(this);
     this.handleDataPropertyChange = this.handleDataPropertyChange.bind(this);
   }
 
-  var _proto = SelectionManager.prototype;
+  var _proto = SelectionModel.prototype;
 
   _proto.init = function init() {
     if (this.inited) {
@@ -48,6 +54,11 @@ var SelectionManager = /*#__PURE__*/function () {
   };
 
   _proto.destroy = function destroy() {
+    var selectionDispatchers = this.topo.store.getModelDispatchers('selection');
+    selectionDispatchers.update({
+      selection: [],
+      selectionIds: []
+    });
     this.removeListener();
   };
 
@@ -58,6 +69,26 @@ var SelectionManager = /*#__PURE__*/function () {
     return selection;
   };
 
+  _proto.useHtSelection = function useHtSelection() {
+    var _this$topo$store$useM2 = this.topo.store.useModelState('selection'),
+        selectionIds = _this$topo$store$useM2.selectionIds;
+
+    var elements = useHtElements({
+      topo: this.topo,
+      ids: selectionIds
+    });
+    return elements;
+  };
+
+  _proto.getSelection = function getSelection() {
+    var selectionModel = this.topo.getSelectionModel();
+    return selectionModel.getSelection().getArray();
+  }
+  /**
+   * 同步选中元素到store
+   */
+  ;
+
   _proto.handleSelectionChange = function handleSelectionChange(e) {
     rlog.info('Selection handleSelectionChange', e);
     this.updateSelection();
@@ -67,19 +98,21 @@ var SelectionManager = /*#__PURE__*/function () {
     var property = e.property,
         data = e.data;
 
-    if (['position', 'childChange', 'a:scale'].indexOf(property) !== -1) {
+    if (!this.selectionIds.includes(data.getId())) {
       return;
     }
 
-    var selectionModel = this.topo.getSelectionModel();
-    var selectionIds = selectionModel.getSelection().getArray().map(function (item) {
-      return item.getId();
-    });
+    if (ignoreList.indexOf(property) !== -1) {
+      return;
+    }
 
-    if (selectionIds.indexOf(data.getId()) > -1) {
-      // console.info('PropertyChangeListener', e);
-      this.updateSelection();
+    if (!window.aa) {
+      window.aa = [];
     }
+
+    window.aa.push(e); // console.info('PropertyChangeListener', e);
+
+    this.updateSelection();
   };
 
   _proto.initListener = function initListener() {
@@ -102,10 +135,10 @@ var SelectionManager = /*#__PURE__*/function () {
     dataModel.removeDataPropertyChangeListener(this.handleDataPropertyChange);
   };
 
-  return SelectionManager;
+  return SelectionModel;
 }();
 
-export { SelectionManager as default };
+export { SelectionModel as default };
 ; // 构造元素数据
 
 var map = {

package/es/core/models/TopoApp.js

@@ -20,9 +20,9 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
-import SelectionManager from "./SelectionManager"; // eslint-disable-next-line no-undef
+import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.0-alpha.5" === 'string' ? "6.0.0-alpha.5" : null;
+var version = typeof "6.0.0-alpha.51" === 'string' ? "6.0.0-alpha.51" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -78,7 +78,7 @@ var Topo = /*#__PURE__*/function () {
 
     this.test = new Test(this);
     this.uid = topoFactory.add(options.name, this);
-    this.selectionManager = new SelectionManager(this);
+    this.selectionModel = new SelectionModel(this);
   };
 
   _proto.destroy = function destroy() {

package/es/core/models/TopoGraphView.js

@@ -26,10 +26,16 @@ var TopoGraphView = /*#__PURE__*/function () {
     this.contextMenu = new ContextMenu();
   };
 
-  _proto.getHtDataModel = function getHtDataModel() {
+  _proto.getHtGraphView = function getHtGraphView() {
     var _this$topoClient;
 
-    return (_this$topoClient = this.topoClient) === null || _this$topoClient === void 0 ? void 0 : _this$topoClient.getDataModel();
+    return (_this$topoClient = this.topoClient) === null || _this$topoClient === void 0 ? void 0 : _this$topoClient.getGraphView();
+  };
+
+  _proto.getHtDataModel = function getHtDataModel() {
+    var _this$topoClient2;
+
+    return (_this$topoClient2 = this.topoClient) === null || _this$topoClient2 === void 0 ? void 0 : _this$topoClient2.getDataModel();
   }
   /**
    * 缩放平移整个拓扑以展示所有的图元

package/es/core/models/selection/ignoreList.js

@@ -0,0 +1 @@
+export default ['position', 'childChange', 'a:scale', 'icons', 'a:dataSource', 'a:dataTipSource', 'agentChange', 'a:runtimeStyles', 'a:linkArrow', '*', 'a:link_ind_left_arrow', 'a:link_ind_right_arrow', 'a:link_ind_area', 'a:middle_area', 'a:areaRect', 'a:outAreaRect', 'a:link_ind_area_right'];

package/es/core/models/utils/linkUtils.js

@@ -31,7 +31,7 @@ export function isCrucialLink(link) {
  */
 
 export function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['network_link.destination_device_id']);
+  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 export function isAggLink(link) {
   return link.attributes["network_link.connect_type"] === "agg";
@@ -176,7 +176,7 @@ function _getLinksDetail() {
 
 export function buildTopoLinkData() {}
 export var compatibleWith = function compatibleWith(value) {
-  console.log("compatibleWith", value);
+  // console.log("compatibleWith",value);
   var pluralType = value !== null && value !== void 0 ? value : 2;
 
   if (value === false) {
@@ -200,8 +200,8 @@ export var showLinkByConfig = function showLinkByConfig(props) {
   var _plurals$compatibleWi;
 
   var topo = props.topo,
-      showType = props.showType;
-  console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
+      showType = props.showType; // console.log("showLinkByConfig-----------------------------", props, showType);
+  //const displayConfig = topo.store.getModelState("displayConfig");
 
   var types = (_plurals$compatibleWi = plurals[compatibleWith(showType)]) !== null && _plurals$compatibleWi !== void 0 ? _plurals$compatibleWi : []; // 查询所有连线
 
@@ -210,8 +210,7 @@ export var showLinkByConfig = function showLinkByConfig(props) {
   var edges = getEdges(dm); // console.log("edges", edges);
 
   var showPhy = types.indexOf("phy") >= 0;
-  var showAgg = types.indexOf("agg") >= 0;
-  console.log("edges----types", showType, types, showPhy, showAgg);
+  var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
 
   if (Array.isArray(edges) && edges.length > 0) {
     edges.map(function (edge) {