@jetlinks-web/components 2.0.33 → 2.0.35

package/lib/ProTable/Content.js

@@ -21,25 +21,28 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "_contentProps": "setup-maybe-ref",
   "Table": "setup-maybe-ref",
   "get": "setup-maybe-ref",
-  "isString": "setup-maybe-ref",
   "Empty": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "slots": "setup-maybe-ref",
   "_columns": "setup-ref",
-  "cardStyle": "setup-ref",
+  "_scroll": "setup-ref",
   "gridTemplateColumns": "setup-ref"
 } */
 import { defineComponent as _defineComponent } from 'vue';
 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";
 const _hoisted_1 = { class: "jtable-box" };
 const _hoisted_2 = {
+    key: 0,
+    class: "jtable-card"
+};
+const _hoisted_3 = {
     key: 1,
     class: "j-table-empty"
 };
 import { useSlots, computed } from 'vue';
 import { _contentProps } from "./setting";
 import { Table } from 'ant-design-vue';
-import { get, isString } from 'lodash-es';
+import { get } from 'lodash-es';
 import Empty from '../Empty';
 const __sfc_main__ = _defineComponent({
     ...{
@@ -56,22 +59,20 @@ const __sfc_main__ = _defineComponent({
         const props = __props;
         const slots = useSlots();
         const _columns = computed(() => props.columns.filter((i) => !_optionalChain([i, 'optionalAccess', _2 => _2.hideInTable])));
-        const cardStyle = computed(() => props.scroll && props.scroll.y ? {
-            maxHeight: isString(props.scroll.y) ? props.scroll.y : props.scroll.y + 'px',
-            overflow: 'auto',
-        }
-            : undefined);
+        const _scroll = computed(() => {
+            let y = _optionalChain([props, 'access', _3 => _3.scroll, 'optionalAccess', _4 => _4.y]) || '100%';
+            return {
+                x: _optionalChain([props, 'access', _5 => _5.scroll, 'optionalAccess', _6 => _6.x]) || '100%',
+                y
+            };
+        });
         const gridTemplateColumns = computed(() => {
             return `repeat(${props.column}, 1fr)`;
         });
         return (_ctx, _cache) => {
             return (_openBlock(), _createElementBlock("div", _hoisted_1, [
                 (_ctx.mode === 'CARD')
-                    ? (_openBlock(), _createElementBlock("div", {
-                        key: 0,
-                        class: "jtable-card",
-                        style: _normalizeStyle(cardStyle.value)
-                    }, [
+                    ? (_openBlock(), _createElementBlock("div", _hoisted_2, [
                         (_ctx.dataSource.length)
                             ? (_openBlock(), _createElementBlock("div", {
                                 key: 0,
@@ -81,31 +82,33 @@ const __sfc_main__ = _defineComponent({
                                 (_openBlock(true), _createElementBlock(_Fragment, null, _renderList(_ctx.dataSource, (item) => {
                                     return (_openBlock(), _createElementBlock("div", {
                                         class: _normalizeClass(['jtable-card-item', props.cardBodyClass]),
-                                        key: item[_ctx.rowKey]
+                                        key: item[props.rowKey]
                                     }, [
                                         _renderSlot(_ctx.$slots, "card", _normalizeProps(_guardReactiveProps(item)))
                                     ], 2 /* CLASS */));
                                 }), 128 /* KEYED_FRAGMENT */))
                             ], 4 /* STYLE */))
-                            : (_openBlock(), _createElementBlock("div", _hoisted_2, [
+                            : (_openBlock(), _createElementBlock("div", _hoisted_3, [
                                 _renderSlot(_ctx.$slots, "emptyText", {}, () => [
                                     _createVNode(_unref(Empty))
                                 ])
                             ]))
-                    ], 4 /* STYLE */))
+                    ]))
                     : (_openBlock(), _createBlock(_unref(Table), _mergeProps({ key: 1 }, props, {
                         dataSource: _ctx.dataSource,
                         columns: _columns.value,
-                        pagination: false
+                        pagination: false,
+                        scroll: _scroll.value,
+                        class: { 'j-table-scroll': !_optionalChain([props, 'access', _7 => _7.scroll, 'optionalAccess', _8 => _8.y]) }
                     }), {
                         headerCell: _withCtx(({ column, title }) => [
                             _renderSlot(_ctx.$slots, "headerCell", _normalizeProps(_guardReactiveProps({ column, title })))
                         ]),
                         bodyCell: _withCtx(({ column, record }) => [
-                            ((_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])]])))
-                                ? _renderSlot(_ctx.$slots, _optionalChain([column, 'optionalAccess', _12 => _12.key]) || _optionalChain([column, 'optionalAccess', _13 => _13.dataIndex]), _normalizeProps(_mergeProps({ key: 0 }, record)))
+                            ((_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])]])))
+                                ? _renderSlot(_ctx.$slots, _optionalChain([column, 'optionalAccess', _18 => _18.key]) || _optionalChain([column, 'optionalAccess', _19 => _19.dataIndex]), _normalizeProps(_mergeProps({ key: 0 }, record)))
                                 : (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
-                                    _createTextVNode(_toDisplayString(_unref(get)(record, _optionalChain([column, 'optionalAccess', _14 => _14.dataIndex]) || _optionalChain([column, 'optionalAccess', _15 => _15.key]))), 1 /* TEXT */)
+                                    _createTextVNode(_toDisplayString(_unref(get)(record, _optionalChain([column, 'optionalAccess', _20 => _20.dataIndex]) || _optionalChain([column, 'optionalAccess', _21 => _21.key]))), 1 /* TEXT */)
                                 ], 64 /* STABLE_FRAGMENT */))
                         ]),
                         emptyText: _withCtx(() => [
@@ -114,7 +117,7 @@ const __sfc_main__ = _defineComponent({
                             ])
                         ]),
                         _: 3 /* FORWARDED */
-                    }, 16 /* FULL_PROPS */, ["dataSource", "columns"]))
+                    }, 16 /* FULL_PROPS */, ["dataSource", "columns", "scroll", "class"]))
             ]));
         };
     }

