@vtx/components 4.0.0-beta.94 → 4.0.0-beta.96

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

@@ -5,25 +5,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.VtxExportAsync = void 0;
-var _react = _interopRequireWildcard(require("react"));
 var _icons = require("@ant-design/icons");
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _ahooks = require("ahooks");
 var _antd = require("antd");
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = require("react");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
-var _util = require("./util");
-var _History = _interopRequireDefault(require("./History"));
+var _lodashEs = require("lodash-es");
+var _filterSpecialCharacters = require("../utils/filterSpecialCharacters");
+var _vtxInput = _interopRequireDefault(require("../vtx-input"));
+var _vtxModal = _interopRequireDefault(require("../vtx-modal"));
+var _vtxProvider = require("../vtx-provider");
 var _ColumnsSelect = _interopRequireDefault(require("./ColumnsSelect"));
+var _History = _interopRequireDefault(require("./History"));
 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 _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 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; }
@@ -93,7 +92,9 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
     _props$historyHeaders = props.historyHeaders,
     historyHeaders = _props$historyHeaders === void 0 ? {} : _props$historyHeaders,
     _props$hideContent = props.hideContent,
-    hideContent = _props$hideContent === void 0 ? false : _props$hideContent;
+    hideContent = _props$hideContent === void 0 ? false : _props$hideContent,
+    _props$extraFormItems = props.extraFormItems,
+    extraFormItems = _props$extraFormItems === void 0 ? [] : _props$extraFormItems;
   var _Form$useForm = _antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -212,6 +213,10 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
           downloadAll = false,
           flag = true,
           columnJson = '';
+        var extraValues = (0, _lodashEs.cloneDeep)(values);
+        delete extraValues.type;
+        delete extraValues.fileName;
+        delete extraValues.content;
         if (enableCustomSelect) {
           columnJson = JSON.stringify(allColumns.filter(function (item) {
             return item.key !== 'action' && values.content.includes(item.key);
@@ -262,13 +267,13 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
             break;
         }
         if (flag && requestExportUrl) {
-          (0, _util.postData)(requestExportUrl, _objectSpread({
+          (0, _util.postData)(requestExportUrl, _objectSpread(_objectSpread({
             downloadAll: downloadAll,
             columnJson: columnJson,
             ids: ids.join(','),
             fileName: values.fileName,
             uniqueKey: uniqueKey
-          }, typeof getExportParams == 'function' ? getExportParams(values.type) : params), headers).then(function (res) {
+          }, typeof getExportParams == 'function' ? getExportParams(values.type) : params), extraValues), headers).then(function (res) {
             if ((res === null || res === void 0 ? void 0 : res.result) == 0) {
               setState({
                 showHistoryModal: true,
@@ -384,6 +389,13 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
               }, item.key);
             })
           })
+        }), extraFormItems === null || extraFormItems === void 0 ? void 0 : extraFormItems.map(function (v) {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({
+            label: v.name,
+            name: v.key
+          }, (v === null || v === void 0 ? void 0 : v.formItemProps) || {}), {}, {
+            children: (v === null || v === void 0 ? void 0 : v.dom) || /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {})
+          }), v.key);
         })]
       })
     }), state.showHistoryModal && /*#__PURE__*/(0, _jsxRuntime.jsx)(_History.default, {
@@ -434,6 +446,7 @@ VtxExportAsync.propTypes = {
   enableCustomSelect: _propTypes.default.bool,
   headers: _propTypes.default.object,
   beforeExport: _propTypes.default.object,
-  historyHeaders: _propTypes.default.object
+  historyHeaders: _propTypes.default.object,
+  extraFormItems: _propTypes.default.array
 };
 var _default = exports.default = VtxExportAsync;

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

@@ -66,8 +66,7 @@ var genStyle = function genStyle(token) {
   })), "".concat(antTabs, "-tab-active"), _defineProperty({
     background: 'rgba(22,119,255,0.08)',
     border: '1px solid rgba(22,119,255,0.1)',
-    color: colorPrimary,
-    fontWeight: 500
+    color: colorPrimary
   }, "".concat(antTabs, "-tab-btn"), {
     color: colorPrimary
   })), "".concat(antTabs, "-ink-bar"), {

package/lib/vtx-tree-select/index.js

@@ -73,6 +73,19 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
     setPopOpen = _useState4[1];
   var ref = (0, _react.useRef)();
   var size = (0, _ahooks.useSize)(ref);
+  var getDropdownWidth = (0, _ahooks.useMemoizedFn)(function (data) {
+    var level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    return data.reduce(function (maxWidth, item) {
+      var textWidth = Array.from(item[fieldNames.label]).reduce(function (width, char) {
+        return width + (char.charCodeAt(0) > 255 ? 14 : 8);
+      }, 0);
+      var currentWidth = level * 24 + textWidth + 64;
+      return Math.max(maxWidth, currentWidth, getDropdownWidth(item[fieldNames.children] || [], level + 1));
+    }, 0);
+  });
+  var dropdownWidth = (0, _react.useMemo)(function () {
+    return Math.max(280, getDropdownWidth(treeData || []));
+  }, [treeData]);
   var keyNodesMapping = (0, _react.useMemo)(function () {
     var keyNodesMapping = {};
     // 建议：添加树数据有效性检查
@@ -206,8 +219,13 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
         },
         styles: {
           popup: {
-            maxHeight: 300,
-            overflow: 'auto'
+            root: {
+              maxHeight: 300,
+              overflow: 'auto'
+            },
+            itemTitle: {
+              wordBreak: 'break-all'
+            }
           }
         },
         classNames: {
@@ -217,7 +235,8 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
         treeDefaultExpandAll: true,
         fieldNames: fieldNames,
         labelInValue: _labelInValue,
-        disabled: disabled
+        disabled: disabled,
+        popupMatchSelectWidth: dropdownWidth
       }, props), {}, {
         onChange: function onChange(value, label, extra) {
           return onChangeTreeSelect(value, label, extra, selectedNodes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/components",
-  "version": "4.0.0-beta.94",
+  "version": "4.0.0-beta.96",
   "description": "React components for Vortex",
   "keywords": [
     "react",