@pointcloud/pcloud-components 0.1.5 → 0.1.6

package/CHANGELOG.md

@@ -0,0 +1,10 @@
+## [0.1.6](https://192.168.101.96:8092/pointcloud_frontend/basiclibrary/pcloud-components/compare/v0.1.5...v0.1.6) (2023-08-16)
+
+### 📚 文档变更
+
+- 更新组件文档 ([35e18a8](https://192.168.101.96:8092/pointcloud_frontend/basiclibrary/pcloud-components/commit/35e18a8e75fe331e2609ab25b964805b36aeef5c))
+
+### 🐛 修复 bug
+
+- 临时修复 bug ([f250f36](https://192.168.101.96:8092/pointcloud_frontend/basiclibrary/pcloud-components/commit/f250f362886b2e18ffa3fd0f012ef9a3d66ca4c6))
+- 修复 DForm 组件 bug ([cc68b1b](https://192.168.101.96:8092/pointcloud_frontend/basiclibrary/pcloud-components/commit/cc68b1b0fc6ec45f18a0d5cc96a892c62ecaafba))

package/README.md

@@ -253,19 +253,19 @@ npm run doctor		// 执行依赖检查
 
 本项目使用 husky 方案来规范 代码的提交,提交代码时请尽量遵循以下约定
 
-| 提交类型 | 类型说明                                                                         |
-| -------- | -------------------------------------------------------------------------------- |
-| feat     | 新增功能                                                                         |
-| fix      | bug 修复                                                                         |
-| docs     | 文档更新                                                                         |
-| style    | 不影响程序逻辑的代码修改(修改空白字符，补全缺失的分号等)                         |
-| refactor | 重构代码(既没有新增功能，也没有修复 bug)                                         |
-| perf     | 性能优化                                                                         |
-| test     | 新增测试用例或是更新现有测试                                                     |
-| build    | 主要目的是修改项目构建系统(例如 glup，webpack，rollup 的配置等)的提交            |
-| ci       | 主要目的是修改项目继续集成流程(例如 Travis，Jenkins，GitLab CI，Circle 等)的提交 |
-| chore    | 不属于以上类型的其他类型(日常事务)                                               |
-| revert   | 回滚某个更早之前的提交                                                           |
+| 提交类型 | 类型说明                                                                     |
+| -------- | ---------------------------------------------------------------------------- |
+| feat     | 新增功能                                                                     |
+| fix      | bug 修复                                                                     |
+| docs     | 文档更新                                                                     |
+| style    | 不影响程序逻辑的代码修改(修改空白字符，补全缺失的分号等)                     |
+| refactor | 重构代码(既没有新增功能，也没有修复 bug)                                     |
+| perf     | 性能优化                                                                     |
+| test     | 新增测试用例或是更新现有测试                                                 |
+| build    | 主要目的是修改项目构建系统(例如 glup，webpack，rollup 的配置等)的提交        |
+| ci       | 主要目的是修改项目集成流程(例如 Travis，Jenkins，GitLab CI，Circle 等)的提交 |
+| chore    | 不属于以上类型的其他类型(日常事务)                                           |
+| revert   | 回滚某个更早之前的提交                                                       |
 
 ```
 git commit -m <type>[optional scope]: <description>	// 提交格式
@@ -303,23 +303,10 @@ git commit -m "fix: 修复bug"	// type后的冒号和空格不可省略，descri
 
    - 检查 `package.json` 中的 NPM 包名及 `publishConfig` 是否符合预期
 
-2. 更新版本号
+2. release 发布
 
-   使用 `npm version` 命令更新版本号，该命令将会自动生成 git tag 及 git commit，并将版本号更新到 package.json 中，例如：
+   使用 release-it 可以根据 [release-it 配置](https://github.com/release-it/release-it/blob/main/config/release-it.json) 自动完成发布前的准备工作，包括：更新版本号、生成 tag 、更新 changelog、git 提交及推送远程仓库、npm 发布等
 
    ```
-   // 升级修订号
-   npm version patch -m "build: 发布%s版本"	// 0.0.1->0.0.2
-
-   // 升级次版本号
-   npm version minor -m "build: 发布%s版本"	// 0.0.1->0.1.0
-
-   // 升级主版本号
-   npm version minor -m "build: 发布%s版本"	// 0.0.1->1.0.0
-   ```
-
-3. 发布
-
-   ```
-   npm publish
+   npm run release
    ```

package/dist/esm/DCascader/index.js

@@ -3,12 +3,12 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["className", "popupClassName", "fieldNames", "options", "onChange", "loadData", "onLoadData", "loading"];
-/*
- * @Author       : wangfeihu
- * @Date         : 2023-05-18 13:35:38
- * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-07-12 09:44:01
- * @Description  : 基于antd的Cascader组件
+/*
+ * @Author       : wangfeihu
+ * @Date         : 2023-05-18 13:35:38
+ * @LastEditors  : wangfeihu
+ * @LastEditTime : 2023-07-12 09:44:01
+ * @Description  : 基于antd的Cascader组件
  */
 import React, { useRef, forwardRef, useState, useEffect, useMemo, useContext } from 'react';
 import { Cascader } from 'antd';

package/dist/esm/DCascader/index.less

@@ -1,24 +1,24 @@
-@import '../commonStyle/index.less';
-
-.@{prefix}-cascader-dropdown .ant-cascader-menu {
-  &::-webkit-scrollbar {
-    width: 8px;
-    height: 8px;
-  }
-
-  // 轨道拖动部分的背景颜色
-  &::-webkit-scrollbar-thumb {
-    background-color: rgba(0, 0, 0, 50%);
-    border-radius: 8px;
-  }
-
-  // 轨道背景颜色
-  &::-webkit-scrollbar-track {
-    border-radius: 2px;
-  }
-
-  // x、y两条轨道的交叉处
-  &::-webkit-scrollbar-corner {
-    background-color: #f1f1f1;
-  }
-}
+@import '../commonStyle/index.less';
+
+.@{prefix}-cascader-dropdown .ant-cascader-menu {
+  &::-webkit-scrollbar {
+    width: 8px;
+    height: 8px;
+  }
+
+  // 轨道拖动部分的背景颜色
+  &::-webkit-scrollbar-thumb {
+    background-color: rgba(0, 0, 0, 50%);
+    border-radius: 8px;
+  }
+
+  // 轨道背景颜色
+  &::-webkit-scrollbar-track {
+    border-radius: 2px;
+  }
+
+  // x、y两条轨道的交叉处
+  &::-webkit-scrollbar-corner {
+    background-color: #f1f1f1;
+  }
+}

package/dist/esm/DForm/DItem/index.js

@@ -18,12 +18,15 @@ function DItem(props) {
     label: label,
     name: name
   }, formItemProps);
-  if (renderType === 'custom' || renderType === 'other') {
+  if (renderType === 'custom') {
     return render ? /*#__PURE__*/_jsx(_Fragment, {
       children: render(otherProps, _formItemProps, props)
     }) : /*#__PURE__*/_jsx(_Fragment, {
       children: children
     });
+  } else if (renderType === 'other') {
+    var _children = render ? render(otherProps, _formItemProps, props) : children;
+    return itemsRender.other(_formItemProps, _children);
   } else if (renderType) {
     return itemsRender[renderType](otherProps, _formItemProps, label, render, children);
   } else {

package/dist/esm/DForm/DItem/itemsRender.d.ts

@@ -1,11 +1,11 @@
+import { AutoCompleteProps, ButtonProps, CascaderProps, CheckboxProps, DatePickerProps, DividerProps, FormItemProps, InputNumberProps, InputProps, MentionProps, RadioProps, RateProps, SelectProps, SliderSingleProps, SwitchProps, TimePickerProps, TransferProps, TreeSelectProps, UploadProps } from 'antd';
 import { ReactNode } from 'react';
-import { FormItemProps, SelectProps, AutoCompleteProps, UploadProps, TransferProps, InputProps, InputNumberProps, CascaderProps, TreeSelectProps, DatePickerProps, TimePickerProps, MentionProps, RadioProps, RateProps, SliderSingleProps, SwitchProps, DividerProps, CheckboxProps, ButtonProps } from 'antd';
-import { PasswordProps, TextAreaProps } from 'antd/lib/input';
 import { RangePickerProps } from 'antd/lib/date-picker';
+import { PasswordProps, TextAreaProps } from 'antd/lib/input';
+import { DCascaderProps } from '../../DCascader';
 import { DInputProps } from '../../DInput';
 import { DSelectProps } from '../../DSelect';
 import { DTreeSelectProps } from '../../DTreeSelect';
-import { DCascaderProps } from '../../DCascader';
 import { DUploadProps } from '../../DUpload';
 import { DItemProps } from './itemType';
 declare const renderMap: {
@@ -35,5 +35,6 @@ declare const renderMap: {
     dUpload: (props: DUploadProps, formItemProps: FormItemProps, label: DItemProps['label'], render: (props: any) => ReactNode, children: DUploadProps['children']) => JSX.Element;
     button: (props: ButtonProps, formItemProps: FormItemProps, label: DItemProps['label']) => JSX.Element;
     divider: (props: DividerProps, formItemProps: FormItemProps, label: DItemProps['label']) => JSX.Element;
+    other: (formItemProps: FormItemProps, children: DUploadProps['children']) => JSX.Element;
 };
 export default renderMap;

package/dist/esm/DForm/DItem/itemsRender.js

@@ -3,15 +3,15 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
  * @Author       : wangfeihu
  * @Date         : 2023-06-12 17:35:10
  * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-07-13 17:11:55
+ * @LastEditTime : 2023-08-16 16:54:13
  * @Description  : 根据renderType渲染对应的表单项组件
  */
 
-import { Input, InputNumber, AutoComplete, Select, Cascader, TreeSelect, DatePicker, TimePicker, Mentions, Checkbox, Radio, Rate, Slider, Switch, Transfer, Upload, Form, Button, Divider } from 'antd';
+import { AutoComplete, Button, Cascader, Checkbox, DatePicker, Divider, Form, Input, InputNumber, Mentions, Radio, Rate, Select, Slider, Switch, TimePicker, Transfer, TreeSelect, Upload } from 'antd';
+import DCascader from "../../DCascader";
 import DInput from "../../DInput";
 import DSelect from "../../DSelect";
 import DTreeSelect from "../../DTreeSelect";
-import DCascader from "../../DCascader";
 import DUpload from "../../DUpload";
 import { jsx as _jsx } from "react/jsx-runtime";
 var renderMap = {
@@ -188,6 +188,11 @@ var renderMap = {
     }, props), {}, {
       children: label
     }));
+  },
+  other: function other(formItemProps, children) {
+    return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, formItemProps), {}, {
+      children: children
+    }));
   }
 };
 export default renderMap;

package/dist/esm/DForm/helper.js

@@ -1,10 +1,10 @@
 import _typeof from "@babel/runtime/helpers/esm/typeof";
-/*
- * @Author       : wangfeihu
- * @Date         : 2023-06-07 15:08:06
- * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-06-12 17:35:15
- * @Description  : 合并两个对象中的所有字段
+/*
+ * @Author       : wangfeihu
+ * @Date         : 2023-06-07 15:08:06
+ * @LastEditors  : wangfeihu
+ * @LastEditTime : 2023-06-12 17:35:15
+ * @Description  : 合并两个对象中的所有字段
  */
 
 import mergeWith from 'lodash/mergeWith';

package/dist/esm/DForm/index.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { FormProps, FormInstance } from 'antd';
+import { FormProps } from 'antd';
 import DItem, { DItemProps } from './DItem';
 import './index.less';
 declare type InternalFormProps = {
@@ -12,9 +12,13 @@ declare type InternalFormProps = {
     /** 布局方式 新增了行内垂直布局方式inlineVertical */
     layout?: 'inline' | 'horizontal' | 'vertical' | 'inlineVertical';
 };
-export declare type DFormProps = Omit<FormProps, 'children' | 'layout'> & InternalFormProps;
-declare function InternalForm(props: DFormProps, ref: React.Ref<FormInstance<any>>): JSX.Element;
+declare type DFormProps = Omit<FormProps, 'children' | 'layout'> & InternalFormProps;
+declare type DFormRefProps = {
+    setItems: (items: DItemProps[] | ((values: DItemProps[]) => DItemProps[] | Promise<DItemProps[]>)) => void;
+} | undefined;
+declare function InternalForm(props: DFormProps, ref: React.Ref<DFormRefProps>): JSX.Element;
 declare const DForm: typeof InternalForm & {
     Item: typeof DItem;
 };
+export { type DFormProps, type DFormRefProps, type DItemProps };
 export default DForm;

package/dist/esm/DForm/index.js

@@ -1,20 +1,23 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["className", "defaultItemProps", "items", "children", "layout"];
+var _excluded = ["className", "defaultItemProps", "items", "children", "layout", "autoComplete"];
 /*
  * @Author       : wangfeihu
  * @Date         : 2023-06-02 09:29:11
  * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-07-14 13:53:10
+ * @LastEditTime : 2023-08-16 16:35:27
  * @Description  : 基于antd的Form组件
  */
 
-import React, { forwardRef, useMemo, useContext } from 'react';
+import React, { forwardRef, useContext, useState, useEffect, useImperativeHandle } from 'react';
 import { Form } from 'antd';
 import { ConfigContext } from "../ConfigProvider";
 import helper from "./helper";
 import DItem from "./DItem";
 import "./index.less";
+
+// eslint-disable-next-line no-unused-vars
 import { jsx as _jsx } from "react/jsx-runtime";
 function getChildren(items, children, _defaultItemProps) {
   var list = [];
@@ -26,7 +29,12 @@ function getChildren(items, children, _defaultItemProps) {
   }
   if (children) {
     var childrenList = children instanceof Array ? children : [children];
-    list = list.concat(childrenList);
+    var _childrenList = childrenList.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        props: helper.merge(_defaultItemProps, item.props)
+      });
+    });
+    list = list.concat(_childrenList);
   }
   return list;
 }
@@ -37,18 +45,42 @@ function InternalForm(props, ref) {
     items = props.items,
     children = props.children,
     layout = props.layout,
+    _props$autoComplete = props.autoComplete,
+    autoComplete = _props$autoComplete === void 0 ? 'off' : _props$autoComplete,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useContext = useContext(ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var _className = "".concat(getPrefixCls('form'), " ").concat(className, " ").concat(layout === 'inlineVertical' ? 'inlineVertical' : '');
   var _layout = layout === 'inlineVertical' ? 'inline' : layout;
-  var itemChildren = useMemo(function () {
-    return getChildren(items, children, defaultItemProps);
+  var _useState = useState(getChildren(items, children, defaultItemProps)),
+    _useState2 = _slicedToArray(_useState, 2),
+    itemChildren = _useState2[0],
+    setItemChildren = _useState2[1];
+  useEffect(function () {
+    setItemChildren(getChildren(items, children, defaultItemProps));
+  }, [items, children, defaultItemProps]);
+  useImperativeHandle(ref, function () {
+    return {
+      setItems: function setItems(value) {
+        if (value instanceof Array) {
+          setItemChildren(getChildren(value, null, defaultItemProps));
+        } else if (typeof value === 'function') {
+          var result = value(items || []);
+          if ('then' in result) {
+            result.then(function (list) {
+              setItemChildren(getChildren(list, null, defaultItemProps));
+            });
+          } else {
+            setItemChildren(getChildren(result, null, defaultItemProps));
+          }
+        }
+      }
+    };
   }, [items, children, defaultItemProps]);
   return /*#__PURE__*/_jsx(Form, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: _className,
     layout: _layout,
-    ref: ref,
+    autoComplete: autoComplete,
     children: /*#__PURE__*/_jsx("div", {
       className: "form-wrapper",
       children: itemChildren
@@ -57,4 +89,5 @@ function InternalForm(props, ref) {
 }
 var DForm = /*#__PURE__*/forwardRef(InternalForm);
 DForm.Item = DItem;
+export {};
 export default DForm;

package/dist/esm/DForm/index.less

@@ -1,32 +1,32 @@
-@import '../commonStyle/index.less';
-
-.@{prefix}-form {
-  .form-wrapper > * {
-    min-height: 32px;
-    margin-right: 0;
-    margin-bottom: 24px;
-    padding-right: 16px;
-  }
-}
-
-.@{prefix}-form.ant-form-horizontal .ant-form-item-label {
-  min-width: 80px;
-}
-
-.@{prefix}-form.ant-form-inline .form-wrapper,
-.@{prefix}-form.ant-form-inline.inlineVertical .form-wrapper {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: flex-end;
-  height: min-content;
-}
-
-.@{prefix}-form.ant-form-inline.inlineVertical {
-  .ant-form-item-row {
-    flex-direction: column;
-
-    .ant-form-item-label {
-      text-align: left;
-    }
-  }
-}
+@import '../commonStyle/index.less';
+
+.@{prefix}-form {
+  .form-wrapper > * {
+    min-height: 32px;
+    margin-right: 0;
+    margin-bottom: 24px;
+    padding-right: 16px;
+  }
+}
+
+.@{prefix}-form.ant-form-horizontal .ant-form-item-label {
+  min-width: 80px;
+}
+
+.@{prefix}-form.ant-form-inline .form-wrapper,
+.@{prefix}-form.ant-form-inline.inlineVertical .form-wrapper {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-end;
+  height: min-content;
+}
+
+.@{prefix}-form.ant-form-inline.inlineVertical {
+  .ant-form-item-row {
+    flex-direction: column;
+
+    .ant-form-item-label {
+      text-align: left;
+    }
+  }
+}

package/dist/esm/DInput/index.js

@@ -6,10 +6,10 @@ var _excluded = ["className", "onChange", "onCompositionStart", "onCompositionEn
  * @Author       : wangfeihu
  * @Date         : 2023-05-16 10:08:26
  * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-07-11 17:14:59
+ * @LastEditTime : 2023-08-16 16:48:52
  * @Description  : 基于antd的Input组件
  */
-import React, { useRef, forwardRef, useState, useContext } from 'react';
+import React, { useRef, forwardRef, useState, useEffect, useContext } from 'react';
 import { Input } from 'antd';
 import { ConfigContext } from "../ConfigProvider";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -72,6 +72,9 @@ function InternalInput(props, ref) {
       emitChange(e.target.value, e);
     }
   };
+  useEffect(function () {
+    return setValue(initValue);
+  }, [initValue]);
   return /*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: _className,
     ref: ref,

package/dist/esm/DSelect/index.js

@@ -2,12 +2,12 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["className", "popupClassName", "fieldNames", "searchValue", "filterOption", "options", "onSearch", "loading", "debounce"];
-/*
- * @Author       : wangfeihu
- * @Date         : 2023-05-17 08:41:25
- * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-07-11 15:44:04
- * @Description  : 基于antd的Select组件
+/*
+ * @Author       : wangfeihu
+ * @Date         : 2023-05-17 08:41:25
+ * @LastEditors  : wangfeihu
+ * @LastEditTime : 2023-07-11 15:44:04
+ * @Description  : 基于antd的Select组件
  */
 import React, { forwardRef, useEffect, useRef, useState, useMemo, useContext } from 'react';
 import { Select } from 'antd';

package/dist/esm/DTable/index.d.ts

@@ -2,6 +2,9 @@ import React from 'react';
 import { TableProps } from 'antd';
 import { ColumnType } from 'antd/lib/table';
 import './index.less';
+export declare type DColumnType = ColumnType<any> & {
+    cellEllipsis?: boolean;
+};
 export declare type DTableSourceProps = {
     records: TableProps<any>['dataSource'];
     total: number;
@@ -12,28 +15,32 @@ export declare type TableParamsProps = {
     size?: number;
     [key: string]: any;
 };
-export declare type DTableProps = TableProps<any> & {
+export declare type DTableProps = Omit<TableProps<any>, 'columns'> & {
     /** 表格列的基础默认配置,默认所有列居中，表头文字超出显示省略号，详见 antd columns */
-    columnsProp?: ColumnType<any>;
+    defaultColumnProps?: DColumnType;
     /** 操作列配置,可以是一个普通列配置对象，也可以是一个columns的 render 函数 */
-    actionColumn?: ColumnType<any> | ColumnType<any>['render'];
+    actionColumn?: DColumnType | DColumnType['render'];
     /** 表格数据的加载函数,在表格创建、分页变化、额外参数变化时自动运行，如果设置该属性，则 dataSource 失效 */
-    loadMore?: (params?: TableParamsProps) => Promise<DTableSourceProps>;
+    loadMore?: (params?: TableParamsProps, records?: DTableSourceProps['records']) => Promise<DTableSourceProps>;
     /** 加载数据失败时是否显示错误信息（仅loadMore可用时生效） */
     showErrorMsg?: boolean | ((err: any) => string);
     /** 额外的请求参数,（仅loadMore可用时生效） */
     extraParams?: TableParamsProps;
+    /** 表格列配置 */
+    columns?: DColumnType[];
 };
-declare const DTable: React.ForwardRefExoticComponent<TableProps<any> & {
+declare const DTable: React.ForwardRefExoticComponent<Omit<TableProps<any>, "columns"> & {
     /** 表格列的基础默认配置,默认所有列居中，表头文字超出显示省略号，详见 antd columns */
-    columnsProp?: ColumnType<any> | undefined;
+    defaultColumnProps?: DColumnType | undefined;
     /** 操作列配置,可以是一个普通列配置对象，也可以是一个columns的 render 函数 */
-    actionColumn?: ColumnType<any> | ColumnType<any>['render'];
+    actionColumn?: DColumnType | DColumnType['render'];
     /** 表格数据的加载函数,在表格创建、分页变化、额外参数变化时自动运行，如果设置该属性，则 dataSource 失效 */
-    loadMore?: ((params?: TableParamsProps) => Promise<DTableSourceProps>) | undefined;
+    loadMore?: ((params?: TableParamsProps, records?: DTableSourceProps['records']) => Promise<DTableSourceProps>) | undefined;
     /** 加载数据失败时是否显示错误信息（仅loadMore可用时生效） */
     showErrorMsg?: boolean | ((err: any) => string) | undefined;
     /** 额外的请求参数,（仅loadMore可用时生效） */
     extraParams?: TableParamsProps | undefined;
+    /** 表格列配置 */
+    columns?: DColumnType[] | undefined;
 } & React.RefAttributes<HTMLDivElement>>;
 export default DTable;

package/dist/esm/DTable/index.js

@@ -1,12 +1,12 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["loadMore", "columnsProp", "actionColumn", "showErrorMsg", "extraParams", "dataSource", "rowKey", "scroll", "className", "pagination", "columns", "loading"];
+var _excluded = ["loadMore", "defaultColumnProps", "actionColumn", "showErrorMsg", "extraParams", "dataSource", "rowKey", "scroll", "className", "pagination", "columns", "loading"];
 /*
  * @Author       : wangfeihu
  * @Date         : 2023-05-09 15:04:48
  * @LastEditors  : wangfeihu
- * @LastEditTime : 2023-07-11 17:22:24
+ * @LastEditTime : 2023-08-16 16:45:15
  * @Description  : 基于antd的Table组件
  */
 import React, { forwardRef, useEffect, useRef, useState, useContext } from 'react';
@@ -31,20 +31,33 @@ var defaultPagination = {
   }
 };
 
+// 数据列
+function getColumns(columns, defaultColumnProps) {
+  return columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
+    var _item = _objectSpread(_objectSpread({
+      align: 'center',
+      ellipsis: {
+        showTitle: false
+      },
+      cellEllipsis: true
+    }, defaultColumnProps), item);
+    if (_item.cellEllipsis === false) {
+      _item.className = _item !== null && _item !== void 0 && _item.className ? 'd-table-cell-wrap ' + _item.className : 'd-table-cell-wrap';
+    }
+    return _item;
+  });
+}
+
 // 操作列
-function getActionColumnProps(props, columnsProp) {
+function getActionColumnProps(props, defaultColumnProps) {
   var defaultProps = {
     width: 140,
     title: '操作',
     dataIndex: 'action'
   };
-  if (typeof props === 'function') {
-    return _objectSpread(_objectSpread(_objectSpread({}, columnsProp), defaultProps), {}, {
-      render: props
-    });
-  } else {
-    return _objectSpread(_objectSpread(_objectSpread({}, columnsProp), defaultProps), props);
-  }
+  return typeof props === 'function' ? _objectSpread(_objectSpread(_objectSpread({}, defaultColumnProps), defaultProps), {}, {
+    render: props
+  }) : _objectSpread(_objectSpread(_objectSpread({}, defaultColumnProps), defaultProps), props);
 }
 
 // 分页配置
@@ -61,7 +74,7 @@ function getTablePage(_pagination) {
 }
 function InternalTable(props, ref) {
   var loadMore = props.loadMore,
-    columnsProp = props.columnsProp,
+    defaultColumnProps = props.defaultColumnProps,
     actionColumn = props.actionColumn,
     _props$showErrorMsg = props.showErrorMsg,
     showErrorMsg = _props$showErrorMsg === void 0 ? true : _props$showErrorMsg,
@@ -100,17 +113,13 @@ function InternalTable(props, ref) {
     y: 'calc(100% - 56px)'
   };
 
-  // 修改列对齐方式为居中
-  var _columns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
-    return _objectSpread(_objectSpread({
-      align: 'center',
-      ellipsis: true
-    }, columnsProp), item);
-  });
+  // 合并列属性
+  var _columns = getColumns(columns, defaultColumnProps);
 
   // 加入操作列
-  var _actionColumn = actionColumn ? getActionColumnProps(actionColumn, columnsProp) : undefined;
-  _actionColumn && ((_columns === null || _columns === void 0 ? void 0 : _columns.push(_actionColumn)) || []);
+  // 加入操作列
+  var _actionColumn = actionColumn ? getActionColumnProps(actionColumn, defaultColumnProps) : undefined;
+  if (_actionColumn && _columns instanceof Array) _columns.push(_actionColumn);
 
   // pcf-table 样式中已经包含对_scroll的支持
   var _className = "".concat(getPrefixCls('table'), " ").concat(className || '', " ").concat(_pagination ? 'height-on-page' : '');
@@ -134,15 +143,15 @@ function InternalTable(props, ref) {
       var paramsString = JSON.stringify(_tableQuery);
       loadingParamsRef.current = paramsString;
       setTableParams(_tableQuery);
-      loadMore(_tableQuery).then(function (response) {
+      loadMore(_tableQuery, tableSource.records).then(function (response) {
         if (loadingParamsRef.current === paramsString) {
           var _response$total = response.total,
             total = _response$total === void 0 ? 0 : _response$total,
             _response$records = response.records,
-            records = _response$records === void 0 ? [] : _response$records;
+            _records = _response$records === void 0 ? [] : _response$records;
           setTableSource({
             total: total,
-            records: records,
+            records: _records,
             loading: false
           });
         }
@@ -184,6 +193,12 @@ function InternalTable(props, ref) {
       }));
     }
   };
+  var _tablePagination = _pagination ? _objectSpread(_objectSpread({}, _pagination), {}, {
+    total: tableSource.total,
+    current: tableParams.current,
+    pageSize: tableParams.size,
+    onChange: onChange
+  }) : _pagination;
 
   // 数据初始加载
   useEffect(function () {
@@ -195,12 +210,7 @@ function InternalTable(props, ref) {
     className: _className,
     columns: _columns,
     dataSource: tableSource.records,
-    pagination: _objectSpread(_objectSpread({}, _pagination), {}, {
-      total: tableSource.total,
-      current: tableParams.current,
-      pageSize: tableParams.size,
-      onChange: onChange
-    }),
+    pagination: _tablePagination,
     scroll: _scroll,
     loading: _objectSpread(_objectSpread({}, _loading), {}, {
       spinning: tableSource.loading