@vtx/components 4.0.0-beta.70 → 4.0.0-beta.72

package/es/vtx-datagrid/Store/Provide.js

@@ -24,7 +24,7 @@ import { message } from 'antd';
 import { genColumnKey, isFunction, useDeepCompareEffectDebounce } from "../../utils";
 import renderColumnButtons from "../renderColumnButtons";
 import { getVtxToken } from '@vtx/utils';
-import { buildColumnKeyMap, buildSortKeyColumns } from "../columnState";
+import { buildColumnKeyMap, buildSortKeyColumns, getVisibleColumnKeysFromMap } from "../columnState";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var indexColumnKey = '_serialNum';
 function useMergedState1(defaultValue, option) {
@@ -270,15 +270,8 @@ function useContainer() {
     }
   }, [visibleColumnKeys, props.defaultVisibleColumnKeys, tableColumn], ['render'], 100);
   useDeepCompareEffectDebounce(function () {
-    var _sortKeyColumns$curre, _props$onVisibleColum;
-    var visibleColumnKeys = [];
-    (_sortKeyColumns$curre = sortKeyColumns.current) === null || _sortKeyColumns$curre === void 0 || _sortKeyColumns$curre.map(function (columnKey) {
-      var config = columnsMap[columnKey];
-      if (config !== null && config !== void 0 && config.show) {
-        visibleColumnKeys.push(columnKey);
-      }
-    });
-    (_props$onVisibleColum = props.onVisibleColumnsChange) === null || _props$onVisibleColum === void 0 || _props$onVisibleColum.call(props, visibleColumnKeys);
+    var _props$onVisibleColum;
+    (_props$onVisibleColum = props.onVisibleColumnsChange) === null || _props$onVisibleColum === void 0 || _props$onVisibleColum.call(props, getVisibleColumnKeysFromMap(columnsMap, sortKeyColumns.current));
   }, [JSON.stringify(columnsMap), sortKeyColumns.current], ['render'], 200);
   var show = function show() {
     setTimeout(function () {

package/es/vtx-datagrid/columnState.js

@@ -1,3 +1,9 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { genColumnKey } from "../utils/genColumnKey";
 import { sortByGivenOrder } from "../utils/sortByGivenOrder";
 export var indexColumnKey = '_serialNum';
@@ -57,8 +63,29 @@ export function buildSortKeyColumns() {
 export function getVisibleColumnKeysFromMap() {
   var columnsMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var sortKeyColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return sortKeyColumns.filter(function (columnKey) {
+  var allColumnKeys = Array.from(new Set([].concat(_toConsumableArray(sortKeyColumns), _toConsumableArray(Object.keys(columnsMap)))));
+  var sortIndexMap = new Map(sortKeyColumns.map(function (columnKey, index) {
+    return [columnKey, index];
+  }));
+  return allColumnKeys.filter(function (columnKey) {
     var _columnsMap$columnKey;
     return (_columnsMap$columnKey = columnsMap[columnKey]) === null || _columnsMap$columnKey === void 0 ? void 0 : _columnsMap$columnKey.show;
+  }).sort(function (leftKey, rightKey) {
+    var leftConfig = columnsMap[leftKey] || {};
+    var rightConfig = columnsMap[rightKey] || {};
+    var leftFixed = leftConfig.fixed,
+      leftOrder = leftConfig.order;
+    var rightFixed = rightConfig.fixed,
+      rightOrder = rightConfig.order;
+    if (leftFixed === 'left' && rightFixed !== 'left' || rightFixed === 'right' && leftFixed !== 'right') {
+      return -2;
+    }
+    if (rightFixed === 'left' && leftFixed !== 'left' || leftFixed === 'right' && rightFixed !== 'right') {
+      return 2;
+    }
+    if (leftOrder !== undefined || rightOrder !== undefined) {
+      return (leftOrder !== null && leftOrder !== void 0 ? leftOrder : 0) - (rightOrder !== null && rightOrder !== void 0 ? rightOrder : 0);
+    }
+    return (sortIndexMap.has(leftKey) ? sortIndexMap.get(leftKey) : Number.MAX_SAFE_INTEGER) - (sortIndexMap.has(rightKey) ? sortIndexMap.get(rightKey) : Number.MAX_SAFE_INTEGER);
   });
 }

package/es/vtx-datagrid/index.js

@@ -58,13 +58,14 @@ function VtxTable(props) {
   var _useSet = useSet({
       // 表格id
       datagridId: "vtx-datagrid-".concat(new Date().getTime()),
-      scrollY: 0
+      scrollY: undefined
     }),
     _useSet2 = _slicedToArray(_useSet, 2),
     _useSet2$ = _useSet2[0],
     datagridId = _useSet2$.datagridId,
     scrollY = _useSet2$.scrollY,
     setState = _useSet2[1];
+  var scrollYRef = useRef(undefined);
   // 列设置提示高度
   var alertHeight = useRef(0);
   // 工具栏高度
@@ -125,32 +126,49 @@ function VtxTable(props) {
         _headFootHeight = ((pagination === null || pagination === void 0 ? void 0 : pagination.clientHeight) || 0) + 32 + (tableHeader === null || tableHeader === void 0 ? void 0 : tableHeader.clientHeight);
       }
       var bodyHeight = ((_rootDomRef$current = rootDomRef.current) === null || _rootDomRef$current === void 0 ? void 0 : _rootDomRef$current.clientHeight) - _headFootHeight - toolbarHeight.current - alertHeight.current;
+      if (!bodyHeight || bodyHeight <= 0) {
+        return;
+      }
       var bodyDiv = Array.prototype.filter.call(divs, function (dom) {
         return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content') || dom.className.includes('ant-table-tbody');
       })[0];
       var tablePlaceholder = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('tr'), function (dom) {
         return dom.className.includes('ant-table-placeholder');
       })[0];
+      if (!bodyDiv) {
+        return;
+      }
+      var tableHeight = ((_bodyDiv$getElementsB = bodyDiv.getElementsByTagName('table')) === null || _bodyDiv$getElementsB === void 0 || (_bodyDiv$getElementsB = _bodyDiv$getElementsB[0]) === null || _bodyDiv$getElementsB === void 0 ? void 0 : _bodyDiv$getElementsB.clientHeight) || 0;
+      var minBodyHeight = Math.max(bodyHeight - (rest.scrollY || 0), 0);
       if (bodyDiv) {
-        bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
+        bodyDiv.style.minHeight = "".concat(minBodyHeight, "px");
       }
-      var tableHeight = (_bodyDiv$getElementsB = bodyDiv.getElementsByTagName('table')) === null || _bodyDiv$getElementsB === void 0 || (_bodyDiv$getElementsB = _bodyDiv$getElementsB[0]) === null || _bodyDiv$getElementsB === void 0 ? void 0 : _bodyDiv$getElementsB.clientHeight;
       if (tablePlaceholder) {
-        tablePlaceholder.style.height = "".concat(bodyHeight - (rest.scrollY || 0) - 48 - 12, "px");
+        var placeholderHeight = Math.max(bodyHeight - (rest.scrollY || 0) - 48 - 12, 0);
+        tablePlaceholder.style.height = "".concat(placeholderHeight, "px");
         var tableCell = Array.prototype.filter.call(tablePlaceholder.getElementsByTagName('td'), function (dom) {
           return dom.className.includes('ant-table-cell');
         })[0];
-        tableCell.style.height = "".concat(bodyHeight - (rest.scrollY || 0) - 48 - 12, "px");
+        if (tableCell) {
+          tableCell.style.height = "".concat(placeholderHeight, "px");
+        }
       }
       // antd6.x 的bug  如果table的高度 没有body 高 则没有滚动条
 
-      setState({
-        scrollY: tableHeight > bodyHeight ? bodyHeight : undefined
-      });
+      var nextScrollY = tableHeight > bodyHeight ? bodyHeight : undefined;
+      if (scrollYRef.current !== nextScrollY) {
+        scrollYRef.current = nextScrollY;
+        setState({
+          scrollY: nextScrollY
+        });
+      }
     }, {
       wait: 350
     }),
     calculateHeight = _useThrottleFn.run;
+  useEffect(function () {
+    scrollYRef.current = scrollY;
+  }, [scrollY]);
   useEffect(function () {
     var resizeObserver = new ResizeObserver(function () {
       calculateHeight();

package/es/vtx-export-async/History.js

@@ -108,6 +108,10 @@ function History(props) {
     timer.current = setInterval(function () {
       refresh();
     }, refreshTime * 1000);
+    return function () {
+      timer.current && clearInterval(timer.current);
+      timer.current = null;
+    };
   }, [JSON.stringify(tableProps.dataSource)]);
   var pageSize = pagination.pageSize,
     current = pagination.current;

package/es/vtx-export-async/index.js

@@ -83,7 +83,9 @@ var VtxExportAsync = function VtxExportAsync(props) {
     headers = _props$headers === void 0 ? {} : _props$headers,
     beforeExport = props.beforeExport,
     _props$historyHeaders = props.historyHeaders,
-    historyHeaders = _props$historyHeaders === void 0 ? {} : _props$historyHeaders;
+    historyHeaders = _props$historyHeaders === void 0 ? {} : _props$historyHeaders,
+    _props$hideContent = props.hideContent,
+    hideContent = _props$hideContent === void 0 ? false : _props$hideContent;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -356,7 +358,7 @@ var VtxExportAsync = function VtxExportAsync(props) {
               }, item.key);
             })
           })
-        }), /*#__PURE__*/_jsx(Form.Item, {
+        }), hideContent ? null : /*#__PURE__*/_jsx(Form.Item, {
           label: TextEnum.fieldContentText,
           name: "content",
           rules: [{

package/es/vtx-import/index.js

@@ -1,15 +1,15 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); }
 import React, { useRef, useEffect, useContext } from 'react';
 import { message, Button, Tooltip } from 'antd';
@@ -22,9 +22,13 @@ import { getVtxToken, getSignature } from '@vtx/utils';
 import { useStyle } from "./style/index";
 import { VtxProvider, useIntl } from "../vtx-provider";
 import VtxModal from "../vtx-modal";
-import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 function VtxImport(props) {
+  var templateURL = props.templateURL,
+    uploadURL = props.uploadURL,
+    afterUpload = props.afterUpload,
+    beforeUpload = props.beforeUpload;
   var token = getToken();
   if (props.token) {
     props.token, _readOnlyError("token");
@@ -36,6 +40,22 @@ function VtxImport(props) {
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
+  var TextEnum = _objectSpread({
+    rowNumberText: intl.getMessage('import.rowNumber', '行号'),
+    errorMessageText: intl.getMessage('import.errorMessage', '错误说明'),
+    resultTitleText: intl.getMessage('import.result', '导入结果'),
+    btnCloseText: intl.getMessage('switch.close', '关闭'),
+    operationText: intl.getMessage('import.operation', '导入'),
+    uploadFailedText: intl.getMessage('import.error', '上传失败'),
+    parseResponseFailedText: intl.getMessage('import.error', '解析响应失败'),
+    uploadSuccessText: intl.getMessage('import.success', '上传成功'),
+    parseResponseDataFailedText: intl.getMessage('import.error', '解析响应数据失败'),
+    downloadTemplateText: intl.getMessage('import.downloadTemplate', '下载模板'),
+    pleaseSelectFileText: intl.getMessage('import.pleaseSelectFile', '请选择需要上传的文件'),
+    uploadText: intl.getMessage('import.upload', '上传'),
+    selectFileText: intl.getMessage('import.selectFile', '选择文件'),
+    noFileSelectedText: intl.getMessage('import.noFileSelected', '未选择任何文件')
+  }, props.customEnumText);
 
   // 用 useRef 管理 DOM 引用，而不是 state
   var fileInputRef = useRef(null);
@@ -62,13 +82,22 @@ function VtxImport(props) {
       // 导入结果查看
       modalWidth: props.modalWidth || 800,
       columns: props.columns || [{
-        title: '行号',
+        title: TextEnum.rowNumberText,
         dataIndex: 'lineNum',
         key: 'lineNum'
       }, {
-        title: '错误说明',
+        title: TextEnum.errorMessageText,
         dataIndex: 'messages',
-        key: 'messages'
+        key: 'messages',
+        render: function render(val) {
+          return /*#__PURE__*/_jsxs("div", {
+            style: {
+              display: 'flex',
+              width: 600
+            },
+            children: [" ", val]
+          });
+        }
       }],
       step: 1,
       chunkSize: props.chunkSize || 10 * 1024 * 1024,
@@ -76,7 +105,7 @@ function VtxImport(props) {
       currentIndex: 0,
       chunkId: '',
       chunks: [],
-      operation: props.operation || intl.getMessage('import.operation', '导入'),
+      operation: props.operation || TextEnum.operationText,
       fileName: ''
     }),
     _useSet2 = _slicedToArray(_useSet, 2),
@@ -133,7 +162,7 @@ function VtxImport(props) {
         }
       };
       xhr.onerror = function () {
-        message.error(intl.getMessage('import.error', '上传失败'));
+        message.error(TextEnum.uploadFailedText);
       };
       // 发送请求
       xhr.open('POST', '/cloudFile/common/uploadChunk', true);
@@ -155,23 +184,23 @@ function VtxImport(props) {
         try {
           res = JSON.parse(xhr.responseText);
         } catch (e) {
-          message.error(intl.getMessage('import.error', '解析响应失败'));
+          message.error(TextEnum.parseResponseFailedText);
           setState({
             uploading: false
           });
           return;
         }
         if (((_res = res) === null || _res === void 0 ? void 0 : _res.result) == 0) {
-          message.success(intl.getMessage('import.success', '上传成功'));
+          message.success(TextEnum.uploadSuccessText);
           chunkUpload(res.data);
         } else {
           var _res2;
-          message.error(((_res2 = res) === null || _res2 === void 0 ? void 0 : _res2.msg) || intl.getMessage('import.error', '上传失败'));
+          message.error(((_res2 = res) === null || _res2 === void 0 ? void 0 : _res2.msg) || TextEnum.uploadFailedText);
         }
       }
     };
     xhr.onerror = function () {
-      message.error(intl.getMessage('import.error', '上传失败'));
+      message.error(TextEnum.uploadFailedText);
     };
     // 发送请求
     xhr.open('POST', '/cloudFile/common/mergeChunk', true);
@@ -298,7 +327,7 @@ function VtxImport(props) {
     try {
       parseData = JSON.parse(data);
     } catch (e) {
-      message.error(intl.getMessage('import.error', '解析响应数据失败'));
+      message.error(TextEnum.parseResponseDataFailedText);
       return;
     }
     if (typeof props.afterUpload === 'function') {
@@ -320,18 +349,14 @@ function VtxImport(props) {
       // 新增其他错误提示
       if (parseData.result !== 0) {
         var _parseData2;
-        message.error(((_parseData2 = parseData) === null || _parseData2 === void 0 ? void 0 : _parseData2.msg) || intl.getMessage('import.success', '上传成功'));
+        message.error(((_parseData2 = parseData) === null || _parseData2 === void 0 ? void 0 : _parseData2.msg) || TextEnum.uploadSuccessText);
       }
     }
   };
-  var templateURL = props.templateURL,
-    uploadURL = props.uploadURL,
-    afterUpload = props.afterUpload,
-    beforeUpload = props.beforeUpload;
   var modalProps = {
     className: "".concat(prefixCls, "-modal"),
     open: state.visible,
-    title: intl.getMessage('import.operation', '导入'),
+    title: TextEnum.operationText,
     onCancel: function onCancel() {
       return closeModal();
     },
@@ -343,7 +368,7 @@ function VtxImport(props) {
       onClick: function onClick() {
         window.open(templateURL);
       },
-      children: intl.getMessage('import.downloadTemplate', '下载模板')
+      children: TextEnum.downloadTemplateText
     }, "downloadTemple") : null, /*#__PURE__*/_jsx(Button, {
       type: "primary",
       loading: state.uploading,
@@ -382,15 +407,15 @@ function VtxImport(props) {
           //     request.send(fmd);
           // }
         } else {
-          message.info(intl.getMessage('import.pleaseSelectFile', '请选择需要上传的文件'));
+          message.info(TextEnum.pleaseSelectFileText);
         }
       },
-      children: intl.getMessage('import.upload', '上传')
+      children: TextEnum.uploadText
     }, "uploadSubmit"), /*#__PURE__*/_jsx(Button, {
       onClick: function onClick() {
         closeModal();
       },
-      children: intl.getMessage('switch.close', '关闭')
+      children: TextEnum.btnCloseText
     }, "closeWindow")],
     width: 520
   };
@@ -403,7 +428,8 @@ function VtxImport(props) {
         resultVisible: false
       });
     },
