@vtx/components 4.0.0-beta.14 → 4.0.0-beta.16

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.
@@ -15,7 +15,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
15
15
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
16
16
  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); }
17
17
  import { useMergedState } from '@rc-component/util';
18
- import { request } from '@vtx/utils';
18
+ import request from '@vtx/utils/lib/request';
19
19
  import getSignature from '@vtx/utils/lib/getSignature';
20
20
  import { createContext, useEffect, useMemo, useRef, useState } from 'react';
21
21
  import { useIntl } from "../../vtx-provider";
@@ -116,9 +116,20 @@ function VtxTable(props) {
116
116
  var bodyDiv = Array.prototype.filter.call(divs, function (dom) {
117
117
  return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content');
118
118
  })[0];
119
+ var tablePlaceholder = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('tr'), function (dom) {
120
+ return dom.className.includes('ant-table-placeholder');
121
+ })[0];
119
122
  if (bodyDiv) {
120
123
  bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
121
124
  }
125
+ console.log('tablePlaceholder', tablePlaceholder);
126
+ if (tablePlaceholder) {
127
+ tablePlaceholder.style.height = "".concat(bodyHeight - (rest.scrollY || 0), "px");
128
+ var tableCell = Array.prototype.filter.call(tablePlaceholder.getElementsByTagName('td'), function (dom) {
129
+ return dom.className.includes('ant-table-cell');
130
+ })[0];
131
+ tableCell.style.height = "".concat(bodyHeight - (rest.scrollY || 0), "px");
132
+ }
122
133
  setState({
123
134
  scrollY: bodyHeight
124
135
  });
@@ -181,9 +192,6 @@ function VtxTable(props) {
181
192
  });
182
193
  };
183
194
  var _tableColumn = loopFilter(counter.tableColumn);
184
- if (!columnsMap['_serialNum']) {
185
- return [];
186
- }
187
195
  return sortByKeyArrayExtract(_tableColumn, sortKeyColumns, columnsMap, 'key');
188
196
  }, [columnsMap, counter.tableColumn, sortKeyColumns]);
189
197
 
@@ -20,18 +20,29 @@ var genVtxStyle = function genVtxStyle(token) {
20
20
  }), '.ant-table-body', _defineProperty({}, '.ant-table-tbody', {
21
21
  '>tr.ant-table-placeholder': {
22
22
  position: 'absolute',
23
- top: '25%',
23
+ bottom: 0,
24
24
  right: 0,
25
25
  left: 0,
26
26
  backgroundColor: 'transparent',
27
27
  borderTop: 'none',
28
+ height: '100%',
29
+ borderInlineEnd: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
30
+ borderBottom: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
28
31
  '>td.ant-table-cell': {
29
- display: 'flex',
30
- alignItems: 'center',
31
- justifyContent: 'center',
32
+ padding: 0,
32
33
  width: '100%',
33
34
  height: '100%',
34
- border: 'none'
35
+ border: 'none',
36
+ '.ant-table-expanded-row-fixed': {
37
+ display: 'flex',
38
+ alignItems: 'center',
39
+ justifyContent: 'center',
40
+ height: '100%',
41
+ width: '100%',
42
+ '&:after': {
43
+ borderInlineEnd: 'none'
44
+ }
45
+ }
35
46
  }
36
47
  }
37
48
  }))), '.ant-pagination', _defineProperty({}, '.ant-pagination-item', {
@@ -47,6 +58,10 @@ var genVtxStyle = function genVtxStyle(token) {
47
58
  }), '.ant-table-body', {
48
59
  '>table >tbody>tr>td': {
49
60
  borderInlineColor: 'transparent !important'
61
+ },
62
+ '>table >tbody>tr.ant-table-placeholder': {
63
+ borderInlineColor: 'transparent !important',
64
+ borderBottomColor: 'transparent !important'
50
65
  }
51
66
  }))))), "&.vtx-datagrid-striped", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty({}, '.ant-table-body', {
52
67
  '>table >tbody>tr:nth-child(odd)>td': {
@@ -1,12 +1,20 @@
1
+ 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); }
2
+ var _excluded = ["children", "defaultSize", "minSize", "maxSize", "style"];
3
+ 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; }
4
+ 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; }
5
+ 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; }
6
+ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
7
+ 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); }
8
+ function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
9
+ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
1
10
  import classnames from 'classnames';
2
11
  import React, { cloneElement, useContext, useRef } from 'react';
3
- import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels';
12
+ import { Splitter } from 'antd';
4
13
  import Resizer from "./Resizer";
