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

package/es/vtx-descriptions/Descriptions.js

@@ -0,0 +1,29 @@
+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 _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
+import classnames from 'classnames';
+import React, { useContext } from 'react';
+import { Descriptions } from 'antd';
+import { useStyle } from "./style";
+import { VtxProvider } from "../vtx-provider";
+import { jsx as _jsx } from "react/jsx-runtime";
+function VtxDescriptions(props) {
+  var _useContext = useContext(VtxProvider),
+    getPrefixCls = _useContext.getPrefixCls;
+  var prefixCls = getPrefixCls('descriptions', props.prefixCls);
+  var _useStyle = useStyle(prefixCls),
+    wrapSSR = _useStyle.wrapSSR,
+    hashId = _useStyle.hashId;
+  var rest = Object.assign({}, (_objectDestructuringEmpty(props), props));
+  return wrapSSR( /*#__PURE__*/_jsx(Descriptions, _objectSpread({
+    classNames: {
+      root: classnames(hashId, prefixCls)
+    }
+  }, rest)));
+}
+VtxDescriptions.propTypes = {};
+export default VtxDescriptions;

package/es/vtx-descriptions/index.js

@@ -0,0 +1,3 @@
+import VtxDescriptions from "./Descriptions";
+export default VtxDescriptions;
+export { VtxDescriptions };

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

@@ -0,0 +1,19 @@
+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 { useStyle as useAntdStyle } from "../../vtx-provider";
+var genStyle = function genStyle(token) {
+  var componentCls = token.componentCls;
+  return _defineProperty({}, componentCls, {});
+};
+export function useStyle(prefixCls) {
+  return useAntdStyle('VtxDescriptions', function (token) {
+    var _token = _objectSpread(_objectSpread({}, token), {}, {
+      componentCls: ".".concat(prefixCls)
+    });
+    return [genStyle(_token)];
+  });
+}

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

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

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

@@ -10,7 +10,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/es/vtx-export/index.js

@@ -16,13 +16,15 @@ import PropTypes from 'prop-types';
 import axios from 'axios';
 import qs from 'querystring';
 import getToken from "../utils/getToken";
-import { DownOutlined, ExportOutlined } from '@ant-design/icons';
-import { getSignature } from '@vtx/utils';
+import { ExportOutlined } from '@ant-design/icons';
+import downloadFile from '@vtx/utils/lib/downloadFile';
+import getSignature from '@vtx/utils/lib/getSignature';
 import { isObject } from "../utils";
 import { useStyle } from "./style/index";
 import { ConfigProvider, message, Spin, Dropdown, Menu, Button } from 'antd';
 import classnames from 'classnames';
 import { useIntl } from "../vtx-provider";
+import VtxIcon from "../vtx-icon";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -102,31 +104,26 @@ var VtxExport = function VtxExport(props) {
       spinning: true,
       className: classnames(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]);
+    downloadFile(downloadURL, {
+      timeout: timeout,
+      data: postData,
+      extraHeader: headers,
+      success: function success() {
+        status = true;
+      },
+      fail: function fail() {
+        status = false;
+        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 {
-          message.warning(intl.getMessage('fallback.browserNotSupported', '浏览器不支持'));
-        }
-      }
-      // 关闭loading，执行回调
-      document.body.removeChild(div);
-      if (afterExport && typeof afterExport === 'function') {
-        afterExport(status);
       }
-    });
+    }, 'blob');
   }
   /* 下载并 兼容IE */
   function download(content, filename) {
@@ -177,7 +174,10 @@ var VtxExport = function VtxExport(props) {
     trigger: ['click'],
     children: /*#__PURE__*/_jsxs(Button, {
       icon: /*#__PURE__*/_jsx(ExportOutlined, {}),
-      children: [exportText, " ", /*#__PURE__*/_jsx(DownOutlined, {})]
+      children: [exportText, " ", /*#__PURE__*/_jsx(VtxIcon, {
+        type: "downOutlined",
+        fileType: "svg"
+      })]
     })
   }));
 };

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

@@ -38,7 +38,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 = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -106,6 +108,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;
@@ -151,7 +157,8 @@ function History(props) {
             downloadFile(downFileUrl, {
               data: {
                 id: record.id
-              }
+              },
+              extraHeader: headers
             }, 'blob');
           }
         },
@@ -251,6 +258,7 @@ History.propTypes = {
   TextEnum: PropTypes.object,
   customTableProps: PropTypes.object,
   refreshTime: PropTypes.number,
-  downloadInNewTab: PropTypes.bool
+  downloadInNewTab: PropTypes.bool,
+  headers: PropTypes.object
 };
 export default History;

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

@@ -10,11 +10,11 @@ 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, forwardRef, useContext, useMemo } from 'react';
+import React, { useEffect, forwardRef, useContext, useMemo, useRef } from 'react';
 import { ExportOutlined } from '@ant-design/icons';
 import PropTypes from 'prop-types';
 import { useSetState } from 'ahooks';
-import { Button, Form, Input, message, Modal, Radio, ConfigProvider } from 'antd';
+import { Button, Form, message, Modal, Radio, ConfigProvider } from 'antd';
 import dayjs from 'dayjs';
 import { postData } from "./util";
 import History from "./History";
@@ -23,17 +23,20 @@ import { useStyle } from "./style/index";
 import classnames from 'classnames';
 import { useIntl } from "../vtx-provider";
 import VtxModal from "../vtx-modal";
