@lingxiteam/ebe-utils 0.2.4 → 0.2.6

package/lib/pcpublic/src/components/pcfactory/src/Table/index.tsx

@@ -31,39 +31,13 @@ import TableHead from './TableHead';
 import TableSummaryRow from './TableSummaryRow';
 import type { MyTableProps } from './types/prop';
 
-const components = {
-  body: {
-    cell: BodyCell,
-  },
-  header: {
-    cell: HeaderCell,
-  },
-};
-
 // const prefixCls = 'table';
 
 const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
-  const {
-    dataSource: boundDataSource,
-    visible = true,
-    style: styles,
-    className,
-    onChange,
-    $$componentItem,
-    getEngineApis,
-    ...restProps
-  } = props;
+  const { dataSource: boundDataSource, visible = true, style: styles, className, onChange, $$componentItem, getEngineApis, ...restProps } = props;
 
   const { uid: compId } = $$componentItem;
-  const {
-    size,
-    sortDirections,
-    sticky,
-    summary,
-    tableLayout,
-    title,
-    rowClassName,
-  } = restProps || {};
+  const { size, sortDirections, sticky, summary, tableLayout, title, rowClassName, showHeader = true } = restProps || {};
   const tableProps = {
     size,
     sortDirections,
@@ -95,28 +69,14 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
     outerDataSourceRef,
   } = useCommon({ ...props, boundDataSource });
 
