aldehyde 0.2.76 → 0.2.78

package/src/aldehyde/import/excel-import.tsx

@@ -1,6 +1,20 @@
 import React from 'react'
-import {Card,Button,Upload,message,Progress,List,Checkbox,Row,Col,Popover,InputNumber ,Typography } from 'antd'
-import {ReloadOutlined ,UploadOutlined,SettingOutlined} from '@ant-design/icons';
+import {
+    Button,
+    Card,
+    Checkbox,
+    Col,
+    InputNumber,
+    List,
+    message,
+    Popover,
+    Progress,
+    Row,
+    Space,
+    Typography,
+    Upload
+} from 'antd'
+import {DownloadOutlined, ReloadOutlined, SettingOutlined, UploadOutlined} from '@ant-design/icons';
 import Super from "../tmpl/superagent"
 import Units from "../units"
 import './index.css'
@@ -8,168 +22,180 @@ import {LtmplConfig} from "../tmpl/interface";
 import HCDataSource from "../tmpl/hc-data-source";
 
 const CheckboxGroup = Checkbox.Group;
-const logLevelList: LogLevel[]= ['INFO', 'SUC', 'ERROR', 'WARN'];
-let totalMSG=[]
-type LogLevel = 'INFO'| 'SUC'|'ERROR'|'WARN';
-type ImportStatus = 'waitingFile'| 'fileSelected' |'importing' | 'success'|'fail' |'stop';
-const { Text } = Typography;
-interface ExcelImportProps  {
-    serverKey?:string,
-    sourceId:string,
+const logLevelList: LogLevel[] = ['INFO', 'SUC', 'ERROR', 'WARN'];
+let totalMSG = []
+type LogLevel = 'INFO' | 'SUC' | 'ERROR' | 'WARN';
+type ImportStatus = 'waitingFile' | 'fileSelected' | 'importing' | 'success' | 'fail' | 'stop';
+const {Text} = Typography;
+
+interface ExcelImportProps {
+    serverKey?: string,
+    sourceId: string,
 };
 
 interface ExcelImportStat {
-    inputMaxMsgCount?:number;
-    maxMsgCount?:number;
-    percent?:number;
-    statusMsg?:string;
-    importStatus?:string,
+    inputMaxMsgCount?: number;
+    maxMsgCount?: number;
+    percent?: number;
+    statusMsg?: string;
+    importStatus?: string,
     showLogLevelList?: LogLevel[],
-    logSetterOpen?:boolean,
-    logs?:any[];
-    importFile?:any,
-    logSerialId?:string,
-    ltmplConfig?:LtmplConfig;
+    logSetterOpen?: boolean,
+    logs?: any[];
+    importFile?: any,
+    logSerialId?: string,
+    ltmplConfig?: LtmplConfig;
 };
 
-export default class ExcelImport extends React.PureComponent<ExcelImportProps, ExcelImportStat>{
+export default class ExcelImport extends React.PureComponent<ExcelImportProps, ExcelImportStat> {
 
     state = {
-        maxMsgCount:100,
-        inputMaxMsgCount:100,
-        importStatus:'waitingFile',
-        importFile:undefined,
-        logs:[],
-        percent:0,
-        statusMsg:undefined,
-        logSetterOpen:false,
-        showLogLevelList:[...logLevelList],
-        logSerialId:undefined,
-        ltmplConfig:undefined,
+        maxMsgCount: 100,
+        inputMaxMsgCount: 100,
+        importStatus: 'waitingFile',
+        importFile: undefined,
+        logs: [],
+        percent: 0,
+        statusMsg: undefined,
+        logSetterOpen: false,
+        showLogLevelList: [...logLevelList],
+        logSerialId: undefined,
+        ltmplConfig: undefined,
     }
 
-    timerId=undefined;
+    timerId = undefined;
 
-   async componentDidMount(){
-       const {sourceId,serverKey}=this.props;
+    async componentDidMount() {
+        const {sourceId, serverKey} = this.props;
 
-        let ltmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey,sourceId);
+        let ltmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey, sourceId);
 
         this.setState({
-            ltmplConfig:ltmplConfigRes.ltmplConfig,
+            ltmplConfig: ltmplConfigRes.ltmplConfig,
         })
 
     }
-    componentWillUnmount(){
-        if(this.timerId){
+
+    componentWillUnmount() {
+        if (this.timerId) {
             clearInterval(this.timerId);
         }
     }
 
 
-
     handleUpload = () => {
-        const {sourceId,serverKey}=this.props;
-        const { importFile } = this.state;
+        const {sourceId, serverKey} = this.props;
+        const {importFile} = this.state;
         const formData = new FormData();
         formData.append('file', importFile);
         formData.append('sourceId', sourceId.toString());
 
         Super.super({
-            url:`/v3/ltmpl/importer`,
+            url: `/v3/ltmpl/importer`,
             serverKey,
-            method:'POST',
-            data:formData,   
-		},"formdata").then((res)=>{
+            method: 'POST',
+            data: formData,
+        }, "formdata").then((res) => {
             //console.log(res)
-            if(res.status==="success"){
+            if (res.status === "success") {
                 this.setState({
                     importStatus: 'importing',
                 });
-               this.timerId=setInterval(() =>this.handleStatus(res.importId),500);
-            }else{
+                this.timerId = setInterval(() => this.handleStatus(res.importId), 500);
+            } else {
                 message.error('失败！');
                 this.setState({
                     importStatus: 'fail',
-                });                          
+                });
             }
-            })
-        }
+        })
+    }
 
