zmdms-webui 0.0.44 → 0.0.45

package/dist/es/button/button.js

@@ -4,6 +4,7 @@ import { Button as Button$1 } from 'antd';
 import classNames from '../node_modules/classnames/index.js';
 import ButtonDownload from './buttonDownload.js';
 import ButtonExport from './buttonExport.js';
+import ButtonPreview from './buttonPreview.js';
 
 var Button = function (props) {
     var _a;
@@ -52,6 +53,7 @@ var ButtonCom = Button;
 ButtonCom.displayName = "ZTXK_WEBUI_Button";
 ButtonCom.Group = Button$1.Group;
 ButtonCom.Download = ButtonDownload;
-ButtonCom.Export = ButtonExport;
+ButtonCom.Export = ButtonExport;
+ButtonCom.Preview = ButtonPreview;
 
 export { ButtonCom as default };

package/dist/es/button/buttonDownload.d.ts

@@ -3,13 +3,15 @@ import { IButtonProps } from './interface.js';
 
 interface IButtonDownloadProps extends Omit<IButtonProps, "onClick"> {
     /** 附件id */
-    fileId: string;
+    attachId: string;
     /** 附件名 */
-    fileName: string;
+    attachName: string;
+    /** 附件大小 */
+    attachSize?: number;
     /** 是否通过公共链接下载 */
     isPublic?: boolean;
     /** 服务器地址 */
-    API_BASEURL: string;
+    API_BASEURL?: string;
     /** 代理点击事件 如果下载结束后 还需做别的处理 */
     onClick?: (e: any, info: any) => void;
 }

package/dist/es/button/buttonDownload.js

@@ -3,16 +3,20 @@ import { jsx } from 'react/jsx-runtime';
 import { useState } from 'react';
 import ButtonCom from './button.js';
 import { downloadFile } from 'zmdms-utils';
+import '../config/ZtxkContext.js';
+import useBaseContext from '../config/useBaseContext.js';
+import { message } from 'antd';
 
 var ButtonDownload = function (props) {
-    var fileId = props.fileId, fileName = props.fileName, isPublic = props.isPublic, API_BASEURL = props.API_BASEURL, onClick = props.onClick, resetProps = __rest(props, ["fileId", "fileName", "isPublic", "API_BASEURL", "onClick"]);
+    var attachId = props.attachId, attachName = props.attachName, isPublic = props.isPublic, API_BASEURL = props.API_BASEURL, onClick = props.onClick, resetProps = __rest(props, ["attachId", "attachName", "isPublic", "API_BASEURL", "onClick"]);
     var _a = useState(false), loading = _a[0], setLoading = _a[1];
+    var apiBaseUrl = useBaseContext().apiBaseUrl;
     var onClickHandle = function (e) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
-            if (fileId) {
+            if (attachId) {
                 setLoading(true);
-                return [2 /*return*/, downloadFile(fileId, fileName || "", {
-                        API_BASEURL: API_BASEURL,
+                return [2 /*return*/, downloadFile(attachId, attachName || "", {
+                        API_BASEURL: API_BASEURL || apiBaseUrl,
                         open: isPublic,
                     })
                         .then(function (res) {
@@ -21,6 +25,20 @@ var ButtonDownload = function (props) {
                     })
                         .catch(function (err) {
                         onClick && onClick(e, { result: false });
+                        try {
+                            err
+                                .text()
+                                .then(function (e) {
+                                var result = JSON.parse("{");
+                                message.error(result.msg || "下载失败!");
+                            })
+                                .catch(function (err2) {
+                                message.error("下载失败!");
+                            });
+                        }
+                        catch (err1) {
+                            message.error("下载失败!");
+                        }
                         setLoading(false);
                     })];
             }

package/dist/es/button/buttonExport.js

@@ -41,7 +41,7 @@ var ButtonExport = function (props) {
             }
         });
     }); };
-    return (jsx(ButtonCom, __assign({ type: "primary", loading: loading, onClick: onClickHandle }, resetProps)));
+    return (jsx(ButtonCom, __assign({ type: "default", loading: loading, onClick: onClickHandle }, resetProps)));
 };
 ButtonExport.displayName = "ZTXK_WEBUI_ButtonExport";
 

package/dist/es/button/buttonPreview.d.ts

@@ -0,0 +1,26 @@
+import React__default from 'react';
+import { IButtonProps } from './interface.js';
+
+interface IButtonPreviewProps extends Omit<IButtonProps, "onClick"> {
+    /** 附件id */
+    attachId: string;
+    /** 附件名 */
+    attachName: string;
+    /** 附件大小 */
+    attachSize?: number;
+    /** 附件列表 */
+    attachList?: {
+        attachId: string;
+        attachName: string;
+        [props: string]: string;
+    }[];
+    /** 是否通过公共链接下载 */
+    isPublic?: boolean;
+    /** 文件服务器地址 */
+    FILE_BASEURL?: string;
+    /** 代理点击事件 如果下载结束后 还需做别的处理 */
+    onClick?: (e: any, info: any) => void;
+}
+declare const ButtonPreview: React__default.FC<IButtonPreviewProps>;
+
+export { IButtonPreviewProps, ButtonPreview as default };

package/dist/es/button/buttonPreview.js

@@ -0,0 +1,34 @@
+import { __rest, __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
+import { jsx } from 'react/jsx-runtime';
+import ButtonCom from './button.js';
+import { formatUnit, previewFile } from 'zmdms-utils';
+import 'react';
+import '../config/ZtxkContext.js';
+import useBaseContext from '../config/useBaseContext.js';
+import { MAX_PREVIEW_SIZE } from '../config/constant.js';
+import { message } from 'antd';
+
+var ButtonPreview = function (props) {
+    var attachId = props.attachId, attachName = props.attachName, attachSize = props.attachSize, attachList = props.attachList; props.isPublic; var FILE_BASEURL = props.FILE_BASEURL; props.onClick; var resetProps = __rest(props, ["attachId", "attachName", "attachSize", "attachList", "isPublic", "FILE_BASEURL", "onClick"]);
+    var fileBaseUrl = useBaseContext().fileBaseUrl;
+    var onClickHandle = function (e) { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            if (attachId) {
+                if (attachSize && attachSize > MAX_PREVIEW_SIZE) {
+                    message.info("\u6587\u4EF6\u5927\u4E8E".concat(formatUnit(MAX_PREVIEW_SIZE), ",\u6682\u4E0D\u652F\u6301\u5728\u7EBF\u9884\u89C8\uFF0C\u8BF7\u5148\u4E0B\u8F7D\u540E\u67E5\u770B"));
+                }
+                else {
+                    previewFile(attachId, attachName, {
+                        API_BASEURL: FILE_BASEURL || fileBaseUrl,
+                        fileList: attachList,
+                    });
+                }
+            }
+            return [2 /*return*/];
+        });
+    }); };
+    return jsx(ButtonCom, __assign({ type: "link", onClick: onClickHandle }, resetProps));
+};
+ButtonPreview.displayName = "ZTXK_WEBUI_ButtonPreview";
+
+export { ButtonPreview as default };

