aldehyde 0.2.197 → 0.2.199

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

@@ -1,279 +1,279 @@
-import React from 'react'
-import {Modal} from 'antd';
-import "./index.css"
-import {DtmplData, QueryKey, SelectConfig, SelectedRow} from "../tmpl/interface";
-import TableUnits from "./table-util";
-import SupportInputTypes from '../tmpl/control-type-supportor';
-import HCDataSource from '../tmpl/hc-data-source';
-import HcserviceV3 from "../tmpl/hcservice-v3";
-import QueryTable from './query-table';
-import CriteriaForm from "../form/criteria-form";
-import ViewControl from "../controls/view-control";
-import SelectedRowsCard from './selected-rows-card'
-import Scrollbars from 'react-custom-scrollbars';
-import { LocaleContext } from "../locale/LocaleProvider";
-interface ModelSelectTableProps {
-    maxSelectedRows?: number,
-    open: boolean,
-    serverKey?:string,
-    sourceId: string,
-    mainCode:string,
-    existRelation?:string,
-    exceptCodes?: string[],
-    onCancel: () => void,
-    defaultCriteriaValue?:object,
-    onOK: (selectedRows: SelectedRow[]) => void,
-};
-
-interface ModelSelectTableStat {
-    selectConfig?: SelectConfig;
-    columns?: object[];
-    queryKey?: QueryKey;
-    loading?: boolean;
-    criteriaData?: object;
-    pageNo?:number,
-    pageSize?:number,
-    selectedRows?: SelectedRow[];
-};
-
-class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelSelectTableStat> {
-    static contextType = LocaleContext;
-    context: React.ContextType<typeof LocaleContext>;
-    static defaultProps={
-        defaultCriteriaValue:{}
-    }
-    state = {
-        selectConfig: undefined,
-        columns: undefined,
-        queryKey: undefined,
-        loading: true,
-        criteriaData: undefined,
-        pageNo:undefined,
-        pageSize:undefined,
-        disableCols: undefined,
-        selectedRows: [],
-    }
-
-    loadData = async (selectConfig: SelectConfig, criteriaData: object) => {
-
-        this.setState({
-            loading: true,
-        })
-        const {pageNo,pageSize} = this.state;
-        const {defaultPageSize} = selectConfig;
-
-        let pageInfo = {
-            pageNo: pageNo,
-            pageSize:pageSize?pageSize: defaultPageSize,
-            virtualEndPageNo: undefined,
-        }
-        const {sourceId, exceptCodes,serverKey,mainCode,existRelation} = this.props;
-        /** 构建 dataSource **/
-            //构建过滤条件
-        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey,sourceId, {exceptCodes, ...criteriaData, ...pageInfo,mainCode,existRelation});
-        this.setState({
-            queryKey,
-            criteriaData,
-            loading: false,
-        })
-    }
-
-    async componentDidMount() {
-        const { sourceId, open,defaultCriteriaValue} = this.props;
-        if (sourceId && open) {
-            let result=await this.loadConfig();
-            await this.loadData(result.selectConfig, result.criteriaData);
-        }
-    }
-
-    loadConfig = async () => {
-        const { translate } = this.context;
-        const { sourceId, exceptCodes,serverKey,defaultCriteriaValue} = this.props;
-        this.setState({
-            loading: true,
-        })
-
-        let selectConfig = await HCDataSource.requestSelectConfig(serverKey, sourceId);
-        /** 构建column **/
-        let columns = [];
-
-        let s = 0;
-        selectConfig.columns.forEach((item) => {
-            let column = {};
-            if (item.title != "操作") {
-                columns.push(column);
-            }
-            column["title"] = translate("${" + item.title + "}");
-            column["width"] = item.colWidth ? item.colWidth : 160;
-            column["align"] = item.valueAlign ? item.valueAlign : "left";
-            column['dataIndex'] = item.id;
-            // column['ellipsis']= true;
-            s++;
-            let itemType = SupportInputTypes.getSupportControlType(item);
-            if (s < 12 && item.sortable) {
-                TableUnits.sort(column, itemType);
-            }
-            //特殊列处理
-            //序号
-            if (item.title === "序号") {
-                column["width"] = item.colWidth ? item.colWidth : 50;
-                column["align"] = item.valueAlign ? item.valueAlign : "center";
-                column['render'] = (text, record, index) => (
-                    <label>{index + 1}</label>
-                )
-                item['sorter'] = undefined;
-            } else {
-                column['render'] = (text, record) => {
-                    return <ViewControl serverKey={serverKey} fieldConfig={item} value={record[item.id]} holderType={'table'} />
-                }
-            }
-        });
-        let criteriaData = {...selectConfig.defaultCriteriaValue,...defaultCriteriaValue};
-        this.setState({
-            columns,
-            selectConfig,
-            loading: false,
-            criteriaData,
-        })
-        return {selectConfig,criteriaData};
-    }
-
-    async componentDidUpdate(prevProps) {
-        const {exceptCodes, open,defaultCriteriaValue} = this.props;
-        const {selectConfig, criteriaData, queryKey, loading} = this.state;
-        const {exceptCodes: preExceptCodes, open: preOpen} = prevProps;
-        let config:SelectConfig = selectConfig;
-        let criteria=criteriaData
-        if (open) {
-            if (!config) {
-                let result = await this.loadConfig();
-                config=result.selectConfig;
-                criteria=result.criteriaData;
-            }
-            if (!queryKey && !loading) {
-                await this.loadData(config, {...criteria,...defaultCriteriaValue});
-            }
-
-        }
-    }
-
-    doSearch = async (params_) => {
-        const {selectConfig} = this.state;
-        let params = {...params_}
-        await this.loadData(selectConfig, params);
-    }
-
-    onChangePage=(pageNo,pageSize)=>{
-        this.setState({
-            pageNo,pageSize
-        })
-    }
-
-    handleOk = () => {
-        this.props.onOK(this.state.selectedRows);
-        this.setState({
-            selectedRows: [],
-            queryKey: undefined,
-        })
-    }
-
-    handleCancel = () => {
-        this.setState({
-            // selectedRows: [],//暂不置空
-            queryKey: undefined,
-        })
-        this.props.onCancel();
-
-    }
-
-    changeRowSelection = (selectedRows_: SelectedRow[],selectedDatas?:DtmplData[], allRowKeys?: string[]) => {
-        //console.log('changeRowSelection:', allRowKeys);
-        let {maxSelectedRows} = this.props;
-        if (allRowKeys) {
-            const {selectedRows} = this.state;
-            let selectedKeys = [];
-            let selectedRows_1: SelectedRow[] = [];
-            if (maxSelectedRows != 1) {
-                selectedRows_1.push(...selectedRows);
-            }
-            //先追加
-            let contains: boolean = false;
-            for (let s1 of selectedRows_) {
-                contains = false;
-                for (let s2 of selectedRows_1) {
-                    if (s1.code == s2.code) {
-                        contains = true;
-                    }
-                }
-                if (!contains) {
-                    selectedRows_1.push(s1);
-                }
-                selectedKeys.push(s1.code);
-            }
-            //再删除
-            let selectedRows_2: SelectedRow[] = [];
-            selectedRows_2.push(...selectedRows_1);
-            for (let row of selectedRows_1) {
-                if (allRowKeys.includes(row.code) && !selectedKeys.includes(row.code)) {
-                    for (let i in selectedRows_2) {
-                        let s = selectedRows_2[i];
-                        if (s.code == row.code) {
-                            selectedRows_2.splice(Number(i), 1);
-                        }
-                    }
-                }
-            }
-            this.setState({
-                selectedRows: selectedRows_2,
-            })
-        } else {
-            this.setState({
-                selectedRows: selectedRows_,
-            })
-        }
-    }
-
-
-    render() {
-        let {open, maxSelectedRows,serverKey} = this.props;
-        let {queryKey, columns, selectConfig, criteriaData, loading, selectedRows,pageSize,pageNo} = this.state;
-
-        if (!selectConfig) {
-            return <>
-            </>
-        }
-        let {buttons, criterias, jumps, actions} = selectConfig
-        let displayCriteriaCard: boolean = false;
-        if (buttons.includes('batchDelete') || (buttons.includes('query') && criterias && criterias.length > 0) ||
-            (actions && actions.length > 0) || (jumps && jumps.length > 0)) {
-            displayCriteriaCard = true;
-        }
-
-        // const selectedTag=
-
-        return (
-            <Modal
-                open={open}
-                title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection}></SelectedRowsCard>}
-                width={1150}
-                destroyOnClose={true}
-                centered
-                bodyStyle={{height: '80vh', overflow: 'auto'}}
-                onCancel={this.handleCancel}
-                onOk={this.handleOk}
-            ><Scrollbars style={{ height: '80vh' }} autoHide autoHideTimeout={1000}>
-                <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}
-                                primaryColumn={selectConfig.primaryColumn}
-                                columns={columns}
-                                queryKey={queryKey}
-                                onChangeRowSelection={this.changeRowSelection}/>
-                </div> </Scrollbars>
-            </Modal>
-        );
-    }
-}
-
+import React from 'react'
+import {Modal} from 'antd';
+import "./index.css"
+import {DtmplData, QueryKey, SelectConfig, SelectedRow} from "../tmpl/interface";
+import TableUnits from "./table-util";
+import SupportInputTypes from '../tmpl/control-type-supportor';
+import HCDataSource from '../tmpl/hc-data-source';
+import HcserviceV3 from "../tmpl/hcservice-v3";
+import QueryTable from './query-table';
+import CriteriaForm from "../form/criteria-form";
+import ViewControl from "../controls/view-control";
+import SelectedRowsCard from './selected-rows-card'
+import Scrollbars from 'react-custom-scrollbars';
+import { LocaleContext } from "../locale/LocaleProvider";
+interface ModelSelectTableProps {
+    maxSelectedRows?: number,
+    open: boolean,
+    serverKey?:string,
+    sourceId: string,
+    mainCode:string,
+    existRelation?:string,
+    exceptCodes?: string[],
+    onCancel: () => void,
+    defaultCriteriaValue?:object,
+    onOK: (selectedRows: SelectedRow[]) => void,
+};
+
+interface ModelSelectTableStat {
+    selectConfig?: SelectConfig;
+    columns?: object[];
+    queryKey?: QueryKey;
+    loading?: boolean;
+    criteriaData?: object;
+    pageNo?:number,
+    pageSize?:number,
+    selectedRows?: SelectedRow[];
+};
+
+class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelSelectTableStat> {
+    static contextType = LocaleContext;
+    context: React.ContextType<typeof LocaleContext>;
+    static defaultProps={
+        defaultCriteriaValue:{}
+    }
+    state = {
+        selectConfig: undefined,
+        columns: undefined,
+        queryKey: undefined,
+        loading: true,
+        criteriaData: undefined,
+        pageNo:undefined,
+        pageSize:undefined,
+        disableCols: undefined,
+        selectedRows: [],
+    }
+
+    loadData = async (selectConfig: SelectConfig, criteriaData: object) => {
+
+        this.setState({
+            loading: true,
+        })
+        const {pageNo,pageSize} = this.state;
+        const {defaultPageSize} = selectConfig;
+
+        let pageInfo = {
+            pageNo: pageNo,
+            pageSize:pageSize?pageSize: defaultPageSize,
+            virtualEndPageNo: undefined,
+        }
+        const {sourceId, exceptCodes,serverKey,mainCode,existRelation} = this.props;
+        /** 构建 dataSource **/
+            //构建过滤条件
+        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey,sourceId, {exceptCodes, ...criteriaData, ...pageInfo,mainCode,existRelation});
+        this.setState({
+            queryKey,
+            criteriaData,
+            loading: false,
+        })
+    }
+
+    async componentDidMount() {
+        const { sourceId, open,defaultCriteriaValue} = this.props;
+        if (sourceId && open) {
+            let result=await this.loadConfig();
+            await this.loadData(result.selectConfig, result.criteriaData);
+        }
+    }
+
+    loadConfig = async () => {
+        const { translate } = this.context;
+        const { sourceId, exceptCodes,serverKey,defaultCriteriaValue} = this.props;
+        this.setState({
+            loading: true,
+        })
+
+        let selectConfig = await HCDataSource.requestSelectConfig(serverKey, sourceId);
+        /** 构建column **/
+        let columns = [];
+
+        let s = 0;
+        selectConfig.columns.forEach((item) => {
+            let column = {};
+            if (item.title != "操作") {
+                columns.push(column);
+            }
+            column["title"] = translate("${" + item.title + "}");
+            column["width"] = item.colWidth ? item.colWidth : 160;
+            column["align"] = item.valueAlign ? item.valueAlign : "left";
+            column['dataIndex'] = item.id;
+            // column['ellipsis']= true;
+            s++;
+            let itemType = SupportInputTypes.getSupportControlType(item);
+            if (s < 12 && item.sortable) {
+                TableUnits.sort(column, itemType);
+            }
+            //特殊列处理
+            //序号
+            if (item.title === "序号") {
+                column["width"] = item.colWidth ? item.colWidth : 50;
+                column["align"] = item.valueAlign ? item.valueAlign : "center";
+                column['render'] = (text, record, index) => (
+                    <label>{index + 1}</label>
+                )
+                item['sorter'] = undefined;
+            } else {
+                column['render'] = (text, record) => {
+                    return <ViewControl serverKey={serverKey} fieldConfig={item} value={record[item.id]} holderType={'table'} />
+                }
+            }
+        });
+        let criteriaData = {...selectConfig.defaultCriteriaValue,...defaultCriteriaValue};
+        this.setState({
+            columns,
+            selectConfig,
+            loading: false,
+            criteriaData,
+        })
+        return {selectConfig,criteriaData};
+    }
+
+    async componentDidUpdate(prevProps) {
+        const {exceptCodes, open,defaultCriteriaValue} = this.props;
+        const {selectConfig, criteriaData, queryKey, loading} = this.state;
+        const {exceptCodes: preExceptCodes, open: preOpen} = prevProps;
+        let config:SelectConfig = selectConfig;
+        let criteria=criteriaData
+        if (open) {
+            if (!config) {
+                let result = await this.loadConfig();
+                config=result.selectConfig;
+                criteria=result.criteriaData;
+            }
+            if (!queryKey && !loading) {
+                await this.loadData(config, {...criteria,...defaultCriteriaValue});
+            }
+
+        }
+    }
+
+    doSearch = async (params_) => {
+        const {selectConfig} = this.state;
+        let params = {...params_}
+        await this.loadData(selectConfig, params);
+    }
+
+    onChangePage=(pageNo,pageSize)=>{
+        this.setState({
+            pageNo,pageSize
+        })
+    }
+
+    handleOk = () => {
+        this.props.onOK(this.state.selectedRows);
+        this.setState({
+            selectedRows: [],
+            queryKey: undefined,
+        })
+    }
+
+    handleCancel = () => {
+        this.setState({
+            // selectedRows: [],//暂不置空
+            queryKey: undefined,
+        })
+        this.props.onCancel();
+
+    }
+
+    changeRowSelection = (selectedRows_: SelectedRow[],selectedDatas?:DtmplData[], allRowKeys?: string[]) => {
+        //console.log('changeRowSelection:', allRowKeys);
+        let {maxSelectedRows} = this.props;
+        if (allRowKeys) {
+            const {selectedRows} = this.state;
+            let selectedKeys = [];
+            let selectedRows_1: SelectedRow[] = [];
+            if (maxSelectedRows != 1) {
+                selectedRows_1.push(...selectedRows);
+            }
+            //先追加
+            let contains: boolean = false;
+            for (let s1 of selectedRows_) {
+                contains = false;
+                for (let s2 of selectedRows_1) {
+                    if (s1.code == s2.code) {
+                        contains = true;
+                    }
+                }
+                if (!contains) {
+                    selectedRows_1.push(s1);
+                }
+                selectedKeys.push(s1.code);
+            }
+            //再删除
+            let selectedRows_2: SelectedRow[] = [];
+            selectedRows_2.push(...selectedRows_1);
+            for (let row of selectedRows_1) {
+                if (allRowKeys.includes(row.code) && !selectedKeys.includes(row.code)) {
+                    for (let i in selectedRows_2) {
+                        let s = selectedRows_2[i];
+                        if (s.code == row.code) {
+                            selectedRows_2.splice(Number(i), 1);
+                        }
+                    }
+                }
+            }
+            this.setState({
+                selectedRows: selectedRows_2,
+            })
+        } else {
+            this.setState({
+                selectedRows: selectedRows_,
+            })
+        }
+    }
+
+
+    render() {
+        let {open, maxSelectedRows,serverKey} = this.props;
+        let {queryKey, columns, selectConfig, criteriaData, loading, selectedRows,pageSize,pageNo} = this.state;
+
+        if (!selectConfig) {
+            return <>
+            </>
+        }
+        let {buttons, criterias, jumps, actions} = selectConfig
+        let displayCriteriaCard: boolean = false;
+        if (buttons.includes('batchDelete') || (buttons.includes('query') && criterias && criterias.length > 0) ||
+            (actions && actions.length > 0) || (jumps && jumps.length > 0)) {
+            displayCriteriaCard = true;
+        }
+
+        // const selectedTag=
+
+        return (
+            <Modal
+                open={open}
+                title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection}></SelectedRowsCard>}
+                width={1150}
+                destroyOnClose={true}
+                centered
+                bodyStyle={{height: '80vh', overflow: 'auto'}}
+                onCancel={this.handleCancel}
+                onOk={this.handleOk}
+            ><Scrollbars style={{ height: '80vh' }} autoHide autoHideTimeout={1000}>
+                <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}
+                                primaryColumn={selectConfig.primaryColumn}
+                                columns={columns}
+                                queryKey={queryKey}
+                                onChangeRowSelection={this.changeRowSelection}/>
+                </div> </Scrollbars>
+            </Modal>
+        );
+    }
+}
+
 export default ModelSelectTable;

package/src/aldehyde/table/pagination.css

@@ -1,15 +1,15 @@
-.seeTotal{
-    margin-right:20px;
-    text-decoration:underline;
-    cursor:pointer
-}
-.sewTotal{
-    margin-right:20px;
-    text-decoration:none;
-    cursor:auto;
-}
-.Pagination{
-    display:flex;
-    align-items: center;
-    margin-top:10px;
+.seeTotal{
+    margin-right:20px;
+    text-decoration:underline;
+    cursor:pointer
+}
+.sewTotal{
+    margin-right:20px;
+    text-decoration:none;
+    cursor:auto;
+}
+.Pagination{
+    display:flex;
+    align-items: center;
+    margin-top:10px;
 }