aldehyde 0.1.34 → 0.1.37

package/src/aldehyde/layout/menu/menu-render.tsx

@@ -15,6 +15,36 @@ export default {
             }
         })
     },
+    getRoutePath(menu:Level2Menu,basePath,defaultCriteriaData){
+        if(menu){
+            let pageType=menu.pageType;
+
+            let routePath='act-table';
+
+            let codeSource='';
+            switch (pageType) {
+                case "列表":
+                    routePath='act-table';
+                    break;
+                case "添加":
+                    routePath='detail-edit';
+                    codeSource='&codeSource=new';
+                    break;
+                case "编辑":
+                    routePath='detail-edit';
+                    codeSource='&codeSource=listTop';
+                    break;
+                case "详情":
+                    routePath='detail-view';
+                    codeSource='&codeSource=listTop';
+                    break;
+            }
+
+            return `${basePath}/${menu.id}/${routePath}?menuId=${menu.id}${codeSource}${defaultCriteriaData}`;
+
+        }
+        return null;
+    },
     renderL2Menu(menus:Level2Menu[],target,basePath=""){
         return menus.map((item) => {
             let delimiter="/";
@@ -29,8 +59,10 @@ export default {
                 defaultCriteriaData='&'+ Units.transQueryParamsToStr(item.defaultCriteriaValue);
             }
 
+            let path=customPath ?`${basePath}/page-${item.id}${delimiter}${customPath}?menuId=${item.id}` :this.getRoutePath(item,basePath,defaultCriteriaData);
+
             return <Menu.Item key={item.id}>
-                <NavLink to={customPath ?`${basePath}/page-${item.id}${delimiter}${customPath}?menuId=${item.id}` :`${basePath}/${item.id}/act-table?menuId=${item.id}${defaultCriteriaData}`} target={target} >{item.title}</NavLink>
+                <NavLink to={path} target={target} >{item.title}</NavLink>
             </Menu.Item>
         })
     },

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

@@ -3,7 +3,8 @@ import {Button, Card, Form as AntdForm, Modal} from 'antd';
 import  {RouterCompProps} from '../tmpl/interface';
 import Units from "../units";
 import DtmplEdit from "../detail/edit/dtmpl-edit";
