aldehyde 0.1.16 → 0.1.19

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

@@ -12,8 +12,8 @@ import HcserviceV3 from "../../tmpl/hcservice-v3";
 import  CqueryButtonBar from "../button/cquery-button-bar"
 
 interface DtmplEditProps extends DtmplBaseProps {
-    goBackToLtmpl: () => void,
-    addOrUpdate:AddOrUpdate,
+    goBackToLtmpl?: () => void,
+    addOrUpdate?:AddOrUpdate,
 }
 
 interface DtmplEditState {

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

@@ -4,7 +4,8 @@ import Loginit from './login/login';
 import DtmplRoute from './routable/dtmpl-route';
 import ImportRoute from './routable/import-route';
 import LtmplRoute from "./routable/ltmpl-route";
-import DtmplPage from './module/dtmpl-page';
+import DtmplViewPage from './module/dtmpl-view-page';
+import DtmplEdit from './detail/edit/dtmpl-edit';
 import LtmplPage from './module/ltmpl-page';
 import Menu2layers from './layout/menu/menu-2layers';
 import Block from './layout/menu/block';
@@ -19,11 +20,12 @@ 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';
 
-export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplPage,LtmplPage,Menu2layers,Block,UserBar,
+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}
+,DatePicker,DtmplEditPage,TmplInterface,TmplDataSource,Superagent,DtmplEdit}
 

package/src/aldehyde/layout/menu/userinfo-bar.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { Drawer, Space,Button} from 'antd'
 import {SolutionOutlined} from '@ant-design/icons';
-import DtmplPage from "../../module/dtmpl-page";
+import DtmplViewPage from "../../module/dtmpl-view-page";
 
 interface UserInfoBarProps {
 
@@ -54,7 +54,7 @@ class UserInfoBar extends React.PureComponent<UserInfoBarProps, UserInfoBarState
                         </Space>
                     }
                 >
-                   <DtmplPage sourceId={'0'} code={"userCode"}></DtmplPage>
+                   <DtmplViewPage sourceId={'0'} code={"userCode"}></DtmplViewPage>
                 </Drawer>
             </>
         );

package/src/aldehyde/module/{dtmpl-page.tsx → dtmpl-view-page.tsx}

@@ -1,27 +1,20 @@
 import React from 'react'
-import {DtmplConfig, DtmplData, LtmplConfigRes} from '../tmpl/interface';
-import Units from "../units";
-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 HcserviceV3 from "../tmpl/hcservice-v3";
+import DtmplEditPage from "../detail/edit/dtmpl-edit-page";
 import ActDtmplView from "../detail/view/act-dtmpl-view";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
