adtec-core-package 2.9.3 → 2.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "private": false,
   "type": "module",
   "scripts": {

package/src/css/vxeTableUI/components/grid.scss

@@ -37,6 +37,7 @@
   }
   .vxe-grid--table-container {
     display: flex;
+    height:100%;
     flex-direction: row;
   }
   .vxe-grid--left-wrapper,

package/src/css/vxeTableUI/components/table.scss

@@ -79,6 +79,37 @@
   overflow-x: scroll;
 }
 
+/* 仅显示外层滚动条：鼠标进入表格显示，移出隐藏 */
+.vxe-table--scroll-x-handle,
+.vxe-table--scroll-y-handle {
+  scrollbar-width: none;
+  -ms-overflow-style: none;
+  &::-webkit-scrollbar {
+    width: 8px;
+    height: 8px;
+    background: transparent;
+  }
+  &::-webkit-scrollbar-thumb {
+    background: transparent;
+    border-radius: 4px;
+  }
+  &::-webkit-scrollbar-track {
+    background: transparent;
+  }
+}
+
+.vxe-table:hover {
+  .vxe-table--scroll-x-handle,
+  .vxe-table--scroll-y-handle {
+    scrollbar-width: thin;
+    scrollbar-color: #DDDEE0 transparent;
+  }
+  .vxe-table--scroll-x-handle::-webkit-scrollbar-thumb,
+  .vxe-table--scroll-y-handle::-webkit-scrollbar-thumb {
+    background: #DDDEE0;
+  }
+}
+
 .vxe-loading--custom-wrapper {
   display: none;
   position: absolute;
@@ -573,10 +604,10 @@
     }
   }
   .vxe-table--scroll-x-virtual {
-    height: 0;
+    height: 0 !important;
   }
   .vxe-table--scroll-y-virtual {
-    width: 0;
+    width: 0px !important;
   }
   .vxe-table--scroll-x-virtual,
   .vxe-table--scroll-y-virtual {
@@ -604,10 +635,10 @@
   .vxe-table--scroll-x-handle {
     overflow-y: hidden;
     overflow-x: scroll;
-    height: 18px;
+    height: 8px;
   }
   .vxe-table--scroll-x-wrapper {
-    height: 100%;
+    height: 8px;
   }
   .vxe-table--scroll-y-handle,
   .vxe-table--scroll-y-wrapper {
@@ -619,7 +650,7 @@
   .vxe-table--scroll-y-handle {
     overflow-y: scroll;
     overflow-x: hidden;
-    width: 18px;
+    width: 8px;
     height: 100%;
   }
   .vxe-table--scroll-x-space {
@@ -873,6 +904,7 @@
 
 /*table*/
 .vxe-table--render-default {
+  height:100%;
   position: relative;
   font-size: var(--vxe-ui-font-size-default);
   color: var(--vxe-ui-font-color);
@@ -893,6 +925,12 @@
     border-collapse: separate;
     table-layout: fixed;
   }
+  .vxe-table--render-wrapper{
+    height:100%;
+    .vxe-table--layout-wrapper {
+      height:100%
+    }
+  }
   &:not(.is--empty) {
     &.is--footer {
       &.is--scroll-x {
@@ -1173,7 +1211,7 @@
         &::after {
           bottom: 0;
           height: calc(100% + var(--vxe-ui-table-border-width));
-          border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
+          //border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
         }
       }
     }

package/src/interface/IUserPermissionVo.ts

@@ -39,6 +39,7 @@ export interface IUserPermissionVo {
   isIup?: string
   roleCodes?: string[]
   topDeptId?: string
+  topDeptName?: string
   mdmDeptId?: string
-  deptName?:string
+  deptName?: string
 }