@jetlinks-web/components 2.0.33 → 2.0.34

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 (15) hide show
  1. package/es/FullPage/FullPage.js +1 -1
  2. package/es/ProTable/Content.js +24 -20
  3. package/es/ProTable/style/ProTable.less +47 -10
  4. package/es/Search/Advanced/SaveHistory.js +1 -1
  5. package/es/Search/Item.js +1 -1
  6. package/es/Search/Search.js +1 -1
  7. package/es/style/index.css +37 -5
  8. package/lib/FullPage/FullPage.js +1 -1
  9. package/lib/ProTable/Content.js +24 -20
  10. package/lib/ProTable/style/ProTable.less +47 -10
  11. package/lib/Search/Advanced/SaveHistory.js +1 -1
  12. package/lib/Search/Item.js +1 -1
  13. package/lib/Search/Search.js +1 -1
  14. package/lib/style/index.css +37 -5
  15. package/package.json +1 -1
package/es/FullPage/FullPage.js CHANGED
@@ -6,7 +6,7 @@
6
6
  } */
7
7
  import { defineComponent as _defineComponent } from 'vue';
8
8
  import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
9
- const _withScopeId = n => (_pushScopeId("data-v-1716520751726"), n = n(), _popScopeId(), n);
9
+ const _withScopeId = n => (_pushScopeId("data-v-1716533070372"), n = n(), _popScopeId(), n);
10
10
  const _hoisted_1 = { class: "full-page-warp-content" };
11
11
  import { ref } from 'vue';
12
12
  import { useElementBounding } from '@vueuse/core';
package/es/ProTable/Content.js CHANGED
@@ -26,20 +26,24 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
26
26
  "props": "setup-reactive-const",
27
27
  "slots": "setup-maybe-ref",
28
28
  "_columns": "setup-ref",
29
- "cardStyle": "setup-ref",
29
+ "_scroll": "setup-ref",
30
30
  "gridTemplateColumns": "setup-ref"
31
31
  } */
32
32
  import { defineComponent as _defineComponent } from 'vue';
33
33
  import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, normalizeProps as _normalizeProps, guardReactiveProps as _guardReactiveProps, renderSlot as _renderSlot, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, unref as _unref, createVNode as _createVNode, mergeProps as _mergeProps, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, withCtx as _withCtx, createBlock as _createBlock } from "vue";
34
34
  const _hoisted_1 = { class: "jtable-box" };
35
35
  const _hoisted_2 = {
36
+ key: 0,
37
+ class: "jtable-card"
38
+ };
39
+ const _hoisted_3 = {
36
40
  key: 1,
37
41
  class: "j-table-empty"
38
42
  };
39
43
  import { useSlots, computed } from 'vue';
40
44
  import { _contentProps } from "./setting";
41
45
  import { Table } from 'ant-design-vue';
42
- import { get, isString } from 'lodash-es';
46
+ import { get, } from 'lodash-es';
43
47
  import Empty from '../Empty';
