aldehyde 0.2.97 → 0.2.99

package/src/aldehyde/table/control-table-x-axis-wrapper.tsx

@@ -0,0 +1,52 @@
+import React, { useEffect, useRef } from "react";
+import { Table as _Table } from "antd";
+import type { TableProps } from "antd/lib";
+
+export const ControlTableXAxisWrapper: <T>(TableComponent: React.FC<T>) => React.FC<T>  = (TableComponent) => {
+  return ({ ...args }) => {
+    const table = useRef(null);
+    useEffect(() => {
+      const tableBody = table.current.querySelector(".ant-table");
+      let isMove = false;
+      const mouseDown = (e) => {
+        if (e.which === 3) isMove = true
+      }
+      const mouseUp = (e) => {
+        if (e.which === 3) isMove = false
+      }
+      const mouseMove = (e: any) => {
+        if (isMove) {
+          const { movementX, movementY, offsetX, offsetY } = e;
+          tableBody.scrollBy(movementX * 5, 0);
+          e.preventDefault()
+        }
+      };
+      const contextmenu = (e: any) => {
+        e.preventDefault()
+      }
+      if (tableBody) {
+        tableBody.addEventListener("mousedown", mouseDown);
+        tableBody.addEventListener("mousemove", mouseMove);
+        tableBody.addEventListener("mouseup", mouseUp);
+        tableBody.addEventListener("contextmenu", contextmenu);
+      }
+      return () => {
+        if (tableBody) {
+          tableBody.removeEventListener("mousedown", mouseDown);
+          tableBody.removeEventListener("mousemove", mouseMove);
+          tableBody.removeEventListener("mouseup", mouseUp);
+          tableBody.removeEventListener("contextmenu", contextmenu);
+        }
+      };
+    }, []);
+    return (
+      <div ref={table}>
+        <TableComponent {...args}></TableComponent>
+      </div>
+    );
+  };
+};
+
+
+// 这里为可以右键滑动控制X轴坐标的二封 antd 的 table 组件
+export const Table = ControlTableXAxisWrapper<TableProps>(_Table);

package/src/aldehyde/table/pagination.tsx

@@ -1,71 +1,78 @@
 import React from "react";
-import {PageInfo} from "../tmpl/interface";
-import {Pagination as AntdPagination} from 'antd';
-import './pagination.css';
+import { PageInfo } from "../tmpl/interface";
+import { Pagination as AntdPagination } from "antd";
+import "./pagination.css";
+import { LocaleContext } from "../locale/LocaleProvider";
 
 interface PaginationProps {
-    pageTo: (pageNo: number, pageSize: number) => void;
-    queryTotal: () => void;
-    pageInfo: PageInfo;
-    total: number;
-    touchEnd: boolean;
-};
-
-interface PaginationStat {
-
-};
+  pageTo: (pageNo: number, pageSize: number) => void;
+  queryTotal: () => void;
+  pageInfo: PageInfo;
+  total: number;
+  touchEnd: boolean;
+}
 
+interface PaginationStat {}
 
 class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
 
-    render() {
-        const {queryTotal, pageInfo, total, pageTo, touchEnd} = this.props;
+  render() {
+    const { queryTotal, pageInfo, total, pageTo, touchEnd } = this.props;
+    const { translate } = this.context;
 
-        if(!pageInfo){
-            return <></>
-        }
-        let virtualTotal;
-        let myTotal;
-        let sewTotal: boolean = true;
-        let seeTotalTitle: string = "";
-
-        if (total &&  total >= 0) {
-            virtualTotal = total;
-            sewTotal = true;
-            if (total > 0) {
-                seeTotalTitle = `共${total}条`;
-            }
-        } else if (touchEnd ) {
-            sewTotal = false;
-            virtualTotal = pageInfo.virtualEndPageNo * pageInfo.pageSize+1;
-            seeTotalTitle = `点击查看总数`;
-        } else {//这里还有问题
-            sewTotal = false;
-            virtualTotal = pageInfo.virtualEndPageNo *  pageInfo.pageSize + 1;
-            seeTotalTitle = `点击查看总数`;
-        }
+    if (!pageInfo) {
+      return <></>;
+    }
+    let virtualTotal;
+    let myTotal;
+    let sewTotal: boolean = true;
+    let seeTotalTitle: string = "";
 
-        return (!virtualTotal || virtualTotal < pageInfo.pageSize?"":
-            <div className='Pagination'>
-                        <span className={sewTotal ? 'sewTotal' : 'seeTotal'} onClick={queryTotal}>
-                            {seeTotalTitle}
-                        </span>
-                <AntdPagination
-                    style={{display: 'inline-block'}}
-                    showQuickJumper
-                    showSizeChanger
-                    pageSizeOptions={['5', '10', '20', '50', '100', '500']}
-                    defaultCurrent={1}
-                    current={parseInt(pageInfo.pageNo.toString())}
-                    pageSize={pageInfo.pageSize}
-                    onChange={(page, pageSize) => pageTo(page, pageSize)}
-                    onShowSizeChange={(current, size) => pageTo(current, size)}
-                    hideOnSinglePage={total === 0 ? true : false}
-                    total={virtualTotal}
-                />
-            </div>
-        );
+    if (total && total >= 0) {
+      virtualTotal = total;
+      sewTotal = true;
+      if (total > 0) {
+        seeTotalTitle = translate("${总共}" + total + "${条}");
+      }
+    } else if (touchEnd) {
+      sewTotal = false;
+      virtualTotal = pageInfo.virtualEndPageNo * pageInfo.pageSize + 1;
+      seeTotalTitle = translate("${点击查看总数}");
+    } else {
+      //这里还有问题
+      sewTotal = false;
+      virtualTotal = pageInfo.virtualEndPageNo * pageInfo.pageSize + 1;
+      seeTotalTitle = translate("${点击查看总数}");
     }
+
+    return !virtualTotal || virtualTotal < pageInfo.pageSize ? (
+      ""
+    ) : (
+      <div className="Pagination">
+        <span
+          className={sewTotal ? "sewTotal" : "seeTotal"}
+          onClick={queryTotal}
+        >
+          {seeTotalTitle}
+        </span>
+        <AntdPagination
+          style={{ display: "inline-block" }}
+          showQuickJumper
+          showSizeChanger
+          pageSizeOptions={["5", "10", "20", "50", "100", "500"]}
+          defaultCurrent={1}
+          current={parseInt(pageInfo.pageNo.toString())}
+          pageSize={pageInfo.pageSize}
+          onChange={(page, pageSize) => pageTo(page, pageSize)}
+          onShowSizeChange={(current, size) => pageTo(current, size)}
+          hideOnSinglePage={total === 0 ? true : false}
+          total={virtualTotal}
+        />
+      </div>
+    );
+  }
 }
 
-export default Pagination;
+export default Pagination;

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

@@ -1,5 +1,6 @@
 import React from 'react'
-import {Card, Collapse, Descriptions, List, Table} from 'antd';
+import {Card, Collapse, Descriptions, List} from 'antd';
+import { Table } from './control-table-x-axis-wrapper';
 import "./index.css"
 import {
     ActTableViewModel, ColumnConfig,