@cloud-app-dev/vidc 1.0.48 → 2.0.0-alpha.1

package/es/Service/http.js

@@ -0,0 +1,152 @@
+import { __rest } from "tslib";
+import fetchAxios from 'fetch-like-axios';
+import * as Middleware from './middleware';
+import Config from '../Config';
+import * as logger from './logger';
+import { cloneDeep } from 'lodash';
+import { formartDesc } from './utils';
+var CancelToken = fetchAxios.CancelToken;
+var config = {
+  baseURL: '/',
+  timeout: 60 * 1000,
+  xhrMode: 'fetch',
+  headers: {
+    Accept: 'application/json; charset=utf-8',
+    'Content-Type': 'application/json; charset=utf-8'
+  }
+};
+var httpInstance = fetchAxios.create(config);
+/**
+ * 请求之前拦截动作
+ */
+
+httpInstance.interceptors.request.use(function (response) {
+  return response;
+}, function (error) {
+  return console.error(error);
+});
+/**
+ * 请求之后拦截动作
+ */
+
+httpInstance.interceptors.response.use(function (response) {
+  if (Middleware.responseMiddleware.length === 0) {
+    return response.data;
+  } else {
+    Middleware.responseMiddleware.forEach(function (fn) {
+      return response = fn(response);
+    });
+    return response;
+  }
+}, function httpUtilErrorRequest(error) {
+  if (Middleware.responseErrorMiddleware.length !== 0) {
+    Middleware.responseErrorMiddleware.forEach(function (fn) {
+      return error = fn(error);
+    });
+    return Promise.reject(error);
+  }
+
+  if (!error.response) {
+    console.error(error);
+    return Promise.reject(error);
+  }
+
+  return Promise.reject(error.response);
+});
+export function $http(options) {
+  var cancel;
+  var cancelToken = new CancelToken(function (c) {
+    cancel = c;
+
+    if (options.cancelHttp) {
+      options.cancelHttp(cancel);
+    }
+  });
+
+  var cancelHttp = options.cancelHttp,
+      newOptions = __rest(options, ["cancelHttp"]);
+
+  if (Config[options.url]) {
+    var item = cloneDeep(Config[options.url]);
+
+    if (Array.isArray(item)) {
+      var indexItem = item[options.loggerIndex || 0];
+      indexItem.description = formartDesc(indexItem.description, options.data);
+      logger.save(indexItem);
+    } else {
+      item.description = formartDesc(item.description, options.data);
+      logger.save(item);
+    }
+  }
+
+  return httpInstance(Object.assign(Object.assign({}, newOptions), {
+    cancelToken: cancelToken
+  }));
+}
+export var $httpMultiPartInstance = fetchAxios.create({
+  xhrMode: 'fetch',
+  timeout: 10 * 60 * 1000,
+  headers: {
+    'Content-Type': 'multipart/form-data'
+  }
+});
+$httpMultiPartInstance.interceptors.response.use(function (response) {
+  return response.data;
+}, function (error) {
+  return Promise.reject(error);
+});
+export var $httpXMLInstance = function xhrRequest(_ref) {
+  var url = _ref.url,
+      _ref$method = _ref.method,
+      method = _ref$method === void 0 ? 'GET' : _ref$method,
+      data = _ref.data,
+      headers = _ref.headers,
+      cancelHttp = _ref.cancelHttp,
+      _ref$isAsync = _ref.isAsync,
+      isAsync = _ref$isAsync === void 0 ? false : _ref$isAsync,
+      requestId = _ref.requestId;
+
+  if (!requestId) {
+    console.warn('缺少requestId');
+  }
+
+  return new Promise(function (resolve, reject) {
+    var xhr = new XMLHttpRequest();
+
+    var cancel = function cancel() {
+      return xhr.abort();
+    };
+
+    if (cancelHttp) {
+      cancelHttp(cancel);
+    }
+
+    xhr.open(method, url, !isAsync);
+
+    if (headers) {
+      Object.keys(headers).forEach(function (key) {
+        xhr.setRequestHeader(key, headers[key]);
+      });
+    }
+
+    xhr.onreadystatechange = function () {
+      if (xhr.readyState === 4 && (xhr.status === 200 || xhr.status === 304)) {
+        var _data;
+
+        try {
+          _data = JSON.parse(xhr.response);
+        } catch (e) {
+          _data = xhr.response;
+        }
+
+        resolve(_data);
+      }
+
+      if (xhr.readyState === 4 && !(xhr.status === 200 || xhr.status === 304)) {
+        reject(xhr);
+      }
+    };
+
+    xhr.send(data ? JSON.stringify(data) : null);
+  });
+};

