@vtx/components 4.0.0-beta.7 → 4.0.0-beta.71

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();
@@ -221,7 +230,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', '上传失败'));
@@ -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,6 +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', (0, _utils.getUrlParam)('systemCode') ? (0, _utils.getUrlParam)('systemCode') : '');
     // 添加操作日志
     request.setRequestHeader('operation', encodeURIComponent(JSON.stringify({
       menuId: sessionStorage.getItem('vtxmenuselectedKeys'),
@@ -335,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) {
@@ -372,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 + ')' : '')
@@ -394,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,
@@ -428,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,
@@ -453,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;

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

@@ -13,7 +13,7 @@ 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 genVtxImport2Style = function genVtxImport2Style(token) {
   var componentCls = token.componentCls;
-  return _defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-modal-header-title', {
+  return _defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-modal-header-title', {
     color: token.colorText
   }), '&-modal-header-text', {
     fontWeight: '400'
@@ -31,8 +31,8 @@ var genVtxImport2Style = function genVtxImport2Style(token) {
     height: '80px',
     padding: '16px 16px 16px 48px',
     color: token.colorPrimary,
-    fontSize: '14px',
-    backgroundColor: token.colorBgLayout,
+    fontSize: 14,
+    backgroundColor: token.colorBgLayoutTable,
     borderRadius: '4px'
   }, "".concat(componentCls, "-download"), {
     marginLeft: '16px'
@@ -54,7 +54,58 @@ var genVtxImport2Style = function genVtxImport2Style(token) {
     display: 'flex',
     alignItems: 'center',
     justifyContent: 'space-between',
-    color: 'fade(@black, 65%)'
+    color: token.colorTextSecondary
+  }, "".concat(componentCls, "-file-name"), {
+    overflow: 'hidden',
+    whiteSpace: 'nowrap',
+    textOverflow: 'ellipsis'
+  }))), '&:last-child ', {
+    marginTop: '20px'
+  }), "".concat(componentCls, "-content-mark"), {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    width: '28px',
+    height: '22px',
+    color: '#fff',
+    backgroundColor: token.colorPrimary,
+    border: "1px solid ".concat(token.colorPrimary),
+    borderRadius: '4px 0',
+    opacity: 0.6
+  }))), "".concat(componentCls, "-content-box"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({
+    position: 'relative',
+    display: 'flex',
+    alignItems: 'center',
+    height: '80px',
+    padding: '16px 16px 16px 48px',
+    color: token.colorPrimary,
+    fontSize: 14,
+    backgroundColor: token.colorBgLayoutTable,
+    borderRadius: '4px'
+  }, "".concat(componentCls, "-download"), {
+    marginLeft: '16px'
+  }), "".concat(componentCls, "-file-list"), _defineProperty(_defineProperty({
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'space-between',
+    width: '100%',
+    marginLeft: '16px',
+    overflow: 'hidden',
+    whiteSpace: 'nowrap',
+    textOverflow: 'ellipsis'
+  }, "".concat(componentCls, "-text"), {
+    cursor: 'pointer',
+    overflowRrap: 'break-word',
+    wordBreak: 'break-all',
+    whiteSpace: 'pre-wrap'
+  }), "".concat(componentCls, "-file-item"), _defineProperty({
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    color: token.colorBase
   }, "".concat(componentCls, "-file-name"), {
     overflow: 'hidden',
     whiteSpace: 'nowrap',
@@ -83,17 +134,17 @@ var genVtxImport2Style = function genVtxImport2Style(token) {
   }, "".concat(componentCls, "-result"), {
     marginTop: '20px',
     marginBottom: '12px',
-    color: 'fade(@black, 85%)',
+    color: token.colorText,
     fontWeight: '700',
     fontSize: '24px'
   }), "&-success-tips", {
-    color: 'fade(@black, 45%)',
-    fontSize: '14px'
+    color: token.colorTextSecondary,
+    fontSize: 14
   }), "&-error-tips", {
     color: token.colorPrimary,
-    fontSize: '14px',
+    fontSize: 14,
     cursor: 'pointer'
-  })));
+  }));
 };
 function useStyle(prefixCls) {
   return (0, _vtxProvider.useStyle)('VtxImport2', function (token) {

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/index.js

@@ -141,8 +141,8 @@ function VtxModal(props) {
     }
   };
 
-  /*
-   *重写title，加入对话框全屏功能
+  /*
+   *重写title，加入对话框全屏功能
    */
   title = function renderTitle() {
     if (typeof title == 'string' && title.indexOf('>') > -1) {
@@ -202,15 +202,20 @@ function VtxModal(props) {
     destroyOnHidden: (_props$destroyOnClose = props.destroyOnClose) !== null && _props$destroyOnClose !== void 0 ? _props$destroyOnClose : true
   };
   var newProps = _objectSpread(_objectSpread(_objectSpread({
-    maskClosable: false,
-    // destroyOnClose: true,
-    width: 700
+    mask: {
+      closable: false
+    },
+    width: 700,
+    focusable: {
+      autoFocusButton: null,
+      focusTriggerAfterClose: true,
+      trap: false
+    }
   }, props), legacyProps), {}, {
     closable: false,
     open: open,
     title: title,
     wrapClassName: (0, _classnames2.default)(prefixCls, hashId, wrapClassName, _defineProperty({}, "".concat(prefixCls, "-maxClass"), isFull ? true : false), classId.current),
-    // bodyStyle,
     onCancel: onCancel,
     style: _objectSpread(_objectSpread({}, props.style), isFull ? {} : transformStyle)
   });

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/Basic.js

@@ -10,8 +10,8 @@ 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 Basic(props) {

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) {
+/**
+ * 页面
+ * @param {*} props
+ */var Page = function Page(props) {
   var _useContext = (0, _react.useContext)(_vtxProvider.VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
   var prefix = getPrefixCls('page', props.prefixCls);
@@ -40,9 +34,9 @@ Page.propTypes = {
   children: _propTypes.default.node
 };
 
-/**
- * 内容
- * @param {*} props
+/**
+ * 内容
+ * @param {*} props
  */
 var Content = function Content(props) {
   var className = props.className,
@@ -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

@@ -33,9 +33,9 @@ var pagePaddingTop = 20;
 var searchMarginBottom = 20;
 
 // eslint-disable-next-line valid-jsdoc
-/**
- * 页面
- * @param {*} props
+/**
+ * 页面
+ * @param {*} props
  */
 var Page = function Page(props) {
   var _useContext = (0, _react.useContext)(_vtxProvider.VtxProvider),
@@ -83,17 +83,17 @@ Page.propTypes = {
   onSearchCollapse: _propTypes.default.func
 };
 
-/**
- * 搜索
+/**
+ * 搜索
  */
 var Search = (0, _container.default)({
   componentClass: 'vtx-page-table-search'
 })(_Basic.default);
 
 // eslint-disable-next-line valid-jsdoc
-/**
- * 内容
- * @param {*} props
+/**
+ * 内容
+ * @param {*} props
  */
 var Content = function Content(props) {
   var className = props.className,
@@ -128,20 +128,30 @@ Content.propTypes = {
 };
 
 // eslint-disable-next-line valid-jsdoc
-/**
- * 表格布局
+/**
+ * 表格布局
  */
 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;

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

@@ -11,16 +11,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) {
+/**
+ * 页面
+ * @param {*} props
+ */var Page = function Page(props) {
   var _useContext = (0, _react.useContext)(_vtxProvider.VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
   var prefix = getPrefixCls('page', props.prefixCls);
@@ -39,9 +33,9 @@ Page.propTypes = {
   children: _propTypes.default.node
 };
 
-/**
- * 内容
- * @param {*} props
+/**
+ * 内容
+ * @param {*} props
  */
 var Content = function Content(props) {
   var className = props.className,
@@ -54,7 +48,7 @@ var Content = function Content(props) {
     hashId = _useStyle2.hashId;
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: (0, _classnames.default)("".concat(prefix, "-tree-content"), className, hashId),
-    style: _objectSpread({}, style),
+    style: style,
     children: props.children
   }));
 };
@@ -67,7 +61,7 @@ var Tree = function Tree(props) {
   var className = props.className,
     style = props.style;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: (0, _classnames.default)('vtx-page-tree-wrap', className ? className : ''),
+    className: (0, _classnames.default)('vtx-page-tree-wrap', className),
     style: style,
     children: props.children
   });

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

@@ -24,8 +24,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 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 _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 getDisplayName(WrappedComponend) {
   return WrappedComponend.displayName || WrappedComponend.name || 'Component';
@@ -50,11 +50,12 @@ function Container() {
             className = _this$props.className,
             top = _this$props.top,
             space = _this$props.space;
-          var wrapClass = (0, _classnames2.default)(_defineProperty({}, componentClass, true), className);
-          var newStyle = _objectSpread({
-            top: top,
+          var wrapClass = (0, _classnames2.default)(_defineProperty({}, componentClass, !!componentClass), className);
+          var newStyle = _objectSpread(_objectSpread(_objectSpread({}, top !== undefined && {
+            top: top
+          }), space !== undefined && {
             padding: space
-          }, style);
+          }), style);
           var newProps = {
             className: wrapClass,
             style: newStyle
@@ -65,7 +66,7 @@ function Container() {
       return HOC;
     }(_react.default.Component), _defineProperty(_class, "displayName", "HOC(".concat(getDisplayName(WrappedComponend), ")")), _defineProperty(_class, "propTypes", {
       top: _propTypes.default.number,
-      space: _propTypes.default.number || _propTypes.default.string,
+      space: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
       style: _propTypes.default.object,
       className: _propTypes.default.string
     }), _class;

package/lib/vtx-page-layout/style/index.js

@@ -103,7 +103,7 @@ var genVtxStyle = function genVtxStyle(token) {
     '&-wrap': _objectSpread(_objectSpread({}, absolute()), {}, {
       backgroundColor: token.colorBgContainer,
       borderRadius: token.borderRadiusLG,
-      padding: '0 20px'
+      padding: '0 20px 20px 20px'
     }),
     '&-card': {
       background: token.colorBgContainer,
@@ -116,7 +116,9 @@ var genVtxStyle = function genVtxStyle(token) {
     '&-left': _defineProperty(_defineProperty({}, "".concat(componentCls, "-ztree-search"), {
       right: 0
     }), '.ant-vtx-tree-wraaper', {})
-  })), "".concat(componentCls, "-button-wrap"), _defineProperty({}, "button + button", {
+  })), "".concat(componentCls, "-button-wrap"), _defineProperty(_defineProperty({}, "button + button", {
+    marginLeft: 8
+  }), "button + .vtx-export-async", {
     marginLeft: 8
   }));
 };