@vtx/components 4.0.0-beta.2 → 4.0.0-beta.21

package/lib/vtx-icon/index.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
 });
@@ -8,15 +7,55 @@ exports.default = exports.VtxIcon = void 0;
 var _react = require("react");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["type", "size", "className", "style", "color", "fileType"];
+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 _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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+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; }
+var iconComponents = {
+  // 核心：添加你需要的所有图标， 动态导入有的组件会失败
+  alignRightOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/alignRightOutlined.js"));
+    });
+  }),
+  columnHeightOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/columnHeightOutlined.js"));
+    });
+  }),
+  downOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/downOutlined.js"));
+    });
+  }),
+  fullscreen: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/fullscreen.js"));
+    });
+  }),
+  redoOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/redoOutlined.js"));
+    });
+  }),
+  rightOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/rightOutlined.js"));
+    });
+  }),
+  settingOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/settingOutlined.js"));
+    });
+  })
+  // 新增其他图标...
+};
 var VtxIcon = exports.VtxIcon = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var type = _ref.type,
     _ref$size = _ref.size,
@@ -34,18 +73,24 @@ var VtxIcon = exports.VtxIcon = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   if (!type) {
     return null;
   }
+  // const SvgComponent = useMemo(() => {
+  //     // 动态导入并缓存结果
+  //     return lazy(() => import(/* @vite-ignore */`./svg/${type}.js`));
+  // }, [type]);
+
   var SvgComponent = (0, _react.useMemo)(function () {
-    // 动态导入并缓存结果
-    return /*#__PURE__*/(0, _react.lazy)(function () {
-      return function (specifier) {
-        return new Promise(function (r) {
-          return r(specifier);
-        }).then(function (s) {
-          return _interopRequireWildcard(require(s));
-        });
-      }( /* @vite-ignore */"./svg/".concat(type, ".js"));
+    // 兜底：找不到对应图标时，返回一个空组件（避免报错）
+    return iconComponents[type] || /*#__PURE__*/(0, _react.lazy)(function () {
+      return Promise.resolve({
+        default: function _default() {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", {
+            width: width,
+            height: height
+          });
+        }
+      });
     });
-  }, [type]);
+  }, [type, width, height]);
 
   // 默认返回空元素
   if (fileType == 'svg') {
@@ -87,4 +132,4 @@ var VtxIcon = exports.VtxIcon = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     );
   }
 });
-var _default = exports.default = VtxIcon;
+var _default2 = exports.default = VtxIcon;

package/lib/vtx-image/Preview.js

@@ -28,15 +28,12 @@ var VIEWER = 'viewer';
 // 多张
 var GALLERY = 'gallery';
 function checkMode(x) {
-  var mode = '';
-  if ((0, _utils.isObject)(x)) {
-    mode = VIEWER;
-  }
   if (Array.isArray(x)) {
     var len = x.length;
-    mode = len == 0 ? '' : len == 1 ? VIEWER : GALLERY;
+    if (len === 0) return null;
+    return len === 1 ? VIEWER : GALLERY;
   }
-  return mode;
+  return (0, _utils.isObject)(x) ? VIEWER : null;
 }
 function Preview(props) {
   var _useState = (0, _react.useState)(),
@@ -93,6 +90,9 @@ function Preview(props) {
     setContainer(container);
     setViewer(viewer);
     return function () {
+      if (container) {
+        container.innerHTML = '';
+      }
       viewer && viewer.destroy();
     };
   }, []);
@@ -102,6 +102,7 @@ function Preview(props) {
         container.innerHTML = '';
       }
       var mode = checkMode(photo);
+      if (!mode) return null;
       var newIndex = index;
       // 单张
       if (mode === VIEWER) {
@@ -132,6 +133,10 @@ function Preview(props) {
       }
       viewer.update();
       viewer.view(newIndex);
+    } else {
+      if (container) {
+        container.innerHTML = '';
+      }
     }
   }, [visible]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});

