aldehyde 0.0.12 → 0.1.1

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

@@ -1,143 +0,0 @@
-import React from 'react'
-import {Button, Card} from 'antd'
-import {DtmplBaseProps, DtmplConfig, DtmplData, FieldGroupConfig} from "../../tmpl/interface";
-import RelationTable from "../../table/relation-table";
-import FieldViewGroup from './field-view-group';
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-import RightBar from "../rightbar";
-import '../dtmpl.css';
-import {HolderOutlined}  from '@ant-design/icons';
-import Units from '../../units';
-import CollapseCard from "../../controls/collapse-card";
-import CqueryButtonBar from "../button/cquery-button-bar";
-
-export interface DtmplViewProps extends DtmplBaseProps {
-    versionId?: number;
-    dtmplConfig: DtmplConfig,
-    refreshCode?:string,
-};
-
-export interface DtmplViewStat {
-    id?:string;
-    loading: boolean,
-    dtmplData: DtmplData,
-    premisesTitle: string,
-    layout: object,
-};
-
-class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
-    static defaultProps = {
-        showRightNav: true,
-    }
-
-    state = {
-        loading: true,
-        id:'dtmplView'+Units.getRandomNum(6),
-        snapshotVisible: false,
-        dtmplData: undefined,
-        premisesTitle: "默认字段",
-        layout: {
-            labelCol: {span: 8},
-            wrapperCol: {span: 16},
-        },
-    }
-
-    async componentDidMount() {
-        await this.loadData();
-    }
-
-    async componentDidUpdate(prevProps) {
-        const { sourceId, code, versionId,refreshCode} = this.props;
-        const {code: preCode, versionId: preVersionId,refreshCode:preRefreshCode} = prevProps;
-        if (code != preCode || (versionId && versionId != prevProps.versionId) || (refreshCode && refreshCode!=preRefreshCode)) {
-            await this.loadData();
-        }
-    }
-
-    loadData = async () => {
-        const { sourceId, code, versionId} = this.props;
-        if (code) {
-            this.setState({
-                loading: true,
-            })
-            const dtmplData = await HcserviceV3.requestDtmplData( sourceId, code, versionId);
-            this.setState({
-                dtmplData, loading:false,
-            })
-        }
-    }
-
-    fieldGroupList = () => {
-        const {dtmplConfig} = this.props;
-        const { dtmplData, loading,id} = this.state;
-
-        let groups: FieldGroupConfig[] = [];
-        if (dtmplConfig) {
-            groups = dtmplConfig.groups;
-        }
-        return groups.map((item) => {
-                if (item.type == 'relation') {//关系
-                    if (item.fields) {
-                        let data: DtmplData[] = undefined;
-                        if (dtmplData) {
-                            data = dtmplData.arrayMap[item.id];
-                        }
-                        // console.log("dtmplData", dtmplData );
-                        // console.log("dtmplData data", data );
-                        // console.log("initCollapsed", dtmplData && (!data || data.length<=0));
-                        return <RelationTable initCollapse={ dtmplData && (!data || data.length<=0)} loading={loading} parentId={id} key={item.id} fieldGroupConfig={item} value={data}
-                                              viewOrEdit={"view"}/>
-                    }
-                } else {//字段组
-                    return <CollapseCard
-                        title={item.title}
-                        key={item.id}
-                        id={id+item.id}
-                        className="hoverable"
-                        headStyle={{background: "#f2f4f5"}}
-                        loading={loading}
-                    >
-                        <FieldViewGroup fields={item.fields} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
-                                        width={220}></FieldViewGroup>
-                    </CollapseCard>
-                }
-
-            }
-        );
-    }
-
-    render() {
-        const {showRightNav, rightBarPositionRight, code,  sourceId,dtmplConfig} = this.props;
-        const {premisesTitle, loading, dtmplData, layout, snapshotVisible,id} = this.state;
-        const premises = dtmplConfig ? dtmplConfig.premises : undefined;
-
-        return (
-            <div>
-                {this.fieldGroupList()}
-                {premises && premises.length > 0 ?
-                    <CollapseCard
-                        // title={<Button type="text"><HolderOutlined />{premisesTitle}</Button>}
-                        title={premisesTitle}
-                        key={premisesTitle}
-                        id={id+premises[0].id}
-                        className="hoverable"
-                        headStyle={{background: "#f2f4f5"}}
-                        loading={loading}
-                    >
-                        <FieldViewGroup
-                            fields={premises}/>
-                    </CollapseCard>
-                    : ""
-                }
-                {showRightNav ?
-                    <RightBar parentId={id} positionRight={rightBarPositionRight} dtmplConfig={dtmplConfig}/> : ""
-                }
-                <CqueryButtonBar  dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
-            </div>
-        );
-    }
-}
-
-
-export default DtmplView;
-

