aldehyde 0.1.18 → 0.1.19

package/src/aldehyde/controls/entity-select/lab-tree-select.tsx

@@ -0,0 +1,148 @@
+import * as React from 'react'
+import {Button, Select, Spin,TreeSelect} from 'antd'
+import {EControlProps, PageInfo, QueryData, QueryKey, SelectConfig, SourceName} from "../../tmpl/interface";
+import {SearchOutlined} from '@ant-design/icons';
+import debounce from 'lodash/debounce';
+import './index.css';
+import HcserviceV3 from "../../tmpl/hcservice-v3";
+import HCDataSource from "../../tmpl/hc-data-source";
+
+interface LabTreeSelectProps extends EControlProps {
+
+};
+
+interface LabTreeSelectState {
+    treeData: object[],
+};
+
+type LoadDataSource = {
+    options: any[],
+    touchEnd: boolean,
+}
+
+export default class LabTreeSelect extends React.PureComponent<LabTreeSelectProps, LabTreeSelectState> {
+
+    static defaultProps = {
+        maxSelected: 100,
+    }
+
+    state = {
+        treeData: [],
+    }
+
+    async componentDidMount() {
+        this.setState({treeData:await this.loadSchoolLevelUnit()}) ;
+    }
+
+    //第一步查根
+    loadSchoolLevelUnit=async ()=>{
+        let data=[];
+     let  res=await  HcserviceV3.requestLtmplQueryTop('221036732522497',{});
+
+      if(res.entities){
+          res.entities.forEach((item, index) => {
+              let d={};
+              d["id"]=item.code;
+              d['level']=1;
+              d["pId"]=0;
+              d["title"]= item.fieldMap['228431869288450'];
+              d["value"]=d["id"]+"@R@"+d["title"];
+              d["key"]=d["value"];
+              d["selectable"]=false;
+              data.push(d);
+          })
+      }
+        return data;
+    }
+
+    loadLab=async (mainCode)=>{
+        let data=[];
+        let  res=await  HcserviceV3.requestLtmplQueryTop('228261345665025',{mainCode});
+
+        if(res.entities){
+            res.entities.forEach((item, index) => {
+                let d={};
+                d["id"]=item.code;
+                d['level']=2;
+                d["pId"]=mainCode;
+                d["title"]= item.fieldMap['227350535774211'];
+                d["value"]=d["id"]+"@R@"+d["title"];
+                d["key"]=d["value"];
+                d["selectable"]=false;
+                data.push(d);
+            })
+        }
+        return data;
+    }
+
+    loadRoom=async (mainCode)=>{
+        let data=[];
+        let  res=await  HcserviceV3.requestLtmplQueryTop('228261733638145',{mainCode});
+
+        if(res.entities){
+            res.entities.forEach((item, index) => {
+                let d={};
+                d["id"]=item.code;
+                d['level']=3;
+                d["pId"]=mainCode;
+                d["title"]= item.fieldMap['227349996806149'];
+                d["value"]=d["id"]+"@R@"+d["title"];
+                d["key"]=d["value"];
+                d["isLeaf"]=true;
+                data.push(d);
+            })
+        }
+        return data;
+    }
+
+    onChange=(newValue: string)=>{
+        const {onChange} = this.props;
+        console.log("newValue",newValue);
+        onChange(newValue);
+    }
+
+
+    onLoadData = async (node) => {
+        console.log('node:',node);
+        const {treeData}=this.state;
+        if(node['level']==1){
+         //加载实验室
+        let d =  await this.loadLab(node['id']);
+         console.log('treeData dddd ',d);
+        this.setState({
+            treeData:[...treeData,...d]
+        })
+        }else if(node['level']==2){
+            let d =  await this.loadRoom(node['id']);
+            console.log('treeData dddd ',d);
+            this.setState({
+                treeData:[...treeData,...d]
+            })
+        }
+    }
+
+    render() {
+        const {id,value,  fieldConfig, style} = this.props;
+        const {treeData} = this.state;
+        let v;
+        if(value){
+            v=value.split("@R@")[1];
+        }
+
+        console.log('treeData',treeData);
+        return (
+            <TreeSelect
+                treeDataSimpleMode
+                style={{ width: '100%' ,minWidth:'260px'}}
+                value={v}
+                dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
+                placeholder="--请选择--"
+                onChange={this.onChange}
+                loadData={this.onLoadData}
+                treeData={treeData}
+            />
+        )
+    }
+}
+
+

package/src/aldehyde/controls/entity-select/popover-entity-select.tsx