-  const {
-    page,
-    pagination,
-    hasPageChangeEvent,
-    setCurrent,
-    setTotal,
-    setCurrentPage,
-    setCurrentPageSize,
-    onPageChange,
-  } = usePagination({
+  const { page, pagination, hasPageChangeEvent, setCurrent, setTotal, setCurrentPage, setCurrentPageSize, onPageChange } = usePagination({
     ...props,
     outerDataSourceRef,
     boundDataSource,
     engineApis,
   });
 
-  const {
-    innerDataSource,
-    setInnerDataSource,
-    setOuterDataSource,
-    currentPageDataSource,
-  } = useDataSource({
+  const { innerDataSource, setInnerDataSource, setOuterDataSource, currentPageDataSource, setTableRowKey } = useDataSource({
     ...props,
     compId,
     currentRowKey,
@@ -131,14 +91,7 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
     setCurrentPage,
   });
 
-  const {
-    filters,
-    filterDropdownOpen,
-    checkIfHiddenRow,
-    renderFilterDropDown,
-    onFilterDropdownVisibleChange,
-    filterDataSource,
-  } = useFilter({
+  const { filters, filterDropdownOpen, checkIfHiddenRow, renderFilterDropDown, onFilterDropdownVisibleChange, filterDataSource } = useFilter({
     compId,
     innerDataSource,
     currentRowKey,
@@ -151,7 +104,11 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
     innerDataSource: filterDataSource,
   });
 
-  const { expandable: realExpandable, expandTableData } = useExpandable({
+  const {
+    expandable: realExpandable,
+    expandTableData,
+    hasExpandContent,
+  } = useExpandable({
     ...props,
     dataSource: sortDataSource,
     currentRowKey,
@@ -222,8 +179,7 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
     currentRowKey,
   });
 
-  const { showPrintContainer, loadPrint, selectorKey, printData } =
-    usePrintMode(props.$$componentItem.uid);
+  const { showPrintContainer, loadPrint, selectorKey, printData } = usePrintMode(props.$$componentItem.uid);
 
   const { loading, colServiceData, colServiceDataForEdit } = useCMDAction({
     ...props,
@@ -256,6 +212,7 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
     loadPrint,
     engineApis,
     expandTableData,
+    setTableRowKey,
   });
 
   // 根据id获取真实的下标，避免过滤和排序后影响下标
@@ -266,9 +223,7 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
         if (indexMap.has(id)) {
           return indexMap.get(id);
         }
-        const index = (innerDataSource || []).findIndex(
-          (c: any) => c[currentRowKey] === id,
-        );
+        const index = (innerDataSource || []).findIndex((c: any) => c[currentRowKey] === id);
         if (index !== -1) {
           indexMap.set(id, index);
         }
@@ -325,6 +280,7 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
     rowSelection,
     getLocale,
     getRealIndexById,
+    childrenColumnName: realExpandable.childrenColumnName,
   });
 
   const {
@@ -338,6 +294,8 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
     finalcolumns,
     columnWidth,
     setColumnWidth,
+    sortDataSource,
+    pageId,
   });
 
   const superSelectTranslationMapRef: any = useRef(); // 防止state更新不及时，导致翻译无法获取翻译数据
@@ -351,12 +309,7 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
     innerTableStyle.overflowY = styles.overflowY;
   }
 
-  const handleTableChange = (
-    newPagination: any,
-    newFilters: any,
-    newSorter: any,
-    newExtra: any,
-  ) => {
+  const handleTableChange = (newPagination: any, newFilters: any, newSorter: any, newExtra: any) => {
     if (typeof onChange === 'function') {
       onChange(newPagination, newFilters, newSorter, newExtra);
     }
@@ -367,7 +320,7 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
           newPagination?.current,
           newPagination?.pageSize,
           newSorter?.order === 'ascend' ? newSorter?.field : undefined,
-          newSorter?.order === 'descend' ? newSorter?.field : undefined,
+          newSorter?.order === 'descend' ? newSorter?.field : undefined
         );
         return;
       }
@@ -411,19 +364,11 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
     'data-compid': (props as any)?.['data-compid'],
   };
 
-  const isEmptyLoading = useMemo(
-    () => loading && sortDataSource?.length === 0,
-    [loading, sortDataSource],
-  );
+  const isEmptyLoading = useMemo(() => loading && sortDataSource?.length === 0, [loading, sortDataSource]);
 
   return visible ? (
-    <Form form={form}>
-      <div
-        {...eleProps}
-        style={styles}
-        className={classnames('ued-table-wrap', className)}
-        ref={tableWrapRef}
-      >
+    <>
+      <div {...eleProps} style={styles} className={classnames('ued-table-wrap', className)} ref={tableWrapRef}>
         <TableHead
           {...restProps}
           source="engine"
@@ -433,74 +378,77 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
           setColOrder={setColCustomOrder}
           sandBoxSafeRun={sandBoxSafeRun}
         />
-        <Table
-          // {...restProps} // TODO: 不要这么透传，需要什么传什么，先注释，之后缺什么再补
-          {...tableProps}
-          locale={{
-            emptyText: (
-              <EmptyComp dataState={dataState} getLocale={getLocale} />
-            ),
-          }}
-          ref={tableRef}
-          // loading={loading}
-          bordered={isBordered}
-          className={innerClassName}
-          style={innerTableStyle}
-          components={components}
-          columns={finalcolumns.map((item, index) => {
-            // 固定列最后一项宽度根据本身计算返回
-            if (fixedAction && finalcolumns.length - 1 === index) {
-              return item;
-            }
-            item.width = columnWidth[index] || item.width;
-            return item;
-          })}
-          rowKey={currentRowKey}
-          scroll={scroll}
-          onChange={handleTableChange}
-          onRow={(record) => {
-            return {
-              onClick: (event) => {
-                const hasOnRowClick = onRowClick(
-                  event,
-                  record,
-                  getRealIndexById(record[currentRowKey]),
-                );
-                !hasOnRowClick &&
-                  onRowSelectClick(
-                    record,
-                    getRealIndexById(record[currentRowKey]),
-                  );
-              }, // 点击行
-              onDoubleClick: (event) => {
-                onRowDoubleClick(
-                  event,
-                  record,
-                  getRealIndexById(record[currentRowKey]),
-                );
+        <Form form={form}>
+          <Table
+            // {...restProps} // TODO: 不要这么透传，需要什么传什么，先注释，之后缺什么再补
+            {...tableProps}
+            showHeader={showHeader}
+            locale={{
+              emptyText: <EmptyComp dataState={dataState} getLocale={getLocale} />,
+            }}
+            ref={tableRef}
+            // loading={loading}
+            bordered={isBordered}
+            className={innerClassName}
+            style={innerTableStyle}
+            components={{
+              body: {
+                cell: BodyCell,
               },
-              onContextMenu: (event) => {},
-              onMouseEnter: (event) => {}, // 鼠标移入行
-              onMouseLeave: (event) => {},
-            };
-          }}
-          rowSelection={rowSelection}
-          // loading没有数据的时候模拟3个数据,当数据为空时依然展示骨架屏
-          dataSource={isEmptyLoading ? [{}, {}, {}] : sortDataSource}
-          expandable={realExpandable}
-          pagination={isEmptyLoading ? false : page && pagination}
-          summary={(pageData: any[]) => (
-            <Table.Summary fixed={!!props?.scroll}>
-              <TableSummaryRow
-                columns={finalcolumns}
-                dataSource={pageData as any[]}
-                summary={props.summary}
-                summaryConfig={props?.summaryTotal}
-                selectionType={rowSelection?.type}
-              />
-            </Table.Summary>
-          )}
-        />
+              header: {
+                cell: (info: any) => (
+                  <HeaderCell
+                    {...info}
+                    tableData={sortDataSource}
+                    hasExpandContent={hasExpandContent}
+                    childrenColumnName={realExpandable.childrenColumnName}
+                  />
+                ),
+              },
+            }}
+            columns={finalcolumns.map((item, index) => {
+              // 固定列最后一项宽度根据本身计算返回
+              if (fixedAction && finalcolumns.length - 1 === index) {
+                return item;
+              }
+              item.width = columnWidth[index] || item.width;
+              return item;
+            })}
+            rowKey={currentRowKey}
+            scroll={scroll}
+            onChange={handleTableChange}
+            onRow={record => {
+              return {
+                onClick: event => {
+                  const hasOnRowClick = onRowClick(event, record, getRealIndexById(record[currentRowKey]));
+                  !hasOnRowClick && onRowSelectClick(record, getRealIndexById(record[currentRowKey]));
+                }, // 点击行
+                onDoubleClick: event => {
+                  onRowDoubleClick(event, record, getRealIndexById(record[currentRowKey]));
+                },
+                onContextMenu: event => {},
+                onMouseEnter: event => {}, // 鼠标移入行
+                onMouseLeave: event => {},
+              };
+            }}
+            rowSelection={rowSelection}
+            // loading没有数据的时候模拟3个数据,当数据为空时依然展示骨架屏
+            dataSource={isEmptyLoading ? [{}, {}, {}] : sortDataSource}
+            expandable={realExpandable}
+            pagination={isEmptyLoading ? false : page && pagination}
+            summary={(pageData: any[]) => (
+              <Table.Summary fixed={!!props?.scroll}>
+                <TableSummaryRow
+                  columns={finalcolumns}
+                  dataSource={pageData as any[]}
+                  summary={props.summary}
+                  summaryConfig={props?.summaryTotal}
+                  selectionType={rowSelection?.type}
+                />
+              </Table.Summary>
+            )}
+          />
+        </Form>
       </div>
       {showPrintContainer && (
         <PrintContainer
@@ -522,40 +470,53 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
             headExtends={[]}
             engineApis={engineApis}
           />
-          {/** @ts-ignore */}
-          <Table
-            {...restProps}
-            bordered={isBordered}
-            className={innerClassName}
-            style={innerTableStyle}
-            components={components}
-            columns={printColumns.map((item, index) => {
-              item.width = columnWidth[index] || item.width;
-              return item;
-            })}
-            rowKey={currentRowKey}
-            dataSource={
-              printData?.dataSource?.length > 0
-                ? printData.dataSource
-                : sortDataSource
-            }
-            expandable={realExpandable}
-            pagination={false}
-            summary={(pageData: readonly any[]) => (
-              <Table.Summary fixed={!!props?.scroll}>
-                <TableSummaryRow
-                  columns={finalcolumns}
-                  dataSource={pageData as any[]}
-                  summary={props.summary}
-                  summaryConfig={props?.summaryTotal}
-                  selectionType={rowSelection?.type}
-                />
-              </Table.Summary>
-            )}
-          />
+          <Form form={form}>
+            {/** @ts-ignore */}
+            <Table
+              {...restProps}
+              showHeader={showHeader}
+              bordered={isBordered}
+              className={innerClassName}
+              style={innerTableStyle}
+              components={{
+                body: {
+                  cell: BodyCell,
+                },
+                header: {
+                  cell: (info: any) => (
+                    <HeaderCell
+                      {...info}
+                      tableData={printData?.dataSource?.length > 0 ? printData.dataSource : sortDataSource}
+                      childrenColumnName={realExpandable.childrenColumnName}
+                      hasExpandContent={hasExpandContent}
+                    />
+                  ),
+                },
+              }}
+              columns={printColumns.map((item, index) => {
+                item.width = columnWidth[index] || item.width;
+                return item;
+              })}
+              rowKey={currentRowKey}
+              dataSource={printData?.dataSource?.length > 0 ? printData.dataSource : sortDataSource}
+              expandable={realExpandable}
+              pagination={false}
+              summary={(pageData: readonly any[]) => (
+                <Table.Summary fixed={!!props?.scroll}>
+                  <TableSummaryRow
+                    columns={finalcolumns}
+                    dataSource={pageData as any[]}
+                    summary={props.summary}
+                    summaryConfig={props?.summaryTotal}
+                    selectionType={rowSelection?.type}
+                  />
+                </Table.Summary>
+              )}
+            />
+          </Form>
         </PrintContainer>
       )}
-    </Form>
+    </>
   ) : null;
 });
 

package/lib/pcpublic/src/components/pcfactory/src/Table/types/bodyCell.d.ts

@@ -14,12 +14,7 @@ export interface MyBodyCellProps {
   mode?: string;
   funcExpExecute?: FuncExpExeCuteType;
   engineApis?: any;
-  onTableCellClick?: (
-    row: Record<string, any>,
-    cell: any,
-    cellId: string | number,
-    rowIndex: number,
-  ) => void;
+  onTableCellClick?: (row: Record<string, any>, cell: any, cellId: string | number, rowIndex: number) => void;
   width?: number;
   index: number;
 }

package/lib/pcpublic/src/components/pcfactory/src/Table/types/contentStyle.d.ts

@@ -3,6 +3,7 @@ interface Page {
   pagePath: string;
   currentPageVersionId: string;
   searchParams?: any;
+  routerData?: any;
 }
 interface Modal {
   pageId: string;

package/lib/pcpublic/src/components/pcfactory/src/Table/types/event.d.ts

@@ -1,4 +1,5 @@
 export interface TableBaseEventTypes {
+
   /**
    * 点击表格头排序图标时触发
    * @param ascendCol
@@ -34,6 +35,7 @@ export interface TableBaseEventTypes {
 }
 
 export interface TableRowExpandEventTypes {
+
   /**
    * 点击展开/收缩时触发
    * @param expanded
@@ -51,6 +53,7 @@ export interface TableRowExpandEventTypes {
 }
 
 export interface TableEditEventTypes {
+
   /**
    * 点击内置的编辑按钮时触发
    * @param key
@@ -114,6 +117,7 @@ export interface TableEditEventTypes {
 }
 
 export interface TablePaginationEventTypes {
+
   /**
    * 页码改变回调时触发
    * @param page
@@ -123,7 +127,4 @@ export interface TablePaginationEventTypes {
   onPageChange?: (page: React.SetStateAction<number>, size: number) => void;
 }
 
-export type MyTableEventTypes = TableBaseEventTypes &
-  TableRowExpandEventTypes &
-  TableEditEventTypes &
-  TablePaginationEventTypes;
+export type MyTableEventTypes = TableBaseEventTypes & TableRowExpandEventTypes & TableEditEventTypes & TablePaginationEventTypes;

package/lib/pcpublic/src/components/pcfactory/src/Table/types/headerCell.d.ts

@@ -2,12 +2,14 @@ import type { EngineApisType } from '@lingxiteam/types';
 import type { ResizeCallbackData } from 'react-resizable';
 
 export type HeaderCellProps = React.HTMLAttributes<any> & {
-  onResize: (
-    e: React.SyntheticEvent<Element>,
-    data: ResizeCallbackData,
-  ) => void;
+  onResize: (e: React.SyntheticEvent<Element>, data: ResizeCallbackData) => void;
   width: number;
   isFlexColumn?: boolean;
+  // 列索引
+  columnIndex?: number;
+  tableData?: any[];
+  hasExpandContent?: boolean;
+  childrenColumnName: string;
 };
 
 export interface Code {

package/lib/pcpublic/src/components/pcfactory/src/Table/types/prop.d.ts

@@ -2,6 +2,7 @@ import type { TableProps } from 'antd/lib/table';
 import type { MyTableEventTypes } from './event';
 
 export type SummaryConfig = {
+
   /**
    * 不合计|单列|多列
    */
@@ -136,6 +137,7 @@ export interface TableBasePropTypes extends TableProps<any> {
 }
 
 export interface TablePaginationPropTypes {
+
   /**
    * 是否开启分页
    */
@@ -178,6 +180,7 @@ export interface TablePaginationPropTypes {
 }
 
 export interface TableEditPropTypes {
+
   /**
    * 编辑模式
    */
@@ -220,6 +223,7 @@ export interface TableEditPropTypes {
 }
 
 export interface TableRowExpandPropTypes {
+
   /**
    * 是否可以行展开规则
    */
@@ -267,6 +271,7 @@ export interface TableRowExpandPropTypes {
 }
 
 export interface TableRowSelectPropType {
+
   /**
    * 选择模式
    */

package/lib/pcpublic/src/components/pcfactory/src/Table/utils/SequenceId.ts

@@ -1,6 +1,7 @@
 import merge from 'lodash/merge';
 
 interface SequenceIdOptions {
+
   /**
    * 创建id类型 random 随机   increment 自增
    */
@@ -22,8 +23,7 @@ interface SequenceIdOptions {
   excludeId?: string[];
 }
 
-const randomArr =
-  '1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM'.split('');
+const randomArr = '1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM'.split('');
 
 const getRandomId = (randomBit = 6) => {
   let t = '';