adtec-core-package 3.2.2 → 3.2.3

package/package.json

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

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -644,10 +644,41 @@ 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: nowrap;
-  white-space: nowrap;
+  flex-wrap: wrap;
+  row-gap: 4px;
+  white-space: normal;
 }
 
 :deep(.umo-button__text),

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

@@ -250,10 +250,12 @@ const setContentFromCache = () => {
   padding: 6px 10px;
   display: flex;
   align-items: center;
-  &-ribbon {
+  &-ribbon,
+  &-classic {
     position: absolute;
     right: 0;
     top: 1px;
+    z-index: 10;
   }
   &-button {
     &.active {
@@ -337,9 +339,18 @@ 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:
@@ -352,12 +363,6 @@ 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/OfficePreview.vue

@@ -19,6 +19,7 @@
         :show-close="showClose"
         :fullscreen="fullscreen"
         :download-loading="downloadLoading"
+        :refresh-loading="refreshLoading"
         :min-zoom="MIN_OFFICE_ZOOM"
         :max-zoom="MAX_RICH_PREVIEW_ZOOM"
         @zoom-in="zoomIn"
@@ -71,7 +72,14 @@
           @error="handleError"
           @page-change="previewCurrentPage = $event"
         />
-        <div v-if="isPreviewLoading && !fileSrc" class="office-rich-loading">
+        <div v-if="refreshLoading" class="office-rich-loading">
+          <div class="loading-card">
+            <span class="loading-spinner" />
+            <p class="loading-title">正在重新生成附件，请稍候…</p>
+            <p v-if="headerTitle" class="loading-sub">{{ headerTitle }}</p>
+          </div>
+        </div>
+        <div v-else-if="isPreviewLoading && !fileSrc" class="office-rich-loading">
           <div class="loading-card">
             <span class="loading-spinner" />
             <p class="loading-title">{{ loadingMessage }}</p>
@@ -128,6 +136,7 @@ const props = withDefaults(
     showClose?: boolean
     fullscreen?: boolean
     downloadLoading?: boolean
+    refreshLoading?: boolean
   }>(),
   {
     showHeader: true,
@@ -140,6 +149,7 @@ const props = withDefaults(
     showClose: false,
     fullscreen: false,
     downloadLoading: false,
+    refreshLoading: false,
   },
 )
 

package/src/components/upload/OfficePreviewHeaderBar.vue

@@ -80,8 +80,16 @@
         <el-icon v-else><Download /></el-icon>
       </button>
 
-      <button v-if="showRefresh" class="toolbar-btn" type="button" title="刷新附件" @click="emit('refresh')">
-        <el-icon><Refresh /></el-icon>
+      <button
+        v-if="showRefresh"
+        class="toolbar-btn"
+        type="button"
+        title="刷新附件"
+        :disabled="refreshLoading"
+        @click="emit('refresh')"
+      >
+        <el-icon v-if="refreshLoading" class="is-loading"><Loading /></el-icon>
+        <el-icon v-else><Refresh /></el-icon>
       </button>
 
       <button
@@ -145,6 +153,7 @@ const props = withDefaults(
     showClose?: boolean
     fullscreen?: boolean
     downloadLoading?: boolean
+    refreshLoading?: boolean
     minZoom?: number
     maxZoom?: number
   }>(),
@@ -165,6 +174,7 @@ const props = withDefaults(
     showClose: false,
     fullscreen: false,
     downloadLoading: false,
+    refreshLoading: false,
     minZoom: MIN_OFFICE_ZOOM,
     maxZoom: MAX_PDF_ZOOM,
   },