@@ -33,7 +33,19 @@ export default class EntitySelect extends React.PureComponent<EntitySelectProps,
         let newValue = [];
         if (selectedRows) {
             for (let row of selectedRows) {
-                newValue.push(row.code + '@R@' + row.title);
+                let title:string=null;
+                if(row.title instanceof Array){
+                    title = row.title[0];
+                }else{
+                    title = row.title;
+                }
+
+                console.log('1323',title);
+                if(row.title && row.title.includes("@R@")){
+                let  ts=  title.split('@R@');
+                    title=ts[ts.length-1];
+                }
+                newValue.push(row.code + '@R@' + title);
             }
         }
         onChange(newValue);

package/src/aldehyde/controls/entry-control.tsx

@@ -16,6 +16,9 @@ import Cascader from './cascader'
 import EntitySelect from "./entity-select/entity-select";
 import PopoverEntitySelect from './entity-select/popover-entity-select'
 import ColorPicker from './color-picker'
+import LabTreeSelect from './entity-select/lab-tree-select'
+import Units from "../units";
+import {ProgramConfig} from "../index";
 // import EntitySelect from "./entity-select/inner-entity-select";
 // import ChemStruc from "./chemstruc/graph";
 const  CheckboxGroup=Checkbox.Group;
@@ -66,8 +69,13 @@ function renderControl(id:any,fieldConfig: FieldConfig, fieldValue: any, onChang
     let disabled: boolean = fieldConfig.disabled;
 
     let viewOrEdit: ViewOrEdit = 'edit';
+    let fieldConfigM:string=fieldConfig.min;
+    let min=(fieldConfigM || fieldConfigM=='0' ) ? Units.configParamTrans(fieldConfigM) : undefined;
+    fieldConfigM=fieldConfig.max;
+    let max=(fieldConfigM || fieldConfigM=='0' ) ? Units.configParamTrans(fieldConfigM) : undefined;;
+
     let controlProps = {
-       id, fieldConfig, itemType, viewOrEdit, onChange, disabled, value: fieldValue, style: {minWidth: 220, width: '100%'}
+       id, fieldConfig,min,max, itemType, viewOrEdit, onChange, disabled, value: fieldValue, style: {minWidth: 220, width: '100%'}
     }
 
     let antdControlProps = {
@@ -80,6 +88,11 @@ function renderControl(id:any,fieldConfig: FieldConfig, fieldValue: any, onChang
         disabled={true}
     />;
 
+    //自定义组件为先
+    if(ProgramConfig.getCustomEditControl(itemType)){
+        return React.createElement(ProgramConfig.getCustomEditControl(itemType),controlProps);
+    }
+
     switch (itemType) {
         case 'int':
         case 'decimal':
@@ -200,11 +213,15 @@ function renderControl(id:any,fieldConfig: FieldConfig, fieldValue: any, onChang
         case 'relselect':
         case 'refselect':
         case 'entity-select':
-            entryControl=<EntitySelect maxSelected={fieldConfig.max?fieldConfig.max:undefined} {...controlProps}  />
+            entryControl=<EntitySelect maxSelected={max?parseInt(max):undefined} {...controlProps}  />
             //  entryControl = <EntitySelect  {...controlProps} sourceName={'rcriteria'}></EntitySelect>
             break;
         case 'table-entity-select':
-            entryControl=<PopoverEntitySelect maxSelected={fieldConfig.max?fieldConfig.max:undefined} {...controlProps}  />
+            entryControl=<PopoverEntitySelect maxSelected={max?parseInt(max):undefined} {...controlProps}  />
+            //  entryControl = <EntitySelect  {...controlProps} sourceName={'rcriteria'}></EntitySelect>
+            break;
+        case 'lab-tree-select':
+            entryControl=<LabTreeSelect maxSelected={max?parseInt(max):undefined} {...controlProps}  />
             //  entryControl = <EntitySelect  {...controlProps} sourceName={'rcriteria'}></EntitySelect>
             break;
         case 'progress':

package/src/aldehyde/controls/enum-tag/index.tsx

@@ -5,7 +5,6 @@ import HCDataSource from "../../tmpl/hc-data-source";
 
 interface EnumTagsProps extends VControlProps {
 
-
 }
 
 
@@ -15,10 +14,17 @@ const EnumTags: React.FC<EnumTagsProps> = (props) => {
     let viewControl = undefined;
     let tagList = [];
     if (value) {
-        value.split(',').forEach(v => {
+        let v=value;
+        if(value instanceof Array){
+
+        }else {
+            v=value.split(',');
+        }
+        v.forEach(v => {
             let color = HCDataSource.getEnumValueColor(fieldConfig.mstrucId, value);
             tagList.push(<Tag key={v} color={color ? color : 'blue'}>{v}</Tag>)
         })
+
     }
     viewControl = <span className="infoStyle">
                                     {tagList}

package/src/aldehyde/controls/input-number/index.tsx

@@ -9,7 +9,7 @@ interface InputNumberProps extends EControlProps {
 
 const InputNumber: React.FC<InputNumberProps> = (props) => {
 
-    const {id,value, itemType, fieldConfig, onChange,style} = props;
+    const {id,value, itemType, fieldConfig, onChange,style,min,max} = props;
 
     let entryControl = undefined;
 
@@ -53,7 +53,7 @@ const InputNumber: React.FC<InputNumberProps> = (props) => {
 
     switch (itemType) {
         case 'int':
-            entryControl = <AntdInputNumber   style={{...style}} min={fieldConfig.min} max={fieldConfig.max}
+            entryControl = <AntdInputNumber   style={{...style}} min={min} max={max}
                                             {...antdControlProps} value={valueSingle}
                                             onKeyUp={changeInt} onChange={changeValue}
             />
@@ -62,7 +62,7 @@ const InputNumber: React.FC<InputNumberProps> = (props) => {
         case 'float':
         case 'double':
             entryControl = <AntdInputNumber style={{...style}}
-                {...antdControlProps} value={valueSingle} min={fieldConfig.min} max={fieldConfig.max}
+                {...antdControlProps} value={valueSingle} min={min} max={max}
                 // style={{width}}
                 step={0.1} onChange={changeValue}
             />
@@ -70,11 +70,11 @@ const InputNumber: React.FC<InputNumberProps> = (props) => {
         case 'intrange':
             entryControl =
                 <Space>
-                <AntdInputNumber  min={fieldConfig.min} max={fieldConfig.max}
+                <AntdInputNumber  min={min} max={max}
                                             placeholder={`开始`} value={valueBegin}
                                             onKeyUp={changeInt} onChange={changeBeginValue}
             />~
-            <AntdInputNumber min={fieldConfig.min} max={fieldConfig.max}
+            <AntdInputNumber min={min} max={max}
                              placeholder={`结束`} value={valueEnd}
                              onKeyUp={changeInt} onChange={changeEndValue}
             />
@@ -83,12 +83,12 @@ const InputNumber: React.FC<InputNumberProps> = (props) => {
         case 'decimalrange':
             entryControl =
                 <Space>
-                    <AntdInputNumber min={fieldConfig.min} max={fieldConfig.max}
+                    <AntdInputNumber min={min} max={max}
                                      placeholder={`开始`} value={valueBegin}
                                       onChange={changeBeginValue} step={0.1}
                                      disabled={disabled}
                     />~
-                    <AntdInputNumber min={fieldConfig.min} max={fieldConfig.max}
+                    <AntdInputNumber min={min} max={max}
                                      placeholder={`结束`} value={valueEnd} step={0.1}
                                       onChange={changeEndValue}  disabled={disabled}
                     />

package/src/aldehyde/controls/view-control.tsx

@@ -13,6 +13,7 @@ import moment from "moment";
 import Progress from './progress'
 import ColorPicker from "./color-picker";
 import EllipsisText from './text/ellipsis-text'
+import {ProgramConfig} from "../index";
 //import ChemStruc from "./chemstruc/graph";
 // import HtmlEditor from "../HtmlEditor/tinymce";
 const Loading = <Spin tip="Loading...">
@@ -59,7 +60,10 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
     let controlProps = {
         fieldConfig, itemType, value,viewOrEdit,
     }
-
+    //自定义组件为先
+    if(ProgramConfig.getCustomEditControl(itemType)){
+        return React.createElement(ProgramConfig.getCustomViewControl(itemType),controlProps);
+    }
     const unSupportControl =
         <span className="infoStyle">{`暂未完成-${itemType}`}</span>;
 

package/src/aldehyde/detail/button/submit-button-bar.tsx

@@ -94,7 +94,7 @@ class SubmitButtonBar extends React.PureComponent<SubmitButtonProps, SubmitButto
                             //     type="primary"
                             // >{item.title}</Button>
                             // </Popconfirm>
-                           return <Action hiddenType={'disabled'} buttonType={'primary'} serial={serial} key={item.id}   formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
+                           return <Action iconType={'icon-title'} hiddenType={'disabled'} buttonType={'primary'} serial={serial} key={item.id}   formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
                         }
                     })
                     }

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,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,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}
 

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";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
@@ -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) => {

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';