aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/module/dtmpl-editor.tsx

@@ -1,163 +1,163 @@
-import React from 'react';
-import {FormInstance} from 'antd'
-import {DtmplBaseProps, DtmplConfig, DtmplData} from "../tmpl/interface";
-import DtmplForm from '../form/dtmpl-form';
-import HCDataSource from "../tmpl/hc-data-source";
-import Units from "../units";
-import HcserviceV3 from "../tmpl/hcservice-v3";
-
-interface ModalEditorProps extends DtmplBaseProps {
-    onOk: (code: string) => void,
-    onCancel: () => void,
-    open:boolean,
-}
-
-interface ModalEditorState {
-    id?:string,
-    dtmplConfig?: DtmplConfig,
-    loading?: boolean;
-    serial?:number,
-    dtmplData?:DtmplData,
-}
-
-export default class DtmplEditPage extends React.PureComponent<ModalEditorProps, ModalEditorState> {
-    formRef = React.createRef<FormInstance>();
-    autoSaveTimer = -1000000000000000;
-    autoSaveInterval=undefined;
-    onClickBody = (e) => {
-        this.autoSaveTimer = 0;
-    }
-    static defaultProps = {
-
-    }
-    state = {
-        id:'modelDtmplEdit'+Units.getRandomNum(6),
-        dtmplConfig: undefined,
-        loading: true,
-        serial:1,
-        dtmplData:undefined,
-    }
-
-    async componentDidMount() {
-        if(this.props.open){
-            await this.loadConfigData();
-        }
-    }
-
-    async componentDidUpdate(prevProps) {
-        const { dtmplConfig} = this.state;
-        if(prevProps && prevProps!=this.props){
-            if(prevProps.sourceId!=this.props.sourceId || dtmplConfig==null){
-                await this.loadConfigData();
-            }else{
-                await this.loadData(dtmplConfig);
-            }
-        }
-    }
-
-    componentWillUnmount(): void {
-        if(this.autoSaveInterval){
-            clearInterval( this.autoSaveInterval);
-        }
-    }
-
-    loadConfigData = async () => {
-        const { sourceId,open,code,serverKey,addTmplId} = this.props;
-        this.setState({
-            loading: true,
-        })
-        let dtmplConfig=undefined;
-        if(code){
-            dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId,code);
-        }else{
-            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId,addTmplId);
-        }
-
-
-        await this.loadData(dtmplConfig);
-        this.setState({
-            dtmplConfig,
-            loading: false,
-        })
-    }
-
-    loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code:propsCode,defaultDtmplData,open,serverKey,codeSource} = this.props;
-        if(!open){
-            return;
-        }
-
-        if(dtmplConfig.autoSaveInterval && dtmplConfig.autoSaveInterval>0){
-            if(this.autoSaveInterval){
-                clearInterval( this.autoSaveInterval);
-            }
-            this.autoSaveInterval = setInterval(() => {
-                if(this.autoSaveTimer>=dtmplConfig.autoSaveInterval){
-                    //console.log('执行自动保存');
-                    this.autoSaveTimer=-1000000000000000;
-                    this.doSubmit(undefined);
-                }else{
-                    this.autoSaveTimer=this.autoSaveTimer+1;
-                }
-            }, 1000);
-        }
-
-        let code=propsCode;
-        if(!code && codeSource){
-            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
-        }
-        if (code) {
-            this.setState({
-                loading: true,
-                dtmplData:undefined,
-            })
-            const dtmplData_:DtmplData=await HcserviceV3.getDtmplData(dtmplConfig,serverKey,sourceId, code);
-            this.setState({
-                dtmplData:dtmplData_,
-                id:code,
-                //  changedGroupData:new Map<number,DtmplData[]>(),
-                loading: false,
-            })
-        }else if(defaultDtmplData){
-            this.setState({
-                dtmplData:defaultDtmplData,
-                loading: false,
-            })
-        }else{
-            this.setState({
-                dtmplData:{code:undefined,title:undefined,fieldMap:{},arrayMap:{}},
-                loading: false,
-            })
-        }
-        setTimeout(()=> this.onValuesChange(),300);
-    }
-
-    onValuesChange=()=>{
-        this.setState({
-            serial:this.state.serial+1
-        })
-    }
-
-    doSubmit = (actionId?: number,codes?:string[],params?:object) => {
-        const {mainCode}=this.props;
-       // if (actionId) {
-            this.formRef.current.setFieldsValue({'actionId': actionId});
-        //}
-        if(mainCode){
-            this.formRef.current.setFieldsValue({'mainCode': mainCode});
-        }
-        if(params){
-            this.formRef.current.setFieldsValue(params);
-        }
-        this.formRef.current.submit();
-    }
-
-    render() {
-        const {onOk,sourceId,mainCode,maxColsOnRow,serverKey} = this.props
-        const {dtmplConfig,id,dtmplData} = this.state;
-        return  <div onClick={this.onClickBody}><DtmplForm serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
-                                   onFinish={onOk}   maxColsOnRow={maxColsOnRow}
-                                showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} /></div>
-       }
-
+import React from 'react';
+import {FormInstance} from 'antd'
+import {DtmplBaseProps, DtmplConfig, DtmplData} from "../tmpl/interface";
+import DtmplForm from '../form/dtmpl-form';
+import HCDataSource from "../tmpl/hc-data-source";
+import Units from "../units";
+import HcserviceV3 from "../tmpl/hcservice-v3";
+
+interface ModalEditorProps extends DtmplBaseProps {
+    onOk: (code: string) => void,
+    onCancel: () => void,
+    open:boolean,
+}
+
+interface ModalEditorState {
+    id?:string,
+    dtmplConfig?: DtmplConfig,
+    loading?: boolean;
+    serial?:number,
+    dtmplData?:DtmplData,
+}
+
+export default class DtmplEditPage extends React.PureComponent<ModalEditorProps, ModalEditorState> {
+    formRef = React.createRef<FormInstance>();
+    autoSaveTimer = -1000000000000000;
+    autoSaveInterval=undefined;
+    onClickBody = (e) => {
+        this.autoSaveTimer = 0;
+    }
+    static defaultProps = {
+
+    }
+    state = {
+        id:'modelDtmplEdit'+Units.getRandomNum(6),
+        dtmplConfig: undefined,
+        loading: true,
+        serial:1,
+        dtmplData:undefined,
+    }
+
+    async componentDidMount() {
+        if(this.props.open){
+            await this.loadConfigData();
+        }
+    }
+
+    async componentDidUpdate(prevProps) {
+        const { dtmplConfig} = this.state;
+        if(prevProps && prevProps!=this.props){
+            if(prevProps.sourceId!=this.props.sourceId || dtmplConfig==null){
+                await this.loadConfigData();
+            }else{
+                await this.loadData(dtmplConfig);
+            }
+        }
+    }
+
+    componentWillUnmount(): void {
+        if(this.autoSaveInterval){
+            clearInterval( this.autoSaveInterval);
+        }
+    }
+
+    loadConfigData = async () => {
+        const { sourceId,open,code,serverKey,addTmplId} = this.props;
+        this.setState({
+            loading: true,
+        })
+        let dtmplConfig=undefined;
+        if(code){
+            dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId,code);
+        }else{
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId,addTmplId);
+        }
+
+
+        await this.loadData(dtmplConfig);
+        this.setState({
+            dtmplConfig,
+            loading: false,
+        })
+    }
+
+    loadData = async (dtmplConfig:DtmplConfig ) => {
+        const { sourceId, code:propsCode,defaultDtmplData,open,serverKey,codeSource} = this.props;
+        if(!open){
+            return;
+        }
+
+        if(dtmplConfig.autoSaveInterval && dtmplConfig.autoSaveInterval>0){
+            if(this.autoSaveInterval){
+                clearInterval( this.autoSaveInterval);
+            }
+            this.autoSaveInterval = setInterval(() => {
+                if(this.autoSaveTimer>=dtmplConfig.autoSaveInterval){
+                    //console.log('执行自动保存');
+                    this.autoSaveTimer=-1000000000000000;
+                    this.doSubmit(undefined);
+                }else{
+                    this.autoSaveTimer=this.autoSaveTimer+1;
+                }
+            }, 1000);
+        }
+
+        let code=propsCode;
+        if(!code && codeSource){
+            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
+        }
+        if (code) {
+            this.setState({
+                loading: true,
+                dtmplData:undefined,
+            })
+            const dtmplData_:DtmplData=await HcserviceV3.getDtmplData(dtmplConfig,serverKey,sourceId, code);
+            this.setState({
+                dtmplData:dtmplData_,
+                id:code,
+                //  changedGroupData:new Map<number,DtmplData[]>(),
+                loading: false,
+            })
+        }else if(defaultDtmplData){
+            this.setState({
+                dtmplData:defaultDtmplData,
+                loading: false,
+            })
+        }else{
+            this.setState({
+                dtmplData:{code:undefined,title:undefined,fieldMap:{},arrayMap:{}},
+                loading: false,
+            })
+        }
+        setTimeout(()=> this.onValuesChange(),300);
+    }
+
+    onValuesChange=()=>{
+        this.setState({
+            serial:this.state.serial+1
+        })
+    }
+
+    doSubmit = (actionId?: number,codes?:string[],params?:object) => {
+        const {mainCode}=this.props;
+       // if (actionId) {
+            this.formRef.current.setFieldsValue({'actionId': actionId});
+        //}
+        if(mainCode){
+            this.formRef.current.setFieldsValue({'mainCode': mainCode});
+        }
+        if(params){
+            this.formRef.current.setFieldsValue(params);
+        }
+        this.formRef.current.submit();
+    }
+
+    render() {
+        const {onOk,sourceId,mainCode,maxColsOnRow,serverKey} = this.props
+        const {dtmplConfig,id,dtmplData} = this.state;
+        return  <div onClick={this.onClickBody}><DtmplForm serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
+                                   onFinish={onOk}   maxColsOnRow={maxColsOnRow}
+                                showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} /></div>
+       }
+
 }

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

