aldehyde 0.2.235 → 0.2.237

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

@@ -30,17 +30,6 @@ class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCar
     static defaultProps={editable:true,
         showHeader:true}
 
-    // async componentDidMount() {
-    //     this.loadDtmplConfig();
-    // }
-    //
-    // async componentDidUpdate(prevProps) {
-    //     const { sourceId} = this.props;
-    //     if(!prevProps || prevProps.sourceId!=sourceId){
-    //         this.loadDtmplConfig();
-    //     }
-    // }
-
     goDtmpl=()=>{
         this.setState({
             showDtmplEdit:true,

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

@@ -31,6 +31,7 @@ export interface LtmplTableProps {
   collapsible?: boolean;
   initCollapse?: boolean;
   readOnly?: boolean;
+  rowOperatable?: boolean;
 }
 
 export interface LtmplTableState {
@@ -72,6 +73,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
     collapsible: false,
     initCollapse: false,
     readOnly: false,
+    rowOperatable:true,
   };
 
   async componentDidMount() {
@@ -237,20 +239,12 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
       addTmplId,dtmplSourceId,
     } = this.state;
     const {
-      sourceId,
-      mainCode,
-      showView,
-      doSearch,
-      doRAction,
-      funcMode,
-      tip,
-      title,
-      collapsible,
-      initCollapse,
-      doCustomEdit,
-      doCustomCreate,
-      serverKey,
-      readOnly,
+      sourceId, mainCode,
+      showView, doSearch,
+      doRAction, funcMode,
+      tip, title, collapsible,
+      initCollapse, doCustomEdit, doCustomCreate,
+      serverKey,rowOperatable, readOnly,
     } = this.props;
     const { translate } = this.context;
 
@@ -260,24 +254,16 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
       const { buttons, customEditPagePath } = ltmplConfigRes.ltmplConfig;
       return (
         <>
-          <ActTable
-            readOnly={readOnly}
-            tip={tip}
-            serverKey={serverKey}
-            pageSize={pageSize}
-            pageNo={pageNo}
-            onChangePage={this.onChangePage}
-            collapsible={collapsible}
+          <ActTable operatable={rowOperatable} readOnly={readOnly} tip={tip}
+            serverKey={serverKey} pageSize={pageSize} pageNo={pageNo}
+            onChangePage={this.onChangePage} collapsible={collapsible}
             initCollapse={initCollapse && collapse}
-            title={title}
-            funcMode={funcMode}
-            mainCode={mainCode}
+            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}
+            doCreate={this.doCreate} sourceId={sourceId}
             criteriaData={criteriaData}
             customEditable={doCustomEdit ? true : false}
             customCreatable={doCustomCreate ? true : false}

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

@@ -5,6 +5,7 @@ import DtmplEdit from "../detail/edit/dtmpl-edit";
 import ActDtmplView from "../detail/view/act-dtmpl-view";
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import withRouter from "./withroute";
+import TabActDtmplView from "../detail/view/tab-act-dtmpl-view";
 
 export interface DtmplRouteProps extends RouterCompProps {
   layoutRootPath?: string;
@@ -136,7 +137,7 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
     let versionId = params["versionId"];
     if (location.pathname.endsWith("detail-view")) {
       return (
-        <ActDtmplView
+        <TabActDtmplView
           serverKey={null}
           goBackToLtmpl={codeSource ? undefined : this.goBackToLtmpl}
           goDtmpl={this.goDtmpl}

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

@@ -18,10 +18,12 @@ import DtmplViewDrawer from "../module/dtmpl-view-drawer";
 import DtmplCustomEditModalPage from "../custom-page/dtmpl-custom-edit-modal-page";
 import DtmplEditPage from "../module/dtmpl-edit-page";
 import DtmplViewModal from "../module/dtmpl-view-modal";
+import {arrowsOptions} from "ketcher-react/dist/script/ui/views/toolbars/LeftToolbar/leftToolbarOptions";
 
 export interface LtmplRouteProps extends RouterCompProps {
     layoutRootPath?: string;
     tableType?:"common"|"report";
+    rowOperatable?: boolean;
 }
 
 export interface LtmplRouteState {
@@ -44,6 +46,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     static defaultProps = {
         basePath: "",
         tableType:"common",
+        rowOperatable:true,
     };
     state = {
         ltmplConfigRes: undefined,
@@ -55,7 +58,8 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         showViewDrawer: false,
         showViewModal: false,
         showEdit: false,
-        showWindowType: "modal"
+        showWindowType: "modal",
+        routeMode:'multiple',
     };
 
     async componentDidMount() {
@@ -126,7 +130,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         const {sourceId} = this.props.params;
         const {ltmplConfigRes} = this.state;
         let ltmplConfig: LtmplConfig = ltmplConfigRes.ltmplConfig;
-        let showType: string = !ltmplConfig.buttonViewConfig ? "routing" : ltmplConfig.buttonViewConfig.showType;
+        let showType: string = !ltmplConfig.buttonViewConfig ? "drawer" : ltmplConfig.buttonViewConfig.showType;
 
         let dtmplSourceId = showViewParam.dtmplSourceId
             ? showViewParam.dtmplSourceId
@@ -165,7 +169,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         let ltmplConfig: LtmplConfig = ltmplConfigRes.ltmplConfig;
         let showWindowType: PageType;
 
-        showWindowType = !ltmplConfig.buttonEditConfig ? "routing" : ltmplConfig.buttonEditConfig.showType;
+        showWindowType = !ltmplConfig.buttonEditConfig ? "modal" : ltmplConfig.buttonEditConfig.showType;
 
         let dtmplSourceId = param.dtmplSourceId ? param.dtmplSourceId : sourceId;
         let path = `${basePath}${
@@ -212,7 +216,9 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         const {sourceId} = this.props.params;
         const {ltmplConfigRes} = this.state;
         let ltmplConfig: LtmplConfig = ltmplConfigRes.ltmplConfig;
-        let showWindowType: string = !ltmplConfig.buttonAddConfig ? "routing" : ltmplConfig.buttonAddConfig.showType;
+
+        let showWindowType: string = !ltmplConfig.buttonAddConfig ?"modal" : ltmplConfig.buttonAddConfig.showType;
+
         let path = `${basePath}${
             this.computedLayoutPath
         }/${sourceId}/detail-edit?menuId=${this.getMenuId()}&addTmplId=${
@@ -271,7 +277,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             ),
             ...params_,
         };
-        //params['sourceId'] = sourceId;
+
         const newfliter = Units.transQueryParamsToStr({...params});
         this.props.navigate(
             `${basePath}${this.computedLayoutPath}/${sourceId}/${this.pathMark()}?${newfliter}`,
@@ -290,9 +296,6 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         }
         const {pageSize, pageNo} = this.state;
         params["pageNo"] = 1;
-        // if (pageNo) {
-        //     params["pageNo"] = 1;
-        // }
         if (pageSize) {
             params["pageSize"] = pageSize;
         }
@@ -320,8 +323,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             ltmplConfigRes, showDraw, showWindowType, ractionId, selectedCode,
             showViewDrawer, showViewModal, showEdit
         } = this.state;
-        const {location, params,tableType} = this.props;
-
+        const {location, params,tableType,rowOperatable} = this.props;
         const {sourceId} = params;
         const {translate} = this.context;
         //let menuId = undefined;
@@ -341,41 +343,37 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
 
         let ltmplConfig = ltmplConfigRes ? ltmplConfigRes.ltmplConfig : null;
 
+        let windowWidth = ltmplConfig?.buttonViewConfig?.windowWidth
+        windowWidth= windowWidth && windowWidth>0 ? windowWidth : 1280;
+
+        let windowHeight = ltmplConfig?.buttonViewConfig?.windowHeight;
+        windowHeight= windowHeight && windowHeight>0 ? windowHeight : '80vh';
+
+        let windowEditWidth = ltmplConfig?.buttonEditConfig?.windowWidth;
+        windowEditWidth= windowEditWidth && windowEditWidth>0 ? windowEditWidth : 1280;
+
+        let windowEditHeight = ltmplConfig?.buttonEditConfig?.windowHeight;
+        windowEditHeight= windowEditHeight && windowEditHeight>0 ? windowEditHeight : '80vh';
+
         if (!ltmplConfig) {
             return <></>;
         } else {
             return (
                 <>
                     <ActTable
-                        tableType={tableType}
-                        serverKey={null}
-                        pageSize={pageSize}
-                        pageNo={pageNo}
-                        onChangePage={this.onChangePage}
-                        menuId={this.getMenuId()}
-                        mainCode={mainCode}
-                        showView={this.showView}
-                        doSearch={this.onChangeSearch}
-                        doEdit={this.doEdit}
-                        doCreate={this.doCreate}
-                        sourceId={sourceId}
-                        criteriaData={criteriaData}
-                        ltmplConfig={ltmplConfig}
-                        doRAction={this.doRAction}
+                        tableType={tableType} serverKey={null} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}
+                        menuId={this.getMenuId()} operatable={rowOperatable}
+                        mainCode={mainCode} showView={this.showView} doSearch={this.onChangeSearch} doEdit={this.doEdit}
+                        doCreate={this.doCreate} sourceId={sourceId}
+                        criteriaData={criteriaData} ltmplConfig={ltmplConfig} doRAction={this.doRAction}
                     />
                     {showDraw ? (
                         <Drawer
-                            placement={"left"}
-                            title={translate("${关联查询}")}
-                            closable={true}
-                            mask={false}
-                            onClose={this.doClose}
-                            open={showDraw}
-                            width={"calc(100% - 280px)"}
+                            placement={"left"} title={translate("${关联查询}")} closable={true} mask={false} onClose={this.doClose}
+                            open={showDraw} width={"calc(100% - 280px)"}
                             style={{
                                 maxWidth: 1960,
-                            }}
-                            extra={
+                            }} extra={
                                 <Space>
                                     <Button onClick={this.doClose}>
                                         {translate("${关闭}")}
@@ -384,19 +382,14 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                             }
                         >
                             {
-                                <LtmplTable
-                                    serverKey={null}
-                                    sourceId={ractionId}
-                                    mainCode={selectedCode}
-                                ></LtmplTable>
+                                <LtmplTable serverKey={null} sourceId={ractionId} mainCode={selectedCode}></LtmplTable>
                             }
                         </Drawer>
                     ) : null}
                     {showViewDrawer && selectedCode ? (
                         <DtmplViewDrawer
-                            serverKey={null}
-                            placement={ltmplConfig.buttonViewConfig.windowPosition}
-                            width={ltmplConfig.buttonViewConfig.windowWidth}
+                            serverKey={null} placement={ltmplConfig.buttonViewConfig.windowPosition}
+                            width={ windowWidth}
                             onClose={this.doClose}
                             open={showViewDrawer}
                             sourceId={sourceId}
@@ -405,12 +398,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                     ) : null}
                     {showViewModal && selectedCode ? (
                         <DtmplViewModal
-                            serverKey={null}
-                            width={ltmplConfig.buttonViewConfig.windowWidth}
-                            height={ltmplConfig.buttonViewConfig.windowHeight}
-                            onClose={this.doClose}
-                            open={showViewModal}
-                            sourceId={sourceId}
+                            serverKey={null} width={windowWidth} height={windowHeight} onClose={this.doClose} open={showViewModal} sourceId={sourceId}
                             code={selectedCode}
                         ></DtmplViewModal>
                     ) : null}
@@ -432,8 +420,8 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                                 serverKey={null}
                                 pageType={showWindowType=="modal"?"modal":"drawer"}
                                 open={showEdit}
-                                width={selectedCode ? ltmplConfig.buttonEditConfig.windowWidth : ltmplConfig.buttonAddConfig.windowWidth}
-                                height={selectedCode ? ltmplConfig.buttonEditConfig.windowHeight : ltmplConfig.buttonAddConfig.windowHeight}
+                                width={windowEditWidth }
+                                height={windowEditHeight}
                                 onCancel={this.doClose}
                                 mainCode={mainCode}
                                 sourceId={sourceId}

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

@@ -12,6 +12,7 @@ import ActTree from "../tree/act-tree";
 import { Card } from "antd";
 export interface TtmplRouteProps extends RouterCompProps {
   layoutRootPath?: string;
+  treeTop?:number,
 }
 
 export interface TtmplRouteState {
@@ -78,14 +79,14 @@ class TtmplRoute extends React.PureComponent<TtmplRouteProps, TtmplRouteState> {
   }
 
   render() {
-    const {} = this.props;
+    const {treeTop} = this.props;
     const { ttmplConfig } = this.state;
     if (!ttmplConfig) {
       return <Card loading={true}></Card>;
     } else {
       return (
         <>
-          <ActTree ttmplConfig={ttmplConfig}></ActTree>
+          <ActTree top={treeTop} ttmplConfig={ttmplConfig}></ActTree>
         </>
       );
     }

package/src/aldehyde/routable/withroute.tsx

@@ -9,14 +9,24 @@ import {
 const withRouter = (Comp) => (props) => {
   const location = useLocation();
   const navigate = useNavigate();
-  const params = useParams();
+
   const [searchParams, setSearchParams] = useSearchParams();
+
+  const {pathname} = location;
+    const {sourceId} = useParams();
+   //let sourceId= pathname.split("/")[2];
+
+  // debugger
+  // if(location.pathname.indexOf(sourceId)<=0){
+  //   return <></>
+  // }
+
   return (
     <Comp
       {...props}
       location={location}
       navigate={navigate}
-      params={params}
+      params={{sourceId}}
       searchParams={searchParams}
     />
   );