-export interface DtmplPageProps  {
+export interface DtmplViewPageProps  {
     sourceId?:string,
     code?:string;
     mainCode?:string;
 };
 
-export interface DtmplPageState  {
+export interface DtmplViewPageState  {
     showDtmplEdit:boolean;
 };
 
-class DtmplPage extends React.PureComponent<DtmplPageProps, DtmplPageState> {
+class DtmplViewPage extends React.PureComponent<DtmplViewPageProps, DtmplViewPageState> {
 
     state = {
         showDtmplEdit:false,
@@ -55,16 +48,16 @@ class DtmplPage extends React.PureComponent<DtmplPageProps, DtmplPageState> {
         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} />
               </>
     }
 }
 
-export default DtmplPage;
+export default DtmplViewPage;
 

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";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
@@ -163,13 +163,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/table/act-table.tsx

@@ -273,7 +273,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                         }) : ""}
                         {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) => {
@@ -287,9 +287,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                                 //                onClick={() => this.doRowCQuery(cQuery.id, record.code)}
                                 // >{cQuery.title}</Button>;
                                 console.log("record record",record);
-                                return <CquickButton key={cquery.id} size={"small"}
+                                return <CquickButton key={cquery.id} size={"small"}  pageType={'drawer'}
                                     // onClick={() => doCQuery(cquery.id)}
-                                                     disabled={false} cQueryConfig={cquery} mainCode={cquery.mainCodeColId?record[cquery.mainCodeColId]:record.code}/>
+                                                     cQueryConfig={cquery} mainCode={cquery.mainCodeColId?record[cquery.mainCodeColId]:record.code}/>
                             }) : ""}
                         </Space>);
             } else {

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/hc-data-source.tsx

@@ -2,8 +2,8 @@ import {
     BlockMenu,
     DtmplConfig,
     EnumItem,
-    FieldBase, LtmplConfigRes,
-    SelectConfig, Level2Menu
+    FieldBase, LtmplConfigRes,ActionConfig,
+    SelectConfig, Level2Menu,LtmplConfig
 } from "./interface";
 import HcserviceV3 from './hcservice-v3';
 import ControlTypeSupportor from './control-type-supportor'
@@ -13,7 +13,8 @@ const blocksCache: BlockMenu[] = [];
 const quickEntranceCache: Level2Menu[] = [];
 const messageCache: Level2Menu[] = [];
 const workbenchCache: Level2Menu[] = [];
-const enumMap: Map<string, EnumItem[]> = new Map<string, EnumItem[]>();
+const enumMap: Map<string, EnumItem[]> = new Map<string, EnumItem[]>();//key mstrucId
+const optionsMap: Map<string, EnumItem[]> = new Map<string, EnumItem[]>();//key mstrucId
 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>();
@@ -35,6 +36,19 @@ function findUnloadEnumMstrucIdOfFields(fields:FieldBase[]) {
     return mstrucIdArray;
 }
 
+function findUnloadEnumMstrucIdOfActions(actions:ActionConfig[]) {
+    const mstrucIds = [];
+    if (actions) {
+        actions.forEach((item) => {
+            let subs= findUnloadEnumMstrucIdOfFields(item.writes);
+            concat(mstrucIds,subs);
+            subs= findUnloadEnumMstrucIdOfFields(item.preposes);
+            concat(mstrucIds,subs);
+        });
+    }
+    return mstrucIds;
+}
+
 async function loadEnumOfDtmplConfig(selectConfig:DtmplConfig){
     const mstrucIds = [];
     if(selectConfig.groups){
@@ -43,6 +57,8 @@ async function loadEnumOfDtmplConfig(selectConfig:DtmplConfig){
             concat(mstrucIds,subs);
         })
     }
+    let subs= findUnloadEnumMstrucIdOfActions(selectConfig.actions);
+    concat(mstrucIds,subs);
     await loadEnum(mstrucIds);
 }
 
@@ -57,12 +73,29 @@ function concat(mstrucIds,sub){
     return mstrucIds;
 }
 
