@ccs-ui/rc-pro 2.3.6-beta-40 → 2.4.0-beta.1

package/es/index.js

@@ -9,6 +9,7 @@ export { default as CcsDialog } from "./dialog";
 export { default as CcsEditor } from "./editor";
 export { default as CcsEllipsis } from "./ellipsis";
 export { default as CcsFullScreenButton } from "./full-screen";
+export { default as CcsGroupFormItem } from "./group-form-item";
 export { default as useAppConfig } from "./hooks/use-app";
 export { default as useCcsOnceEvent } from "./hooks/use-once-event";
 export { default as useCcsPage } from "./hooks/use-page";
@@ -19,7 +20,6 @@ export { default as CcsIntervalButton } from "./interval-button";
 export { default as CcsKeepAliveTabs } from "./layout-keep-alive";
 export { default as CcsSinglePage } from "./layout-single-page";
 export { default as CcsLoading } from "./loading";
-export { default as CcsProGrid } from "./pro-grid";
 export { default as CcsProTable } from "./pro-table";
 export { default as CcsProTabs } from "./pro-tabs";
 export { default as CcsResizeObserver } from "./resize-observer";
@@ -28,9 +28,7 @@ export { default as CcsSelect } from "./select";
 export { default as CcsStatusTag } from "./status-tag";
 export { default as CcsTable } from "./table";
 export { default as CcsTimePicker } from "./time-picker";
-export { default as CcsTrigger } from "./trigger";
 export { default as CcsUpload } from "./upload";
-export { default as CcsVirtualList } from "./virtual-list";
 export { default as CcsWaterMark } from "./water-mark";
 import * as CCS from "./ccs";
 export default CCS;

package/es/interval-button/index.js

