aldehyde 0.0.2 → 0.0.3

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

@@ -1,218 +0,0 @@
-import React from 'react';
-import {Card, FormInstance} from 'antd';
-import DtmplForm from '../../form/dtmpl-form';
-import PostResult from "./post-result";
-import RightBar from '../rightbar';
-import {DtmplBaseProps, DtmplConfig, DtmplData,AddOrUpdate} from "../../tmpl/interface";
-import HCDataSource from "../../tmpl/hc-data-source";
-import '../dtmpl.css'
-import SubmitButtonBar from "../button/submit-button-bar";
-import Units from '../../units';
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-import  CqueryButtonBar from  "../button/cquery-button-bar"
-
-interface DtmplEditProps extends DtmplBaseProps {
-    goBackToLtmpl: () => void,
-    addOrUpdate:AddOrUpdate,
-}
-
-interface DtmplEditState {
-    id:string,
-    dtmplConfig: DtmplConfig,
-    dtmplData:DtmplData,
-    showPostResult: boolean;
-    // addOrUpdate?: AddOrUpdate;
-    // dtmplData: DtmplData;
-    loading: boolean;
-    serial:number,
-}
-
-export default class DtmplEdit extends React.PureComponent<DtmplEditProps, DtmplEditState> {
-    formRef = React.createRef<FormInstance>();
-    newCode=undefined;
-    static defaultProps = {
-        showRightNav: true,
-    }
-    state = {
-        id:'dtmplEdit'+Units.getRandomNum(6),
-        showPostResult: false,
-        dtmplConfig: undefined,
-        loading: true,
-        serial:1,
-        dtmplData:undefined,
-    }
-
-    componentDidMount() {
-        this.loadConfigData();
-    }
-
-    async componentDidUpdate(prevProps, prevState, snapshot) {
-        const { dtmplConfig} = this.state;
-        if(prevProps && prevProps!=this.props){
-            await this.loadData(dtmplConfig);
-        }
-    }
-
-    autoSaveTimer = -1000000000000000;
-    autoSaveInterval=undefined;
-
-    onClickBody = (e) => {
-        //  console.log(e);
-        console.log("点击了我" + this.autoSaveTimer);
-        this.autoSaveTimer = 0;
-    }
-
-    onValuesChange=()=>{
-        this.setState({
-            serial:this.state.serial+1
-        })
-    }
-
-    loadConfigData = async () => {
-        const { sourceId} = this.props;
-        this.setState({
-            loading: true,
-        })
-        const dtmplConfig = await HCDataSource.requestDtmplConfig(sourceId);
-
-       if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
-           if(this.autoSaveInterval){
-               clearInterval( this.autoSaveInterval);
-           }
-           this.autoSaveInterval = setInterval(() => {
-               if(this.autoSaveTimer>=dtmplConfig.authSaveInterval){
-                   console.log('执行自动保存');
-                   this.autoSaveTimer=-1000000000000000;
-                   this.doSubmit(undefined);
-               }else{
-                   this.autoSaveTimer=this.autoSaveTimer+1;
-               }
-           }, 1000);
-       }
-      await this.loadData(dtmplConfig);
-        this.setState({
-            dtmplConfig,
-            loading: false,
-        })
-
-    }
-
-    loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,addOrUpdate} = this.props;
-        if (code) {
-            this.setState({
-                loading: true,
-            })
-            const dtmplData_ = await HcserviceV3.requestDtmplData( sourceId, code, null);
-            if(addOrUpdate=='copy'&& dtmplData_){
-                dtmplData_.code=undefined;
-            }
-            this.setState({
-                dtmplData:dtmplData_,
-                //  changedGroupData:new Map<number,DtmplData[]>(),
-                loading: false,
-            })
-        }else{
-            this.setState({
-                dtmplData:{code:undefined,title:undefined,fieldMap:{},arrayMap:{}},
-                loading: false,
-            })
-        }
-        setTimeout(()=> this.onValuesChange(),300);
-    }
-
-    componentWillUnmount(): void {
-        if(this.autoSaveInterval){
-            clearInterval( this.autoSaveInterval);
-        }
-    }
-
-    doSubmit = (actionId: string) => {
-        const {mainCode}=this.props;
-        if (actionId) {
-            //actionid 直接放在表单中
-            this.formRef.current.setFieldsValue({'actionId': actionId});
-        };
-        if(mainCode){
-            this.formRef.current.setFieldsValue({'mainCode': mainCode});
-        }
-        this.formRef.current.submit();
-    }
-
-    onFinish = (currentCode:string) => {
-        console.log("提交返回的Code：", currentCode);
-        this.newCode=currentCode;
-        //默认返回到列表页面
-        const {dtmplConfig} = this.state;
-        const saveJumpTo=dtmplConfig.saveJumpTo?dtmplConfig.saveJumpTo:[];
-        if(saveJumpTo.length>1){
-            this.setState({
-                showPostResult:true,
-            })
-        }else if(saveJumpTo.includes('edit')){
-            this.goEdit()
-        }else if(saveJumpTo.includes('add')){
-            this.goAdd();
-        }else {
-            this.goList();
-        }
-    }
-
-    goList = () => {
-        this.newCode=undefined;
-        this.props.goBackToLtmpl();
-    }
-
-    goEdit = () => {
-        const  code=this.newCode;
-        const {goDtmpl,code:propCode,goBackToLtmpl}=this.props;
-        this.newCode=undefined;
-        goDtmpl(code);
-        this.setState({
-            showPostResult:false,
-        })
-    }
-
-    goAdd = () => {
-        this.newCode=undefined;
-        const {goDtmpl,code:propCode}=this.props;
-        if(propCode){
-            goDtmpl();
-        }
-        this.setState({
-            showPostResult:false,
-        })
-    }
-
-    render() {
-        const {dtmplConfig, showPostResult,loading,id,serial,dtmplData} = this.state;
-        console.log(" dtmpl edit serial:",serial);
-        const { sourceId, showRightNav, code,addOrUpdate} = this.props;
-        //const {title} = dtmplConfig;
-        if (!dtmplConfig) {
-            return  <Card loading={loading}>
-            </Card>
-        }
-        return (
-            <div className={`detailPage ${showRightNav ? 'showRightNav' : 'noRightNav'}`} onClick={this.onClickBody}>
-                <DtmplForm  parentId={id} dtmplConfig={dtmplConfig}  formRef={this.formRef} sourceId={sourceId}
-                           onFinish={this.onFinish}
-                           showConfirm={true} dtmplData={dtmplData}  onValuesChange={this.onValuesChange}></DtmplForm>
-                {showRightNav ?
-                    <RightBar parentId={id} dtmplConfig={dtmplConfig}/> : ""
-                }
-                <SubmitButtonBar serial={serial} dtmplConfig={dtmplConfig} doSubmit={this.doSubmit}  formRef={this.formRef}></SubmitButtonBar>
-                <CqueryButtonBar  dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
-                <PostResult
-                    visible={showPostResult}
-                    addOrUpdate={addOrUpdate=='copy' ? 'add' : addOrUpdate}
-                    resultStatus={"success"}
-                    goList={this.goList}
-                    goEdit={this.goEdit}
-                    goAdd={this.goAdd}
-                    jumpTypes={dtmplConfig.saveJumpTo}
-                > </PostResult>
-            </div>)
-    }
-
-}

