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

package/lib/vtx-ellipsis-text/index.js

@@ -28,6 +28,11 @@ function VtxEllipsisText(props) {
     tooltip = _props$tooltip === void 0 ? {} : _props$tooltip,
     className = props.className,
     style = props.style;
+
+  // 边界检查
+  if (!text) {
+    return null;
+  }
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('vtx-ellipsis-text');
@@ -35,7 +40,7 @@ function VtxEllipsisText(props) {
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
   var textStyle = {};
-  if (lineClamp > 2) {
+  if (lineClamp >= 1) {
     textStyle['WebkitLineClamp'] = lineClamp;
   }
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, _objectSpread(_objectSpread({
@@ -44,7 +49,7 @@ function VtxEllipsisText(props) {
     mouseEnterDelay: 0.3
   }, tooltip), {}, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
-      className: (0, _classnames2.default)(prefixCls, hashId, _defineProperty(_defineProperty({}, "".concat(prefixCls, "--single"), lineClamp < 2), "".concat(prefixCls, "--multi"), lineClamp >= 2), className),
+      className: (0, _classnames2.default)(prefixCls, hashId, _defineProperty(_defineProperty({}, "".concat(prefixCls, "--single"), lineClamp < 1), "".concat(prefixCls, "--multi"), lineClamp >= 1), className),
       style: _objectSpread(_objectSpread({}, style), textStyle),
       children: text
     })

package/lib/vtx-ellipsis-text/style/index.js

@@ -16,7 +16,9 @@ var genVtxEllipsisTextStyle = function genVtxEllipsisTextStyle(token) {
   return _defineProperty({}, componentCls, _defineProperty(_defineProperty({
     margin: 0,
     overflow: 'hidden',
-    textOverflow: 'ellipsis'
+    textOverflow: 'ellipsis',
+    wordBreak: "break-all",
+    wordWrap: "break-word"
   }, "&--single", {
     whiteSpace: 'nowrap'
   }), "&--multi", {

package/lib/vtx-export/index.js

@@ -11,12 +11,14 @@ var _axios = _interopRequireDefault(require("axios"));
 var _querystring = _interopRequireDefault(require("querystring"));
 var _getToken = _interopRequireDefault(require("../utils/getToken"));
 var _icons = require("@ant-design/icons");
-var _utils = require("@vtx/utils");
-var _utils2 = require("../utils");
+var _downloadFile = _interopRequireDefault(require("@vtx/utils/lib/downloadFile"));
+var _getSignature = _interopRequireDefault(require("@vtx/utils/lib/getSignature"));
+var _utils = require("../utils");
 var _index = require("./style/index");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _vtxProvider = require("../vtx-provider");
+var _vtxIcon = _interopRequireDefault(require("../vtx-icon"));
 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); }
@@ -76,10 +78,10 @@ var VtxExport = exports.VtxExport = function VtxExport(props) {
   }
 
   // eslint-disable-next-line valid-jsdoc
-  /**
-   * 发送http请求
-   * @param {Object} postData api参数
-   * @return reponse
+  /**
+   * 发送http请求
+   * @param {Object} postData api参数
+   * @return reponse
    */
   function requestToResponse(postData) {
     var params = {
@@ -90,7 +92,7 @@ var VtxExport = exports.VtxExport = function VtxExport(props) {
       headers: _objectSpread(_objectSpread({
         'Content-Type': 'application/x-www-form-urlencoded',
         Authorization: token ? "Bearer ".concat(token) : ''
-      }, headers), (0, _utils.getSignature)((0, _utils2.isObject)(postData) ? postData : {}, undefined, (0, _utils2.isObject)(postData) ? undefined : postData)),
+      }, headers), (0, _getSignature.default)((0, _utils.isObject)(postData) ? postData : {}, undefined, (0, _utils.isObject)(postData) ? undefined : postData)),
       data: (headers === null || headers === void 0 ? void 0 : headers['Content-Type']) === 'application/json' ? postData : _querystring.default.stringify(postData)
     };
     return new Promise(function (resolve, reject) {
@@ -109,31 +111,26 @@ var VtxExport = exports.VtxExport = function VtxExport(props) {
       spinning: true,
       className: (0, _classnames.default)(prefixCls, hashId, 'vtx-spin')
     }), div);
+    var status = false;
     document.body.appendChild(div);
-    requestToResponse(postData).then(function (res) {
-      var status = false;
-      // 文件存在
-      if (res.headers['content-disposition']) {
-        var contentDisposition = res.headers['content-disposition'];
-        var filename;
-        if (contentDisposition.indexOf('filename*=') > -1) {
-          filename = decodeURI(contentDisposition.split('filename*=')[1].replace("utf-8'zh_cn'", ''));
-        } else {
-          filename = decodeURI(contentDisposition.split('filename=')[1]);
+    (0, _downloadFile.default)(downloadURL, {
+      timeout: timeout,
+      data: postData,
+      extraHeader: headers,
+      success: function success() {
+        status = true;
+      },
+      fail: function fail() {
+        status = false;
+        _antd.message.error('导出失败');
+      },
+      finally: function _finally() {
+        document.body.removeChild(div);
+        if (afterExport && typeof afterExport === 'function') {
+          afterExport(status);
         }
-        if ('download' in document.createElement('a')) {
-          download(res.data, filename);
-          status = true;
-        } else {
-          _antd.message.warning(intl.getMessage('fallback.browserNotSupported', '浏览器不支持'));
-        }
-      }
-      // 关闭loading，执行回调
-      document.body.removeChild(div);
-      if (afterExport && typeof afterExport === 'function') {
-        afterExport(status);
       }
-    });
+    }, 'blob');
   }
   /* 下载并 兼容IE */
   function download(content, filename) {
@@ -145,10 +142,10 @@ var VtxExport = exports.VtxExport = function VtxExport(props) {
       downloadByATag(window.URL.createObjectURL(blob), filename);
     }
   }
-  /**
-   * 通过a标签模拟下载
-   * @param {String} href
-   * @param {String} filename
+  /**
+   * 通过a标签模拟下载
+   * @param {String} href
+   * @param {String} filename
    */
   function downloadByATag(href, filename) {
     var a = document.createElement('a');
@@ -184,7 +181,10 @@ var VtxExport = exports.VtxExport = function VtxExport(props) {
     trigger: ['click'],
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Button, {
       icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.ExportOutlined, {}),
-      children: [exportText, " ", /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.DownOutlined, {})]
+      children: [exportText, " ", /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxIcon.default, {
+        type: "downOutlined",
+        fileType: "svg"
+      })]
     })
   }));
 };