5
14
  import { useStyle } from "./style";
6
15
  import { VtxProvider } from "../vtx-provider";
7
- import { jsx as _jsx } from "react/jsx-runtime";
8
16
  import { Fragment as _Fragment } from "react/jsx-runtime";
9
- import { jsxs as _jsxs } from "react/jsx-runtime";
17
+ import { jsx as _jsx } from "react/jsx-runtime";
10
18
  function removeNullChildren(children) {
11
19
  return React.Children.toArray(children).filter(function (c) {
12
20
  return c;
@@ -21,40 +29,42 @@ function VtxSplitPane(props) {
21
29
  hashId = _useStyle.hashId;
22
30
  var splitPane = useRef();
23
31
  var children = props.children,
32
+ defaultSize = props.defaultSize,
33
+ minSize = props.minSize,
34
+ maxSize = props.maxSize,
24
35
  style = props.style,
25
- _props$direction = props.direction,
26
- direction = _props$direction === void 0 ? 'horizontal' : _props$direction;
36
+ rest = _objectWithoutProperties(props, _excluded);
27
37
  var notNullChildren = removeNullChildren(children);
28
38
  var refs = useRef([]);
29
39
  return wrapSSR( /*#__PURE__*/_jsx("div", {
30
- className: classnames("".concat(prefixCls, " ").concat(prefixCls, "-").concat(direction), hashId),
40
+ className: classnames("".concat(prefixCls), hashId),
31
41
  ref: splitPane,
32
42
  style: style,
33
- children: /*#__PURE__*/_jsx(PanelGroup, {
34
- direction: direction,
43
+ children: /*#__PURE__*/_jsx(Splitter, _objectSpread(_objectSpread({}, rest), {}, {
35
44
  children: notNullChildren === null || notNullChildren === void 0 ? void 0 : notNullChildren.map(function (v, index) {
36
- return /*#__PURE__*/_jsxs(_Fragment, {
37
- children: [/*#__PURE__*/cloneElement(notNullChildren[index], {
45
+ var _v$props;
46
+ return /*#__PURE__*/_jsx(_Fragment, {
47
+ children: /*#__PURE__*/cloneElement(notNullChildren[index], _objectSpread(_objectSpread(_objectSpread({
38
48
  ref: function ref(el) {
39
49
  refs.current[index] = el;
40
- },
41
- collapsible: true
42
- }), index !== (notNullChildren === null || notNullChildren === void 0 ? void 0 : notNullChildren.length) - 1 && /*#__PURE__*/_jsx(_Fragment, {
43
- children: /*#__PURE__*/_jsx(PanelResizeHandle, {
44
- className: classnames("".concat(prefixCls, "-outer"), hashId),
45
- children: /*#__PURE__*/_jsx(Resizer, {
46
- refs: refs,
47
- index: index,
48
- direction: direction
49
- })
50
- })
51
- })]
50
+ }
51
+ }, index === 0 ? {
52
+ max: maxSize,
53
+ min: minSize,
54
+ size: defaultSize
55
+ } : {}), v.props), {}, {
56
+ collapsible: _objectSpread({
57
+ start: true,
58
+ end: true,
59
+ showCollapsibleIcon: 'auto'
60
+ }, (_v$props = v.props) === null || _v$props === void 0 ? void 0 : _v$props.collapsible)
61
+ }))
52
62
  });
53
63
  })
54
- })
64
+ }))
55
65
  }));
56
66
  }
57
67
  VtxSplitPane.propTypes = {};
58
68
  VtxSplitPane.defaultProps = {};
59
- VtxSplitPane.Pane = Panel;
69
+ VtxSplitPane.Pane = Splitter.Panel;
60
70
  export default VtxSplitPane;
@@ -7,121 +7,16 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
7
7
  import { useStyle as useAntdStyle } from "../../vtx-provider";
8
8
  var genVtxSplitPaneStyle = function genVtxSplitPaneStyle(token) {
9
9
  var componentCls = token.componentCls;
10
- return _defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({
10
+ return _defineProperty({}, componentCls, {
11
11
  height: '100%',
12
12
  overflow: 'hidden',
13
- '&-outer': _defineProperty(_defineProperty(_defineProperty(_defineProperty({
14
- backgroundColor: 'transparent',
15
- position: 'relative',
16
- outline: 'none',
17
- '&-resizer': _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
18
- position: 'absolute',
19
- height: '100%',
20
- width: 6,
21
- zIndex: 1
22
- }, '&-left,&-right', {
23
- position: 'absolute',
24
- top: '50%',
25
- zIndex: 1001,
26
- opacity: 0,
27
- width: '16px !important',
28
- height: '24px !important',
29
- backgroundColor: token.colorBorder,
30
- color: token.colorTextSecondary,
31
- borderColor: "transparent !important",
32
- fontSize: 12,
33
- '&:hover': {
34
- color: token.colorTextSecondary,
35
- backgroundColor: "".concat(token.colorPrimaryBg, " !important")
36
- }
37
- }), '&-left', {
38
- transform: 'translate(-16px,-50%)'
39
- }), '&-right', {
40
- transform: 'translate(6px,-50%)'
41
- }), '&::after', {
42
- position: 'absolute',
43
- content: "' '",
44
- left: 0,
45
- top: 0,
46
- bottom: 0,
47
- right: 4,
48
- borderRadius: token.borderRadius
49
- }), '&:hover', _defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
50
- opacity: 1
51
- })), '.ant-btn-icon', {
52
- color: token.colorTextSecondary
53
- })
54
- }, "&[data-resize-handle-state='hover']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
55
- opacity: 1
56
- }), '.vtx-split-pane-outer-resizer::after', {
57
- background: "linear-gradient(to bottom , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
58
- })), "&[data-resize-handle-state='active']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
59
- opacity: 1
60
- }), '.vtx-split-pane-outer-resizer::after', {
61
- background: "linear-gradient(to bottom , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
62
- })), "&[data-resize-handle-state='drag']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
63
- opacity: 1
64
- }), '.vtx-split-pane-outer-resizer::after', {
65
- background: "linear-gradient(to bottom , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
66
- })), "&[data-resize-handle-state='inactive']", {
67
- backgroundColor: 'transparent'
68
- }),
69
- '&-item': {
70
- position: 'relative',
71
- display: 'inline-block',
72
- height: '100%',
73
- verticalAlign: 'top'
13
+ '.ant-splitter-bar .ant-splitter-bar-dragger::before': {
14
+ background: 'transparent'
15
+ },
16
+ '.ant-splitter-bar .ant-splitter-bar-dragger-active::before': {
17
+ background: 'var(--ant-control-item-bg-active)'
74
18
  }
75
- }, '&-resizer-left', {
76
- borderRight: "1px solid ".concat(token.colorBorderSecondary),
77
- '&:hover': {
78
- borderRight: "1px solid ".concat(token.colorBorderSecondary),
79
- transition: 'border-right 0.2s ease-in-out'
80
- }
81
- }), '&-resizer-right', {
82
- borderLeft: "1px solid ".concat(token.colorBorderSecondary),
83
- '&:hover': {
84
- borderLeft: "1px solid ".concat(token.colorBorderSecondary),
85
- transition: 'border-right 0.2s ease-in-out'
86
- }
87
- }), '&-resizer.disabled', {
88
- cursor: 'not-allowed'
89
- }), '&-resizer.disabled:hover', {
90
- borderColor: 'transparent'
91
- })), "".concat(componentCls, "-vertical"), _defineProperty({}, "".concat(componentCls, "-outer"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({
92
- '&-resizer': _defineProperty(_defineProperty(_defineProperty(_defineProperty({
93
- width: '100%',
94
- height: 6
95
- }, '&-left,&-right', {
96
- top: 'auto',
97
- left: '50%',
98
- height: '16px !important',
99
- width: '24px !important'
100
- }), '&-left', {
101
- transform: 'translate(-50%,-16px)'
102
- }), '&-right', {
103
- transform: 'translate(-50%, 6px)'
104
- }), '&::after', {
105
- left: 0,
106
- top: 0,
107
- bottom: 4,
108
- right: 0
109
- })
110
- }, "&[data-resize-handle-state='hover']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
111
- opacity: 1
112
- }), '.vtx-split-pane-outer-resizer::after', {
113
- background: "linear-gradient(to right , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
114
- })), "&[data-resize-handle-state='active']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
115
- opacity: 1
116
- }), '.vtx-split-pane-outer-resizer::after', {
117
- background: "linear-gradient(to right , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
118
- })), "&[data-resize-handle-state='drag']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
119
- opacity: 1
120
- }), '.vtx-split-pane-outer-resizer::after', {
121
- background: "linear-gradient(to right , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
122
- })), "&[data-resize-handle-state='inactive']", {
123
- backgroundColor: 'transparent'
124
- })));
19
+ });
125
20
  };