-async function loadEnumOfSelectConfig(selectConfig:SelectConfig){
+async function loadEnumOfSelectConfig(selectConfig:SelectConfig  ){
+    const mstrucIds = [];
+    let subs= findUnloadEnumMstrucIdOfFields(selectConfig.columns);
+    concat(mstrucIds,subs);
+    subs= findUnloadEnumMstrucIdOfFields(selectConfig.criterias);
+    concat(mstrucIds,subs);
+    await loadEnum(mstrucIds);
+}
+
+async function loadEnumOfLtmplConfig(selectConfig: LtmplConfig ){
     const mstrucIds = [];
    let subs= findUnloadEnumMstrucIdOfFields(selectConfig.columns);
     concat(mstrucIds,subs);
     subs= findUnloadEnumMstrucIdOfFields(selectConfig.criterias);
     concat(mstrucIds,subs);
+    subs= findUnloadEnumMstrucIdOfFields(selectConfig.drillingParams);
+    concat(mstrucIds,subs);
+    subs= findUnloadEnumMstrucIdOfFields(selectConfig.reStatParams);
+    concat(mstrucIds,subs);
+    subs= findUnloadEnumMstrucIdOfActions(selectConfig.actions);
+    concat(mstrucIds,subs);
+    subs= findUnloadEnumMstrucIdOfActions(selectConfig.rowActions);
+    concat(mstrucIds,subs);
     await loadEnum(mstrucIds);
 }
 async function loadEnum(mstrucIds:string[]){
@@ -79,16 +112,35 @@ async function loadEnum(mstrucIds:string[]){
 }
 
 
+
+
 function HCDataSource() {
 
 }
 
+HCDataSource.getOptions = async function (mstrucId:string){
+    if(!mstrucId){
+        return null;
+    }
+    if( !optionsMap.has(mstrucId)){
+        let reqOptions=  await HcserviceV3.requestOptions(mstrucId);
+        for(let option of reqOptions){
+            if(option['css']){
+                option['color']=option['css'].color;
+            }
+        }
+        optionsMap.set(mstrucId,reqOptions);
+    }
+
+    return optionsMap.get(mstrucId);
+}
+
 HCDataSource.requestLtmplConfig = async function ( sourceId: string) {
     if (!ltmplConfigMap.has(sourceId)) {
         ltmplConfigMap.set(sourceId, await HcserviceV3.requestLtmplConfig(sourceId));
         //加载枚举
         let res:LtmplConfigRes=ltmplConfigMap.get(sourceId);
-        await loadEnumOfSelectConfig(res.ltmplConfig);
+        await loadEnumOfLtmplConfig(res.ltmplConfig);
     }
     return ltmplConfigMap.get(sourceId);
 };
@@ -97,7 +149,7 @@ HCDataSource.requestL2LtmplConfig = async function (sourceId: string) {
         l2LtmplConfigMap.set(sourceId, await HcserviceV3.requestL2LtmplConfig(sourceId));
         //加载枚举
         let res:LtmplConfigRes=l2LtmplConfigMap.get(sourceId);
-        await loadEnumOfSelectConfig(res.ltmplConfig);
+        await loadEnumOfLtmplConfig(res.ltmplConfig);
     }
     return l2LtmplConfigMap.get(sourceId);
 };
@@ -218,6 +270,7 @@ HCDataSource.clearOnly =async function () {
     dtmplConfigMap.clear();
     selectConfigMap.clear();
     l2LtmplConfigMap.clear();
+    optionsMap.clear();
     blocksCache.splice(0,blocksCache.length);
     quickEntranceCache.splice(0,quickEntranceCache.length);
     messageCache.splice(0,quickEntranceCache.length);

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

@@ -21,6 +21,20 @@ export default class HcserviceV3 {
         }
     }
 
+    static async requestOptions(mstrucId) { //有下拉菜单时，请求下拉选项操作
+        if (mstrucId) {
+            let res = await Super.super({
+                url: `/v3/enum`,
+                query: {
+                    mstrucId
+                },
+            });
+            return res.options;
+        } else {
+            return {};
+        }
+    }
+
     // static async requestSelect(requestedMap, selectMSFieldIdArray) {
     //     //先从当前状态从中找，没有的才去查
     //     //后续可以放在缓存里，但需要一些策略和技巧
@@ -110,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({
@@ -121,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("没有选择实体")
@@ -257,6 +282,8 @@ export default class HcserviceV3 {
         return res;
     }
 
+
+
     static async requestLtmplCount(sourceId) {
 
         let url = `/v3/ltmpl/data/count`;
@@ -291,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[];
 
@@ -168,16 +169,19 @@ export interface LtmplConfig extends SelectConfig {
     cQuerys?:CQueryConfig[];
     rowCQuerys?:CQueryConfig[];
     chartType?: ChartType[];
-    reStatParams?: CriteriaConfig[];
     editAction:ActionConfig;
+    reStatParams?: CriteriaConfig[];
+
     drillingParams?: CriteriaConfig[];
 }
 
 export interface EnumItem {
     title: string;
     value: string;
+    id:string;
     color: string;
     order:string;
+    subOptions?:EnumItem[]
 }
 
 export type EditStatus ='new'|'changed'|'persisted'
@@ -227,6 +231,8 @@ export interface QueryData {
 
 export interface EControlProps extends ControlBaseProps {
     onChange?: (value: any) => void;
+    min?:string;
+    max?:string;
 }
 
 export interface VEControlProps extends EControlProps {