dcp-design-react 1.11.20 → 1.11.22

package/lib/table/src/context/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { TableBodyRef, IColumn, IDerivedRowKey, IFetchParams, IPagination, IRecord, IRowColSpan, IRowKey, IRule, IMergeCellItem, IMergedCell } from '../table/types';
+import type { TableBodyRef, IColumn, IFetchParams, IPagination, IRecord, IRowColSpan, IRowKey, IRule, IMergeCellItem, IMergedCell } from '../table/types';
 import type { ITableRef } from '../hooks/useTableRef';
 import type { ITableState } from '../hooks/useTableState';
 import type { ComponentSize } from '../../../_utils/types';
@@ -72,8 +72,6 @@ export type ITableContext = {
     doFieldValidate: (rules: IRule[], val: unknown, rowKey: IRowKey, columnKey: string, columnTitle: string) => void;
     createTableData: (list: IRecord[]) => void;
     createGroupData: (records: IRecord[]) => IRecord[];
-    findParentRowKeys: (deriveRowKeys: IDerivedRowKey[], key: IRowKey) => IRowKey[];
-    getAllChildRowKeys: (deriveRowKeys: IDerivedRowKey[]) => IRowKey[];
     scrollBottomDebouncer: (event: React.MouseEvent<HTMLDivElement>) => void;
     resetTableScroll: () => void;
     clearTableSorter: () => void;

package/lib/table/src/hooks/useTableCore.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { ITableRef } from './useTableRef';
 import type { ITableState } from './useTableState';
-import type { getRowKeyType, IColumn, IDerivedRowKey, IFetchParams, IFieldAuthItem, IFilter, IPagination, IRecord, IRowKey, IRule, ISorter, ISuperFilter, ITableProps, IValidItem, TableBodyRef } from '../table/types';
+import type { getRowKeyType, IColumn, IFetchParams, IFieldAuthItem, IFilter, IPagination, IRecord, IRowKey, IRule, ISorter, ISuperFilter, ITableProps, IValidItem, TableBodyRef } from '../table/types';
 import type { ComponentSize } from '../../../_utils/types';
 type IExtra = {
     getRowKey: getRowKeyType;
@@ -64,8 +64,6 @@ declare const useTableCore: <T extends ITableProps>(props: T, extra: IExtra) =>
     createTableData: (list: IRecord[]) => void;
     createGroupData: (list: IRecord[]) => IRecord<any>[];
     setSelectionKeysEffect: (selectedKeys: IRowKey[]) => void;
-    findParentRowKeys: (deriveRowKeyList: IDerivedRowKey[], key: IRowKey) => (string | number)[];
-    getAllChildRowKeys: (deriveRowKeyList: IDerivedRowKey[]) => (string | number)[];
     doFieldValidate: (rules: IRule[], val: unknown, rowKey: IRowKey, columnKey: string, columnTitle: string) => void;
     getTableLog: () => {
         required: IValidItem[];

package/lib/table/src/table/types.d.ts

@@ -140,6 +140,7 @@ export type IEditerReturn = {
             columns?: IColumn[];
             rowKey?: ((row: IRecord, index: number) => IRowKey) | IRowKey;
             webPagination?: boolean;
+            topBarExtra?: React.ReactNode;
         };
         tree?: {
             fetch?: IFetch & {

package/lib/table/src/utils/index.d.ts

@@ -45,6 +45,8 @@ export declare const groupByProps: (array?: IRecord[], props?: string[]) => any[
 export declare const deepGetColumn: (arr: IColumn[], value: string) => IColumn[] | undefined;
 export declare const deepGetRowkey: (arr: IRecord[], value: IRowKey) => IRowKey[] | undefined;
 export declare const deepFindRecord: (arr: IRecord[], fn: (node: IRecord) => boolean) => Nullable<IRecord>;
+export declare const findParentRowKeys: (deriveRowKeyList: IDerivedRowKey[], key: IRowKey) => (string | number)[];
+export declare const getAllChildRowKeys: (deriveRowKeyList: IDerivedRowKey[]) => (string | number)[];
 export declare const deepTreeFilter: (tree: any[], fn: (node: unknown) => boolean) => any[];
 export declare const flatToTree: (list: any[], id: string, pid: string) => any[];
 export declare const sortableFormatter: <T>(items: T[]) => T[];

package/lib/table/style/body.less

@@ -1,103 +1,104 @@
-/*
- * @Author: 焦质晔
- * @Date: 2020-02-28 22:13:54
- * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-12-01 18:48:00
- */
-.body--row {
-  &-draggable {
-    position: relative;
-    .drop-indicator {
-      position: absolute;
-      right: 0;
-      bottom: 0;
-      z-index: 5;
-      height: 2px;
-      background-color: @v-primary-color;
-      border-radius: 1px;
-      pointer-events: none;
-      &::after {
-        position: absolute;
-        top: -3px;
-        left: 0;
-        width: 8px;
-        height: 8px;
-        background-color: #fff;
-        border: 2px solid @v-primary-color;
-        border-radius: 50%;
-        content: '';
-      }
-    }
-  }
-}
-.body--column {
-  .cell--edit {
-    margin: 0 -1 * (@v-module-distance - 1px);
-    // placeholder
-    input::placeholder {
-      text-align: left;
-    }
-    // search
-    .ant-input-search {
-      width: calc(100% + 1px);
-      & > .ant-input-group > .ant-input-group-addon {
-        line-height: 1;
-      }
-    }
-    // search-helper-multiple
-    .search-helper-multiple {
-      .ant-input-group > .ant-select:first-child {
-        z-index: 1;
-        .ant-select-selector {
-          border-top-right-radius: 0;
-          border-bottom-right-radius: 0;
-        }
-      }
-      .ant-select-multiple {
-        .ant-select-selection-overflow-item-rest {
-          pointer-events: none;
-        }
-      }
-    }
-    // textArea
-    textarea[class='ant-input'] {
-      resize: none;
-    }
-    &.is-error {
-      position: relative;
-      .ant-input,
-      .ant-input-affix-wrapper {
-        border-color: @v-danger-color;
-        box-shadow: none;
-        z-index: 1;
-      }
-      .ant-input-search {
-        & + .cell-error {
-          right: 38px;
-        }
-      }
-      .cell-error {
-        position: absolute;
-        top: calc(50% - 9px);
-        font-size: @v-font-size-small;
-        color: @v-danger-color;
-        right: 8px;
-        pointer-events: none;
-        z-index: 1;
-      }
-    }
-  }
-  &.col--center {
-    .cell--edit .ant-input {
-      text-align: center;
-    }
-  }
-  &.col--right {
-    .cell--edit .ant-input {
-      text-align: right;
-    }
-  }
-  &.selected {
-    background-color: @v-table-row-selected-background-color !important;
-  }
-}
+/*
+ * @Author: 焦质晔
+ * @Date: 2020-02-28 22:13:54
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2024-12-01 18:48:00
+ */
+.body--row {
+  &-draggable {
+    position: relative;
+    .drop-indicator {
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      z-index: 5;
+      height: 2px;
+      background-color: @v-primary-color;
+      border-radius: 1px;
+      pointer-events: none;
+      &::after {
+        position: absolute;
+        top: -3px;
+        left: 0;
+        width: 8px;
+        height: 8px;
+        background-color: #fff;
+        border: 2px solid @v-primary-color;
+        border-radius: 50%;
+        content: '';
+      }
+    }
+  }
+}
+.body--column {
+  .cell--edit {
+    margin: 0 -1 * (@v-module-distance - 1px);
+    // placeholder
+    input::placeholder {
+      text-align: left;
+    }
+    // search
+    .ant-input-search {
+      width: calc(100% + 1px);
+      & > .ant-input-group > .ant-input-group-addon {
+        line-height: 1;
+      }
+    }
+    // search-helper-multiple
+    .search-helper-multiple {
+      .ant-input-group > .ant-select:first-child {
+        z-index: 1;
+        .ant-select-selector {
+          border-top-right-radius: 0;
+          border-bottom-right-radius: 0;
+        }
+      }
+      .ant-select-multiple {
+        .ant-select-selection-overflow-item-rest {
+          pointer-events: none;
+        }
+      }
+    }
+    // textArea
+    textarea[class='ant-input'] {
+      resize: none;
+    }
+    &.is-error {
+      position: relative;
+      .ant-input,
+      .ant-input-affix-wrapper,
+      .ant-select > .ant-select-selector {
+        border-color: @v-danger-color;
+        box-shadow: none;
+        z-index: 1;
+      }
+      .ant-input-search {
+        & + .cell-error {
+          right: 38px;
+        }
+      }
+      .cell-error {
+        position: absolute;
+        top: calc(50% - 9px);
+        font-size: @v-font-size-small;
+        color: @v-danger-color;
+        right: 8px;
+        pointer-events: none;
+        z-index: 1;
+      }
+    }
+  }
+  &.col--center {
+    .cell--edit .ant-input {
+      text-align: center;
+    }
+  }
+  &.col--right {
+    .cell--edit .ant-input {
+      text-align: right;
+    }
+  }
+  &.selected {
+    background-color: @v-table-row-selected-background-color !important;
+  }
+}

package/lib/virtual-list/src/core.d.ts

@@ -110,16 +110,25 @@ export declare class Virtualizer<TScrollElement extends Element | Window, TItemE
     private getFurthestMeasurement;
     private getMeasurementOptions;
     private getMeasurements;
-    calculateRange: () => {
-        startIndex: number;
-        endIndex: number;
-    } | null;
-    getVirtualIndexes: () => number[];
+    calculateRange: {
+        (): {
+            startIndex: number;
+            endIndex: number;
+        } | null;
+        updateDeps(newDeps: [VirtualItem[], number, number]): void;
+    };
+    getVirtualIndexes: {
+        (): number[];
+        updateDeps(newDeps: [(range: Range) => number[], number, number, number | null, number | null]): void;
+    };
     indexFromElement: (node: TItemElement) => number;
     private _measureElement;
     resizeItem: (index: number, size: number) => void;
     measureElement: (node: TItemElement | null | undefined) => void;
-    getVirtualItems: () => VirtualItem[];
+    getVirtualItems: {
+        (): VirtualItem[];
+        updateDeps(newDeps: [number[], VirtualItem[]]): void;
+    };
     getVirtualItemForOffset: (offset: number) => VirtualItem | undefined;
     getOffsetForAlignment: (toOffset: number, align: ScrollAlignment) => number;
     getOffsetForIndex: (index: number, align?: ScrollAlignment) => readonly [number, "auto"] | readonly [number, "center"] | readonly [number, "end"] | readonly [number, "start"] | undefined;

package/lib/virtual-list/src/utils.d.ts

@@ -7,7 +7,10 @@ export declare function memo<TDeps extends ReadonlyArray<any>, TResult>(getDeps:
     debug?: () => boolean;
     onChange?: (result: TResult) => void;
     initialDeps?: TDeps;
-}): () => TResult;
+}): {
+    (): TResult;
+    updateDeps(newDeps: [...TDeps]): void;
+};
 export declare function notUndefined<T>(value: T | undefined, msg?: string): T;
 export declare const approxEqual: (a: number, b: number) => boolean;
 export declare const debounce: (targetWindow: Window & typeof globalThis, fn: AnyFunction<any>, ms: number) => (this: any, ...args: Array<any>) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-design-react",
-  "version": "1.11.20",
+  "version": "1.11.22",
   "description": "A Component Library for React",
   "keywords": [
     "React",
@@ -122,8 +122,8 @@
     "lint-staged": "^10.5.4",
     "mockjs": "^1.1.0",
     "prettier": "^2.8.8",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.79.1",
     "style-loader": "^3.3.4",