aldehyde 0.1.18 → 0.1.21

package/src/aldehyde/detail/edit/{modal-dtmpl-edit.tsx → dtmpl-edit-page.tsx}

@@ -1,18 +1,20 @@
 import React from 'react';
-import {Button, FormInstance, Modal, Popconfirm} from 'antd'
-import {DtmplBaseProps, DtmplConfig, DtmplData} from "../../tmpl/interface";
+import {Button, Drawer, FormInstance, Modal, Popconfirm, Space} from 'antd'
+import {DtmplBaseProps, DtmplConfig, DtmplData, PageType} from "../../tmpl/interface";
 import DtmplForm from '../../form/dtmpl-form';
 import HCDataSource from "../../tmpl/hc-data-source";
 import Units from "../../units";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import Action from "../../controls/action";
+import DtmplEdit from "./dtmpl-edit";
 
 interface ModalEditorProps extends DtmplBaseProps {
-    height: any,
+    height?: any,
+    width?:number,
     visible: boolean,
     onOk: (code: string) => void,
     onCancel: () => void,
-
+    pageType:PageType;
 }
 
 interface ModalEditorState {
@@ -23,7 +25,7 @@ interface ModalEditorState {
     dtmplData:DtmplData,
 }
 
-export default class ModalDtmplEdit extends React.PureComponent<ModalEditorProps, ModalEditorState> {
+export default class DtmplEditPage extends React.PureComponent<ModalEditorProps, ModalEditorState> {
     formRef = React.createRef<FormInstance>();
     autoSaveTimer = -1000000000000000;
     autoSaveInterval=undefined;
@@ -35,12 +37,13 @@ export default class ModalDtmplEdit extends React.PureComponent<ModalEditorProps
     static defaultProps = {
         showConfirm: true,
         height: 500,
+        width:1250,
         //antd modal
         forceRender: true,
         style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
         okText: "确定",
         cancelText: "取消",
-
+        pageType:'modal'
     }
     state = {
         id:'modelDtmplEdit'+Units.getRandomNum(6),
@@ -160,7 +163,7 @@ export default class ModalDtmplEdit extends React.PureComponent<ModalEditorProps
         //处理action
         if (dtmplConfig) {
             dtmplConfig.actions.forEach((ac, index) => {
-                footerButtons.unshift(<Action hiddenType={'disabled'}  serial={serial} key={ac.id}  formRef={this.formRef} actionConfig={ac}  doAction={this.doSubmit}></Action>);
+                footerButtons.unshift(<Action iconType={'icon-title'} hiddenType={'disabled'}  serial={serial} key={ac.id}  formRef={this.formRef} actionConfig={ac}  doAction={this.doSubmit}></Action>);
             })
         }
         footerButtons.unshift(<Popconfirm key="back" placement="topLeft" title={"确定要取消本次修改内容吗?"} onConfirm={onCancel} okText="确定" cancelText="取消">
@@ -171,12 +174,12 @@ export default class ModalDtmplEdit extends React.PureComponent<ModalEditorProps
     }
 
     render() {
-        const {height, onOk, onCancel, code, sourceId,  visible,mainCode} = this.props
+        const {height, onOk, onCancel, code, sourceId,  visible,mainCode,width,pageType} = this.props
         const {dtmplConfig,id,dtmplData} = this.state;
 
-        return <Modal
+        return (<> {pageType=='modal'? <Modal
             visible={visible}
-            width={1250}
+            width={width}
             title={dtmplConfig ? dtmplConfig.title : ""}
             bodyStyle={{height: height, overflow: 'auto'}}
             destroyOnClose={true}
@@ -185,13 +188,33 @@ export default class ModalDtmplEdit extends React.PureComponent<ModalEditorProps
             footer={this.getFooter()}
         >
             {visible} <div onClick={this.onClickBody}>
-                {/*<Scrollbars  autoHide autoHideTimeout={1000}>*/}
                 <DtmplForm parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
                            onFinish={onOk}
                            showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
-                {/*</Scrollbars>*/}
             </div>
-        </Modal>
+            </Modal>
+            :
+            <Drawer
+                placement={'left'}
+                closable={true}
+                mask={false}
+                onClose={onCancel}
+                visible={visible}
+                width={width}
+                style={{
+                    maxWidth: 1960,
+                }}
+                extra={
+                    <Space>{this.getFooter()}</Space>
+                }
+            >
+                <DtmplForm parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
+                           onFinish={onOk}
+                           showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
+            </Drawer>
+       }
+       </>
+    )
 
     }
 

package/src/aldehyde/form/criteria-form.tsx

@@ -68,7 +68,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
                 //     <Button type="primary" key={action.id}
                 //             disabled={disabled}>{action.title}</Button>
                 // </Popconfirm>;
-                return   <Action hiddenType={"disabled"} key={action.id} disabled={disabled} data={selectedDatas} actionConfig={action}  doAction={doAction}  serial={1} ></Action>
+                return   <Action  hiddenType={"disabled"} key={action.id} disabled={disabled} data={selectedDatas} actionConfig={action}  doAction={doAction}  serial={1} ></Action>
             });
         }
     }

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