package/lib/vtx-import/index.js

@@ -14,9 +14,9 @@ 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 _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); }
@@ -41,14 +41,19 @@ function VtxImport(props) {
   var _useStyle = (0, _index.useStyle)(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
+
+  // 用 useRef 管理 DOM 引用，而不是 state
+  var fileInputRef = (0, _react.useRef)(null);
+  var iframeRef = (0, _react.useRef)(null);
+  var formRef = (0, _react.useRef)(null);
+
+  // 用于追踪当前 XHR 请求，方便取消
+  var xhrRef = (0, _react.useRef)(null);
   var indexRef = (0, _react.useRef)(0);
   var _useSet = (0, _useSet3.default)({
-      fileForm: null,
-      // form表单
-      fileInput: null,
-      // 保存上传的文件
-      iframe: null,
-      // form表单提交之后跳转的
+      // fileForm: null, // form表单
+      // fileInput: null, // 保存上传的文件
+      // iframe: null, // form表单提交之后跳转的
       useFormData: window.FormData ? true : false,
       // 是否查看
       uploading: false,
@@ -111,7 +116,7 @@ function VtxImport(props) {
       data.append('chunkNo', i + 1);
       data.append('chunkId', state.chunkId);
       data.append('tenantId', (0, _utils.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);
@@ -121,6 +126,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({
@@ -144,15 +150,27 @@ 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) {
+        var _res;
+        var res;
+        try {
+          res = JSON.parse(xhr.responseText);
+        } catch (e) {
+          _antd.message.error(intl.getMessage('import.error', '解析响应失败'));
+          setState({
+            uploading: false
+          });
+          return;
+        }
+        if (((_res = res) === null || _res === void 0 ? void 0 : _res.result) == 0) {
           _antd.message.success(intl.getMessage('import.success', '上传成功'));
           chunkUpload(res.data);
         } else {
-          _antd.message.error((res === null || res === void 0 ? void 0 : res.msg) || intl.getMessage('import.error', '上传失败'));
+          var _res2;
+          _antd.message.error(((_res2 = res) === null || _res2 === void 0 ? void 0 : _res2.msg) || intl.getMessage('import.error', '上传失败'));
         }
       }
     };
@@ -165,7 +183,7 @@ function VtxImport(props) {
     data.append('chunkId', state.chunkId);
     data.append('tenantId', (0, _utils.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);
   }
 
@@ -175,6 +193,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) : '');
@@ -205,6 +224,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) : '');
@@ -225,7 +245,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);
     }
   }
@@ -256,7 +276,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 {
@@ -267,15 +289,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) {
+      _antd.message.error(intl.getMessage('import.error', '解析响应数据失败'));
+      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) {
@@ -290,7 +321,8 @@ function VtxImport(props) {
     } else {
       // 新增其他错误提示
       if (parseData.result !== 0) {
-        _antd.message.error((parseData === null || parseData === void 0 ? void 0 : parseData.msg) || intl.getMessage('import.success', '上传成功'));
+        var _parseData2;
+        _antd.message.error(((_parseData2 = parseData) === null || _parseData2 === void 0 ? void 0 : _parseData2.msg) || intl.getMessage('import.success', '上传成功'));
       }
     }
   };
@@ -315,22 +347,21 @@ function VtxImport(props) {
       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();
@@ -359,7 +390,8 @@ function VtxImport(props) {
         closeModal();
       },
       children: intl.getMessage('switch.close', '关闭')
-    }, "closeWindow")]
+    }, "closeWindow")],
+    width: 520
   };
   var resultProps = {
     visible: state.resultVisible,
@@ -372,36 +404,45 @@ function VtxImport(props) {
     },
     modalWidth: state.modalWidth
   };