package/es/Service/index.d.ts

@@ -0,0 +1,3 @@
+import { IServiceInterface } from './interface';
+declare let proxy: IServiceInterface;
+export default proxy;

package/es/Service/index.js

@@ -0,0 +1,14 @@
+import { $http, $httpMultiPartInstance, $httpXMLInstance } from './http';
+import { registerResponseMiddleware, registerResponseErrorMiddleware } from './middleware';
+import produce from 'immer';
+import * as logger from './logger';
+var ServiceInterface = {
+  $http: $http,
+  $httpXMLInstance: $httpXMLInstance,
+  $httpMultiPartInstance: $httpMultiPartInstance,
+  registerResponseMiddleware: registerResponseMiddleware,
+  registerResponseErrorMiddleware: registerResponseErrorMiddleware,
+  logger: logger
+};
+var proxy = produce(ServiceInterface, function () {});
+export default proxy;

package/es/Service/interface.d.ts

@@ -0,0 +1,28 @@
+import { AxiosRequestConfig } from 'fetch-like-axios';
+
+export type loggerType = {
+  save(options: { description: string; module: string | number; function: string | number }, token?: string): Promise<any>;
+};
+
+export type RsponseType = AxiosRequestConfig & { requestId?: string; cancelHttp?: (cancel: Function) => void; loggerIndex?: number };
+
+export type XHRResponse = {
+  url: string;
+  method: string;
+  data?: any;
+  headers?: any;
+  cancelHttp?: any;
+  isAsync?: boolean;
+  requestId?: string;
+};
+
+export type MiddleWareType = (config: any) => any;
+
+export type IServiceInterface = {
+  $http(options: RsponseType): Promise<any>;
+  $httpXMLInstance(options: XHRResponse): Promise<any>;
+  $httpMultiPartInstance(options: AxiosRequestConfig): Promise<any>;
+  registerResponseMiddleware(fn: MiddleWareType): void;
+  registerResponseErrorMiddleware(fn: MiddleWareType): void;
+  logger: loggerType;
+};

package/es/Service/logger.d.ts

@@ -0,0 +1,3 @@
+export declare function save(data: {
+    [key: string]: any;
+}, token?: string): import("fetch-like-axios").AxiosPromise<any>;

package/es/Service/logger.js

@@ -0,0 +1,13 @@
+import _cache from "@cloud-app-dev/utils/es/cache";
+import { $http } from './http';
+export function save(data, token) {
+  return $http({
+    method: 'post',
+    url: "/api/log/v1/addLog",
+    data: data,
+    requestId: 'addLog',
+    headers: {
+      Authorization: token || _cache.getCache('token', 'session')
+    }
+  });
+}

package/es/Service/middleware.d.ts

@@ -0,0 +1,5 @@
+import { MiddleWareType } from './interface';
+export declare const responseMiddleware: Array<any>;
+export declare const responseErrorMiddleware: Array<any>;
+export declare function registerResponseMiddleware(fn: MiddleWareType): void;
+export declare function registerResponseErrorMiddleware(fn: MiddleWareType): void;

package/es/Service/middleware.js

@@ -0,0 +1,15 @@
+var _global = window;
+export var responseMiddleware = _global.responseMiddleware || [];
+export var responseErrorMiddleware = _global.responseMiddleware || [];
+export function registerResponseMiddleware(fn) {
+  if (!responseMiddleware.includes(fn)) {
+    responseMiddleware.push(fn);
+    _global.responseMiddleware = responseMiddleware;
+  }
+}
+export function registerResponseErrorMiddleware(fn) {
+  if (!responseErrorMiddleware.includes(fn)) {
+    responseErrorMiddleware.push(fn);
+    _global.responseErrorMiddleware = responseErrorMiddleware;
+  }
+}

