adtec-core-package 3.1.9 → 3.2.0

package/.idea/codeStyles/Project.xml

@@ -0,0 +1,61 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <HTMLCodeStyleSettings>
+      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </HTMLCodeStyleSettings>
+    <JSCodeStyleSettings version="0">
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </JSCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </TypeScriptCodeStyleSettings>
+    <VueCodeStyleSettings>
+      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
+      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
+    </VueCodeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Vue">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

package/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SvnConfiguration">
+    <configuration>$USER_HOME$/.subversion</configuration>
+  </component>
+</project>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/前端核心包.iml" filepath="$PROJECT_DIR$/.idea/前端核心包.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/.idea//345/211/215/347/253/257/346/240/270/345/277/203/345/214/205.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "3.1.9",
+  "version": "3.2.0",
   "private": false,
   "type": "module",
   "exports": {

package/src/assets/style/index.less

@@ -5,6 +5,7 @@
 // @import './sidebar.scss';
 // @import './btn.scss';
 @import './transition.scss';
+@import './scrollbar-classic.less';
 
 body {
   height: 100%;
@@ -126,60 +127,47 @@ 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;
 }
 
-*::-webkit-scrollbar {
-  width: 6px;
-  height: 6px;
-  background: transparent;
+* {
+  .adtec-scrollbar-hidden();
 }
 
-*::-webkit-scrollbar-thumb {
-  background: transparent;
-  border-radius: 4px;
+*:hover {
+  .adtec-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 {
-  display: none;
+  background: transparent;
 }
 // 两个滚动条的交汇处上用于通过拖动调整元素大小的小控件
 *::-webkit-resizer {

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

@@ -0,0 +1,105 @@
+/* 现代圆角滚动条（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

@@ -0,0 +1,105 @@
+// 现代圆角滚动条（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;
+  }
+}

package/src/components/ElCardList.vue

@@ -3,7 +3,7 @@
 <!--创建时间: 2025/5/8 09:15-->
 <!--修改时间: 2025/5/8 09:15-->
 <template>
-  <el-scrollbars :noresize="true" style="width: 100%">
+  <el-scrollbars :noresize="true" class="el-card-list-scroll" 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,4 +61,10 @@ 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/Scrollbars/ElScrollbars.vue

@@ -3,7 +3,11 @@
 <!--创建时间: 2025/3/20 16:16-->
 <!--修改时间: 2025/3/20 16:16-->
 <template>
-  <el-scrollbar :noresize="true" v-resize-observer="onResizeObserver" ref="ref_scrollbar">
+  <el-scrollbar
+    class="adtec-el-scrollbar"
+    :noresize="true"
+    v-resize-observer="onResizeObserver"
+    ref="ref_scrollbar">
     <slot></slot>
   </el-scrollbar>
 </template>
@@ -17,5 +21,9 @@ 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: 8px;
+  --umo-scrollbar-size: 12px;
   --umo-scrollbar-thumb-color: rgba(0, 0, 0, 0.1);
   --umo-scrollbar-thumb-hover-color: rgba(0, 0, 0, 0.3);
 }

package/src/components/upload/DocxJsViewer.vue

@@ -1,10 +1,7 @@
 <template>
   <div ref="scrollRef" class="docx-js-viewer">
     <div v-if="loading" class="docx-loading">正在解析 Word 文档…</div>
-    <div v-else-if="legacyDoc" class="docx-legacy-tip">
-      <el-empty description="旧版 Word（.doc）暂不支持浏览器内预览，请下载后查看或转换为 docx。" />
-    </div>
-    <div v-else-if="loadError" class="docx-legacy-tip">
+    <div v-else-if="loadError" class="docx-error-tip">
       <el-empty :description="loadError" />
     </div>
     <div v-else class="docx-body">
@@ -22,9 +19,7 @@ import { computed, nextTick, ref, watch } from 'vue'
 import {
   activateDocxSearchMark,
   clearDocxSearchMarks,
-  detectWordBinaryFormat,
   type DocxSearchMatch,
-  resolveRawWordExt,
   searchDocxPages,
 } from '../../utils/docxPreviewUtil.ts'
 
@@ -49,7 +44,6 @@ const scrollRef = ref<HTMLElement | null>(null)
 const styleHostRef = ref<HTMLElement | null>(null)
 const bodyHostRef = ref<HTMLElement | null>(null)
 const loading = ref(false)
-const legacyDoc = ref(false)
 const loadError = ref('')
 const totalPages = ref(0)
 const currentPage = ref(1)
@@ -72,7 +66,6 @@ const scaleHostStyle = computed(() => {
 })
 
 const resetViewer = () => {
-  legacyDoc.value = false
   loadError.value = ''
   totalPages.value = 0
   currentPage.value = 1
@@ -110,13 +103,6 @@ const loadDocument = async (src: Blob | ArrayBuffer) => {
   resetViewer()
   try {
     const buffer = src instanceof Blob ? await src.arrayBuffer() : src
-    const binaryFormat = detectWordBinaryFormat(buffer)
-    const rawExt = resolveRawWordExt(props.fileType, props.fileName, props.fileUrl)
-    if (binaryFormat === 'doc' || rawExt === 'doc') {
-      legacyDoc.value = true
-      emit('loaded')
-      return
-    }
     const bodyHost = bodyHostRef.value
     const styleHost = styleHostRef.value
     if (!bodyHost || !styleHost) {
@@ -253,7 +239,7 @@ defineExpose({
 }
 
 .docx-loading,
-.docx-legacy-tip {
+.docx-error-tip {
   display: flex;
   align-items: center;
   justify-content: center;

package/src/components/upload/OfficePreview.vue

@@ -394,6 +394,14 @@ defineExpose({
   min-height: 0;
 }
 
+:deep(.office-rich-viewer) {
+  flex: 1;
+  width: 100%;
+  min-height: 0;
+  height: 100%;
+  overflow: auto;
+}
+
 .office-rich-wrap {
   position: relative;
   flex: 1;

package/src/config/VxeTableConfig.ts

@@ -213,8 +213,8 @@ export function initVxeTableInPage(
         oSize: 2,
       },
       scrollbarConfig: {
-        // width: 0,
-        // height: 0
+        width: 10,
+        height: 10,
       },
     },
     grid: {

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

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

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

@@ -1,5 +1,6 @@
 @use 'function' as *;
 @use '../common/var' as *;
+@use '../../../assets/style/scrollbar-classic.scss' as classic;
 // forward mixins
 @forward 'config';
 @forward 'function';
@@ -22,35 +23,10 @@
 
 // Scrollbar
 @mixin scroll-bar {
-  $scrollbar-thumb-background: getCssVar('text-color', 'disabled');
-  $scrollbar-track-background: getCssVar('fill-color', 'blank');
+  @include classic.adtec-scrollbar-hidden;
 
-  &::-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;
-      }
-    }
+  &:hover {
+    @include classic.adtec-scrollbar-active;
   }
 }