-    modalWidth: state.modalWidth
+    modalWidth: state.modalWidth,
+    TextEnum: TextEnum
   };
 
   // 组件卸载时清理
@@ -477,7 +503,7 @@ function VtxImport(props) {
           onClick: handleSelectFile,
           children: /*#__PURE__*/_jsx("span", {
             className: "".concat(prefixCls, "-label"),
-            children: intl.getMessage('import.selectFile', '选择文件')
+            children: TextEnum.selectFileText
           })
         }), state.fileName ? /*#__PURE__*/_jsx(Tooltip, {
           title: state.fileName,
@@ -487,7 +513,7 @@ function VtxImport(props) {
           })
         }) : /*#__PURE__*/_jsx("div", {
           className: "".concat(prefixCls, "-file-name"),
-          children: intl.getMessage('import.noFileSelected', '未选择任何文件')
+          children: TextEnum.noFileSelectedText
         })]
       }), /*#__PURE__*/_jsx("input", {
         type: "file",
@@ -515,11 +541,13 @@ VtxImport.propTypes = {
   postData: PropTypes.object,
   fileKey: PropTypes.string,
   accept: PropTypes.string,
+  token: PropTypes.string,
   operation: PropTypes.string,
   close: PropTypes.func,
   afterUpload: PropTypes.func,
   modalWidth: PropTypes.number,
   columns: PropTypes.array,
+  customEnumText: PropTypes.object,
   children: PropTypes.object,
   beforeUpload: PropTypes.func,
   chunkSize: PropTypes.number

package/es/vtx-import/result.js

@@ -1,25 +1,27 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React from 'react';
 import { Modal, Button } from 'antd';
 import PropTypes from 'prop-types';
 import useSet from "../utils/useSet";
 import VtxDatagrid from "../vtx-datagrid";
-import { useIntl } from "../vtx-provider";
 import VtxModal from "../vtx-modal";
 import { jsx as _jsx } from "react/jsx-runtime";
 function VtxImportResult(props) {
-  var intl = useIntl();
+  var TextEnum = _objectSpread({
+    resultTitleText: '导入结果',
+    btnCloseText: '关闭'
+  }, props.TextEnum);
   var _useSet = useSet({
       visible: props.visible || false,
       dataSource: props.dataSource || [],
@@ -29,11 +31,9 @@ function VtxImportResult(props) {
     _useSet2 = _slicedToArray(_useSet, 1),
     state = _useSet2[0];
   var modalProps = {
-    bodyStyle: {
-      backgroundColor: '#f8f8f8'
-    },
+    bodyStyle: {},
     open: state.visible,
-    title: intl.getMessage('import.result', '导入结果'),
+    title: TextEnum.resultTitleText,
     onCancel: function onCancel() {
       if (typeof props.hideVisible === 'function') {
         props.hideVisible();
@@ -50,29 +50,26 @@ function VtxImportResult(props) {
           props.hideVisible();
         }
       },
-      children: intl.getMessage('switch.close', '关闭')
+      children: TextEnum.btnCloseText
     }, "closeWindow")]
   };
   var newTableProps = {
+    toolba: false,
     columns: state.columns,
     dataSource: state.dataSource,
     startIndex: 1,
     size: 'small',
     headFootHeight: 50,
     pagination: false,
-    autoFit: false
+    autoFit: false,
+    scroll: {
+      y: 550
+    }
   };
   return /*#__PURE__*/_jsx(VtxModal, _objectSpread(_objectSpread({}, modalProps), {}, {
-    children: /*#__PURE__*/_jsx("div", {
-      style: {
-        maxHeight: 600,
-        width: '100%',
-        overflow: 'auto'
-      },
-      children: /*#__PURE__*/_jsx(VtxDatagrid, _objectSpread({
-        toolbar: false
-      }, newTableProps))
-    })
+    children: /*#__PURE__*/_jsx(VtxDatagrid, _objectSpread({
+      toolbar: false
+    }, newTableProps))
   }));
 }
 VtxImportResult.propTypes = {
@@ -80,6 +77,7 @@ VtxImportResult.propTypes = {
   dataSource: PropTypes.array,
   columns: PropTypes.array,
   modalWidth: PropTypes.number,
-  hideVisible: PropTypes.func
+  hideVisible: PropTypes.func,
+  TextEnum: PropTypes.object
 };
 export default VtxImportResult;

package/es/vtx-provider/locale/en_US.js

@@ -125,6 +125,8 @@ export default {
     operation: 'Import',
     error: 'Upload failed',
     success: 'Upload successful',
+    rowNumber: 'Line No.',
+    errorMessage: 'Error Description',
     selectFile: 'Click to select file',
     noFileSelected: "No file selected",
     downloadTemplate: 'Download template',

package/es/vtx-provider/locale/zh_CN.js

@@ -124,6 +124,8 @@ export default {
     operation: '导入',
     error: '上传失败',
     success: '上传成功',
+    rowNumber: '行号',
+    errorMessage: '错误说明',
     selectFile: '选择文件',
     noFileSelected: "未选择任何文件",
     downloadTemplate: '下载模板',

package/lib/vtx-datagrid/Store/Provide.js

@@ -277,15 +277,8 @@ function useContainer() {
     }
   }, [visibleColumnKeys, props.defaultVisibleColumnKeys, tableColumn], ['render'], 100);
   (0, _utils.useDeepCompareEffectDebounce)(function () {
-    var _sortKeyColumns$curre, _props$onVisibleColum;
-    var visibleColumnKeys = [];
-    (_sortKeyColumns$curre = sortKeyColumns.current) === null || _sortKeyColumns$curre === void 0 || _sortKeyColumns$curre.map(function (columnKey) {
-      var config = columnsMap[columnKey];
-      if (config !== null && config !== void 0 && config.show) {
-        visibleColumnKeys.push(columnKey);
-      }
-    });
-    (_props$onVisibleColum = props.onVisibleColumnsChange) === null || _props$onVisibleColum === void 0 || _props$onVisibleColum.call(props, visibleColumnKeys);
+    var _props$onVisibleColum;
+    (_props$onVisibleColum = props.onVisibleColumnsChange) === null || _props$onVisibleColum === void 0 || _props$onVisibleColum.call(props, (0, _columnState.getVisibleColumnKeysFromMap)(columnsMap, sortKeyColumns.current));
   }, [JSON.stringify(columnsMap), sortKeyColumns.current], ['render'], 200);
   var show = function show() {
     setTimeout(function () {

package/lib/vtx-datagrid/columnState.js

@@ -9,6 +9,12 @@ exports.getVisibleColumnKeysFromMap = getVisibleColumnKeysFromMap;
 exports.indexColumnKey = void 0;
 var _genColumnKey = require("../utils/genColumnKey");
 var _sortByGivenOrder = require("../utils/sortByGivenOrder");
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var indexColumnKey = exports.indexColumnKey = '_serialNum';
 function buildColumnKeyMap() {
   var tableColumn = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -66,8 +72,29 @@ function buildSortKeyColumns() {
 function getVisibleColumnKeysFromMap() {
   var columnsMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var sortKeyColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return sortKeyColumns.filter(function (columnKey) {
+  var allColumnKeys = Array.from(new Set([].concat(_toConsumableArray(sortKeyColumns), _toConsumableArray(Object.keys(columnsMap)))));
+  var sortIndexMap = new Map(sortKeyColumns.map(function (columnKey, index) {
+    return [columnKey, index];
+  }));
+  return allColumnKeys.filter(function (columnKey) {
     var _columnsMap$columnKey;
     return (_columnsMap$columnKey = columnsMap[columnKey]) === null || _columnsMap$columnKey === void 0 ? void 0 : _columnsMap$columnKey.show;
+  }).sort(function (leftKey, rightKey) {
+    var leftConfig = columnsMap[leftKey] || {};
+    var rightConfig = columnsMap[rightKey] || {};
+    var leftFixed = leftConfig.fixed,
+      leftOrder = leftConfig.order;
+    var rightFixed = rightConfig.fixed,
+      rightOrder = rightConfig.order;
+    if (leftFixed === 'left' && rightFixed !== 'left' || rightFixed === 'right' && leftFixed !== 'right') {
+      return -2;
+    }
+    if (rightFixed === 'left' && leftFixed !== 'left' || leftFixed === 'right' && rightFixed !== 'right') {
+      return 2;
+    }
+    if (leftOrder !== undefined || rightOrder !== undefined) {
+      return (leftOrder !== null && leftOrder !== void 0 ? leftOrder : 0) - (rightOrder !== null && rightOrder !== void 0 ? rightOrder : 0);
+    }
+    return (sortIndexMap.has(leftKey) ? sortIndexMap.get(leftKey) : Number.MAX_SAFE_INTEGER) - (sortIndexMap.has(rightKey) ? sortIndexMap.get(rightKey) : Number.MAX_SAFE_INTEGER);
   });
 }

package/lib/vtx-datagrid/index.js

@@ -68,13 +68,14 @@ function VtxTable(props) {
   var _useSet = (0, _useSet3.default)({
       // 表格id
       datagridId: "vtx-datagrid-".concat(new Date().getTime()),
-      scrollY: 0
+      scrollY: undefined
     }),
     _useSet2 = _slicedToArray(_useSet, 2),
     _useSet2$ = _useSet2[0],
     datagridId = _useSet2$.datagridId,
     scrollY = _useSet2$.scrollY,
     setState = _useSet2[1];
+  var scrollYRef = (0, _react.useRef)(undefined);
   // 列设置提示高度
   var alertHeight = (0, _react.useRef)(0);
   // 工具栏高度
@@ -135,32 +136,49 @@ function VtxTable(props) {
         _headFootHeight = ((pagination === null || pagination === void 0 ? void 0 : pagination.clientHeight) || 0) + 32 + (tableHeader === null || tableHeader === void 0 ? void 0 : tableHeader.clientHeight);
       }
       var bodyHeight = ((_rootDomRef$current = rootDomRef.current) === null || _rootDomRef$current === void 0 ? void 0 : _rootDomRef$current.clientHeight) - _headFootHeight - toolbarHeight.current - alertHeight.current;
+      if (!bodyHeight || bodyHeight <= 0) {
+        return;
+      }
       var bodyDiv = Array.prototype.filter.call(divs, function (dom) {
         return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content') || dom.className.includes('ant-table-tbody');
       })[0];
       var tablePlaceholder = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('tr'), function (dom) {
         return dom.className.includes('ant-table-placeholder');
       })[0];
+      if (!bodyDiv) {
+        return;
+      }
+      var tableHeight = ((_bodyDiv$getElementsB = bodyDiv.getElementsByTagName('table')) === null || _bodyDiv$getElementsB === void 0 || (_bodyDiv$getElementsB = _bodyDiv$getElementsB[0]) === null || _bodyDiv$getElementsB === void 0 ? void 0 : _bodyDiv$getElementsB.clientHeight) || 0;
+      var minBodyHeight = Math.max(bodyHeight - (rest.scrollY || 0), 0);
       if (bodyDiv) {
-        bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
+        bodyDiv.style.minHeight = "".concat(minBodyHeight, "px");
       }
-      var tableHeight = (_bodyDiv$getElementsB = bodyDiv.getElementsByTagName('table')) === null || _bodyDiv$getElementsB === void 0 || (_bodyDiv$getElementsB = _bodyDiv$getElementsB[0]) === null || _bodyDiv$getElementsB === void 0 ? void 0 : _bodyDiv$getElementsB.clientHeight;
       if (tablePlaceholder) {
-        tablePlaceholder.style.height = "".concat(bodyHeight - (rest.scrollY || 0) - 48 - 12, "px");
+        var placeholderHeight = Math.max(bodyHeight - (rest.scrollY || 0) - 48 - 12, 0);
+        tablePlaceholder.style.height = "".concat(placeholderHeight, "px");
         var tableCell = Array.prototype.filter.call(tablePlaceholder.getElementsByTagName('td'), function (dom) {
           return dom.className.includes('ant-table-cell');
         })[0];
-        tableCell.style.height = "".concat(bodyHeight - (rest.scrollY || 0) - 48 - 12, "px");
+        if (tableCell) {
+          tableCell.style.height = "".concat(placeholderHeight, "px");
+        }
       }
       // antd6.x 的bug  如果table的高度 没有body 高 则没有滚动条
 
-      setState({
-        scrollY: tableHeight > bodyHeight ? bodyHeight : undefined
-      });
+      var nextScrollY = tableHeight > bodyHeight ? bodyHeight : undefined;
+      if (scrollYRef.current !== nextScrollY) {
+        scrollYRef.current = nextScrollY;
+        setState({
+          scrollY: nextScrollY
+        });
+      }
     }, {
       wait: 350
     }),
     calculateHeight = _useThrottleFn.run;
+  (0, _react.useEffect)(function () {
+    scrollYRef.current = scrollY;
+  }, [scrollY]);
   (0, _react.useEffect)(function () {
     var resizeObserver = new ResizeObserver(function () {
       calculateHeight();

package/lib/vtx-export-async/History.js

@@ -116,6 +116,10 @@ function History(props) {
     timer.current = setInterval(function () {
       refresh();
     }, refreshTime * 1000);
+    return function () {
+      timer.current && clearInterval(timer.current);
+      timer.current = null;
+    };
   }, [JSON.stringify(tableProps.dataSource)]);
   var pageSize = pagination.pageSize,
     current = pagination.current;

package/lib/vtx-export-async/index.js

@@ -91,7 +91,9 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
     headers = _props$headers === void 0 ? {} : _props$headers,
     beforeExport = props.beforeExport,
     _props$historyHeaders = props.historyHeaders,
-    historyHeaders = _props$historyHeaders === void 0 ? {} : _props$historyHeaders;
+    historyHeaders = _props$historyHeaders === void 0 ? {} : _props$historyHeaders,
+    _props$hideContent = props.hideContent,
+    hideContent = _props$hideContent === void 0 ? false : _props$hideContent;
   var _Form$useForm = _antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -364,7 +366,7 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
               }, item.key);
             })
           })
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, {
+        }), hideContent ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, {
           label: TextEnum.fieldContentText,
           name: "content",
           rules: [{

package/lib/vtx-import/index.js

@@ -21,19 +21,23 @@ var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); }
 function VtxImport(props) {
+  var templateURL = props.templateURL,
+    uploadURL = props.uploadURL,
+    afterUpload = props.afterUpload,
+    beforeUpload = props.beforeUpload;
   var token = (0, _getToken.default)();
   if (props.token) {
     props.token, _readOnlyError("token");
@@ -45,6 +49,22 @@ function VtxImport(props) {
   var _useStyle = (0, _index.useStyle)(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
+  var TextEnum = _objectSpread({
+    rowNumberText: intl.getMessage('import.rowNumber', '行号'),
+    errorMessageText: intl.getMessage('import.errorMessage', '错误说明'),
+    resultTitleText: intl.getMessage('import.result', '导入结果'),
+    btnCloseText: intl.getMessage('switch.close', '关闭'),
+    operationText: intl.getMessage('import.operation', '导入'),
+    uploadFailedText: intl.getMessage('import.error', '上传失败'),
+    parseResponseFailedText: intl.getMessage('import.error', '解析响应失败'),
+    uploadSuccessText: intl.getMessage('import.success', '上传成功'),
+    parseResponseDataFailedText: intl.getMessage('import.error', '解析响应数据失败'),
+    downloadTemplateText: intl.getMessage('import.downloadTemplate', '下载模板'),
+    pleaseSelectFileText: intl.getMessage('import.pleaseSelectFile', '请选择需要上传的文件'),
+    uploadText: intl.getMessage('import.upload', '上传'),
+    selectFileText: intl.getMessage('import.selectFile', '选择文件'),
+    noFileSelectedText: intl.getMessage('import.noFileSelected', '未选择任何文件')
+  }, props.customEnumText);
 
   // 用 useRef 管理 DOM 引用，而不是 state
   var fileInputRef = (0, _react.useRef)(null);
@@ -71,13 +91,22 @@ function VtxImport(props) {
       // 导入结果查看
       modalWidth: props.modalWidth || 800,
       columns: props.columns || [{
-        title: '行号',
+        title: TextEnum.rowNumberText,
         dataIndex: 'lineNum',
         key: 'lineNum'
       }, {
-        title: '错误说明',
+        title: TextEnum.errorMessageText,
         dataIndex: 'messages',
-        key: 'messages'
+        key: 'messages',
+        render: function render(val) {
+          return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            style: {
+              display: 'flex',
+              width: 600
+            },
+            children: [" ", val]
+          });
+        }
       }],
       step: 1,
       chunkSize: props.chunkSize || 10 * 1024 * 1024,
@@ -85,7 +114,7 @@ function VtxImport(props) {
       currentIndex: 0,
       chunkId: '',
       chunks: [],
-      operation: props.operation || intl.getMessage('import.operation', '导入'),
+      operation: props.operation || TextEnum.operationText,
       fileName: ''
     }),
     _useSet2 = _slicedToArray(_useSet, 2),
@@ -142,7 +171,7 @@ function VtxImport(props) {
         }
       };
       xhr.onerror = function () {
-        _antd.message.error(intl.getMessage('import.error', '上传失败'));
+        _antd.message.error(TextEnum.uploadFailedText);
       };
       // 发送请求
       xhr.open('POST', '/cloudFile/common/uploadChunk', true);
@@ -164,23 +193,23 @@ function VtxImport(props) {
         try {
           res = JSON.parse(xhr.responseText);
         } catch (e) {
-          _antd.message.error(intl.getMessage('import.error', '解析响应失败'));
+          _antd.message.error(TextEnum.parseResponseFailedText);
           setState({
             uploading: false
           });
           return;
         }
         if (((_res = res) === null || _res === void 0 ? void 0 : _res.result) == 0) {
-          _antd.message.success(intl.getMessage('import.success', '上传成功'));
+          _antd.message.success(TextEnum.uploadSuccessText);
           chunkUpload(res.data);
         } else {
           var _res2;
-          _antd.message.error(((_res2 = res) === null || _res2 === void 0 ? void 0 : _res2.msg) || intl.getMessage('import.error', '上传失败'));
+          _antd.message.error(((_res2 = res) === null || _res2 === void 0 ? void 0 : _res2.msg) || TextEnum.uploadFailedText);
         }
       }
     };
     xhr.onerror = function () {
-      _antd.message.error(intl.getMessage('import.error', '上传失败'));
+      _antd.message.error(TextEnum.uploadFailedText);
     };
     // 发送请求
     xhr.open('POST', '/cloudFile/common/mergeChunk', true);
@@ -307,7 +336,7 @@ function VtxImport(props) {
     try {
       parseData = JSON.parse(data);
     } catch (e) {
-      _antd.message.error(intl.getMessage('import.error', '解析响应数据失败'));
+      _antd.message.error(TextEnum.parseResponseDataFailedText);
       return;
     }
     if (typeof props.afterUpload === 'function') {
@@ -329,18 +358,14 @@ function VtxImport(props) {
       // 新增其他错误提示
       if (parseData.result !== 0) {
         var _parseData2;
-        _antd.message.error(((_parseData2 = parseData) === null || _parseData2 === void 0 ? void 0 : _parseData2.msg) || intl.getMessage('import.success', '上传成功'));
+        _antd.message.error(((_parseData2 = parseData) === null || _parseData2 === void 0 ? void 0 : _parseData2.msg) || TextEnum.uploadSuccessText);
       }
     }
   };
-  var templateURL = props.templateURL,
-    uploadURL = props.uploadURL,
-    afterUpload = props.afterUpload,
-    beforeUpload = props.beforeUpload;
   var modalProps = {
     className: "".concat(prefixCls, "-modal"),
     open: state.visible,
-    title: intl.getMessage('import.operation', '导入'),
+    title: TextEnum.operationText,
     onCancel: function onCancel() {
       return closeModal();
     },
@@ -352,7 +377,7 @@ function VtxImport(props) {
       onClick: function onClick() {
         window.open(templateURL);
       },
-      children: intl.getMessage('import.downloadTemplate', '下载模板')
+      children: TextEnum.downloadTemplateText
     }, "downloadTemple") : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
       type: "primary",
       loading: state.uploading,
@@ -391,15 +416,15 @@ function VtxImport(props) {
           //     request.send(fmd);
           // }
         } else {
-          _antd.message.info(intl.getMessage('import.pleaseSelectFile', '请选择需要上传的文件'));
+          _antd.message.info(TextEnum.pleaseSelectFileText);
         }
       },
-      children: intl.getMessage('import.upload', '上传')
+      children: TextEnum.uploadText
     }, "uploadSubmit"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
       onClick: function onClick() {
         closeModal();
       },
-      children: intl.getMessage('switch.close', '关闭')
+      children: TextEnum.btnCloseText
     }, "closeWindow")],
     width: 520
   };
@@ -412,7 +437,8 @@ function VtxImport(props) {
         resultVisible: false
       });
     },