package/dist/es/button/interface.d.ts

@@ -2,6 +2,7 @@ import { Button } from 'antd';
 import { ButtonProps } from 'antd/es/button';
 import ButtonDownload from './buttonDownload.js';
 import ButtonExport from './buttonExport.js';
+import ButtonPreview from './buttonPreview.js';
 
 interface IButtonProps extends ButtonProps {
 }
@@ -12,6 +13,8 @@ interface ButtonComponent extends React.FC<IButtonProps> {
     Download: typeof ButtonDownload;
     /** 导出按钮 */
     Export: typeof ButtonExport;
+    /** 预览按钮 */
+    Preview: typeof ButtonPreview;
 }
 
 export { ButtonComponent, IButtonProps };

package/dist/es/config/ZtxkContext.d.ts

@@ -5,7 +5,9 @@ import React__default from 'react';
  */
 interface IZtxkConfig {
     locale: "zh-cn" | "en";
+    apiBaseUrl: string;
+    fileBaseUrl: string;
 }
 declare const ZtxkContext: React__default.Context<IZtxkConfig>;
 
-export { ZtxkContext as default };
+export { IZtxkConfig, ZtxkContext as default };

package/dist/es/config/ZtxkContext.js

@@ -2,6 +2,8 @@ import React__default from 'react';
 
 var ztxkConfig = {
     locale: "zh-cn",
+    apiBaseUrl: "",
+    fileBaseUrl: "",
 };
 var ZtxkContext = React__default.createContext(ztxkConfig);
 