+
+  // 组件卸载时清理
+  (0, _react.useEffect)(function () {
+    return function () {
+      // 取消进行中的 XHR 请求
+      if (xhrRef.current) {
+        xhrRef.current.abort();
+        xhrRef.current = null;
+      }
+      // 清理文件输入
+      if (fileInputRef.current) {
+        fileInputRef.current.value = '';
+      }
+    };
+  }, []);
   (0, _react.useEffect)(function () {
     if (state.chunkId) {
       startUpload();
     }
   }, [state.chunkId]);
-  return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Modal, _objectSpread(_objectSpread({}, modalProps), {}, {
+  return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_vtxModal.default, _objectSpread(_objectSpread({}, modalProps), {}, {
     children: [props.children, /*#__PURE__*/(0, _jsxRuntime.jsx)("form", {
       encType: "multipart/form-data",
       method: "post",
       target: "tmp",
       action: uploadURL,
-      ref: function ref(dom) {
-        if (dom) state.fileForm = dom;
-      },
+      ref: formRef,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
         type: "file",
         name: state.fileKey,
         accept: state.accept,
-        ref: function ref(dom) {
-          if (dom) state.fileInput = dom;
-        }
+        ref: fileInputRef
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
       name: "tmp",
       style: {
         display: 'none'
       },
-      ref: function ref(dom) {
-        if (dom) state.iframe = dom;
-      }
+      ref: iframeRef
     }), state.resultVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)(_result.default, _objectSpread({}, resultProps))]
   })));
 }

package/lib/vtx-import/result.js

