aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/detail/dtmpl.css

@@ -1,57 +1,57 @@
-/*.labelcss label{*/
-/*    display:table-cell!important;*/
-/*    vertical-align: middle;*/
-/*    width:120px;*/
-/*}*/
-
-.downEditPic {
-  display: inline-block;
-}
-.downEditPic a {
-  visibility: hidden;
-  color: #1890ff;
-  cursor: pointer;
-}
-.downEditPic:hover a {
-  visibility: visible;
-}
-.editPic .ant-upload-list {
-  width: 150px;
-}
-.buttonGroup {
-  position: fixed;
-  width: 100px;
-  bottom: 30px;
-  right: 20px;
-  z-index: 99;
-}
-
-.buttonGroup button {
-  margin-bottom: 10px;
-}
-
-.detailPage h3 {
-  font-size: 18px;
-}
-.detailPage.showRightNav .ant-card {
-  min-width: 740px;
-  max-width: 1440px;
-  width: 90%;
-}
-
-.detailPage.noRightNav .ant-card {
-  min-width: 740px;
-  width: 100%;
-}
-
-.actionbtn button {
-  margin-right: 5px;
-}
-
-.detailPage .pad {
-  margin-right: 100px;
-}
-
-.ant-descriptions-item-content:has(.description-content) {
-  overflow: hidden;
-}
+/*.labelcss label{*/
+/*    display:table-cell!important;*/
+/*    vertical-align: middle;*/
+/*    width:120px;*/
+/*}*/
+
+.downEditPic {
+  display: inline-block;
+}
+.downEditPic a {
+  visibility: hidden;
+  color: #1890ff;
+  cursor: pointer;
+}
+.downEditPic:hover a {
+  visibility: visible;
+}
+.editPic .ant-upload-list {
+  width: 150px;
+}
+.buttonGroup {
+  position: fixed;
+  width: 100px;
+  bottom: 30px;
+  right: 20px;
+  z-index: 99;
+}
+
+.buttonGroup button {
+  margin-bottom: 10px;
+}
+
+.detailPage h3 {
+  font-size: 18px;
+}
+.detailPage.showRightNav .ant-card {
+  min-width: 740px;
+  max-width: 1440px;
+  width: 90%;
+}
+
+.detailPage.noRightNav .ant-card {
+  min-width: 740px;
+  width: 100%;
+}
+
+.actionbtn button {
+  margin-right: 5px;
+}
+
+.detailPage .pad {
+  margin-right: 100px;
+}
+
+.ant-descriptions-item-content:has(.description-content) {
+  overflow: hidden;
+}

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