package/src/components/detail/view/field-view-group.tsx

@@ -1,73 +0,0 @@
-import React from 'react'
-import {Col,Row,Descriptions} from 'antd';
-import {FieldConfig, FieldGroupConfig} from "../../tmpl/interface";
-import ViewControl from './../../controls/view-control';
-
-
-interface FieldViewGroupProps {
-    fields: FieldConfig[],
-    valueMap?: object,
-    width?: number,
-};
-
-interface FieldViewGroupState {
-    fileList: any,
-};
-
-export default class FieldViewGroup extends React.PureComponent<FieldViewGroupProps, FieldViewGroupState> {
-
-    constructor(props) {
-        super(props);
-        this.state = {
-            fileList: [],
-        }
-    }
-
-    initViewList = () => {
-        const {fields, valueMap} = this.props
-        const formItemList = [];
-
-        if (fields.length > 0) {
-            fields.forEach((item, index) => {
-                const title = item.title;
-                let fieldValue = valueMap?valueMap[item.id]:undefined;
-                //fieldValue 没有值时不能为null 要为 undefined。antd input所限制
-                fieldValue = fieldValue ? fieldValue : item.defaultValue ? item.defaultValue : undefined;
-                const fieldKey = item.id + Math.random() * 100;
-
-                if(item.extControlType!='hidden'){
-                    const formItem = <Descriptions.Item  label={item.title} span={item.colNum} key={index}
-                                                         className='labelcss'
-                    >
-                        <ViewControl holderType={'descriptions'} value={fieldValue} fieldConfig={item}/>
-                    </Descriptions.Item>
-                    formItemList.push(formItem);
-                }
-            });
-        }
-        return formItemList;
-        // const colList = [];
-        //
-        // for (let i = 0; i < formItemList.length; i = i + 1) {
-        //     let colNum = fields[i].colNum;
-        //     let col = <Col span={12 * colNum}>
-        //         {formItemList[i]}
-        //     </Col>
-        //     colList.push(col);
-        // }
-        //
-        // const row =
-        //     <Row gutter={[16, 8]} key={1}>
-        //         {colList}
-        //     </Row>
-        //return row;
-    }
-
-    render() {
-        return (
-            <Descriptions column={2}>
-                {this.initViewList()}
-            </Descriptions>
-        )
-    }
-}

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