@@ -18,6 +18,7 @@ export interface DtmplFormProps extends DtmplBaseProps {
     showConfirm: boolean,
     onFinish: (code:string) => void,
     onValuesChange?:()=>void,
+    maxColsOnRow?:number,// 2
 };
 
 interface DtmplFormStat {
@@ -37,6 +38,9 @@ export default class Form extends React.PureComponent<DtmplFormProps, DtmplFormS
         dtmplData: undefined,
         // changedGroupData:new Map<number,DtmplData[]>()
     }
+    static defaultPorps={
+        maxCols:2,
+    }
 
     async componentDidMount() {
        await this.loadData();
@@ -140,11 +144,11 @@ export default class Form extends React.PureComponent<DtmplFormProps, DtmplFormS
                 if (ds) {
                     ds.forEach((d, index) => {
                         values[`${group.id}[${index}].$$relation$$`] = d.relationLabel;
-                        if (d.editStatus || d.editStatus=='new') {
+                        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'){
+                        } 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];
@@ -175,7 +179,7 @@ export default class Form extends React.PureComponent<DtmplFormProps, DtmplFormS
 
     fieldGroupList = () => {
 
-        const {dtmplConfig,parentId} = this.props;
+        const {dtmplConfig,parentId,maxColsOnRow} = this.props;
         const {dtmplData, loading} = this.state;
 
         let groups: FieldGroupConfig[];
@@ -202,7 +206,7 @@ export default class Form extends React.PureComponent<DtmplFormProps, DtmplFormS
                         headStyle={{background: "#f2f4f5"}}
                         loading={loading}
                     >
-                        <FormItemGroup  fields={item?item.fields:undefined} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
+                        <FormItemGroup maxColsOnRow={maxColsOnRow} fields={item?item.fields:undefined} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
                         ></FormItemGroup>
                     </CollapseCard>
                 }

package/src/aldehyde/form/form-Item-group.tsx

@@ -14,6 +14,7 @@ export interface FieldGroupProps {
     nameAttr?:string,
     valueMap: object,
     width?: number,
+    maxColsOnRow?:number,
 };
 
 interface FieldGroupState {
@@ -24,6 +25,7 @@ export default class FormItemGroup extends React.PureComponent<FieldGroupProps,
 
     static defaultProps={
         nameAttr:'id',
+        maxColsOnRow:2,
     }
 
     constructor(props) {
@@ -34,7 +36,7 @@ export default class FormItemGroup extends React.PureComponent<FieldGroupProps,
     }
 
     initFormList = () => {
-        const {fields, valueMap,nameAttr} = this.props
+        const {fields, valueMap,nameAttr,maxColsOnRow} = this.props
         const formItemList = [];
 
         if ( fields && fields.length > 0) {
@@ -75,8 +77,11 @@ export default class FormItemGroup extends React.PureComponent<FieldGroupProps,
 
         for (let i = 0; i < formItemList.length; i = i + 1) {
             let colNum = fields[i].colNum;
+
             if(fields[i].extControlType=='hidden'){
                 colNum=0;
+            }else if(maxColsOnRow && maxColsOnRow==1){
+                colNum=2;
             }
             let col = <Col key={i} span={12 * colNum}>
                 {formItemList[i]}

package/src/aldehyde/icon/index.tsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import {FileDoneOutlined,CheckOutlined,CloseCircleOutlined,FileAddOutlined,ThunderboltOutlined} from '@ant-design/icons';
+
+interface IconProps{
+    type:string,
+}
+
+export interface IconStat {
+
+};
+
+const iconMap={
+    FileDoneOutlined:FileDoneOutlined,
+    CheckOutlined:CheckOutlined,
+    CloseCircleOutlined:CloseCircleOutlined,
+    FileAddOutlined:FileAddOutlined,
+    ThunderboltOutlined:ThunderboltOutlined,
+}
+
+export default class Icon extends React.PureComponent<IconProps, IconStat>{
+    render(){
+        const {type}=this.props;
+        if(iconMap[type]){
+            return React.createElement(iconMap[type]);
+        }else{
+            return <ThunderboltOutlined />
+        }
+
+    }
+}

package/src/aldehyde/index.tsx

@@ -20,12 +20,15 @@ import QuickEntrance from './welcome/quick-entrance'
 import Workbench from './welcome/workbench';
 import PopoverEntitySelect from "./controls/entity-select/popover-entity-select";
 import DatePicker from "./controls/date-picker";
-import ModalDtmplEdit from "./detail/edit/modal-dtmpl-edit";
+import DtmplEditPage from "./detail/edit/dtmpl-edit-page";
 import TmplDataSource from './tmpl/hc-data-source';
 import * as TmplInterface from './tmpl/interface';
 import Superagent from './tmpl/superagent';
+import HCWelcome from './welcome/HCWelcome';
+import MainPage from './layout/MainPage';
+import ExcelImportRoute from './routable/import-route';
 
 export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplViewPage,LtmplPage,Menu2layers,Block,UserBar,
     ResetPassword,Footer,EntryControl,ViewControl,ProgramConfig,HydrocarbonService,QuickEntrance,Workbench,PopoverEntitySelect
-,DatePicker,ModalDtmplEdit,TmplInterface,TmplDataSource,Superagent,DtmplEdit}
+,DatePicker,DtmplEditPage,TmplInterface,TmplDataSource,Superagent,DtmplEdit,HCWelcome,MainPage,ExcelImportRoute}
 

package/src/aldehyde/layout/header/index.css

@@ -47,8 +47,9 @@
 }
 .userLogin:hover{
     background: #4a5f74;
-    color:#fff;
+    color:#000;
 }
+
 .ant-dropdown-menu-item:hover, .ant-dropdown-menu-submenu-title:hover{
     color:#1890FF;
 }

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import ModalDtmplEdit from "../detail/edit/modal-dtmpl-edit";
+import DtmplEditPage from "../detail/edit/dtmpl-edit-page";
 import ActDtmplView from "../detail/view/act-dtmpl-view";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
@@ -48,13 +48,13 @@ class DtmplViewPage extends React.PureComponent<DtmplViewPageProps, DtmplViewPag
         const { sourceId,code,mainCode} = this.props;
             return <>
                 <ActDtmplView goDtmpl={this.goDtmpl} sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
-                    <ModalDtmplEdit visible={showDtmplEdit} onCancel={()=>{
+                    <DtmplEditPage visible={showDtmplEdit} onCancel={()=>{
                         this.setState({
                             showDtmplEdit:false,
                         })}}
-                                    sourceId={sourceId}
-                                    code={code}
-                                    onOk={this.handleDtmplEdit} />
+                                   sourceId={sourceId}
+                                   code={code}
+                                   onOk={this.handleDtmplEdit} />
               </>
     }
 }

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

@@ -5,7 +5,7 @@ import ActTable from '../table/act-table'
 // import StatActTable from '../table/stat-act-table'
 import HCDataSource from "../tmpl/hc-data-source";
 import ModalDtmplView from "../detail/view/modal-dtmpl-view";
-import ModalDtmplEdit from "../detail/edit/modal-dtmpl-edit";
+import DtmplEditPage from "../detail/edit/dtmpl-edit-page";
 import HcserviceV3 from "../tmpl/hcservice-v3";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
@@ -107,6 +107,8 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
 
 
 
+
+
     doCreate = () => {
         this.setState({
             selectedCode:null,
@@ -163,13 +165,13 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                                     sourceId={sourceId}
                                     code={selectedCode}> </ModalDtmplView> : ""}
                 {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                    <ModalDtmplEdit visible={showDtmplEdit} onCancel={()=>{
+                    <DtmplEditPage visible={showDtmplEdit} onCancel={()=>{
                         this.setState({
                             showDtmplEdit:false,
                         })}}
-                        sourceId={sourceId}
-                                    code={selectedCode}
-                                    onOk={this.handleDtmplEdit}  />
+                                   sourceId={sourceId}
+                                   code={selectedCode}
+                                   onOk={this.handleDtmplEdit}  />
                     : ""}
               </>
         }

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

@@ -68,14 +68,23 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     showView = (code: string) => {
         const {basePath}=this.props;
         const { sourceId} = this.props.match.params;
-        this.onRoute(`${basePath}/${sourceId}/detail-view?code=${code}&menuId=${this.getMenuId()}`);
+        const {ltmplConfigRes} = this.state;
+        let path = `${basePath}/${sourceId}/detail-view?code=${code}&menuId=${this.getMenuId()}`;
+        if(ltmplConfigRes.ltmplConfig.customViewPagePath){
+            path=`${basePath}${ltmplConfigRes.ltmplConfig.customViewPagePath}?menuId=${this.getMenuId()}&sourceId=${sourceId}`;
+        }
+        this.onRoute(path);
     }
 
     doEdit = (code: string,mode:string) => {
         const {basePath}=this.props;
         const { sourceId} = this.props.match.params;
+        const {ltmplConfigRes} = this.state;
         let mainCode = this.getMainCode();
         let path = `${basePath}/${sourceId}/detail-edit?code=${code}&menuId=${this.getMenuId()}&mode=${mode}`;
+        if(ltmplConfigRes.ltmplConfig.customEditPagePath){
+            path=`${basePath}${ltmplConfigRes.ltmplConfig.customEditPagePath}?menuId=${this.getMenuId()}&sourceId=${sourceId}`;
+        }
         if (mainCode) {
             path = path + `&mainCode=${mainCode}`;
         }
@@ -97,7 +106,11 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     doCreate = () => {
         const {basePath}=this.props;
         const { sourceId} = this.props.match.params;
+        const {ltmplConfigRes} = this.state;
         let path = `${basePath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
+        if(ltmplConfigRes.ltmplConfig.customEditPagePath){
+            path=`${basePath}${ltmplConfigRes.ltmplConfig.customEditPagePath}?menuId=${this.getMenuId()}&sourceId=${sourceId}`;
+        }
         let mainCode = this.getMainCode();
         if (mainCode) {
             path = path + `&mainCode=${mainCode}`;
@@ -105,6 +118,12 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         this.onRoute(path);
     }
 
+    doRAction = (ractionId:string,mainCode:String) => {
+        const {basePath}=this.props;
+        let path = `${basePath}/${ractionId}/act-table?mainCode=${mainCode}&menuId=${this.getMenuId()}`;
+        this.onRoute(path);
+    }
+
     doSearch = (params_) => {
         const {basePath}=this.props;
         const { sourceId} = this.props.match.params;
@@ -154,7 +173,9 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             return <ActTable menuId={this.getMenuId()} mainCode={mainCode} showView={this.showView}
                              doSearch={this.doSearch} doEdit={this.doEdit} doCreate={this.doCreate}
                              sourceId={sourceId} criteriaData={criteriaData}
-                             ltmplConfig={ltmplConfigRes.ltmplConfig}/>
+                             ltmplConfig={ltmplConfigRes.ltmplConfig}
+                             doRAction={this.doRAction}
+            />
         }
 
     }

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

@@ -59,6 +59,7 @@ interface ActTableProps extends TmplBaseProps {
     doCreate?: () => void,
     doEdit?: (code: string,mode:AddOrUpdate) => void,
     doSearch?: (params: object) => void,
+    doRAction?:(ractionId:string,mainCode:string)=>void,
     level?: Level,
 };
 
@@ -178,7 +179,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     buildTableColumns = (ltmplConfig: LtmplConfig, hiddenColIds: string[], hiddenRowCodes: string[], sortedColConfigs: ColumnConfig[]) => {
-        const {mainCode, showView, doEdit,menuId} = this.props
+        const {mainCode, showView, doEdit,menuId,doRAction} = this.props
         const {buttons} = ltmplConfig;
         let tableColumns = [];
         let s = 0;
@@ -267,13 +268,15 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                                 key={raction.id}
                                 size="small"
                                 type="dashed"
-                                href={`#/${raction.id}/act-table?mainCode=${record.code}&menuId=${menuId}`}>
+                                onClick={() => doRAction(raction.id,record.code)}
+                               // href={`#/${raction.id}/act-table?mainCode=${record.code}&menuId=${menuId}`}
+                                    >
                                 {raction.title}
                             </Button>
                         }) : ""}
                         {ltmplConfig.rowActions && ltmplConfig.rowActions.length > 0 ?
                             ltmplConfig.rowActions.map((action) => {
-                                return <Action key={action.id} data={[record]} actionConfig={action}  doAction={this.doRowAction} buttonSize={'small'}  serial={1}></Action>
+                                return <Action iconType={'icon'} key={action.id} data={[record]} actionConfig={action}  doAction={this.doRowAction} buttonSize={'small'}  serial={1}></Action>
                             }) : ""}
                         {ltmplConfig.jumps && ltmplConfig.jumps.length > 0 ?
                             ltmplConfig.jumps.map((jump) => {

package/src/aldehyde/table/column/column-selector.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 import {Checkbox, Col, Row} from "antd";
 import {ColumnConfig,} from "../../tmpl/interface";
-import '../pagination.css';
 import {MenuOutlined} from '@ant-design/icons';
 import {SortableContainer, SortableElement, SortableHandle} from 'react-sortable-hoc';
 import {arrayMoveImmutable} from 'array-move';

package/src/aldehyde/table/index.css

@@ -32,7 +32,7 @@
 }
 
 .opsColumn {
-    min-width: 80px;
+    min-width: 156px;
 }
 
 /*.collapse .ant-card-body {*/

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

@@ -14,7 +14,7 @@ import SupportInputTypes from '../tmpl/control-type-supportor';
 import TableUnits from "./table-util";
 import ViewControl from "../controls/view-control";
 import ModalDtmplView from '../detail/view/modal-dtmpl-view';
-import ModalDtmplEdit from '../detail/edit/modal-dtmpl-edit'
+import DtmplEditPage from '../detail/edit/dtmpl-edit-page'
 import ModelSelectTable from './modal-select-table';
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import CollapseCard from '../controls/collapse-card'
@@ -41,6 +41,7 @@ interface RelationTableStat {
     showRowEdit: boolean,
     selectedDtmplData: DtmplData,
     filterStr: string,
+    pageSize:number,
 };
 
 
@@ -55,6 +56,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         showRowEdit: false,
         selectedDtmplData: undefined,
         filterStr: undefined,
+        pageSize:10,
         // columns:[],
         // dataSource:[],
         // current:1,
@@ -306,7 +308,11 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         })
     }
 
-    tabChange = () => {
+    tabChange = (pagination) => {
+        console.log('pagination',pagination);
+        this.setState({
+            pageSize:pagination.pageSize,
+        })
 
     }
 
@@ -446,6 +452,9 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
             datas.unshift(dtmplData);
         }
         onChange(fieldGroupConfig, datas);
+
+        console.log("handleRowEdit data:",datas);
+
         if (isAdd) {
             message.success('已添加');
         } else {
@@ -525,11 +534,11 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
     render() {
 
         const {fieldGroupConfig, value, parentId, loading, initCollapse} = this.props;
-        const {selectedCode, showDtmplView, showSelectTable, showDtmplEdit, tableLoading, showRowEdit, selectedDtmplData} = this.state;
+        const {pageSize,selectedCode, showDtmplView, showSelectTable, showDtmplEdit, tableLoading, showRowEdit, selectedDtmplData} = this.state;
 
         const {buttons} = fieldGroupConfig;
         let page = {
-            pageSize: 10,
+            pageSize: pageSize,
             hideOnSinglePage: true,
             defaultCurrent: 1,
             total: value ? value.length : undefined,
@@ -575,10 +584,10 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                                         sourceId={fieldGroupConfig.id}
                                         code={selectedCode}> </ModalDtmplView> : ""}
                     {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                        <ModalDtmplEdit visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
-                                        sourceId={fieldGroupConfig.id}
-                                        code={selectedCode}
-                                        onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd} />
+                        <DtmplEditPage visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
+                                       sourceId={fieldGroupConfig.id}
+                                       code={selectedCode}
+                                       onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd} />
                         : ""}
                     {/*{buttons.includes('rowEdit') || buttons.includes('rowAdd') ?*/}
                     {/*    <ModalRowEdit visible={showRowEdit} onCancel={this.hiddenRowEdit}*/}

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

@@ -1,5 +1,6 @@
 import {ColumnConfig, EnumItem, FieldBase, FieldConfig} from "./interface";
 import HCDataSource from "./hc-data-source";
+import {ProgramConfig} from "../index";
 
 const SupportInputTypes:Set<string>=new Set<string>();
 SupportInputTypes.add('date-YY');
@@ -61,12 +62,17 @@ SupportInputTypes.add('modal-entity-select');
 SupportInputTypes.add('color');
 
 SupportInputTypes.add('hidden');
+SupportInputTypes.add('lab-tree-select');
 function ControlTypeSupportor(){
 
 }
 ControlTypeSupportor.isSupport=function(type:string):boolean {
     if(type){
-        return SupportInputTypes.has(type);
+        if(ProgramConfig.getCustomViewControl(type)){
+            return true;
+        }else{
+            return SupportInputTypes.has(type);
+        }
     }else{
         return false;
     }

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

@@ -124,7 +124,7 @@ export default class HcserviceV3 {
         return res;
     }
 
-    static async requestLtmplQueryKey(sourceId, condition) {
+    static async requestLtmplQueryKey(sourceId, condition?) {
         console.log('condition:',condition);
         let url = `/v3/ltmpl/query/key`
         let res = await Super.super({
@@ -135,6 +135,17 @@ export default class HcserviceV3 {
         return res;
     }
 
+    static async requestLtmplQueryTop(sourceId, condition) {
+        console.log('condition:',condition);
+        let url = `/v3/ltmpl/top-data`
+        let res = await Super.super({
+            url: url,
+            method: 'GET',
+            query: {...condition,sourceId}
+        });
+        return res;
+    }
+
     static async requestSelectedData(sourceId, codes) {
         if (!codes) {
             message.warn("没有选择实体")
@@ -271,6 +282,8 @@ export default class HcserviceV3 {
         return res;
     }
 
+
+
     static async requestLtmplCount(sourceId) {
 
         let url = `/v3/ltmpl/data/count`;
@@ -305,6 +318,8 @@ export default class HcserviceV3 {
     //     return criterias;
     // }
 
+
+
     static async requestQueryData(queryKey:string, pageInfo:PageInfo) {
         let res = await Super.super({
             url: `/v3/ltmpl/query/data`,

package/src/aldehyde/tmpl/interface.tsx

@@ -13,7 +13,7 @@ export type StatColType = 'fact' | 'dimension';
 export type ActTableViewModel = 'table' | 'verticalList' | 'horizontalList';
 
 export type ControlHolderType= 'table' | 'descriptions'
-
+export type PageType='modal'|'drawer';
 export interface TmplBase {
     id: string;
     title: string;
@@ -42,6 +42,7 @@ export interface CQueryConfig extends OrderableTmplBase {
 
 export interface ActionConfig extends OrderableTmplBase {
     multible: boolean,
+    icon:string,
     beforeExeConfirm:string,
     preposes:FieldConfig[],
     writes:FieldConfig[],
@@ -121,8 +122,8 @@ export type Comparator = 'equal' | 'unequal' | 'includeOne' |  'exclude' | 'noLe
 
 export interface FieldConfig extends FieldBase {
     disabled?: boolean;
-    max?: number;
-    min?: number;
+    max?: string;
+    min?: string;
     buttons?: ButtonName[];
     rules?: FileRule[];
 
@@ -170,7 +171,8 @@ export interface LtmplConfig extends SelectConfig {
     chartType?: ChartType[];
     editAction:ActionConfig;
     reStatParams?: CriteriaConfig[];
-
+    customEditPagePath?:string;
+    customViewPagePath?:string;
     drillingParams?: CriteriaConfig[];
 }
 
@@ -230,6 +232,8 @@ export interface QueryData {
 
 export interface EControlProps extends ControlBaseProps {
     onChange?: (value: any) => void;
+    min?:string;
+    max?:string;
 }
 
 export interface VEControlProps extends EControlProps {

package/src/aldehyde/tmpl/tmpl-config-analysis.tsx

@@ -86,10 +86,10 @@ TmplConfigAnalysis.currentL1 =  function ( config: string,format:string) {
                    break;
            }
            if(symbol=="-"){
-               //console.log("moment().subtract(n,momentUnit)",moment().subtract(n,momentUnit));
+              // console.log("moment().subtract(n,momentUnit)",moment().subtract(n,momentUnit).format(format));
               return moment().subtract(n,momentUnit).format(format);
            }else{
-               //console.log("moment().add(n,momentUnit)",moment().add(n,momentUnit));
+              // console.log("moment().add(n,momentUnit)",moment().add(n,momentUnit).format(format));
               return moment().add(n,momentUnit).format(format);
            }
        }