package/src/components/detail/edit/fields-edit-card.tsx

@@ -1,103 +0,0 @@
-import React from 'react';
-import {Button, Card, FormInstance, Popconfirm, Space} from 'antd'
-import {CloseOutlined} from '@ant-design/icons'
-import {DtmplData, FieldConfig, FieldGroupConfig} from "../../tmpl/interface";
-import FieldGroupForm from '../../form/field-group-form';
-import {ButtonType} from "antd/es/button";
-import FieldsForm from "../../form/fields-form";
-
-interface FieldsEditCardProps {
-    title?:any,
-    height?: any,
-    onCancel?: () => void,
-    onOk: (value: object) => void,
-    fields: FieldConfig[],
-    value?: object,
-    okButtonType?: ButtonType,
-    okDanger?: boolean,
-    needConfirm?: boolean,
-    onValuesChange:(value:object)=>void,
-}
-
-interface FieldsEditCardState {
-}
-
-export default class FieldsEditCard extends React.PureComponent<FieldsEditCardProps, FieldsEditCardState> {
-    formRef = React.createRef<FormInstance>();
-    static defaultProps = {
-        forceRender: true,
-        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
-        needConfirm: false,
-        okButtonType: 'primary',
-        okDanger: false,
-
-    }
-    state = {}
-
-    async componentDidMount() {
-
-    }
-
-    async componentDidUpdate() {
-        this.reset();
-    }
-
-    reset = () => {
-        if (this.formRef.current) {
-            this.formRef.current.resetFields();
-        }
-    }
-
-    onOk = () => {
-        this.formRef.current.submit();
-    }
-
-
-
-    render() {
-        const {title,height, onOk, fields, value, onCancel, okButtonType, needConfirm, okDanger,onValuesChange} = this.props
-        const {} = this.state;
-
-        function okButton(onOk) {
-            return needConfirm ? okDanger ?
-                <Popconfirm
-                    placement="rightBottom"
-                    title={`确定要执行提交吗？`}
-                    onConfirm={onOk}
-                    okText="确定"
-                    cancelText="取消"
-                    okType={'danger'}
-                >
-                    <Button type={okButtonType} danger={true}
-                    >确定</Button>
-                </Popconfirm> :
-                <Popconfirm
-                    placement="rightBottom"
-                    title={`确定要执行提交吗？`}
-                    onConfirm={onOk}
-                    okText="确定"
-                    cancelText="取消"
-                >
-                    <Button  type={okButtonType}
-                    >确定</Button>
-                </Popconfirm> :
-                <Button type={okButtonType}  onClick={onOk}
-                >确定</Button>
-        }
-
-        return <Card
-            style={{width: 1000}}
-            title={title}
-            bodyStyle={{overflow: 'auto'}}
-            extra={<><Space size={[8, 0]}><Button onClick={this.reset}>重置</Button>
-                {okButton(this.onOk)}
-                {onCancel ? <Button onClick={onCancel}><CloseOutlined/></Button> : ""}
-            </Space></>}
-        >
-            <FieldsForm onValuesChange={onValuesChange} fields={fields} formRef={this.formRef}
-                        value={value}
-                        onFinish={onOk} ></FieldsForm>
-        </Card>
-    }
-
-}