package/lib/vtx-export-async/History.js

@@ -5,18 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
 var _2 = require("./..");
 var _utils = require("@vtx/utils");
 var _ahooks = require("ahooks");
 var _antd = require("antd");
-var _util = require("./util");
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = require("react");
 var _getToken = _interopRequireDefault(require("../utils/getToken"));
+var _util = require("./util");
 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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 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; }
@@ -46,7 +44,9 @@ function History(props) {
     _props$customTablePro = props.customTableProps,
     customTableProps = _props$customTablePro === void 0 ? {} : _props$customTablePro,
     refreshTime = props.refreshTime,
-    downloadInNewTab = props.downloadInNewTab;
+    downloadInNewTab = props.downloadInNewTab,
+    _props$headers = props.headers,
+    headers = _props$headers === void 0 ? {} : _props$headers;
   var _Form$useForm = _antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -114,6 +114,10 @@ function History(props) {
     timer.current = setInterval(function () {
       refresh();
     }, refreshTime * 1000);
+    return function () {
+      timer.current && clearInterval(timer.current);
+      timer.current = null;
+    };
   }, [JSON.stringify(tableProps.dataSource)]);
   var pageSize = pagination.pageSize,
     current = pagination.current;
@@ -154,12 +158,13 @@ function History(props) {
         name: TextEnum.downloadBtnText,
         onClick: function onClick() {
           if (downloadInNewTab) {
-            window.open("".concat(downFileUrl, "?id=").concat(record.id, "&token=").concat((0, _getToken.default)('token')), '_blank');
+            window.location.href = "".concat(downFileUrl, "?id=").concat(record.id, "&token=").concat((0, _getToken.default)('token'));
           } else {
             (0, _utils.downloadFile)(downFileUrl, {
               data: {
                 id: record.id
-              }
+              },
+              extraHeader: headers
             }, 'blob');
           }
         },
