aldehyde 0.2.92 → 0.2.94

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

@@ -25,7 +25,7 @@ import "./index.css"
 import {
     ActTableMode,
     ActTableViewModel,
-    AddOrUpdate,
+    AddOrUpdate, ClassifiedAddConfig,
     ColumnConfig,
     DtmplData, JumpConfig,
     LtmplConfig,
@@ -68,7 +68,7 @@ interface ActTableProps extends TmplBaseProps {
     ltmplConfig: LtmplConfig,
     menuId?: string,
     showView?: (code: string, toCustomPage?: boolean) => void,
-    doCreate?: (toCustomPage?: boolean) => void,
+    doCreate?: (addtmplId:string,toCustomPage: boolean) => void,
     customCreatable?:boolean,
     doEdit?: (code: string, mode: AddOrUpdate, toCustomPage?: boolean) => void,
     customEditable?:boolean,
@@ -605,6 +605,18 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         })
     }
 
+    getAddTmplButton= (classifiedAddConfigs: ClassifiedAddConfig[]) => {
+        if(classifiedAddConfigs && classifiedAddConfigs.length<1){
+            return "没有分类添加按钮";
+        }
+        return classifiedAddConfigs.map((config)=>{
+            return <p><Button size={'small'} type={'text'}
+                onClick={() => this.props.doCreate(config.id,false)}>
+                {config.title}
+            </Button></p>
+        })
+    }
+
 
     renderHeaderButtons = () => {
         let {hiddenColIds, queryKey, viewModels, sortedColConfigs, disabledColIds, showL2Chart, showL2ActTable} = this.state;
@@ -619,15 +631,23 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 : null
             }
             {buttons.includes("dtmplAdd") && doCreate && !readOnly ?
-                <Tooltip title={'创建'}>
+                ltmplConfig.classifiedAddConfigs && ltmplConfig.classifiedAddConfigs.length>0 ?
+                    <Popover arrow={false}  content={this.getAddTmplButton(ltmplConfig.classifiedAddConfigs)}
+                             placement="bottomRight"
+                             >
+                        <Tooltip >
+                            <Button><PlusOutlined/></Button>
+                        </Tooltip>
+                    </Popover>
+                    :<Tooltip title={'创建'}>
                     <Button
-                        onClick={() => doCreate()}>
+                        onClick={() => doCreate(null,false)}>
                         <PlusOutlined/>
                     </Button> </Tooltip> : ''}
             {(buttons.includes("dtmplCustomAdd") || customCreatable) && doCreate && !readOnly?
                 <Tooltip title={'创建'}>
                     <Button
-                        onClick={() => doCreate(true)}><PlusCircleOutlined/></Button></Tooltip> : ''}
+                        onClick={() => doCreate(null,true)}><PlusCircleOutlined/></Button></Tooltip> : ''}
             {buttons.includes("importLtmplExcel")  && !readOnly ? <Tooltip title={'导入'}> <Button
                 href={`#/${sourceId}/importer?menuId=${menuId}`} target={'_blank'}>
                 <UploadOutlined/>

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import {Button, Col, Form, message, Row, Space, Table, Tooltip, Typography} from 'antd';
+import {Button, Col, Form, message, Popover, Row, Space, Table, Tooltip, Typography} from 'antd';
 import {
     AlignLeftOutlined,
     DeleteOutlined,
@@ -9,7 +9,7 @@ import {
     SnippetsOutlined
 } from '@ant-design/icons';
 import "./index.css";
-import {DtmplData, FieldGroupConfig, SelectedRow, ViewOrEdit} from "../tmpl/interface";
+import {ClassifiedAddConfig, DtmplData, FieldGroupConfig, SelectedRow, ViewOrEdit} from "../tmpl/interface";
 import SupportInputTypes from '../tmpl/control-type-supportor';
 import TableUnits from "./table-util";
 import ViewControl from "../controls/view-control";
@@ -49,6 +49,7 @@ interface RelationTableStat {
     selectedDtmplData?: DtmplData,
     filterStr?: string,
     pageSize?: number,
+    addTmplId?:string,
 };
 
 
@@ -64,6 +65,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         selectedDtmplData: undefined,
         filterStr: undefined,
         pageSize: 10,
+        addTmplId:undefined,
         // columns:[],
         // dataSource:[],
         // current:1,
@@ -439,19 +441,33 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         //this.hiddenRowEdit();
     }
 
-    showAddDtmplModel = () => {
+    showAddDtmplModel = (addTmplId?:string) => {
         this.setState({
             showDtmplEdit: true,
+            addTmplId,
             selectedCode: undefined,
         })
     }
     showEditDtmplModel = (record) => {
         this.setState({
             showDtmplEdit: true,
+            addTmplId:undefined,
             selectedCode: record.code,
         })
     }
 
+    getAddTmplButton= (classifiedAddConfigs: ClassifiedAddConfig[]) => {
+        if(classifiedAddConfigs && classifiedAddConfigs.length<1){
+            return "没有分类添加按钮";
+        }
+        return classifiedAddConfigs.map((config)=>{
+            return <p><Button size={'small'} type={'text'}
+                              onClick={() => this.showAddDtmplModel(config.id)}>
+                {config.title}
+            </Button></p>
+        })
+    }
+
     buildButtons = () => {
         const {fieldGroupConfig, viewOrEdit, value,serverKey} = this.props;
         const {buttons, disabled} = fieldGroupConfig;
@@ -469,11 +485,20 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                             ></RowEditor>
                             : ''}
                         {buttons.includes('dtmplAdd') ?
+                            fieldGroupConfig.classifiedAddConfigs && fieldGroupConfig.classifiedAddConfigs.length>0 ?
+                                <Popover arrow={false}  content={this.getAddTmplButton(fieldGroupConfig.classifiedAddConfigs)}
+                                          placement="bottomRight"
+                                >
+                                    <Tooltip >
+                                        <Button icon={<PlusSquareOutlined/>}>新增</Button>
+                                    </Tooltip>
+                                </Popover>
+                                :
                             <Button
                                 disabled={buttonDisabled}
                                 icon={<PlusSquareOutlined/>}
                                 size="small"
-                                onClick={this.showAddDtmplModel}
+                                onClick={()=>this.showAddDtmplModel()}
                                 style={{marginBottom: 10}}
                             >新增</Button> : ""}
                         {buttons.includes('selectAdd') ?
@@ -513,7 +538,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
     render() {
 
         const {fieldGroupConfig, value, parentId, loading, initCollapse, mainCode,serverKey,showRightNav} = this.props;
-        const {pageSize, selectedCode, showDtmplView, showSelectTable, showDtmplEdit, tableLoading, showRowEdit, selectedDtmplData} = this.state;
+        const {pageSize, selectedCode, showDtmplView, showSelectTable, showDtmplEdit,addTmplId, tableLoading, showRowEdit, selectedDtmplData} = this.state;
 
         const {buttons} = fieldGroupConfig;
         let mainCode1 = fieldGroupConfig.mainCode ? fieldGroupConfig.mainCode : mainCode ? mainCode : parentId;
@@ -570,7 +595,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                                         sourceId={fieldGroupConfig.id}
                                         code={selectedCode}> </ModalDtmplView> : ""}
                     {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                        <DtmplEditPage serverKey={serverKey} mainCode={mainCode1} open={showDtmplEdit} onCancel={this.hiddenEntityEdit}
+                        <DtmplEditPage addTmplId={addTmplId}  serverKey={serverKey} mainCode={mainCode1} open={showDtmplEdit} onCancel={this.hiddenEntityEdit}
                                        sourceId={fieldGroupConfig.id}
                                        code={selectedCode}
                                        onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd}/>

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -163,7 +163,6 @@ HCDataSource.getOptions = async function (serverKey: string, mstrucId: string) {
             }
             enumMap.set(mstrucId, reqOptions);
         }
-
     }
 
     return enumMap.get(mstrucId);
@@ -201,7 +200,7 @@ HCDataSource.requestDtmplConfig = async function (serverKey: string, sourceId: s
     if (!dtmplConfigMap.has(sourceId)) {
         let dtmplConfig:DtmplConfig=await HcserviceV3.requestDtmplConfig(serverKey, sourceId,code);
 
-        if(!dtmplConfig.dynamic){
+        if(dtmplConfig && !dtmplConfig.dynamic){
             dtmplConfigMap.set(sourceId,dtmplConfig);
         }else{
             //直接返回
@@ -232,13 +231,14 @@ HCDataSource.requestViewDtmplConfig = async function (serverKey: string, sourceI
     return viewDtmplConfigMap.get(sourceId);
 };
 
-HCDataSource.requestAddDtmplConfig = async function (serverKey: string, sourceId: string) {
-    if (!addDtmplConfigMap.has(sourceId)) {
-        addDtmplConfigMap.set(sourceId, await HcserviceV3.requestAddDtmplConfig(serverKey, sourceId));
+HCDataSource.requestAddDtmplConfig = async function (serverKey: string, sourceId: string,addTmplId:string) {
+   let key=addTmplId?addTmplId:sourceId;
+    if (!addDtmplConfigMap.has(key)) {
+        addDtmplConfigMap.set(key, await HcserviceV3.requestAddDtmplConfig(serverKey, sourceId,addTmplId));
         //加载枚举
-        await loadEnumOfDtmplConfig(serverKey, addDtmplConfigMap.get(sourceId));
+        await loadEnumOfDtmplConfig(serverKey, addDtmplConfigMap.get(key));
     }
-    return addDtmplConfigMap.get(sourceId);
+    return addDtmplConfigMap.get(key);
 };
 
 HCDataSource.getEnums = function (mstrucId: string): EnumItem[] {
@@ -274,17 +274,19 @@ HCDataSource.requestBlocks = async (l2MenuId: string, blockId: string) => {
     let result;
     if (blocksCache.length < 1) {
         let blockRes = await HcserviceV3.requestBlocks(l2MenuId ? l2MenuId : undefined, blockId ? blockId : undefined);
-
-        for (let block of blockRes.blocks) {
-            blocksCache.push(block);
+        if(blockRes){
+            for (let block of blockRes.blocks) {
+                blocksCache.push(block);
+            }
+            programName = blockRes.programName;
+            result = {
+                blocks: blockRes.blocks,
+                l2MenuId: blockRes.l2MenuId,
+                blockId: blockRes.blockId,
+                programName: blockRes.programName,
+            };
         }
-        programName = blockRes.programName;
-        result = {
-            blocks: blockRes.blocks,
-            l2MenuId: blockRes.l2MenuId,
-            blockId: blockRes.blockId,
-            programName: blockRes.programName,
-        };
+
     } else {
         result = {
             blocks: blocksCache,

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

@@ -72,14 +72,14 @@ export default class HcserviceV3 {
         return res.dtmplConfig;
     }
 
-    static async requestAddDtmplConfig(serverKey:string,sourceId: string) {
+    static async requestAddDtmplConfig(serverKey:string,sourceId: string,addTmplId:string) {
 
         let url = `/v3/add-dtmpl/config`
         let res = await Super.super({
             url,
             serverKey,
             method: "GET",
-            query: {sourceId}
+            query: {sourceId,addTmplId}
         });
         return res.dtmplConfig;
     }
@@ -649,7 +649,7 @@ export default class HcserviceV3 {
             url: '/v3/auth/context-source-value',
             method: "GET"
         })
-        return res.value;
+        return res?res.value:null;
     }
 
     static async login(json, kaptchaToken, kaptchaText, pubkey,programCode?:string) {
@@ -720,7 +720,7 @@ export default class HcserviceV3 {
             header:{programCode,hydrocarbonToken},
             url: '/v3/current-user',
         });
-        return res.user;
+        return res?res.user:null;
     }
 
     // static async requestMessagebar() {
@@ -747,7 +747,7 @@ export default class HcserviceV3 {
             url: url,
             method: "GET",
         })
-        return res.fastMenu;
+        return res?res.fastMenu:null;
     }
 
     static async reload() {

package/src/aldehyde/tmpl/interface.tsx

@@ -77,6 +77,10 @@ export interface JumpConfig extends OrderableTmplBase {
     searchParams:FieldConfig[],
     routeParams:FieldConfig[],
 }
+export interface ClassifiedAddConfig extends OrderableTmplBase {
+
+}
+
 
 export interface Level2Menu extends MenuBase {
     items:(BlockMenu|Level2Menu)[],
@@ -142,12 +146,13 @@ export interface FieldGroupConfig extends OrderableTmplBase {
     pageSourceFieldMstrucId:string,
     codeSourceFieldMstrucId:string,
     pointSourceId:string,
+    classifiedAddConfigs?:ClassifiedAddConfig[],
 }
 
 export type SaveJumpType = 'list' | 'add' | 'edit';
 
 export interface DtmplConfig extends TmplBase {
-    authSaveInterval: number;
+    autoSaveInterval?: number;
     //exportExcel fusionMode history dtmplSave refresh
     buttons: ButtonName[];
     // list add  edit
@@ -251,6 +256,7 @@ export interface LtmplConfig extends SelectConfig {
     reStatParams?: CriteriaConfig[];
     customEditPagePath?:string;
     customViewPagePath?:string;
+    classifiedAddConfigs?:ClassifiedAddConfig[],
     drillingParams?: CriteriaConfig[];
     footer?:string;
     header?:string;
@@ -369,6 +375,7 @@ export interface DtmplBaseProps extends TmplBaseProps {
     serialNumber?: number,
     goDtmpl?: (code?:string) => void,
     maxColsOnRow?:1|2,
+    addTmplId?:string,
 };
 
 export interface ChartConfig {

package/src/aldehyde/tmpl/superagent.js

@@ -143,7 +143,7 @@ export default class Superagent {
 
     static getHeaderObj() {
         return {
-            'hydrocarbon-token': Units.hydrocarbonToken() ?Units.hydrocarbonToken() : Units.getAnoHydrocarbonToken(),
+            'hydrocarbon-token': Units.hydrocarbonToken() ? Units.hydrocarbonToken() : Units.getAnoHydrocarbonToken(),
             'hydrocarbon-program-token': Units.programCode()
         }
     }

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

@@ -21,6 +21,7 @@ interface ActTreeState {
     mainCode?: string,
     sourceId?: string,
     cardtitle?:string,
+    addTmplId?:string,
 }
 
 export default class ActTree extends React.PureComponent<ActTreeProps, ActTreeState> {
@@ -34,6 +35,7 @@ export default class ActTree extends React.PureComponent<ActTreeProps, ActTreeSt
         mainCode: undefined,
         sourceId: undefined,
         cardtitle:undefined,
+        addTmplId:undefined
     }
 
     refTmplTree: any = React.createRef();
@@ -67,42 +69,42 @@ export default class ActTree extends React.PureComponent<ActTreeProps, ActTreeSt
         const {ttmplConfig} = this.props;
         this.showCard(title,ttmplConfig.rootGtmplId,null,code,true,false);
     };
-    showCard=(cardtitle,sourceId,mainCode,recordCode,showEdit,showView)=>{
+    showCard=(cardtitle,sourceId,mainCode,recordCode,showEdit,showView,addTmplId?:string)=>{
         this.setState({
             mainCode,
             cardtitle,
             recordCode,
             showEdit,
             showView,
-            sourceId,
+            sourceId,addTmplId
         })
     }
     onViewRoot = (title:string,code?: string) => {
         const {ttmplConfig} = this.props;
-        this.showCard(title,ttmplConfig.rootGtmplId,null,code,false,true);
+        this.showCard(title,ttmplConfig.rootGtmplId,null,code,false,true,null);
     };
 
     onEditSub = (title:string,sourceId:string,mainCode:string,recordCode?: string) => {
-        this.showCard(title,sourceId,mainCode,recordCode,true,false);
+        this.showCard(title,sourceId,mainCode,recordCode,true,false,null);
     };
 
     onViewSub = (title:string,sourceId:string,mainCode:string,recordCode?: string) => {
 
-        this.showCard(title,sourceId,mainCode,recordCode,false,true);
+        this.showCard(title,sourceId,mainCode,recordCode,false,true,null);
     };
 
     onDelete=(sourceId:string,recordCode?: string) => {
         HcserviceV3.deleteByCode(null,sourceId, [recordCode]);
     };
-    onAddSub=(title:string,sourceId:string,mainCode: string) => {
+    onAddSub=(title:string,sourceId:string,mainCode: string,addTmplId: string) => {
         
-        this.showCard(title,sourceId,mainCode,null,true,false);
+        this.showCard(title,sourceId,mainCode,null,true,false,addTmplId);
     };
 
     render() {
         const {} = this.props;
 
-        const {ttmplNodeConfig,showView, showEdit, recordCode, mainCode, sourceId,cardtitle} = this.state;
+        const {ttmplNodeConfig,showView, showEdit, recordCode, mainCode, sourceId,cardtitle,addTmplId} = this.state;
         if (!ttmplNodeConfig) {
             return <Card loading={true}></Card>
         }
@@ -128,7 +130,7 @@ export default class ActTree extends React.PureComponent<ActTreeProps, ActTreeSt
             </Sider>
             <Layout style={{marginLeft: 322, backgroundColor: '#fff'}}>
                 <Content style={{overflow: 'initial'}}>
-                    {showEdit ? <DtmplEditCard title={<>{recordCode ? <>编辑 {cardtitle?cardtitle:""}</> : <>添加 {cardtitle?cardtitle:""}</>} </>}
+                    {showEdit ? <DtmplEditCard addTmplId={addTmplId} title={<>{recordCode ? <>编辑 {cardtitle?cardtitle:""}</> : <>添加 {cardtitle?cardtitle:""}</>} </>}
                                                mainCode={mainCode}
                                                sourceId={sourceId}
                                                code={recordCode}

package/src/aldehyde/tree/tmpl-tree.tsx

@@ -24,7 +24,7 @@ interface TmplTreeProps {
     doEditRoot?: (title:string,code?: string) => void,
     doViewRoot?: (title:string,code?: string) => void,
     doDelete?: (ratmplId: string, code?: string) => void,
-    doAddSub?: (title:string,ratmplId: string, mainCode: string) => void,
+    doAddSub?: (title:string,ratmplId: string, mainCode: string,addTmplId:string) => void,
 }
 
 interface TmplTreeState {
@@ -236,7 +236,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
         const {doAddSub} = this.props;
         return <Button onClick={(e) => {
             this.stopPropagation(e)
-            doAddSub(title,ratmplId, mainCode);
+            doAddSub(title,ratmplId, mainCode,null);
         }} size={'small'}>{icon}{title}</Button>
     }