@vtx/components 4.0.0-beta.8 → 4.0.0-beta.80

package/es/vtx-import/index.js

@@ -1,30 +1,38 @@
 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 { ConfigProvider, message, Button, Modal } from 'antd';
+import { message, Button, Tooltip } from 'antd';
 import PropTypes from 'prop-types';
 import useSet from "../utils/useSet";
 import VtxImportResult from "./result";
 import getToken from "../utils/getToken";
-var token = getToken();
 import md5 from 'md5';
 import { getVtxToken, getSignature } from '@vtx/utils';
-import classnames from 'classnames';
 import { useStyle } from "./style/index";
 import { VtxProvider, useIntl } from "../vtx-provider";
-import { jsx as _jsx } from "react/jsx-runtime";
+import VtxModal from "../vtx-modal";
 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");
+  }
   var intl = useIntl();
   var _useContext = useContext(VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
@@ -32,14 +40,35 @@ 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);
+  var iframeRef = useRef(null);
+  var formRef = useRef(null);
+
+  // 用于追踪当前 XHR 请求，方便取消
+  var xhrRef = useRef(null);
   var indexRef = useRef(0);
   var _useSet = useSet({
-      fileForm: null,
-      // form表单
-      fileInput: null,
-      // 保存上传的文件
-      iframe: null,
-      // form表单提交之后跳转的
+      // fileForm: null, // form表单
+      // fileInput: null, // 保存上传的文件
+      // iframe: null, // form表单提交之后跳转的
       useFormData: window.FormData ? true : false,
       // 是否查看
       uploading: false,
@@ -53,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,
@@ -67,7 +105,8 @@ function VtxImport(props) {
       currentIndex: 0,
       chunkId: '',
       chunks: [],
-      operation: props.operation || intl.getMessage('import.operation', '导入')
+      operation: props.operation || TextEnum.operationText,
+      fileName: ''
     }),
     _useSet2 = _slicedToArray(_useSet, 2),
     state = _useSet2[0],
@@ -102,7 +141,7 @@ function VtxImport(props) {
       data.append('chunkNo', i + 1);
       data.append('chunkId', state.chunkId);
       data.append('tenantId', getVtxToken('tenantId'));
-      data.append('file', new File([e], state.fileInput.files[0].name));
+      data.append('file', new File([e], fileInputRef.current.files[0].name));
       dataArr.push(data);
     });
     uploadAsync(dataArr);