@@ -259,6 +264,7 @@ History.propTypes = {
   TextEnum: _propTypes.default.object,
   customTableProps: _propTypes.default.object,
   refreshTime: _propTypes.default.number,
-  downloadInNewTab: _propTypes.default.bool
+  downloadInNewTab: _propTypes.default.bool,
+  headers: _propTypes.default.object
 };
 var _default = exports.default = History;

package/lib/vtx-export-async/index.js

@@ -18,6 +18,8 @@ var _index = require("./style/index");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _vtxProvider = require("../vtx-provider");
 var _vtxModal = _interopRequireDefault(require("../vtx-modal"));
+var _vtxInput = _interopRequireDefault(require("../vtx-input"));
+var _filterSpecialCharacters = require("../utils/filterSpecialCharacters");
 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); }
@@ -33,15 +35,16 @@ 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; }
-var timer = null;
+var Includes = ['\\\\', '\\/', ':', '*', '?', '"', '<', '>', '|'];
 var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
   var intl = (0, _vtxProvider.useIntl)();
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('vtx-export-async', props.prefixCls);
+  var prefixCls = getPrefixCls('', 'vtx-export-async');
   var _useStyle = (0, _index.useStyle)(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
+  var timerRef = (0, _react.useRef)(null);
   var uniqueKey = props.uniqueKey,
     _props$title = props.title,
     title = _props$title === void 0 ? '' : _props$title,
@@ -84,9 +87,13 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
     downloadInNewTab = _props$downloadInNewT === void 0 ? false : _props$downloadInNewT,
     _props$enableCustomSe = props.enableCustomSelect,
     enableCustomSelect = _props$enableCustomSe === void 0 ? false : _props$enableCustomSe,
-    beforeExport = props.beforeExport,
     _props$headers = props.headers,
-    headers = _props$headers === void 0 ? {} : _props$headers;
+    headers = _props$headers === void 0 ? {} : _props$headers,
+    beforeExport = props.beforeExport,
+    _props$historyHeaders = props.historyHeaders,
+    historyHeaders = _props$historyHeaders === void 0 ? {} : _props$historyHeaders,
+    _props$hideContent = props.hideContent,
+    hideContent = _props$hideContent === void 0 ? false : _props$hideContent;
   var _Form$useForm = _antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -168,9 +175,9 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
     });
   }, [state.visible]);
   function close() {
-    if (timer) {
-      clearInterval(timer);
-      timer = null;
+    if (timerRef.current) {
+      clearInterval(timerRef.current);
+      timerRef.current = null;
     }
     form.resetFields();
     setState({
@@ -180,6 +187,15 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
       timer: null
     });
   }
+
+  // 组件卸载时也要清理
+  (0, _react.useEffect)(function () {
+    return function () {
+      if (timerRef.current) {
+        clearInterval(timerRef.current);
+      }
+    };
+  }, []);
   function showHistory() {
     setState({
       showHistoryModal: true
@@ -261,6 +277,8 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
             } else {
               _antd.message.error((res === null || res === void 0 ? void 0 : res.msg) || "".concat(intl.getMessage('export.exportText', '导出')).concat(intl.getMessage('export.failure', '失败')));
             }
+          }).catch(function (err) {
+            _antd.message.error('导出失败：' + (err.message || '网络错误'));
           });
         }
       });
@@ -290,7 +308,9 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
         subtitle: TextEnum.modalTitleText
       }) : TextEnum.modalTitleText,
       open: state.visible,
-      maskClosable: false,
+      mask: {
+        closable: false
+      },
       onCancel: close,
       footer: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
         onClick: close,
