@vtx/components 4.0.0-beta.54 → 4.0.0-beta.56

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/es/vtx-datagrid/index.js +10 -2
  2. package/es/vtx-provider/index.js +1 -0
  3. package/es/vtx-select/index.js +1 -3
  4. package/lib/vtx-datagrid/index.js +10 -2
  5. package/lib/vtx-provider/index.js +1 -0
  6. package/lib/vtx-select/index.js +1 -3
  7. package/package.json +1 -1
package/es/vtx-datagrid/index.js CHANGED
@@ -130,6 +130,7 @@ function VtxTable(props) {
130
130
  var tablePlaceholder = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('tr'), function (dom) {
131
131
  return dom.className.includes('ant-table-placeholder');
132
132
  })[0];
133
+ console.log('tablePlaceholder', tablePlaceholder);
133
134
  if (bodyDiv) {
134
135
  bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
135
136
  }
@@ -154,7 +155,7 @@ function VtxTable(props) {
154
155
  var resizeObserver = new ResizeObserver(function () {
155
156
  calculateHeight();
156
157
  });
157
- if (autoFit && rootDomRef.current && scrollY) {
158
+ if (autoFit && rootDomRef.current) {
158
159
  resizeObserver.observe(rootDomRef.current, {
159
160
  box: 'border-box'
160
161
  });
@@ -164,7 +165,14 @@ function VtxTable(props) {
164
165
  resizeObserver.disconnect();
165
166
  }
166
167
  };
167
- }, [autoFit, tableSize, scrollY]);
168
+ }, [autoFit, tableSize]);
169
+
170
+ // fix: 最后一页，横向滚动条上移问题
171
+ useEffect(function () {
172
+ if (scrollY > 0) {
173
+ calculateHeight();
174
+ }
175
+ }, [scrollY]);
168
176
  useLayoutEffect(function () {
169
177
  if (autoFit) {
170
178
  calculateHeight();
package/es/vtx-provider/index.js CHANGED
@@ -268,6 +268,7 @@ export var VtxConfigProvider = function VtxConfigProvider(props) {
268
268
  colorBgLayoutTable: '#111'
269
269
  } : _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
270
270
  colorPrimary: '#3A6DFF',
271
+ colorLink: '#3A6DFF',
271
272
  colorText: '#29343D',
272
273
  colorTextSecondary: '#78829D',
273
274
  colorBorder: '#DCDFE6',
package/es/vtx-select/index.js CHANGED
@@ -217,9 +217,7 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
217
217
  className: classnames(prefixCls, hashId, _defineProperty({}, "".concat(prefixCls, "-multi"), mode == 'multiple' || mode == 'tags')),
218
218
  id: elId.current,
219
219
  ref: elRef,
220
- style: _objectSpread(_objectSpread({}, props.style), {}, {
221
- paddingRight: (mode == 'multiple' || mode == 'tags') && showAll ? 32 : 0
222
- }),
220
+ style: _objectSpread({}, props.style),
223
221
  children: /*#__PURE__*/_jsxs(Space.Compact, {
224
222
  style: {
225
223
  width: '100%'
package/lib/vtx-datagrid/index.js CHANGED
@@ -140,6 +140,7 @@ function VtxTable(props) {
140
140
  var tablePlaceholder = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('tr'), function (dom) {
141
141
  return dom.className.includes('ant-table-placeholder');
142
142
  })[0];
143
+ console.log('tablePlaceholder', tablePlaceholder);
143
144
  if (bodyDiv) {
144
145
  bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
145
146
  }
@@ -164,7 +165,7 @@ function VtxTable(props) {
164
165
  var resizeObserver = new ResizeObserver(function () {
165
166
  calculateHeight();
166
167
  });
167
- if (autoFit && rootDomRef.current && scrollY) {
168
+ if (autoFit && rootDomRef.current) {
168
169
  resizeObserver.observe(rootDomRef.current, {
169
170
  box: 'border-box'
170
171
  });
@@ -174,7 +175,14 @@ function VtxTable(props) {
174
175
  resizeObserver.disconnect();
175
176
  }
176
177
  };
177
- }, [autoFit, tableSize, scrollY]);
178
+ }, [autoFit, tableSize]);
179
+
180
+ // fix: 最后一页，横向滚动条上移问题
181
+ (0, _react.useEffect)(function () {
182
+ if (scrollY > 0) {
183
+ calculateHeight();
184
+ }
185
+ }, [scrollY]);
178
186
  (0, _react.useLayoutEffect)(function () {
179
187
  if (autoFit) {
180
188
  calculateHeight();
package/lib/vtx-provider/index.js CHANGED
@@ -303,6 +303,7 @@ var VtxConfigProvider = exports.VtxConfigProvider = function VtxConfigProvider(p
303
303
  colorBgLayoutTable: '#111'
304
304
  } : _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
305
305
  colorPrimary: '#3A6DFF',
306
+ colorLink: '#3A6DFF',
306
307
  colorText: '#29343D',
307
308
  colorTextSecondary: '#78829D',
308
309
  colorBorder: '#DCDFE6',
package/lib/vtx-select/index.js CHANGED
@@ -225,9 +225,7 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
225
225
  className: (0, _classnames2.default)(prefixCls, hashId, _defineProperty({}, "".concat(prefixCls, "-multi"), mode == 'multiple' || mode == 'tags')),
226
226
  id: elId.current,
227
227
  ref: elRef,
228
- style: _objectSpread(_objectSpread({}, props.style), {}, {
229
- paddingRight: (mode == 'multiple' || mode == 'tags') && showAll ? 32 : 0
230
- }),
228
+ style: _objectSpread({}, props.style),
231
229
  children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
232
230
  style: {
233
231
  width: '100%'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vtx/components",
3
- "version": "4.0.0-beta.54",
3
+ "version": "4.0.0-beta.56",
4
4
  "description": "React components for Vortex",
5
5
  "keywords": [
6
6
  "react",