@@ -11,6 +11,7 @@ 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; }
@@ -65,7 +66,7 @@ function VtxImportResult(props) {
     pagination: false,
     autoFit: false
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Modal, _objectSpread(_objectSpread({}, modalProps), {}, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxModal.default, _objectSpread(_objectSpread({}, modalProps), {}, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       style: {
         maxHeight: 600,

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

@@ -13,7 +13,17 @@ 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, {
+    '.ant-modal-container': {
+      padding: 0,
+      '.ant-modal-header': {
+        padding: 20
+      },
+      '.ant-modal-body': {
+        padding: 20
+      }
+    }
+  });
 };
 function useStyle(prefixCls) {
   return (0, _vtxProvider.useStyle)('VtxImport', function (token) {

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); }
@@ -221,7 +222,7 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
       if (xhr.status === 200) {
         var res = JSON.parse(xhr.responseText);
         if ((res === null || res === void 0 ? void 0 : res.result) == 0) {
-          _antd.message.success('上传成功');
+          _antd.message.success(intl.getMessage('import.success', '上传成功'));
           chunkUpload(res.data);
         } else {
           _antd.message.error((res === null || res === void 0 ? void 0 : res.msg) || intl.getMessage('import.error', '上传失败'));
@@ -253,6 +254,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('operation', encodeURIComponent(JSON.stringify({
       menuId: sessionStorage.getItem('vtxmenuselectedKeys'),
@@ -394,7 +396,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,

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

@@ -32,7 +32,7 @@ var genVtxImport2Style = function genVtxImport2Style(token) {
     padding: '16px 16px 16px 48px',
     color: token.colorPrimary,
     fontSize: '14px',
-    backgroundColor: token.colorBgLayout,
+    backgroundColor: token.colorBgLayoutTable,
     borderRadius: '4px'
   }, "".concat(componentCls, "-download"), {
     marginLeft: '16px'

package/lib/vtx-input/TextArea/index.js

@@ -54,12 +54,17 @@ var TextArea = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }));
 
   // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-  showCount && 'value' in props && (render = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: (0, _classnames.default)(prefixCls, hashId),
-    "data-count": "".concat(len, "/").concat(maxLength),
-    children: render
-  }));
-  return wrapSSR(render);
+  var wrapper = null;
+  if (showCount && 'value' in props) {
+    wrapper = function wrapper(element) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: (0, _classnames.default)(prefixCls, hashId),
+        "data-count": "".concat(len, "/").concat(maxLength),
+        children: element
+      });
+    };
+  }
+  return wrapSSR(wrapper ? wrapper(render) : render);
 });
 var _default = exports.default = TextArea;
 TextArea.propTypes = {

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

@@ -25,11 +25,13 @@ var genVtxModalStyle = function genVtxModalStyle(token) {
           padding: 0
         },
         '.ant-modal-body': {
-          maxHeight: 'calc(100% - 108px)',
+          height: 'calc(100% - 108px)',
           padding: '12px 20px 8px 20px',
-          overflowY: 'auto',
-          height: '100%'
+          overflowY: 'auto'
         }
+      },
+      '.ant-modal-container': {
+        padding: 0
       }
     }
   }, '&-title', _defineProperty(_defineProperty(_defineProperty({

package/lib/vtx-page-layout/Content.js

@@ -26,7 +26,7 @@ function Content(props) {
     height = props.height;
   var contentClass = (0, _classnames2.default)(_defineProperty(_defineProperty(_defineProperty({}, 'vtx-page-content-absolute', !relative), 'vtx-page-content-relative', relative), 'vtx-page-content-scroll-y', scrollY), className);
   var newStyle = style;
-  if ('height' in props) {
+  if (height !== undefined) {
     newStyle = _objectSpread(_objectSpread({}, newStyle), {}, {
       height: height
     });

package/lib/vtx-page-layout/TabLayout.js

@@ -12,16 +12,10 @@ var _style = require("./style");
 var _vtxProvider = require("../vtx-provider");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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); } /**
+/**
  * 页面
  * @param {*} props
- */
-var Page = function Page(props) {
+ */var Page = function Page(props) {
   var _useContext = (0, _react.useContext)(_vtxProvider.VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
   var prefix = getPrefixCls('page', props.prefixCls);
@@ -55,7 +49,7 @@ var Content = function Content(props) {
     hashId = _useStyle2.hashId;
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: (0, _classnames.default)("".concat(prefix, "-tab-content"), className, hashId),
-    style: _objectSpread({}, style),
+    style: style,
     children: props.children
   }));
 };

package/lib/vtx-page-layout/TableLayout.js

@@ -133,15 +133,25 @@ Content.propTypes = {
  */
 var Table = function Table(props) {
   var className = props.className,
-    style = props.style;
+    style = props.style,
+    children = props.children;
   var _useContext3 = (0, _react.useContext)(StoreCtx),
     searchCollapseEvent$ = _useContext3.searchCollapseEvent$;
+
+  // 安全检查：如果不是有效的 React 元素，直接渲染不注入 props
+  if (! /*#__PURE__*/_react.default.isValidElement(children)) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: (0, _classnames.default)('vtx-page-table-wrap', className),
+      style: style,
+      children: children
+    });
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: (0, _classnames.default)('vtx-page-table-wrap', className ? className : ''),
+    className: (0, _classnames.default)('vtx-page-table-wrap', className),
     style: style,
-    children: /*#__PURE__*/_react.default.cloneElement(props.children, _objectSpread(_objectSpread({}, props.children.props), {}, {
+    children: /*#__PURE__*/_react.default.cloneElement(children, {
       searchCollapseEvent$: searchCollapseEvent$
-    }))
+    })
   });
 };
 Table.propTypes = {

package/lib/vtx-page-layout/TableWrap.js

@@ -19,7 +19,8 @@ function TableWrap(props) {
   var relative = props.relative,
     height = props.height,
     style = props.style,
-    className = props.className;
+    className = props.className,
+    children = props.children;
   var tableClass = (0, _classnames2.default)(_defineProperty(_defineProperty({}, 'vtx-table-wrapper-absolute', !relative), 'vtx-table-wrapper-relative', relative), className);
   var newStyle = style;
   if (relative && 'height' in props) {
@@ -30,7 +31,7 @@ function TableWrap(props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: tableClass,
     style: newStyle,
-    children: props.children
+    children: children
   });
 }
 var _default = exports.default = TableWrap;