aldehyde 0.2.59 → 0.2.61

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -6,6 +6,7 @@ import HCDataSource from "../tmpl/hc-data-source";
 import Units from "../units";
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import Action from "../controls/action";
+import Scrollbars from 'react-custom-scrollbars';
 
 interface ModalEditorProps extends DtmplBaseProps {
     height?: any,
@@ -38,7 +39,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
     static defaultProps = {
         showConfirm: true,
-        height: 500,
+        height: 580,
         width:1250,
         bodyWidth:'100%',
         //antd modal
@@ -114,10 +115,14 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,defaultDtmplData,open,serverKey} = this.props;
+        const { sourceId, code:propsCode,defaultDtmplData,open,serverKey,codeSource} = this.props;
         if(!open){
             return;
         }
+        let code=propsCode;
+        if(!code && codeSource){
+            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
+        }
         if (code) {
             this.setState({
                 loading: true,
@@ -198,17 +203,18 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
             width={width}
             title={title1}
             closable={false}
-            bodyStyle={{height: height,width:bodyWidth,overflow: 'auto'}}
+            bodyStyle={{height: height,overflow: 'auto'}}
             destroyOnClose={true}
             centered
             onCancel={onCancel}
             footer={this.getFooter()}
-        >
-            {open} <div onClick={this.onClickBody}>
+        ><Scrollbars style={{ height: height-40 }} autoHide autoHideTimeout={1000}>
+             <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>
+                </Scrollbars>
             </Modal>
             :pageType=='drawer'?
             <Drawer

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

@@ -95,10 +95,14 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,defaultDtmplData,open,serverKey} = this.props;
+        const { sourceId, code:propsCode,defaultDtmplData,open,serverKey,codeSource} = this.props;
         if(!open){
             return;
         }
+        let code=propsCode;
+        if(!code && codeSource){
+            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
+        }
         if (code) {
             this.setState({
                 loading: true,

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

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

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

@@ -39,7 +39,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
     }
 
     render() {
-        const {title,sourceId,code,placement,open,onClose,width,cancelText,editable,serverKey}=this.props;
+        const {title,sourceId,code,placement,open,onClose,width,cancelText,editable,serverKey,codeSource}=this.props;
         return  (<Drawer
                     placement={placement}
                     title={<>{title}</>}
@@ -57,7 +57,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
                         </Space>
                     }
                 >
-                   <DtmplViewCard serverKey={serverKey} editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
+                   <DtmplViewCard codeSource={codeSource} serverKey={serverKey} editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
              </Drawer>)
     }
 }

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

@@ -2,7 +2,7 @@ import React, {ReactNode} from 'react'
 import { Modal} from 'antd'
 import DtmplViewCard from "./dtmpl-view-card";
 import {DtmplBaseProps} from "../tmpl/interface";
-
+import Scrollbars from 'react-custom-scrollbars';
 interface DtmplViewModalProps extends DtmplBaseProps{
     title?:ReactNode,
     open: boolean,
@@ -34,7 +34,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
     }
 
     render() {
-        const {title,sourceId,code,open,onClose,width,height,serverKey}=this.props;
+        const {title,sourceId,code,open,onClose,width,height,serverKey,codeSource}=this.props;
         return <Modal
                     open={open}
                     width={width}
@@ -43,7 +43,10 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
                     destroyOnClose={true}
                     centered
                     onCancel={onClose}
-                ><DtmplViewCard serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
+                >
+            <Scrollbars style={{ height: Number(height)-40 }} autoHide autoHideTimeout={1000}>
+            <DtmplViewCard  codeSource={codeSource} serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
+        </Scrollbars>
                 </Modal>
     }
 }

package/src/aldehyde/module/ltmpl-modal.tsx

@@ -1,7 +1,7 @@
 import React, {ReactNode} from 'react';
 import { Modal,Button,Card} from 'antd'
 import LtmplTable, {LtmplTableProps} from "./ltmpl-table";
-
+import Scrollbars from 'react-custom-scrollbars';
 
 interface LtmplDrawPageProps extends LtmplTableProps {
     onCancel: () => void,
@@ -19,10 +19,10 @@ export default class LtmplDrawer extends React.PureComponent<LtmplDrawPageProps,
 
     static defaultProps = {
         showConfirm: true,
-        height: 560,
+        height: 580,
         width:1250,
         forceRender: true,
-        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
+        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)',padding:10},
         okText: "确定",
         cancelText: "取消",
     }
@@ -34,22 +34,24 @@ export default class LtmplDrawer extends React.PureComponent<LtmplDrawPageProps,
     render() {
         const {title,height,width,onCancel,open,...other} = this.props
 
-        return (<Modal
+        return ( <Modal
                 open={open}
                 width={width}
                 title={title}
                 closable={false}
-                bodyStyle={{height: height, overflow: 'auto'}}
+                bodyStyle={{height: height, overflow: 'auto',padding:6}}
                 destroyOnClose={true}
                 centered
                 onOk={onCancel}
                 onCancel={onCancel}
                 footer={[<Button onClick={onCancel}>关 闭</Button>]}
-            >
+            > <Scrollbars style={{ height: Number(height)-40 }} autoHide autoHideTimeout={1000}>
                 <Card bordered={false} bodyStyle={{padding:'4px 0 0 0'}} >
+
                     <LtmplTable {...other}></LtmplTable>
-                </Card>
 
+                </Card>
+            </Scrollbars>
         </Modal>
     )
 

package/src/aldehyde/routable/dtmpl-route.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Empty} from 'antd';
-import  {RouterCompProps} from '../tmpl/interface';
+import {CodeSource, RouterCompProps} from '../tmpl/interface';
 import DtmplEdit from "../detail/edit/dtmpl-edit";
 import ActDtmplView from '../detail/view/act-dtmpl-view';
 import HcserviceV3 from "../tmpl/hcservice-v3";
@@ -12,7 +12,7 @@ export interface DtmplRouteProps extends RouterCompProps {
 };
 
 export interface DtmplRoutePropsStat {
-    codeSource?:'new'|'listop'|'listop-new'|undefined,
+    codeSource?:CodeSource,
     queriedCode?:string,
 };
 
@@ -46,22 +46,11 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
     queryCode=async ()=>{
         const {params}=this.props;
         const {sourceId} = params;
-        let codeSource:'new'|'listop'|'listop-new'|undefined=this.getCodeSource();
-        let queriedCode=undefined;
-        if(codeSource){
-            if( codeSource=='listop'){
-                queriedCode=await HcserviceV3.queryTop1(null,sourceId);
-                if(!queriedCode){
-                    queriedCode="bad-code";
-                }
-            }else if( codeSource=='listop-new'){
-                queriedCode=await HcserviceV3.queryTop1(null,sourceId);
-            }else if(codeSource=='new'){
-                queriedCode=null;
-            }
-        }
+        let codeSource:CodeSource=this.getCodeSource();
+        let  queriedCode=await HcserviceV3.queryCode(sourceId,codeSource);
         this.setState({
-            codeSource,queriedCode
+            codeSource,
+            queriedCode
         })
     }
 
@@ -84,15 +73,6 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
     }
 
     goBackToLtmpl=()=>{
-        // const { sourceId,} = this.props.match.params;
-        // const {basePath}=this.props;
-        //
-        // let url=`${basePath}/${sourceId}/act-table?menuId=${this.getMenuId()}`;
-        // let mainCode=this.getMainCode();
-        // if(mainCode){
-        //     url=url+`&mainCode=${mainCode}`;
-        // }
-        //this.props.history.push(url);
        this.props.navigate(-1);
     }
 

package/src/aldehyde/table/act-table.tsx

@@ -486,8 +486,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     doSelectedCQuery = async (cqueryId: string) => {
     }
 
-    doJump = async (jump: JumpConfig, record: object) => {
-        const {ltmplConfig} = this.props
+    doJump = async (jump: JumpConfig, record: DtmplData) => {
+       // const {ltmplConfig} = this.props
         // let result = await HcserviceV3.postJumps(jumpId, code);
         //
         // if (result.status === "success") {
@@ -520,7 +520,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                     //根据参数名匹配参数
                     for(let p of routeParamConfigs){
                         if(pa == p.title){//赋值替换
-                            paths[i]=record[p.id];
+                            paths[i]=record.fieldMap[p.id];
                             break;
                         }
                     }
@@ -533,24 +533,29 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
         //处理search 参数
         let searchParamConfigs=jump.searchParams;
+        let searchs=[];
+        //放入token
+        if(jump.tokenName){
+            searchs[0]=jump.tokenName+"="+Units.hydrocarbonToken();
+        }
+
         if(searchParamConfigs){
-            let searchs=[];
-            for(let i=0;i<searchParamConfigs.length;i++){
+            for(let i=searchs.length;i<searchParamConfigs.length+searchs.length;i++){
                let p= searchParamConfigs[i];
-                searchs[i]=p.title+"="+ (record[p.id]?record[p.id]:p.defaultValue);
+                searchs[i]=p.title+"="+ (record.fieldMap[p.id]?record.fieldMap[p.id]:p.defaultValue);
             }
-            if(searchs.length>0){
-                if( url.indexOf("?")!=url.length-1){
-                    url=url+"?";
-                }
-                url=url+searchs.join("&");
+        }
+        if(searchs.length>0){
+            if( url.indexOf("?")!=url.length-1){
+                url=url+"?";
             }
+            url=url+searchs.join("&");
         }
 
         window.open(url);
     }
 
-    doRowJump = async (jump: JumpConfig, record: object) => {
+    doRowJump = async (jump: JumpConfig, record: DtmplData) => {
         this.doJump(jump, record);
     }
 

package/src/aldehyde/table/modal-select-table.tsx

@@ -10,7 +10,7 @@ import QueryTable from './query-table';
 import CriteriaForm from "../form/criteria-form";
 import ViewControl from "../controls/view-control";
 import SelectedRowsCard from './selected-rows-card'
-
+import Scrollbars from 'react-custom-scrollbars';
 interface ModelSelectTableProps {
     maxSelectedRows: number,
     open: boolean,
@@ -236,21 +236,20 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
             <Modal
                 open={open}
                 title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection}></SelectedRowsCard>}
-                style={{maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'}}
-                width={'1250px'}
+                width={1150}
                 destroyOnClose={true}
                 centered
-                bodyStyle={{height: 500, overflow: 'auto'}}
+                bodyStyle={{height: 470, overflow: 'auto'}}
                 onCancel={this.handleCancel}
                 onOk={this.handleOk}
-            >
+            ><Scrollbars style={{ height: 470 }} autoHide autoHideTimeout={1000}>
                 <div className="actTable">
                     <CriteriaForm serverKey={serverKey} selectedRows={selectedRows} ltmplConfig={selectConfig} data={criteriaData}
                                   doSearch={this.doSearch} loading={loading} />
                     <QueryTable serverKey={serverKey}  pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:selectConfig.defaultPageSize}} onChangePage={this.onChangePage} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows} columns={columns}
                                 queryKey={queryKey}
                                 onChangeRowSelection={this.changeRowSelection}/>
-                </div>
+                </div> </Scrollbars>
             </Modal>
         );
     }

package/src/aldehyde/table/query-table.tsx

@@ -16,7 +16,7 @@ import {TableRowSelection} from "antd/lib/table/interface";
 import {SortableContainer, SortableElement} from "react-sortable-hoc";
 import {arrayMoveImmutable} from 'array-move';
 import ViewControl from "../controls/view-control";
-
+import Scrollbars from 'react-custom-scrollbars';
 const {Panel} = Collapse;
 const SortableItem = SortableElement(props => <tr {...props} />);
 const SortableBody = SortableContainer(props => <tbody {...props} />);
@@ -318,7 +318,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                                },
                            }}
                     >