-import ActDtmplView from '../detail/view/act-dtmpl-view'
+import ActDtmplView from '../detail/view/act-dtmpl-view';
+import HcserviceV3 from "../tmpl/hcservice-v3";
 
 
 export interface DtmplRouteProps extends RouterCompProps {
@@ -11,13 +12,37 @@ export interface DtmplRouteProps extends RouterCompProps {
 };
 
 export interface DtmplRoutePropsStat {
-
+    codeSource:'new'|'listTop'|undefined,
+    queriedCode:string,
 };
 
 class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsStat> {
+    state={
+        codeSource:undefined,
+        queriedCode:undefined,
+    }
     static  defaultProps={
         basePath:"",
+        codeSource:undefined,
+        queriedCode:undefined,
     }
+    async componentDidMount() {
+        const {location,match}=this.props;
+        const {sourceId,} = match.params;
+        let codeSource:'new'|'listTop'|undefined=this.getCodeSource();
+        let queriedCode=undefined;
+        if(codeSource && codeSource=='listTop'){
+            //查询
+          let data= await HcserviceV3.requestMstrucLtmplQueryTop(sourceId,{top:1});
+          if(data && data.entities && data.entities[0]){
+              queriedCode=data.entities[0].code;
+          }
+        }
+        this.setState({
+            codeSource,queriedCode
+        })
+    }
+
     getMenuId=()=>{
         const {location} = this.props;
         console.log("this.props.match.params",this.props);
@@ -26,6 +51,16 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
         return menuId;
     }
 
+    getCodeSource=()=>{
+        const {location}=this.props;
+        let params=Units.transQueryStrToParams(location.search);
+        if('codeSource' in params){
+            return params['codeSource'];
+        }else{
+            return undefined;
+        }
+    }
+
     goBackToLtmpl=()=>{
         const { sourceId,} = this.props.match.params;
         const {basePath}=this.props;
@@ -53,6 +88,7 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
 
     getMainCode=()=>{
         const {location}=this.props;
+
         let params=Units.transQueryStrToParams(location.search);
         if('mainCode' in params){
             return params['mainCode'];
@@ -61,10 +97,16 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
         }
     }
 
-    getCode=()=>{
+    getCode= ()=>{
+        const {codeSource,queriedCode}=this.state;
         const {location}=this.props;
-        let params=Units.transQueryStrToParams(location.search);
-        return params['code'];
+        //let code;
+        if(codeSource=='listTop'){
+            return queriedCode;
+        }else{
+            let params=Units.transQueryStrToParams(location.search);
+            return params['code'];
+        }
     }
 
     getMode=()=>{
@@ -76,7 +118,8 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
     render() {
         const {location,match}=this.props;
         const {sourceId,} = match.params;
-        // console.log("this.props.match.params",match);
+        const {codeSource}=this.state;
+        console.log("this.props.match.params",match);
         if(!location){
             return <></>;
         }
@@ -88,7 +131,7 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
             );
         }else{
             return (
-                <DtmplEdit addOrUpdate={this.getMode()} sourceId={sourceId} code={this.getCode()} mainCode={this.getMainCode()} goBackToLtmpl={this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
+                <DtmplEdit addOrUpdate={this.getMode()} sourceId={sourceId} code={this.getCode()} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
             );
         }
 

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

@@ -15,6 +15,7 @@ interface ModelSelectTableProps {
     maxSelectedRows: number,
     visible: boolean,
     sourceId: string,
+    mainCode:string,
     exceptCodes?: string[],
     onCancel: () => void,
     onOK: (selectedRows: SelectedRow[]) => void,
@@ -53,10 +54,10 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
             pageSize: defaultPageSize ? defaultPageSize : 10,
             virtualEndPageNo: undefined,
         }
-        const {sourceId, exceptCodes} = this.props;
+        const {sourceId, exceptCodes,mainCode} = this.props;
         /** 构建 dataSource **/
             //构建过滤条件
-        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {exceptCodes, ...criteriaData, ...pageInfo});
+        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {exceptCodes, ...criteriaData, ...pageInfo,mainCode});
         this.setState({
             queryKey,
             criteriaData,

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import {Button, Input, message, Table, Tooltip} from 'antd';
+import {Button, Input, message, Table, Tooltip,Space,Tag,Row,Col,Form,Typography} from 'antd';
 import {
     AlignLeftOutlined,
     DeleteOutlined,
@@ -20,8 +20,12 @@ import HcserviceV3 from "../tmpl/hcservice-v3";
 import CollapseCard from '../controls/collapse-card'
 import RowEditor from '../detail/edit/row-editor'
 import Action from "../controls/action";
-
+import EntryControl from "../controls/entry-control";
+import CountingTag from "../controls/counting-tag";
+const FormItem = Form.Item
+const { Text} = Typography;
 interface RelationTableProps {
+    mainCode?:string,
     parentId: string,
     loading: boolean,
     viewOrEdit: ViewOrEdit,
@@ -196,17 +200,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         }) : ""}
                     {/*行编辑*/}
                     {rowEdit ?
-                        // <Popover placement="leftBottom"   content={<RowEditCard fieldGroupConfig={fieldGroupConfig} dtmplData={this.getRowEditData(record.code)} onOk={this.handleRowEdit}  ></RowEditCard>} trigger="click">
-                        // <Tooltip placement="left" title="编辑当前行">
-                        //     <Button
-                        //         type='primary'
-                        //         icon={<EditOutlined/>}
-                        //         size="small"
-                        //         // onClick={() => {
-                        //         //     this.showRowEditModel(record.code)
-                        //         // }}
-                        //     ></Button> </Tooltip></Popover>
-                        <RowEditor buttonIcon={<EditOutlined/>} dtmplData={this.getRowEditData(record.code)}
+                        <RowEditor  buttonIcon={<EditOutlined/>} dtmplData={this.getRowEditData(record.code)}
                                    fieldGroupConfig={fieldGroupConfig}
                                    onOk={this.handleRowEdit}
                                    tooltipTitle={"编辑当前行"}></RowEditor> : ""}
@@ -337,8 +331,6 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
             codes.push(row.code);
         }
         await this.add(codes);
-
-
     }
 
     add = async (codes: string[]) => {
@@ -367,27 +359,6 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         })
     }
 
