aldehyde 0.2.39 → 0.2.42

package/src/aldehyde/detail/view/modal-dtmpl-view.tsx

@@ -41,6 +41,7 @@ export default class ModalDtmplView extends React.PureComponent<ModalDtmplViewPr
             // style={style}
             width={'1250px'}
             centered
+            wrapClassName={'aaa'}
             bodyStyle={{height: height, overflow: 'auto'}}
             onCancel={onCancel}
             footer={[
@@ -48,7 +49,7 @@ export default class ModalDtmplView extends React.PureComponent<ModalDtmplViewPr
                     取 消
                 </Button>]}
         >
-            {code?<ActDtmplView rightBarPositionRight={30} sourceId={sourceId}  code={code} />:""}
+            {code?<ActDtmplView showRightNav={false} sourceId={sourceId}  code={code} />:""}
         </Modal>
     }
 

package/src/aldehyde/layout/header/index.css

@@ -5,7 +5,8 @@
     color:#333;
     background: #fff;
     font-size: 16px;
-    border-bottom: 1px solid #40a9ff;
+    border-bottom: 1px solid ;
+    border-bottom-color: var(--antd-color-primary);
 }
 
 .header-col{
@@ -23,7 +24,7 @@
     cursor: pointer;
 }
 .message-bar:hover{
-    background: #4a5f74;
+    background: var(--message-bar-backgroupd);
     color:#fff;
     border-radius: 30%;
 }