package/dist/es/config/constant.js

@@ -0,0 +1,4 @@
+// 附件预览最大文件大小
+var MAX_PREVIEW_SIZE = 20971520;
+
+export { MAX_PREVIEW_SIZE };

package/dist/es/config/index.js

@@ -1,3 +1,4 @@
 export { default as useLocale } from './useLocale.js';
+export { default as useBaseContext } from './useBaseContext.js';
 export { default as ZtxkContext } from './ZtxkContext.js';
 export { default as isEqual } from './isEqual.js';

package/dist/es/config/useBaseContext.js

@@ -0,0 +1,13 @@
+import { useContext } from 'react';
+import ZtxkContext from './ZtxkContext.js';
+
+/**
+ * 获取语言配置 目前支持中文、英文
+ * @returns 返回当前语言配置
+ */
+function useBaseContext() {
+    var ztxkConfig = useContext(ZtxkContext);
+    return ztxkConfig;
+}
+
+export { useBaseContext as default };

package/dist/es/form/detaultDom.js

@@ -3,8 +3,8 @@ import { jsx } from 'react/jsx-runtime';
 import { memo } from 'react';
 
 var DefaultDom = function (_a) {
-    var children = _a.children, value = _a.value;
-    return (jsx("div", __assign({ className: "ztxk-form--detault-dom" }, { children: children ? children : value ? value : "— —" })));
+    var children = _a.children, value = _a.value, style = _a.style;
+    return (jsx("div", __assign({ className: "ztxk-form--detault-dom", style: style }, { children: children ? children : value ? value : "— —" })));
 };
 var DefaultDom$1 = memo(DefaultDom);
 

package/dist/es/form/form.js

