adtec-core-package 3.2.4 → 3.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "3.2.4",
+  "version": "3.2.6",
   "private": false,
   "type": "module",
   "exports": {
@@ -17,7 +17,7 @@
     "./scripts/*": "./scripts/*"
   },
   "scripts": {
-    "build:vite-integration": "esbuild vite/umoIntegration.ts --bundle --platform=node --format=esm --packages=external --outfile=vite/umoIntegration.js",
+    "build:vite-integration": "node scripts/build-vite-integration.mjs",
     "build:umo": "node scripts/inject-umo-composable-imports.mjs && node scripts/build-umo.mjs",
     "dev": "vite",
     "prepare:umo": "node scripts/prepare-umo-source.mjs",

package/scripts/build-vite-integration.mjs

@@ -0,0 +1,15 @@
+import * as esbuild from 'esbuild'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const root = fileURLToPath(new URL('..', import.meta.url))
+
+await esbuild.build({
+  entryPoints: [path.join(root, 'vite/umoIntegration.ts')],
+  bundle: true,
+  platform: 'node',
+  format: 'esm',
+  packages: 'external',
+  outfile: path.join(root, 'vite/umoIntegration.js'),
+  logLevel: 'info',
+})

package/src/assets/style/index.less

@@ -5,7 +5,6 @@
 // @import './sidebar.scss';
 // @import './btn.scss';
 @import './transition.scss';
-@import './scrollbar-classic.less';
 
 body {
   height: 100%;
@@ -127,61 +126,60 @@ div:focus {
   --margin-8: 8px;
   --margin-9: 9px;
   --margin-10: 10px;
-
-  /* 现代圆角滚动条 */
-  --adtec-scrollbar-size: 15px;
-  --el-scrollbar-size: 8px;
-  --adtec-scrollbar-radius: 999px;
-  --adtec-scrollbar-thumb-color: rgba(0, 0, 0, 0.22);
-  --adtec-scrollbar-thumb-hover-color: rgba(0, 0, 0, 0.35);
-  --adtec-scrollbar-track-color: rgba(0, 0, 0, 0.04);
-  /* vxe 表格滚动条：与 el-scrollbar 对齐 */
-  --vxe-scrollbar-size: var(--el-scrollbar-size, 8px);
-  --vxe-scrollbar-thumb-color: var(--el-scrollbar-bg-color, rgba(0, 0, 0, 0.42));
-  --vxe-scrollbar-thumb-hover-color: var(--el-scrollbar-hover-bg-color, rgba(0, 0, 0, 0.55));
-  --vxe-scrollbar-track-color: rgba(0, 0, 0, 0.04);
-  /* el-scrollbar 单独配色（略粗 + 半透明灰，颜色偏深） */
-  --el-scrollbar-opacity: 0.65;
-  --el-scrollbar-bg-color: rgba(0, 0, 0, 0.42);
-  --el-scrollbar-hover-opacity: 0.85;
-  --el-scrollbar-hover-bg-color: rgba(0, 0, 0, 0.55);
 }
 .move-back {
   background: #f5f5f5 !important;
 }
 
-* {
-  .adtec-scrollbar-hidden();
-}
-
-*:hover {
-  .adtec-scrollbar-active();
+*::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+  background: transparent;
 }
 
-/* vxe-table 使用独立滚动条手柄，禁止全局 hover 样式作用于表格内部（含固定列） */
-.vxe-table,
-.vxe-table *,
-.vxe-table *:hover {
-  .adtec-scrollbar-hidden();
+*::-webkit-scrollbar-thumb {
+  background: transparent;
+  border-radius: 4px;
 }
 
-.vxe-table:hover {
-  .vxe-table--scroll-x-handle,
-  .vxe-table--scroll-y-handle {
-    .adtec-vxe-scrollbar-active();
-  }
+*:hover::-webkit-scrollbar-thumb {
+  background: #DDDEE0;
 }
 
-/* 附件预览：常显滚动条，避免 hover 才出现导致“没有滚动条” */
-.pdf-js-viewer,
-.docx-js-viewer,
-.excel-grid-scroll,
-.office-preview-root.is-rich-preview {
-  .adtec-scrollbar-persistent();
+*:hover::-webkit-scrollbar-track {
+  background: transparent;
 }
 
+//::-webkit-scrollbar {
+//  width: 6px;
+//  height: 6px;
+//}
+//// 滚动条的轨道的两端按钮，允许通过点击微调小方块的位置。
+//::-webkit-scrollbar-button {
+//  display: none;
+//}
+//// 滚动条的轨道（里面装有Thumb）
+//::-webkit-scrollbar-track {
+//  background: transparent;
+//}
+//// 滚动条的轨道（里面装有Thumb）
+//::-webkit-scrollbar-track-piece {
+//  background-color: transparent;
+//}
+//// 滚动条里面的小方块，能向上向下移动（或往左往右移动，取决于是垂直滚动条还是水平滚动条）
+//::-webkit-scrollbar-thumb {
+//  background: #DDDEE0;
+//  opacity: var(--el-scrollbar-opacity, .3);
+//  transition: var(--el-transition-duration) background-color;
+//  cursor: pointer;
+//  border-radius: 4px;
+//}
+//::-webkit-scrollbar-thumb:hover {
+//  background: #C7C9CC;
+//}
+// 边角，即两个滚动条的交汇处
 ::-webkit-scrollbar-corner {
-  background: transparent;
+  display: none;
 }
 // 两个滚动条的交汇处上用于通过拖动调整元素大小的小控件
 *::-webkit-resizer {

package/src/components/ElCardList.vue

@@ -3,7 +3,7 @@
 <!--创建时间: 2025/5/8 09:15-->
 <!--修改时间: 2025/5/8 09:15-->
 <template>
-  <el-scrollbars :noresize="true" class="el-card-list-scroll" style="width: 100%">
+  <el-scrollbars :noresize="true" style="width: 100%">
     <div v-if="!model || (model?.length ?? 0) == 0" class="el-table__empty-block">
       <span class="el-table__empty-text">暂无数据</span>
     </div>
@@ -61,10 +61,4 @@ defineExpose<{
 .seMeetingSel {
   border: 1px solid var(--el-color-primary) !important;
 }
-
-.el-card-list-scroll {
-  flex: 1;
-  min-height: 0;
-  overflow: hidden;
-}
 </style>

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -644,41 +644,10 @@ onUnmounted(() => {
   min-width: 0;
 }
 
-/* classic 模式：切换工具栏固定右上角（与 ribbon 图二一致） */
-:deep(.umo-toolbar-actions-classic) {
-  position: absolute;
-  right: 5px;
-  top: 6px;
-  z-index: 10;
-  border-radius: 6px;
-  background-color: var(--umo-color-white, #fff);
-  box-shadow:
-    0 0 0 1px hsla(0, 0%, 5%, 0.04),
-    0 2px 5px hsla(0, 0%, 5%, 0.06);
-}
-
-:deep(.toolbar-classic .umo-scrollable-container) {
-  padding-right: 108px;
-}
-
-:deep(.umo-scrollable-content) {
-  overflow-x: hidden;
-  overflow-y: hidden;
-  scrollbar-width: none;
-  -ms-overflow-style: none;
-
-  &::-webkit-scrollbar {
-    display: none;
-    width: 0;
-    height: 0;
-  }
-}
-
 :deep(.umo-classic-menu),
 :deep(.umo-virtual-group) {
-  flex-wrap: wrap;
-  row-gap: 4px;
-  white-space: normal;
+  flex-wrap: nowrap;
+  white-space: nowrap;
 }
 
 :deep(.umo-button__text),

package/src/components/Scrollbars/ElScrollbars.vue

@@ -3,11 +3,7 @@
 <!--创建时间: 2025/3/20 16:16-->
 <!--修改时间: 2025/3/20 16:16-->
 <template>
-  <el-scrollbar
-    class="adtec-el-scrollbar"
-    :noresize="true"
-    v-resize-observer="onResizeObserver"
-    ref="ref_scrollbar">
+  <el-scrollbar :noresize="true" v-resize-observer="onResizeObserver" ref="ref_scrollbar">
     <slot></slot>
   </el-scrollbar>
 </template>
@@ -21,9 +17,5 @@ const onResizeObserver=(entries:any) =>{
 }
 </script>
 <style scoped lang="scss">
-.adtec-el-scrollbar {
-  height: 100%;
-  flex: 1;
-  min-height: 0;
-}
+
 </style>

package/src/components/editor-main/src/assets/styles/_variables.less

@@ -60,7 +60,7 @@
     Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
 
   // 滚动条
-  --umo-scrollbar-size: 12px;
+  --umo-scrollbar-size: 8px;
   --umo-scrollbar-thumb-color: rgba(0, 0, 0, 0.1);
   --umo-scrollbar-thumb-hover-color: rgba(0, 0, 0, 0.3);
 }

package/src/components/editor-main/src/components/toolbar/index.vue

@@ -250,12 +250,10 @@ const setContentFromCache = () => {
   padding: 6px 10px;
   display: flex;
   align-items: center;
-  &-ribbon,
-  &-classic {
+  &-ribbon {
     position: absolute;
     right: 0;
     top: 1px;
-    z-index: 10;
   }
   &-button {
     &.active {
@@ -339,18 +337,9 @@ const setContentFromCache = () => {
 
 <style lang="less">
 .umo-skin-modern {
-  &.toolbar-classic,
-  &.toolbar-ribbon {
-    .umo-toolbar-actions {
-      right: 5px !important;
-      top: 6px !important;
-    }
-  }
   &.toolbar-classic {
-    .umo-scrollable-container {
-      padding-right: 108px;
-    }
     .umo-toolbar-actions {
+      margin: 15px 15px 2px 0;
       border-radius: 6px;
       background-color: var(--umo-color-white);
       box-shadow:
@@ -363,6 +352,12 @@ const setContentFromCache = () => {
       }
     }
   }
+  &.toolbar-ribbon {
+    .umo-toolbar-actions {
+      right: 5px !important;
+      top: 6px !important;
+    }
+  }
 }
 [theme-mode='dark'] .umo-skin-modern {
   &.toolbar-classic {

package/src/components/upload/CustomElUpload.vue

@@ -44,15 +44,7 @@
     :before-upload="beforeUpload"
     drag
     :accept="getAccept"
-    :action="
-      '/api/doc/uploadFile/' +
-      business +
-      '/' +
-      businessId +
-      '/' +
-      association +
-      (watermarkCode ? '?watermarkCode=' + watermarkCode : '')
-    "
+    :action="uploadAction"
     multiple
     :limit="limit"
     :headers="uploadHeaders"
@@ -101,7 +93,7 @@
 
 <script setup lang="ts">
 import { UploadFilled } from '@element-plus/icons-vue'
-import { computed, onMounted, ref } from 'vue'
+import { computed, ref } from 'vue'
 import {
   ElMessage,
   ElMessageBox,
@@ -116,11 +108,9 @@ import documentApi from '../../api/DocumentApi.ts'
 import frameworkUtils from '../../utils/FrameworkUtils.ts'
 import { userInfoStore } from '../../stores/userInfoStore'
 import { getAcceptString } from '../../utils/uploadAccept.ts'
+import { buildUploadHeaders } from '../../utils/buildUploadHeaders.ts'
 
 const { fileView: fileView } = useFileView()
-const uploadHeaders = ref({
-  Authorization: '',
-})
 const emit = defineEmits(['success'])
 const userInfo = userInfoStore()
 const ref_upload = ref()
@@ -217,6 +207,17 @@ const props = defineProps({
     default: () => undefined,
   },
 })
+const uploadAction = computed(
+  () =>
+    '/api/doc/uploadFile/' +
+    props.business +
+    '/' +
+    props.businessId +
+    '/' +
+    props.association +
+    (props.watermarkCode ? '?watermarkCode=' + props.watermarkCode : ''),
+)
+const uploadHeaders = computed(() => buildUploadHeaders(uploadAction.value))
 /**
  * 文件列表
  */
@@ -435,9 +436,6 @@ const confirm = async (autoDelete: boolean = true) => {
     }
   }
 }
-onMounted(() => {
-  uploadHeaders.value.Authorization = sessionStorage.getItem('Authorization') + ''
-})
 defineExpose({
   remove,
   confirm,

package/src/components/upload/ElUploads.vue

@@ -40,15 +40,7 @@
     :before-upload="beforeUpload"
     drag
     :accept="getAccept"
-    :action="
-      '/api/doc/uploadFile/' +
-      business +
-      '/' +
-      businessId +
-      '/' +
-      association +
-      (watermarkCode ? '?watermarkCode=' + watermarkCode : '')
-    "
+    :action="uploadAction"
     multiple
     :limit="limit"
     :headers="uploadHeaders"
@@ -97,7 +89,7 @@
 
 <script setup lang="ts">
 import { UploadFilled } from '@element-plus/icons-vue'
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import {
   ElMessage,
   ElMessageBox,
@@ -112,11 +104,9 @@ import documentApi from '../../api/DocumentApi.ts'
 import frameworkUtils from '../../utils/FrameworkUtils.ts'
 import { userInfoStore } from '../../stores/userInfoStore'
 import { getAcceptString } from '../../utils/uploadAccept.ts'
+import { buildUploadHeaders } from '../../utils/buildUploadHeaders.ts'
 
 const { fileView: fileView } = useFileView()
-const uploadHeaders = ref({
-  Authorization: '',
-})
 const userInfo = userInfoStore()
 const ref_upload = ref()
 const hoverfileName = ref('')
@@ -201,6 +191,17 @@ const props = defineProps({
     default: () => undefined,
   },
 })
+const uploadAction = computed(
+  () =>
+    '/api/doc/uploadFile/' +
+    props.business +
+    '/' +
+    props.businessId +
+    '/' +
+    props.association +
+    (props.watermarkCode ? '?watermarkCode=' + props.watermarkCode : ''),
+)
+const uploadHeaders = computed(() => buildUploadHeaders(uploadAction.value))
 const mousemove = (fileName: string) => {
   hoverfileName.value = fileName
 }
@@ -325,9 +326,6 @@ const remove = async (file: UploadFile) => {
   }
   // }
 }
-onMounted(() => {
-  uploadHeaders.value.Authorization = sessionStorage.getItem('Authorization') + ''
-})
 defineExpose({
   remove,
 })

package/src/config/VxeTableConfig.ts

@@ -6,8 +6,12 @@ import {
 
 import VxeUIPluginRenderElement from '@vxe-ui/plugin-render-element'
 import '@vxe-ui/plugin-render-element/dist/style.css'
+import VxeUIPluginExportXLSX from '@vxe-ui/plugin-export-xlsx'
+import ExcelJS from 'exceljs'
 import 'vxe-pc-ui/lib/style.css'
 import '../css/vxeTableUI/all.scss'
+import VxeUIPluginExportPDF from '@vxe-ui/plugin-export-pdf'
+import { jsPDF } from 'jspdf'
 // 导入默认的语言（使用 es 构建，避免 lib CJS 在 Vite 下无 default 导出）
 import zhCN from 'vxe-table/es/locale/lang/zh-CN'
 
@@ -25,30 +29,8 @@ export function initVxeTableInPage(
   VxeUI.component(VxeTooltip)
   // 局部注册插件
   enableElementPlus && VxeUI.use(VxeUIPluginRenderElement)
-  if (enableExcel) {
-    void Promise.all([
-      import('exceljs'),
-      import('@vxe-ui/plugin-export-xlsx'),
-    ]).then(([{ default: ExcelJS }, xlsxModule]) => {
-      const VxeUIPluginExportXLSX =
-        xlsxModule.default ??
-        (xlsxModule as { VxeUIPluginExportXLSX?: typeof xlsxModule.default }).VxeUIPluginExportXLSX ??
-        xlsxModule
-      VxeUI.use(VxeUIPluginExportXLSX, { ExcelJS })
-    })
-  }
-  if (enablePdf) {
-    void Promise.all([
-      import('jspdf'),
-      import('@vxe-ui/plugin-export-pdf'),
-    ]).then(([{ jsPDF }, pdfModule]) => {
-      const VxeUIPluginExportPDF =
-        pdfModule.default ??
-        (pdfModule as { VxeUIPluginExportPDF?: typeof pdfModule.default }).VxeUIPluginExportPDF ??
-        pdfModule
-      VxeUI.use(VxeUIPluginExportPDF, { jsPDF })
-    })
-  }
+  enableExcel && VxeUI.use(VxeUIPluginExportXLSX, { ExcelJS })
+  enablePdf && VxeUI.use(VxeUIPluginExportPDF, { jsPDF })
 
   // 设置表格配置（可复制你在 VxeTableConfig.ts 中的配置）
   VxeUI.setConfig({
@@ -231,8 +213,8 @@ export function initVxeTableInPage(
         oSize: 2,
       },
       scrollbarConfig: {
-        width: 10,
-        height: 10,
+        // width: 0,
+        // height: 0
       },
     },
     grid: {

package/src/css/elementUI/common/var.scss

@@ -1226,10 +1226,10 @@ $loading: map.merge(
 $scrollbar: () !default;
 $scrollbar: map.merge(
   (
-    'opacity': 0.65,
-    'bg-color': rgba(0, 0, 0, 0.42),
-    'hover-opacity': 0.85,
-    'hover-bg-color': rgba(0, 0, 0, 0.55),
+    'opacity': 0.3,
+    'bg-color': getCssVar('text-color-secondary'),
+    'hover-opacity': 0.5,
+    'hover-bg-color': getCssVar('text-color-secondary'),
   ),
   $scrollbar
 );

package/src/css/elementUI/mixins/mixins.scss

@@ -1,6 +1,5 @@
 @use 'function' as *;
 @use '../common/var' as *;
-@use '../../../assets/style/scrollbar-classic.scss' as classic;
 // forward mixins
 @forward 'config';
 @forward 'function';
@@ -23,10 +22,35 @@
 
 // Scrollbar
 @mixin scroll-bar {
-  @include classic.adtec-scrollbar-hidden;
+  $scrollbar-thumb-background: getCssVar('text-color', 'disabled');
+  $scrollbar-track-background: getCssVar('fill-color', 'blank');
 
-  &:hover {
-    @include classic.adtec-scrollbar-active;
+  &::-webkit-scrollbar {
+    z-index: 11;
+    width: 6px;
+
+    &:horizontal {
+      height: 6px;
+    }
+
+    &-thumb {
+      border-radius: 5px;
+      width: 6px;
+      background: $scrollbar-thumb-background;
+    }
+
+    &-corner {
+      background: $scrollbar-track-background;
+    }
+
+    &-track {
+      background: $scrollbar-track-background;
+
+      &-piece {
+        background: $scrollbar-track-background;
+        width: 6px;
+      }
+    }
   }
 }
 

package/src/css/elementUI/scrollbar.scss

@@ -3,7 +3,6 @@
 @use 'mixins/mixins' as *;
 @use 'mixins/var' as *;
 @use 'common/var' as *;
-@use '../../assets/style/scrollbar-classic.scss' as classic;
 
 @include b(scrollbar) {
   @include set-component-css-var('scrollbar', $scrollbar);
@@ -17,9 +16,6 @@
   @include e(wrap) {
     overflow: auto;
     height: 100%;
-    box-sizing: border-box;
-    /* 预留滚动条槽位，避免 thumb 压在正文上 */
-    padding-right: calc(var(--el-scrollbar-size, 8px) + 4px);
 
     @include m(hidden-default) {
       scrollbar-width: none;
@@ -35,7 +31,7 @@
     width: 0;
     height: 0;
     cursor: pointer;
-    border-radius: calc(var(--el-scrollbar-size, 8px) / 2);
+    border-radius: inherit;
     background-color: var(
       #{getCssVarName('scrollbar-bg-color')},
       map.get($scrollbar, 'bg-color')
@@ -60,17 +56,14 @@
 
   @include e(bar) {
     position: absolute;
-    right: 4px;
+    right: 2px;
     bottom: 2px;
     z-index: 1;
-    border-radius: calc(var(--el-scrollbar-size, 8px) / 2);
-    opacity: 0;
-    transition: opacity getCssVar('transition-duration') ease-out;
+    border-radius: 4px;
 
     @include when(vertical) {
-      width: var(--el-scrollbar-size, 8px);
+      width: 6px;
       top: 2px;
-      background-color: rgba(0, 0, 0, 0.04);
 
       > div {
         width: 100%;
@@ -78,22 +71,14 @@
     }
 
     @include when(horizontal) {
-      height: var(--el-scrollbar-size, 8px);
+      height: 6px;
       left: 2px;
-      background-color: rgba(0, 0, 0, 0.04);
 
       > div {
         height: 100%;
       }
     }
   }
-
-  &:hover,
-  &:active {
-    @include e(bar) {
-      opacity: 1;
-    }
-  }
 }
 
 .#{$namespace}-scrollbar-fade {

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

@@ -1,5 +1,4 @@
 @use '../helpers/baseMixin.scss';
-@use '../../../assets/style/scrollbar-classic.scss' as classic;
 @use './icon.scss';
 @use './table-module/all.scss';
 
@@ -51,20 +50,11 @@
 .vxe-table--body-wrapper,
 .vxe-table--footer-wrapper,
 .vxe-table--fixed-left-body-wrapper,
-.vxe-table--fixed-right-body-wrapper,
-.vxe-table--fixed-left-wrapper,
-.vxe-table--fixed-right-wrapper {
+.vxe-table--fixed-right-body-wrapper {
   overflow: hidden;
   outline: 0;
   scrollbar-width: none;
-  -ms-overflow-style: none;
   -webkit-overflow-scrolling: touch;
-
-  &::-webkit-scrollbar {
-    display: none;
-    width: 0;
-    height: 0;
-  }
 }
 .vxe-table--header-inner-wrapper,
 .vxe-table--body-inner-wrapper,
@@ -75,11 +65,8 @@
   scrollbar-width: none;
   -ms-overflow-style: none;
   -webkit-overflow-scrolling: touch;
-
   &::-webkit-scrollbar {
     display: none;
-    width: 0;
-    height: 0;
   }
 }
 .vxe-table--header-inner-wrapper,
@@ -92,16 +79,34 @@
   overflow-x: scroll;
 }
 
-/* vxe 表格：hover 时仅在手柄上显示现代圆角滚动条（全局 index.less 已排除表格内部） */
+/* 仅显示外层滚动条：鼠标进入表格显示，移出隐藏 */
 .vxe-table--scroll-x-handle,
 .vxe-table--scroll-y-handle {
-  @include classic.adtec-scrollbar-hidden;
+  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 {
-    @include classic.adtec-vxe-scrollbar-active;
+    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;
   }
 }
 
@@ -599,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 {
@@ -630,10 +635,10 @@
   .vxe-table--scroll-x-handle {
     overflow-y: hidden;
     overflow-x: scroll;
-    height: var(--vxe-scrollbar-size, 8px);
+    height: 8px;
   }
   .vxe-table--scroll-x-wrapper {
-    height: 100%;
+    height: 8px;
   }
   .vxe-table--scroll-y-handle,
   .vxe-table--scroll-y-wrapper {
@@ -645,7 +650,7 @@
   .vxe-table--scroll-y-handle {
     overflow-y: scroll;
     overflow-x: hidden;
-    width: var(--vxe-scrollbar-size, 8px);
+    width: 8px;
     height: 100%;
   }
   .vxe-table--scroll-x-space {
@@ -920,20 +925,10 @@
     border-collapse: separate;
     table-layout: fixed;
   }
-  .vxe-table--render-wrapper {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-
+  .vxe-table--render-wrapper{
+    height:100%;
     .vxe-table--layout-wrapper {
-      flex: 1;
-      min-height: 0;
-      height: auto;
-    }
-
-    .vxe-table--scroll-x-virtual {
-      flex-shrink: 0;
+      height:100%
     }
   }
   &:not(.is--empty) {

package/src/utils/AxiosConfig.ts

@@ -14,6 +14,7 @@ import encrypt from './encrypt'
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
 import { Md5 } from 'ts-md5'
+import { computeSigna, normalizeSignaPayload } from './buildUploadHeaders'
 import { ElMessage } from 'element-plus'
 import { useEventBus } from '@vueuse/core'
 /** 是否正在刷新的标志 */
@@ -31,7 +32,6 @@ const request = axios.create({
 function setHeaders(config: any) {
   //数据防止篡改
   const Authorization = config.skipAuthorization ? '' : sessionStorage.getItem('Authorization')
-  const signa = 'F2E49299-D0D2-4AA1-87A3-270272EA3D6A'
   let dataJson: string = ''
   if (config.method === 'get') {
     if (config.params) {
@@ -52,14 +52,11 @@ function setHeaders(config: any) {
     }
   }
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  dataJson=dataJson.replace(/[^\u4E00-\u9FA5A-Za-z0-9]/g, '')
-  dataJson = dataJson.split('').sort().join('').trim()
+  const normalizedPayload = normalizeSignaPayload(dataJson)
   config.headers.sessionId = config.skipAuthorization ? '' : sessionStorage.getItem('sessionId')
   config.headers.Authorization = Authorization
-  config.headers.signa = Md5.hashStr(Authorization + signa + dataJson)
-  config.headers.antiShakeKey = Md5.hashStr(dataJson)
+  config.headers.signa = computeSigna(Authorization || '', dataJson)
+  config.headers.antiShakeKey = Md5.hashStr(normalizedPayload)
   //防止重放 GUID+当前时间+TOKEN 加密
   const timeDifference = sessionStorage.getItem('timeDifference')
   const id = uuidv4()

package/src/utils/buildUploadHeaders.ts

@@ -0,0 +1,58 @@
+import { Md5 } from 'ts-md5'
+import { v4 as uuidv4 } from 'uuid'
+import encrypt from './encrypt'
+
+/** 与后端 token.dataSigna / DataTamperingFilter 一致 */
+export const SIGNA_KEY = 'F2E49299-D0D2-4AA1-87A3-270272EA3D6A'
+
+/**
+ * 规范化 signa 参与签名的字符串（strip 非字母数字 → 字符排序）。
+ * multipart 上传使用完整 URL（含 query）；JSON 接口使用序列化后的 body。
+ */
+export function normalizeSignaPayload(raw: string): string {
+  return raw
+    .replace(/[^\u4E00-\u9FA5A-Za-z0-9]/g, '')
+    .split('')
+    .sort()
+    .join('')
+    .trim()
+}
+
+export function computeSigna(authorization: string, payload: string): string {
+  return Md5.hashStr(authorization + SIGNA_KEY + normalizeSignaPayload(payload))
+}
+
+export interface BuildUploadHeadersOptions {
+  /** 上传 action 路径，如 /api/doc/uploadFile/biz/id/true?watermarkCode=xxx */
+  url: string
+  skipAuthorization?: boolean
+}
+
+/**
+ * el-upload / uni.uploadFile 等不走 axios 拦截器的上传请求头。
+ * signa 按 URL 计算，与 DataTamperingFilter multipart 分支对齐。
+ */
+export function buildUploadHeaders(
+  options: BuildUploadHeadersOptions | string,
+): Record<string, string> {
+  const url = typeof options === 'string' ? options : options.url
+  const skipAuthorization =
+    typeof options === 'string' ? false : (options.skipAuthorization ?? false)
+
+  const Authorization = skipAuthorization ? '' : sessionStorage.getItem('Authorization') || ''
+  const normalizedPayload = normalizeSignaPayload(url)
+
+  const timeDifference = sessionStorage.getItem('timeDifference')
+  const id = uuidv4()
+  const localTime = new Date().getTime()
+  const replayObj = { timeDifference, guid: id, localTime }
+
+  return {
+    Authorization,
+    sessionId: skipAuthorization ? '' : sessionStorage.getItem('sessionId') || '',
+    signa: computeSigna(Authorization, url),
+    antiShakeKey: Md5.hashStr(normalizedPayload),
+    'Cache-Control': 'no-cache',
+    replayToken: encrypt.encrypt(JSON.stringify(replayObj)),
+  }
+}

package/src/assets/style/scrollbar-classic.less

@@ -1,105 +0,0 @@
-/* 现代圆角滚动条（hover 显示），供全局 / vxe 复用 */
-
-.adtec-scrollbar-active() {
-  scrollbar-width: thin;
-  scrollbar-color: var(--adtec-scrollbar-thumb-color) var(--adtec-scrollbar-track-color);
-
-  &::-webkit-scrollbar {
-    background: transparent;
-  }
-
-  &::-webkit-scrollbar:vertical {
-    width: var(--adtec-scrollbar-size);
-  }
-
-  &::-webkit-scrollbar:horizontal {
-    height: var(--adtec-scrollbar-size);
-  }
-
-  &::-webkit-scrollbar-track {
-    background: var(--adtec-scrollbar-track-color);
-    border-radius: var(--adtec-scrollbar-radius);
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background: var(--adtec-scrollbar-thumb-color);
-    border-radius: var(--adtec-scrollbar-radius);
-    border: none;
-  }
-
-  &::-webkit-scrollbar-thumb:hover {
-    background: var(--adtec-scrollbar-thumb-hover-color);
-  }
-
-  &::-webkit-scrollbar-button {
-    display: none;
-    width: 0;
-    height: 0;
-  }
-
-  &::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-}
-
-.adtec-scrollbar-hidden() {
-  scrollbar-width: none;
-  -ms-overflow-style: none;
-
-  &::-webkit-scrollbar-thumb {
-    background: transparent;
-  }
-
-  &::-webkit-scrollbar-track {
-    background: transparent;
-  }
-}
-
-/* 附件预览等关键区域：滚动条常显（覆盖全局 hover 才显示） */
-.adtec-scrollbar-persistent() {
-  .adtec-scrollbar-active();
-}
-
-/* vxe 表格专用：尺寸/颜色与 el-scrollbar 一致 */
-.adtec-vxe-scrollbar-active() {
-  scrollbar-width: thin;
-  scrollbar-color: var(--vxe-scrollbar-thumb-color, rgba(0, 0, 0, 0.42))
-    var(--vxe-scrollbar-track-color, rgba(0, 0, 0, 0.04));
-
-  &::-webkit-scrollbar {
-    background: transparent;
-  }
-
-  &::-webkit-scrollbar:vertical {
-    width: var(--vxe-scrollbar-size, 8px);
-  }
-
-  &::-webkit-scrollbar:horizontal {
-    height: var(--vxe-scrollbar-size, 8px);
-  }
-
-  &::-webkit-scrollbar-track {
-    background: var(--vxe-scrollbar-track-color, rgba(0, 0, 0, 0.04));
-    border-radius: calc(var(--vxe-scrollbar-size, 8px) / 2);
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background: var(--vxe-scrollbar-thumb-color, rgba(0, 0, 0, 0.42));
-    border-radius: calc(var(--vxe-scrollbar-size, 8px) / 2);
-    border: none;
-  }
-
-  &::-webkit-scrollbar-thumb:hover {
-    background: var(--vxe-scrollbar-thumb-hover-color, rgba(0, 0, 0, 0.55));
-  }
-
-  &::-webkit-scrollbar-button {
-    display: none;
-    width: 0;
-    height: 0;
-  }
-
-  &::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-}

package/src/assets/style/scrollbar-classic.scss

@@ -1,105 +0,0 @@
-// 现代圆角滚动条（hover 显示），与 scrollbar-classic.less 保持同步
-
-@mixin adtec-scrollbar-active {
-  scrollbar-width: thin;
-  scrollbar-color: var(--adtec-scrollbar-thumb-color) var(--adtec-scrollbar-track-color);
-
-  &::-webkit-scrollbar {
-    background: transparent;
-  }
-
-  &::-webkit-scrollbar:vertical {
-    width: var(--adtec-scrollbar-size);
-  }
-
-  &::-webkit-scrollbar:horizontal {
-    height: var(--adtec-scrollbar-size);
-  }
-
-  &::-webkit-scrollbar-track {
-    background: var(--adtec-scrollbar-track-color);
-    border-radius: var(--adtec-scrollbar-radius);
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background: var(--adtec-scrollbar-thumb-color);
-    border-radius: var(--adtec-scrollbar-radius);
-    border: none;
-  }
-
-  &::-webkit-scrollbar-thumb:hover {
-    background: var(--adtec-scrollbar-thumb-hover-color);
-  }
-
-  &::-webkit-scrollbar-button {
-    display: none;
-    width: 0;
-    height: 0;
-  }
-
-  &::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-}
-
-@mixin adtec-scrollbar-hidden {
-  scrollbar-width: none;
-  -ms-overflow-style: none;
-
-  &::-webkit-scrollbar-thumb {
-    background: transparent;
-  }
-
-  &::-webkit-scrollbar-track {
-    background: transparent;
-  }
-}
-
-/* 附件预览等关键区域：滚动条常显（覆盖全局 hover 才显示） */
-@mixin adtec-scrollbar-persistent {
-  @include adtec-scrollbar-active;
-}
-
-/* vxe 表格专用：尺寸/颜色与 el-scrollbar 一致 */
-@mixin adtec-vxe-scrollbar-active {
-  scrollbar-width: thin;
-  scrollbar-color: var(--vxe-scrollbar-thumb-color, rgba(0, 0, 0, 0.42))
-    var(--vxe-scrollbar-track-color, rgba(0, 0, 0, 0.04));
-
-  &::-webkit-scrollbar {
-    background: transparent;
-  }
-
-  &::-webkit-scrollbar:vertical {
-    width: var(--vxe-scrollbar-size, 8px);
-  }
-
-  &::-webkit-scrollbar:horizontal {
-    height: var(--vxe-scrollbar-size, 8px);
-  }
-
-  &::-webkit-scrollbar-track {
-    background: var(--vxe-scrollbar-track-color, rgba(0, 0, 0, 0.04));
-    border-radius: calc(var(--vxe-scrollbar-size, 8px) / 2);
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background: var(--vxe-scrollbar-thumb-color, rgba(0, 0, 0, 0.42));
-    border-radius: calc(var(--vxe-scrollbar-size, 8px) / 2);
-    border: none;
-  }
-
-  &::-webkit-scrollbar-thumb:hover {
-    background: var(--vxe-scrollbar-thumb-hover-color, rgba(0, 0, 0, 0.55));
-  }
-
-  &::-webkit-scrollbar-button {
-    display: none;
-    width: 0;
-    height: 0;
-  }
-
-  &::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-}