aldehyde 0.2.19 → 0.2.21

package/src/aldehyde/controls/html-editor/draft.tsx

@@ -3,7 +3,7 @@ import * as React from 'react'
 import {Card} from "antd";
 import {VEControlProps} from "../../tmpl/interface";
 // 核心
-import { EditorState, convertToRaw,convertFromRaw, ContentState } from 'draft-js'
+import { EditorState, ContentState } from 'draft-js'
 import { Editor } from 'react-draft-wysiwyg'
 import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css'
 // draft 转换为 html
@@ -16,7 +16,7 @@ interface DraftProps extends VEControlProps {
 }
 
 interface DraftState  {
-    editorState:boolean;
+    editorState?:boolean;
 }
 
 export default class Draft extends React.PureComponent<DraftProps, DraftState>{

package/src/aldehyde/controls/relation-existion/index.tsx

@@ -10,7 +10,7 @@ interface RelationExistionProps extends EControlProps {
 };
 
 interface RelationExistionState {
-    showSelectTable: boolean;
+    showSelectTable?: boolean;
 };
 
 export default class RelationExistion extends React.PureComponent<RelationExistionProps, RelationExistionState> {

package/src/aldehyde/controls/rfield/index.tsx

@@ -8,10 +8,10 @@ interface RfieldProps extends VControlProps {
 };
 
 interface RfieldState {
-    showDtmplView: boolean;
-    showSelectTable: boolean;
-    selectedCodes: string[];
-    openCode: string;
+    showDtmplView?: boolean;
+    showSelectTable?: boolean;
+    selectedCodes?: string[];
+    openCode?: string;
 };
 
 export default class Rfield extends React.PureComponent<RfieldProps, RfieldState> {

package/src/aldehyde/controls/signature/index.tsx

@@ -10,9 +10,9 @@ interface SignatureProps extends VEControlProps {
 }
 
 interface SignatureState {
-    modalOpen: boolean,
-    molFileLoaded: boolean,
-    trimmedDataURL:any,
+    modalOpen?: boolean,
+    molFileLoaded?: boolean,
+    trimmedDataURL?:any,
 }
 
 export default class Signature extends React.PureComponent<SignatureProps, SignatureState> {

package/src/aldehyde/custom-page/custom-page-router.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import DefCustomPage from "./def-custom-page";
 import {TmplInterface,ProgramConfig} from "../index";
 import Units from "../units";
+import withRouter from "../routable/withroute";
 
 export interface CustomPageRouterProps extends TmplInterface.RouterCompProps {
 
@@ -37,38 +38,40 @@ export interface CustomPageRouterStat {
         if(mainCode){
             url=url+`&mainCode=${mainCode}`;
         }
-        this.props.history.push(url);
+        this.props.navigate(url);
     }
 
     getMainCode = () => {
-        const {location} = this.props;
-        let search = location.search;
-        let mainCode = undefined;
-        let criteriaData = Units.transQueryStrToParams(search);
-        if (search.indexOf('mainCode') > 0) {
-            criteriaData = Units.transQueryStrToParams(search);
-            mainCode = criteriaData['mainCode'];
-        }
-        return mainCode;
+        const {searchParams} = this.props;
+        // let search = location.search;
+        // let mainCode = undefined;
+        // let criteriaData = Units.transQueryStrToParams(search);
+        // if (search.indexOf('mainCode') > 0) {
+        //     criteriaData = Units.transQueryStrToParams(search);
+        //     mainCode = criteriaData['mainCode'];
+        // }
+        return searchParams.get("mainCode");
     }
 
     getMenuId=()=>{
-        const {location} = this.props;
+        const {searchParams} = this.props;
         //console.log("this.props.match.params",this.props);
-        var searchParams = new URLSearchParams( location.search);
+        // var searchParams = new URLSearchParams( location.search);
         let menuId = searchParams.get('menuId');
         return menuId;
     }
 
     render() {
+        debugger
         // console.log("CustomPageRouter",this.props);
-        let pageName = this.props.match.params.pageName;
+        let pageName = this.props.params.pageName;
         let search = this.props.location.search;
         let criteriaData = Units.transQueryStrToParams(search);
         let Page = ProgramConfig.getCustomPage("/" + pageName) || DefCustomPage;
+
         //console.log("CustomPageRouter",{...this.props.match.params, ...criteriaData});
-        return React.createElement(Page, {...this.props.match.params,goBack:this.goBackToLtmpl, ...criteriaData});
+        return React.createElement(Page, {...this.props.params,goBack:this.goBackToLtmpl, ...criteriaData});
     }
 }
 
-export default CustomPageRouter;
+export default withRouter(CustomPageRouter);

package/src/aldehyde/detail/button/submit-button-bar.tsx

@@ -112,13 +112,12 @@ class SubmitButtonBar extends React.PureComponent<SubmitButtonProps, SubmitButto
                 <div className={'submitButtonBar'} >
                     <ul>
                         {buttons.includes('dtmplSave') ? <li key={100}>
-                            <Popconfirm placement="left" title={"确定要保存修改吗?"} onConfirm={() => doSubmit()} okText="确定" cancelText="取消">
                             <Button
+                                onClick={() => doSubmit()}
                                 type='primary'
                                 icon={<SaveOutlined/>}
                                 key="btn" block
                             >保 存</Button>
-                            </Popconfirm>
                         </li> : ""
                         }
                         {//处理前两个

package/src/aldehyde/detail/edit/dtmpl-edit.tsx

@@ -17,14 +17,14 @@ interface DtmplEditProps extends DtmplBaseProps {
 }
 
 interface DtmplEditState {
-    id:string,
-    dtmplConfig: DtmplConfig,
-    dtmplData:DtmplData,
-    showPostResult: boolean;
+    id?:string,
+    dtmplConfig?: DtmplConfig,
+    dtmplData?:DtmplData,
+    showPostResult?: boolean;
     // addOrUpdate?: AddOrUpdate;
     // dtmplData: DtmplData;
-    loading: boolean;
-    serial:number,
+    loading?: boolean;
+    serial?:number,
 }
 
 export default class DtmplEdit extends React.PureComponent<DtmplEditProps, DtmplEditState> {
@@ -174,9 +174,9 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
         const {goDtmpl,code:propCode,goBackToLtmpl}=this.props;
         this.newCode=undefined;
         goDtmpl(code);
-        this.setState({
-            showPostResult:false,
-        })
+        this.setState(state =>({
+            showPostResult:false
+        }))
     }
 
     goAdd = () => {
@@ -185,9 +185,9 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
         if(propCode){
             goDtmpl();
         }
-        this.setState({
+        this.setState(state =>({
             showPostResult:false,
-        })
+        }))
     }
 
     render() {

package/src/aldehyde/detail/edit/row-edit-card.tsx

@@ -17,7 +17,7 @@ interface RowEditCardProps {
 }
 
 interface RowEditCardState {
-    isAdded:boolean,
+    isAdded?:boolean,
 }
 
 export default class RowEditCard extends React.PureComponent<RowEditCardProps, RowEditCardState> {

package/src/aldehyde/detail/edit/row-editor.tsx

@@ -15,7 +15,7 @@ interface RowEditorProps {
 }
 
 interface RowEditorState {
-    popoverOpen: boolean,
+    popoverOpen?: boolean,
 }
 
 export default class RowEditor extends React.PureComponent<RowEditorProps, RowEditorState> {

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

@@ -14,12 +14,12 @@ export interface ActDtmplViewProps extends DtmplBaseProps {
 };
 
 export interface ActDtmplViewStat {
-    loading: boolean,
-    dtmplConfig: DtmplConfig,
-    premisesTitle: string,
-    snapshotOpen: boolean,
-    layout: object,
-    refreshCode: string,
+    loading?: boolean,
+    dtmplConfig?: DtmplConfig,
+    premisesTitle?: string,
+    snapshotOpen?: boolean,
+    layout?: object,
+    refreshCode?: string,
 };
 
 class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewStat> {

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

@@ -19,10 +19,10 @@ export interface DtmplViewProps extends DtmplBaseProps {
 
 export interface DtmplViewStat {
     id?:string;
-    loading: boolean,
-    dtmplData: DtmplData,
-    premisesTitle: string,
-    layout: object,
+    loading?: boolean,
+    dtmplData?: DtmplData,
+    premisesTitle?: string,
+    layout?: object,
 };
 
 class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {

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

@@ -1,8 +1,6 @@
 import React from 'react';
 import {Modal, ModalProps as AntdModalProps,Form,Button} from 'antd'
-import {DtmplConfig, EnumItem, ViewOrEdit} from "../../tmpl/interface";
 import ActDtmplView, {ActDtmplViewProps} from "./act-dtmpl-view";
-import Scrollbars from 'react-custom-scrollbars';
 interface ModalDtmplViewProps extends AntdModalProps, ActDtmplViewProps{
     height:any,
     onCancel:()=>any,

package/src/aldehyde/detail/view/snapshot-timeline.tsx

@@ -16,8 +16,8 @@ export interface SnapshotTimelineProps {
 };
 
 export interface SnapshotTimelineStat {
-    list: any[],
-    loading: boolean,
+    list?: any[],
+    loading?: boolean,
     current?: number;
 };
 

package/src/aldehyde/exportor/export-frame.tsx

@@ -15,17 +15,17 @@ interface ExportFrameProps {
 }
 
 interface ExportFrameStat {
-    interrupted:boolean,
-    disabledPageNoInput:boolean,
-    disabledCurrentPageRadio:boolean,
-    disabledAllPageRadio:boolean,
-    exportId:string,
-    startPageNo:number,
-    endPageNo:number,
-    exportMode:string,
-    percent:number,
-    exportStatus:string,
-    exportingMsg:string,
+    interrupted?:boolean,
+    disabledPageNoInput?:boolean,
+    disabledCurrentPageRadio?:boolean,
+    disabledAllPageRadio?:boolean,
+    exportId?:string,
+    startPageNo?:number,
+    endPageNo?:number,
+    exportMode?:string,
+    percent?:number,
+    exportStatus?:string,
+    exportingMsg?:string,
 }
 
 

package/src/aldehyde/form/dtmpl-form.tsx

@@ -23,9 +23,9 @@ export interface DtmplFormProps extends DtmplBaseProps {
 };
 
 interface DtmplFormStat {
-    loading: boolean,
-    dtmplData: DtmplData,
-    appDtmplConfig:DtmplConfig,
+    loading?: boolean,
+    dtmplData?: DtmplData,
+    appDtmplConfig?:DtmplConfig,
 };
 
 

package/src/aldehyde/form/form-Item-group.tsx

@@ -18,7 +18,7 @@ export interface FieldGroupProps {
 };
 
 interface FieldGroupState {
-    fileList: any,
+    fileList?: any,
 };
 
 export default class FormItemGroup extends React.PureComponent<FieldGroupProps, FieldGroupState> {

package/src/aldehyde/import/excel-import.tsx

@@ -18,17 +18,17 @@ interface ExcelImportProps  {
 };
 
 interface ExcelImportStat {
-    inputMaxMsgCount:number;
-    maxMsgCount:number;
-    percent:number;
-    statusMsg:string;
-    importStatus:string,
-    showLogLevelList: LogLevel[],
-    logSetterOpen:boolean,
-    logs:any[];
-    importFile:any,
-    logSerialId:string,
-    ltmplConfig:LtmplConfig;
+    inputMaxMsgCount?:number;
+    maxMsgCount?:number;
+    percent?:number;
+    statusMsg?:string;
+    importStatus?:string,
+    showLogLevelList?: LogLevel[],
+    logSetterOpen?:boolean,
+    logs?:any[];
+    importFile?:any,
+    logSerialId?:string,
+    ltmplConfig?:LtmplConfig;
 };
 
 export default class ExcelImport extends React.PureComponent<ExcelImportProps, ExcelImportStat>{

package/src/aldehyde/index.tsx

@@ -21,9 +21,10 @@ import loadable from '@loadable/component';
 import {Spin} from "antd";
 import React from "react";
 
+
 import L2MenuMessageBar from './layout/menu/l2menu-message-bar';
 import L2MenuQuickBar  from './layout/menu/l2menu-quick-bar';
-import Axios from "axios";
+import withRouter from './routable/withroute';
 
 const Loading = <Spin tip="Loading...">
     {/*<Alert*/}
@@ -96,6 +97,7 @@ const ViewControl = loadable(() =>
     import("./controls/view-control"), {fallback: Loading});
 const HCCustomPageRouter = loadable(() =>
     import("./custom-page/custom-page-router"), {fallback: Loading});
+
 //import DtmplEditPage from "./detail/edit/dtmpl-edit-page";
 
 
@@ -121,5 +123,5 @@ const HCCustomPageRouter = loadable(() =>
 
 export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplViewCard,DtmplEditDrawer,DtmplEditModal,LtmplModal,LtmplDrawer,LtmplTable,Menu2layers,Block,UserBar,
     ResetPassword,Footer,EntryControl,ViewControl,ProgramConfig,HydrocarbonService,QuickEntrance,Workbench,PopoverEntitySelect,DtmplEditCard
-,DatePicker,DtmplEditPage,TmplInterface,TmplDataSource,Superagent,DtmplEdit,HCWelcome,MainPage,ExcelImportRoute,CustomPageRouter,HCCustomPageRouter,L2MenuMessageBar,L2MenuQuickBar,ContextSetter,}
+,DatePicker,DtmplEditPage,TmplInterface,TmplDataSource,Superagent,DtmplEdit,HCWelcome,MainPage,ExcelImportRoute,CustomPageRouter,HCCustomPageRouter,L2MenuMessageBar,L2MenuQuickBar,ContextSetter,withRouter}
 

package/src/aldehyde/layout/MainPage.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import {FormInstance, Layout,Row,Col} from 'antd'
+import { Layout} from 'antd'
 import Footer from './footer/index';
 import {BlockMenu} from "../tmpl/interface";
 import Header from './header';
@@ -10,7 +10,7 @@ import Units from '../units';
 import Scrollbars from 'react-custom-scrollbars';
 import "./common.css"
 import "./coverstyle.css"
-import Logo from '../../bccm/logo_03.png';
+import withRouter from "../routable/withroute";
 const {Content, Sider} = Layout;
 
 interface MainPageProps {
@@ -19,11 +19,11 @@ interface MainPageProps {
 }
 
 interface MainPageState {
-    collapsed: boolean,
-    currentL2MenuId: string,
-    blocks: BlockMenu[],
+    collapsed?: boolean,
+    currentL2MenuId?: string,
+    blocks?: BlockMenu[],
     currentBlockId?: string,
-    isImporter:boolean,
+    isImporter?:boolean,
 }
 
 class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
@@ -54,13 +54,12 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
             }
         }
         let blockRes = await HCDataSource.requestBlocks(l2MenuId ? l2MenuId : undefined, blockId ? blockId : undefined);
-        this.setState({
+        this.setState((state)=>({
             isImporter:currentURL.hash.indexOf('/importer')>0,
             blocks: blockRes.blocks,
             currentL2MenuId: blockRes.l2MenuId,
             currentBlockId: blockRes.blockId,
-
-        });
+        }));
 
     }
 
@@ -74,9 +73,9 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
         let l2MenuId = searchParams.get('menuId');
         let isImporter_= currentURL.hash.indexOf('/importer')>0;
         if(prevState.isImporter!=isImporter_){
-            this.setState({
+            this.setState((state)=>({
                 isImporter:isImporter_,
-            })
+            }))
         }
         //进一步找找l2MenuId
         if (!l2MenuId) {
@@ -91,18 +90,18 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
 
         const {currentL2MenuId, currentBlockId} = this.state;
         if (l2MenuId && currentL2MenuId != l2MenuId) {
-            this.setState({
+            this.setState((state)=>({
                 currentL2MenuId: l2MenuId,
-            });
+            }));
         }
 
         if (!blockId) {
             blockId = this.findBlockIdOfL2Menu(l2MenuId);
         }
         if (blockId && currentBlockId != blockId) {
-            this.setState({
+            this.setState((state)=>({
                 currentBlockId: blockId,
-            });
+            }));
         }
     }
 
@@ -172,13 +171,12 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
     }
 
     toggle = () => {
-        this.setState({
+        this.setState((state)=>({
             collapsed: !this.state.collapsed,
-        });
+        }));
     };
 
     render() {
-        const {match}=this.props;
 
         const {collapsed, currentL2MenuId, currentBlockId,isImporter} = this.state;
         //滚动条回到顶部
@@ -238,4 +236,4 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
     }
 }
 
-export default MainPage;
+export default withRouter(MainPage);

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

@@ -1,7 +1,7 @@
 import React from "react";
-import {Badge, Col, Dropdown, Menu, Row} from 'antd';
+import { Dropdown, Menu} from 'antd';
 import {BlockMenu} from "../../tmpl/interface";
-import {NavLink, withRouter} from 'react-router-dom';
+import withRouter from "../../routable/withroute";
 import {} from '@ant-design/icons';
 import MenuRender from './menu-render';
 
@@ -77,4 +77,4 @@ class Block extends React.PureComponent<BlockProps, BlockState> {
 
 }
 
-export default withRouter(Block);
+export default Block;

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

@@ -17,8 +17,8 @@ interface MessageBar {
 }
 
 interface L2MenuMessageBarState {
-    messageBars: MessageBar[];
-    anyState:boolean;
+    messageBars?: MessageBar[];
+    anyState?:boolean;
 }
 
 
@@ -86,7 +86,7 @@ class L2MenuMessageBar extends React.PureComponent<L2MenuMessageBarProps, L2Menu
                 defaultCriteriaData='&'+ Units.transQueryParamsToStr(l2Menu.defaultCriteriaValue);
             }
             return (<div  className={'message-bar'} >
-                <a href={l2Menu.customPath ? `/page-${l2Menu.id}${l2Menu.customPath}?menuId=${l2Menu.id}` : `#/${l2Menu.id}/act-table?menuId=${l2Menu.id}${defaultCriteriaData}`}
+                <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]}>
                         <span  style={{ fontSize: '20px', color: '#08c' }} ><BellOutlined /></span>

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

@@ -17,10 +17,10 @@ interface QuickBar {
 }
 
 interface L2MenuQuickBarState {
-    quickBars: QuickBar[];
-    anyState:boolean;
-    currentId:string;
-    showDraw:boolean;
+    quickBars?: QuickBar[];
+    anyState?:boolean;
+    currentId?:string;
+    showDraw?:boolean;
 }
 
 

package/src/aldehyde/layout/menu/menu-2layers.tsx

@@ -1,11 +1,10 @@
 import React from "react";
 import {Menu} from 'antd';
-import {BlockMenu,Menu2layersProps} from "../../tmpl/interface";
+import {Menu2layersProps} from "../../tmpl/interface";
 import MenuRender from './menu-render';
-import {withRouter} from 'react-router-dom';
 
 interface Menu2layersState {
-    openKeys: string[];
+    openKeys?: string[];
 }
 
 class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState> {
@@ -78,4 +77,4 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
     }
 }
 
-export default withRouter(Menu2layers);
+export default Menu2layers;

package/src/aldehyde/layout/menu/menu-render.tsx

@@ -63,7 +63,7 @@ export default {
                 defaultCriteriaData='&'+ Units.transQueryParamsToStr(item.defaultCriteriaValue);
             }
 
-            let path=customPath ?`${basePath}/page-${item.id}${delimiter}${customPath}?menuId=${item.id}` :this.getRoutePath(item,basePath,defaultCriteriaData);
+            let path=customPath ?`${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` :this.getRoutePath(item,basePath,defaultCriteriaData);
 
             return <Menu.Item key={item.id}>
                 <NavLink to={path} target={target} >{item.title}</NavLink>

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

@@ -24,9 +24,9 @@ interface ResetPasswordProps {
 
 
 interface ResetPasswordState {
-    showPopover:boolean,
-    pubkey:string,
-    loading:boolean
+    showPopover?:boolean,
+    pubkey?:string,
+    loading?:boolean
 }
 
 

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

@@ -7,7 +7,7 @@ interface UserInfoBarProps {
 }
 
 interface UserInfoBarState {
-    showDraw:boolean;
+    showDraw?:boolean;
 }
 
 

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

@@ -11,9 +11,9 @@ export interface ContextSetterProps {
 };
 
 export interface ContextSetterState {
-    loading:boolean,
-    config: object,
-    context:object,
+    loading?:boolean,
+    config?: object,
+    context?:object,
 };
 
 class LtmplPage extends React.PureComponent<ContextSetterProps, ContextSetterState> {

package/src/aldehyde/login/login.js

@@ -4,8 +4,9 @@ import {Button, Col, Form, Input, Row} from 'antd'
 import {LockOutlined, SafetyCertificateOutlined, UserOutlined} from '@ant-design/icons';
 import HCserviceV3 from "../tmpl/hcservice-v3"
 import Units from "../units";
+import withRouter from "../routable/withroute";
 
-export default class Loginit extends React.Component {
+class Loginit extends React.Component {
     state = {
         username: "",
         password: "",
@@ -16,8 +17,11 @@ export default class Loginit extends React.Component {
     }
     formRef = React.createRef();
 
+
     componentDidMount = async () => {
-       Units.setProgramCode4RoutePath(this.props);
+        const {params}=this.props;
+        // const params =  useParams();
+         Units.setProgramCode4RoutePath(params);
         let pubkey = await HCserviceV3.getRasPubkey();
         this.setState({
             pubkey,
@@ -80,6 +84,7 @@ export default class Loginit extends React.Component {
     }
 
     render() {
+
         const {username, password, loading, needKaptcha, kaptchaImg, config} = this.state
 
         return (<Row type="flex" justify="center" align="middle" className="login-blue">
@@ -140,3 +145,5 @@ export default class Loginit extends React.Component {
     }
 
 }
+
+export default withRouter(Loginit);