@@ -18,7 +18,7 @@ var FORM_DYNAMIC_KEY = "ztxk-webui-dynamic-form";
 // 用户配置优先，先从远端获取到 表单配置信息。
 // 给子元素设置好了表单配置信息后 接下来的内容 交给动态列配置接管
 var Form = function (props) {
-    var form = props.form, bottomBorder = props.bottomBorder, _a = props.isFlex, isFlex = _a === void 0 ? true : _a, wrapClassName = props.wrapClassName, leftClassName = props.leftClassName; props.itemClassName; var rightWrapVisible = props.rightWrapVisible, rightClassName = props.rightClassName, children = props.children, dynamicKey = props.dynamicKey, formPreferences = props.formPreferences, items = props.items, outsideState = props.outsideState, onValuesChange = props.onValuesChange, onResetHandle = props.onResetHandle, onSearchHandle = props.onSearchHandle, type = props.type, restProps = __rest(props, ["form", "bottomBorder", "isFlex", "wrapClassName", "leftClassName", "itemClassName", "rightWrapVisible", "rightClassName", "children", "dynamicKey", "formPreferences", "items", "outsideState", "onValuesChange", "onResetHandle", "onSearchHandle", "type"]);
+    var form = props.form, bottomBorder = props.bottomBorder, _a = props.isFlex, isFlex = _a === void 0 ? true : _a, wrapClassName = props.wrapClassName, leftClassName = props.leftClassName; props.itemClassName; var rightWrapVisible = props.rightWrapVisible, rightClassName = props.rightClassName, children = props.children, dynamicKey = props.dynamicKey, formPreferences = props.formPreferences, items = props.items, outsideState = props.outsideState, onValuesChange = props.onValuesChange, onResetHandle = props.onResetHandle, onSearchHandle = props.onSearchHandle, type = props.type, directionColumn = props.directionColumn, restProps = __rest(props, ["form", "bottomBorder", "isFlex", "wrapClassName", "leftClassName", "itemClassName", "rightWrapVisible", "rightClassName", "children", "dynamicKey", "formPreferences", "items", "outsideState", "onValuesChange", "onResetHandle", "onSearchHandle", "type", "directionColumn"]);
     // 获取新的items
     var configInfoItems = useFormPreferencesCreateNewItems(formPreferences, items).configInfoItems;
     // 根据items 和 dynamicKey 获取到动态列配置信息
@@ -31,6 +31,7 @@ var Form = function (props) {
     // 左容器类名
     var leftClasses = classNames("ztxk-form__left", leftClassName, {
         "ztxk-form__left--flex": isFlex,
+        "ztxk-form__left--flex-direction": directionColumn,
     });
     // 右容器类名
     var rightClasses = classNames("ztxk-form__right", rightClassName);

package/dist/es/form/interface.d.ts

@@ -71,6 +71,8 @@ interface IProFormProps extends FormProps {
      * 表单内部需要的外部参数
      */
     outsideState?: any;
+    /** 表单布局 默认是横向 设置为true后 为纵向布局 */
+    directionColumn?: boolean;
 }
 
 export { IFormItemProps, IFormPreferences, IProFormProps };

package/dist/es/formitem/formItem.d.ts

@@ -76,10 +76,21 @@ interface IFormItem extends FormItemProps {
      */
     shouldUpdateBeOutsideState?: (prevOutsideState: any, nextOutsideState: any) => boolean;
     /**
+     * @deprecated 此属性已经废弃，可以删除掉这个属性
      * item 类型
      * 当需要一些表单除外的样式时 使用
      */
     nonForm?: boolean;
+    /**
+     * 是否自定义表单项
+     */
+    isCustomItem?: boolean;
+    /**
+     * 自定义表单项样式
+     * default 默认样式
+     * fill 表示输入框还是同样的高度，只是去除上下边框
+     */
+    customStyle?: "default" | "fill";
 }
 declare const _default: React__default.NamedExoticComponent<IFormItem & {
     outsideState: any;

package/dist/es/formitem/formItem.js

@@ -9,7 +9,7 @@ import { Col } from 'antd';
 
 var FormItem = function (props) {
     var _a;
-    var children = props.children, isDisplay = props.isDisplay, isRequired = props.isRequired, isChangeable = props.isChangeable, isStress = props.isStress, preNode = props.preNode, nextNode = props.nextNode; props.dynamicDisabled; var hiddenBorder = props.hiddenBorder, singleSelectShowBorder = props.singleSelectShowBorder, hiddenLabel = props.hiddenLabel, width = props.width, className = props.className, itemClassName = props.itemClassName, render = props.render, shouldUpdateNames = props.shouldUpdateNames; props.shouldUpdateClear; var dependencies = props.dependencies, shouldUpdate = props.shouldUpdate; props.index; props.outsideState; props.shouldUpdateBeOutsideState; props.nonForm; var resetProps = __rest(props, ["children", "isDisplay", "isRequired", "isChangeable", "isStress", "preNode", "nextNode", "dynamicDisabled", "hiddenBorder", "singleSelectShowBorder", "hiddenLabel", "width", "className", "itemClassName", "render", "shouldUpdateNames", "shouldUpdateClear", "dependencies", "shouldUpdate", "index", "outsideState", "shouldUpdateBeOutsideState", "nonForm"]);
+    var children = props.children, isDisplay = props.isDisplay, isRequired = props.isRequired, isChangeable = props.isChangeable, isStress = props.isStress, preNode = props.preNode, nextNode = props.nextNode; props.dynamicDisabled; var hiddenBorder = props.hiddenBorder, singleSelectShowBorder = props.singleSelectShowBorder, hiddenLabel = props.hiddenLabel, width = props.width, className = props.className, itemClassName = props.itemClassName, render = props.render, shouldUpdateNames = props.shouldUpdateNames; props.shouldUpdateClear; var dependencies = props.dependencies, shouldUpdate = props.shouldUpdate; props.index; props.outsideState; props.shouldUpdateBeOutsideState; props.nonForm; var isCustomItem = props.isCustomItem, customStyle = props.customStyle, resetProps = __rest(props, ["children", "isDisplay", "isRequired", "isChangeable", "isStress", "preNode", "nextNode", "dynamicDisabled", "hiddenBorder", "singleSelectShowBorder", "hiddenLabel", "width", "className", "itemClassName", "render", "shouldUpdateNames", "shouldUpdateClear", "dependencies", "shouldUpdate", "index", "outsideState", "shouldUpdateBeOutsideState", "nonForm", "isCustomItem", "customStyle"]);
     var form = MemoForm.useFormInstance();
     // 根据配置属性，判断是否渲染表单项
     // 是否显示表单项
@@ -56,6 +56,8 @@ var FormItem = function (props) {
         "ztxk-form__item--hidden-label": hiddenLabel,
         "ztxk-form__item--single-show-border": singleSelectShowBorder,
         "ztxk-form__item--stress": isStress,
+        "ztxk-form__item--custom": isCustomItem,
+        "ztxk-form__item--custom-fill": customStyle === "fill",
     });
     if (dependencies) {
         return (jsxs(ItemWrap, __assign({ width: width, className: className }, { children: [preNode ? preNode : null, jsx(MemoForm.Item, __assign({ dependencies: dependencies, noStyle: true }, { children: function (formInstance) {

package/dist/es/table/components/SortTitle.js

@@ -18,25 +18,17 @@ var SortTitle = function (_a) {
         var currentOrd;
         if (order === ASCEND) {
             currentOrd = DESCEND;
-            setCustomOrder({
-                field: field,
-                order: currentOrd,
-            });
         }
         else if (order === DESCEND) {
             currentOrd = null;
-            setCustomOrder({
-                field: field,
-                order: currentOrd,
-            });
         }
         else {
             currentOrd = ASCEND;
-            setCustomOrder({
-                field: field,
-                order: currentOrd,
-            });
         }
+        setCustomOrder({
+            field: field,
+            order: currentOrd,
+        });
         onChange && onChange({ field: field, order: currentOrd });
     };
     var currentTitle = useMemo(function () {

package/dist/es/table/hooks.js

@@ -170,16 +170,25 @@ function useScuRfresh() {
         getRefreshScuCell: getRefreshScuCell,
     };
 }
-// 自定义排序方法
+/**
+ * 自定义排序方法
+ * 排序会触发onTableChange事件，即排序会改变数据源
+ * 如果排序改变了数据源，那么数据没法恢复到初始状态
+ */
 function useCustomSort(dataSource, onTableChange, options) {
-    var refreshScuCell = options.refreshScuCell;
+    var refreshScuCell = options.refreshScuCell, rowKey = options.rowKey, serviceOrder = options.serviceOrder;
     // 排序的数据
-    var _a = useState(null), sortDataSource = _a[0], setSortDataSource = _a[1];
-    var _b = useState(undefined), order = _b[0], setOrder = _b[1];
-    var isSelfChange = useRef(true);
+    var _a = useState(undefined), order = _a[0], setOrder = _a[1];
+    var isSelfChange = useRef(false);
+    // 记录初始数据的顺序（根据rowKey记录）
+    var innerOrderDataSource = useRef();
     var customSortHandle = useCallback(function (info) {
         if (Array.isArray(dataSource) && dataSource.length > 1) {
             var field_1 = info.field, order_1 = info.order;
+            if (serviceOrder) {
+                serviceOrder(info);
+                return;
+            }
             var handle_1 = function (a, b) {
                 var result = a[field_1] - b[field_1];
                 if (!isNaN(result)) {
@@ -193,45 +202,66 @@ function useCustomSort(dataSource, onTableChange, options) {
                 }
                 return 0;
             };
+            var newDataSource_1 = [];
             if (order_1 === "ascend") {
-                var newDataSource = dataSource.slice().sort(function (a, b) {
+                newDataSource_1 = dataSource.slice().sort(function (a, b) {
                     return handle_1(a, b);
                 });
-                setSortDataSource(newDataSource);
-                isSelfChange.current = true;
-                refreshScuCell && refreshScuCell();
-                onTableChange &&
-                    onTableChange(newDataSource, dataSource, { type: "sort" });
             }
             else if (order_1 === "descend") {
-                var newDataSource = dataSource.slice().sort(function (a, b) {
+                newDataSource_1 = dataSource.slice().sort(function (a, b) {
                     return -handle_1(a, b);
                 });
-                setSortDataSource(newDataSource);
-                isSelfChange.current = true;
-                refreshScuCell && refreshScuCell();
-                onTableChange &&
-                    onTableChange(newDataSource, dataSource, { type: "sort" });
             }
             else {
-                setSortDataSource(null);
+                // 通过之前排序好的数组Key，返回一个新的数据
+                // 之所以这么做 是因为有可能排序后，数据做了修改、增减。
+                // 所以不能单纯的记录排序之前的数据为准
+                if (Array.isArray(innerOrderDataSource.current) &&
+                    typeof rowKey === "string") {
+                    innerOrderDataSource.current.forEach(function (key) {
+                        var item = dataSource.find(function (d) { return d[rowKey] === key; });
+                        if (item) {
+                            newDataSource_1.push(item);
+                        }
+                    });
+                }
+                else {
+                    newDataSource_1 = dataSource;
+                }
             }
+            // 表示当前修改数据的行为 由组件内部触发 不需要清空order
+            isSelfChange.current = true;
+            // 针对配置了scu的列做处理
+            refreshScuCell && refreshScuCell();
+            // 真实的更新数据
+            onTableChange &&
+                onTableChange(newDataSource_1, dataSource, {
+                    type: "sort",
+                    order: order_1,
+                    field: field_1,
+                });
         }
-    }, [dataSource, onTableChange, refreshScuCell]);
+    }, [dataSource, onTableChange, refreshScuCell, rowKey, serviceOrder]);
     /**
      * 表格数据更新的时候 重置下当前排序的数据 以及 排序的方式
      * 但是如果是因为点击排序触发的表格数据更新 那么不做处理
      */
     useEffect(function () {
+        if (serviceOrder) {
+            return;
+        }
         if (!isSelfChange.current) {
-            setSortDataSource(null);
+            if (typeof rowKey === "string") {
+                innerOrderDataSource.current = dataSource.map(function (item) {
+                    return item[rowKey];
+                });
+            }
             setOrder(undefined);
         }
         isSelfChange.current = false;
-    }, [dataSource]);
+    }, [dataSource, rowKey, serviceOrder]);
     return {
-        sortDataSource: sortDataSource,
-        setSortDataSource: setSortDataSource,
         order: order,
         setOrder: setOrder,
         customSortHandle: customSortHandle,

package/dist/es/table/interface.d.ts

@@ -129,6 +129,7 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
         dragIndex?: number;
         hoverIndex?: number;
         type?: "edit" | "move" | "add" | "del" | "delAll" | "fillDown" | "sort";
+        [prop: string]: any;
     }) => void;
     /**
      * 是否开启表格编辑功能
@@ -181,6 +182,11 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
      * 表格的名字 一个页面存在多个表格时 发起表格验证时，可以提示哪个表格出现问题
      */
     tableName?: string;
+    /**
+     * 服务端排序返回事件
+     * 如果开启服务端排序，那么前端这边不做排序处理，只返回设置的字段
+     */
+    serviceOrder?: (order: IOrder) => void;
 }
 interface IFields {
     /**
@@ -226,6 +232,13 @@ interface TableComponent<T> extends React.FC<ITableProps<T>> {
     Column: typeof Table.Column;
     ColumnGroup: typeof Table.ColumnGroup;
     Summary: typeof Table.Summary;
+}
+/**
+ * 排序相关类型
+ */
+interface IOrder {
+    field: string;
+    order: "ascend" | "descend" | undefined;
 }
 
-export { IColumnGroupType, IColumnType, IColumnsType, IColumnsTypeProp, IEditableConfig, IFields, ISummaryConfig, ITableProps, TableComponent };
+export { IColumnGroupType, IColumnType, IColumnsType, IColumnsTypeProp, IEditableConfig, IFields, IOrder, ISummaryConfig, ITableProps, TableComponent };

package/dist/es/table/table.js

@@ -29,7 +29,7 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
 // TODO: 实现表头自定义伸缩
 var Table = function (props) {
     // console.log("表格渲染");
-    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, _c = props.isDelAll, isDelAll = _c === void 0 ? true : _c, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _d = props.summaryFixed, summaryFixed = _d === void 0 ? true : _d, isInnerPagination = props.isInnerPagination, _e = props.innerPaginationPageSize, innerPaginationPageSize = _e === void 0 ? 30 : _e, _f = props.innerPaginationPosition, innerPaginationPosition = _f === void 0 ? INNER_TABLE_PAGINATION_POSITION : _f, _g = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _g === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _g, tableRefHandle = props.tableRefHandle, tableName = props.tableName, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "addMode", "addCallback", "isDel", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "tableRefHandle", "tableName"]);
+    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, _c = props.isDelAll, isDelAll = _c === void 0 ? true : _c, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _d = props.summaryFixed, summaryFixed = _d === void 0 ? true : _d, isInnerPagination = props.isInnerPagination, _e = props.innerPaginationPageSize, innerPaginationPageSize = _e === void 0 ? 30 : _e, _f = props.innerPaginationPosition, innerPaginationPosition = _f === void 0 ? INNER_TABLE_PAGINATION_POSITION : _f, _g = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _g === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _g, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "addMode", "addCallback", "isDel", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "tableRefHandle", "tableName", "serviceOrder"]);
     var classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
@@ -68,7 +68,9 @@ var Table = function (props) {
     var _l = useCustomSort(dataSource, onTableChange, {
         refreshScuCell: refreshScuCell,
         currentPage: currentPage,
-    }), sortDataSource = _l.sortDataSource, order = _l.order, setOrder = _l.setOrder, customSortHandle = _l.customSortHandle;
+        rowKey: props === null || props === void 0 ? void 0 : props.rowKey,
+        serviceOrder: serviceOrder,
+    }), order = _l.order, setOrder = _l.setOrder, customSortHandle = _l.customSortHandle;
     // 处理列配置信息 得到新的列配置信息
     var newColumns = useColumns(columns, {
         dynamicKey: dynamicKey,
@@ -126,12 +128,15 @@ var Table = function (props) {
     // 暴露给外部一些方法
     useImperativeHandle(tableRefHandle, function () {
         return {
+            /** 获取真实的索引，内部分页时使用 */
             getRealyIndex: function (index) {
                 return getInnerIndex(currentPage, index);
             },
+            /** 获取当前表格的配置信息 */
             getDynamicList: function () {
                 return currentDynamicList;
             },
+            /** 表格的验证方法 */
             tableValidate: function () { return __awaiter(void 0, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -150,11 +155,12 @@ var Table = function (props) {
                     }
                 });
             }); },
+            /** 清除错误样式 */
             clearErrorClass: clearErrorClass,
         };
     });
     // 表格
-    var SingleTable = (jsx(Table$1, __assign({ className: classes, bordered: bordered, dataSource: sortDataSource ? sortDataSource : dataSource, columns: newColumns, components: componentsMemo, onRow: onRow, summary: getSummaryHandle, pagination: isInnerPagination
+    var SingleTable = (jsx(Table$1, __assign({ className: classes, bordered: bordered, dataSource: dataSource, columns: newColumns, components: componentsMemo, onRow: onRow, summary: getSummaryHandle, pagination: isInnerPagination
             ? pagination
                 ? pagination
                 : paginationConfig

package/dist/es/table/useColumns.js

@@ -18,6 +18,7 @@ function useColumns(columns, options) {
     var myNewColumns = [];
     if (Array.isArray(newColumns)) {
         newColumns.forEach(function (column) {
+            var _a;
             var _column = __assign(__assign({}, column), { __title: column.title });
             var isCopy = _column.isCopy, editable = _column.editable, editableConfig = _column.editableConfig, title = _column.title, key = _column.key, validate = _column.validate, isRequire = _column.isRequire, isFillDown = _column.isFillDown, isOrder = _column.isOrder;
             var _key = key ? key : _column === null || _column === void 0 ? void 0 : _column.dataIndex;
@@ -32,11 +33,14 @@ function useColumns(columns, options) {
                         display: "flex",
                         alignItems: "center",
                         justifyContent: "space-between",
+                        flex: "1",
                     } }, { children: jsxs(Fragment, { children: [_column.title, jsx(TitleOperation, { copyKey: isCopy === true ? _key : isCopy, dataSourceRef: dataSourceRef, isFillDown: isFillDown, dataKey: _key, onTableChange: onTableChange })] }) })));
             }
             // 列头增加必填标识
             if (isRequire) {
-                _column.title = (jsxs(Fragment, { children: [jsx("i", __assign({ className: "ztxk-column--required" }, { children: "*" })), _column.title] }));
+                _column.title = (jsxs("div", __assign({ style: { display: "flex", alignItems: "center" } }, { children: [jsx("i", __assign({ className: "ztxk-column--required" }, { children: "*" })), typeof _column.title === "function"
+                            ? (_a = _column.title) === null || _a === void 0 ? void 0 : _a.call(_column, {})
+                            : _column.title] })));
             }
             // 如果列添加可编辑配置
             if (editable && isEdit) {