@@ -1,73 +1,73 @@
-import React from 'react'
-import ActDtmplView from "./../detail/view/act-dtmpl-view";
-import DtmplEditModal from './dtmpl-edit-modal';
-import {CodeSource} from "../tmpl/interface";
-
-//以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
-
-export interface DtmplViewCardProps  {
-    title?:any,
-    serverKey?:string,
-    sourceId?:string,
-    addTmplId?:string,
-    code?:string;
-    mainCode?:string;
-    editable?:boolean;
-    codeSource?:CodeSource,
-    showHeader?:boolean,
-};
-
-export interface DtmplViewCardState  {
-    showDtmplEdit?:boolean;
-};
-
-class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCardState> {
-
-    state = {
-        showDtmplEdit:false,
-    }
-
-    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,
-        })
-    }
-
-    handleDtmplEdit =  (code: string) => {
-        this.setState({
-            showDtmplEdit:false,
-        })
-    }
-
-    render() {
-        const {showDtmplEdit} = this.state;
-        const { sourceId,code,mainCode,editable,serverKey,codeSource,title,showHeader,addTmplId} = this.props;
-            return <>
-                <ActDtmplView showHeader={showHeader} title={title} codeSource={codeSource} serverKey={serverKey} goDtmpl={editable?this.goDtmpl:null}  sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
-                {showDtmplEdit? <DtmplEditModal  addTmplId={addTmplId} codeSource={codeSource} serverKey={serverKey} open={showDtmplEdit} onCancel={()=>{
-                        this.setState({
-                            showDtmplEdit:false,
-                        })}}
-                                   sourceId={sourceId}
-                                   code={code}
-                                   onOk={this.handleDtmplEdit} />:null}
-              </>
-    }
-}
-
-export default DtmplViewCard;
-
+import React from 'react'
+import ActDtmplView from "./../detail/view/act-dtmpl-view";
+import DtmplEditModal from './dtmpl-edit-modal';
+import {CodeSource} from "../tmpl/interface";
+
+//以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
+
+export interface DtmplViewCardProps  {
+    title?:any,
+    serverKey?:string,
+    sourceId?:string,
+    addTmplId?:string,
+    code?:string;
+    mainCode?:string;
+    editable?:boolean;
+    codeSource?:CodeSource,
+    showHeader?:boolean,
+};
+
+export interface DtmplViewCardState  {
+    showDtmplEdit?:boolean;
+};
+
+class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCardState> {
+
+    state = {
+        showDtmplEdit:false,
+    }
+
+    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,
+        })
+    }
+
+    handleDtmplEdit =  (code: string) => {
+        this.setState({
+            showDtmplEdit:false,
+        })
+    }
+
+    render() {
+        const {showDtmplEdit} = this.state;
+        const { sourceId,code,mainCode,editable,serverKey,codeSource,title,showHeader,addTmplId} = this.props;
+            return <>
+                <ActDtmplView showHeader={showHeader} title={title} codeSource={codeSource} serverKey={serverKey} goDtmpl={editable?this.goDtmpl:null}  sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
+                {showDtmplEdit? <DtmplEditModal  addTmplId={addTmplId} codeSource={codeSource} serverKey={serverKey} open={showDtmplEdit} onCancel={()=>{
+                        this.setState({
+                            showDtmplEdit:false,
+                        })}}
+                                   sourceId={sourceId}
+                                   code={code}
+                                   onOk={this.handleDtmplEdit} />:null}
+              </>
+    }
+}
+
+export default DtmplViewCard;
+

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