-    handleStopImport=()=>{
+    handleStopImport = () => {
         this.setState({
             importStatus: 'stop',
         });
     }
 
-    handleStatus=(importId)=>{
-       const {serverKey}=this.props;
-        const {maxMsgCount,importStatus}=this.state
+    handleStatus = (importId) => {
+        const {serverKey} = this.props;
+        const {maxMsgCount, importStatus, logs} = this.state
         Super.super({
-            url:`/v3/importer/status`,
+            url: `/v3/importer/status`,
             serverKey,
-            method:'GET',
-            query:{
-                importId:importId,
-                msgIndex:0,
+            method: 'GET',
+            query: {
+                importId: importId,
+                msgIndex: 0,
                 maxMsgCount,
-                interrupted: importStatus=='stop',
-            }          
-        },"","none").then((res)=>{
-
-            const MSG=[]
-            if(res.status === 'error'){
-                clearInterval(this.timerId);
-            }else {
-                for (let item of res.messageSequence.messages) {
-                    let color = "";
-                    let logLevel = "";
-                    let createTime = Units.formateDate(item.createTime);
-                    if (item.type === "SUC") {
-                        color = "green"
-                        logLevel = '成功';
-                    } else if (item.type === "INFO") {
-                        color = "black"
-                        logLevel = '常规';
-                    } else if (item.type === "ERROR") {
-                        color = "red"
-                        logLevel = '错误';
-                    } else if (item.type === "WARN") {
-                        color = "rgb(250, 225, 4)"
-                        logLevel = '警告';
+                interrupted: importStatus == 'stop',
+            }
+        }, "", "none").then((res) => {
+                const MSG = []
+                if (res.status === 'error') {
+                    clearInterval(this.timerId);
+                } else {
+                    if (res.messageSequence.messages) {
+                        for (let item of res.messageSequence.messages) {
+                            let color = "";
+                            let logLevel = "";
+                            let createTime = Units.formateDate(item.createTime);
+                            if (item.type === "SUC") {
+                                color = "green"
+                                logLevel = '成功';
+                            } else if (item.type === "INFO") {
+                                color = "black"
+                                logLevel = '常规';
+                            } else if (item.type === "ERROR") {
+                                color = "red"
+                                logLevel = '错误';
+                            } else if (item.type === "WARN") {
+                                color = "rgb(250, 225, 4)"
+                                logLevel = '警告';
+                            }
+                            const msg = <div><p>{createTime}</p><p style={{color: color}}>{`【${logLevel}】` + item.text}</p>
+                            </div>
+                            MSG.push({level: item.type, msg});
+                        }
                     }
-                    const msg = <div><p>{createTime}</p><p style={{color: color}}>{`【${logLevel}】` + item.text}</p>
-                    </div>
-                    MSG.push({level: item.type, msg});
-                    this.setState({
-                        statusMsg: res.message,
-                        percent: Math.floor((res.current / res.totalCount) * 100),
-                        logs: MSG,
-                    })
-                    if (res.completed === true) {
-                        if(this.timerId){
+                    // if(){
+                    //
+                    // }
+                    //
+                    let percent = Math.floor((res.current / res.totalCount) * 100);
+                    if (res.completed == true) {
+                        if (this.timerId) {
                             clearInterval(this.timerId);
-                            this.timerId=undefined;
+                            this.timerId = undefined;
                             message.success('导入完成！');
                             this.setState({
-                                importStatus: 'success'
+
                             });
                         }
+                        percent = 100;
                     }
                     if (importStatus == 'stop') {
                         clearInterval(this.timerId);
                     }
+                    let loggs=[...logs, ...MSG];
+                    loggs=loggs.length>maxMsgCount?loggs.slice(logs.length-maxMsgCount):loggs;
+                    this.setState({
+                        statusMsg: res.message,
+                        percent,
+                        importStatus: percent==100?'success':'importing',
+                        logs: loggs,
+                    })
                 }
             }
-        })
-    } 
+        )
+    }
     onChangeShowLogLevelList = (showLogLevelList) => { //日志checkbox选择
         this.setState({
             showLogLevelList,
         });
     }
 
-    fresh=()=>{
+    fresh = () => {
         // this.setState({
         //     fileList:[],
         //     uploading: false,
@@ -183,140 +209,152 @@ export default class ExcelImport extends React.PureComponent<ExcelImportProps, E
         // message.success("刷新成功！")
     }
 
-    handleLogSetter=()=>{
-        const {inputMaxMsgCount}=this.state
+    handleLogSetter = () => {
+        const {inputMaxMsgCount} = this.state
         this.setState({
-            maxMsgCount:inputMaxMsgCount,
-            logSetterOpen:false,
+            maxMsgCount: inputMaxMsgCount,
+            logSetterOpen: false,
         })
         message.success("设置成功！")
     }
     changeLogSetterOpen = open => {
-        this.setState({ logSetterOpen:open });
-      };
-
+        this.setState({logSetterOpen: open});
+    };
+    download = () => {
+        const {sourceId, serverKey} = this.props;
+        const hydrocarbonToken = Units.hydrocarbonToken();
+        Units.downloadFile(Units.joinPath(Units.api(serverKey), `/v3/ltmpl/importer/template?sourceId=${sourceId}&@token=${hydrocarbonToken}&@programToken=${Units.programCode(serverKey)}`), "导入模板")
+    }
 
-    render(){
-        const { ltmplConfig,importFile,maxMsgCount ,percent,importStatus,showLogLevelList,logSetterOpen,logs} = this.state;
+    render() {
+        const {ltmplConfig, importFile, maxMsgCount, percent, importStatus, showLogLevelList, logSetterOpen, logs} = this.state;
 
-        let showLogs=[];
+        let showLogs = [];
 
-        for(let log of logs){
-            if(showLogLevelList.includes(log.level) ){
+        for (let log of logs) {
+            if (showLogLevelList.includes(log.level)) {
                 showLogs.push(log.msg);
             }
         }
 
         const props = {
-            accept:"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/vnd.ms-excel",
-            onChange : () => {
+            accept: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/vnd.ms-excel",
+            onChange: () => {
 
             },
-            onRemove : (file) => {
+            onRemove: (file) => {
                 this.setState({
-                      importFile: undefined,
-                    importStatus:'waitingFile',
-                      percent:0,
-                  });
+                    importFile: undefined,
+                    importStatus: 'waitingFile',
+                    percent: 0,
+                });
             },
             beforeUpload: (file) => {
                 this.setState({
-                    percent:0,
+                    percent: 0,
                     importFile: file,
-                    importStatus:'fileSelected',
-                  });
-                  return false;
+                    importStatus: 'fileSelected',
+                });
+                return false;
             },
-            fileList:importFile?[importFile]:undefined,
+            fileList: importFile ? [importFile] : undefined,
         }
-        const content=(
+        const content = (
             <div>
                 <label>日志消息数上限：</label>
-                <InputNumber 
-                    defaultValue={maxMsgCount} 
-                    onChange={(value)=>this.setState({inputMaxMsgCount:value})}
-                    />
-                <Button 
-                    type="primary" 
-                    style={{marginLeft:'10px'}} 
+                <InputNumber
+                    defaultValue={maxMsgCount}
+                    onChange={(value) => this.setState({inputMaxMsgCount: value})}
+                />
+                <Button
+                    type="primary"
+                    style={{marginLeft: '10px'}}
                     onClick={this.handleLogSetter}
-                    >确定</Button>
+                >确定</Button>
             </div>
         )
-        return(
+        return (
             <div className="importData">
                 <h3>
-                    {'导入 -> '}{ ltmplConfig?ltmplConfig.title:""}
-                    <p className="fr">                      
-                        <Button 
+                    {'导入 -> '}{ltmplConfig ? ltmplConfig.title : ""}
+                    <p className="fr">
+                        <Button
                             className="hoverbig"
                             title="刷新"
                             onClick={this.fresh}>
-                            <ReloadOutlined />
+                            <ReloadOutlined/>
                         </Button>
                     </p>
-                </h3>              
+                </h3>
                 <Row>
                     <Col span={14} offset={5}>
-                        <Card size={'small'} style={{minWidth:600}}>
-                            <Upload {...props}>
-                                <Button>
-                                    <UploadOutlined />选择导入文件
+                        <Card size={'small'} style={{minWidth: 600}}>
+                            <Space>
+                                <Upload {...props}>
+                                    <Button type={'primary'}>
+                                        <UploadOutlined/>选择导入文件
+                                    </Button>
+                                </Upload>
+                                <Button onClick={this.download}>
+                                    <DownloadOutlined/>下载导入模板
                                 </Button>
-                            </Upload>
-                            <Progress percent={percent} size="small" status="active" />
+                            </Space>
+
+                            <Progress percent={percent} size="small" status="active"/>
                             <div className="importBtns">
+                                <Space>
                                 <Button
                                     type="primary"
                                     onClick={this.handleUpload}
-                                    disabled={!(['fileSelected','stop'].includes(importStatus))}
-                                    loading={importStatus=='importing'}
-                                    >
-                                    {importStatus=='importing' ? '正在导入' : importStatus=='stop'?'重新导入':'开始导入' }
+                                    disabled={!(['fileSelected', 'stop'].includes(importStatus))}
+                                    loading={importStatus == 'importing'}
+                                >
+                                    {importStatus == 'importing' ? '正在导入' : importStatus == 'stop' ? '重新导入' : '开始导入'}
                                 </Button>
                                 <Button
                                     onClick={this.handleStopImport}
-                                    disabled={importStatus!='importing'}
+                                    disabled={importStatus != 'importing'}
                                 >
                                     {'停止导入'}
-                                </Button>
-
-                            </div>               
+                                </Button></Space>
+                            </div>
                             <List
                                 header={
                                     <div className="listHeader">
                                         <h4>导入日志</h4>
-                                        <div className="checks">              
-                                            <CheckboxGroup value={showLogLevelList} onChange={this.onChangeShowLogLevelList}>
+                                        <div className="checks">
+                                            <CheckboxGroup value={showLogLevelList}
+                                                           onChange={this.onChangeShowLogLevelList}>
                                                 <Checkbox value="INFO" className="infoColor">常规</Checkbox>
                                                 <Checkbox value="SUC" className="sucColor">成功</Checkbox>
-                                                <Checkbox value="ERROR"  className="errorColor">错误</Checkbox>
-                                                <Checkbox value="WARN"  className="warnColor">警告</Checkbox>
+                                                <Checkbox value="ERROR" className="errorColor">错误</Checkbox>
+                                                <Checkbox value="WARN" className="warnColor">警告</Checkbox>
                                             </CheckboxGroup>
                                             <div className="btns">
-                                                <Popover 
-                                                    content={content} 
+                                                <Popover
+                                                    content={content}
                                                     title="日志设置"
-                                                    trigger="click" 
-                                                    placement="top" 
+                                                    trigger="click"
+                                                    placement="top"
                                                     open={logSetterOpen}
-                                                    overlayStyle={{width:350}}
+                                                    overlayStyle={{width: 350}}
                                                     onOpenChange={this.changeLogSetterOpen}
-                                                    >
+                                                >
                                                     <Button title="日志设置" type="primary" size="small">
-                                                        <SettingOutlined />
+                                                        <SettingOutlined/>
                                                     </Button>
                                                 </Popover>
                                             </div>
                                         </div>
                                     </div>
                                 }
-                                footer={<Text type={importStatus=="fail" || importStatus=="stop"?"danger":"success"}>{importStatus}</Text>}
+                                footer={<Text
+                                    type={importStatus == "fail" || importStatus == "stop" ? "danger" : "success"}>{importStatus}</Text>}
                                 bordered
                                 dataSource={showLogs}
                                 renderItem={item => (<List.Item>{item}</List.Item>)}
                                 className="importList"
-                                />
+                            />
                         </Card>
                     </Col>
                 </Row>

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

@@ -767,7 +767,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                     {displayCriteriaCard ?
                         this.renderCriteriaForm() : null
                     }
-                    {loading?"":<QueryTable serverKey={serverKey}  onChangePage={onChangePage} viewModels={viewModels} columnConfigs={columnConfigs}
+                    {loading?"":<QueryTable serverKey={serverKey}  onChangePage={onChangePage} viewModels={viewModels} primaryColumn={ltmplConfig.primaryColumn} columnConfigs={columnConfigs}
                                         maxSelectedRows={this.checkBoxUseful() ? 10000 : -1}
                                         selectedRows={selectedRows}
                                         columns={tableColumns}

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

@@ -246,7 +246,9 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
                 <div className="actTable">
                     <CriteriaForm serverKey={serverKey} selectedRows={selectedRows} ltmplConfig={selectConfig} data={criteriaData}
                                   doSearch={this.doSearch} loading={loading} />
-                    <QueryTable serverKey={serverKey}  pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:selectConfig.defaultPageSize}} onChangePage={this.onChangePage} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows} columns={columns}
+                    <QueryTable serverKey={serverKey}  pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:selectConfig.defaultPageSize}} onChangePage={this.onChangePage} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows}
+                                primaryColumn={selectConfig.primaryColumn}
+                                columns={columns}
                                 queryKey={queryKey}
                                 onChangeRowSelection={this.changeRowSelection}/>
                 </div> </Scrollbars>

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

@@ -2,7 +2,7 @@ import React from 'react'
 import {Card, Collapse, Descriptions, List, Table} from 'antd';
 import "./index.css"
 import {
-    ActTableViewModel,
+    ActTableViewModel, ColumnConfig,
     DtmplData,
     FieldConfig,
     PageInfo,
@@ -34,6 +34,7 @@ interface QueryTableProps {
         pageNo: number,
         pageSize: number
     },
+    primaryColumn?:ColumnConfig,
     columns: any[];
     serverKey?:string,
     queryKey: QueryKey;
@@ -209,7 +210,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
     getRowSelection = () => {
 
-        const {columns, onChangeRowSelection, selectedRows, maxSelectedRows} = this.props;
+        const {columns, onChangeRowSelection, selectedRows, maxSelectedRows,primaryColumn} = this.props;
         let {dataSource} = this.state;
         let selectedRowKeys = [];
 
@@ -234,13 +235,15 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                 // console.log('selectedRows:', selectedRows);
                 let selectedRows_: SelectedRow[] = [];
                 let selectedDatas: DtmplData[] = [];
-                let titleColId = null;
-                columns.forEach((col) => {
-                    if (col.title != '序号' && titleColId == null) {
-                        titleColId = col.dataIndex;
-                        return;
-                    }
-                })
+                let titleColId =primaryColumn?.id;
+                if(!titleColId){
+                    columns.forEach((col) => {
+                        if (col.title != '序号' && titleColId == null) {
+                            titleColId = col.dataIndex;
+                            return;
+                        }
+                    })
+                }
                 selectedRows.forEach((item) => {
                     selectedRows_.push({code: item['code'], title: item[titleColId]});
                     selectedDatas.push(item);

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

@@ -243,7 +243,9 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
                 <CriteriaForm serverKey={serverKey} selectedRows={selectedRows} selectedDatas={selectedDatas} ltmplConfig={selectConfig}
                               data={criteriaData}
                               doSearch={this.doSearch} loading={loading}/>
-                <QueryTable serverKey={serverKey} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows} columns={columns}
+                <QueryTable serverKey={serverKey} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows}
+                            primaryColumn={selectConfig.primaryColumn}
+                            columns={columns}
                             pageInfo={{pageNo,
                                 pageSize: pageSize?pageSize:selectConfig.defaultPageSize}}
                             onChangePage={this.onChangePage}

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

@@ -501,7 +501,9 @@ export default class HcserviceV3 {
             }
         },null,null);
         if(res.status != 'success'){
-            message.error("错误消息：" + res.message,4)
+            if(res.message){
+                message.error("错误消息：" + res.message,4)
+            }
         }
         return res;
     }

package/src/aldehyde/tmpl/interface.tsx

@@ -183,7 +183,7 @@ export interface SelectConfig extends TmplBase {
     columns: ColumnConfig[];
     criterias: CriteriaConfig[];
     defaultCriteriaValue?:object;
-    primaryColumn:ColumnConfig;
+    primaryColumn?:ColumnConfig;
     primaryCriteria:CriteriaConfig;
     orderColumn:ColumnConfig;
 }
@@ -213,6 +213,7 @@ export interface TtmplConfig extends TmplBase {
     rootGtmplId:string,
     branchRatmplId:string,
     leafRatmplId:string,
+    showLine:boolean,
 }
 
 // export interface StatViewConfig extends SelectConfig {