@@ -54,7 +54,7 @@ function IntervalButton(_ref, ref) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return localStorage.getStroage(key);
+              return localStorage.getItem(key);
             case 2:
               s = _context.sent;
               if (!s) {
@@ -90,7 +90,7 @@ function IntervalButton(_ref, ref) {
     if (count - 1 === 0) {
       setCodeInterval(null);
       setCount(num);
-      if (key) localStorage.removeStroage(key);
+      if (key) localStorage.removeItem(key);
       return;
     }
     setCount(count - 1);
@@ -103,10 +103,10 @@ function IntervalButton(_ref, ref) {
   var onStart = function onStart() {
     setCodeInterval(1000);
     if (key) {
-      localStorage.setStroage(key, {
+      localStorage.setItem(key, JSON.stringify({
         num: num,
         time: new Date().getTime()
-      });
+      }));
     }
   };
   useImperativeHandle(ref, function () {

package/es/layout-keep-alive/index.d.ts

@@ -6,9 +6,9 @@ import { MenuType } from '../ccs';
 import './index.less';
 export type CacheRouter = {
     key: string;
+    menuKey: string;
     label: string;
     urlAuthList: string[];
-    timestamp: number;
     outlet: ReactElement<any, string | JSXElementConstructor<any>> | null;
     children?: ReactElement<any, string | JSXElementConstructor<any>> | null;
     breadcrumb: BreadcrumbProps['items'];

package/es/layout-keep-alive/index.js

@@ -16,14 +16,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { MoreOutlined } from '@ant-design/icons';
 import CcsUtils from '@ccs-ui/utils';
-import { useUpdate, useUpdateEffect } from 'ahooks';
-import { Button, Dropdown, Empty, Tabs } from 'antd';
+import { useMemoizedFn, useUpdate, useUpdateEffect } from 'ahooks';
+import { Button, Dropdown, Tabs } from 'antd';
 import classnames from 'classnames';
 import updateHelper from 'immutability-helper';
-import { useMemo, useRef } from 'react';
+import { useCallback, useMemo, useRef } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
-import { useAppConfig } from '..';
+import { CcsResult, useAppConfig } from '..';
 import "./index.less";
 import Page from "./page";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -151,11 +151,10 @@ function KeepAliveTabs(_ref) {
   useUpdateEffect(function () {
     routers.current.forEach(function (router) {
       var _menu$btnAuth;
-      var menu = findMenuById(menuItems, router.key);
+      var menu = findMenuById(menuItems, router.menuKey);
       router.urlAuthList = (menu === null || menu === void 0 || (_menu$btnAuth = menu.btnAuth) === null || _menu$btnAuth === void 0 ? void 0 : _menu$btnAuth.map(function (b) {
         return b.code;
       })) || [];
-      router.timestamp = new Date().getTime();
     });
     update();
   }, [menuItems]);
@@ -262,25 +261,26 @@ function KeepAliveTabs(_ref) {
       btnAuth = _ref3$btnAuth === void 0 ? [] : _ref3$btnAuth,
       _ref3$breadcrumb = _ref3.breadcrumb,
       breadcrumb = _ref3$breadcrumb === void 0 ? [] : _ref3$breadcrumb;
+    var isMenu = curMenu.key !== undefined;
     routers.current = updateHelper(routers.current, {
       $push: [{
         key: location.key,
-        timestamp: new Date().getTime(),
         label: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.label) || '未知',
-        outlet: curMenu ? outlet : /*#__PURE__*/_jsx(Empty, {
-          description: "\u672A\u77E5\u9875\u9762"
+        outlet: isMenu ? outlet : /*#__PURE__*/_jsx(CcsResult.Page404, {
+          title: "\u672A\u77E5\u9875\u9762"
         }),
         urlAuthList: btnAuth.map(function (b) {
           return b.code;
         }),
-        breadcrumb: breadcrumb,
-        pageLocation: location
+        breadcrumb: isMenu ? breadcrumb : [],
+        pageLocation: location,
+        menuKey: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.key) || ''
       }]
     });
   }
 
   // tab路由切换,携带search，state参数
-  var onHistory = function onHistory(key) {
+  var onHistory = useCallback(function (key) {
     var tab = routers.current.find(function (c) {
       return c.key === key;
     });
@@ -291,10 +291,10 @@ function KeepAliveTabs(_ref) {
         search = _tab$pageLocation.search;
       history.push("".concat(_pathname).concat(search), state);
     }
-  };
+  }, []);
 
   // 页面主动销毁或关闭tab
-  var onDestroy = function onDestroy(key) {
+  var onDestroy = useMemoizedFn(function (key) {
     var index = routers.current.findIndex(function (c) {
       return c.key === key;
     });
@@ -326,10 +326,10 @@ function KeepAliveTabs(_ref) {
       // 显示后一个
       onHistory(routers.current[index].key);
     }
-  };
+  });
 
   // 扩展操作
-  var onCloseTab = function onCloseTab(key) {
+  var onCloseTab = useCallback(function (key) {
     // 关闭其他标签
     if (key === '1') {
       routers.current = routers.current.filter(function (c) {
@@ -340,7 +340,7 @@ function KeepAliveTabs(_ref) {
       routers.current = [];
       history.push('/');
     }
-  };
+  }, []);
   var tabBarExtraContent = /*#__PURE__*/_jsx(Dropdown, {
     menu: {
       items: extraItems,
@@ -368,11 +368,18 @@ function KeepAliveTabs(_ref) {
         return onDestroy(e);
       },
       items: routers.current,
-      tabBarExtraContent: routers.current.length > 2 ? tabBarExtraContent : null
+      tabBarExtraContent: routers.current.length > 2 ? tabBarExtraContent : null,
+      tabBarStyle: {
+        margin: 0
+      },
+      renderTabBar: function renderTabBar(props, DefaultTabBar) {
+        return /*#__PURE__*/_jsx(DefaultTabBar, _objectSpread(_objectSpread({}, props), {}, {
+          className: "ccs-keep-alive-nav"
+        }));
+      }
     }), routers.current.map(function (_ref4) {
       var key = _ref4.key,
         urlAuthList = _ref4.urlAuthList,
-        timestamp = _ref4.timestamp,
         outlet = _ref4.outlet,
         breadcrumb = _ref4.breadcrumb,
         pageLocation = _ref4.pageLocation;
@@ -381,7 +388,6 @@ function KeepAliveTabs(_ref) {
         location: pageLocation,
         onDestroy: onDestroy,
         urlAuthList: urlAuthList,
-        timestamp: timestamp,
         breadcrumb: breadcrumb,
         children: outlet
       }, key);

package/es/layout-keep-alive/index.less

@@ -1,3 +1,14 @@
+// .ccs-keep-alive-nav .ant-tabs-tab {
+//   border: 0 !important;
+//   border-radius: 0 !important;
+// }
+// .ccs-keep-alive-nav .ant-tabs-tab-active {
+//   background-color: #f0f2f5 !important;
+// }
+// .ccs-keep-alive .dark .ccs-keep-alive-nav .ant-tabs-tab-active {
+//   background-color: #2b2c2c !important;
+// }
+
 .ccs-keep-alive {
   flex: 1 1 auto;
   display: flex;
@@ -33,6 +44,14 @@
     }
   }
 
+  &-nav {
+    margin: 0;
+
+    &::before {
+      border-bottom: 0 !important;
+    }
+  }
+
   &-tabs {
     background-color: #fff;
     border-bottom: 1px solid #f1f2f5;
@@ -41,29 +60,6 @@
       background-color: rgb(37, 37, 37);
       border-bottom: 0;
     }
-
-    & > .ant-tabs-nav {
-      margin: 0;
-
-      &::before {
-        border-bottom: 0;
-      }
-
-      .ant-tabs-tab {
-        border: 0;
-        border-radius: 0 !important;
-      }
-
-      .ant-tabs-tab-active {
-        background-color: #f0f2f5;
-      }
-    }
-
-    &.dark > .ant-tabs-nav {
-      .ant-tabs-tab-active {
-        background-color: #2b2c2c;
-      }
-    }
   }
 
   .ccs-tab-item {

package/es/layout-keep-alive/page.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { Location } from 'react-router';
 import { CacheRouter } from '.';
-export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'children' | 'timestamp'> & {
+export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'children'> & {
     /** 选中状态 */
     active: boolean;
     /** router location */
@@ -9,5 +9,6 @@ export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'c
     /** 销毁页面 */
     onDestroy: (path: string) => void;
 };
-declare const _default: import("react").MemoExoticComponent<(props: CachePageProps) => import("react/jsx-runtime").JSX.Element>;
+declare function CachePage(props: CachePageProps): import("react/jsx-runtime").JSX.Element;
+declare const _default: import("react").MemoExoticComponent<typeof CachePage>;
 export default _default;

package/es/layout-keep-alive/page.js

@@ -6,7 +6,7 @@ import { PageContext } from "../context";
 import { DialogElementsHolder } from "../dialog/hook";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-export default /*#__PURE__*/memo(function (props) {
+function CachePage(props) {
   var children = props.children,
     active = props.active,
     urlAuthList = props.urlAuthList,
@@ -47,6 +47,7 @@ export default /*#__PURE__*/memo(function (props) {
       })
     })
   });
-}, function (l, n) {
-  return l.active === n.active && l.timestamp === n.timestamp;
+}
+export default /*#__PURE__*/memo(CachePage, function (l, n) {
+  return l.active === n.active && l.urlAuthList.join(',') === n.urlAuthList.join(',');
 });

package/es/layout-single-page/index.d.ts

@@ -1,11 +1,13 @@
-import CCS from "..";
+import CCS from '@ccs-ui/rc-pro';
+import { CSSProperties, ReactNode } from 'react';
 import './index.less';
 type PropsType = {
     appName: string;
     menuItems: CCS.MenuType[];
-    className?: string;
+    breadcrumbStyle?: CSSProperties;
+    children?: ReactNode;
 };
-declare function SinglePage({ appName, menuItems, className }: PropsType): import("react/jsx-runtime").JSX.Element;
+declare function SinglePage({ appName, menuItems, breadcrumbStyle, children, }: PropsType): import("react/jsx-runtime").JSX.Element;
 declare namespace SinglePage {
     var displayName: string;
 }

package/es/layout-single-page/index.js

@@ -1,4 +1,3 @@
-import classnames from 'classnames';
 import { useMemo } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
@@ -6,12 +5,15 @@ import { findMenusByUrl } from "../layout-keep-alive";
 import CcsResult from "../result";
 import "./index.less";
 import Page from "./page";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 function SinglePage(_ref) {
   var appName = _ref.appName,
     _ref$menuItems = _ref.menuItems,
     menuItems = _ref$menuItems === void 0 ? [] : _ref$menuItems,
-    className = _ref.className;
+    breadcrumbStyle = _ref.breadcrumbStyle,
+    children = _ref.children;
   var location = useLocation();
   var pathname = location.pathname;
   var outlet = useOutlet();
@@ -46,14 +48,19 @@ function SinglePage(_ref) {
       menu: menu
     };
   }, [pathname, menuItems]);
-  return /*#__PURE__*/_jsx("div", {
-    className: classnames(className, "ccs-single-page"),
+  return /*#__PURE__*/_jsx(_Fragment, {
     children: menuInfo !== null && menuInfo !== void 0 && menuInfo.auth ? /*#__PURE__*/_jsx(Page, {
       location: location,
       urlAuthList: menuInfo.auth,
       breadcrumb: menuInfo.breadcrumb,
-      children: outlet
+      breadcrumbStyle: breadcrumbStyle,
+      children: /*#__PURE__*/_jsxs(_Fragment, {
+        children: [outlet, children]
+      })
     }) : /*#__PURE__*/_jsx(CcsResult.Page404, {
+      style: {
+        flex: 'auto'
+      },
       subTitle: "\u9875\u9762\u4E0D\u5B58\u5728"
     })
   });

package/es/layout-single-page/index.less

@@ -1,13 +1,7 @@
-.ccs-single-page {
-  flex: 1 1 auto;
+.ccs-sticky-scroll > div {
   display: flex;
   flex-direction: column;
-
-  .ccs-sticky-scroll > div {
-    display: flex;
-    flex-direction: column;
-    padding: 10px 16px 16px;
-  }
+  padding: 10px 16px 16px;
 }
 
 .colorful-theme {

package/es/layout-single-page/page.d.ts

@@ -1,4 +1,4 @@
-import { JSXElementConstructor, ReactElement } from 'react';
+import { CSSProperties, JSXElementConstructor, ReactElement } from 'react';
 import { Location } from 'react-router';
 import { CacheRouter } from '../layout-keep-alive';
 export type SinglePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList'> & {
@@ -6,6 +6,8 @@ export type SinglePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList'> &
     location: Location;
     /** children */
     children: ReactElement<any, string | JSXElementConstructor<any>> | null;
+    /** 语义化style */
+    breadcrumbStyle?: CSSProperties;
 };
 declare const _default: import("react").MemoExoticComponent<(props: SinglePageProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/es/layout-single-page/page.js

@@ -31,7 +31,8 @@ export default /*#__PURE__*/memo(function (props) {
       className: "ccs-sticky-scroll",
       children: [/*#__PURE__*/_jsx(Breadcrumb, {
         items: breadcrumb,
-        className: "ccs-breadcrumb"
+        className: "ccs-breadcrumb",
+        style: props.breadcrumbStyle
       }), children, /*#__PURE__*/_jsx(DialogElementsHolder, {
         ref: dialogHolderRef
       }, "modal-drawer-holder")]

package/es/pro-table/_utils.d.ts

@@ -2,7 +2,7 @@ import { TableSticky } from 'rc-table/lib/interface';
 import React, { ReactNode } from 'react';
 import CCS from '..';
 import { ShowDependType, TableStickyProps } from './table';
-declare const onTableInModalOrDrawer: (node: any) => TableStickyProps;
+declare const onTableInModalOrDrawer: (node: any, classPrefix: string) => TableStickyProps;
 declare const onTableInTabItem: (node: any) => boolean | TableSticky;
 declare const getDataById: (data: any[], rowKey: string, id: React.Key) => any;
 declare const getAllChildrenId: (data: any[], rowKey: string) => string[];

package/es/pro-table/_utils.js

@@ -1,13 +1,13 @@
 import _isArray from 'lodash.isarray';
 import React from 'react';
 // 判断组件所处dom
-var onTableInModalOrDrawer = function onTableInModalOrDrawer(node) {
-  var _parent$classList, _parent$classList2, _parent$classList3, _parent$classList4, _parent$classList5;
+var onTableInModalOrDrawer = function onTableInModalOrDrawer(node, classPrefix) {
+  var _parent$classList, _parent$classList2, _parent$classList3, _parent$classList4;
   var parent = node.parentNode;
   if (!parent) return false;
   if (
   // 通过指定dom吸顶
-  (_parent$classList = parent.classList) !== null && _parent$classList !== void 0 && _parent$classList.contains('ccs-trigger-container') || (_parent$classList2 = parent.classList) !== null && _parent$classList2 !== void 0 && _parent$classList2.contains('ccs-drawer-content') || (_parent$classList3 = parent.classList) !== null && _parent$classList3 !== void 0 && _parent$classList3.contains('ant-drawer-body')) {
+  (_parent$classList = parent.classList) !== null && _parent$classList !== void 0 && _parent$classList.contains('ccs-drawer-content') || (_parent$classList2 = parent.classList) !== null && _parent$classList2 !== void 0 && _parent$classList2.contains("".concat(classPrefix, "-drawer-body"))) {
     return {
       getContainer: function getContainer() {
         return parent;
@@ -17,20 +17,20 @@ var onTableInModalOrDrawer = function onTableInModalOrDrawer(node) {
   }
 
   // 在弹出框中吸顶top
-  if ((_parent$classList4 = parent.classList) !== null && _parent$classList4 !== void 0 && _parent$classList4.contains('ant-modal') || (_parent$classList5 = parent.classList) !== null && _parent$classList5 !== void 0 && _parent$classList5.contains('ant-drawer')) {
+  if ((_parent$classList3 = parent.classList) !== null && _parent$classList3 !== void 0 && _parent$classList3.contains("".concat(classPrefix, "-modal")) || (_parent$classList4 = parent.classList) !== null && _parent$classList4 !== void 0 && _parent$classList4.contains("".concat(classPrefix, "-drawer"))) {
     return {
       offsetHeader: 0,
       isInDialog: true
     };
   }
-  return onTableInModalOrDrawer(parent);
+  return onTableInModalOrDrawer(parent, classPrefix);
 };
 var onTableInTabItem = function onTableInTabItem(node) {
-  var _parent$classList6;
+  var _parent$classList5;
   var parent = node.parentNode;
   if (!parent) return false;
   if ( // 通过指定dom吸顶
-  (_parent$classList6 = parent.classList) !== null && _parent$classList6 !== void 0 && _parent$classList6.contains('ccs-sticky-scroll')) {
+  (_parent$classList5 = parent.classList) !== null && _parent$classList5 !== void 0 && _parent$classList5.contains('ccs-sticky-scroll')) {
     return {
       getContainer: function getContainer() {
         return node;

package/es/pro-table/form-item.d.ts

@@ -1,7 +1,9 @@
+import { NamePath } from 'antd/es/form/interface';
 import { TableFormItem } from '../ccs';
-import { CcsProTableProps } from './table';
 type PropsType = TableFormItem & {
     dependParam?: any;
-} & Pick<CcsProTableProps<any>, 'formItemLabelWidth'>;
-export default function HeadFormItem({ label, name, rules, value, dependParam, formItemLabelWidth, }: PropsType): import("react/jsx-runtime").JSX.Element;
+    groupItemNames?: NamePath[];
+    formItemLabelWidth?: number | string;
+};
+export default function HeadFormItem({ label, name, rules, value, dependParam, groupItemNames, formItemLabelWidth, }: PropsType): import("react/jsx-runtime").JSX.Element;
 export {};

package/es/pro-table/form-item.js

@@ -1,5 +1,12 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { Form } from 'antd';
 import { cloneElement } from 'react';
+import { CcsGroupFormItem } from '..';
 import { classPrefix } from "./table";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -9,19 +16,29 @@ export default function HeadFormItem(_ref) {
     rules = _ref.rules,
     value = _ref.value,
     dependParam = _ref.dependParam,
+    groupItemNames = _ref.groupItemNames,
     formItemLabelWidth = _ref.formItemLabelWidth;
+  var props = {
+    rules: rules,
+    className: "".concat(classPrefix, "-form-item"),
+    label: formItemLabelWidth ? /*#__PURE__*/_jsx("div", {
+      style: {
+        width: formItemLabelWidth
+      },
+      children: label
+    }) : label
+  };
+  if (groupItemNames) {
+    return /*#__PURE__*/_jsx(CcsGroupFormItem, _objectSpread(_objectSpread({}, props), {}, {
+      groupItemNames: groupItemNames,
+      children: dependParam ? /*#__PURE__*/cloneElement(value, dependParam) : value
+    }));
+  }
   return /*#__PURE__*/_jsx(_Fragment, {
-    children: /*#__PURE__*/_jsx(Form.Item, {
-      name: name,
-      rules: rules,
-      className: "".concat(classPrefix, "-form-label"),
-      label: formItemLabelWidth ? /*#__PURE__*/_jsx("div", {
-        style: {
-          width: formItemLabelWidth
-        },
-        children: label
-      }) : label,
+    children: /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
+      name: name
+    }, props), {}, {
       children: dependParam ? /*#__PURE__*/cloneElement(value, dependParam) : value
-    })
+    }))
   });
 }