aldehyde 0.1.62 → 0.1.64

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

@@ -1,35 +1,36 @@
-import React from 'react'
+import React, {ReactNode} from 'react'
 import {Button, Card, Checkbox, Col, Collapse, Divider, Popconfirm, Popover, Row, Space, Table, Tooltip} from 'antd';
 import {
+    AlignCenterOutlined,
     AlignLeftOutlined,
-    CalculatorOutlined,
+    CopyOutlined,
     DownloadOutlined,
     EditOutlined,
     EyeInvisibleOutlined,
     EyeOutlined,
+    FormOutlined,
     FundOutlined,
     LineChartOutlined,
     MenuOutlined,
+    PlusCircleOutlined,
     PlusOutlined,
     ReloadOutlined,
     RetweetOutlined,
     TableOutlined,
     UploadOutlined,
-    CopyOutlined,
-PlusCircleOutlined,
-    FormOutlined,
-AlignCenterOutlined
+    DeleteOutlined,
+SearchOutlined
 } from '@ant-design/icons';
 import "./index.css"
 import {
     ActTableViewModel,
+    AddOrUpdate,
     ColumnConfig,
-    DtmplConfig, DtmplData,
+    DtmplData,
     LtmplConfig,
     QueryKey,
     SelectedRow,
     TmplBaseProps,
-    AddOrUpdate
 } from "../tmpl/interface";
 import TableUnits from "./table-util";
 import SupportInputTypes from '../tmpl/control-type-supportor';
@@ -47,25 +48,28 @@ import Action from '../controls/action'
 import Restat from "./stat/restat"
 import ActionUtils from '../controls/action/utils'
 import CquickButton from "../controls/cquery/cquick-button";
+
 const DragHandle = SortableHandle(() => <MenuOutlined style={{cursor: 'grab', color: '#999'}}/>);
 const {Panel} = Collapse;
 
 type Level = 'l1' | 'l2';
-export type Mode='simple' | 'common' | 'complete'
+export type Mode = 'simple' | 'common' | 'complete'
 