package/src/components/detail/edit/modal-dtmpl-edit.tsx

@@ -1,198 +0,0 @@
-import React from 'react';
-import {Button, FormInstance, Modal, Popconfirm} 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";
-import Action from "../../controls/action";
-
-interface ModalEditorProps extends DtmplBaseProps {
-    height: any,
-    visible: boolean,
-    onOk: (code: string) => void,
-    onCancel: () => void,
-
-}
-
-interface ModalEditorState {
-    id:string,
-    dtmplConfig: DtmplConfig,
-    loading: boolean;
-    serial:number,
-    dtmplData:DtmplData,
-}
-
-export default class ModalDtmplEdit extends React.PureComponent<ModalEditorProps, ModalEditorState> {
-    formRef = React.createRef<FormInstance>();
-    autoSaveTimer = -1000000000000000;
-    autoSaveInterval=undefined;
-    onClickBody = (e) => {
-        //  console.log(e);
-        console.log("点击了我" + this.autoSaveTimer);
-        this.autoSaveTimer = 0;
-    }
-    static defaultProps = {
-        showConfirm: true,
-        height: 500,
-        //antd modal
-        forceRender: true,
-        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
-        okText: "确定",
-        cancelText: "取消",
-
-    }
-    state = {
-        id:'modelDtmplEdit'+Units.getRandomNum(6),
-        dtmplConfig: undefined,
-        loading: true,
-        serial:1,
-        dtmplData:undefined,
-    }
-
-    async componentDidMount() {
-
-        await this.loadConfigData();
-    }
-
-    async componentDidUpdate(prevProps) {
-        const { dtmplConfig} = this.state;
-        if(prevProps && prevProps!=this.props){
-            await this.loadData(dtmplConfig);
-        }
-        // if(this.formRef.current){
-        //     this.formRef.current.resetFields();
-        // }
-    }
-
-    componentWillUnmount(): void {
-        if(this.autoSaveInterval){
-            clearInterval( this.autoSaveInterval);
-        }
-    }
-
-    loadConfigData = async () => {
-        const { sourceId,visible} = this.props;
-        this.setState({
-            loading: true,
-        })
-
-        const dtmplConfig = await HCDataSource.requestDtmplConfig(sourceId);
-        if(dtmplConfig.authSaveInterval && dtmplConfig.authSaveInterval>0){
-            if(this.autoSaveInterval){
-                clearInterval( this.autoSaveInterval);
-            }
-            this.autoSaveInterval = setInterval(() => {
-                if(this.autoSaveTimer>=dtmplConfig.authSaveInterval){
-                    console.log('执行自动保存');
-                    this.autoSaveTimer=-1000000000000000;
-                    this.doSubmit(undefined);
-                }else{
-                    this.autoSaveTimer=this.autoSaveTimer+1;
-                }
-            }, 1000);
-        }
-        await this.loadData(dtmplConfig);
-        this.setState({
-            dtmplConfig,
-            loading: false,
-        })
-    }
-
-    loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,defaultDtmplData,visible} = this.props;
-        if(!visible){
-            return;
-        }
-        if (code) {
-            this.setState({
-                loading: true,
-            })
-            const dtmplData_ = await HcserviceV3.requestDtmplData( sourceId, code, null);
-            this.setState({
-                dtmplData:dtmplData_,
-                //  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();
-    }
-
-    getFooter = () => {
-        const {onCancel} = this.props
-        const {dtmplData,serial}=this.state;
-        const footerButtons = [];
-        footerButtons.unshift(<Popconfirm key="ok" placement="topLeft" title={"确定要保存修改吗?"} onConfirm={() =>this.doSubmit()} okText="确定" cancelText="取消">
-            <Button  type={'primary'} >
-            保 存
-        </Button></Popconfirm>)
-        const {dtmplConfig} = this.state;
-        //处理action
-        if (dtmplConfig) {
-            dtmplConfig.actions.forEach((ac, index) => {
-                footerButtons.unshift(<Action hiddenType={'disabled'}  serial={serial} key={ac.id}  formRef={this.formRef} actionConfig={ac}  doAction={this.doSubmit}></Action>);
-            })
-        }
-        footerButtons.unshift(<Popconfirm key="back" placement="topLeft" title={"确定要取消本次修改内容吗?"} onConfirm={onCancel} okText="确定" cancelText="取消">
-            <Button >
-            取 消
-            </Button></Popconfirm>);
-        return footerButtons;
-    }
-
-    render() {
-        const {height, onOk, onCancel, code, sourceId,  visible,mainCode} = this.props
-        const {dtmplConfig,id,dtmplData} = this.state;
-
-        return <Modal
-            visible={visible}
-            width={1250}
-            title={dtmplConfig ? dtmplConfig.title : ""}
-            bodyStyle={{height: height, overflow: 'auto'}}
-            destroyOnClose={true}
-            centered
-            onCancel={onCancel}
-            footer={this.getFooter()}
-        >
-            {visible} <div onClick={this.onClickBody}>
-                {/*<Scrollbars  autoHide autoHideTimeout={1000}>*/}
-                <DtmplForm parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
-                           onFinish={onOk}
-                           showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
-                {/*</Scrollbars>*/}
-            </div>
-        </Modal>
-
-    }
-
-}

package/src/components/detail/edit/modal-row-edit.tsx

@@ -1,72 +0,0 @@
-import React from 'react';
-import {FormInstance, Modal} from 'antd'
-import {DtmplData, FieldGroupConfig} from "../../tmpl/interface";
-import FieldGroupForm from '../../form/field-group-form';
-
-interface ModalRowEditorProps {
-    height?: any,
-    visible: boolean,
-    onOk: (value: DtmplData) => void,
-    onCancel: () => void,
-    fieldGroupConfig: FieldGroupConfig,
-    dtmplData?: DtmplData,
-}
-
-interface ModalRowEditorState {
-}
-
-export default class ModalRowEdit extends React.PureComponent<ModalRowEditorProps, ModalRowEditorState> {
-    formRef = React.createRef<FormInstance>();
-    static defaultProps = {
-        forceRender: true,
-        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
-    }
-    state = {}
-
-    async componentDidMount() {
-    }
-
-    async componentDidUpdate() {
-        if (this.formRef.current) {
-            this.formRef.current.resetFields();
-        }
-    }
-
-    onOk = () => {
-        this.formRef.current.submit();
-    }
-
-    getTitle = () => {
-        const {fieldGroupConfig, dtmplData} = this.props
-        let title = "";
-        title = fieldGroupConfig.title;
-        if (dtmplData) {
-            title = title + "【行编辑】";
-        } else {
-            title = title + "【新建一行】";
-        }
-        return title;
-    }
-
-    render() {
-        const {height, onOk, onCancel, fieldGroupConfig, visible, dtmplData} = this.props
-        const {} = this.state;
-        return <Modal
-            visible={visible}
-            width={1150}
-            title={this.getTitle()}
-            bodyStyle={{overflow: 'auto'}}
-            destroyOnClose={true}
-            centered
-            okText={'确定'}
-            cancelText={'取消'}
-            onOk={this.onOk}
-            onCancel={onCancel}
-        >
-            <FieldGroupForm fieldGroupConfig={fieldGroupConfig} formRef={this.formRef}
-                            onFinish={onOk}
-                            dtmplData={dtmplData}> </FieldGroupForm>
-        </Modal>
-    }
-
-}

package/src/components/detail/edit/post-result/index.tsx

@@ -1,52 +0,0 @@
-import React, {ReactNode} from 'react'
-import {Button, Modal, Result} from 'antd'
-import {AddOrUpdate, SaveJumpType} from "../../../tmpl/interface";
-import {ResultStatusType} from "antd/lib/result";
-
-interface PostResultProps {
-    title?: ReactNode,
-    subtitle?: ReactNode,
-    visible: boolean,
-    jumpTypes: SaveJumpType[],
-    addOrUpdate: AddOrUpdate,
-    resultStatus?: ResultStatusType,
-    goAdd: () => void,
-    goEdit: () => void,
-    goList: () => void,
-};
-
-const PostResult: React.FC<PostResultProps> = ({resultStatus='success',...props}) => {
-
-    const {title, visible, subtitle, goAdd, goEdit, goList, jumpTypes, addOrUpdate} = props;
-    return (
-        <Modal
-            title={title ? title : "保存提示"}
-            visible={visible}
-            closable={false}
-            destroyOnClose
-            footer={[]}
-            bodyStyle={{height: 430, overflow: 'auto'}}
-            width={560}
-            maskClosable={true}
-        >
-            <Result status={resultStatus} title={resultStatus === "success" ? "保存成功" : "保存失败"}
-                    subTitle={subtitle}
-                    extra={[goAdd && jumpTypes && jumpTypes.includes('add') ?
-                        <Button key="goOnAdd" onClick={() => goAdd()}>
-                            {addOrUpdate === "update" ? "转添加" : "继续添加"}
-                        </Button> : undefined,
-                        goEdit && jumpTypes && jumpTypes.includes('edit') ?
-                            <Button type="primary" key="goOnEdit" onClick={() => goEdit()}>
-                                {addOrUpdate === "update" ? "继续编辑" : "编辑实体"}
-                            </Button> : "",
-                        goList && jumpTypes && jumpTypes.includes('list') ?
-                            <Button type="primary" key="onBackList" onClick={() => goList()}>
-                                返回列表
-                            </Button> : ""
-                    ]}
-            ></Result>
-        </Modal>
-    )
-}
-
-export default PostResult;