+import VtxInput from "../vtx-input";
+import { SpecialCharacters } from "../utils/filterSpecialCharacters";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var timer = null;
+var Includes = ['\\\\', '\\/', ':', '*', '?', '"', '<', '>', '|'];
 var VtxExportAsync = function VtxExportAsync(props) {
   var intl = useIntl();
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('vtx-export-async', props.prefixCls);
+  var prefixCls = getPrefixCls('', 'vtx-export-async');
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
+  var timerRef = useRef(null);
   var uniqueKey = props.uniqueKey,
     _props$title = props.title,
     title = _props$title === void 0 ? '' : _props$title,
@@ -76,9 +79,13 @@ var 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 = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -160,9 +167,9 @@ var 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({
@@ -172,6 +179,15 @@ var VtxExportAsync = function VtxExportAsync(props) {
       timer: null
     });
   }
+
+  // 组件卸载时也要清理
+  useEffect(function () {
+    return function () {
+      if (timerRef.current) {
+        clearInterval(timerRef.current);
+      }
+    };
+  }, []);
   function showHistory() {
     setState({
       showHistoryModal: true
@@ -253,6 +269,8 @@ var VtxExportAsync = function VtxExportAsync(props) {
             } else {
               message.error((res === null || res === void 0 ? void 0 : res.msg) || "".concat(intl.getMessage('export.exportText', '导出')).concat(intl.getMessage('export.failure', '失败')));
             }
+          }).catch(function (err) {
+            message.error('导出失败：' + (err.message || '网络错误'));
           });
         }
       });
@@ -282,7 +300,9 @@ var VtxExportAsync = function VtxExportAsync(props) {
         subtitle: TextEnum.modalTitleText
       }) : TextEnum.modalTitleText,
       open: state.visible,
-      maskClosable: false,
+      mask: {
+        closable: false
+      },
       onCancel: close,
       footer: [/*#__PURE__*/_jsx(Button, {
         onClick: close,
@@ -313,8 +333,15 @@ var VtxExportAsync = function VtxExportAsync(props) {
             required: true,
             message: TextEnum.requireFieldMsgText
           }],
-          children: /*#__PURE__*/_jsx(Input, {
-            placeholder: TextEnum.placeholderFileName
+          children: /*#__PURE__*/_jsx(VtxInput, {
+            placeholder: TextEnum.placeholderFileName,
+            specialCharactersFilter: {
+              include: Includes,
+              exclude: SpecialCharacters.filter(function (v) {
+                return !Includes.includes(v);
+              })
+            },
+            maxLength: 255
           })
         }), /*#__PURE__*/_jsx(Form.Item, {
           label: TextEnum.fieldTypeText,
@@ -331,7 +358,7 @@ var VtxExportAsync = function VtxExportAsync(props) {
               }, item.key);
             })
           })
-        }), /*#__PURE__*/_jsx(Form.Item, {
+        }), hideContent ? null : /*#__PURE__*/_jsx(Form.Item, {
           label: TextEnum.fieldContentText,
           name: "content",
           rules: [{
@@ -366,7 +393,8 @@ var VtxExportAsync = function VtxExportAsync(props) {
       TextEnum: TextEnum,
       customTableProps: customTableProps,
       refreshTime: refreshTime,
-      downloadInNewTab: downloadInNewTab
+      downloadInNewTab: downloadInNewTab,
+      headers: historyHeaders
     })]
   }));
 };
@@ -396,7 +424,9 @@ VtxExportAsync.propTypes = {
   refreshTime: PropTypes.number,
   downloadInNewTab: PropTypes.bool,
   enableCustomSelect: PropTypes.bool,
-  headers: PropTypes.object
+  headers: PropTypes.object,
+  beforeExport: PropTypes.object,
+  historyHeaders: PropTypes.object
 };
 export { VtxExportAsync };
 export default VtxExportAsync;

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

@@ -9,6 +9,16 @@ import qs from 'querystring';
 import getToken from "../utils/getToken";
 import getSignature from '@vtx/utils/lib/getSignature';
 var token = getToken();
+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) : qs.stringify(params);
+};
 var getData = function getData(url, params, headers) {
   return new Promise(function (resolve, reject) {
     axios.get(url, {
@@ -29,14 +39,15 @@ var getData = function getData(url, params, headers) {
 };
 var 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) : ''
+    }, getSignature(params)), headers);
     axios({
       url: url,
       method: 'post',
-      headers: _objectSpread(_objectSpread({
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Authorization: token ? "Bearer ".concat(token) : ''
-      }, getSignature(params)), headers),
-      data: qs.stringify(params)
+      headers: nextHeaders,
+      data: stringifyPostData(params, nextHeaders)
     }).then(function (res) {
       if (res.status == 200) {
         resolve(res.data);

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

@@ -12,6 +12,7 @@ import PropTypes from 'prop-types';
 import { ConfigProvider, Tooltip, Col, Form } from 'antd';
 import classnames from 'classnames';
 import { StoreCtx } from "./context";
+import { useIntl } from "../vtx-provider";
 
 // 24 栅格
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -19,6 +20,7 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 var SPAN = 24;
 export default function FormItem(props) {
   var _rest$rules;
+  var intl = useIntl();
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('', 'vtx-form-layout-item');
@@ -62,27 +64,25 @@ export default 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__*/isValidElement(child)) {
-      return /*#__PURE__*/React.cloneElement(child, {
-        placeholder: initPlaceholder(props.placeholder, label, child === null || child === void 0 ? void 0 : child.type)
-      });
+      var _child$props;
+      return /*#__PURE__*/React.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/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,