-                    </Table> : ""}
+                    </Table>
+                    : ""}
                 <Pagination touchEnd={touchEnd} pageInfo={{...pageInfo, virtualEndPageNo}} pageTo={this.pageTo}
                             queryTotal={this.queryTotal}
                             total={total}/>

package/src/aldehyde/table/relation-table.tsx

@@ -523,7 +523,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
             defaultCurrent: 1,
             total: value ? value.length : undefined,
             showTotal: (total) => {
-                return `总共有${total}条`;
+                return `共${total}条`;
             }
         }
         let exceptCodes = [];
@@ -551,7 +551,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                     >
                         <div className="editTableList">
                             {this.buildButtons()}
-                            <Table size={'small'} scroll={{scrollToFirstRowOnChange: false}}
+                            <Table size={'small'}
                                    locale={{
                                        emptyText: <div style={{textAlign: 'center', width: '100%'}}><Text
                                            disabled>暂无数据...</Text></div>

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -3,7 +3,7 @@ import Super from "./superagent";
 import {message} from 'antd'
 import EncryptUtils from '../units/EncryptUtils'
 import format from 'dayjs';
-import {PageInfo, SelectedRow} from "./interface";
+import {CodeSource, PageInfo, SelectedRow} from "./interface";
 import HCDataSource from "./hc-data-source";
 
 import {ProgramConfig} from "../index";
@@ -130,7 +130,7 @@ export default class HcserviceV3 {
     }
 
     static async queryTop1(serverKey:string,sourceId:string){
-        let data= await HcserviceV3.requestMstrucLtmplQueryTop(serverKey,sourceId,{top:1});
+        let data= await this.requestMstrucLtmplQueryTop(serverKey,sourceId,{top:1});
         let queriedCode=null;
         if(data && data.entities && data.entities[0]){
             queriedCode=data.entities[0].code
@@ -491,6 +491,24 @@ export default class HcserviceV3 {
     //     Units.downloadFile(url, "详情");
     // }
 
+    static async queryCode(sourceId:string,codeSource:CodeSource,serverKey?:string) {
+
+        let queriedCode=undefined;
+        if(codeSource){
+            if( codeSource=='listop'){
+                queriedCode=await this.queryTop1(serverKey,sourceId);
+                if(!queriedCode){
+                    queriedCode="bad-code";
+                }
+            }else if( codeSource=='listop-new'){
+                queriedCode=await this.queryTop1(serverKey,sourceId);
+            }else if(codeSource=='new'){
+                queriedCode=null;
+            }
+        }
+        return queriedCode;
+    }
+
     static download(serverKey:string,path) {
         let vars = path.split("/");
         let fileName = vars[vars.length - 1]

package/src/aldehyde/tmpl/interface.tsx

@@ -106,6 +106,8 @@ export interface ColumnConfig extends FieldConfig {
     statColType?: StatColType;
 }
 
+export type CodeSource = 'new'|'listop'|'listop-new'|undefined;
+
 export type FieldGroupType = 'relation' | 'fieldGroup' ;
 
 export type ButtonName = 'rowAdd' | 'rowEdit' | 'batchDelete'|'singleDelete'| 'selectAdd' | 'dtmplAdd' | 'dtmplEdit' | 'copy'|
@@ -322,6 +324,7 @@ export interface TmplBaseProps {
 };
 
 export interface DtmplBaseProps extends TmplBaseProps {
+    codeSource?:CodeSource,
     showConfirm?: boolean,
     code?: string,
     defaultDtmplData?:DtmplData,

package/src/aldehyde/tmpl/model-struc-v3.tsx

@@ -0,0 +1,98 @@
+
+import {message} from 'antd'
+import Superagent from "./superagent";
+
+
+export default class ModelStrucV3 {
+
+    static url='/v3/mstruc/data';
+
+    static async post(sourceId:string,jsonEntity:object,serverKey?:string,){
+        const formData = new FormData();
+        formData.append('sourceId', sourceId);
+        formData.append('jsonEntity', JSON.stringify(jsonEntity));
+        let res = await Superagent.super({
+            url:this.url,
+            serverKey,
+            data: formData,
+            method: 'POST'
+        }, 'formdata',null)
+        let code = null;
+        if (res) {
+            if (res.status === "success") {
+                if (message) {
+                    if (res.message) {
+                        message.warning("保存成功! " + res.message, 4);
+                    } else{
+                        message.success("保存成功! ",1);
+                    }
+                }
+                code = res.entityCode ? res.entityCode : res.code;
+            }
+        } else {
+            if (message) {
+                message.error("保存失败");
+            }
+        }
+        return {code, status: res?res.status:'error'};
+
+    }
+
+    static async get(sourceId:string,params?:object,serverKey?:string,){
+
+        let res = await Superagent.super({
+            url:this.url,
+            serverKey,
+            query: {pageSize:1000,sourceId,...params},
+            method: 'GET'
+        }, null,null)
+        let code = null;
+        if (res) {
+            if (res.status === "success") {
+                if (message) {
+                    if (res.message) {
+                        message.warning("查询成功! " + res.message, 4);
+                    }
+                }
+                code = res.entityCode ? res.entityCode : res.code;
+            }else{
+                message.error("查询失败! " + res.message, 6);
+            }
+        } else {
+            if (message) {
+                message.error("查询失败");
+            }
+        }
+        return res?res:{status:"error"};
+    }
+
+    static async delete(sourceId:string,codes:string[],serverKey?:string,){
+
+        let res = await Superagent.super({
+            url:this.url,
+            serverKey,
+            query: {sourceId,codes},
+            method: 'DELETE'
+        }, null,null)
+        let code = null;
+        if (res) {
+            if (res.status === "success") {
+                if (message) {
+                    if (res.message) {
+                        message.warning("删除成功! " + res.message, 4);
+                    }
+                }
+                code = res.entityCode ? res.entityCode : res.code;
+            }else{
+                message.error("删除失败! " + res.message, 6);
+            }
+        } else {
+            if (message) {
+                message.error("删除失败");
+            }
+        }
+        return res;
+    }
+
+
+}