126
21
  export function useStyle(prefixCls) {
127
22
  return useAntdStyle(prefixCls, function (token) {
@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.indexColumnKey = exports.TableContext = exports.Container = void 0;
7
7
  var _util = require("@rc-component/util");
8
- var _utils = require("@vtx/utils");
8
+ var _request = _interopRequireDefault(require("@vtx/utils/lib/request"));
9
9
  var _getSignature = _interopRequireDefault(require("@vtx/utils/lib/getSignature"));
10
10
  var _react = require("react");
11
11
  var _vtxProvider = require("../../vtx-provider");
12
12
  var _antd = require("antd");
13
- var _utils2 = require("../../utils");
13
+ var _utils = require("../../utils");
14
14
  var _renderColumnButtons = _interopRequireDefault(require("../renderColumnButtons"));
15
+ var _utils2 = require("@vtx/utils");
15
16
  var _jsxRuntime = require("react/jsx-runtime");
16
17
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
18
  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); }
@@ -33,7 +34,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
33
34
  var indexColumnKey = exports.indexColumnKey = '_serialNum';
34
35
  function useContainer() {
35
36
  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
36
- var _ref = (0, _utils.getVtxToken)() || {},
37
+ var _ref = (0, _utils2.getVtxToken)() || {},
37
38
  _ref$userId = _ref.userId,
38
39
  userId = _ref$userId === void 0 ? '' : _ref$userId,
39
40
  _ref$tenantId = _ref.tenantId,
@@ -175,7 +176,7 @@ function useContainer() {
175
176
  return _objectSpread(_objectSpread({}, newColumn), {}, {
176
177
  key: newColumn.key || newColumn.dataIndex,
177
178
  disable: disabledColumnKeys === null || disabledColumnKeys === void 0 ? void 0 : disabledColumnKeys.includes(column.dataIndex || column.key),
178
- render: (0, _utils2.isFunction)(column.renderButtons) ? function (text, record, index) {
179
+ render: (0, _utils.isFunction)(column.renderButtons) ? function (text, record, index) {
179
180
  return (0, _renderColumnButtons.default)({
180
181
  renderButtons: column.renderButtons,
181
182
  visible: column.renderButtonsVisibleNum,
@@ -207,7 +208,7 @@ function useContainer() {
207
208
  fixed = _ref2.fixed,
208
209
  disable = _ref2.disable,
209
210
  width = _ref2.width;
210
- var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
211
+ var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
211
212
  columnKeyMap[columnKey] = {
212
213
  show: indexColumn && indexColumnKey == columnKey ? true : (_ref3 = _toConsumableArray(props.defaultVisibleColumnKeys)) === null || _ref3 === void 0 ? void 0 : _ref3.includes(columnKey),
213
214
  fixed: fixed,
@@ -222,7 +223,7 @@ function useContainer() {
222
223
  fixed = _ref4.fixed,
223
224
  disable = _ref4.disable,
224
225
  width = _ref4.width;
225
- var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
226
+ var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
226
227
  columnKeyMap[columnKey] = {
227
228
  show: true,
228
229
  fixed: fixed,
@@ -235,7 +236,7 @@ function useContainer() {
235
236
  }, [tableColumn, props.defaultVisibleColumnKeys, tableConfig, uniqueKey]);
236
237
 
237
238
  // 深度比较 + 防抖 + 忽略这render函数引用变化
238
- (0, _utils2.useDeepCompareEffectDebounce)(function () {
239
+ (0, _utils.useDeepCompareEffectDebounce)(function () {
239
240
  var columnKeyMap = {};
240
241
  if (Array.isArray(visibleColumnKeys)) {
241
242
  tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref5, index) {
@@ -245,7 +246,7 @@ function useContainer() {
245
246
  fixed = _ref5.fixed,
246
247
  disable = _ref5.disable,
247
248
  width = _ref5.width;
248
- var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
249
+ var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
249
250
  columnKeyMap[columnKey] = {
250
251
  show: isFirst.current && indexColumn && indexColumnKey == columnKey ? true : (_ref6 = _toConsumableArray(visibleColumnKeys)) === null || _ref6 === void 0 ? void 0 : _ref6.includes(columnKey),
251
252
  fixed: fixed,
@@ -261,7 +262,7 @@ function useContainer() {
261
262
  fixed = _ref7.fixed,
262
263
  disable = _ref7.disable,
263
264
  width = _ref7.width;
264
- var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
265
+ var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
265
266
  columnKeyMap[columnKey] = {
266
267
  show: isFirst.current && indexColumn && indexColumnKey == columnKey ? true : (_ref8 = _toConsumableArray(props.defaultVisibleColumnKeys)) === null || _ref8 === void 0 ? void 0 : _ref8.includes(columnKey),
267
268
  fixed: fixed,
@@ -276,7 +277,7 @@ function useContainer() {
276
277
  fixed = _ref9.fixed,
277
278
  disable = _ref9.disable,
278
279
  width = _ref9.width;
279
- var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
280
+ var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
280
281
  columnKeyMap[columnKey] = {
281
282
  show: true,
282
283
  fixed: fixed,
@@ -292,14 +293,14 @@ function useContainer() {
292
293
  return key;
293
294
  });
294
295
  if ((sortKeys === null || sortKeys === void 0 ? void 0 : sortKeys.length) > 0) {
295
- sortKeyColumns.current = (0, _utils2.sortByGivenOrder)(sortKeyColumns.current, sortKeys);
296
+ sortKeyColumns.current = (0, _utils.sortByGivenOrder)(sortKeyColumns.current, sortKeys);
296
297
  }
297
298
  setColumnsMap(columnKeyMap);
298
299
  if (isFirst.current) {
299
300
  isFirst.current = false;
300
301
  }
301
302
  }, [visibleColumnKeys], ['render'], 100);
302
- (0, _utils2.useDeepCompareEffectDebounce)(function () {
303
+ (0, _utils.useDeepCompareEffectDebounce)(function () {
303
304
  var _sortKeyColumns$curre, _props$onVisibleColum;
304
305
  var visibleColumnKeys = [];
305
306
  (_sortKeyColumns$curre = sortKeyColumns.current) === null || _sortKeyColumns$curre === void 0 || _sortKeyColumns$curre.map(function (columnKey) {
@@ -319,7 +320,7 @@ function useContainer() {
319
320
  var params = {
320
321
  tableCode: uniqueKey
321
322
  };
322
- _utils.request.get("".concat(location.origin, "/cloud/management/api/v101/user/config/table/page"), {
323
+ _request.default.get("".concat(location.origin, "/cloud/management/api/v101/user/config/table/page"), {
323
324
  body: params
324
325
  }).then(function (res) {
325
326
  var _res$data;
@@ -346,7 +347,7 @@ function useContainer() {
346
347
  var getUniqueKey = function getUniqueKey() {
347
348
  var route = location.href.match(/#\/(\S*)\?/);
348
349
  if (route) {
349
- _utils.request.get("".concat(location.pathname, "resources/json/menu.json"), {
350
+ _request.default.get("".concat(location.pathname, "resources/json/menu.json"), {
350
351
  headers: _objectSpread({}, (0, _getSignature.default)({}))
351
352
  }).then(function (res) {
352
353
  var _res$data2;
@@ -358,7 +359,7 @@ function useContainer() {
358
359
  // setUniqueKey('test_demo_7')
359
360
  };
360
361
  var saveColumns = function saveColumns() {
361
- _utils.request.post("/cloud/management/api/v101/user/config/table/save", {
362
+ _request.default.post("/cloud/management/api/v101/user/config/table/save", {
362
363
  body: JSON.stringify({
363
364
  showColumns: "".concat(sortKeyColumns.current.join(','), ";").concat(JSON.stringify(columnsMap)),
364
365
  tableCode: uniqueKey,
@@ -126,9 +126,20 @@ function VtxTable(props) {
126
126
  var bodyDiv = Array.prototype.filter.call(divs, function (dom) {
127
127
  return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content');
128
128
  })[0];
129
+ var tablePlaceholder = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('tr'), function (dom) {
130
+ return dom.className.includes('ant-table-placeholder');
131
+ })[0];
129
132
  if (bodyDiv) {
130
133
  bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
131
134
  }
135
+ console.log('tablePlaceholder', tablePlaceholder);
136
+ if (tablePlaceholder) {
137
+ tablePlaceholder.style.height = "".concat(bodyHeight - (rest.scrollY || 0), "px");
138
+ var tableCell = Array.prototype.filter.call(tablePlaceholder.getElementsByTagName('td'), function (dom) {
139
+ return dom.className.includes('ant-table-cell');
140
+ })[0];
141
+ tableCell.style.height = "".concat(bodyHeight - (rest.scrollY || 0), "px");
142
+ }
132
143
  setState({
133
144
  scrollY: bodyHeight
134
145
  });
@@ -191,9 +202,6 @@ function VtxTable(props) {
191
202
  });
192
203
  };
193
204
  var _tableColumn = loopFilter(counter.tableColumn);
194
- if (!columnsMap['_serialNum']) {
195
- return [];
196
- }
197
205
  return (0, _utils.sortByKeyArrayExtract)(_tableColumn, sortKeyColumns, columnsMap, 'key');
198
206
  }, [columnsMap, counter.tableColumn, sortKeyColumns]);
199
207
 
@@ -26,18 +26,29 @@ var genVtxStyle = function genVtxStyle(token) {
26
26
  }), '.ant-table-body', _defineProperty({}, '.ant-table-tbody', {
27
27
  '>tr.ant-table-placeholder': {
28
28
  position: 'absolute',
29
- top: '25%',
29
+ bottom: 0,
30
30
  right: 0,
31
31
  left: 0,
32
32
  backgroundColor: 'transparent',
33
33
  borderTop: 'none',
34
+ height: '100%',
35
+ borderInlineEnd: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
36
+ borderBottom: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
34
37
  '>td.ant-table-cell': {
35
- display: 'flex',
36
- alignItems: 'center',
37
- justifyContent: 'center',
38
+ padding: 0,
38
39
  width: '100%',
39
40
  height: '100%',
40
- border: 'none'
41
+ border: 'none',
42
+ '.ant-table-expanded-row-fixed': {
43
+ display: 'flex',
44
+ alignItems: 'center',
45
+ justifyContent: 'center',
46
+ height: '100%',
47
+ width: '100%',
48
+ '&:after': {
49
+ borderInlineEnd: 'none'
50
+ }
51
+ }
41
52
  }
42
53
  }
43
54
  }))), '.ant-pagination', _defineProperty({}, '.ant-pagination-item', {
@@ -53,6 +64,10 @@ var genVtxStyle = function genVtxStyle(token) {
53
64
  }), '.ant-table-body', {
54
65
  '>table >tbody>tr>td': {
55
66
  borderInlineColor: 'transparent !important'
67
+ },
68
+ '>table >tbody>tr.ant-table-placeholder': {
69
+ borderInlineColor: 'transparent !important',
70
+ borderBottomColor: 'transparent !important'
56
71
  }
57
72
  }))))), "&.vtx-datagrid-striped", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty({}, '.ant-table-body', {
58
73
  '>table >tbody>tr:nth-child(odd)>td': {
@@ -7,14 +7,22 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = void 0;
8
8
  var _classnames = _interopRequireDefault(require("classnames"));
9
9
  var _react = _interopRequireWildcard(require("react"));
10
- var _reactResizablePanels = require("react-resizable-panels");
10
+ var _antd = require("antd");
11
11
  var _Resizer = _interopRequireDefault(require("./Resizer"));
12
12
  var _style = require("./style");
13
13
  var _vtxProvider = require("../vtx-provider");
14
14
  var _jsxRuntime = require("react/jsx-runtime");
15
+ var _excluded = ["children", "defaultSize", "minSize", "maxSize", "style"];
15
16
  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); }
16
17
  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; }
17
18
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
19
+ 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; }
20
+ 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; }
21
+ 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; }
22
+ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
23
+ 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); }
24
+ function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
25
+ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
18
26
  function removeNullChildren(children) {
19
27
  return _react.default.Children.toArray(children).filter(function (c) {
20
28
  return c;
@@ -29,40 +37,42 @@ function VtxSplitPane(props) {
29
37
  hashId = _useStyle.hashId;
30
38
  var splitPane = (0, _react.useRef)();
31
39
  var children = props.children,
40
+ defaultSize = props.defaultSize,
41
+ minSize = props.minSize,
42
+ maxSize = props.maxSize,
32
43
  style = props.style,
33
- _props$direction = props.direction,
34
- direction = _props$direction === void 0 ? 'horizontal' : _props$direction;
44
+ rest = _objectWithoutProperties(props, _excluded);
35
45
  var notNullChildren = removeNullChildren(children);
36
46
  var refs = (0, _react.useRef)([]);
37
47
  return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
38
- className: (0, _classnames.default)("".concat(prefixCls, " ").concat(prefixCls, "-").concat(direction), hashId),
48
+ className: (0, _classnames.default)("".concat(prefixCls), hashId),
39
49
  ref: splitPane,
40
50
  style: style,
41
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactResizablePanels.PanelGroup, {
42
- direction: direction,
51
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Splitter, _objectSpread(_objectSpread({}, rest), {}, {
43
52
  children: notNullChildren === null || notNullChildren === void 0 ? void 0 : notNullChildren.map(function (v, index) {
44
- return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
45
- children: [/*#__PURE__*/(0, _react.cloneElement)(notNullChildren[index], {
53
+ var _v$props;
54
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
55
+ children: /*#__PURE__*/(0, _react.cloneElement)(notNullChildren[index], _objectSpread(_objectSpread(_objectSpread({
46
56
  ref: function ref(el) {
47
57
  refs.current[index] = el;
48
- },
49
- collapsible: true
50
- }), index !== (notNullChildren === null || notNullChildren === void 0 ? void 0 : notNullChildren.length) - 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
51
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactResizablePanels.PanelResizeHandle, {
52
- className: (0, _classnames.default)("".concat(prefixCls, "-outer"), hashId),
53
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Resizer.default, {
54
- refs: refs,
55
- index: index,
56
- direction: direction
57
- })
58
- })
59
- })]
58
+ }
59
+ }, index === 0 ? {
60
+ max: maxSize,
61
+ min: minSize,
62
+ size: defaultSize
63
+ } : {}), v.props), {}, {
64
+ collapsible: _objectSpread({
65
+ start: true,
66
+ end: true,
67
+ showCollapsibleIcon: 'auto'
68
+ }, (_v$props = v.props) === null || _v$props === void 0 ? void 0 : _v$props.collapsible)
69
+ }))
60
70
  });
61
71
  })
62
- })
72
+ }))
63
73
  }));
64
74
  }
65
75
  VtxSplitPane.propTypes = {};
66
76
  VtxSplitPane.defaultProps = {};
67
- VtxSplitPane.Pane = _reactResizablePanels.Panel;
77
+ VtxSplitPane.Pane = _antd.Splitter.Panel;
68
78
  var _default = exports.default = VtxSplitPane;
@@ -13,121 +13,16 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
13
13
  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); }
14
14
  var genVtxSplitPaneStyle = function genVtxSplitPaneStyle(token) {
15
15
  var componentCls = token.componentCls;
16
- return _defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({
16
+ return _defineProperty({}, componentCls, {
17
17
  height: '100%',
18
18
  overflow: 'hidden',
19
- '&-outer': _defineProperty(_defineProperty(_defineProperty(_defineProperty({
20
- backgroundColor: 'transparent',
21
- position: 'relative',
22
- outline: 'none',
23
- '&-resizer': _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
24
- position: 'absolute',
25
- height: '100%',
26
- width: 6,
27
- zIndex: 1
28
- }, '&-left,&-right', {
29
- position: 'absolute',
30
- top: '50%',
31
- zIndex: 1001,
32
- opacity: 0,
33
- width: '16px !important',
34
- height: '24px !important',
35
- backgroundColor: token.colorBorder,
36
- color: token.colorTextSecondary,
37
- borderColor: "transparent !important",
38
- fontSize: 12,
39
- '&:hover': {
40
- color: token.colorTextSecondary,
41
- backgroundColor: "".concat(token.colorPrimaryBg, " !important")
42
- }
43
- }), '&-left', {
44
- transform: 'translate(-16px,-50%)'
45
- }), '&-right', {
46
- transform: 'translate(6px,-50%)'
47
- }), '&::after', {
48
- position: 'absolute',
49
- content: "' '",
50
- left: 0,
51
- top: 0,
52
- bottom: 0,
53
- right: 4,
54
- borderRadius: token.borderRadius
55
- }), '&:hover', _defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
56
- opacity: 1
57
- })), '.ant-btn-icon', {
58
- color: token.colorTextSecondary
59
- })
60
- }, "&[data-resize-handle-state='hover']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
61
- opacity: 1
62
- }), '.vtx-split-pane-outer-resizer::after', {
63
- background: "linear-gradient(to bottom , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
64
- })), "&[data-resize-handle-state='active']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
65
- opacity: 1
66
- }), '.vtx-split-pane-outer-resizer::after', {
67
- background: "linear-gradient(to bottom , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
68
- })), "&[data-resize-handle-state='drag']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
69
- opacity: 1
70
- }), '.vtx-split-pane-outer-resizer::after', {
71
- background: "linear-gradient(to bottom , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
72
- })), "&[data-resize-handle-state='inactive']", {
73
- backgroundColor: 'transparent'
74
- }),
75
- '&-item': {
76
- position: 'relative',
77
- display: 'inline-block',
78
- height: '100%',
79
- verticalAlign: 'top'
19
+ '.ant-splitter-bar .ant-splitter-bar-dragger::before': {
20
+ background: 'transparent'
21
+ },
22
+ '.ant-splitter-bar .ant-splitter-bar-dragger-active::before': {
23
+ background: 'var(--ant-control-item-bg-active)'
80
24
  }
81
- }, '&-resizer-left', {
82
- borderRight: "1px solid ".concat(token.colorBorderSecondary),
83
- '&:hover': {
84
- borderRight: "1px solid ".concat(token.colorBorderSecondary),
85
- transition: 'border-right 0.2s ease-in-out'
86
- }
87
- }), '&-resizer-right', {
88
- borderLeft: "1px solid ".concat(token.colorBorderSecondary),
89
- '&:hover': {
90
- borderLeft: "1px solid ".concat(token.colorBorderSecondary),
91
- transition: 'border-right 0.2s ease-in-out'
92
- }
93
- }), '&-resizer.disabled', {
94
- cursor: 'not-allowed'
95
- }), '&-resizer.disabled:hover', {
96
- borderColor: 'transparent'
97
- })), "".concat(componentCls, "-vertical"), _defineProperty({}, "".concat(componentCls, "-outer"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({
98
- '&-resizer': _defineProperty(_defineProperty(_defineProperty(_defineProperty({
99
- width: '100%',
100
- height: 6
101
- }, '&-left,&-right', {
102
- top: 'auto',
103
- left: '50%',
104
- height: '16px !important',
105
- width: '24px !important'
106
- }), '&-left', {
107
- transform: 'translate(-50%,-16px)'
108
- }), '&-right', {
109
- transform: 'translate(-50%, 6px)'
110
- }), '&::after', {
111
- left: 0,
112
- top: 0,
113
- bottom: 4,
114
- right: 0
115
- })
116
- }, "&[data-resize-handle-state='hover']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
117
- opacity: 1
118
- }), '.vtx-split-pane-outer-resizer::after', {
119
- background: "linear-gradient(to right , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
120
- })), "&[data-resize-handle-state='active']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
121
- opacity: 1
122
- }), '.vtx-split-pane-outer-resizer::after', {
123
- background: "linear-gradient(to right , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
124
- })), "&[data-resize-handle-state='drag']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
125
- opacity: 1
126
- }), '.vtx-split-pane-outer-resizer::after', {
127
- background: "linear-gradient(to right , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
128
- })), "&[data-resize-handle-state='inactive']", {
129
- backgroundColor: 'transparent'
130
- })));
25
+ });
131
26
  };