@@ -32,7 +33,7 @@
     color:#1890ff;
 }
 .message-bar-avatar:hover{
-    background: #4a5f74;
+    background: #var(--message-bar-backgroupd);
     color:#fff;
 }
 .userLogin{
@@ -46,12 +47,12 @@
     font-size: 24px!important;
 }
 .userLogin:hover{
-    background: #4a5f74;
+    background: var(--message-bar-backgroupd);
     color:#000;
 }
 
 .loginAvatar{
-    background: #4a5f74;
+    background: var(--message-bar-backgroupd);
     font-size:20px;
     vertical-align: middle;
     line-height: 46px;
@@ -74,10 +75,10 @@
     padding-top: 0px;
     border-bottom-style: solid;
     border-bottom-width:2px;
-    border-bottom-color:#1E90FF ;
+    border-bottom-color:var(--header-block-active-bottom-color) ;
 }
 .header-top .active{
-    background: #1E90FF;
+    background: var(--header-top-active-background) ;
 }
 .header-top .active>a {
     color: #fcfcfc;

package/src/aldehyde/layout/header/index.tsx

@@ -1,12 +1,13 @@
-import React from 'react'
-import {Col, Layout, Row} from 'antd'
+import React, {CSSProperties} from 'react'
+import {Col, Layout, Row, theme} from 'antd'
 import {MenuFoldOutlined, MenuUnfoldOutlined} from '@ant-design/icons';
 import "./index.css"
 import Block, {BlockProps} from "../menu/block";
 import L2MenuMessageBar from '../menu/l2menu-message-bar';
-import L2MenuQuickBar  from '../menu/l2menu-quick-bar';
+import L2MenuQuickBar from '../menu/l2menu-quick-bar';
 import UserBar from '../menu/user-bar';
-const { Header:AntdHeader, } = Layout;
+
+const {Header: AntdHeader,} = Layout;
 
 interface HeaderProps extends BlockProps {
     toggle: any;
@@ -17,48 +18,45 @@ interface HeaderState {
 
 }
 
-class Header extends React.PureComponent<HeaderProps, HeaderState> {
-
-    toggle = () => {
-        this.props.toggle();
-    };
-
-    render() {
-
-        let {collapsed}=this.props;
-        return (
-            <AntdHeader style={{ padding: 0 , height: 'auto'}}>
-                  {/*<Row  justify="space-around" align="middle" style={{'background':'#0f4da1',height:'100px'}}>*/}
-                  {/*      <Col span={12}>*/}
-                  {/*          <img style={{height:'80px'}} src={Logo}></img>*/}
-                  {/*      </Col>*/}
-                  {/*      <Col  span={4}>*/}
-
-                  {/*      </Col>*/}
-                  {/*  </Row>*/}
-                    <Row  className="header-top" wrap={false}>
-                        <Col span={20} className="header-col" >
-                            <div style={{float: 'left'}}>
-                                {React.createElement(collapsed ? MenuUnfoldOutlined : MenuFoldOutlined, {
-                                    className: 'trigger',
-                                    onClick: this.toggle,
-                                })}
-                            </div>
-                            <Block {...this.props} />
-                        </Col>
-                        <Col span={1} style={{width: '100%'}}>
-                            <L2MenuQuickBar></L2MenuQuickBar>
-                        </Col>
-                        <Col span={1} style={{width: '100%'}}>
-                            <L2MenuMessageBar></L2MenuMessageBar>
-                        </Col>
-                        <Col span={2}>
-                            <UserBar></UserBar>
-                        </Col>
-                    </Row>
-            </AntdHeader>
-        )
-    }
+const {useToken} = theme;
+const Header: React.FC<HeaderProps> = (props) => {
+    const {token} = useToken();
+    let {collapsed} = props;
+    const syyy:CSSProperties={'--antd-color-primary': token.colorPrimary} as CSSProperties;
+    return (
+        <AntdHeader style={{padding: 0, height: 'auto'}}>
+            {/*<Row  justify="space-around" align="middle" style={{'background':'#0f4da1',height:'100px'}}>*/}
+            {/*      <Col span={12}>*/}
+            {/*          <img style={{height:'80px'}} src={Logo}></img>*/}
+            {/*      </Col>*/}
+            {/*      <Col  span={4}>*/}
+
+            {/*      </Col>*/}
+            {/*  </Row>*/}
+            <Row className="header-top" style={syyy} wrap={false}>
+                <Col span={20} className="header-col">
+                    <div style={{float: 'left'}}>
+                        {React.createElement(collapsed ? MenuUnfoldOutlined : MenuFoldOutlined, {
+                            className: 'trigger',
+                            onClick: () => {
+                                props.toggle();
+                            },
+                        })}
+                    </div>
+                    <Block {...props} activeColor={token.colorPrimary} />
+                </Col>
+                <Col span={1} style={{width: '100%'}}>
+                    <L2MenuQuickBar backgroudColor={token.colorPrimary} ></L2MenuQuickBar>
+                </Col>
+                <Col span={1} style={{width: '100%'}}>
+                    <L2MenuMessageBar backgroudColor={token.colorPrimary}></L2MenuMessageBar>
+                </Col>
+                <Col span={2}>
+                    <UserBar backgroudColor={token.colorPrimary}></UserBar>
+                </Col>
+            </Row>
+        </AntdHeader>
+    )
 }
 
 export default Header

package/src/aldehyde/layout/menu/block.tsx

@@ -1,8 +1,6 @@
-import React from "react";
+import React, {CSSProperties} from "react";
 import { Dropdown, Menu} from 'antd';
 import {BlockMenu} from "../../tmpl/interface";
-import withRouter from "../../routable/withroute";
-import {} from '@ant-design/icons';
 import MenuRender from './menu-render';
 
 
@@ -10,6 +8,7 @@ export interface BlockProps{
     blocks:BlockMenu[];
     currentBlockId?:string;
     currentL2MenuId?:string;
+    activeColor?:string;
 }
 interface BlockState{
 
@@ -17,7 +16,6 @@ interface BlockState{
 
 class Block extends React.PureComponent<BlockProps, BlockState> {
 
-
     constructor(props) {
         super(props);
     }
@@ -46,7 +44,10 @@ class Block extends React.PureComponent<BlockProps, BlockState> {
     }
 
     render(){
-        const {currentBlockId,blocks,currentL2MenuId}=this.props;
+        const {currentBlockId,blocks,currentL2MenuId,activeColor}=this.props;
+
+        const syyy={'--header-block-active-bottom-color':activeColor?activeColor:"#1E90FF",'--header-top-active-background':activeColor?activeColor:"#1E90FF"} as CSSProperties
+
         if(!blocks || blocks.length<1){
             return <></>;
         }
@@ -59,19 +60,19 @@ class Block extends React.PureComponent<BlockProps, BlockState> {
         }
 
         return (
-        blocks.map((item, index) => {
-            return <div key={index}
-                        className={`${item.id == blockId ? "active" : ""} header-block`}>
-                <Dropdown overlay={this.renderBlockMenu(item)}>
-                    <a  className="dropdown-link"
-                       // href={`#/home?blockId=${item.id}`}
-                       rel="noopener noreferrer"
-                    >
-                        {item.title}
-                    </a>
-                </Dropdown>
-            </div>
-        })
+            blocks.map((item, index) => {
+                return <div key={index}
+                            className={`${item.id == blockId ? "active" : ""} header-block`}  style={syyy}>
+                    <Dropdown overlay={this.renderBlockMenu(item)}>
+                        <a  className="dropdown-link"
+                            style={item.id == blockId?{color:'#fff'}:{color:activeColor}}
+                            rel="noopener noreferrer"
+                        >
+                            {item.title}
+                        </a>
+                    </Dropdown>
+                </div>
+            })
         );
     }
 

package/src/aldehyde/layout/menu/block1.tsx

@@ -0,0 +1,81 @@
+import React, {CSSProperties} from "react";
+import { Dropdown, Menu} from 'antd';
+import {BlockMenu} from "../../tmpl/interface";
+import MenuRender from './menu-render';
+
+
+export interface BlockProps{
+    blocks:BlockMenu[];
+    currentBlockId?:string;
+    currentL2MenuId?:string;
+    activeColor?:string;
+}
+interface BlockState{
+
+}
+
+class Block extends React.PureComponent<BlockProps, BlockState> {
+
+    constructor(props) {
+        super(props);
+    }
+
+    renderBlockMenu = (blockMenu:BlockMenu)=>{
+        return <Menu>
+            {MenuRender.renderL1Menu(blockMenu.l1Menus,null)}
+        </Menu>
+
+    }
+
+
+    findBlockId = (blocks:BlockMenu[],currentL2MenuId:string) => {
+        let blockId:string=undefined;
+        for(const block of blocks){
+            for(const menul1 of block.l1Menus){
+                for(const menul2 of menul1.l2Menus){
+                    if(menul2.id===currentL2MenuId){
+                        blockId=block.id;
+                        return blockId;
+                    }
+                }
+            }
+        }
+        return blockId;
+    }
+
+    render(){
+        const {currentBlockId,blocks,currentL2MenuId,activeColor}=this.props;
+
+        const syyy={'--header-block-active-bottom-color':activeColor?activeColor:"#1E90FF",'--header-top-active-background':activeColor?activeColor:"#1E90FF"} as CSSProperties
+
+        if(!blocks || blocks.length<1){
+            return <></>;
+        }
+        let blockId=currentBlockId;
+        if(currentL2MenuId && !blockId){
+            blockId=this.findBlockId(blocks,currentL2MenuId);
+        }
+        if(!blockId){
+            blockId=blocks.at(0).id;
+        }
+
+        return (
+        blocks.map((item, index) => {
+            return <div key={index}
+                        className={`${item.id == blockId ? "active" : ""} header-block`}  style={syyy}>
+                <Dropdown overlay={this.renderBlockMenu(item)}>
+                    <a  className="dropdown-link"
+                        style={item.id == blockId?{color:'#fff'}:{color:activeColor}}
+                       rel="noopener noreferrer"
+                    >
+                        {item.title}
+                    </a>
+                </Dropdown>
+            </div>
+        })
+        );
+    }
+
+}
+
+export default Block;

package/src/aldehyde/layout/menu/l2menu-message-bar.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, {CSSProperties} from 'react'
 import {Badge, Avatar, Dropdown, Menu} from 'antd'
 import {MessageTwoTone,BellOutlined} from '@ant-design/icons';
 import 'antd/dist/reset.css';
@@ -8,7 +8,7 @@ import {NavLink} from 'react-router-dom';
 import HCDataSource from '../../tmpl/hc-data-source'
 import Units from "../../units";
 interface L2MenuMessageBarProps {
-
+    backgroudColor?:string;
 }
 
 interface MessageBar {
@@ -27,6 +27,9 @@ class L2MenuMessageBar extends React.PureComponent<L2MenuMessageBarProps, L2Menu
         messageBars:undefined,
         anyState:false,
     }
+    static  defaultProps={
+        backgroudColor:"#4a5f74"
+    }
 
     async componentDidMount() {
         let l2Menus = await HCDataSource.messageMenus();
@@ -54,10 +57,12 @@ class L2MenuMessageBar extends React.PureComponent<L2MenuMessageBarProps, L2Menu
     }
 
 
+
     renderMessageBar = (messageBars: MessageBar[]) => {
 
+        const {backgroudColor}=this.props
         let  total:number=0;
-
+        const syyy:CSSProperties = {'--message-bar-backgroupd':backgroudColor} as CSSProperties;
         const menu = (
             <Menu key={1}>
                 { messageBars.map((messageBar, index) => {
@@ -85,7 +90,7 @@ class L2MenuMessageBar extends React.PureComponent<L2MenuMessageBarProps, L2Menu
             if(l2Menu.defaultCriteriaValue){
                 defaultCriteriaData='&'+ Units.transQueryParamsToStr(l2Menu.defaultCriteriaValue);
             }
-            return (<div  className={'message-bar'} >
+            return (<div  className={'message-bar'} style={syyy}  >
                 <a href={l2Menu.customPath ? `/page/${l2Menu.id}${l2Menu.customPath}?menuId=${l2Menu.id}` : `#/${l2Menu.id}/act-table?menuId=${l2Menu.id}${defaultCriteriaData}`}
                    className="head-example" >
                     <Badge  count={messageBar.count}   overflowCount={99} offset={[8, -2]}>
@@ -95,7 +100,7 @@ class L2MenuMessageBar extends React.PureComponent<L2MenuMessageBarProps, L2Menu
             </div>)
         }else{
             return <Dropdown overlay={menu} placement="bottomCenter"    >
-                <div  className={'message-bar'} >
+                <div  className={'message-bar'} style={syyy} >
                         <Badge  count={total}   overflowCount={99} offset={[8, -2]}>
                             <span  style={{ fontSize: '20px', color: '#08c' }} ><BellOutlined /></span>
                         </Badge>

package/src/aldehyde/layout/menu/l2menu-quick-bar.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, {CSSProperties} from 'react'
 import { Dropdown, Menu, Drawer, Space,Button} from 'antd'
 import {AppstoreOutlined} from '@ant-design/icons';
 import 'antd/dist/reset.css';
@@ -7,7 +7,7 @@ import HCDataSource from '../../tmpl/hc-data-source'
 import LtmplTable from "../../module/ltmpl-table";
 
 interface L2MenuQuickBarProps {
-
+    backgroudColor?:string;
 }
 
 interface QuickBar {
@@ -30,6 +30,9 @@ class L2MenuQuickBar extends React.PureComponent<L2MenuQuickBarProps, L2MenuQuic
         currentId:undefined,
         showDraw:false,
     }
+    static  defaultProps={
+        backgroudColor:"#4a5f74"
+    }
 
     async componentDidMount() {
         let l2Menus = await HCDataSource.quickEntranceMenus();
@@ -62,9 +65,9 @@ class L2MenuQuickBar extends React.PureComponent<L2MenuQuickBarProps, L2MenuQuic
     }
 
     renderQuickBar = (quickBars: QuickBar[]) => {
-
+        const {backgroudColor}=this.props
         let  total:number=0;
-
+        const syyy:CSSProperties={'--message-bar-backgroupd':backgroudColor} as CSSProperties;
         const menu = (
             <Menu key={1}>
                 { quickBars.map((quickBar, index) => {
@@ -86,12 +89,12 @@ class L2MenuQuickBar extends React.PureComponent<L2MenuQuickBarProps, L2MenuQuic
         }else if(quickBars.length==1){
             let quickBar=quickBars[0];
             const l2Menu = quickBar.l2Menu;
-            return (<div  className={'message-bar'} onClick={()=>this.showDraw(quickBar.l2Menu.id)}>
+            return (<div  className={'message-bar'}  style={syyy}  onClick={()=>this.showDraw(quickBar.l2Menu.id)}>
                  <span  style={{ fontSize: '20px', color: '#08c' }} ><AppstoreOutlined /></span>
             </div>)
         }else{
             return <Dropdown overlay={menu} placement="bottomCenter"   >
-                <div  className={'message-bar'} >
+                <div  className={'message-bar'}  style={syyy} >
                    <span  style={{ fontSize: '20px', color: '#08c' }} ><AppstoreOutlined /></span>
                 </div>
             </Dropdown>

package/src/aldehyde/layout/menu/reset-password.tsx

@@ -172,7 +172,8 @@ class ResetPassword extends React.PureComponent<ResetPasswordProps, ResetPasswor
                 ><span onClick={()=>{
                     this.setState({
                         showPopover:!showPopover
-                    })}} > <KeyOutlined />修改密码</span>
+                    })}} >修改密码</span>
+                    {/*<KeyOutlined />*/}
                 </Popover>
             </>
         );

package/src/aldehyde/layout/menu/user-bar.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, {CSSProperties} from 'react'
 import {Avatar, Col, Dropdown, Menu, Row, Tooltip} from 'antd';
 import {ClearOutlined, LogoutOutlined, ProfileOutlined, UserOutlined,LoginOutlined} from '@ant-design/icons';
 import {UserInfo} from "../../tmpl/interface";
@@ -11,6 +11,9 @@ import ResetPassword from "./reset-password";
 
 interface UserBarProps {
 
+
+    backgroudColor?:string,
+
 }
 
 
@@ -27,6 +30,10 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
         context: undefined,
     }
 
+    static  defaultProps={
+        backgroudColor:"#4a5f74"
+    }
+
     async componentDidMount() {
         let userInfo = await HcserviceV3.getUser();
         //查询 上下文配置信息
@@ -76,44 +83,45 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
     }
 
     render() {
+        const {backgroudColor}=this.props;
         const {name, context, roles} = this.state;
-
+        const syyy:CSSProperties={'--message-bar-backgroupd':backgroudColor}as CSSProperties;;
         const menu =name? (
             <Menu style={{minWidth: '100px'}}>
                 <Menu.Item>
                     <UserInfoBar/>
                 </Menu.Item>
-                {context && context.length > 0 ? <Menu.Item>
-                    <span onClick={this.toSetContext}><ProfileOutlined/>全局配置</span>
+                {context && context.length > 0 ? <Menu.Item  >{/*icon={<ProfileOutlined/>}*/}
+                    <span onClick={this.toSetContext}>全局配置</span>
                 </Menu.Item> : null}
                 <Menu.Item>
                     <ResetPassword></ResetPassword>
                 </Menu.Item>
                 {roles && roles.indexOf("admin") >= 0 ?
                     <Menu.Item>
-                        <span onClick={this.cleanCache}><ClearOutlined/>清空缓存</span>
+                        <span onClick={this.cleanCache}>清空缓存</span> {/*<ClearOutlined/>*/}
                     </Menu.Item> : null
                 }
 
-                <Menu.Item>
-                    <span onClick={HcserviceV3.logout}><LogoutOutlined/>退出登录</span>
+                <Menu.Item  >
+                    <span onClick={HcserviceV3.logout} ><LogoutOutlined/> 退出</span>
                 </Menu.Item>
             </Menu>
         ):(<Menu>
         <Menu.Item>
-            <span onClick={HcserviceV3.logout}><LoginOutlined />登录</span>
+            <span onClick={HcserviceV3.logout}><LoginOutlined /> 登录</span>
         </Menu.Item> </Menu>);
         return (
             <>
                 <Dropdown overlay={menu} placement="bottomRight" trigger={['click']}>
-                    <div className="userLogin">
+                    <div className="userLogin" style={syyy} >
                         {/*<Tooltip placement={'right'} title={name} >*/}
                         {/*<Avatar style={{ color:'#1890ff' }} shape="square" icon={<UserOutlined/>}  size={{ xs: 8, sm: 16, md: 24, lg: 32, xl: 40, xxl: 48 }}>*/}
                         {/*</Avatar>*/}
                         {/*</Tooltip>*/}
                         {/*<UserOutlined/>*/}
                         <Tooltip placement="left" title={this.getTitle()}>
-                            <Avatar className={'loginAvatar'} icon={<UserOutlined/>} size="large">
+                            <Avatar className={'loginAvatar'}  icon={<UserOutlined/>} size="large">
                                 {/*{name ?name.substring(0,1).toUpperCase():null}*/}
                             </Avatar>
                             {/*<span>{name && name.length>=8?name.substring(0,5)+'...':name}</span>*/}

package/src/aldehyde/layout/menu/userinfo-bar.tsx

@@ -35,7 +35,8 @@ class UserInfoBar extends React.PureComponent<UserInfoBarProps, UserInfoBarState
         const {showDraw} = this.state;
         return (
             <>
-                <span onClick={this.showDraw}><SolutionOutlined />个人信息</span>
+                <span onClick={this.showDraw}>个人信息</span>
+                {/*<SolutionOutlined />*/}
                 {showDraw?<DtmplViewDrawer title={'个人信息'} width={'calc(100% - 280px)'}  sourceId={'0'} open={showDraw} code={"userCode"} onClose={this.closeDrawer}></DtmplViewDrawer>:null}
             </>
         );

package/src/aldehyde/layout/sidebar/index.css

@@ -18,7 +18,7 @@
 	vertical-align: middle;
 	width:100%;
 	margin:0;
-	background: #0f4da1
+	background: var(--logo-blue-background);
 }
 
 .logo-dark h1{

package/src/aldehyde/layout/sidebar/index.tsx

@@ -4,7 +4,7 @@ import Units from '../../units';
 import Menu2layers from "../menu/menu-2layers";
 import {Menu2layersProps} from "../../tmpl/interface";
 import Scrollbars from 'react-custom-scrollbars';
-import {Image,Affix } from 'antd';
+import {Image, theme} from 'antd';
 interface NavLeftProps extends Menu2layersProps {
 
 }
@@ -12,15 +12,15 @@ interface NavLeftProps extends Menu2layersProps {
 interface NavLeftState {
 
 }
+const {useToken} = theme;
+const NavLeft :React.FC<NavLeftProps> = (props) =>  {
+    const {token} = useToken();
+    let {collapsed} = props;
 
-class NavLeft extends React.PureComponent<NavLeftProps, NavLeftState> {
-
-    render() {
-        let {collapsed}=this.props
         return (
             <div>
-                <Scrollbars style={{height: 'calc(100vh)'}} autoHide autoHideTimeout={1000}>
-                    <div className={collapsed?"logonly" :"logo-blue"}>
+                <Scrollbars style={{height: 'calc(100vh)','--logo-blue-background': token.colorPrimary}}  autoHide autoHideTimeout={1000}>
+                    <div className={collapsed?"logonly" :"logo-blue"} style={{}}>
                         <a href="#/home">
                             {collapsed?<Image
                                 src={Units.programName_Logo()}
@@ -28,12 +28,11 @@ class NavLeft extends React.PureComponent<NavLeftProps, NavLeftState> {
                         </a>
                     </div>
                     <Menu2layers  mode="inline"
-                                     theme="light" {...this.props}></Menu2layers>
+                                     theme="light" {...props}></Menu2layers>
                 </Scrollbars>
             </div>
 
         )
-    }
 }
 
 export default NavLeft

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -235,7 +235,7 @@ export default class HcserviceV3 {
                     msg = res.message;
                 }
                 if (message) {
-                    message.success("保存成功! " + msg)
+                    message.success("保存成功! " + msg,1)
                 }
                 code = res.entityCode ? res.entityCode : res.code;
             } else {
@@ -245,7 +245,7 @@ export default class HcserviceV3 {
             }
         } else {
             if (message) {
-                message.error("保存成功");
+                message.error("保存失败");
             }
         }
         return {code, status: res.status};
@@ -379,7 +379,7 @@ export default class HcserviceV3 {
             method: 'DELETE',
         });
         if (res.status == 'success') {
-            message.success("删除成功");
+            message.success("删除成功",1);
             return true;
         } else {
             message.error("删除失败");
@@ -441,7 +441,7 @@ export default class HcserviceV3 {
             data: {...params, sourceId}
         });
         if (res.status === 'success') {
-            message.success("统计成功")
+            message.success("统计成功",1)
         } else {
             message.error("统计失败")
         }
@@ -712,7 +712,7 @@ export default class HcserviceV3 {
             }
         },null,null);
         if(res.status != 'success'){
-            message.error("错误消息：" + res.message)
+            message.error("错误消息：" + res.message,4)
         }
         return res;
     }