-    // edit = async (code: string) => {
-    //
-    // }
-
-    // showRowEditModel = (code?: string) => {
-    //     const {value} = this.props;
-    //     let selectedDtmplData = undefined;
-    //     if (code) {
-    //         for (let dtmplData of value) {
-    //             if (code == dtmplData.code) {
-    //                 selectedDtmplData = dtmplData;
-    //                 break;
-    //             }
-    //         }
-    //     }
-    //     this.setState({
-    //         showRowEdit: true,
-    //         selectedDtmplData,
-    //     })
-    // }
-
     getRowEditData = (code?: string) => {
         const {value} = this.props;
         let data = undefined;
@@ -483,20 +454,11 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         const buttonDisabled: boolean = fieldGroupConfig.max ? fieldGroupConfig.max <= (value ? value.length : 0) : false;
 
         if (viewOrEdit == 'edit') {
-            return <>
+            return <Row>
+                <Col span={20}>
+                        <Space>
                 {buttons.includes('rowAdd') ?
-                    // <Popover placement="rightBottom"   content={<RowEditCard fieldGroupConfig={fieldGroupConfig} onOk={this.handleRowEdit}  ></RowEditCard>} trigger="click">
-                    //                     // <Button
-                    //                     //     disabled={buttonDisabled}
-                    //                     //     type='primary'
-                    //                     //     icon={<PlusOutlined/>}
-                    //                     //     size="small"
-                    //                     //     // onClick={() => {
-                    //                     //     //     this.showRowEditModel()
-                    //                     //     // }}
-                    //                     //     style={{marginBottom: 10, marginRight: 10}}
-                    //                     // >新建一行</Button></Popover>
-                    <RowEditor buttonStyle={{marginBottom: 10, marginRight: 10}} buttonTitle={"新建一行"}
+                    <RowEditor disabled={buttonDisabled} buttonStyle={{marginBottom: 10}} buttonTitle={"新建一行"}
                                fieldGroupConfig={fieldGroupConfig}
                                onOk={this.handleRowEdit}
                     ></RowEditor>
@@ -508,7 +470,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         icon={<PlusSquareOutlined/>}
                         size="small"
                         onClick={this.showAddDtmplModel}
-                        style={{marginBottom: 10, marginRight: 10}}
+                        style={{marginBottom: 10}}
                     >新增</Button> : ""}
                 {buttons.includes('selectAdd') ?
                     <Button
@@ -517,9 +479,18 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         icon={<SnippetsOutlined/>}
                         size="small"
                         onClick={this.showSelect}
-                        style={{marginBottom: 10, marginRight: 10}}
+                        style={{marginBottom: 10}}
                     >选择</Button> : ""}
-            </>
+                            <FormItem   name={'$virtual'+fieldGroupConfig.id}
+                                        style={{ margin: 0}}
+                                        rules={fieldGroupConfig.min? [{
+                                            required: true, message: `请选择或添加${fieldGroupConfig.title}`,
+                                        }] :null}>
+                                <CountingTag min={fieldGroupConfig.min+""} style={{marginBottom: 10}} count={value?value.length:0}></CountingTag>
+                            </FormItem>
+                </Space>
+                </Col>
+            </Row>
         } else {
             return "";
         }
@@ -533,7 +504,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
 
     render() {
 
-        const {fieldGroupConfig, value, parentId, loading, initCollapse} = this.props;
+        const {fieldGroupConfig, value, parentId, loading, initCollapse,mainCode} = this.props;
         const {pageSize,selectedCode, showDtmplView, showSelectTable, showDtmplEdit, tableLoading, showRowEdit, selectedDtmplData} = this.state;
 
         const {buttons} = fieldGroupConfig;
@@ -564,12 +535,14 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         className={`hoverable`}
                         headStyle={{background: "#f2f4f5"}}
                         loading={loading}
+                        bodyStyle={{padding:'6px'}}
                         extra={<Input.Search onSearch={this.searchValue} allowClear placeholder="关键字搜索"/>
                         }
                     >
                         <div className="editTableList">
                             {this.buildButtons()}
                             <Table scroll={{scrollToFirstRowOnChange: false}}
+                                   locale={{emptyText:<div style={{textAlign:'center',width:'100%'}}><Text  disabled>暂无数据...</Text></div>}}
                                    bordered
                                    loading={tableLoading}
                                    dataSource={this.buildDataSource()}
@@ -598,7 +571,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         <ModelSelectTable maxSelectedRows={fieldGroupConfig.max} visible={showSelectTable}
                                           onOK={this.select} onCancel={() => {
                             this.setState({showSelectTable: false})
-                        }} exceptCodes={exceptCodes}
+                        }} exceptCodes={exceptCodes} mainCode={mainCode}
                                           sourceId={fieldGroupConfig.id}></ModelSelectTable> : ""}
 
                 </>

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

