@vtx/components 4.0.0-beta.9 → 4.0.0-beta.91

package/lib/vtx-image/style/index.js

@@ -26,7 +26,6 @@ var center = function center() {
 };
 var genVtxImageStyle = function genVtxImageStyle(token) {
   var componentCls = token.componentCls;
-  console.log('componentCls', componentCls);
   return _defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-aspectFit', {
     position: 'relative',
     height: '100%',

package/lib/vtx-import/index.js

@@ -1,39 +1,43 @@
 "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
 });
 exports.VtxImport = VtxImport;
 exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
+var _utils = require("@vtx/utils");
 var _antd = require("antd");
+var _md = _interopRequireDefault(require("md5"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _getToken = _interopRequireDefault(require("../utils/getToken"));
 var _useSet3 = _interopRequireDefault(require("../utils/useSet"));
+var _vtxModal = _interopRequireDefault(require("../vtx-modal"));
+var _vtxProvider = require("../vtx-provider");
 var _result = _interopRequireDefault(require("./result"));
-var _getToken = _interopRequireDefault(require("../utils/getToken"));
-var _md = _interopRequireDefault(require("md5"));
-var _utils = require("@vtx/utils");
-var _classnames = _interopRequireDefault(require("classnames"));
 var _index = require("./style/index");
-var _vtxProvider = require("../vtx-provider");
 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 _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; }
-var token = (0, _getToken.default)();
+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 VtxImport(props) {
+  var templateURL = props.templateURL,
+    uploadURL = props.uploadURL,
+    afterUpload = props.afterUpload,
+    beforeUpload = props.beforeUpload;
+  var token = (0, _react.useMemo)(function () {
+    return props.token || (0, _getToken.default)();
+  }, [props.token]);
   var intl = (0, _vtxProvider.useIntl)();
   var _useContext = (0, _react.useContext)(_vtxProvider.VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
@@ -41,6 +45,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);
@@ -67,13 +87,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,
@@ -81,7 +110,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],
@@ -137,10 +167,12 @@ 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);
+      xhr.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
+      xhr.setRequestHeader('access_token', token ? "".concat(token) : '');
       xhr.send(list[indexRef.current]);
     } else {
       mergeFile();
@@ -159,26 +191,28 @@ 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);
+    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', (0, _utils.getVtxToken)('tenantId'));
@@ -300,7 +334,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') {
@@ -322,27 +356,26 @@ 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();
     },
-    maskClosable: false,
+    // maskClosable: false,
+    mask: {
+      closable: false
+    },
     footer: [templateURL ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
       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,
@@ -381,16 +414,17 @@ 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', '关闭')
-    }, "closeWindow")]
+      children: TextEnum.btnCloseText
+    }, "closeWindow")],
+    width: 520
   };
   var resultProps = {
     visible: state.resultVisible,
@@ -401,7 +435,8 @@ function VtxImport(props) {
         resultVisible: false
       });
     },
-    modalWidth: state.modalWidth
+    modalWidth: state.modalWidth,
+    TextEnum: TextEnum
   };
 
   // 组件卸载时清理
@@ -423,19 +458,80 @@ function VtxImport(props) {
       startUpload();
     }
   }, [state.chunkId]);
-  return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Modal, _objectSpread(_objectSpread({}, modalProps), {}, {
-    children: [props.children, /*#__PURE__*/(0, _jsxRuntime.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__*/(0, _jsxRuntime.jsxs)(_vtxModal.default, _objectSpread(_objectSpread({}, modalProps), {}, {
+    children: [props.children, /*#__PURE__*/(0, _jsxRuntime.jsxs)("form", {
       encType: "multipart/form-data",
       method: "post",
       target: "tmp",
       action: uploadURL,
       ref: formRef,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "".concat(prefixCls, "-btn"),
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
+          onClick: handleSelectFile,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+            className: "".concat(prefixCls, "-label"),
+            children: TextEnum.selectFileText
+          })
+        }), state.fileName ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
+          title: state.fileName,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "".concat(prefixCls, "-file-name"),
+            children: state.fileName
+          })
+        }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "".concat(prefixCls, "-file-name"),
+          children: TextEnum.noFileSelectedText
+        })]
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
         type: "file",
         name: state.fileKey,
         accept: state.accept,