132
27
  function useStyle(prefixCls) {
133
28
  return (0, _vtxProvider.useStyle)(prefixCls, function (token) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vtx/components",
3
- "version": "4.0.0-beta.14",
3
+ "version": "4.0.0-beta.16",
4
4
  "description": "React components for Vortex",
5
5
  "keywords": [
6
6
  "react",
@@ -87,7 +87,6 @@
87
87
  "@emotion/serialize": "^1.3.3",
88
88
  "@rc-component/util": "1.3.0",
89
89
  "@types/react": "^18.0.0",
90
- "@vtx/utils": "^1.0.20",
91
90
  "@wangeditor/editor": "^5.1.23",
92
91
  "@wangeditor/editor-for-react": "^1.0.6",
93
92
  "@wangeditor/plugin-upload-attachment": "^1.1.0",
@@ -216,7 +215,8 @@
216
215
  "write-pkg": "^4.0.0",
217
216
  "xhr-mock": "^2.5.1",
218
217
  "yorkie": "^2.0.0",
219
- "zustand": "^4.5.7"
218
+ "zustand": "^4.5.7",
219
+ "@vtx/utils": "^1.0.20"
220
220
  },
221
221
  "peerDependencies": {
222
222
  "@ant-design/icons": "^6.0.0",
@@ -224,9 +224,10 @@
224
224
  "lodash-es": "^4.17.21",
225
225
  "react": ">=18.0.0",
226
226
  "react-dom": ">=18.0.0",
227
- "dayjs": "^1.11.18"
227
+ "dayjs": "^1.11.18",
228
+ "@vtx/utils": "^1.0.20"
228
229
  },
229
- "peerDependenciesName":"声明宿主依赖",
230
+ "peerDependenciesName": "声明宿主依赖",
230
231
  "packageManager": "pnpm@9.6.0",
231
232
  "publishConfig": {
232
233
  "access": "public"