@@ -10,6 +10,7 @@ import CriteriaForm from "../form/criteria-form";
 import ViewControl from "../controls/view-control";
 
 interface SelectTableProps {
+    mainCode?:string,
     maxSelectedRows?: number,
     sourceId: string,
     selectedRows: SelectedRow[];
@@ -45,6 +46,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         this.setState({
             loading: true,
         })
+        const {mainCode}=this.props;
         const {defaultPageSize} = selectConfig;
         let pageInfo = {
             pageNo: 1,
@@ -54,7 +56,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         const {sourceId} = this.props;
         /** 构建 dataSource **/
             //构建过滤条件
-        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {...criteriaData, ...pageInfo});
+        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {...criteriaData, ...pageInfo,mainCode});
         this.setState({
             queryKey,
             criteriaData,

package/src/aldehyde/tmpl/control-type-supportor.tsx

@@ -36,6 +36,7 @@ SupportInputTypes.add('select');
 SupportInputTypes.add('multiselect');
 SupportInputTypes.add('checkbox');
 SupportInputTypes.add('radio');
+SupportInputTypes.add('yes-no-switch');
 SupportInputTypes.add('caselect');
 SupportInputTypes.add('relation');
 SupportInputTypes.add('file');

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

@@ -19,6 +19,7 @@ const selectConfigMap: Map<string, SelectConfig> = new Map<string, SelectConfig>
 const ltmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigRes>();
 const l2LtmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigRes>();
 const dtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
+const viewDtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
 
 
 function findUnloadEnumMstrucIdOfFields(fields:FieldBase[]) {
@@ -167,11 +168,20 @@ HCDataSource.requestDtmplConfig = async function ( sourceId: string) {
     if (!dtmplConfigMap.has(sourceId)) {
         dtmplConfigMap.set(sourceId, await HcserviceV3.requestDtmplConfig(sourceId));
         //加载枚举
-       await loadEnumOfDtmplConfig(dtmplConfigMap.get(sourceId));
+        await loadEnumOfDtmplConfig(dtmplConfigMap.get(sourceId));
     }
     return dtmplConfigMap.get(sourceId);
 };
 
+HCDataSource.requestViewDtmplConfig = async function ( sourceId: string) {
+    if (!viewDtmplConfigMap.has(sourceId)) {
+        viewDtmplConfigMap.set(sourceId, await HcserviceV3.requestViewDtmplConfig(sourceId));
+        //加载枚举
+        await loadEnumOfDtmplConfig(viewDtmplConfigMap.get(sourceId));
+    }
+    return viewDtmplConfigMap.get(sourceId);
+};
+
 HCDataSource.getEnums = function (mstrucId:string): EnumItem[] {
     //这里是不是后续可以考虑防止串改
    return enumMap.get(mstrucId);
@@ -268,6 +278,7 @@ HCDataSource.clearOnly =async function () {
     enumMap.clear();
     ltmplConfigMap.clear();
     dtmplConfigMap.clear();
+    viewDtmplConfigMap.clear();
     selectConfigMap.clear();
     l2LtmplConfigMap.clear();
     optionsMap.clear();

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

@@ -57,10 +57,6 @@ export default class HcserviceV3 {
 
     static async requestDtmplConfig(sourceId:string) {
 
-        // if(sourceId=='user'){
-        //     return this.requestUserDtmplConfig();
-        // }
-
         let url = `/v3/dtmpl/config`
         let res = await Super.super({
             url,
@@ -70,6 +66,17 @@ export default class HcserviceV3 {
         return res.dtmplConfig;
     }
 
+    static async requestViewDtmplConfig(sourceId:string) {
+
+        let url = `/v3/view-dtmpl/config`
+        let res = await Super.super({
+            url,
+            method: "GET",
+            query:{sourceId}
+        });
+        return res.dtmplConfig;
+    }
+
     // static async requestUserDtmplConfig() {
     //     let url = `/v3/user/dtmpl/config`
     //     let res = await Super.super({
@@ -220,6 +227,16 @@ export default class HcserviceV3 {
         return await this.requestCommonDtmplData(sourceId, code,versionId,url)
     }
 
+    static async requestViewDtmplData(sourceId, code,versionId) {
+        let url = `/v3/view-dtmpl/data`;
+        return await this.requestCommonDtmplData(sourceId, code,versionId,url)
+    }
+
+    static async requestMstrucViewDtmplData(sourceId, code,versionId) {
+        let url = `/v3/mstruc/view-dtmpl/data`;
+        return await this.requestCommonDtmplData(sourceId, code,versionId,url)
+    }
+
     // static async requestUserDtmplData() {
     //     let url = `/v3/user/dtmpl/data`;
     //     let res = await Super.super({

package/src/aldehyde/tmpl/interface.tsx

@@ -58,7 +58,8 @@ export interface Level2Menu extends MenuBase {
     customPath?: string;
     displayTotal?: boolean;
     count?:number;
-    defaultCriteriaValue?:object
+    defaultCriteriaValue?:object,
+    pageType:'列表'|'详情'|'编辑'|'添加'
 }
 
 export interface Level1Menu extends MenuBase {
@@ -143,6 +144,8 @@ export interface SelectConfig extends TmplBase {
     columns: ColumnConfig[];
     criterias: CriteriaConfig[];
     defaultCriteriaValue?:object;
+    characteristicColumn:ColumnConfig;
+    primaryCriteria:CriteriaConfig;
 }
 
 export interface RActionConfig extends OrderableTmplBase {
@@ -248,10 +251,11 @@ export interface VControlProps extends ControlBaseProps {
 export interface ControlBaseProps {
     id?:any;
     value?: any;
-    fieldConfig: FieldConfig;
+    fieldConfig?: FieldConfig;
     itemType?: string;
     style?: object;
     disabled?: boolean;
+    mainCode?:string;
 }
 
 export interface SelectedRow {