package/lib/ProTable/Pagination.js

@@ -1,25 +1,33 @@
 /* Analyzed bindings: {
   "Pagination": "setup-maybe-ref",
-  "paginationProps": "setup-maybe-ref",
+  "_paginationProps": "setup-maybe-ref",
+  "computed": "setup-const",
   "props": "setup-reactive-const",
   "emits": "setup-const",
+  "className": "setup-ref",
   "_showTotal": "setup-const",
   "onChange": "setup-const"
 } */
 import { defineComponent as _defineComponent } from 'vue';
-import { renderSlot as _renderSlot, unref as _unref, createVNode as _createVNode, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
+import { renderSlot as _renderSlot, unref as _unref, mergeProps as _mergeProps, createVNode as _createVNode, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
 const _hoisted_1 = { class: "jtable-pagination" };
 import { Pagination } from 'ant-design-vue';
-import { paginationProps } from "./setting";
+import { _paginationProps } from "./setting";
+import { computed } from 'vue';
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'Pagination'
     },
-    props: { ...paginationProps },
+    props: { ..._paginationProps },
     emits: ['change'],
     setup(__props, { emit: __emit }) {
         const props = __props;
         const emits = __emit;
+        const className = computed(() => {
+            return {
+                'show-content': !props.isShowContent,
+            };
+        });
         const _showTotal = (num) => {
             const minSize = props.pageIndex * props.pageSize + 1;
             const MaxSize = (props.pageIndex + 1) * props.pageSize;
@@ -31,13 +39,14 @@ const __sfc_main__ = _defineComponent({
         return (_ctx, _cache) => {
             return (_openBlock(), _createElementBlock("div", _hoisted_1, [
                 _renderSlot(_ctx.$slots, "default", {}, () => [
-                    _createVNode(_unref(Pagination), {
+                    _createVNode(_unref(Pagination), _mergeProps(props, {
                         total: _ctx.total,
                         pageSize: _ctx.pageSize,
                         current: _ctx.pageIndex + 1,
                         "show-total": (num) => _showTotal(num),
-                        onChange: onChange
-                    }, null, 8 /* PROPS */, ["total", "pageSize", "current", "show-total"])
+                        onChange: onChange,
+                        class: className.value
+                    }), null, 16 /* FULL_PROPS */, ["total", "pageSize", "current", "show-total", "class"])
                 ])
             ]));
         };

package/lib/ProTable/ProTable.js

@@ -281,13 +281,14 @@ const __sfc_main__ = _defineComponent({
                                 })
                             ]), 1040 /* FULL_PROPS, DYNAMIC_SLOTS */, ["mode", "dataSource", "column"]),
                             (showPagination.value)
-                                ? (_openBlock(), _createBlock(Pagination, {
+                                ? (_openBlock(), _createBlock(Pagination, _mergeProps({
                                     key: 1,
-                                    onChange: onPageChange,
+                                    onChange: onPageChange
+                                }, props.pagination, {
                                     total: page.total,
                                     pageIndex: page.pageIndex,
                                     pageSize: page.pageSize
-                                }, {
+                                }), {
                                     default: _withCtx(() => [
                                         _renderSlot(_ctx.$slots, "paginationRender", {
                                             total: page.total,
@@ -297,7 +298,7 @@ const __sfc_main__ = _defineComponent({
                                         })
                                     ]),
                                     _: 3 /* FORWARDED */
-                                }, 8 /* PROPS */, ["total", "pageIndex", "pageSize"]))
+                                }, 16 /* FULL_PROPS */, ["total", "pageIndex", "pageSize"]))
                                 : _createCommentVNode("v-if", true)
                         ])
                     ]),