@@ -1,268 +1,268 @@
-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, ActionConfig} 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;
-    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) {
-        if(!prevProps || prevProps!=this.props){
-            await this.loadData(await this.loadConfigData());
-        }
-    }
-
-    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,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);
-        }
-
-        if(dtmplConfig?.entity && dtmplConfig?.entity?.code==code){
-            let dtmplData=dtmplConfig.entity;
-            dtmplConfig.entity=undefined;
-            this.setState({
-                dtmplData,
-                id: code,
-                loading: false,
-            });
-        }else {
-            await this.loadData(dtmplConfig);
-        }
-
-        this.setState({
-            dtmplConfig,
-            loading: false,
-        })
-
-        return dtmplConfig;
-
-    }
-
-    loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code:propsCode,addOrUpdate,serverKey,codeSource} = this.props;
-        let code=propsCode;
-        if(!code && codeSource){
-            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
-        }
-
-        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);
-        }
-
-        if (code) {
-            this.setState({
-                loading: true,
-                dtmplData:undefined,
-            })
-
-            const dtmplData_:DtmplData=await HcserviceV3.getDtmplData(dtmplConfig,serverKey,sourceId, code);
-
-            if(this.props.code==dtmplData_.code &&
-                (!dtmplData_.sourceId  || (this.props.sourceId==dtmplData_.sourceId))){
-                if(addOrUpdate=='copy'&& dtmplData_){
-                    dtmplData_.code=undefined;
-                }
-                this.setState({
-                    dtmplData:dtmplData_,
-                    id:code,
-                })
-            }
-            this.setState({
-                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 if(saveJumpTo.includes('nothing')){
-
-        }else {
-            this.goList();
-        }
-    }
-
-    goList = () => {
-        this.newCode=undefined;
-        if(this.props.goBackToLtmpl){
-            this.props.goBackToLtmpl();
-        }
-
-    }
-
-    goEdit = () => {
-        const  code=this.newCode;
-        const {goDtmpl,code:propCode}=this.props;
-        this.newCode=undefined;
-        goDtmpl(code);
-        this.setState(state =>({
-            showPostResult:false
-        }))
-    }
-
-    goAdd = () => {
-        this.newCode=undefined;
-        const {goDtmpl,code:propCode}=this.props;
-        if(propCode){
-            goDtmpl();
-        }
-        this.setState(state =>({
-            showPostResult:false,
-        }))
-    }
-
-    render() {
-        const {dtmplConfig, showPostResult,loading,id,serial,dtmplData} = this.state;
-        //console.log(" dtmpl edit serial:",serial);
-        const { sourceId, showRightNav, code,addOrUpdate,maxColsOnRow,mainCode,serverKey} = this.props;
-        //const {title} = dtmplConfig;
-        let hiddenFields=[];
-        if (!dtmplConfig) {
-            return  <Card loading={loading}>
-            </Card>
-        }else{
-            let actions:ActionConfig[]= dtmplConfig.actions;
-            if(actions){
-                for(let a of actions){
-                   if(a.writes) {
-                       a.writes.forEach(w => {
-                           hiddenFields.push({id:w.id,value:w.value})
-                       })
-                   }
-                }
-                dtmplConfig.hiddenFields=hiddenFields;
-            }
-
-        }
-        return (
-            <div className={`detailPage `} onClick={this.onClickBody}>
-                <DtmplForm showRightNav={showRightNav} serverKey={serverKey} mainCode={mainCode}   parentId={id} dtmplConfig={dtmplConfig}  formRef={this.formRef} sourceId={sourceId}
-                           onFinish={this.onFinish} maxColsOnRow={maxColsOnRow}
-                           showConfirm={true} dtmplData={dtmplData}  onValuesChange={this.onValuesChange}></DtmplForm>
-                {showRightNav ?
-                    <RightBar  parentId={id} dtmplConfig={dtmplConfig}/> : ""
-                }
-
-                <SubmitButtonBar dtmplData={dtmplData} serverKey={serverKey} serial={serial} dtmplConfig={dtmplConfig} doSubmit={this.doSubmit} formRef={this.formRef}></SubmitButtonBar>
-                <CqueryButtonBar  serverKey={serverKey} dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
-                <PostResult
-                    open={showPostResult}
-                    addOrUpdate={addOrUpdate=='copy' ? 'add' : addOrUpdate}
-                    resultStatus={"success"}
-                    goList={this.goList}
-                    goEdit={this.goEdit}
-                    goAdd={this.goAdd}
-                    jumpTypes={dtmplConfig.saveJumpTo}
-                />
-            </div>)
-    }
-
+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, ActionConfig} 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;
+    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) {
+        if(!prevProps || prevProps!=this.props){
+            await this.loadData(await this.loadConfigData());
+        }
+    }
+
+    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,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);
+        }
+
+        if(dtmplConfig?.entity && dtmplConfig?.entity?.code==code){
+            let dtmplData=dtmplConfig.entity;
+            dtmplConfig.entity=undefined;
+            this.setState({
+                dtmplData,
+                id: code,
+                loading: false,
+            });
+        }else {
+            await this.loadData(dtmplConfig);
+        }
+
+        this.setState({
+            dtmplConfig,
+            loading: false,
+        })
+
+        return dtmplConfig;
+
+    }
+
+    loadData = async (dtmplConfig:DtmplConfig ) => {
+        const { sourceId, code:propsCode,addOrUpdate,serverKey,codeSource} = this.props;
+        let code=propsCode;
+        if(!code && codeSource){
+            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
+        }
+
+        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);
+        }
+
+        if (code) {
+            this.setState({
+                loading: true,
+                dtmplData:undefined,
+            })
+
+            const dtmplData_:DtmplData=await HcserviceV3.getDtmplData(dtmplConfig,serverKey,sourceId, code);
+
+            if(this.props.code==dtmplData_.code &&
+                (!dtmplData_.sourceId  || (this.props.sourceId==dtmplData_.sourceId))){
+                if(addOrUpdate=='copy'&& dtmplData_){
+                    dtmplData_.code=undefined;
+                }
+                this.setState({
+                    dtmplData:dtmplData_,
+                    id:code,
+                })
+            }
+            this.setState({
+                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 if(saveJumpTo.includes('nothing')){
+
+        }else {
+            this.goList();
+        }
+    }
+
+    goList = () => {
+        this.newCode=undefined;
+        if(this.props.goBackToLtmpl){
+            this.props.goBackToLtmpl();
+        }
+
+    }
+
+    goEdit = () => {
+        const  code=this.newCode;
+        const {goDtmpl,code:propCode}=this.props;
+        this.newCode=undefined;
+        goDtmpl(code);
+        this.setState(state =>({
+            showPostResult:false
+        }))
+    }
+
+    goAdd = () => {
+        this.newCode=undefined;
+        const {goDtmpl,code:propCode}=this.props;
+        if(propCode){
+            goDtmpl();
+        }
+        this.setState(state =>({
+            showPostResult:false,
+        }))
+    }
+
+    render() {
+        const {dtmplConfig, showPostResult,loading,id,serial,dtmplData} = this.state;
+        //console.log(" dtmpl edit serial:",serial);
+        const { sourceId, showRightNav, code,addOrUpdate,maxColsOnRow,mainCode,serverKey} = this.props;
+        //const {title} = dtmplConfig;
+        let hiddenFields=[];
+        if (!dtmplConfig) {
+            return  <Card loading={loading}>
+            </Card>
+        }else{
+            let actions:ActionConfig[]= dtmplConfig.actions;
+            if(actions){
+                for(let a of actions){
+                   if(a.writes) {
+                       a.writes.forEach(w => {
+                           hiddenFields.push({id:w.id,value:w.value})
+                       })
+                   }
+                }
+                dtmplConfig.hiddenFields=hiddenFields;
+            }
+
+        }
+        return (
+            <div className={`detailPage `} onClick={this.onClickBody}>
+                <DtmplForm showRightNav={showRightNav} serverKey={serverKey} mainCode={mainCode}   parentId={id} dtmplConfig={dtmplConfig}  formRef={this.formRef} sourceId={sourceId}
+                           onFinish={this.onFinish} maxColsOnRow={maxColsOnRow}
+                           showConfirm={true} dtmplData={dtmplData}  onValuesChange={this.onValuesChange}></DtmplForm>
+                {showRightNav ?
+                    <RightBar  parentId={id} dtmplConfig={dtmplConfig}/> : ""
+                }
+
+                <SubmitButtonBar dtmplData={dtmplData} serverKey={serverKey} serial={serial} dtmplConfig={dtmplConfig} doSubmit={this.doSubmit} formRef={this.formRef}></SubmitButtonBar>
+                <CqueryButtonBar  serverKey={serverKey} dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
+                <PostResult
+                    open={showPostResult}
+                    addOrUpdate={addOrUpdate=='copy' ? 'add' : addOrUpdate}
+                    resultStatus={"success"}
+                    goList={this.goList}
+                    goEdit={this.goEdit}
+                    goAdd={this.goAdd}
+                    jumpTypes={dtmplConfig.saveJumpTo}
+                />
+            </div>)
+    }
+
 }