@@ -112,6 +151,7 @@ function VtxImport(props) {
   function uploadAsync(list) {
     if (indexRef.current < list.length) {
       var xhr = new XMLHttpRequest();
+      xhrRef.current = xhr;
       xhr.onload = function () {
         if (xhr.status === 200) {
           setState({
@@ -122,10 +162,12 @@ function VtxImport(props) {
         }
       };
       xhr.onerror = function () {
-        message.error(intl.getMessage('import.error', '上传失败'));
+        message.error(TextEnum.uploadFailedText);
       };
       // 发送请求
       xhr.open('POST', '/cloudFile/common/uploadChunk', true);
+      xhr.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
+      xhr.setRequestHeader('access_token', token ? "".concat(token) : '');
       xhr.send(list[indexRef.current]);
     } else {
       mergeFile();
@@ -135,28 +177,42 @@ function VtxImport(props) {
   // 合并分片
   function mergeFile() {
     var xhr = new XMLHttpRequest();
+    xhrRef.current = xhr;
     // 当上传完成时调用
     xhr.onload = function () {
       if (xhr.status === 200) {
-        var res = JSON.parse(xhr.responseText);
-        if ((res === null || res === void 0 ? void 0 : res.result) == 0) {
-          message.success(intl.getMessage('import.success', '上传成功'));
+        var _res;
+        var res;
+        try {
+          res = JSON.parse(xhr.responseText);
+        } catch (e) {
+          message.error(TextEnum.parseResponseFailedText);
+          setState({
+            uploading: false
+          });
+          return;
+        }
+        if (((_res = res) === null || _res === void 0 ? void 0 : _res.result) == 0) {
+          message.success(TextEnum.uploadSuccessText);
           chunkUpload(res.data);
         } else {
-          message.error((res === null || res === void 0 ? void 0 : res.msg) || intl.getMessage('import.error', '上传失败'));
+          var _res2;
+          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);
+    xhr.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
+    xhr.setRequestHeader('access_token', token ? "".concat(token) : '');
     var data = new FormData();
     data.append('chunkId', state.chunkId);
     data.append('tenantId', getVtxToken('tenantId'));
     data.append('chunkSize', state.chunks.length);
-    data.append('fileName', state.fileInput.files[0].name);
+    data.append('fileName', fileInputRef.current.files[0].name);
     xhr.send(data);
   }
 
@@ -166,6 +222,7 @@ function VtxImport(props) {
     var postData = props.postData || {};
     if (state.useFormData) {
       var request = new XMLHttpRequest();
+      xhrRef.current = request;
       // 发送请求
       request.open('POST', postUrl);
       request.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
@@ -196,6 +253,7 @@ function VtxImport(props) {
     var postData = props.postData || {};
     if (state.useFormData) {
       var request = new XMLHttpRequest();
+      xhrRef.current = request;
       // 发送请求
       request.open('POST', postUrl);
       request.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
@@ -216,7 +274,7 @@ function VtxImport(props) {
       };
       //创建formdata对象
       var fmd = new FormData();
-      fmd.append(state.fileKey, state.fileInput.files[0]);
+      fmd.append(state.fileKey, fileInputRef.current.files[0]);
       request.send(fmd);
     }
   }
@@ -247,7 +305,9 @@ function VtxImport(props) {
     return postArray.length > 0 ? "".concat(postUrl, "?").concat(postArray.join('&')) : postUrl;
   };
   var closeModal = function closeModal() {
-    state.fileInput.value = '';
+    if (fileInputRef.current) {
+      fileInputRef.current.value = '';
+    }
     if (typeof props.close === 'function') {
       props.close();
     } else {
@@ -258,15 +318,24 @@ function VtxImport(props) {
   };
   // 上传之后的回调 - 展示报错信息
   var uploadSuccess = function uploadSuccess(data) {
-    state.fileInput.value = '';
+    var _parseData;
+    if (fileInputRef.current) {
+      fileInputRef.current.value = '';
+    }
     setState({
       uploading: false
     });
+    var parseData;
+    try {
+      parseData = JSON.parse(data);
+    } catch (e) {
+      message.error(TextEnum.parseResponseDataFailedText);
+      return;
+    }
     if (typeof props.afterUpload === 'function') {
       afterUpload(data);
     }
-    var parseData = JSON.parse(data);
-    if (Array.isArray(parseData === null || parseData === void 0 ? void 0 : parseData.data)) {
+    if (Array.isArray((_parseData = parseData) === null || _parseData === void 0 ? void 0 : _parseData.data)) {
       setState({
         resultVisible: true,
         resultData: parseData.data.map(function (item, index) {
@@ -281,47 +350,46 @@ function VtxImport(props) {
     } else {
       // 新增其他错误提示
       if (parseData.result !== 0) {
-        message.error((parseData === null || parseData === void 0 ? void 0 : parseData.msg) || intl.getMessage('import.success', '上传成功'));
+        var _parseData2;
+        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();
     },
-    maskClosable: false,
+    // maskClosable: false,
+    mask: {
+      closable: false
+    },
     footer: [templateURL ? /*#__PURE__*/_jsx(Button, {
       onClick: function onClick() {
         window.open(templateURL);
       },
-      children: intl.getMessage('import.downloadTemplate', '下载模板')
+      children: TextEnum.downloadTemplateText
     }, "downloadTemple") : null, /*#__PURE__*/_jsx(Button, {
       type: "primary",
       loading: state.uploading,
       onClick: function onClick() {
+        var _fileInputRef$current2;
         if (typeof props.beforeUpload === 'function') {
-          var flag = beforeUpload(state.fileInput.files[0]);
+          var _fileInputRef$current;
+          var flag = beforeUpload((_fileInputRef$current = fileInputRef.current) === null || _fileInputRef$current === void 0 || (_fileInputRef$current = _fileInputRef$current.files) === null || _fileInputRef$current === void 0 ? void 0 : _fileInputRef$current[0]);
           if (!flag) {
-            state.fileInput.value = '';
-            setState({
-              fileInput: null
-            });
+            fileInputRef.current.value = '';
             return;
           }
         }
-        if (state.fileInput.value) {
+        if ((_fileInputRef$current2 = fileInputRef.current) !== null && _fileInputRef$current2 !== void 0 && _fileInputRef$current2.value) {
           setState({
             uploading: true
           });
           // 上传文件
-          checkFile(state.fileInput.files[0]);
+          checkFile(fileInputRef.current.files[0]);
           // const postUrl = getPostURL();
           // if (state.useFormData) {
           //     const request = new XMLHttpRequest();
@@ -341,16 +409,17 @@ 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', '关闭')
-    }, "closeWindow")]
+      children: TextEnum.btnCloseText
+    }, "closeWindow")],
+    width: 520
   };
   var resultProps = {
     visible: state.resultVisible,
@@ -361,38 +430,109 @@ function VtxImport(props) {
         resultVisible: false
       });
     },
-    modalWidth: state.modalWidth
+    modalWidth: state.modalWidth,
+    TextEnum: TextEnum
   };
+
+  // 组件卸载时清理
+  useEffect(function () {
+    return function () {
+      // 取消进行中的 XHR 请求
+      if (xhrRef.current) {
+        xhrRef.current.abort();
+        xhrRef.current = null;
+      }
+      // 清理文件输入
+      if (fileInputRef.current) {
+        fileInputRef.current.value = '';
+      }
+    };
+  }, []);
   useEffect(function () {
     if (state.chunkId) {
       startUpload();
     }
   }, [state.chunkId]);
-  return wrapSSR( /*#__PURE__*/_jsxs(Modal, _objectSpread(_objectSpread({}, modalProps), {}, {
-    children: [props.children, /*#__PURE__*/_jsx("form", {
+  var truncateFileName = function truncateFileName(fileName) {
+    var maxLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 28;
+    if (fileName.length <= maxLength) return fileName;
+    var extIndex = fileName.lastIndexOf('.');
+    var ext = extIndex !== -1 ? fileName.slice(extIndex) : '';
+    var name = extIndex !== -1 ? fileName.slice(0, extIndex) : fileName;
+    var availableLength = maxLength - ext.length - 3; // 3 是 "..."
+    if (availableLength <= 0) return "...".concat(ext);
+    var startLength = Math.ceil(availableLength / 2);
+    var endLength = Math.floor(availableLength / 2);
+    var start = name.slice(0, startLength);
+    var end = name.slice(-endLength);
+    return "".concat(start, "...").concat(end).concat(ext);
+  };
+
+  // 处理文件选择变化
+  var handleFileChange = function handleFileChange(event) {
+    var _event$target$files;
+    var file = (_event$target$files = event.target.files) === null || _event$target$files === void 0 ? void 0 : _event$target$files[0];
+    if (file) {
+      setState(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          fileName: truncateFileName(file.name)
+        });
+      });
+      // 这里可以添加文件上传或其他处理逻辑
+      // 例如：uploadFile(file);
+    } else {
+      setState(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          fileName: ''
+        });
+      });
+    }
+  };
+  var handleSelectFile = function handleSelectFile() {
+    var _fileInputRef$current3;
+    (_fileInputRef$current3 = fileInputRef.current) === null || _fileInputRef$current3 === void 0 || _fileInputRef$current3.click();
+  };
+  return wrapSSR( /*#__PURE__*/_jsxs(VtxModal, _objectSpread(_objectSpread({}, modalProps), {}, {
+    children: [props.children, /*#__PURE__*/_jsxs("form", {
       encType: "multipart/form-data",
       method: "post",
       target: "tmp",
       action: uploadURL,
-      ref: function ref(dom) {
-        if (dom) state.fileForm = dom;
-      },
-      children: /*#__PURE__*/_jsx("input", {
+      ref: formRef,
+      children: [/*#__PURE__*/_jsxs("div", {
+        className: "".concat(prefixCls, "-btn"),
+        children: [/*#__PURE__*/_jsx(Button, {
+          onClick: handleSelectFile,
+          children: /*#__PURE__*/_jsx("span", {
+            className: "".concat(prefixCls, "-label"),
+            children: TextEnum.selectFileText
+          })
+        }), state.fileName ? /*#__PURE__*/_jsx(Tooltip, {
+          title: state.fileName,
+          children: /*#__PURE__*/_jsx("div", {
+            className: "".concat(prefixCls, "-file-name"),
+            children: state.fileName
+          })
+        }) : /*#__PURE__*/_jsx("div", {
+          className: "".concat(prefixCls, "-file-name"),
+          children: TextEnum.noFileSelectedText
+        })]
+      }), /*#__PURE__*/_jsx("input", {
         type: "file",
         name: state.fileKey,
         accept: state.accept,
-        ref: function ref(dom) {
-          if (dom) state.fileInput = dom;
-        }
-      })
+        ref: fileInputRef,
+        style: {
+          display: 'none'
+        },
+        onChange: handleFileChange
+      })]
     }), /*#__PURE__*/_jsx("iframe", {
       name: "tmp",
       style: {
         display: 'none'
       },
-      ref: function ref(dom) {
-        if (dom) state.iframe = dom;
-      }
+      ref: iframeRef
     }), state.resultVisible && /*#__PURE__*/_jsx(VtxImportResult, _objectSpread({}, resultProps))]
   })));
 }
@@ -403,11 +543,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,24 +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 || [],
@@ -28,47 +31,45 @@ 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();
       }
     },
     width: state.modalWidth,
-    maskClosable: false,
+    // maskClosable: false,
+    mask: {
+      closable: false
+    },
     footer: [/*#__PURE__*/_jsx(Button, {
       onClick: function onClick() {
         if (typeof props.hideVisible === 'function') {
           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(Modal, _objectSpread(_objectSpread({}, modalProps), {}, {
-    children: /*#__PURE__*/_jsx("div", {
-      style: {
-        maxHeight: 600,
-        width: '100%',
-        overflow: 'auto'
-      },
-      children: /*#__PURE__*/_jsx(VtxDatagrid, _objectSpread({
-        toolbar: false
-      }, newTableProps))
-    })
+  return /*#__PURE__*/_jsx(VtxModal, _objectSpread(_objectSpread({}, modalProps), {}, {
+    children: /*#__PURE__*/_jsx(VtxDatagrid, _objectSpread({
+      toolbar: false
+    }, newTableProps))
   }));
 }
 VtxImportResult.propTypes = {
@@ -76,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-import/style/index.js

@@ -7,7 +7,22 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { useStyle as useAntdStyle } from "../../vtx-provider";
 var genVtxImportStyle = function genVtxImportStyle(token) {
   var componentCls = token.componentCls;
-  return _defineProperty({}, componentCls, {});
+  return _defineProperty({}, componentCls, _defineProperty({
+    '.ant-modal-container': {
+      padding: 0,
+      '.ant-modal-header': {
+        padding: 20
+      },
+      '.ant-modal-body': {
+        padding: 20
+      }
+    }
+  }, '&-btn', {
+    display: 'flex',
+    justifyContent: 'flex-start',
+    alignItems: 'center',
+    gap: 8
+  }));
 };
 export function useStyle(prefixCls) {
   return useAntdStyle('VtxImport', function (token) {

package/es/vtx-import2/Content.js

@@ -98,6 +98,7 @@ Content.propTypes = {
   customText: PropTypes.string,
   extraText: PropTypes.string,
   TextEnum: PropTypes.object,
-  extraDom: [PropTypes.string, PropTypes.node]
+  // extraDom: [PropTypes.string, PropTypes.node],
+  extraDom: PropTypes.object
 };
 export default Content;