-const defualtDisabledColIds:string[]=['20000']
+const defaultDisabledColIds: string[] = ['20000', '10000']
 
 interface ActTableProps extends TmplBaseProps {
     criteriaData: object,
     ltmplConfig: LtmplConfig,
-    menuId?:string,
-    showView?: (code: string,toCustomPage?:boolean) => void,
-    doCreate?: (toCustomPage?:boolean) => void,
-    doEdit?: (code: string,mode:AddOrUpdate,toCustomPage?:boolean) => void,
+    menuId?: string,
+    showView?: (code: string, toCustomPage?: boolean) => void,
+    doCreate?: (toCustomPage?: boolean) => void,
+    doEdit?: (code: string, mode: AddOrUpdate, toCustomPage?: boolean) => void,
+    doDelete?: (code: string) => void,
     doSearch?: (params: object) => void,
-    doRAction?:(ractionId:string,mainCode:string)=>void,
+    doRAction?: (ractionId: string, mainCode: string) => void,
     level?: Level,
-    funcMode?:Mode
+    funcMode?: Mode,
+    title?: ReactNode,
 };
 
 interface ActTableStat {
@@ -75,7 +79,7 @@ interface ActTableStat {
     loading: boolean;
     criteriaData: object;
     selectedRows: SelectedRow[];
-    selectedDatas:DtmplData[];
+    selectedDatas: DtmplData[];
     hiddenColIds?: string[];
     drillingColIds?: string[];
     disabledColIds: string[];
@@ -86,9 +90,6 @@ interface ActTableStat {
     // drillingPopoverVisible:boolean;
 };
 
-
-
-
 class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     state = {
         tableColumns: undefined,
@@ -97,9 +98,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         loading: true,
         criteriaData: undefined,
         disableCols: undefined,
-        hiddenColIds: defualtDisabledColIds,
+        hiddenColIds: defaultDisabledColIds,
         selectedRows: [],
-        selectedDatas:[],
+        selectedDatas: [],
         hiddenRowCodes: [],
         viewModels: [],
         drillingColIds: undefined,
@@ -109,9 +110,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         //drillingPopoverVisible:false,
     }
 
-    static defaultProps={
-        criteriaData:{},
-        funcMode:'complete'
+    static defaultProps = {
+        criteriaData: {},
+        funcMode: 'complete'
     }
 
     loadData = async (hiddenColIds: string[], hiddenRowCodes: string[], sortedColConfigs: ColumnConfig[]) => {
@@ -156,12 +157,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             //构建过滤条件
         let queryKey: QueryKey
         if (level && level == 'l2') {
-            queryKey = await HcserviceV3.requestL2LtmplQueryKey( sourceId, {
+            queryKey = await HcserviceV3.requestL2LtmplQueryKey(sourceId, {
                 ...criteriaData, ...pageInfo,
                 mainCode
             });
         } else {
-            queryKey = await HcserviceV3.requestLtmplQueryKey( sourceId, {
+            queryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {
                 ...criteriaData, ...pageInfo,
                 mainCode
             });
@@ -177,15 +178,15 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             queryKey,
             criteriaData,
             loading: false,
-            showL2Chart:false,
+            showL2Chart: false,
             selectedRows: [],
-            selectedDatas:[],
+            selectedDatas: [],
             viewModels: (this.state.viewModels.length > 0 ? this.state.viewModels : ['table']),
         })
     }
 
     buildTableColumns = (ltmplConfig: LtmplConfig, hiddenColIds: string[], hiddenRowCodes: string[], sortedColConfigs: ColumnConfig[]) => {
-        const {mainCode, showView, doEdit,menuId,doRAction} = this.props
+        const {mainCode, showView, doEdit, menuId, doRAction, doDelete} = this.props
         const {buttons} = ltmplConfig;
         let tableColumns = [];
         let s = 0;
@@ -207,7 +208,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                     TableUnits.sort(column, itemType);
                 }
             }
-            //TableUnits.render(column, item);
             //特殊列处理
             //序号
             if (item.title === "序号") {
@@ -239,64 +239,65 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 </Button></Tooltip>);
             } else if (item.title === "操作") {
                 column['fixed'] = 'right';
-                column['align']='center';
-                column['className']='opsColumn';
+                column['align'] = 'center';
+                column['className'] = 'opsColumn';
                 column['title'] = <>操 作</>
                 column['render'] = (text, record) => (
-                    <Space  size={[0, 4]} wrap>
-                            {buttons.includes('detail') && showView ?
-                        <Button
-                            size="small"
-                            type="primary"
-                            icon={<AlignLeftOutlined/>}
-                            onClick={() => showView(record.code)}>
-                        </Button>
-                        : ""}
+                    <Space size={[0, 4]} wrap>
+                        {buttons.includes('detail') && showView ?
+                            <Button
+                                size="small"
+                                type="primary"
+                                icon={<AlignLeftOutlined/>}
+                                onClick={() => showView(record.code)}>
+                            </Button>
+                            : ""}
                         {buttons.includes('customDetail') && showView ?
                             <Button
                                 size="small"
                                 type="primary"
-                                icon={<AlignCenterOutlined />}
-                                onClick={() => showView(record.code,true)}>
+                                icon={<AlignCenterOutlined/>}
+                                onClick={() => showView(record.code, true)}>
                             </Button>
                             : ""}
                         {buttons.includes('dtmplEdit') && doEdit
-                        && (!ltmplConfig.editAction || ActionUtils.isShow(ltmplConfig.editAction,[record],undefined))?
+                        && (!ltmplConfig.editAction || ActionUtils.isShow(ltmplConfig.editAction, [record], undefined)) ?
                             < Button
                                 size="small"
                                 type="dashed"
                                 icon={<EditOutlined/>}
-                                onClick={() => doEdit(record.code,'update')}>
-                            </Button>: ""}
+                                onClick={() => doEdit(record.code, 'update')}>
+                            </Button> : ""}
                         {buttons.includes('dtmplCustomEdit') && doEdit
-                        && (!ltmplConfig.editAction || ActionUtils.isShow(ltmplConfig.editAction,[record],undefined))?
+                        && (!ltmplConfig.editAction || ActionUtils.isShow(ltmplConfig.editAction, [record], undefined)) ?
                             < Button
                                 size="small"
                                 type="dashed"
-                                icon={<FormOutlined />}
-                                onClick={() => doEdit(record.code,'update',true)}>
-                            </Button>: ""}
+                                icon={<FormOutlined/>}
+                                onClick={() => doEdit(record.code, 'update', true)}>
+                            </Button> : ""}
                         {buttons.includes('copy') && doEdit
                             ?
                             <Tooltip title={'复制'}>< Button
                                 size="small"
                                 type="dashed"
-                                icon={<CopyOutlined />}
-                                onClick={() => doEdit(record.code,'copy')}>
+                                icon={<CopyOutlined/>}
+                                onClick={() => doEdit(record.code, 'copy')}>
                             </Button></Tooltip> : ""}
                         {ltmplConfig.ractions ? ltmplConfig.ractions.map((raction) => {
                             return <Button
                                 key={raction.id}
                                 size="small"
                                 type="dashed"
-                                onClick={() => doRAction(raction.id,record.code)}
-                                    >
+                                onClick={() => doRAction(raction.id, record.code)}
+                            >
                                 {raction.title}
                             </Button>
                         }) : ""}
                         {ltmplConfig.rowActions && ltmplConfig.rowActions.length > 0 ?
                             ltmplConfig.rowActions.map((action) => {
-                                return <Action iconType={'icon'} 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) => {
@@ -306,23 +307,36 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                             }) : ""}
                         {ltmplConfig.rowCQuerys && ltmplConfig.rowCQuerys.length > 0 ?
                             ltmplConfig.rowCQuerys.map((cquery) => {
-                                // return <Button key={cQuery.id} size="small" type="dashed"
-                                //                onClick={() => this.doRowCQuery(cQuery.id, record.code)}
-                                // >{cQuery.title}</Button>;
-                                console.log("record record",record);
-                                return <CquickButton key={cquery.id} size={"small"}  pageType={'drawer'}
+                                console.log("record record", record);
+                                return <CquickButton key={cquery.id} size={"small"} pageType={'drawer'}
                                     // onClick={() => doCQuery(cquery.id)}
-                                                     cQueryConfig={cquery} mainCode={cquery.mainCodeColId?record[cquery.mainCodeColId]:record.code}/>
+                                                     cQueryConfig={cquery}
+                                                     mainCode={cquery.mainCodeColId ? record[cquery.mainCodeColId] : record.code}/>
                             }) : ""}
-                        </Space>);
+                        {buttons.includes('singleDelete') ?
+                            <Popconfirm
+                                placement="rightBottom"
+                                title={'确定要【删除】此数据吗？'}
+                                onConfirm={() => {
+                                    this.doDeleteByCode(record.code)
+                                }}
+                                okText="确定"
+                                cancelText="取消"
+                                okType={"danger"}
+                            >
+                                <Button size="small" type="dashed" danger><DeleteOutlined /></Button>
+                            </Popconfirm>
+                            : ""}
+                    </Space>);
             } else {
-                column['className']='opsColumn';
+                column['className'] = 'opsColumn';
                 column['render'] = (text, record) => {
-                    return <ViewControl  fieldConfig={item} value={record[item.id]} holderType={'table'}/>
+                    return <ViewControl fieldConfig={item} value={record[item.id]} holderType={'table'}/>
 
                 }
             }
         });