package/es/Service/utils.d.ts

@@ -0,0 +1,3 @@
+export declare function formartDesc(desc: string, data: {
+    [key: string]: any;
+}): string;

package/es/Service/utils.js

@@ -0,0 +1,11 @@
+export function formartDesc(desc, data) {
+  try {
+    Object.keys(data).forEach(function (key) {
+      desc = desc.replace("<".concat(key, ">"), data[key]);
+    });
+  } catch (e) {
+    console.warn('日志描述转换异常！', e);
+  }
+
+  return desc;
+}

package/es/WorkerFlow/Demo.js

@@ -47,6 +47,7 @@ var App = function App() {
   }, /*#__PURE__*/React.createElement(WorkerFlow, {
     form: form,
     data: data.data,
+    readOnly: false,
     onChange: console.log,
     hasTools: true,
     errorIds: ['UserTask_2222', 'SequenceFlow_6666']

package/es/WorkerFlow/Form/Condition.js

@@ -4,7 +4,6 @@ import "antd/lib/button/style";
 import _Button from "antd/lib/button";
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _ContentBox from "@cloud-app-dev/basic-components/es/ContentBox";
-import _useChangeEffect from "@cloud-app-dev/basic-components/es/useChangeEffect";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -18,7 +17,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import RefModal from '../../RefModal';
 
 function ConditionForm(_ref) {
@@ -30,6 +29,8 @@ function ConditionForm(_ref) {
 
   var _a, _b;
 
+  console.log(item, useConditionFields);
+
   var _useState = useState({
     field: (item === null || item === void 0 ? void 0 : item.conditionList) ? (_a = item.conditionList[0]) === null || _a === void 0 ? void 0 : _a.field : '',
     value: (item === null || item === void 0 ? void 0 : item.conditionList) ? (_b = item === null || item === void 0 ? void 0 : item.conditionList[0]) === null || _b === void 0 ? void 0 : _b.value : ''
@@ -104,8 +105,7 @@ function ConditionForm(_ref) {
       };
     });
   }, []);
-
-  _useChangeEffect(function () {
+  useEffect(function () {
     if (state.field !== undefined && state.value !== undefined && formItem) {
       var conditionList = [{
         field: state.field,
@@ -129,7 +129,6 @@ function ConditionForm(_ref) {
       });
     }
   }, [state.field, state.value, formItem, options]);
-
   return /*#__PURE__*/React.createElement(_ContentBox.InfoBox, {
     title: "\u8BBE\u7F6E\u6761\u4EF6",
     contentStyle: {

package/es/WorkerFlow/Form/GroupList.d.ts

@@ -5,6 +5,7 @@ interface IGroupListProps {
     checkedKeys: string[];
     keywords?: string;
     onChecked: (ids: string[]) => void;
+    title: string;
 }
-declare function GroupList({ list, onKeywordChange, onChecked, checkedKeys }: IGroupListProps): JSX.Element;
+declare function GroupList({ list, onKeywordChange, onChecked, checkedKeys, title }: IGroupListProps): JSX.Element;
 export default GroupList;

package/es/WorkerFlow/Form/GroupList.js

@@ -7,12 +7,13 @@ function GroupList(_ref) {
   var list = _ref.list,
       onKeywordChange = _ref.onKeywordChange,
       onChecked = _ref.onChecked,
-      checkedKeys = _ref.checkedKeys;
+      checkedKeys = _ref.checkedKeys,
+      title = _ref.title;
   return /*#__PURE__*/React.createElement("div", {
     className: "lm-c-check-list-wrapper vidc-list-component post-group-list"
   }, /*#__PURE__*/React.createElement(TreeTitle, {
     titleExt: false,
-    title: "\u5DF2\u6DFB\u52A0(".concat(list.length, ")\u4E2A"),
+    title: title,
     inputPlaceholder: "\u8BF7\u8F93\u5165\u5C97\u4F4D\u540D\u79F0",
     onChange: onKeywordChange
   }), /*#__PURE__*/React.createElement("div", {

package/es/WorkerFlow/Form/GroupSelectModalContent.js

@@ -156,7 +156,8 @@ function GroupSelectModalContent(_ref, ref) {
       });
     },
     keywords: state.keyword1,
-    onChecked: onUserChecked1
+    onChecked: onUserChecked1,
+    title: "\u5C97\u4F4D\u5217\u8868"
   }), /*#__PURE__*/React.createElement(GroupList, {
     list: renderList,
     checkedKeys: state.selectIds,
@@ -168,7 +169,8 @@ function GroupSelectModalContent(_ref, ref) {
       });
     },
     keywords: state.keyword2,
-    onChecked: onUserChecked2
+    onChecked: onUserChecked2,
+    title: "\u5DF2\u6DFB\u52A0\uFF08".concat(state.selectIds.length, "\uFF09")
   }));
 }
 

package/es/WorkerFlow/Nodes/TitleElement.js

@@ -13,7 +13,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useState, useEffect, useRef, useCallback, useContext } from 'react';
+import WFC from '../OperatorContext';
 
 function TitleElement(_ref) {
   var nodeName = _ref.nodeName,
@@ -22,6 +23,9 @@ function TitleElement(_ref) {
       icon = _ref.icon,
       delNode = _ref.delNode;
 
+  var _useContext = useContext(WFC),
+      readOnly = _useContext.readOnly;
+
   var _useState = useState(nodeName),
       _useState2 = _slicedToArray(_useState, 2),
       title = _useState2[0],
@@ -41,11 +45,11 @@ function TitleElement(_ref) {
     }
   }, [title, placeholder]);
   useEffect(function () {
-    return editable && input.current.focus();
+    return !readOnly && editable && input.current.focus();
   }, [editable]);
 
   _useChangeEffect(function () {
-    !editable && onTitleChange && onTitleChange(title);
+    !readOnly && !editable && onTitleChange && onTitleChange(title);
   }, [title, editable]);
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.createElement(_IconFont, {
@@ -53,7 +57,7 @@ function TitleElement(_ref) {
     style: {
       paddingRight: 4
     }
-  }), editable ? /*#__PURE__*/React.createElement("input", {
+  }), !readOnly && editable ? /*#__PURE__*/React.createElement("input", {
     ref: input,
     type: "text",
     className: "cloudapp-input editable-title-input",
@@ -70,8 +74,11 @@ function TitleElement(_ref) {
     className: "editable-title",
     onClick: function onClick() {
       return setEditable(true);
-    }
-  }, title), /*#__PURE__*/React.createElement(_IconFont, {
+    },
+    style: readOnly ? {
+      borderColor: 'transparent'
+    } : undefined
+  }, title), !readOnly && /*#__PURE__*/React.createElement(_IconFont, {
     className: "worker-flow-node-del",
     type: "icon-MarkNo",
     onClick: delNode,

package/es/WorkerFlow/index.js

@@ -70,8 +70,17 @@ function WorkerFlow(_ref, ref) {
 
   var updateNode = function updateNode() {
     return setConfig(Object.assign({}, config));
-  }; // 链表操作: 几种行为， 添加行为，删除行为，点击行为     pRef.childNode -> node.childNode -> 后继
-  // 添加节点
+  };
+  /**
+   * @mate 节点函数介绍
+   * @description 链表操作: 几种行为， 添加行为，删除行为，点击行为     pRef.childNode -> node.childNode -> 后继
+   */
+
+  /**
+   * @description 添加节点
+   * @param type
+   * @param node
+   */
 
 
   function onInsertNode(type, node) {
@@ -114,7 +123,15 @@ function WorkerFlow(_ref, ref) {
     }
 
     updateNode();
-  } // 删除节点
+  }
+  /**
+   * @description 删除节点的操作
+   * @param parentNode
+   * @param node
+   * @param type
+   * @param index
+   * @returns
+   */
 
 
   function onDeleteNode(parentNode, node, type, index) {
@@ -164,7 +181,14 @@ function WorkerFlow(_ref, ref) {
     modal.confirm(Object.assign(Object.assign({}, options), {
       onOk: onOk
     }));
-  } // 获取节点
+  }
+  /**
+   * @description 选中节点操作
+   * @param node
+   * @param parentNode
+   * @param index
+   * @returns
+   */
 
 
   function onSelectNode(node, parentNode, index) {
@@ -263,12 +287,17 @@ function WorkerFlow(_ref, ref) {
       useFormKeys: useFormKeys
     };
   }, [config]);
+  /**
+   * @description onChange传递数据
+   */
 
   _useChangeEffect(function () {
-    if (onChange) {
-      onChange(getConfig());
-    }
+    return onChange && onChange(getConfig());
   }, [config]);
+  /**
+   * @description ref传递数据
+   */
+
 
   useImperativeHandle(ref, function () {
     return {

package/es/index.d.ts

@@ -1,23 +1,19 @@
 export { default as Api } from './Api';
-export { default as AppLayout } from './AppLayout';
+export { default as AppContext } from './AppContext';
 export { default as AutoExit } from './AutoExit';
-export { default as DagInitialConfig } from './DagInitialConfig';
-export { default as DagInitialRequest } from './DagInitialRequest';
+export { default as Config } from './Config';
+export { default as ConfigContext } from './ConfigContext';
 export { default as DeviceIcon } from './DeviceIcon';
 export { default as DeviceList } from './DeviceList';
 export { default as DeviceSelect } from './DeviceSelect';
 export { default as DynamicDeviceList } from './DynamicDeviceList';
-export { default as FormContent } from './FormContent';
 export { default as InitialConfig } from './InitialConfig';
 export { default as InitialRequest } from './InitialRequest';
 export { default as List } from './List';
-export { default as OrgTree } from './OrgTree';
-export { default as OrgUserTree } from './OrgUserTree';
-export { default as PlaceTree } from './PlaceTree';
 export { default as RefDrawer } from './RefDrawer';
 export { default as RefModal } from './RefModal';
+export { default as Service } from './Service';
 export { default as TreeMode } from './TreeMode';
 export { default as TreeTitle } from './TreeTitle';
-export { default as Upload } from './Upload';
 export { default as UserSelect } from './UserSelect';
 export { default as WorkerFlow } from './WorkerFlow';

package/es/index.js

@@ -1,23 +1,19 @@
 export { default as Api } from './Api';
-export { default as AppLayout } from './AppLayout';
+export { default as AppContext } from './AppContext';
 export { default as AutoExit } from './AutoExit';
-export { default as DagInitialConfig } from './DagInitialConfig';
-export { default as DagInitialRequest } from './DagInitialRequest';
+export { default as Config } from './Config';
+export { default as ConfigContext } from './ConfigContext';
 export { default as DeviceIcon } from './DeviceIcon';
 export { default as DeviceList } from './DeviceList';
 export { default as DeviceSelect } from './DeviceSelect';
 export { default as DynamicDeviceList } from './DynamicDeviceList';
-export { default as FormContent } from './FormContent';
 export { default as InitialConfig } from './InitialConfig';
 export { default as InitialRequest } from './InitialRequest';
 export { default as List } from './List';
-export { default as OrgTree } from './OrgTree';
-export { default as OrgUserTree } from './OrgUserTree';
-export { default as PlaceTree } from './PlaceTree';
 export { default as RefDrawer } from './RefDrawer';
 export { default as RefModal } from './RefModal';
+export { default as Service } from './Service';
 export { default as TreeMode } from './TreeMode';
 export { default as TreeTitle } from './TreeTitle';
-export { default as Upload } from './Upload';
 export { default as UserSelect } from './UserSelect';
 export { default as WorkerFlow } from './WorkerFlow';

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "1.0.48",
+  "version": "2.0.0-alpha.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,7 +58,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+http://git.topvdn.com/micro-basic/video-cloud-components.git",
+    "url": "git+http://git.topvdn.com/cloudapp/vidc.git",
     "branch": "master",
     "platform": "github"
   }

package/es/AppLayout/AppHeader/index.css

@@ -1,4 +0,0 @@
-.app-header-content {
-  user-select: none;
-  color: var(--app-header-color);
-}

package/es/AppLayout/AppHeader/index.d.ts

@@ -1,18 +0,0 @@
-import React from 'react';
-import * as H from 'history';
-import { UserInfo } from '@cloud-app-dev/basic-components/es/Store/app';
-import './index.less';
-interface IAppHeaderProps {
-    className?: string;
-    renderMenu?: boolean;
-    isMenuHome?: boolean;
-    systemLogo?: string;
-    defaultSrc?: string;
-    systemName?: string;
-    appTools?: React.ReactNode;
-    history: H.History;
-    menuType?: string;
-    userInfo?: UserInfo;
-}
-declare function AppHeader({ className, renderMenu, isMenuHome, systemLogo, defaultSrc, systemName, appTools, history, menuType, userInfo }: IAppHeaderProps): JSX.Element;
-export default AppHeader;

package/es/AppLayout/AppHeader/index.js

@@ -1,41 +0,0 @@
-import React from 'react';
-import AppLogo from '../AppLogo';
-import AppTools from '../AppTools';
-import AppHorizontalMenu from '../AppHorizontalMenu';
-import MenuEmptyBox from '../AppHorizontalMenu/MenuEmptyBox';
-import "./index.css";
-
-function AppHeader(_ref) {
-  var _ref$className = _ref.className,
-      className = _ref$className === void 0 ? '' : _ref$className,
-      renderMenu = _ref.renderMenu,
-      isMenuHome = _ref.isMenuHome,
-      systemLogo = _ref.systemLogo,
-      defaultSrc = _ref.defaultSrc,
-      systemName = _ref.systemName,
-      appTools = _ref.appTools,
-      history = _ref.history,
-      menuType = _ref.menuType,
-      userInfo = _ref.userInfo;
-  return /*#__PURE__*/React.createElement("div", {
-    className: "app-header-content ".concat(className),
-    style: {
-      display: 'flex',
-      width: '100%',
-      height: '100%',
-      overflow: 'hidden'
-    }
-  }, /*#__PURE__*/React.createElement(AppLogo, {
-    systemLogo: systemLogo,
-    history: history,
-    isMenuHome: isMenuHome,
-    defaultSrc: defaultSrc,
-    systemName: systemName,
-    userInfo: userInfo
-  }), menuType !== 'inline' ? /*#__PURE__*/React.createElement(AppHorizontalMenu, {
-    renderMenu: renderMenu,
-    history: history
-  }) : /*#__PURE__*/React.createElement(MenuEmptyBox, null), /*#__PURE__*/React.createElement(AppTools, null, appTools));
-}
-
-export default AppHeader;

package/es/AppLayout/AppHorizontalMenu/MenuEmptyBox.d.ts

@@ -1 +0,0 @@
-export default function MenuEmptyBox(): JSX.Element;

package/es/AppLayout/AppHorizontalMenu/MenuEmptyBox.js

@@ -1,10 +0,0 @@
-import React from 'react';
-export default function MenuEmptyBox() {
-  return /*#__PURE__*/React.createElement("div", {
-    className: "app-menu-layout",
-    style: {
-      flex: 1,
-      overflow: 'hidden'
-    }
-  });
-}

package/es/AppLayout/AppHorizontalMenu/SubGroup.d.ts

@@ -1,9 +0,0 @@
-import React from 'react';
-import { FeatureItem } from '@cloud-app-dev/basic-components/es/Store/auth';
-interface ISubGroupProps {
-    item: FeatureItem & any;
-    onClick: (e: React.MouseEvent, item: FeatureItem) => void;
-    currentMenuKeys: string[];
-}
-declare function SubGroup({ item, onClick, currentMenuKeys }: ISubGroupProps): JSX.Element;
-export default SubGroup;