-        ref: fileInputRef
-      })
+        ref: fileInputRef,
+        style: {
+          display: 'none'
+        },
+        onChange: handleFileChange
+      })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
       name: "tmp",
       style: {
@@ -452,11 +548,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,22 +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 || [],
@@ -35,47 +38,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__*/(0, _jsxRuntime.jsx)(_antd.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__*/(0, _jsxRuntime.jsx)(_antd.Modal, _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))
-    })
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxModal.default, _objectSpread(_objectSpread({}, modalProps), {}, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxDatagrid.default, _objectSpread({
+      toolbar: false
+    }, newTableProps))
   }));
 }
 VtxImportResult.propTypes = {
@@ -83,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-import/style/index.js

@@ -13,7 +13,22 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 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
+  }));
 };
 function useStyle(prefixCls) {
   return (0, _vtxProvider.useStyle)('VtxImport', function (token) {

package/lib/vtx-import2/Content.js

@@ -107,6 +107,7 @@ Content.propTypes = {
   customText: _propTypes.default.string,
   extraText: _propTypes.default.string,
   TextEnum: _propTypes.default.object,
-  extraDom: [_propTypes.default.string, _propTypes.default.node]
+  // extraDom: [PropTypes.string, PropTypes.node],
+  extraDom: _propTypes.default.object
 };
 var _default = exports.default = Content;

package/lib/vtx-import2/index.js

@@ -18,6 +18,7 @@ var _utils = require("@vtx/utils");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _index = require("./style/index");
 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 _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); }
@@ -40,7 +41,8 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 getFileName() {
   var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  var intl = (0, _vtxProvider.useIntl)();
+  var _ref = arguments.length > 1 ? arguments[1] : undefined,
+    intl = _ref.intl;
   var index = name.lastIndexOf('.');
   var suffix = name.substring(index);
   return name.substring(0, index) + "(".concat(intl.getMessage('import.errorFile', '错误文件'), ")") + suffix;
@@ -49,17 +51,20 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
   var intl = (0, _vtxProvider.useIntl)();
   var _useContext = (0, _react.useContext)(_vtxProvider.VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('import2', props.prefixCls);
+  var prefixCls = getPrefixCls('', 'vtx-import2');
   var _useStyle = (0, _index.useStyle)(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
   var visible = props.visible,
     close = props.close,
     title = props.title,
-    accept = props.accept,
-    fileKey = props.fileKey,
+    _props$accept = props.accept,
+    accept = _props$accept === void 0 ? 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,text/csv' : _props$accept,
+    _props$fileKey = props.fileKey,
+    fileKey = _props$fileKey === void 0 ? 'file' : _props$fileKey,
     uploadURL = props.uploadURL,
-    postData = props.postData,
+    _props$postData = props.postData,
+    postData = _props$postData === void 0 ? {} : _props$postData,
     errorURL = props.errorURL,
     templateURL = props.templateURL,
     afterUpload = props.afterUpload,
@@ -138,7 +143,7 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
     state = _useSet2[0],
     setState = _useSet2[1];
   var token = (0, _getToken.default)();
-  if (!token) {
+  if (props.token) {
     token = props.token;
   }
   var newErrorDownloadName = errorDownloadName;
@@ -153,7 +158,9 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
   }, interval);
   (0, _react.useEffect)(function () {
     if (fileList.length !== 0) {
-      fileName.current = getFileName(fileList[0].name);
+      fileName.current = getFileName(fileList[0].name, {
+        intl: intl
+      });
     }
   }, [fileList]);
 
@@ -208,6 +215,8 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
       };
       // 发送请求
       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();
@@ -233,6 +242,8 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
     };
     // 发送请求
     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', (0, _utils.getVtxToken)('tenantId'));
@@ -253,7 +264,7 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
     }
     request.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
     request.setRequestHeader('access_token', token ? "".concat(token) : '');
-    request.setRequestHeader('systemCode', getUrlParam('systemCode') ? getUrlParam('systemCode') : '');
+    request.setRequestHeader('systemCode', (0, _utils.getUrlParam)('systemCode') ? (0, _utils.getUrlParam)('systemCode') : '');
     // 添加操作日志
     request.setRequestHeader('operation', encodeURIComponent(JSON.stringify({
       menuId: sessionStorage.getItem('vtxmenuselectedKeys'),
@@ -336,9 +347,9 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
       }
     }
   };
-  var onUpload = function onUpload(_ref) {
-    var _ref$files = _ref.files,
-      files = _ref$files === void 0 ? fileList : _ref$files;
+  var onUpload = function onUpload(_ref2) {
+    var _ref2$files = _ref2.files,
+      files = _ref2$files === void 0 ? fileList : _ref2$files;
     if (typeof props.beforeUpload === 'function') {
       var flag = beforeUpload(files[0]);
       if (!flag) {
@@ -373,7 +384,10 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
   var modelProps = {
     open: visible,
     width: width || 392,
-    maskClosable: false,
+    // maskClosable: false,
+    mask: {
+      closable: false
+    },
     footer: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
       onClick: close,
       children: "".concat(TextEnum.btnCloseText).concat(status === 1 && result ? '(' + countdown + ')' : '')
@@ -395,7 +409,7 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
       })]
     })
   };
-  return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Modal, _objectSpread(_objectSpread({}, modelProps), {}, {
+  return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_vtxModal.default, _objectSpread(_objectSpread({}, modelProps), {}, {
     children: [status === 0 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Content.default, {
       prefixCls: prefixCls,
       fileList: fileList,
@@ -429,11 +443,6 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
     })]
   })));
 };
-VtxImport2.defaultProps = {
-  fileKey: 'file',
-  accept: 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,text/csv',
-  postData: {}
-};
 VtxImport2.propTypes = {
   visible: _propTypes.default.bool,
   templateURL: _propTypes.default.string,
@@ -454,6 +463,7 @@ VtxImport2.propTypes = {
   beforeUpload: _propTypes.default.func,
   chunkSize: _propTypes.default.number,
   width: _propTypes.default.number,
-  extraDom: [_propTypes.default.string, _propTypes.default.node]
+  // extraDom: [PropTypes.string, PropTypes.node],
+  extraDom: _propTypes.default.object
 };
 var _default = exports.default = VtxImport2;