aldehyde 0.2.19 → 0.2.21

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

@@ -21,11 +21,13 @@ interface SelectTableProps {
 };
 
 interface SelectTableStat {
-    selectConfig: SelectConfig;
-    columns: object[];
-    queryKey: QueryKey;
-    loading: boolean;
-    criteriaData: object;
+    selectConfig?: SelectConfig;
+    columns?: object[];
+    queryKey?: QueryKey;
+    loading?: boolean;
+    criteriaData?: object;
+    pageNo?:number,
+    pageSize?:number,
 };
 
 class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat> {
@@ -40,6 +42,8 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         loading: true,
         criteriaData: undefined,
         disableCols: undefined,
+        pageNo:1,
+        pageSize:undefined,
     }
 
     loadData = async (selectConfig: SelectConfig, criteriaData: object) => {
@@ -47,10 +51,11 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
             loading: true,
         })
         const {mainCode}=this.props;
+        const {pageNo,pageSize}=this.state;
         const {defaultPageSize} = selectConfig;
         let pageInfo = {
-            pageNo: 1,
-            pageSize: defaultPageSize ? defaultPageSize : 10,
+            pageNo: pageNo,
+            pageSize: pageSize?pageSize:defaultPageSize ? defaultPageSize : 10,
             virtualEndPageNo: undefined,
         }
         const {sourceId} = this.props;
@@ -65,7 +70,6 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
     }
 
     async componentDidMount() {
-        const {sourceId} = this.props;
         await this.loadData(await this.loadConfig(), {});
     }
 
@@ -206,10 +210,16 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         onChange(selectedRows_new, selectedDatas_new);
     }
 
+    onChangePage=(pageNo,pageSize)=>{
+
+        this.setState({pageNo,pageSize})
+
+    }
+
 
     render() {
         let {maxSelectedRows, selectedRows, selectedDatas} = this.props;
-        let {queryKey, columns, selectConfig, criteriaData, loading} = this.state;
+        let {queryKey, columns, selectConfig, criteriaData, loading,pageNo,pageSize} = this.state;
 
         if (!selectConfig) {
             return <>
@@ -234,7 +244,9 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
                               data={criteriaData}
                               doSearch={this.doSearch} loading={loading}/>
                 <QueryTable maxSelectedRows={maxSelectedRows} selectedRows={selectedRows} columns={columns}
-                            defaultPageSize={selectConfig.defaultPageSize}
+                            pageInfo={{pageNo,
+                                pageSize: pageSize?pageSize:selectConfig.defaultPageSize}}
+                            onChangePage={this.onChangePage}
                             queryKey={queryKey}
                             onChangeRowSelection={this.changeRowSelection}/>
             </div>

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

@@ -13,8 +13,8 @@ interface RestatProps {
 };
 
 interface RestatStat {
-    popoverOpen: boolean;
-    loading:boolean,
+    popoverOpen?: boolean;
+    loading?:boolean,
 };
 
 class Restat extends React.PureComponent<RestatProps, RestatStat> {

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

@@ -727,6 +727,21 @@ export default class HcserviceV3 {
         return res;
     }
 
+    static async doCopy(sourceId:string,code:string,copyRelation,copyOpp2One) {
+        let res = await Super.super({
+            url: `/v3/mstruc/copy-data`,
+            method: "POST",
+            query: {
+                sourceId,
+                code,copyRelation,copyOpp2One
+            }
+        },null,null);
+        if(res.status != 'success'){
+            message.error("错误消息：" + res.message)
+        }
+        return res;
+    }
+
     static async initProgramConfig(ProgramConfigJson) {
         //设置项目配置信息
         if (ProgramConfigJson['programCode']) {

package/src/aldehyde/tmpl/interface.tsx

@@ -1,5 +1,6 @@
 import {MenuProps} from "antd/lib/menu";
 import {FormInstance} from "antd";
+import React from "react";
 
 export type ViewOrEdit = 'view' | 'edit' ;
 
@@ -278,7 +279,10 @@ export interface RouterCompProps {
     basePath?:string;
     match?: any;
     history?: any;
-    location?: any;
+    location: any;
+    navigate?:any;
+    params:any,
+    searchParams:any,
 }
 
 export interface TmplBaseProps {

package/src/aldehyde/units/index.tsx

@@ -92,11 +92,16 @@ export default {
         }
 
     },setProgramCode(programCode_: string) {
-        window.localStorage.setItem('programCode',programCode_);
-        window.sessionStorage.setItem('programCode',programCode_);
+        if(programCode_){
+            window.localStorage.setItem('programCode',programCode_);
+            window.sessionStorage.setItem('programCode',programCode_);
+        }
     },
     setSessionProgramCode(programCode_: string) {
-        window.sessionStorage.setItem('programCode',programCode_);
+        if(programCode_){
+            window.sessionStorage.setItem('programCode',programCode_);
+        }
+
     },
     programCode() {
         let programCode=window.sessionStorage.getItem('programCode');
@@ -722,18 +727,18 @@ export default {
         }
         return path;
     },
-    getRouteProgramCode(pathProps){
-        if (pathProps && pathProps.match && pathProps.match.params) {
-            const {programCode} = pathProps.match.params;
-            return programCode;
-        }
-    },
-    setProgramCode4RoutePath(pathProps){
-        let programCode= this.getRouteProgramCode(pathProps);
+    // getRouteProgramCode(pathProps){
+    //     if (pathProps && pathProps.match && pathProps.match.params) {
+    //         const {programCode} = pathProps.match.params;
+    //         return programCode;
+    //     }
+    // },
+    setProgramCode4RoutePath(pathParams){
+        let programCode= pathParams.programCode;
         this.setProgramCode(programCode);
     },
-    setSessionProgramCode4RoutePath(pathProps){
-       let programCode= this.getRouteProgramCode(pathProps);
+    setSessionProgramCode4RoutePath(pathParams){
+       let programCode= pathParams.programCode;;
        this.setSessionProgramCode(programCode);
     }
 }

package/src/aldehyde/welcome/quick-entrance.tsx

@@ -10,7 +10,7 @@ interface QuickEntranceProps extends CardProps{
 }
 
 interface QuickEntranceState {
-    l2Menus:Level2Menu[]
+    l2Menus?:Level2Menu[]
 }
 
 class QuickEntrance extends React.PureComponent<QuickEntranceProps, QuickEntranceState> {

package/src/aldehyde/welcome/workbench.tsx

@@ -10,7 +10,7 @@ interface WorkbenchProps extends CardProps {
 }
 
 interface WorkbenchState {
-    l2Menus: Level2Menu[]
+    l2Menus?: Level2Menu[]
 }
 
 class Workbench extends React.PureComponent<WorkbenchProps, WorkbenchState> {