aldehyde 0.2.55 → 0.2.57

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

@@ -1,5 +1,5 @@
 import React, {CSSProperties} from 'react'
-import {Avatar, Col, Dropdown, Menu, Row, Tooltip} from 'antd';
+import {Avatar, Col, Dropdown, Menu, MenuProps, Row, Tooltip} from 'antd';
 import {LoginOutlined, LogoutOutlined, UserOutlined} from '@ant-design/icons';
 import {UserInfo} from "../../tmpl/interface";
 import HcserviceV3 from '../../tmpl/hcservice-v3';
@@ -13,6 +13,7 @@ interface UserBarProps {
     backgroudColor?: string,
     showUserInfo?: boolean,
     showChangePassword?: boolean,
+    menu?: MenuProps
 }
 
 
@@ -89,37 +90,58 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
     }
 
     render() {
-        const {backgroudColor, showUserInfo, showChangePassword} = this.props;
+        const {backgroudColor, showUserInfo, showChangePassword,menu} = this.props;
         const {name, context, cleanCachable, gtmplSourceId, changePasswordable, changePersonalInfoable, viewPersonalInfoable, id} = this.state;
         const syyy: CSSProperties = {'--message-bar-backgroupd': backgroudColor} as CSSProperties;
-        const menu = name ? (
-            <Menu style={{minWidth: '100px'}}>
-                {showUserInfo && viewPersonalInfoable ? <Menu.Item>
-                    <UserInfoBar gtmplSourceId={gtmplSourceId} editable={changePersonalInfoable} userCode={id}/>
-                </Menu.Item> : null}
-                {context && context.length > 0 ? <Menu.Item>{/*icon={<ProfileOutlined/>}*/}
+
+        const items: MenuProps['items'] = [];
+        if (name) {
+            showUserInfo && viewPersonalInfoable ?
+                items.push({
+                    key: '1',
+                    label: (
+                        <UserInfoBar gtmplSourceId={gtmplSourceId} editable={changePersonalInfoable} userCode={id}/>
+                    ),
+                }) : null;
+            context && context.length > 0 ? items.push({
+                key: '2',
+                label: (
                     <span onClick={this.toSetContext}>全局配置</span>
-                </Menu.Item> : null}
-                {showChangePassword && changePasswordable ? <Menu.Item>
+                ),
+            }) : null;
+            showChangePassword && changePasswordable ? items.push({
+                key: '3',
+                label: (
                     <ResetPassword></ResetPassword>
-                </Menu.Item> : null}
-                {cleanCachable ?
-                    <Menu.Item>
-                        <span onClick={this.cleanCache}>清空缓存</span> {/*<ClearOutlined/>*/}
-                    </Menu.Item> : null
-                }
-
-                <Menu.Item>
+                ),
+            }) : null;
+
+            cleanCachable ? items.push({
+                    key: '4',
+                    label: (
+                        <span onClick={this.cleanCache}>清空缓存</span>
+                    ),
+                }) : null;
+
+            items.push({
+                key: '5',
+                label: (
                     <span onClick={HcserviceV3.logout}><LogoutOutlined/> 退出</span>
-                </Menu.Item>
-            </Menu>
-        ) : (<Menu style={{minWidth: '100px'}}>
-            <Menu.Item>
-                <span onClick={HcserviceV3.logout}><LoginOutlined/> 登 录</span>
-            </Menu.Item> </Menu>);
+                ),
+            });
+        } else {
+            items.push({
+                key: '2',
+                label: (
+                    <span onClick={HcserviceV3.logout}><LoginOutlined/> 登 录</span>
+                ),
+            })
+        }
+
+
         return (
             <>
-                <Dropdown overlay={menu} placement="bottom" trigger={['click']}>
+                <Dropdown menu={menu?menu:{ items}} placement="bottom" trigger={['click']}>
                     <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 }}>*/}

package/src/aldehyde/login/context-setter.tsx

@@ -8,7 +8,7 @@ import withRouter from "../routable/withroute";
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
 export interface ContextSetterProps {
-    serverKey:string,
+    serverKey?:string,
     // match:any,
 };
 

package/src/aldehyde/module/dtmpl-view-card.tsx

