aldehyde 0.1.61 → 0.1.63

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

@@ -1,4 +1,4 @@
-import React from 'react'
+import React,{ReactNode} from 'react'
 import {AddOrUpdate, DtmplData, LtmplConfigRes} from '../tmpl/interface';
 import Units from "../units";
 import ActTable,{Mode} from '../table/act-table'
@@ -15,11 +15,12 @@ export interface LtmplPageProps  {
     sourceId:string,
     mainCode?:string;
     showView?: (code: string,toCustomPage?:boolean) => void,
-    doCreate?: (toCustomPage?:boolean) => void,
-    doEdit?: (code: string,mode:AddOrUpdate,toCustomPage?:boolean) => void,
+    doCreate?: (handleOk:()=>void) => void,
+    doEdit?: (code: string,mode:AddOrUpdate,handleOk:()=>void) => void,
     doSearch?: (params: object) => void,
     doRAction?:(ractionId:string,mainCode:string)=>void,
-    funcMode?:Mode
+    funcMode?:Mode,
+    title?:ReactNode,
 };
 
 export interface LtmplPageState  {
@@ -68,7 +69,6 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                criteriaData=this.toCriteriaData(defaultCriteriaValue);
            }
         }
-
         this.setState({
             ltmplConfigRes,criteriaData
         })
@@ -84,36 +84,25 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
         return criteriaData;
     }
 
-
-    // async componentDidUpdate(prevProps) {
-    //     const {location} = this.props;
-    //     const { sourceId} = this.props.match.params;
-    //     let { sourceId: preSourceId} = prevProps.match.params;
-    //     let {location: preLocation} = prevProps;
-    //
-    //     if ( !sourceId ||
-    //         ( !preSourceId && this.state.ltmplConfigRes)
-    //         || (location.pathname == preLocation.pathname && location.search == preLocation.search)
-    //     ) {
-    //         return;
-    //     }
-    //     this.loadData();
-    // }
-
     showView = (code: string) => {
-        // const { sourceId} = this.props.match.params;
-        // this.onRoute(`/${sourceId}/detail-view?code=${code}&menuId=${this.getMenuId()}`);
         this.setState({
             selectedCode:code,
             showDtmplView:true,
         })
     }
 
-    doEdit = (code: string,mode:string) => {
-        this.setState({
-            selectedCode:code,
-            showDtmplEdit:true,
-        })
+    doEdit = (code: string,mode:AddOrUpdate,toCustomPage?:boolean) => {
+        const {doEdit}=this.props
+        if(toCustomPage && doEdit){
+            doEdit(code,mode,()=>{
+                this.doSearch(this.state.criteriaData);
+            });
+        }else{
+            this.setState({
+                selectedCode:code,
+                showDtmplEdit:true,
+            })
+        }
     }
     doRAction = (ractionId:string,mainCode:string) => {
         this.setState({
@@ -122,11 +111,18 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
             ractionId
         })
     }
-    doCreate = () => {
-        this.setState({
-            selectedCode:null,
-            showDtmplEdit:true,
-        })
+    doCreate = (toCustomPage) => {
+        const {doCreate}=this.props
+        if(toCustomPage && doCreate){
+            doCreate(()=>{
+                this.doSearch(this.state.criteriaData);
+            });
+        }else{
+            this.setState({
+                selectedCode:null,
+                showDtmplEdit:true,
+            })
+        }
     }
     closeDrawer=()=>{
         this.setState({
@@ -136,21 +132,15 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
 
     doSearch = (params_) => {
         const { sourceId,mainCode} = this.props;
-        //const oldfliter = history.location.search.slice(1);
-
         let params = {...params_}
         //追加过滤条件，hiddenColIds，innerQueryKey
         if (mainCode) {
             params['mainCode'] = mainCode;
         }
         params['sourceId'] = sourceId;
-       // const criteriaData = Units.transQueryParamsToStr(params);
-       // let flag = true;
-        //if (newfliter && oldfliter != newfliter) { //查询条件更新时
         this.setState({
             criteriaData:this.toCriteriaData(params)
         });
-
     }
 
     handleDtmplEdit =  (code: string) => {
@@ -163,15 +153,15 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
 
     render() {
         const {ltmplConfigRes,criteriaData,showDtmplView,selectedCode,showDtmplEdit,ractionId,showDraw} = this.state;
-        const { sourceId,mainCode,showView,doCreate,doEdit,doSearch,doRAction,funcMode} = this.props;
+        const { sourceId,mainCode,showView,doSearch,doRAction,funcMode,title} = this.props;
 
         if (!ltmplConfigRes) {
             return <></>;
         } else {
             const {buttons}=ltmplConfigRes.ltmplConfig
             return <>
-                <ActTable funcMode={funcMode} mainCode={mainCode} showView={showView?showView:this.showView} doRAction={doRAction?doRAction:this.doRAction}
-                             doSearch={doSearch?doSearch:this.doSearch} doEdit={doEdit?doEdit:this.doEdit} doCreate={doCreate?doCreate:this.doCreate}
+                <ActTable title={title} funcMode={funcMode} mainCode={mainCode} showView={showView?showView:this.showView} doRAction={doRAction?doRAction:this.doRAction}
+                             doSearch={doSearch?doSearch:this.doSearch} doEdit={this.doEdit} doCreate={this.doCreate}
                              sourceId={sourceId} criteriaData={criteriaData}
                              ltmplConfig={ltmplConfigRes.ltmplConfig} />
                 {buttons.includes('detail') ?