@@ -1,65 +1,65 @@
-import React, {ReactNode} from 'react'
-import {Drawer, Space, Button} from 'antd'
-import DtmplViewCard from "./dtmpl-view-card";
-import {DtmplBaseProps} from "../tmpl/interface";
-import ToolTipBar from "../detail/tooltipbar";
-
-interface DtmplViewDrawerProps extends DtmplBaseProps{
-    title?:ReactNode,
-    open: boolean,
-    onClose: () => void,
-    placement?:'top' | 'right' | 'bottom' | 'left',
-    width?:string|number,
-    cancelText:string,
-    editable?:boolean,
-}
-
-interface DtmplViewDrawerState {
-
-}
-
-
-class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplViewDrawerState> {
-    state={
-
-    }
-
-    static defaultProps = {
-        height: "82vh",
-        width:"82vw",
-        forceRender: true,
-        cancelText: "关闭",
-        placement:'left',
-        open:false,
-        editable:true,
-    }
-
-    async componentDidMount() {
-
-    }
-
-    render() {
-        const {title,sourceId,code,placement,open,onClose,width,cancelText,editable,serverKey,codeSource}=this.props;
-        return  (<Drawer
-                    placement={placement}
-                    title={<>{title}</>}
-                    closable={true}
-                    mask={false}
-                    onClose={onClose}
-                    open={open}
-                    width={width}
-                    style={{
-                        maxWidth: "92vw",
-                    }}
-                    extra={
-                        <Space>
-                            <Button onClick={()=>onClose()}>{cancelText}</Button>
-                        </Space>
-                    }
-                >
-                   <DtmplViewCard  codeSource={codeSource} serverKey={serverKey} editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
-             </Drawer>)
-    }
-}
-
+import React, {ReactNode} from 'react'
+import {Drawer, Space, Button} from 'antd'
+import DtmplViewCard from "./dtmpl-view-card";
+import {DtmplBaseProps} from "../tmpl/interface";
+import ToolTipBar from "../detail/tooltipbar";
+
+interface DtmplViewDrawerProps extends DtmplBaseProps{
+    title?:ReactNode,
+    open: boolean,
+    onClose: () => void,
+    placement?:'top' | 'right' | 'bottom' | 'left',
+    width?:string|number,
+    cancelText:string,
+    editable?:boolean,
+}
+
+interface DtmplViewDrawerState {
+
+}
+
+
+class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplViewDrawerState> {
+    state={
+
+    }
+
+    static defaultProps = {
+        height: "82vh",
+        width:"82vw",
+        forceRender: true,
+        cancelText: "关闭",
+        placement:'left',
+        open:false,
+        editable:true,
+    }
+
+    async componentDidMount() {
+
+    }
+
+    render() {
+        const {title,sourceId,code,placement,open,onClose,width,cancelText,editable,serverKey,codeSource}=this.props;
+        return  (<Drawer
+                    placement={placement}
+                    title={<>{title}</>}
+                    closable={true}
+                    mask={false}
+                    onClose={onClose}
+                    open={open}
+                    width={width}
+                    style={{
+                        maxWidth: "92vw",
+                    }}
+                    extra={
+                        <Space>
+                            <Button onClick={()=>onClose()}>{cancelText}</Button>
+                        </Space>
+                    }
+                >
+                   <DtmplViewCard  codeSource={codeSource} serverKey={serverKey} editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
+             </Drawer>)
+    }
+}
+
 export default DtmplViewDrawer;