@@ -5,7 +5,7 @@ import DtmplEditModal from './dtmpl-edit-modal';
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
 export interface DtmplViewCardProps  {
-    serverKey:string,
+    serverKey?:string,
     sourceId?:string,
     code?:string;
     mainCode?:string;

package/src/aldehyde/module/ltmpl-table.tsx

@@ -12,7 +12,7 @@ import DtmplCustomEditModalPage from "../custom-page/dtmpl-custom-edit-modal-pag
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
 export interface LtmplTableProps {
-    serverKey:string,
+    serverKey?:string,
     sourceId: string,
     mainCode?: string;
     showView?: (code: string, toCustomPage?: boolean) => void,

package/src/aldehyde/routable/import-route.tsx

@@ -4,7 +4,7 @@ import ExcelImport from '../import/excel-import'
 import withRouter from "./withroute";
 
 export interface ImportRouteProps extends RouterCompProps {
-    serverKey:string,
+    serverKey?:string,
 };
 interface ImportRouteStat{
 

package/src/aldehyde/table/modal-select-table.tsx

@@ -14,7 +14,7 @@ import SelectedRowsCard from './selected-rows-card'
 interface ModelSelectTableProps {
     maxSelectedRows: number,
     open: boolean,
-    serverKey:string,
+    serverKey?:string,
     sourceId: string,
     mainCode:string,
     exceptCodes?: string[],

package/src/aldehyde/table/query-table.tsx

@@ -35,7 +35,7 @@ interface QueryTableProps {
         pageSize: number
     },
     columns: any[];
-    serverKey:string,
+    serverKey?:string,
     queryKey: QueryKey;
     onChangePage: (pageNo: number, pageSize: number) => void,
     onChangeRowSelection?: (selectedRows: SelectedRow[], selectedDatas: DtmplData[], allRowKeys: string[]) => void;

package/src/aldehyde/table/relation-table.tsx

@@ -27,7 +27,7 @@ const {Text} = Typography;
 
 interface RelationTableProps {
     mainCode?: string,
-    serverKey:string,
+    serverKey?:string,
     parentId: string,
     loading: boolean,
     viewOrEdit: ViewOrEdit,

package/src/aldehyde/table/select-table.tsx

@@ -12,7 +12,7 @@ import ViewControl from "../controls/view-control";
 interface SelectTableProps {
     mainCode?:string,
     maxSelectedRows?: number,
-    serverKey:string,
+    serverKey?:string,
     sourceId: string,
     selectedRows: SelectedRow[];
     selectedDatas?: DtmplData[];

package/src/aldehyde/table/stat/restat.tsx

@@ -9,7 +9,7 @@ interface RestatProps {
     onfinish: () => void;
     fields: FieldConfig[];
     value?: object;
-    serverKey:string,
+    serverKey?:string,
     sourceId:string;
 };
 

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

@@ -563,11 +563,12 @@ export default class HcserviceV3 {
     }
 
 
-    static async resetPassword(oPassword, nPassword, pubkey) {
+    static async resetPassword(serverKey:string,oPassword:string, nPassword:string, pubkey) {
         let oldPassword = EncryptUtils.rsaEncrypt(oPassword, pubkey);
         let newPassword = EncryptUtils.rsaEncrypt(nPassword, pubkey);
         let res = await Super.super({
             url: '/v3/auth/password',
+            serverKey,
             query: {
                 oldPassword, newPassword
             },
@@ -647,9 +648,10 @@ export default class HcserviceV3 {
         }
     }
 
-    static async getRasPubkey() {
+    static async getRasPubkey(serverKey?:string) {
         let res = await Super.super({
             url: '/v3/auth/ras-pubkey',
+            serverKey,
             method: "GET"
         })
         if (res.status === 'success') {

package/src/aldehyde/tmpl/interface.tsx

@@ -111,7 +111,7 @@ export type ButtonName = 'rowAdd' | 'rowEdit' | 'batchDelete'|'singleDelete'| 's
 export type ChartType = 'line' | 'pie' | 'column';
 export type GroupDisplayConfig = 'nonDataNonDisplayed' | 'displayed' | 'folded' |'unfold' | 'listview' | 'tableview';
 export interface FieldGroupConfig extends OrderableTmplBase {
-    serverKey:string,
+    serverKey?:string,
     type: FieldGroupType;
     buttons: ButtonName[];
     min: number;
@@ -311,7 +311,7 @@ export interface RouterCompProps {
 }
 
 export interface TmplBaseProps {
-    serverKey:string,
+    serverKey?:string,
     sourceId: string,
     mainCode?: string,
 };