@jiaozhiye/qm-design-react 1.7.15 → 1.7.17

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

@@ -41,6 +41,7 @@ import type { ITableProps } from './types';
  *     width: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
  *     onlySelect: PropTypes.bool,
  *     autoQueryAssign: PropTypes.bool,
+ *     combinedDataIndex: PropTypes.string,
  *     fieldAliasMap: PropTypes.func,
  *     filterAliasMap: PropTypes.func,
  *     beforeOpen: PropTypes.func,
@@ -263,6 +264,7 @@ export declare const propTypes: {
     onRowContextmenu: PropTypes.Requireable<(...args: any[]) => any>;
     onRowEnter: PropTypes.Requireable<(...args: any[]) => any>;
     onScrollEnd: PropTypes.Requireable<(...args: any[]) => any>;
+    onFetchError: PropTypes.Requireable<(...args: any[]) => any>;
     onMergeChange: PropTypes.Requireable<(...args: any[]) => any>;
 };
 export declare const defaultProps: ITableProps;
@@ -276,6 +278,7 @@ export declare const defaultProps: ITableProps;
  * onRowContextmenu: 行右键单击事件，row, column, event
  * onRowEnter: 行选中(单选) 或 行高亮 回车时触发，参数 row, event
  * onScrollEnd: 滚动条滚动至底部时触发，参数 event
+ * onFetchError: 后端分页时，查询接口错误时触发，参数 error
  */
 /**
  * 方法：

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

@@ -140,6 +140,7 @@ export type IEditerReturn = {
         onlySelect?: boolean;
         autoQueryAssign?: boolean;
         closeRemoteMatch?: boolean;
+        combinedDataIndex?: string;
         fieldAliasMap?: (() => Record<string, string>) | Record<string, string>;
         filterAliasMap?: (() => string[]) | string[];
         beforeOpen?: (value: Record<string, string | number>, row: IRecord, column: IColumn) => void | Promise<void> | boolean;
@@ -162,7 +163,7 @@ export type IFetch = {
     afterFetch?: (records: IRecord[]) => IRecord[];
     stopToFirst?: boolean;
     dataKey?: string;
-    callback?: (resData: any) => void;
+    callback?: (resData: AjaxResponse['data'], response?: AjaxResponse) => void;
 };
 export type IRowSelection = {
     type: ISelectionType;
@@ -393,6 +394,7 @@ export type ITableProps = {
     onRowContextmenu?: (row: IRecord, column: IColumn, event: React.MouseEvent<HTMLTableCellElement>) => void;
     onRowEnter?: (row: IRecord, event: KeyboardEvent) => void;
     onScrollEnd?: (event: React.MouseEvent<HTMLDivElement>) => void;
+    onFetchError?: (error: any) => void;
     onMergeChange?: (cells: IMergeCell[]) => void;
 };
 export type TableRef = {

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

@@ -24,7 +24,8 @@ export declare const difference: <T extends AnyObject<any>>(obj: T, base: T) =>
 export declare const isArrayContain: (targetArr: unknown[], arr: unknown[]) => boolean;
 export declare const getCellValue: (record: IRecord, dataIndex: string) => any;
 export declare const setCellValue: (record: IRecord, dataIndex: string, val: unknown, precision?: number) => void;
-export declare const getSplitValue: (record: IRecord, key: string) => any;
+export declare const getSplitValue: (record: IRecord, key: string) => string;
+export declare const setSplitValue: (record: IRecord, key: string, val: string, precision?: number) => void;
 export declare const formatNumber: (value: number | string) => string;
 export declare const validateNumber: (val: string) => boolean;
 export declare const stringToNumber: (input: string) => number | '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jiaozhiye/qm-design-react",
-  "version": "1.7.15",
+  "version": "1.7.17",
   "description": "A Component Library for React",
   "keywords": [
     "React",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "add-dom-event-listener": "^1.1.0",
-    "antd": "4.24.10",
+    "antd": "4.24.12",
     "axios": "^0.27.2",
     "big.js": "^6.2.1",
     "china-area-data": "^5.0.1",
@@ -125,7 +125,7 @@
     "style-loader": "^3.3.2",
     "ts-loader": "^9.4.2",
     "typescript": "^4.9.5",
-    "webpack": "^5.86.0",
+    "webpack": "^5.88.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.0",
     "webpack-node-externals": "^3.0.0"