+        debugger
         return tableColumns
     }
 
@@ -333,18 +347,18 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         if (ltmplConfig) {
             sortedColConfigs = [{id: '10000', title: '排序'}, ...ltmplConfig.columns, {id: '20000', title: '隐藏'}]
         }
-        this.loadData(defualtDisabledColIds, [], sortedColConfigs);
+        this.loadData(defaultDisabledColIds, [], sortedColConfigs);
     }
 
     async componentDidUpdate(prevProps) {
-        const { sourceId, criteriaData, ltmplConfig} = this.props;
+        const {sourceId, criteriaData, ltmplConfig} = this.props;
         let {ltmplConfig: preLtmplConfig, criteriaData: preCriteriaData} = prevProps;
 
         let {hiddenColIds, sortedColConfigs} = this.state;
 
-        console.log("UnitscriteriaData)",Units.transQueryParamsToStr(criteriaData));
-        console.log("preCriteriaData)",Units.transQueryParamsToStr(preCriteriaData));
-        console.log("preCriteriaData) bool",Units.transQueryParamsToStr(preCriteriaData)==Units.transQueryParamsToStr(criteriaData));
+        console.log("UnitscriteriaData)", Units.transQueryParamsToStr(criteriaData));
+        console.log("preCriteriaData)", Units.transQueryParamsToStr(preCriteriaData));
+        console.log("preCriteriaData) bool", Units.transQueryParamsToStr(preCriteriaData) == Units.transQueryParamsToStr(criteriaData));
         if (ltmplConfig && (!preLtmplConfig || ltmplConfig.id != preLtmplConfig.id) || (Units.transQueryParamsToStr(criteriaData) != Units.transQueryParamsToStr(preCriteriaData))) {
 
             if (ltmplConfig.id == preLtmplConfig.id) {
@@ -357,7 +371,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 this.setState({
                     viewModels: ['table'],
                 })
-                this.loadData(defualtDisabledColIds, [], sColConfigs);
+                this.loadData(defaultDisabledColIds, [], sColConfigs);
             }
         }
     }