44
48
  const __sfc_main__ = _defineComponent({
45
49
  ...{
@@ -56,22 +60,20 @@ const __sfc_main__ = _defineComponent({
56
60
  const props = __props;
57
61
  const slots = useSlots();
58
62
  const _columns = computed(() => props.columns.filter((i) => !_optionalChain([i, 'optionalAccess', _2 => _2.hideInTable])));
59
- const cardStyle = computed(() => props.scroll && props.scroll.y ? {
60
- maxHeight: isString(props.scroll.y) ? props.scroll.y : props.scroll.y + 'px',
61
- overflow: 'auto',
62
- }
63
- : undefined);
63
+ const _scroll = computed(() => {
64
+ let y = _optionalChain([props, 'access', _3 => _3.scroll, 'optionalAccess', _4 => _4.y]) || '100%';
65
+ return {
66
+ x: _optionalChain([props, 'access', _5 => _5.scroll, 'optionalAccess', _6 => _6.x]) || 1366,
67
+ y
68
+ };
69
+ });
64
70
  const gridTemplateColumns = computed(() => {
65
71
  return `repeat(${props.column}, 1fr)`;
66
72
  });
67
73
  return (_ctx, _cache) => {
68
74
  return (_openBlock(), _createElementBlock("div", _hoisted_1, [
69
75
  (_ctx.mode === 'CARD')
70
- ? (_openBlock(), _createElementBlock("div", {
71
- key: 0,
72
- class: "jtable-card",
73
- style: _normalizeStyle(cardStyle.value)
74
- }, [
76
+ ? (_openBlock(), _createElementBlock("div", _hoisted_2, [
75
77
  (_ctx.dataSource.length)
76
78
  ? (_openBlock(), _createElementBlock("div", {
77
79
  key: 0,
@@ -81,31 +83,33 @@ const __sfc_main__ = _defineComponent({
81
83
  (_openBlock(true), _createElementBlock(_Fragment, null, _renderList(_ctx.dataSource, (item) => {
82
84
  return (_openBlock(), _createElementBlock("div", {
83
85
  class: _normalizeClass(['jtable-card-item', props.cardBodyClass]),
84
- key: item[_ctx.rowKey]
86
+ key: item[props.rowKey]
85
87
  }, [
86
88
  _renderSlot(_ctx.$slots, "card", _normalizeProps(_guardReactiveProps(item)))
87
89
  ], 2 /* CLASS */));
88
90
  }), 128 /* KEYED_FRAGMENT */))
89
91
  ], 4 /* STYLE */))
90
- : (_openBlock(), _createElementBlock("div", _hoisted_2, [
92
+ : (_openBlock(), _createElementBlock("div", _hoisted_3, [
91
93
  _renderSlot(_ctx.$slots, "emptyText", {}, () => [
92
94
  _createVNode(_unref(Empty))
93
95
  ])
94
96
  ]))
95
- ], 4 /* STYLE */))
97
+ ]))
96
98
  : (_openBlock(), _createBlock(_unref(Table), _mergeProps({ key: 1 }, props, {
97
99
  dataSource: _ctx.dataSource,
98
100
  columns: _columns.value,
99
- pagination: false
101
+ pagination: false,
102
+ scroll: _scroll.value,
103
+ class: { 'j-table-scroll': !_optionalChain([props, 'access', _7 => _7.scroll, 'optionalAccess', _8 => _8.y]) }
100
104
  }), {
101
105
  headerCell: _withCtx(({ column, title }) => [
102
106
  _renderSlot(_ctx.$slots, "headerCell", _normalizeProps(_guardReactiveProps({ column, title })))
103
107
  ]),
104
108
  bodyCell: _withCtx(({ column, record }) => [
105
- ((_optionalChain([column, 'optionalAccess', _3 => _3.key]) || _optionalChain([column, 'optionalAccess', _4 => _4.dataIndex])) && _optionalChain([column, 'optionalAccess', _5 => _5.scopedSlots]) && (_optionalChain([_unref, 'call', _6 => _6(slots), 'optionalAccess', _7 => _7[_optionalChain([column, 'optionalAccess', _8 => _8.dataIndex])]]) || _optionalChain([_unref, 'call', _9 => _9(slots), 'optionalAccess', _10 => _10[_optionalChain([column, 'optionalAccess', _11 => _11.key])]])))
106
- ? _renderSlot(_ctx.$slots, _optionalChain([column, 'optionalAccess', _12 => _12.key]) || _optionalChain([column, 'optionalAccess', _13 => _13.dataIndex]), _normalizeProps(_mergeProps({ key: 0 }, record)))
109
+ ((_optionalChain([column, 'optionalAccess', _9 => _9.key]) || _optionalChain([column, 'optionalAccess', _10 => _10.dataIndex])) && _optionalChain([column, 'optionalAccess', _11 => _11.scopedSlots]) && (_optionalChain([_unref, 'call', _12 => _12(slots), 'optionalAccess', _13 => _13[_optionalChain([column, 'optionalAccess', _14 => _14.dataIndex])]]) || _optionalChain([_unref, 'call', _15 => _15(slots), 'optionalAccess', _16 => _16[_optionalChain([column, 'optionalAccess', _17 => _17.key])]])))
110
+ ? _renderSlot(_ctx.$slots, _optionalChain([column, 'optionalAccess', _18 => _18.key]) || _optionalChain([column, 'optionalAccess', _19 => _19.dataIndex]), _normalizeProps(_mergeProps({ key: 0 }, record)))
107
111
  : (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
108
- _createTextVNode(_toDisplayString(_unref(get)(record, _optionalChain([column, 'optionalAccess', _14 => _14.dataIndex]) || _optionalChain([column, 'optionalAccess', _15 => _15.key]))), 1 /* TEXT */)
112
+ _createTextVNode(_toDisplayString(_unref(get)(record, _optionalChain([column, 'optionalAccess', _20 => _20.dataIndex]) || _optionalChain([column, 'optionalAccess', _21 => _21.key]))), 1 /* TEXT */)
109
113
  ], 64 /* STABLE_FRAGMENT */))
110
114
  ]),
111
115
  emptyText: _withCtx(() => [
@@ -114,7 +118,7 @@ const __sfc_main__ = _defineComponent({
114
118
  ])
115
119
  ]),
116
120
  _: 3 /* FORWARDED */
117
- }, 16 /* FULL_PROPS */, ["dataSource", "columns"]))
121
+ }, 16 /* FULL_PROPS */, ["dataSource", "columns", "scroll", "class"]))
118
122
  ]));
119
123
  };
120
124
  }
package/es/ProTable/style/ProTable.less CHANGED
@@ -1,7 +1,7 @@
1
1
  @import '../../style/variable.less';
2
2
 
3
3
  .jtable-body-spin {
4
- min-height: 100%;
4
+ height: 100%;
5
5
  width: 100%;
6
6
  background-color: #fff;
7
7
 
@@ -59,22 +59,59 @@
59
59
  }
60
60
  }
61
61
 
62
- .jtable-alert {
63
- margin-bottom: 16px;
64
- }
62
+ .jtable-box {
63
+ flex: 1;
64
+ min-height: 0;
65
+
66
+ .jtable-card {
67
+ height: 100%;
68
+ overflow-y: auto;
69
+
70
+ .jtable-card-items {
71
+ display: grid;
72
+ grid-gap: 26px;
65
73
 
66
- .jtable-card {
67
- .jtable-card-items {
68
- display: grid;
69
- grid-gap: 26px;
74
+ .jtable-card-item {
75
+ display: flex;
76
+ min-width: 0;
77
+ }
78
+ }
79
+ }
80
+
81
+ .ant-table-wrapper {
82
+ height: 100%;
83
+ .ant-table {
84
+ height: 100%;
70
85
 
71
- .jtable-card-item {
86
+ .ant-table-container {
87
+ height: 100%;
88
+
89
+ .ant-table-content {
90
+ height: 100%;
91
+ }
92
+ }
93
+ }
94
+ }
95
+
96
+ .j-table-scroll {
97
+ background-color: red;
98
+ .ant-table-container {
72
99
  display: flex;
73
- min-width: 0;
100
+ flex-direction: column;
101
+
102
+ .ant-table-body {
103
+ flex: 1;
104
+ min-height: 0;
105
+ overflow-y: auto;
106
+ }
74
107
  }
75
108
  }
76
109
  }
77
110
 
111
+ .jtable-alert {
112
+ margin-bottom: 16px;
113
+ }
114
+
78
115
  .jtable-pagination {
79
116
  width: 100%;
80
117
  display: flex;
package/es/Search/Advanced/SaveHistory.js CHANGED
@@ -21,7 +21,7 @@
21
21
  } */
22
22
  import { defineComponent as _defineComponent } from 'vue';
23
23
  import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
24
- const _withScopeId = n => (_pushScopeId("data-v-1716520754696"), n = n(), _popScopeId(), n);
24
+ const _withScopeId = n => (_pushScopeId("data-v-1716533072084"), n = n(), _popScopeId(), n);
25
25
  const _hoisted_1 = {
26
26
  key: 0,
27
27
  style: { "width": "240px" }
package/es/Search/Item.js CHANGED
@@ -78,7 +78,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
78
78
  } */
79
79
  import { defineComponent as _defineComponent } from 'vue';
80
80
  import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
81
- const _withScopeId = n => (_pushScopeId("data-v-1716520753826"), n = n(), _popScopeId(), n);
81
+ const _withScopeId = n => (_pushScopeId("data-v-1716533071139"), n = n(), _popScopeId(), n);
82
82
  const _hoisted_1 = { class: "JSearch-item" };
83
83
  const _hoisted_2 = {
84
84
  key: 0,
package/es/Search/Search.js CHANGED
@@ -36,7 +36,7 @@
36
36
  } */
37
37
  import { defineComponent as _defineComponent } from 'vue';
38
38
  import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
39
- const _withScopeId = n => (_pushScopeId("data-v-1716520754058"), n = n(), _popScopeId(), n);
39
+ const _withScopeId = n => (_pushScopeId("data-v-1716533071278"), n = n(), _popScopeId(), n);
40
40
  const _hoisted_1 = { class: "JSearch-content simple" };
41
41
  const _hoisted_2 = { class: "JSearch-items" };
42
42
  import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';
package/es/style/index.css CHANGED
@@ -489,7 +489,7 @@
489
489
  color: unset;
490
490
  }
491
491
  .jtable-body-spin {
492
- min-height: 100%;
492
+ height: 100%;
493
493
  width: 100%;
494
494
  background-color: #fff;
495
495
  }
@@ -536,17 +536,49 @@
536
536
  .jtable-body-header .jtable-body-header-right .jtable-body-header-right-button :deep(.ant-radio-button-wrapper-checked) {
537
537
  color: #1890ff;
538
538
  }
539
- .jtable-alert {
540
- margin-bottom: 16px;
539
+ .jtable-box {
540
+ flex: 1;
541
+ min-height: 0;
541
542
  }
542
- .jtable-card .jtable-card-items {
543
+ .jtable-box .jtable-card {
544
+ height: 100%;
545
+ overflow-y: auto;
546
+ }
547
+ .jtable-box .jtable-card .jtable-card-items {
543
548
  display: grid;
544
549
  grid-gap: 26px;
545
550
  }
546
- .jtable-card .jtable-card-items .jtable-card-item {
551
+ .jtable-box .jtable-card .jtable-card-items .jtable-card-item {
547
552
  display: flex;
548
553
  min-width: 0;
549
554
  }
555
+ .jtable-box .ant-table-wrapper {
556
+ height: 100%;
557
+ }
558
+ .jtable-box .ant-table-wrapper .ant-table {
559
+ height: 100%;
560
+ }
561
+ .jtable-box .ant-table-wrapper .ant-table .ant-table-container {
562
+ height: 100%;
563
+ }
564
+ .jtable-box .ant-table-wrapper .ant-table .ant-table-container .ant-table-content {
565
+ height: 100%;
566
+ }
567
+ .jtable-box .j-table-scroll {
568
+ background-color: red;
569
+ }
570
+ .jtable-box .j-table-scroll .ant-table-container {
571
+ display: flex;
572
+ flex-direction: column;
573
+ }
574
+ .jtable-box .j-table-scroll .ant-table-container .ant-table-body {
575
+ flex: 1;
576
+ min-height: 0;
577
+ overflow-y: auto;
578
+ }
579
+ .jtable-alert {
580
+ margin-bottom: 16px;
581
+ }
550
582
  .jtable-pagination {
551
583
  width: 100%;
552
584
  display: flex;
package/lib/FullPage/FullPage.js CHANGED
@@ -6,7 +6,7 @@
6
6
  } */
7
7
  import { defineComponent as _defineComponent } from 'vue';
8
8
  import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
9
- const _withScopeId = n => (_pushScopeId("data-v-1716520751738"), n = n(), _popScopeId(), n);
9
+ const _withScopeId = n => (_pushScopeId("data-v-1716533070378"), n = n(), _popScopeId(), n);
10
10
  const _hoisted_1 = { class: "full-page-warp-content" };
11
11
  import { ref } from 'vue';
12
12
  import { useElementBounding } from '@vueuse/core';
package/lib/ProTable/Content.js CHANGED
@@ -26,20 +26,24 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
26
26
  "props": "setup-reactive-const",
27
27
  "slots": "setup-maybe-ref",
28
28
  "_columns": "setup-ref",
29
- "cardStyle": "setup-ref",
29
+ "_scroll": "setup-ref",
30
30
  "gridTemplateColumns": "setup-ref"
31
31
  } */
32
32
  import { defineComponent as _defineComponent } from 'vue';
33
33
  import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, normalizeProps as _normalizeProps, guardReactiveProps as _guardReactiveProps, renderSlot as _renderSlot, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, unref as _unref, createVNode as _createVNode, mergeProps as _mergeProps, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, withCtx as _withCtx, createBlock as _createBlock } from "vue";
34
34
  const _hoisted_1 = { class: "jtable-box" };
35
35
  const _hoisted_2 = {
36
+ key: 0,
37
+ class: "jtable-card"
38
+ };
39
+ const _hoisted_3 = {
36
40
  key: 1,
37
41
  class: "j-table-empty"
38
42
  };
39
43
  import { useSlots, computed } from 'vue';
40
44
  import { _contentProps } from "./setting";
41
45
  import { Table } from 'ant-design-vue';
42
- import { get, isString } from 'lodash-es';
46
+ import { get, } from 'lodash-es';
43
47
  import Empty from '../Empty';
44
48
  const __sfc_main__ = _defineComponent({
45
49
  ...{
@@ -56,22 +60,20 @@ const __sfc_main__ = _defineComponent({
56
60
  const props = __props;
57
61
  const slots = useSlots();
58
62
  const _columns = computed(() => props.columns.filter((i) => !_optionalChain([i, 'optionalAccess', _2 => _2.hideInTable])));
59
- const cardStyle = computed(() => props.scroll && props.scroll.y ? {
60
- maxHeight: isString(props.scroll.y) ? props.scroll.y : props.scroll.y + 'px',
61
- overflow: 'auto',
62
- }
63
- : undefined);
63
+ const _scroll = computed(() => {
64
+ let y = _optionalChain([props, 'access', _3 => _3.scroll, 'optionalAccess', _4 => _4.y]) || '100%';
65
+ return {
66
+ x: _optionalChain([props, 'access', _5 => _5.scroll, 'optionalAccess', _6 => _6.x]) || 1366,
67
+ y
68
+ };
69
+ });
64
70
  const gridTemplateColumns = computed(() => {
65
71
  return `repeat(${props.column}, 1fr)`;
66
72
  });
67
73
  return (_ctx, _cache) => {
68
74
  return (_openBlock(), _createElementBlock("div", _hoisted_1, [
69
75
  (_ctx.mode === 'CARD')
70
- ? (_openBlock(), _createElementBlock("div", {
71
- key: 0,
72
- class: "jtable-card",
73
- style: _normalizeStyle(cardStyle.value)
74
- }, [
76
+ ? (_openBlock(), _createElementBlock("div", _hoisted_2, [
75
77
  (_ctx.dataSource.length)
76
78
  ? (_openBlock(), _createElementBlock("div", {
77
79
  key: 0,
@@ -81,31 +83,33 @@ const __sfc_main__ = _defineComponent({
81
83
  (_openBlock(true), _createElementBlock(_Fragment, null, _renderList(_ctx.dataSource, (item) => {
82
84
  return (_openBlock(), _createElementBlock("div", {
83
85
  class: _normalizeClass(['jtable-card-item', props.cardBodyClass]),
84
- key: item[_ctx.rowKey]
86
+ key: item[props.rowKey]
85
87
  }, [
86
88
  _renderSlot(_ctx.$slots, "card", _normalizeProps(_guardReactiveProps(item)))
87
89
  ], 2 /* CLASS */));
88
90
  }), 128 /* KEYED_FRAGMENT */))
89
91
  ], 4 /* STYLE */))
90
- : (_openBlock(), _createElementBlock("div", _hoisted_2, [
92
+ : (_openBlock(), _createElementBlock("div", _hoisted_3, [
91
93
  _renderSlot(_ctx.$slots, "emptyText", {}, () => [
92
94
  _createVNode(_unref(Empty))
93
95
  ])
94
96
  ]))
95
- ], 4 /* STYLE */))
97
+ ]))
96
98
  : (_openBlock(), _createBlock(_unref(Table), _mergeProps({ key: 1 }, props, {
97
99
  dataSource: _ctx.dataSource,
98
100
  columns: _columns.value,
99
- pagination: false
101
+ pagination: false,
102
+ scroll: _scroll.value,
103
+ class: { 'j-table-scroll': !_optionalChain([props, 'access', _7 => _7.scroll, 'optionalAccess', _8 => _8.y]) }
100
104
  }), {
101
105
  headerCell: _withCtx(({ column, title }) => [
102
106
  _renderSlot(_ctx.$slots, "headerCell", _normalizeProps(_guardReactiveProps({ column, title })))
103
107
  ]),
104
108
  bodyCell: _withCtx(({ column, record }) => [
105
- ((_optionalChain([column, 'optionalAccess', _3 => _3.key]) || _optionalChain([column, 'optionalAccess', _4 => _4.dataIndex])) && _optionalChain([column, 'optionalAccess', _5 => _5.scopedSlots]) && (_optionalChain([_unref, 'call', _6 => _6(slots), 'optionalAccess', _7 => _7[_optionalChain([column, 'optionalAccess', _8 => _8.dataIndex])]]) || _optionalChain([_unref, 'call', _9 => _9(slots), 'optionalAccess', _10 => _10[_optionalChain([column, 'optionalAccess', _11 => _11.key])]])))
106
- ? _renderSlot(_ctx.$slots, _optionalChain([column, 'optionalAccess', _12 => _12.key]) || _optionalChain([column, 'optionalAccess', _13 => _13.dataIndex]), _normalizeProps(_mergeProps({ key: 0 }, record)))
109
+ ((_optionalChain([column, 'optionalAccess', _9 => _9.key]) || _optionalChain([column, 'optionalAccess', _10 => _10.dataIndex])) && _optionalChain([column, 'optionalAccess', _11 => _11.scopedSlots]) && (_optionalChain([_unref, 'call', _12 => _12(slots), 'optionalAccess', _13 => _13[_optionalChain([column, 'optionalAccess', _14 => _14.dataIndex])]]) || _optionalChain([_unref, 'call', _15 => _15(slots), 'optionalAccess', _16 => _16[_optionalChain([column, 'optionalAccess', _17 => _17.key])]])))
110
+ ? _renderSlot(_ctx.$slots, _optionalChain([column, 'optionalAccess', _18 => _18.key]) || _optionalChain([column, 'optionalAccess', _19 => _19.dataIndex]), _normalizeProps(_mergeProps({ key: 0 }, record)))
107
111
  : (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
108
- _createTextVNode(_toDisplayString(_unref(get)(record, _optionalChain([column, 'optionalAccess', _14 => _14.dataIndex]) || _optionalChain([column, 'optionalAccess', _15 => _15.key]))), 1 /* TEXT */)
112
+ _createTextVNode(_toDisplayString(_unref(get)(record, _optionalChain([column, 'optionalAccess', _20 => _20.dataIndex]) || _optionalChain([column, 'optionalAccess', _21 => _21.key]))), 1 /* TEXT */)
109
113
  ], 64 /* STABLE_FRAGMENT */))
110
114
  ]),
111
115
  emptyText: _withCtx(() => [
@@ -114,7 +118,7 @@ const __sfc_main__ = _defineComponent({
114
118
  ])
115
119
  ]),
116
120
  _: 3 /* FORWARDED */
117
- }, 16 /* FULL_PROPS */, ["dataSource", "columns"]))
121
+ }, 16 /* FULL_PROPS */, ["dataSource", "columns", "scroll", "class"]))
118
122
  ]));
119
123
  };
120
124
  }
package/lib/ProTable/style/ProTable.less CHANGED
@@ -1,7 +1,7 @@
1
1
  @import '../../style/variable.less';
2
2
 
3
3
  .jtable-body-spin {
4
- min-height: 100%;
4
+ height: 100%;
5
5
  width: 100%;
6
6
  background-color: #fff;
7
7
 
@@ -59,22 +59,59 @@
59
59
  }
60
60
  }
61
61
 
62
- .jtable-alert {
63
- margin-bottom: 16px;
64
- }
62
+ .jtable-box {
63
+ flex: 1;
64
+ min-height: 0;
65
+
66
+ .jtable-card {
67
+ height: 100%;
68
+ overflow-y: auto;
69
+
70
+ .jtable-card-items {
71
+ display: grid;
72
+ grid-gap: 26px;
65
73
 
66
- .jtable-card {
67
- .jtable-card-items {
68
- display: grid;
69
- grid-gap: 26px;
74
+ .jtable-card-item {
75
+ display: flex;
76
+ min-width: 0;
77
+ }
78
+ }
79
+ }
80
+
81
+ .ant-table-wrapper {
82
+ height: 100%;
83
+ .ant-table {
84
+ height: 100%;
70
85
 
71
- .jtable-card-item {
86
+ .ant-table-container {
87
+ height: 100%;
88
+
89
+ .ant-table-content {
90
+ height: 100%;
91
+ }
92
+ }
93
+ }
94
+ }
95
+
96
+ .j-table-scroll {
97
+ background-color: red;
98
+ .ant-table-container {
72
99
  display: flex;
73
- min-width: 0;
100
+ flex-direction: column;
101
+
102
+ .ant-table-body {
103
+ flex: 1;
104
+ min-height: 0;
105
+ overflow-y: auto;
106
+ }
74
107
  }
75
108
  }
76
109
  }
77
110
 
111
+ .jtable-alert {
112
+ margin-bottom: 16px;
113
+ }
114
+
78
115
  .jtable-pagination {
79
116
  width: 100%;
80
117
  display: flex;
package/lib/Search/Advanced/SaveHistory.js CHANGED
@@ -21,7 +21,7 @@
21
21
  } */
22
22
  import { defineComponent as _defineComponent } from 'vue';
23
23
  import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
24
- const _withScopeId = n => (_pushScopeId("data-v-1716520754723"), n = n(), _popScopeId(), n);
24
+ const _withScopeId = n => (_pushScopeId("data-v-1716533072100"), n = n(), _popScopeId(), n);
25
25
  const _hoisted_1 = {
26
26
  key: 0,
27
27
  style: { "width": "240px" }
package/lib/Search/Item.js CHANGED
@@ -78,7 +78,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
78
78
  } */
79
79
  import { defineComponent as _defineComponent } from 'vue';
80
80
  import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
81
- const _withScopeId = n => (_pushScopeId("data-v-1716520753930"), n = n(), _popScopeId(), n);
81
+ const _withScopeId = n => (_pushScopeId("data-v-1716533071207"), n = n(), _popScopeId(), n);
82
82
  const _hoisted_1 = { class: "JSearch-item" };
83
83
  const _hoisted_2 = {
84
84
  key: 0,
package/lib/Search/Search.js CHANGED
@@ -36,7 +36,7 @@
36
36
  } */
37
37
  import { defineComponent as _defineComponent } from 'vue';
38
38
  import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createVNode as _createVNode, unref as _unref, withCtx as _withCtx, createBlock as _createBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
39
- const _withScopeId = n => (_pushScopeId("data-v-1716520754118"), n = n(), _popScopeId(), n);
39
+ const _withScopeId = n => (_pushScopeId("data-v-1716533071302"), n = n(), _popScopeId(), n);
40
40
  const _hoisted_1 = { class: "JSearch-content simple" };
41
41
  const _hoisted_2 = { class: "JSearch-items" };
42
42
  import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';
package/lib/style/index.css CHANGED
@@ -489,7 +489,7 @@
489
489
  color: unset;
490
490
  }
491
491
  .jtable-body-spin {
492
- min-height: 100%;
492
+ height: 100%;
493
493
  width: 100%;
494
494
  background-color: #fff;
495
495
  }
@@ -536,17 +536,49 @@
536
536
  .jtable-body-header .jtable-body-header-right .jtable-body-header-right-button :deep(.ant-radio-button-wrapper-checked) {
537
537
  color: #1890ff;
538
538
  }
539
- .jtable-alert {
540
- margin-bottom: 16px;
539
+ .jtable-box {
540
+ flex: 1;
541
+ min-height: 0;
541
542
  }
542
- .jtable-card .jtable-card-items {
543
+ .jtable-box .jtable-card {
544
+ height: 100%;
545
+ overflow-y: auto;
546
+ }
547
+ .jtable-box .jtable-card .jtable-card-items {
543
548
  display: grid;
544
549
  grid-gap: 26px;
545
550
  }
546
- .jtable-card .jtable-card-items .jtable-card-item {
551
+ .jtable-box .jtable-card .jtable-card-items .jtable-card-item {
547
552
  display: flex;
548
553
  min-width: 0;
549
554
  }
555
+ .jtable-box .ant-table-wrapper {
556
+ height: 100%;
557
+ }
558
+ .jtable-box .ant-table-wrapper .ant-table {
559
+ height: 100%;
560
+ }
561
+ .jtable-box .ant-table-wrapper .ant-table .ant-table-container {
562
+ height: 100%;
563
+ }
564
+ .jtable-box .ant-table-wrapper .ant-table .ant-table-container .ant-table-content {
565
+ height: 100%;
566
+ }
567
+ .jtable-box .j-table-scroll {
568
+ background-color: red;
569
+ }
570
+ .jtable-box .j-table-scroll .ant-table-container {
571
+ display: flex;
572
+ flex-direction: column;
573
+ }
574
+ .jtable-box .j-table-scroll .ant-table-container .ant-table-body {
575
+ flex: 1;
576
+ min-height: 0;
577
+ overflow-y: auto;
578
+ }
579
+ .jtable-alert {
580
+ margin-bottom: 16px;
581
+ }
550
582
  .jtable-pagination {
551
583
  width: 100%;
552
584
  display: flex;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jetlinks-web/components",
3
- "version": "2.0.33",
3
+ "version": "2.0.34",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",