@@ -321,8 +341,15 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
             required: true,
             message: TextEnum.requireFieldMsgText
           }],
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {
-            placeholder: TextEnum.placeholderFileName
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxInput.default, {
+            placeholder: TextEnum.placeholderFileName,
+            specialCharactersFilter: {
+              include: Includes,
+              exclude: _filterSpecialCharacters.SpecialCharacters.filter(function (v) {
+                return !Includes.includes(v);
+              })
+            },
+            maxLength: 255
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, {
           label: TextEnum.fieldTypeText,
@@ -339,7 +366,7 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
               }, item.key);
             })
           })
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, {
+        }), hideContent ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, {
           label: TextEnum.fieldContentText,
           name: "content",
           rules: [{
@@ -374,7 +401,8 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
       TextEnum: TextEnum,
       customTableProps: customTableProps,
       refreshTime: refreshTime,
-      downloadInNewTab: downloadInNewTab
+      downloadInNewTab: downloadInNewTab,
+      headers: historyHeaders
     })]
   }));
 };
@@ -404,6 +432,8 @@ VtxExportAsync.propTypes = {
   refreshTime: _propTypes.default.number,
   downloadInNewTab: _propTypes.default.bool,
   enableCustomSelect: _propTypes.default.bool,
-  headers: _propTypes.default.object
+  headers: _propTypes.default.object,
+  beforeExport: _propTypes.default.object,
+  historyHeaders: _propTypes.default.object
 };
 var _default = exports.default = VtxExportAsync;

package/lib/vtx-export-async/util.js