@@ -1,130 +0,0 @@
-import React from 'react'
-import {Button, Drawer, Timeline} from 'antd'
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-import '../dtmpl.css';
-import {DtmplConfig, SourceName} from "../../tmpl/interface";
-import Units from '../../units';
-import DtmplView from "./dtmpl-view";
-
-export interface SnapshotTimelineProps {
-    sourceId: string;
-    code: string;
-    showSnapshot?: (id: number) => void;
-    onClose: () => void;
-    visible: boolean;
-    dtmplConfig: DtmplConfig;
-};
-
-export interface SnapshotTimelineStat {
-    list: any[],
-    loading: boolean,
-    current?: number;
-};
-
-class SnapshotTimeline extends React.PureComponent<SnapshotTimelineProps, SnapshotTimelineStat> {
-    static defaultProps = {}
-
-    state = {
-        list: undefined,
-        loading: false,
-        current: undefined,
-    }
-
-    async componentDidMount() {
-
-    }
-
-    async componentDidUpdate(prevProps) {
-        const {visible} = this.props;
-        const {list} = this.state;
-        if (visible && !list) {
-            this.loadData();
-        }
-    }
-
-    loadData = async () => {
-        const {sourceId, code, showSnapshot} = this.props;
-        const {current} = this.state;
-        if (code) {
-            this.setState({
-                loading: true,
-            })
-            const list = await HcserviceV3.requestVersionList( sourceId, code);
-            this.setState({
-                list, current: !current && list.length > 0 ? list[0].code : current,
-                loading: false,
-            })
-        }
-    }
-
-    onChange = (code: number) => {
-        const {showSnapshot} = this.props;
-        this.setState({
-            current: code
-        })
-        showSnapshot(code);
-    }
-
-    detailHistory = () => {
-        const {list, current} = this.state;
-        let detailHistory
-        if (list.length > 0) {
-            detailHistory = list.map((item, index) => {
-                const isCurrentItem = (current ? item.code === current : false);
-                const color = isCurrentItem ? "red" : "blue";
-                return <Timeline.Item color={color} key={index}>
-                    {Units.formateDate(item.time)}<br/>
-                    {`` + item.userName}
-                    {isCurrentItem ? "" : <Button
-                        style={{marginLeft: 10}}
-                        type="primary"
-                        size="small"
-                        onClick={() => this.onChange(item.code)}
-                    >查看</Button>
-                    }
-                </Timeline.Item>
-            })
-
-            return detailHistory;
-        }
-    }
-
-    render() {
-        const {visible, onClose, dtmplConfig, sourceId,  code} = this.props;
-        const {list, current} = this.state;
-        return (
-            <>
-                <Drawer
-                    title="快照列表"
-                    closable={true}
-                    onClose={onClose}
-                    visible={visible}
-                    width={350}
-                >
-                    {list && list.length > 0 ? <Timeline mode="alternate">
-                        {this.detailHistory()}
-                    </Timeline> : "暂无历史记录"}
-                </Drawer>
-                <Drawer
-                    placement={'left'}
-                    title="快照查看"
-                    closable={true}
-                    mask={false}
-                    onClose={onClose}
-                    visible={visible}
-                    width={'calc(100% - 380px)'}
-                    style={{
-                        maxWidth: 1960,
-                    }}
-                >
-                    <DtmplView showRightNav={false} dtmplConfig={dtmplConfig} sourceId={sourceId}
-                                code={code} versionId={current}></DtmplView>
-                </Drawer>
-            </>
-        );
-    }
-}
-
-
-export default SnapshotTimeline;
-

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