-    modalWidth: state.modalWidth
+    modalWidth: state.modalWidth,
+    TextEnum: TextEnum
   };
 
   // 组件卸载时清理
@@ -486,7 +512,7 @@ function VtxImport(props) {
           onClick: handleSelectFile,
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
             className: "".concat(prefixCls, "-label"),
-            children: intl.getMessage('import.selectFile', '选择文件')
+            children: TextEnum.selectFileText
           })
         }), state.fileName ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
           title: state.fileName,
@@ -496,7 +522,7 @@ function VtxImport(props) {
           })
         }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: "".concat(prefixCls, "-file-name"),
-          children: intl.getMessage('import.noFileSelected', '未选择任何文件')
+          children: TextEnum.noFileSelectedText
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
         type: "file",
@@ -524,11 +550,13 @@ VtxImport.propTypes = {
   postData: _propTypes.default.object,
   fileKey: _propTypes.default.string,
   accept: _propTypes.default.string,
+  token: _propTypes.default.string,
   operation: _propTypes.default.string,
   close: _propTypes.default.func,
   afterUpload: _propTypes.default.func,
   modalWidth: _propTypes.default.number,
   columns: _propTypes.default.array,
+  customEnumText: _propTypes.default.object,
   children: _propTypes.default.object,
   beforeUpload: _propTypes.default.func,
   chunkSize: _propTypes.default.number

package/lib/vtx-import/result.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,23 +9,26 @@ var _antd = require("antd");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _useSet3 = _interopRequireDefault(require("../utils/useSet"));
 var _vtxDatagrid = _interopRequireDefault(require("../vtx-datagrid"));
-var _vtxProvider = require("../vtx-provider");
 var _vtxModal = _interopRequireDefault(require("../vtx-modal"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function VtxImportResult(props) {
-  var intl = (0, _vtxProvider.useIntl)();
+  var TextEnum = _objectSpread({
+    resultTitleText: '导入结果',
+    btnCloseText: '关闭'
+  }, props.TextEnum);
   var _useSet = (0, _useSet3.default)({
       visible: props.visible || false,
       dataSource: props.dataSource || [],
@@ -36,11 +38,9 @@ function VtxImportResult(props) {
     _useSet2 = _slicedToArray(_useSet, 1),
     state = _useSet2[0];
   var modalProps = {
-    bodyStyle: {
-      backgroundColor: '#f8f8f8'
-    },
+    bodyStyle: {},
     open: state.visible,
-    title: intl.getMessage('import.result', '导入结果'),
+    title: TextEnum.resultTitleText,
     onCancel: function onCancel() {
       if (typeof props.hideVisible === 'function') {
         props.hideVisible();
@@ -57,29 +57,26 @@ function VtxImportResult(props) {
           props.hideVisible();
         }
       },
-      children: intl.getMessage('switch.close', '关闭')
+      children: TextEnum.btnCloseText
     }, "closeWindow")]
   };
   var newTableProps = {
+    toolba: false,
     columns: state.columns,
     dataSource: state.dataSource,
     startIndex: 1,
     size: 'small',
     headFootHeight: 50,
     pagination: false,
-    autoFit: false
+    autoFit: false,
+    scroll: {
+      y: 550
+    }
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxModal.default, _objectSpread(_objectSpread({}, modalProps), {}, {
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      style: {
-        maxHeight: 600,
-        width: '100%',
-        overflow: 'auto'
-      },
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxDatagrid.default, _objectSpread({
-        toolbar: false
-      }, newTableProps))
-    })
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxDatagrid.default, _objectSpread({
+      toolbar: false
+    }, newTableProps))
   }));
 }
 VtxImportResult.propTypes = {
@@ -87,6 +84,7 @@ VtxImportResult.propTypes = {
   dataSource: _propTypes.default.array,
   columns: _propTypes.default.array,
   modalWidth: _propTypes.default.number,
-  hideVisible: _propTypes.default.func
+  hideVisible: _propTypes.default.func,
+  TextEnum: _propTypes.default.object
 };
 var _default = exports.default = VtxImportResult;

package/lib/vtx-provider/locale/en_US.js

@@ -131,6 +131,8 @@ var _default = exports.default = {
     operation: 'Import',
     error: 'Upload failed',
     success: 'Upload successful',
+    rowNumber: 'Line No.',
+    errorMessage: 'Error Description',
     selectFile: 'Click to select file',
     noFileSelected: "No file selected",
     downloadTemplate: 'Download template',

package/lib/vtx-provider/locale/zh_CN.js

@@ -130,6 +130,8 @@ var _default = exports.default = {
     operation: '导入',
     error: '上传失败',
     success: '上传成功',
+    rowNumber: '行号',
+    errorMessage: '错误说明',
     selectFile: '选择文件',
     noFileSelected: "未选择任何文件",
     downloadTemplate: '下载模板',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/components",
-  "version": "4.0.0-beta.70",
+  "version": "4.0.0-beta.72",
   "description": "React components for Vortex",
   "keywords": [
     "react",