3h1-ui 3.0.0-next.21 → 3.0.0-next.23

package/es/index.js

@@ -30823,6 +30823,10 @@ const shyTableBasicProps = reactive({
     type: Boolean,
     default: true
   },
+  isShowFooterSettings: {
+    type: Boolean,
+    default: true
+  },
   isShowFooter: {
     type: Boolean,
     default: true
@@ -34423,9 +34427,11 @@ function usePagination(refProps) {
   const getPaginationInfo = computed(() => {
     const {
       pagination,
-      isShowPagination
+      isShowPagination,
+      isShowFooterSettings
     } = unref(refProps);
     return {
+      isShowFooterSettings,
       isShowPagination,
       current: 1,
       pageSize: PAGE_SIZE,
@@ -36760,7 +36766,6 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     const {
       isShowFooter,
       resizeHeightOffset,
-      pagination,
       maxHeight,
       isCanResizeParent,
       useSearchForm
@@ -36821,7 +36826,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     }
     let height = bottomIncludeBody - (resizeHeightOffset || 0) - paddingHeight - footerHeight - tableHeaderHeight - headerHeight;
     height = height > maxHeight ? maxHeight : height;
-    height = Math.floor(height);
+    height = Math.floor(height + 2);
     setHeight(height);
     bodyEl.style.height = `${height}px`;
   }
@@ -37250,9 +37255,8 @@ const tableFooter = "";
 const ShyTableFooter = /* @__PURE__ */ defineComponent({
   emits: ["pageChange"],
   props: {
-    isShowSettings: {
-      type: Boolean,
-      default: true
+    isShowFooterSettings: {
+      type: Boolean
     },
     isShowPagination: {
       type: Boolean
@@ -37293,9 +37297,7 @@ const ShyTableFooter = /* @__PURE__ */ defineComponent({
     return () => {
       const isShowSettings = () => {
         var _a2;
-        return props2.isShowSettings ? createVNode("div", {
-          "class": `${prefixCls2}-settings`
-        }, [createVNode("div", {
+        return props2.isShowFooterSettings ? createVNode(Fragment, null, [createVNode("div", {
           "class": `${prefixCls2}-count-box`
         }, [getSelectTotal.value]), createVNode("div", {
           "class": `${prefixCls2}-settings-box`
@@ -37308,7 +37310,9 @@ const ShyTableFooter = /* @__PURE__ */ defineComponent({
       };
       return createVNode("div", {
         "class": prefixCls2
-      }, [isShowSettings(), isShowPagination()]);
+      }, [createVNode("div", {
+        "class": `${prefixCls2}-settings`
+      }, [isShowSettings()]), isShowPagination()]);
     };
   }
 });
@@ -37426,7 +37430,6 @@ const ShyTable = /* @__PURE__ */ defineComponent({
     }, emit);
     const {
       schemasAdvancedSearch,
-      // schemasAdvancedSearchString,
       schemasAdvancedSearchGlobal,
       isVisibleAdvancedSearch,
       openAdvancedSearch,
@@ -37608,8 +37611,9 @@ const ShyTable = /* @__PURE__ */ defineComponent({
         }, null) : null;
       };
       const isShowSummary = () => {
+        var _a2, _b;
         let _slot2;
-        return getProps.value.showSummaryTotal ? createVNode(TableSummary, null, {
+        return ((_a2 = getDataSourceRef.value) == null ? void 0 : _a2.length) && ((_b = getProps.value) == null ? void 0 : _b.showSummaryTotal) ? createVNode(TableSummary, null, {
           default: () => [createVNode(TableSummaryRow, null, _isSlot(_slot2 = getColumnsSummary.value.map((item, index2) => {
             if (index2 === 0)
               return createVNode(TableSummaryCell, {
@@ -37634,6 +37638,7 @@ const ShyTable = /* @__PURE__ */ defineComponent({
       };
       const isShowFooter = () => {
         return getBindValues.value.isShowFooter ? createVNode(ShyTableFooter, {
+          "isShowFooterSettings": getBindValues.value.isShowFooterSettings,
           "isShowPagination": getBindValues.value.isShowPagination,
           "pagination": getPaginationInfo.value,
           "onPageChange": handlePageChange
@@ -37661,10 +37666,7 @@ const ShyTable = /* @__PURE__ */ defineComponent({
       };
       const emptyText = () => {
         return createVNode("div", {
-          "class": "flex justify-center items-center",
-          "style": {
-            height: `${getScrollRef.value.y - 41 - (getProps.value.showSummaryTotal ? 47 : 0)}px`
-          }
+          "class": "flex justify-center items-center"
         }, [createVNode(Empty$3, null, null)]);
       };
       return createVNode("div", {

package/es/style.css

@@ -847,22 +847,22 @@ mark {
   background-color: var(--gray-0);
   transition: background-color outline-width ease-in-out 0.3s;
 }
-:is(.ant-table-body)::-webkit-scrollbar {
+:is(.ant-table-body, .ant-table-content)::-webkit-scrollbar {
   position: absolute;
   height: 10px;
   width: 10px;
 }
-:is(.ant-table-body)::-webkit-scrollbar-thumb {
+:is(.ant-table-body, .ant-table-content)::-webkit-scrollbar-thumb {
   box-shadow: inset 0 0 10px 10px var(--gray-2);
   border: solid 2px transparent;
   background-color: transparent;
   border-radius: 10px;
 }
-:is(.ant-table-body)::-webkit-scrollbar-thumb:active, :is(.ant-table-body)::-webkit-scrollbar-thumb:hover {
+:is(.ant-table-body, .ant-table-content)::-webkit-scrollbar-thumb:active, :is(.ant-table-body, .ant-table-content)::-webkit-scrollbar-thumb:hover {
   box-shadow: inset 0 0 10px 10px var(--gray-3);
   background-color: transparent;
 }
-:is(.ant-table-body)::-webkit-scrollbar-track {
+:is(.ant-table-body, .ant-table-content)::-webkit-scrollbar-track {
   border-radius: 10px;
   border: solid 2px transparent;
   background: transparent;

package/lib/index.js

@@ -30847,6 +30847,10 @@ const shyTableBasicProps = vue.reactive({
     type: Boolean,
     default: true
   },
+  isShowFooterSettings: {
+    type: Boolean,
+    default: true
+  },
   isShowFooter: {
     type: Boolean,
     default: true
@@ -34447,9 +34451,11 @@ function usePagination(refProps) {
   const getPaginationInfo = vue.computed(() => {
     const {
       pagination,
-      isShowPagination
+      isShowPagination,
+      isShowFooterSettings
     } = vue.unref(refProps);
     return {
+      isShowFooterSettings,
       isShowPagination,
       current: 1,
       pageSize: PAGE_SIZE,
@@ -36784,7 +36790,6 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     const {
       isShowFooter,
       resizeHeightOffset,
-      pagination,
       maxHeight,
       isCanResizeParent,
       useSearchForm
@@ -36845,7 +36850,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     }
     let height = bottomIncludeBody - (resizeHeightOffset || 0) - paddingHeight - footerHeight - tableHeaderHeight - headerHeight;
     height = height > maxHeight ? maxHeight : height;
-    height = Math.floor(height);
+    height = Math.floor(height + 2);
     setHeight(height);
     bodyEl.style.height = `${height}px`;
   }
@@ -37274,9 +37279,8 @@ const tableFooter = "";
 const ShyTableFooter = /* @__PURE__ */ vue.defineComponent({
   emits: ["pageChange"],
   props: {
-    isShowSettings: {
-      type: Boolean,
-      default: true
+    isShowFooterSettings: {
+      type: Boolean
     },
     isShowPagination: {
       type: Boolean
@@ -37317,9 +37321,7 @@ const ShyTableFooter = /* @__PURE__ */ vue.defineComponent({
     return () => {
       const isShowSettings = () => {
         var _a2;
-        return props2.isShowSettings ? vue.createVNode("div", {
-          "class": `${prefixCls2}-settings`
-        }, [vue.createVNode("div", {
+        return props2.isShowFooterSettings ? vue.createVNode(vue.Fragment, null, [vue.createVNode("div", {
           "class": `${prefixCls2}-count-box`
         }, [getSelectTotal.value]), vue.createVNode("div", {
           "class": `${prefixCls2}-settings-box`
@@ -37332,7 +37334,9 @@ const ShyTableFooter = /* @__PURE__ */ vue.defineComponent({
       };
       return vue.createVNode("div", {
         "class": prefixCls2
-      }, [isShowSettings(), isShowPagination()]);
+      }, [vue.createVNode("div", {
+        "class": `${prefixCls2}-settings`
+      }, [isShowSettings()]), isShowPagination()]);
     };
   }
 });
@@ -37450,7 +37454,6 @@ const ShyTable = /* @__PURE__ */ vue.defineComponent({
     }, emit);
     const {
       schemasAdvancedSearch,
-      // schemasAdvancedSearchString,
       schemasAdvancedSearchGlobal,
       isVisibleAdvancedSearch,
       openAdvancedSearch,
@@ -37632,8 +37635,9 @@ const ShyTable = /* @__PURE__ */ vue.defineComponent({
         }, null) : null;
       };
       const isShowSummary = () => {
+        var _a2, _b;
         let _slot2;
-        return getProps.value.showSummaryTotal ? vue.createVNode(antDesignVue.TableSummary, null, {
+        return ((_a2 = getDataSourceRef.value) == null ? void 0 : _a2.length) && ((_b = getProps.value) == null ? void 0 : _b.showSummaryTotal) ? vue.createVNode(antDesignVue.TableSummary, null, {
           default: () => [vue.createVNode(antDesignVue.TableSummaryRow, null, _isSlot(_slot2 = getColumnsSummary.value.map((item, index2) => {
             if (index2 === 0)
               return vue.createVNode(antDesignVue.TableSummaryCell, {
@@ -37658,6 +37662,7 @@ const ShyTable = /* @__PURE__ */ vue.defineComponent({
       };
       const isShowFooter = () => {
         return getBindValues.value.isShowFooter ? vue.createVNode(ShyTableFooter, {
+          "isShowFooterSettings": getBindValues.value.isShowFooterSettings,
           "isShowPagination": getBindValues.value.isShowPagination,
           "pagination": getPaginationInfo.value,
           "onPageChange": handlePageChange
@@ -37685,10 +37690,7 @@ const ShyTable = /* @__PURE__ */ vue.defineComponent({
       };
       const emptyText = () => {
         return vue.createVNode("div", {
-          "class": "flex justify-center items-center",
-          "style": {
-            height: `${getScrollRef.value.y - 41 - (getProps.value.showSummaryTotal ? 47 : 0)}px`
-          }
+          "class": "flex justify-center items-center"
         }, [vue.createVNode(antDesignVue.Empty, null, null)]);
       };
       return vue.createVNode("div", {

package/lib/style.css

@@ -847,22 +847,22 @@ mark {
   background-color: var(--gray-0);
   transition: background-color outline-width ease-in-out 0.3s;
 }
-:is(.ant-table-body)::-webkit-scrollbar {
+:is(.ant-table-body, .ant-table-content)::-webkit-scrollbar {
   position: absolute;
   height: 10px;
   width: 10px;
 }
-:is(.ant-table-body)::-webkit-scrollbar-thumb {
+:is(.ant-table-body, .ant-table-content)::-webkit-scrollbar-thumb {
   box-shadow: inset 0 0 10px 10px var(--gray-2);
   border: solid 2px transparent;
   background-color: transparent;
   border-radius: 10px;
 }
-:is(.ant-table-body)::-webkit-scrollbar-thumb:active, :is(.ant-table-body)::-webkit-scrollbar-thumb:hover {
+:is(.ant-table-body, .ant-table-content)::-webkit-scrollbar-thumb:active, :is(.ant-table-body, .ant-table-content)::-webkit-scrollbar-thumb:hover {
   box-shadow: inset 0 0 10px 10px var(--gray-3);
   background-color: transparent;
 }
-:is(.ant-table-body)::-webkit-scrollbar-track {
+:is(.ant-table-body, .ant-table-content)::-webkit-scrollbar-track {
   border-radius: 10px;
   border: solid 2px transparent;
   background: transparent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "3.0.0-next.21",
+  "version": "3.0.0-next.23",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -29,9 +29,9 @@
     "vue-json-pretty": "^2.2.3",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
+    "@shy-plugins/use": "1.0.0-next.1",
     "@shy-plugins/tinymce": "^1.0.6",
-    "@shy-plugins/utils": "1.0.0-next.1",
-    "@shy-plugins/use": "1.0.0-next.1"
+    "@shy-plugins/utils": "1.0.0-next.1"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {