@vtx/components 4.0.0-beta.1 → 4.0.0-beta.10

package/es/vtx-form-layout/Card.js

@@ -8,7 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
-import React, { useEffect, useState, useContext } from 'react';
+import React, { useEffect, useState, useContext, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { Card, ConfigProvider } from 'antd';
@@ -22,17 +22,17 @@ function VtxCard(props) {
     _props$expand = props.expand,
     expand = _props$expand === void 0 ? true : _props$expand,
     extra = props.extra,
-    onExpandChange = props.onExpandChange;
+    onExpandChange = props.onExpandChange,
+    children = props.children;
   var _useState = useState(expand),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var style = {};
-  if (visible) {
-    style = {
+  var iconStyle = useMemo(function () {
+    return visible ? {
       transform: 'rotate(90deg)'
-    };
-  }
+    } : {};
+  }, [visible]);
   useEffect(function () {
     // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     onExpandChange && onExpandChange(visible);
@@ -50,8 +50,8 @@ function VtxCard(props) {
       },
       children: extra
     }) : /*#__PURE__*/_jsx(RightOutlined, {
-      className: "".concat(prefixCls, "-expand-icon\""),
-      style: style,
+      className: "".concat(prefixCls, "-expand-icon"),
+      style: iconStyle,
       onClick: function onClick() {
         return setVisible(function (pre) {
           return !pre;
@@ -60,7 +60,7 @@ function VtxCard(props) {
     }),
     children: /*#__PURE__*/_jsx("div", {
       className: classnames("".concat(prefixCls, "-content"), _defineProperty({}, "".concat(prefixCls, "-content-hide"), !visible)),
-      children: props.children
+      children: children
     })
   });
 }

package/es/vtx-form-layout/Divider.js

@@ -13,7 +13,7 @@ function VtxDivider(props) {
   var prefixCls = getPrefixCls('', 'vtx-form-layout-divider');
   var size = props.size;
   return /*#__PURE__*/_jsx(Divider, {
-    className: classnames(prefixCls, _defineProperty({}, "".concat(prefixCls, "--small'"), size === 'small'))
+    className: classnames(prefixCls, _defineProperty({}, "".concat(prefixCls, "--small"), size === 'small'))
   });
 }
 VtxDivider.propTypes = {

package/es/vtx-form-layout/Pane.js

@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, { useContext, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { ConfigProvider, Collapse } from 'antd';
 import { CaretRightOutlined } from '@ant-design/icons';
@@ -8,18 +8,29 @@ function Pane(props) {
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('', 'vtx-form-layout-pane');
-  var title = props.title;
-  var items = [{
-    key: '1',
-    label: /*#__PURE__*/_jsx("div", {
-      className: "".concat(prefixCls, "-title"),
-      children: title
-    }),
-    children: /*#__PURE__*/_jsx("div", {
+  var title = props.title,
+    children = props.children;
+
+  // 无标题时直接渲染内容
+  if (!title) {
+    return /*#__PURE__*/_jsx("div", {
       className: "".concat(prefixCls, "-content"),
-      children: props.children
-    })
-  }];
+      children: children
+    });
+  }
+  var items = useMemo(function () {
+    return [{
+      key: '1',
+      label: /*#__PURE__*/_jsx("div", {
+        className: "".concat(prefixCls, "-title"),
+        children: title
+      }),
+      children: /*#__PURE__*/_jsx("div", {
+        className: "".concat(prefixCls, "-content"),
+        children: children
+      })
+    }];
+  }, [title, children, prefixCls]);
   return /*#__PURE__*/_jsx(Collapse, {
     className: prefixCls,
     bordered: false,

package/es/vtx-form-layout/style/index.js

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 { borderRadius } from 'polished';
 import { useStyle as useAntdStyle } from "../../vtx-provider";
 var genVtxFormLayoutStyle = function genVtxFormLayoutStyle(token) {
   var _componentCls;

package/es/vtx-image/Preview.js

@@ -22,15 +22,12 @@ var VIEWER = 'viewer';
 // 多张
 var GALLERY = 'gallery';
 function checkMode(x) {
-  var mode = '';
-  if (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 isObject(x) ? VIEWER : null;
 }
 export default function Preview(props) {
   var _useState = useState(),
@@ -87,6 +84,9 @@ export default function Preview(props) {
     setContainer(container);
     setViewer(viewer);
     return function () {
+      if (container) {
+        container.innerHTML = '';
+      }
       viewer && viewer.destroy();
     };
   }, []);
@@ -96,6 +96,7 @@ export default function Preview(props) {
         container.innerHTML = '';
       }
       var mode = checkMode(photo);
+      if (!mode) return null;
       var newIndex = index;
       // 单张
       if (mode === VIEWER) {
@@ -126,6 +127,10 @@ export default function Preview(props) {
       }
       viewer.update();
       viewer.view(newIndex);
+    } else {
+      if (container) {
+        container.innerHTML = '';
+      }
     }
   }, [visible]);
   return /*#__PURE__*/_jsx(_Fragment, {});

package/es/vtx-import/index.js

@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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; }
 import React, { useRef, useEffect, useContext } from 'react';
-import { ConfigProvider, message, Button, Modal } from 'antd';
+import { message, Button } from 'antd';
 import PropTypes from 'prop-types';
 import useSet from "../utils/useSet";
 import VtxImportResult from "./result";
@@ -19,9 +19,9 @@ 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 VtxModal from "../vtx-modal";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 function VtxImport(props) {
@@ -32,14 +32,19 @@ function VtxImport(props) {
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
+
+  // 用 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,
@@ -102,7 +107,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 +117,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({
@@ -135,15 +141,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) {
+          message.error(intl.getMessage('import.error', '解析响应失败'));
+          setState({
+            uploading: false
+          });
+          return;
+        }
+        if (((_res = res) === null || _res === void 0 ? void 0 : _res.result) == 0) {
           message.success(intl.getMessage('import.success', '上传成功'));
           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) || intl.getMessage('import.error', '上传失败'));
         }
       }
     };
@@ -156,7 +174,7 @@ function VtxImport(props) {
     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 +184,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 +215,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 +236,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 +267,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 +280,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(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) {
@@ -281,7 +312,8 @@ 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) || intl.getMessage('import.success', '上传成功'));
       }
     }
   };
@@ -306,22 +338,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();
@@ -350,7 +381,8 @@ function VtxImport(props) {
         closeModal();
       },
       children: intl.getMessage('switch.close', '关闭')
-    }, "closeWindow")]
+    }, "closeWindow")],
+    width: 520
   };
   var resultProps = {
     visible: state.resultVisible,
@@ -363,36 +395,45 @@ function VtxImport(props) {
     },
     modalWidth: state.modalWidth
   };
