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

package/es/vtx-combogrid/Combogrid.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["setPopoverVisible", "multiple", "onChange", "getTableData", "columns", "searchForms", "selectedRowKeys", "setSelectedRowKeys", "spread", "defaultPageSize", "customEnumText", "headFootHeight", "popoverWidth"];
+var _excluded = ["setPopoverVisible", "multiple", "onChange", "getTableData", "columns", "searchForms", "selectedRowKeys", "setSelectedRowKeys", "spread", "defaultPageSize", "customEnumText", "headFootHeight", "popoverWidth", "formProps"];
 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; }
@@ -51,6 +51,8 @@ function VtxCombogrid(props, ref) {
     _props$headFootHeight = props.headFootHeight,
     headFootHeight = _props$headFootHeight === void 0 ? 95 : _props$headFootHeight,
     popoverWidth = props.popoverWidth,
+    _props$formProps = props.formProps,
+    formProps = _props$formProps === void 0 ? {} : _props$formProps,
     rest = _objectWithoutProperties(props, _excluded);
   var prefixCls = getPrefixCls('', 'vtx-combogrid');
   var _useStyle = useStyle(prefixCls, {
@@ -184,8 +186,9 @@ function VtxCombogrid(props, ref) {
   return wrapSSR( /*#__PURE__*/_jsxs("div", {
     className: "".concat(prefixCls, "-popover"),
     ref: ref,
-    children: [formLen > 0 && /*#__PURE__*/_jsx(Form, {
-      form: form,
+    children: [formLen > 0 && /*#__PURE__*/_jsx(Form, _objectSpread(_objectSpread({
+      form: form
+    }, formProps), {}, {
       children: /*#__PURE__*/_jsxs(Row, {
         gutter: 8,
         children: [/*#__PURE__*/_jsxs(Col, {
@@ -223,7 +226,7 @@ function VtxCombogrid(props, ref) {
           })]
         })]
       })
-    }), /*#__PURE__*/_jsx("div", {
+    })), /*#__PURE__*/_jsx("div", {
       className: "".concat(prefixCls, "-main"),
       children: /*#__PURE__*/_jsx(VtxDatagrid, _objectSpread(_objectSpread(_objectSpread({
         toolbar: false

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

@@ -59,8 +59,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/es/vtx-tree-select/index.js

@@ -28,6 +28,7 @@ import { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import VtxIcon from "../vtx-icon";
 import { VtxProvider, useIntl } from "../vtx-provider";
 import { useStyle } from "./style/index";
+import { useMemoizedFn } from 'ahooks';
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -68,6 +69,19 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
     setPopOpen = _useState4[1];
   var ref = useRef();
   var size = useSize(ref);
+  var getDropdownWidth = 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 = useMemo(function () {
+    return Math.max(280, getDropdownWidth(treeData || []));
+  }, [treeData]);
   var keyNodesMapping = useMemo(function () {
     var keyNodesMapping = {};
     // 建议：添加树数据有效性检查
@@ -201,8 +215,13 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
         },
         styles: {
           popup: {
-            maxHeight: 300,
-            overflow: 'auto'
+            root: {
+              maxHeight: 300,
+              overflow: 'auto'
+            },
+            itemTitle: {
+              wordBreak: 'break-all'
+            }
           }
         },
         classNames: {
@@ -212,7 +231,8 @@ var 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/lib/vtx-combogrid/Combogrid.js

@@ -14,7 +14,7 @@ var _vtxDatagrid = _interopRequireDefault(require("../vtx-datagrid"));
 var _style = require("./style");
 var _vtxProvider = require("../vtx-provider");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["setPopoverVisible", "multiple", "onChange", "getTableData", "columns", "searchForms", "selectedRowKeys", "setSelectedRowKeys", "spread", "defaultPageSize", "customEnumText", "headFootHeight", "popoverWidth"];
+var _excluded = ["setPopoverVisible", "multiple", "onChange", "getTableData", "columns", "searchForms", "selectedRowKeys", "setSelectedRowKeys", "spread", "defaultPageSize", "customEnumText", "headFootHeight", "popoverWidth", "formProps"];
 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; }
@@ -59,6 +59,8 @@ function VtxCombogrid(props, ref) {
     _props$headFootHeight = props.headFootHeight,
     headFootHeight = _props$headFootHeight === void 0 ? 95 : _props$headFootHeight,
     popoverWidth = props.popoverWidth,
+    _props$formProps = props.formProps,
+    formProps = _props$formProps === void 0 ? {} : _props$formProps,
     rest = _objectWithoutProperties(props, _excluded);
   var prefixCls = getPrefixCls('', 'vtx-combogrid');
   var _useStyle = (0, _style.useStyle)(prefixCls, {
@@ -192,8 +194,9 @@ function VtxCombogrid(props, ref) {
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "".concat(prefixCls, "-popover"),
     ref: ref,
-    children: [formLen > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form, {
-      form: form,
+    children: [formLen > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form, _objectSpread(_objectSpread({
+      form: form
+    }, formProps), {}, {
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Row, {
         gutter: 8,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Col, {
@@ -231,7 +234,7 @@ function VtxCombogrid(props, ref) {
           })]
         })]
       })
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    })), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "".concat(prefixCls, "-main"),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxDatagrid.default, _objectSpread(_objectSpread(_objectSpread({
         toolbar: false

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.95",
   "description": "React components for Vortex",
   "keywords": [
     "react",