@@ -16,6 +16,16 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 var token = (0, _getToken.default)();
+var getContentType = function getContentType(headers) {
+  var contentTypeKey = Object.keys(headers || {}).find(function (key) {
+    return key.toLowerCase() === 'content-type';
+  });
+  return contentTypeKey ? headers[contentTypeKey] : '';
+};
+var stringifyPostData = function stringifyPostData(params, headers) {
+  var contentType = getContentType(headers);
+  return String(contentType).includes('application/json') ? JSON.stringify(params) : _querystring.default.stringify(params);
+};
 var getData = exports.getData = function getData(url, params, headers) {
   return new Promise(function (resolve, reject) {
     _axios.default.get(url, {
@@ -36,14 +46,15 @@ var getData = exports.getData = function getData(url, params, headers) {
 };
 var postData = exports.postData = function postData(url, params, headers) {
   return new Promise(function (resolve, reject) {
+    var nextHeaders = _objectSpread(_objectSpread({
+      'Content-Type': 'application/x-www-form-urlencoded',
+      Authorization: token ? "Bearer ".concat(token) : ''
+    }, (0, _getSignature.default)(params)), headers);
     (0, _axios.default)({
       url: url,
       method: 'post',
-      headers: _objectSpread(_objectSpread({
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Authorization: token ? "Bearer ".concat(token) : ''
-      }, (0, _getSignature.default)(params)), headers),
-      data: _querystring.default.stringify(params)
+      headers: nextHeaders,
+      data: stringifyPostData(params, nextHeaders)
     }).then(function (res) {
       if (res.status == 200) {
         resolve(res.data);

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

@@ -31,17 +31,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 = (0, _react.useState)(expand),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var style = {};
-  if (visible) {
-    style = {
+  var iconStyle = (0, _react.useMemo)(function () {
+    return visible ? {
       transform: 'rotate(90deg)'
-    };
-  }
+    } : {};
+  }, [visible]);
   (0, _react.useEffect)(function () {
     // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     onExpandChange && onExpandChange(visible);
@@ -59,8 +59,8 @@ function VtxCard(props) {
       },
       children: extra
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.RightOutlined, {
-      className: "".concat(prefixCls, "-expand-icon\""),
-      style: style,
+      className: "".concat(prefixCls, "-expand-icon"),
+      style: iconStyle,
       onClick: function onClick() {
         return setVisible(function (pre) {
           return !pre;
@@ -69,7 +69,7 @@ function VtxCard(props) {
     }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: (0, _classnames2.default)("".concat(prefixCls, "-content"), _defineProperty({}, "".concat(prefixCls, "-content-hide"), !visible)),
-      children: props.children
+      children: children
     })
   });
 }

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

@@ -22,7 +22,7 @@ function VtxDivider(props) {
   var prefixCls = getPrefixCls('', 'vtx-form-layout-divider');
   var size = props.size;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Divider, {
-    className: (0, _classnames2.default)(prefixCls, _defineProperty({}, "".concat(prefixCls, "--small'"), size === 'small'))
+    className: (0, _classnames2.default)(prefixCls, _defineProperty({}, "".concat(prefixCls, "--small"), size === 'small'))
   });
 }
 VtxDivider.propTypes = {

package/lib/vtx-form-layout/FormItem.js

@@ -10,6 +10,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _antd = require("antd");
 var _classnames7 = _interopRequireDefault(require("classnames"));
 var _context = require("./context");
+var _vtxProvider = require("../vtx-provider");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["weights", "label", "inline", "hideTooltip", "disableHtmlFor", "tooltip", "hidden", "nameExtra"]; // 24 栅格
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -25,6 +26,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 var SPAN = 24;
 function FormItem(props) {
   var _rest$rules;
+  var intl = (0, _vtxProvider.useIntl)();
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('', 'vtx-form-layout-item');
@@ -68,27 +70,25 @@ function FormItem(props) {
     if (placeholder) {
       return placeholder;
     }
-    if (typeof label === 'string') {
-      if (!['Input', 'Select', 'RangePicker', 'VtxInput', 'InputNumber', 'VtxSelect', 'TextArea'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        // console.log(type?.displayName)
-      }
-      if (['Input', 'InputNumber', 'VtxInput', 'TextArea'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        return '请输入' + label;
-      }
-      if (['Select', 'VtxColorPicker', 'VtxSelect', 'VtxCombogrid'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        return '请选择' + label;
-      }
-      if (['RangePicker'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        return undefined;
-      }
+    if (['Input', 'InputNumber', 'VtxInput', 'TextArea', 'VtxEditor'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      // return '请输入' + label
+      return intl.getMessage('tableForm.inputPlaceholder', '请输入');
+    }
+    if (['Select', 'VtxColorPicker', 'VtxSelect', 'VtxCombogrid', 'VtxTreeSelect', 'VtxZtreeSelect', 'VtxSearchMapInput'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      // return '请选择' + label
+      return intl.getMessage('tableForm.selectPlaceholder', '请选择');
+    }
+    if (['DatePicker', 'RangePicker', 'TimePicker', 'VtxDatePicker', 'VtxRangePicker', 'VtxTimePicker', 'VtxTimeRangePicker'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      return undefined;
     }
     return null;
   };
   var renderItem = function renderItem(child) {
     if ( /*#__PURE__*/(0, _react.isValidElement)(child)) {
-      return /*#__PURE__*/_react.default.cloneElement(child, {
-        placeholder: initPlaceholder(props.placeholder, label, child === null || child === void 0 ? void 0 : child.type)
-      });
+      var _child$props;
+      return /*#__PURE__*/_react.default.cloneElement(child, _objectSpread(_objectSpread({}, child.props), {}, {
+        placeholder: initPlaceholder(child === null || child === void 0 || (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.placeholder, label, child === null || child === void 0 ? void 0 : child.type)
+      }));
     }
     return child;
   };

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

@@ -17,18 +17,29 @@ function Pane(props) {
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('', 'vtx-form-layout-pane');
-  var title = props.title;
-  var items = [{
-    key: '1',
-    label: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "".concat(prefixCls, "-title"),
-      children: title
-    }),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+  var title = props.title,
+    children = props.children;
+
+  // 无标题时直接渲染内容
+  if (!title) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "".concat(prefixCls, "-content"),
-      children: props.children
-    })
-  }];
+      children: children
+    });
+  }
+  var items = (0, _react.useMemo)(function () {
+    return [{
+      key: '1',
+      label: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "".concat(prefixCls, "-title"),
+        children: title
+      }),
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "".concat(prefixCls, "-content"),
+        children: children
+      })
+    }];
+  }, [title, children, prefixCls]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Collapse, {
     className: prefixCls,
     bordered: false,