@@ -1,272 +0,0 @@
-import React, {RefObject} from 'react'
-import {Button, Card, Form as AntdForm, message, Modal, Switch} from 'antd'
-import {DtmplBaseProps, DtmplConfig, DtmplData, FieldGroupConfig} from "../tmpl/interface";
-import HcserviceV3 from "../tmpl/hcservice-v3";
-import FormItemGroup from "./form-Item-group";
-import {FormInstance} from "antd/lib/form/hooks/useForm";
-import {ReloadOutlined} from '@ant-design/icons';
-import FieldViewGroup from "../detail/view/field-view-group";
-import RelationTable from "./../table/relation-table";
-import './dtmpl-form.css';
-import CollapseCard from "../controls/collapse-card";
-
-export interface DtmplFormProps extends DtmplBaseProps {
-    parentId:string,
-    dtmplConfig: DtmplConfig,
-    dtmplData?:DtmplData,
-    formRef: RefObject<FormInstance>,
-    showConfirm: boolean,
-    onFinish: (code:string) => void,
-    onValuesChange?:()=>void,
-};
-
-interface DtmplFormStat {
-    loading: boolean,
-    dtmplData: DtmplData,
-    // changedGroupData:Map<number,DtmplData[]>
-};
-
-const confirm = Modal.confirm;
-
-export default class Form extends React.PureComponent<DtmplFormProps, DtmplFormStat> {
-    fuseMode: boolean = false;
-    premisestitle: string = "默认字段";
-
-    state = {
-        loading: true,
-        dtmplData: undefined,
-        // changedGroupData:new Map<number,DtmplData[]>()
-    }
-
-    async componentDidMount() {
-       await this.loadData();
-    }
-
-    async componentDidUpdate(preProps) {
-        // const { code,formRef} = this.props;
-        const { code:preCode} = preProps;
-        if(preProps!=this.props){
-            await this.loadData();
-        }
-        // this.props.onValuesChange();
-        //  if(code!=preCode || (!code && preCode)){
-        //     await this.loadData();
-        // }else{
-        //      formRef.current.resetFields();
-        //  }
-
-    }
-
-    loadData = async () => {
-        const { sourceId, code, formRef,dtmplData} = this.props;
-        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(dtmplData){
-            this.setState({
-                dtmplData,
-                //  changedGroupData:new Map<number,DtmplData[]>(),
-                loading: false,
-            })
-        }else{
-            this.setState({
-                dtmplData:{code:undefined,title:undefined,fieldMap:{},arrayMap:{}},
-                loading: false,
-            })
-        }
-        //debounce(formRef.current.resetFields();, 500);
-       setTimeout(()=>formRef.current.resetFields(),200)
-    }
-
-    doRefresh = async () => {
-        await this.loadData();
-        message.info("已刷新！")
-    }
-
-    onGroupChange = (fieldGroupConfig: FieldGroupConfig, selectdDatas: DtmplData[]) => {
-        const {dtmplData} = this.state;
-        dtmplData['arrayMap'][fieldGroupConfig.id] = selectdDatas;
-        let dtmplData_1 = {...dtmplData};
-
-        this.setState({
-            dtmplData: dtmplData_1,
-        })
-
-    }
-
-
-    changeFuseMode = (checked) => {
-        this.fuseMode = !checked;
-    }
-
-    postForm = async (result) => {
-        this.setState({
-            loading:true,
-        })
-        const {sourceId, code,dtmplData} = this.props;
-        if (code) { //有code是修改，没有是新增实体模板
-            result['唯一编码'] = code;
-        }else if(dtmplData && dtmplData.code){
-            result['唯一编码'] = dtmplData.code;
-        }
-        let res = await HcserviceV3.postDtmplData(sourceId, result, message);
-        this.setState({
-            loading:false,
-        })
-        if(res.status === "success"){
-            this.props.onFinish(res.code);
-        }
-    }
-
-    onSubmit = async (values: any) => {
-        const {showConfirm, code, dtmplConfig} = this.props;
-        const {dtmplData} = this.state;
-        console.log("from value:",values);
-        let resultCode = undefined;
-        const result = values;
-        for (let group of dtmplConfig.groups) {
-            if (group.type == 'relation') {
-                //添加关系标识
-                values[`${group.id}.$$flag$$`] = true;
-                //添加关系内容
-                let ds: DtmplData[] = dtmplData.arrayMap[group.id];
-                if (ds) {
-                    ds.forEach((d, index) => {
-                        values[`${group.id}[${index}].$$relation$$`] = d.relationLabel;
-                        if (d.editStatus || d.editStatus=='new') {
-                            for (let field of group.fields) {
-                                values[`${group.id}[${index}].${field.id}`] = d.fieldMap[field.id];
-                            }
-                        } else if(d.editStatus || d.editStatus=='changed'){
-                            values[`${group.id}[${index}].唯一编码`] = d.code;
-                            for (let field of group.fields) {
-                                values[`${group.id}[${index}].${field.id}`] = d.fieldMap[field.id];
-                            }
-                        }else{
-                            values[`${group.id}[${index}].唯一编码`] = d.code;
-                        }
-                    })
-                }
-            }
-        }
-        resultCode = await this.postForm(result);
-        // if (showConfirm) {
-        //     confirm({
-        //         title: '确定要保存修改吗',
-        //         okText: '确定',
-        //         okType: 'danger',
-        //         cancelText: '取消',
-        //         onOk: async () =>
-        //             await this.postForm(result)
-        //         ,
-        //     });
-        // } else {
-        //     resultCode = await this.postForm(result);
-        // }
-    }
-
-
-    fieldGroupList = () => {
-
-        const {dtmplConfig,parentId} = this.props;
-        const {dtmplData, loading} = this.state;
-
-        let groups: FieldGroupConfig[];
-        if (dtmplConfig) {
-            groups = dtmplConfig.groups;
-        }
-
-        return groups.map((item) => {
-                if (item.type == 'relation') {//关系
-                    if (item.fields) {
-                        let data: DtmplData[] = undefined;
-                        if (dtmplData) {
-                            data = dtmplData.arrayMap[item.id];
-                        }
-                        return <RelationTable loading={loading} parentId={parentId}  key={item.id} fieldGroupConfig={item} value={data}
-                                              viewOrEdit={"edit"} onChange={this.onGroupChange}/>
-                    }
-                } else {//字段组
-                    return <CollapseCard
-                        title={item.title}
-                        key={item.id}
-                        id={parentId+item.id}
-                        className="hoverable"
-                        headStyle={{background: "#f2f4f5"}}
-                        loading={loading}
-                    >
-                        <FormItemGroup  fields={item?item.fields:undefined} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
-                        ></FormItemGroup>
-                    </CollapseCard>
-                }
-            }
-        );
-    }
-
-    render() {
-        const {formRef, dtmplConfig,  sourceId, code,parentId,onValuesChange,dtmplData} = this.props;
-        if(!dtmplConfig){
-           return <Card>
-               {/*loading={loading}*/}
-           </Card>
-        }
-        const {buttons, premises} = dtmplConfig;
-        return (
-            <>
-                <Card bordered={false}
-                      key={"detailTitle"}
-                      className="hoverable pageHeader"
-                    // loading={loading}
-                >
-                    <h3>
-                        {code || (dtmplData && dtmplData.code)? "[编辑]":"[新增]"}
-                        <div className="fr">
-                            {buttons && buttons.includes('fusionMode') ?
-                                <Switch
-                                    checkedChildren="开"
-                                    unCheckedChildren="关"
-                                    style={{marginRight: 10}}
-                                    title="融合模式"
-                                    onChange={this.changeFuseMode}/>
-                                : ""}
-                            <Button
-                                className="hoverbig"
-                                title="刷新"
-                                onClick={this.doRefresh}
-                            ><ReloadOutlined/></Button>
-                        </div>
-                    </h3>
-                </Card>
-                <AntdForm scrollToFirstError={true} labelWrap={true}  ref={formRef} name="control-hooks"  onValuesChange={onValuesChange} onFinish={this.onSubmit}>
-                    <AntdForm.Item hidden={true} name={'actionId'}  ></AntdForm.Item>
-                    <AntdForm.Item hidden={true} name={'mainCode'}  ></AntdForm.Item>
-                    {this.fieldGroupList()}
-                </AntdForm>
-                {premises && premises.length > 0 ?
-                    <CollapseCard
-                        title={this.premisestitle}
-                        key={this.premisestitle}
-                        id={parentId+premises[0].id}
-                        className="hoverable"
-                        headStyle={{background: "#f2f4f5"}}
-                        // loading={loading}
-                    >
-                        <FieldViewGroup
-                            fields={premises}/>
-                    </CollapseCard>
-                    : ""
-                }
-            </>
-        );
-    }
-
-}
-
-