+
+  // 组件卸载时清理
+  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), {}, {
+  return wrapSSR( /*#__PURE__*/_jsxs(VtxModal, _objectSpread(_objectSpread({}, modalProps), {}, {
     children: [props.children, /*#__PURE__*/_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__*/_jsx("input", {
         type: "file",
         name: state.fileKey,
         accept: state.accept,
-        ref: function ref(dom) {
-          if (dom) state.fileInput = dom;
-        }
+        ref: fileInputRef
       })
     }), /*#__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))]
   })));
 }

package/es/vtx-import/result.js

@@ -16,6 +16,7 @@ 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();
@@ -58,7 +59,7 @@ function VtxImportResult(props) {
     pagination: false,
     autoFit: false
   };
-  return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({}, modalProps), {}, {
+  return /*#__PURE__*/_jsx(VtxModal, _objectSpread(_objectSpread({}, modalProps), {}, {
     children: /*#__PURE__*/_jsx("div", {
       style: {
         maxHeight: 600,

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

@@ -4,10 +4,21 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 { padding } from 'polished';
 import { useStyle as useAntdStyle } from "../../vtx-provider";
 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
+      }
+    }
+  });
 };
 export function useStyle(prefixCls) {
   return useAntdStyle('VtxImport', function (token) {

package/es/vtx-import2/index.js

@@ -30,6 +30,7 @@ import { getVtxToken } from '@vtx/utils';
 import classnames from 'classnames';
 import { useStyle } from "./style/index";
 import { VtxProvider, useIntl } from "../vtx-provider";
+import VtxModal from "../vtx-modal";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 function getFileName() {
@@ -215,7 +216,7 @@ var 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) {
-          message.success('上传成功');
+          message.success(intl.getMessage('import.success', '上传成功'));
           chunkUpload(res.data);
         } else {
           message.error((res === null || res === void 0 ? void 0 : res.msg) || intl.getMessage('import.error', '上传失败'));
@@ -247,6 +248,7 @@ var 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'),
@@ -388,7 +390,7 @@ var VtxImport2 = function VtxImport2(props) {
       })]
     })
   };
-  return wrapSSR( /*#__PURE__*/_jsxs(Modal, _objectSpread(_objectSpread({}, modelProps), {}, {
+  return wrapSSR( /*#__PURE__*/_jsxs(VtxModal, _objectSpread(_objectSpread({}, modelProps), {}, {
     children: [status === 0 ? /*#__PURE__*/_jsx(Content, {
       prefixCls: prefixCls,
       fileList: fileList,

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

@@ -26,7 +26,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/es/vtx-input/TextArea/index.js

@@ -45,12 +45,17 @@ var TextArea = /*#__PURE__*/forwardRef(function (props, ref) {
   }));
 
   // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-  showCount && 'value' in props && (render = /*#__PURE__*/_jsx("div", {
-    className: classnames(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__*/_jsx("div", {
+        className: classnames(prefixCls, hashId),
+        "data-count": "".concat(len, "/").concat(maxLength),
+        children: element
+      });
+    };
+  }
+  return wrapSSR(wrapper ? wrapper(render) : render);
 });
 export default TextArea;
 TextArea.propTypes = {

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

@@ -19,11 +19,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/es/vtx-page-layout/Content.js

@@ -19,7 +19,7 @@ function Content(props) {
     height = props.height;
   var contentClass = classnames(_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/es/vtx-page-layout/TabLayout.js

@@ -1,9 +1,3 @@
-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); }
 import { ConfigProvider } from 'antd';
 import classsnames from 'classnames';
 import PropTypes from 'prop-types';
@@ -50,7 +44,7 @@ var Content = function Content(props) {
     hashId = _useStyle2.hashId;
   return wrapSSR( /*#__PURE__*/_jsx("div", {
     className: classsnames("".concat(prefix, "-tab-content"), className, hashId),
-    style: _objectSpread({}, style),
+    style: style,
     children: props.children
   }));
 };

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

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

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

@@ -12,7 +12,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 = classnames(_defineProperty(_defineProperty({}, 'vtx-table-wrapper-absolute', !relative), 'vtx-table-wrapper-relative', relative), className);
   var newStyle = style;
   if (relative && 'height' in props) {
@@ -23,7 +24,7 @@ function TableWrap(props) {
   return /*#__PURE__*/_jsx("div", {
     className: tableClass,
     style: newStyle,
-    children: props.children
+    children: children
   });
 }
 export default TableWrap;