@@ -405,24 +419,24 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         const {ltmplConfig} = this.props
         const {hiddenRowCodes, sortedColConfigs} = this.state;
         this.setState({
-            showL2Chart:false,
+            showL2Chart: false,
             hiddenColIds,
             tableColumns: this.buildTableColumns(ltmplConfig, hiddenColIds, hiddenRowCodes, sortedColConfigs),
         })
     }
 
-    doSelectedAction = async (actionId: string,codes,params:object) => {
+    doSelectedAction = async (actionId: string, codes, params: object) => {
         const {selectedRows} = this.state;
-        this.doAction(actionId, selectedRows,params);
+        this.doAction(actionId, selectedRows, params);
     }
 
-    doAction = async (actionId: string, selectedRows: SelectedRow[],params) => {
-        const { sourceId} = this.props;
+    doAction = async (actionId: string, selectedRows: SelectedRow[], params) => {
+        const {sourceId} = this.props;
         const {hiddenColIds, hiddenRowCodes, sortedColConfigs} = this.state;
         this.setState({
             loading: true,
         })
-        let result: boolean = await HcserviceV3.postActions( actionId, selectedRows,params);
+        let result: boolean = await HcserviceV3.postActions(actionId, selectedRows, params);
         if (result) {//重新加载数据
             this.loadData(hiddenColIds, hiddenRowCodes, sortedColConfigs);
         } else {
@@ -432,12 +446,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         }
     }
 
-    doRowAction = async (actionId: string, codes: string[],params:object) => {
-        this.doAction(actionId, [{title: undefined, code:codes[0]}],params);
+    doRowAction = async (actionId: string, codes: string[], params: object) => {
+        this.doAction(actionId, [{title: undefined, code: codes[0]}], params);
     }
 
     doDelete = async () => {
-        const { sourceId} = this.props;
+        const {sourceId} = this.props;
         const {selectedRows, hiddenColIds, hiddenRowCodes, sortedColConfigs} = this.state;
         this.setState({
             loading: true,
@@ -452,17 +466,23 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         }
     }
 
-    // doCQuery=(cqueryId: string, selectedRow: SelectedRow)=>{
-    //
-    //
-    // }
-    // doRowCQuery = async (cqueryId: string, code: string) => {
-    //     this.doCQuery(cqueryId, {title: undefined, code})
-    // }
+    doDeleteByCode = async (code: string) => {
+        const {sourceId} = this.props;
+        const {hiddenColIds, hiddenRowCodes, sortedColConfigs} = this.state;
+        this.setState({
+            loading: true,
+        })
+        let result: boolean = await HcserviceV3.deleteByCode(sourceId, [code]);
+        if (result) {//重新加载数据
+            this.loadData(hiddenColIds, hiddenRowCodes, sortedColConfigs);
+        } else {
+            this.setState({
+                loading: false,
+            })
+        }
+    }
 
     doSelectedCQuery = async (cqueryId: string) => {
-        // const {selectedRows} = this.state;
-        // this.doCQuery(cqueryId, selectedRows[0])
     }
 
     doJump = async (jumpId: string, code: string) => {
@@ -484,13 +504,13 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
     doSelectedJump = async (jumpId: string) => {
         const {selectedRows} = this.state;
-        if(selectedRows.length==1){
+        if (selectedRows.length == 1) {
             this.doJump(jumpId, selectedRows[0].code)
         }
 
     }
 
-    changeRowSelection = (selectedRows: SelectedRow[],selectedDatas:DtmplData[]) => {
+    changeRowSelection = (selectedRows: SelectedRow[], selectedDatas: DtmplData[]) => {
         this.setState({
             selectedRows,
             selectedDatas,
@@ -507,24 +527,29 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
 
-
     renderHeaderButtons = () => {
         let {hiddenColIds, queryKey, viewModels, sortedColConfigs, disabledColIds, showL2Chart, showL2ActTable} = this.state;
-        const {ltmplConfig,  sourceId, doCreate, doSearch,menuId} = this.props;
+        const {ltmplConfig, sourceId, doCreate, doSearch, menuId, funcMode} = this.props;
         let {buttons} = ltmplConfig;
 
         return <>
+            {funcMode == "common" && this.criteriaFormUseful() ?
+                <Popover trigger="click"  content={this.renderCriteriaForm()} >
+                    <Button ><SearchOutlined /></Button>
+                </Popover>
+                : null
+            }
             {buttons.includes("dtmplAdd") && doCreate ?
                 <Tooltip title={'创建'}>
                     <Button
-                        onClick={()=>doCreate()}>
+                        onClick={() => doCreate()}>
                         <PlusOutlined/>
                     </Button> </Tooltip> : ''}
             {buttons.includes("dtmplCustomAdd") && doCreate ?
                 <Tooltip title={'创建'}>
                     <Button
-                        onClick={()=>doCreate(true)}>
-                        <PlusCircleOutlined />
+                        onClick={() => doCreate(true)}>
+                        <PlusCircleOutlined/>
                     </Button> </Tooltip> : ''}
             {buttons.includes("importLtmplExcel") ? <Tooltip title={'导入'}> <Button
                 href={`#/${sourceId}/importer?menuId=${menuId}`} target={'_blank'}>
@@ -557,7 +582,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 onClick={this.handleDataAnalysis}>
                 <FundOutlined/>
             </Button></Tooltip> : ""}
-            {buttons.includes("reStat") ? <Restat fields={ltmplConfig.reStatParams} sourceId={sourceId} onfinish={()=>doSearch(null)}></Restat> : ""}
+            {buttons.includes("reStat") ? <Restat fields={ltmplConfig.reStatParams} sourceId={sourceId}
+                                                  onfinish={() => doSearch(null)}></Restat> : ""}
             <Popover content={<Checkbox.Group value={viewModels} onChange={this.changeViewModel}>
                 <Row style={{width: '120px'}}>
                     <Col span={24}><Checkbox value={'table'}>表格</Checkbox></Col>
@@ -595,9 +621,43 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         </>
     }
 
+    criteriaFormUseful = () => {
+        const {ltmplConfig} = this.props;
+        let {buttons, criterias, jumps, actions} = ltmplConfig;
+        if( (buttons.includes('query') && ((criterias && criterias.length > 0) || buttons.includes('drilling'))) ||
+            this.checkBoxUseful()){
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    checkBoxUseful=()=>{
+        const {ltmplConfig} = this.props;
+        let {buttons, jumps, actions} = ltmplConfig;
+        if(buttons.includes('batchDelete') ||
+            (actions && actions.length > 0) || (jumps && jumps.length > 0)){
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    renderCriteriaForm=()=>{
+        let { criteriaData, loading, selectedRows, selectedDatas} = this.state;
+        let {ltmplConfig, doSearch} = this.props;
+       return <CriteriaForm loading={loading} selectedDatas={selectedDatas} selectedRows={selectedRows}
+                      ltmplConfig={ltmplConfig} data={criteriaData}
+                      doCQuery={this.doSelectedCQuery}
+                      doAction={this.doSelectedAction}
+                      doDelete={this.doDelete}
+                      doJump={this.doSelectedJump}
+                      doSearch={doSearch}/>
+    }
+
     render() {
-        let {queryKey, tableColumns, criteriaData, loading, selectedRows,selectedDatas, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable, showL2Chart} = this.state;
-        let { sourceId, ltmplConfig, doSearch,funcMode} = this.props;
+        let {queryKey, tableColumns, criteriaData, loading, selectedRows, selectedDatas, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable, showL2Chart} = this.state;
+        let {sourceId, ltmplConfig, doSearch, funcMode, title} = this.props;
 
         if (!ltmplConfig || !sourceId) {
             return <>
@@ -609,10 +669,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         }
         let {buttons, criterias, jumps, actions} = ltmplConfig
         let displayCriteriaCard: boolean = false;
-        if(funcMode=='simple'){
-            displayCriteriaCard=false;
-        }else if (buttons.includes('delete') || (buttons.includes('query') && ((criterias && criterias.length > 0 )|| buttons.includes('drilling'))) ||
-            (actions && actions.length > 0) || (jumps && jumps.length > 0) ) {
+        if (funcMode == 'simple' || funcMode == 'common') {
+            displayCriteriaCard = false;
+        } else if (this.criteriaFormUseful()) {
             displayCriteriaCard = true;
         }
 
@@ -633,29 +692,26 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 </div> : ""
                 }
                 {buttons.includes("analysis") && showL2ActTable ? <div>
-                    <L2ActTable innerQueryKey={queryKey.key}  sourceId={sourceId}/>
+                    <L2ActTable innerQueryKey={queryKey.key} sourceId={sourceId}/>
                     <Divider dashed style={{borderTopColor: "#40a9ff",}} plain></Divider>
                 </div> : ""
                 }
                 <div className="actTable">
-                    {funcMode=='complete'?
+                    {funcMode == 'complete' || funcMode == 'common' ?
                         <h3>
-                            {ltmplConfig.title}
+                            {title ? title : ltmplConfig.title}
                             <p className="fr">
                                 {this.renderHeaderButtons()}
                             </p>
-                        </h3>:null
+                        </h3> : null
+                    }
+                    {displayCriteriaCard ?
+                        this.renderCriteriaForm() : null
                     }
-                    <CriteriaForm loading={loading} visible={displayCriteriaCard} selectedDatas={selectedDatas} selectedRows={selectedRows}
-                                  ltmplConfig={ltmplConfig} data={criteriaData}
-                                  doCQuery={this.doSelectedCQuery}
-                                  doAction={this.doSelectedAction}
-                                  doDelete={this.doDelete}
-                                  doJump={this.doSelectedJump}
-                                  doSearch={doSearch} />
                     {
                         loading ? "" :
                             <QueryTable viewModels={viewModels} columnConfigs={columnConfigs}
+                                        maxSelectedRows={this.checkBoxUseful()?10000:-1}
                                         selectedRows={selectedRows}
                                         columns={tableColumns}
                                         hiddenRowCodes={hiddenRowCodes}

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

@@ -214,7 +214,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
         }
         let {buttons, criterias, jumps, actions} = selectConfig
         let displayCriteriaCard: boolean = false;
-        if (buttons.includes('delete') || (buttons.includes('query') && criterias && criterias.length > 0) ||
+        if (buttons.includes('batchDelete') || (buttons.includes('query') && criterias && criterias.length > 0) ||
             (actions && actions.length > 0) || (jumps && jumps.length > 0)) {
             displayCriteriaCard = true;
         }

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

@@ -109,9 +109,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     DraggableBodyRow = ({className, style, ...restProps}) => {
         const {dataSource} = this.state;
         if (dataSource) {
-            //let ds=  this.getUnHidenDataSource();
-            // function findIndex base on Table rowKey props and should always be a right array index
-            // @ts-ignore
             const index = dataSource.findIndex(x => x.key === restProps['data-row-key']);
             return <SortableItem key={index} index={index} {...restProps} />;
         } else {
@@ -210,7 +207,9 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                 allRowKeys.push(d.code);
             }
         }
-
+        if(maxSelectedRows==-1){
+            return null;
+        }
         const rowSelection: TableRowSelection<any> = {
             fixed: true,
             type: maxSelectedRows == 1 ? 'radio' : 'checkbox',
@@ -251,7 +250,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                 }
             }
         }
-
+        // debugger
         return ds;
     }
 
@@ -314,7 +313,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                             dataSource={this.getUnHidenDataSource()}
                             renderItem={item => (
                                 <List.Item key={item['id']}>
-                                    <Card><Descriptions column={4}>
+                                    <Card bodyStyle={{padding:'4px'}}><Descriptions column={4}>
                                         {this.initViewList(item)}
                                     </Descriptions></Card>
                                 </List.Item>

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

@@ -139,7 +139,9 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
             column['dataIndex'] = item.id;
             s++;
             let itemType = SupportInputTypes.getControlType(item, null);
-            if (s < 10) {
+            if (s==1) {
+                TableUnits.sort(column, itemType,'ascend');
+            }else if (s < 10) {
                 TableUnits.sort(column, itemType);
             }
             column['render'] = (text, record) => {
@@ -165,7 +167,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         const viewable = buttons.includes('detail');
         const rowEdit = buttons.includes('rowEdit');
         const dtmplEdit = buttons.includes('dtmplEdit');
-        const deletable = buttons.includes('delete');
+        const deletable =  buttons.includes('singleDelete');
 
 
         if (viewOrEdit == 'edit' && (viewable || rowEdit || dtmplEdit || deletable)) {

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

@@ -66,10 +66,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
 
     async componentDidMount() {
         const {sourceId} = this.props;
-        // if (sourceName && visible) {
-        //  if (sourceName) {
         await this.loadData(await this.loadConfig(), {});
-        // }
     }
 
     loadConfig = async () => {
@@ -220,7 +217,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         }
         let {buttons, criterias, jumps, actions} = selectConfig
         let displayCriteriaCard: boolean = false;
-        if (buttons.includes('delete') || (buttons.includes('query') && criterias && criterias.length > 0) ||
+        if (buttons.includes('batchDelete') || (buttons.includes('query') && criterias && criterias.length > 0) ||
             (actions && actions.length > 0) || (jumps && jumps.length > 0)) {
             displayCriteriaCard = true;
         }