package/lib/ProTable/setting.js

@@ -4,11 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.proTableProps = exports.paginationProps = exports._headerProps = exports._contentProps = exports._alertProps = void 0;
+exports.proTableProps = exports._paginationProps = exports._headerProps = exports._contentProps = exports._alertProps = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _Table = require("ant-design-vue/es/table/Table");
 require("vue");
 require("ant-design-vue/es/table");
+var _Pagination = require("ant-design-vue/es/pagination/Pagination");
 var _headerProps = exports._headerProps = {
   mode: {
     type: [String, undefined],
@@ -55,17 +56,15 @@ var _contentProps = exports._contentProps = (0, _objectSpread2.default)((0, _obj
   scroll: {
     type: Object,
     default: function _default() {
-      return {
-        x: 1366
-      };
-    }
+      return {};
+    } //  x: 1366
   },
   rowKey: {
     type: [String, Function],
     default: 'id'
   }
 });
-var paginationProps = exports.paginationProps = {
+var _paginationProps = exports._paginationProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _Pagination.paginationProps)()), {}, {
   total: {
     type: Number,
     default: 0
@@ -77,8 +76,15 @@ var paginationProps = exports.paginationProps = {
   pageIndex: {
     type: Number,
     default: 0
+  },
+  /**
+   *  是否显示分页内容
+   */
+  isShowContent: {
+    type: Boolean,
+    default: false
   }
-};
+});
 var proTableProps = exports.proTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _contentProps), _alertProps), {}, {
   bodyStyle: {
     type: Object,

package/lib/ProTable/style/ProTable.less

@@ -1,7 +1,8 @@
 @import '../../style/variable.less';
+@import 'ant-design-vue/lib/pagination/style/index.less';
 
 .jtable-body-spin {
-  min-height: 100%;
+  height: 100%;
   width: 100%;
   background-color: #fff;
 
@@ -59,25 +60,75 @@
   }
 }
 
-.jtable-alert {
-  margin-bottom: 16px;
-}
+.jtable-box {
+  flex: 1;
+  min-height: 0;
+
+  .jtable-card {
+    height: 100%;
+    overflow-y: auto;
+
+    .jtable-card-items {
+      display: grid;
+      grid-gap: 26px;
+
+      .jtable-card-item {
+        display: flex;
+        min-width: 0;
+      }
+    }
+
+    .j-table-empty {
+      margin-top: 100px;
+    }
+  }
+
+  .ant-table-wrapper {
+    height: 100%;
+    .ant-table {
+      height: 100%;
 
-.jtable-card {
-  .jtable-card-items {
-    display: grid;
-    grid-gap: 26px;
+      .ant-table-container {
+        height: 100%;
 
-    .jtable-card-item {
+        .ant-table-content {
+          height: 100%;
+        }
+      }
+    }
+  }
+
+  .j-table-scroll {
+    background-color: red;
+    .ant-table-container {
       display: flex;
-      min-width: 0;
+      flex-direction: column;
+
+      .ant-table-body {
+        flex: 1;
+        min-height: 0;
+        overflow-y: auto;
+      }
     }
   }
 }
 
+.jtable-alert {
+  margin-bottom: 16px;
+}
+
 .jtable-pagination {
   width: 100%;
   display: flex;
   justify-content: flex-end;
   margin-top: 16px;
+
+  .show-content {
+    .@{ant-prefix}-pagination-item,
+    & .@{ant-prefix}-pagination-jump-prev,
+    & .@{ant-prefix}-pagination-jump-next {
+      display: none;
+    }
+  }
 }
+

package/lib/Search/Advanced/SaveHistory.js

@@ -21,7 +21,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 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";
-const _withScopeId = n => (_pushScopeId("data-v-1716520754723"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1716887937833"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/lib/Search/Item.js

@@ -78,7 +78,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 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";
-const _withScopeId = n => (_pushScopeId("data-v-1716520753930"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1716887935892"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/lib/Search/Search.js

@@ -36,7 +36,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 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";
-const _withScopeId = n => (_pushScopeId("data-v-1716520754118"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1716887936060"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-content simple" };
 const _hoisted_2 = { class: "JSearch-items" };
 import { Button, Row, Col, Form, FormItemRest, } from 'ant-design-vue';