@vtx/components 4.0.0-beta.45 → 4.0.0-beta.47

package/es/vtx-combogrid/index.js

@@ -74,8 +74,8 @@ var VtxCombogrid = /*#__PURE__*/forwardRef(function (props, ref) {
       ref: comboRef
     })),
     trigger: "click",
-    visible: disabled ? false : visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: disabled ? false : visible,
+    onOpenChange: function onOpenChange(visible) {
       return setVisible(visible);
     },
     classNames: {

package/es/vtx-datagrid/Store/Provide.js

@@ -17,6 +17,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useMergedState } from '@rc-component/util';
 import request from '@vtx/utils/lib/request';
 import getSignature from '@vtx/utils/lib/getSignature';
+import VtxEllipsisText from "../../vtx-ellipsis-text";
 import { createContext, useEffect, useMemo, useRef, useState, useCallback } from 'react';
 import { useIntl } from "../../vtx-provider";
 import { message } from 'antd';
@@ -230,7 +231,10 @@ function useContainer() {
             })
           });
         } : 'render' in column ? column.render : function (text) {
-          return ['', null, undefined].includes(text) ? '-' : text;
+          return ['', null, undefined].includes(text) ? '-' : column.ellipse && typeof text === 'string' ? /*#__PURE__*/_jsx(VtxEllipsisText, {
+            text: text,
+            lineClamp: 2
+          }) : text;
         }
       });
     });

package/es/vtx-datagrid/index.js

@@ -364,9 +364,7 @@ function VtxTable(props) {
       bordered: true
       // virtual
     }, rest), {}, {
-      dataSource: dataSource
-      // scroll={{  ...scroll }}   
-      ,
+      dataSource: dataSource,
       scroll: _objectSpread({
         x: 'max-content'
       }, scroll),
@@ -380,8 +378,10 @@ function VtxTable(props) {
         })
       }, rest.locale),
       components: _components,
-      columns: _columns,
-      tableLayout: 'auto'
+      columns: _columns
+      // tableLayout={'auto'}
+      ,
+      tableLayout: "fixed"
     }))]
   }));
 }

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

@@ -8,12 +8,14 @@ import { useStyle as useAntdStyle } from "../../vtx-provider";
 var genVtxStyle = function genVtxStyle(token) {
   var componentCls = token.componentCls,
     antCls = token.antCls;
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty({
+  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty({
     position: 'relative',
     // overflow: 'hidden',
     display: 'flex',
     flexDirection: 'column'
-  }, "".concat(antCls, "-table-wrapper"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "table", {
+  }, "".concat(antCls, "-table-cell-ellipsis"), {
+    whiteSpace: "normal"
+  }), "".concat(antCls, "-table-wrapper"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "table", {
     // minWidth: "calc(100% - 2px) !important"
   }), '.ant-spin', _defineProperty({
     height: '100%'

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

@@ -31,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({
@@ -40,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-select/index.js

@@ -135,8 +135,9 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   };
   var newProps = _objectSpread(_objectSpread({
-    showSearch: true,
-    optionFilterProp: 'children',
+    showSearch: {
+      optionFilterProp: 'label'
+    },
     placeholder: TextEnum.defaultPlaceholderText,
     allowClear: true
   }, props), {}, {

package/lib/vtx-combogrid/index.js

@@ -83,8 +83,8 @@ var VtxCombogrid = exports.VtxCombogrid = /*#__PURE__*/(0, _react.forwardRef)(fu
       ref: comboRef
     })),
     trigger: "click",
-    visible: disabled ? false : visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: disabled ? false : visible,
+    onOpenChange: function onOpenChange(visible) {
       return setVisible(visible);
     },
     classNames: {

package/lib/vtx-datagrid/Store/Provide.js

@@ -8,6 +8,7 @@ exports.indexColumnKey = exports.TableContext = exports.Container = void 0;
 var _util = require("@rc-component/util");
 var _request = _interopRequireDefault(require("@vtx/utils/lib/request"));
 var _getSignature = _interopRequireDefault(require("@vtx/utils/lib/getSignature"));
+var _vtxEllipsisText = _interopRequireDefault(require("../../vtx-ellipsis-text"));
 var _react = require("react");
 var _vtxProvider = require("../../vtx-provider");
 var _antd = require("antd");
@@ -237,7 +238,10 @@ function useContainer() {
             })
           });
         } : 'render' in column ? column.render : function (text) {
-          return ['', null, undefined].includes(text) ? '-' : text;
+          return ['', null, undefined].includes(text) ? '-' : column.ellipse && typeof text === 'string' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxEllipsisText.default, {
+            text: text,
+            lineClamp: 2
+          }) : text;
         }
       });
     });

package/lib/vtx-datagrid/index.js

@@ -374,9 +374,7 @@ function VtxTable(props) {
       bordered: true
       // virtual
     }, rest), {}, {
-      dataSource: dataSource
-      // scroll={{  ...scroll }}   
-      ,
+      dataSource: dataSource,
       scroll: _objectSpread({
         x: 'max-content'
       }, scroll),
@@ -390,8 +388,10 @@ function VtxTable(props) {
         })
       }, rest.locale),
       components: _components,
-      columns: _columns,
-      tableLayout: 'auto'
+      columns: _columns
+      // tableLayout={'auto'}
+      ,
+      tableLayout: "fixed"
     }))]
   }));
 }

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

@@ -14,12 +14,14 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 var genVtxStyle = function genVtxStyle(token) {
   var componentCls = token.componentCls,
     antCls = token.antCls;
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty({
+  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty({
     position: 'relative',
     // overflow: 'hidden',
     display: 'flex',
     flexDirection: 'column'
-  }, "".concat(antCls, "-table-wrapper"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "table", {
+  }, "".concat(antCls, "-table-cell-ellipsis"), {
+    whiteSpace: "normal"
+  }), "".concat(antCls, "-table-wrapper"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "table", {
     // minWidth: "calc(100% - 2px) !important"
   }), '.ant-spin', _defineProperty({
     height: '100%'

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

@@ -40,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({
@@ -49,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-select/index.js

@@ -143,8 +143,9 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
     });
   };
   var newProps = _objectSpread(_objectSpread({
-    showSearch: true,
-    optionFilterProp: 'children',
+    showSearch: {
+      optionFilterProp: 'label'
+    },
     placeholder: TextEnum.defaultPlaceholderText,
     allowClear: true
   }, props), {}, {

package/package.json

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