adtec-core-package 3.2.2 → 3.2.4

package/package.json

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

package/src/api/workflow/workflowInstApi.ts

@@ -34,8 +34,8 @@ export default {
     return request.post<IWfTaskVo>(baseUrl + '/taskReject', task)
   },
   //查询可回退环节
-  findReturnTaskList(taskId: string) {
-    return request.post<IWfReturnNodeVo[]>(baseUrl + '/findReturnTaskList', { taskId })
+  findReturnTaskList(taskId: string, ignoreBackNodes = false) {
+    return request.post<IWfReturnNodeVo[]>(baseUrl + '/findReturnTaskList', { taskId, ignoreBackNodes })
   },
   //回退任务
   taskReturn(activity: IWfTaskAskVo) {

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,
   },

package/src/components/workflow/components/SelectReturnActivityDialog.vue

@@ -49,14 +49,16 @@ const loading = ref(false)
 const selectActivity = ref<string>('')
 const taskId = ref<string>('')
 const comment = ref<string>('')
-const open = async (tId: string, c: string) => {
+const ignoreBackNodes = ref(false)
+const open = async (tId: string, c: string, ignoreBackNodesFlag = false) => {
   try {
     selectActivity.value = ''
     taskId.value = tId ?? ''
     comment.value = c ?? ''
+    ignoreBackNodes.value = ignoreBackNodesFlag
     dialogVisible.value = true
     loading.value = true
-    data.value = await workflowInstApi.findReturnTaskList(tId)
+    data.value = await workflowInstApi.findReturnTaskList(tId, ignoreBackNodesFlag)
   } catch (err: any) {
     data.value = []
     frameworkUtils.messageError(err)
@@ -76,6 +78,7 @@ const save = async () => {
       userId: userInfoStore().getUserInfo.id,
       comment: comment.value,
       targetKey: selectActivity.value,
+      ignoreBackNodes: ignoreBackNodes.value,
     })
     ElMessage.success('回退成功')
     emit('success')

package/src/config/VxeTableConfig.ts

@@ -6,12 +6,10 @@ 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 'vxe-pc-ui/lib/style.css'
 import '../css/vxeTableUI/all.scss'
-import VxeUIPluginExportPDF from '@vxe-ui/plugin-export-pdf'
-// 导入默认的语言
-import zhCN from 'vxe-table/lib/locale/lang/zh-CN'
+// 导入默认的语言（使用 es 构建，避免 lib CJS 在 Vite 下无 default 导出）
+import zhCN from 'vxe-table/es/locale/lang/zh-CN'
 
 /**
  * 局部初始化 vxe-table 插件与配置
@@ -28,12 +26,26 @@ export function initVxeTableInPage(
   // 局部注册插件
   enableElementPlus && VxeUI.use(VxeUIPluginRenderElement)
   if (enableExcel) {
-    void import('exceljs').then(({ default: ExcelJS }) => {
+    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 import('jspdf').then(({ jsPDF }) => {
+    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 })
     })
   }

package/src/interface/workflow/IWfTaskAskVo.ts

@@ -58,6 +58,8 @@ export interface IWfTaskAskVo {
    * 中止流程
    */
   stopWorkflow?: boolean
+  /** 工作流管理：忽略流程图 backNodes，返回全部已执行用户节点 */
+  ignoreBackNodes?: boolean
   /**
    * 是否是第一个节点
    */

package/vite/umoCjsVirtual.ts

@@ -23,15 +23,36 @@ const UMO_CJS_SPECS = [
   'nzh/cn',
   'jszip',
   'exceljs',
+  '@vxe-ui/plugin-render-element',
+  '@vxe-ui/plugin-export-xlsx',
+  '@vxe-ui/plugin-export-pdf',
 ] as const
 
 const UMO_CJS_NAMED_EXPORTS: Record<string, string[]> = {
   'file-saver': ['saveAs'],
   'pure-svg-code': ['qrcode', 'barcode', 'svg2url'],
+  '@vxe-ui/plugin-render-element': ['VxeUIPluginRenderElement'],
+  '@vxe-ui/plugin-export-xlsx': ['VxeUIPluginExportXLSX'],
+  '@vxe-ui/plugin-export-pdf': ['VxeUIPluginExportPDF'],
 }
 
 const VIRTUAL_UMO_CJS_PREFIX = '\0virtual:umo-cjs:'
 
+function parseNpmSpec(spec: string): { pkgName: string; subPath: string | null } {
+  if (spec.startsWith('@')) {
+    const parts = spec.split('/')
+    if (parts.length >= 2) {
+      return {
+        pkgName: `${parts[0]}/${parts[1]}`,
+        subPath: parts.length > 2 ? parts.slice(2).join('/') : null,
+      }
+    }
+  }
+  const slashIndex = spec.indexOf('/')
+  if (slashIndex === -1) return { pkgName: spec, subPath: null }
+  return { pkgName: spec.slice(0, slashIndex), subPath: spec.slice(slashIndex + 1) }
+}
+
 function requireFromProjectRoot() {
   return createRequire(path.join(getProjectRoot(), 'package.json'))
 }
@@ -58,7 +79,7 @@ function resolvePackageMain(pkgDir: string): string | null {
 
 function findUmoPackageDir(pkgName: string): string | null {
   const projectRoot = getProjectRoot()
-  const hoisted = path.join(projectRoot, 'node_modules', pkgName)
+  const hoisted = path.join(projectRoot, 'node_modules', ...pkgName.split('/'))
   if (fs.existsSync(path.join(hoisted, 'package.json'))) return hoisted
 
   const pnpmDir = path.join(projectRoot, 'node_modules/.pnpm')
@@ -68,16 +89,16 @@ function findUmoPackageDir(pkgName: string): string | null {
   const pkgDir = fs.readdirSync(pnpmDir).find((name) => name.startsWith(`${pnpmPrefix}@`))
   if (!pkgDir) return null
 
-  const resolved = path.join(pnpmDir, pkgDir, 'node_modules', pkgName)
+  const resolved = path.join(pnpmDir, pkgDir, 'node_modules', ...pkgName.split('/'))
   return fs.existsSync(path.join(resolved, 'package.json')) ? resolved : null
 }
 
 function findUmoPackageEntryForSpec(spec: string): string | null {
-  const [pkgName, ...subParts] = spec.split('/')
+  const { pkgName, subPath } = parseNpmSpec(spec)
   const pkgDir = findUmoPackageDir(pkgName)
   if (!pkgDir) return null
 
-  if (subParts.length === 0) {
+  if (!subPath) {
     const override = UMO_CJS_ENTRY_OVERRIDES[pkgName]
     if (override) {
       const overridePath = path.join(pkgDir, override)
@@ -88,11 +109,10 @@ function findUmoPackageEntryForSpec(spec: string): string | null {
     return resolvePackageMain(pkgDir)
   }
 
-  const sub = subParts.join('/')
   const candidates = [
-    path.join(pkgDir, `${sub}.js`),
-    path.join(pkgDir, sub, 'index.js'),
-    path.join(pkgDir, sub),
+    path.join(pkgDir, `${subPath}.js`),
+    path.join(pkgDir, subPath, 'index.js'),
+    path.join(pkgDir, subPath),
   ]
   for (const candidate of candidates) {
     if (fs.existsSync(candidate) && fs.statSync(candidate).isFile()) return candidate
@@ -102,13 +122,12 @@ function findUmoPackageEntryForSpec(spec: string): string | null {
 }
 
 function matchesUmoCjsFile(source: string, spec: string): boolean {
-  const [pkg, ...sub] = spec.split('/')
-  if (!source.includes(`/${pkg}/`)) return false
-  if (sub.length === 0) {
+  const { pkgName, subPath } = parseNpmSpec(spec)
+  if (!source.includes(`/${pkgName}/`)) return false
+  if (!subPath) {
     return source.endsWith('.js') || source.includes('.js?')
   }
-  const subPath = sub.join('/')
-  return source.includes(`/${pkg}/${subPath}.js`) || source.includes(`/${pkg}/${subPath}?`)
+  return source.includes(`/${subPath}.js`) || source.includes(`/${subPath}?`)
 }
 
 function augmentUmoCjsNamedExports(code: string, spec: string): string {

package/vite/umoIntegration.js

@@ -448,13 +448,33 @@ var UMO_CJS_SPECS = [
   "pure-svg-code",
   "nzh/cn",
   "jszip",
-  "exceljs"
+  "exceljs",
+  "@vxe-ui/plugin-render-element",
+  "@vxe-ui/plugin-export-xlsx",
+  "@vxe-ui/plugin-export-pdf"
 ];
 var UMO_CJS_NAMED_EXPORTS = {
   "file-saver": ["saveAs"],
-  "pure-svg-code": ["qrcode", "barcode", "svg2url"]
+  "pure-svg-code": ["qrcode", "barcode", "svg2url"],
+  "@vxe-ui/plugin-render-element": ["VxeUIPluginRenderElement"],
+  "@vxe-ui/plugin-export-xlsx": ["VxeUIPluginExportXLSX"],
+  "@vxe-ui/plugin-export-pdf": ["VxeUIPluginExportPDF"]
 };
 var VIRTUAL_UMO_CJS_PREFIX = "\0virtual:umo-cjs:";
+function parseNpmSpec(spec) {
+  if (spec.startsWith("@")) {
+    const parts = spec.split("/");
+    if (parts.length >= 2) {
+      return {
+        pkgName: `${parts[0]}/${parts[1]}`,
+        subPath: parts.length > 2 ? parts.slice(2).join("/") : null
+      };
+    }
+  }
+  const slashIndex = spec.indexOf("/");
+  if (slashIndex === -1) return { pkgName: spec, subPath: null };
+  return { pkgName: spec.slice(0, slashIndex), subPath: spec.slice(slashIndex + 1) };
+}
 function requireFromProjectRoot() {
   return createRequire4(path4.join(getProjectRoot(), "package.json"));
 }
@@ -475,21 +495,21 @@ function resolvePackageMain(pkgDir) {
 }
 function findUmoPackageDir(pkgName) {
   const projectRoot2 = getProjectRoot();
-  const hoisted = path4.join(projectRoot2, "node_modules", pkgName);
+  const hoisted = path4.join(projectRoot2, "node_modules", ...pkgName.split("/"));
   if (fs5.existsSync(path4.join(hoisted, "package.json"))) return hoisted;
   const pnpmDir = path4.join(projectRoot2, "node_modules/.pnpm");
   if (!fs5.existsSync(pnpmDir)) return null;
   const pnpmPrefix = pkgName.replace("/", "+");
   const pkgDir = fs5.readdirSync(pnpmDir).find((name) => name.startsWith(`${pnpmPrefix}@`));
   if (!pkgDir) return null;
-  const resolved = path4.join(pnpmDir, pkgDir, "node_modules", pkgName);
+  const resolved = path4.join(pnpmDir, pkgDir, "node_modules", ...pkgName.split("/"));
   return fs5.existsSync(path4.join(resolved, "package.json")) ? resolved : null;
 }
 function findUmoPackageEntryForSpec(spec) {
-  const [pkgName, ...subParts] = spec.split("/");
+  const { pkgName, subPath } = parseNpmSpec(spec);
   const pkgDir = findUmoPackageDir(pkgName);
   if (!pkgDir) return null;
-  if (subParts.length === 0) {
+  if (!subPath) {
     const override = UMO_CJS_ENTRY_OVERRIDES[pkgName];
     if (override) {
       const overridePath = path4.join(pkgDir, override);
@@ -499,11 +519,10 @@ function findUmoPackageEntryForSpec(spec) {
     }
     return resolvePackageMain(pkgDir);
   }
-  const sub = subParts.join("/");
   const candidates = [
-    path4.join(pkgDir, `${sub}.js`),
-    path4.join(pkgDir, sub, "index.js"),
-    path4.join(pkgDir, sub)
+    path4.join(pkgDir, `${subPath}.js`),
+    path4.join(pkgDir, subPath, "index.js"),
+    path4.join(pkgDir, subPath)
   ];
   for (const candidate of candidates) {
     if (fs5.existsSync(candidate) && fs5.statSync(candidate).isFile()) return candidate;
@@ -511,13 +530,12 @@ function findUmoPackageEntryForSpec(spec) {
   return null;
 }
 function matchesUmoCjsFile(source, spec) {
-  const [pkg, ...sub] = spec.split("/");
-  if (!source.includes(`/${pkg}/`)) return false;
-  if (sub.length === 0) {
+  const { pkgName, subPath } = parseNpmSpec(spec);
+  if (!source.includes(`/${pkgName}/`)) return false;
+  if (!subPath) {
     return source.endsWith(".js") || source.includes(".js?");
   }
-  const subPath = sub.join("/");
-  return source.includes(`/${pkg}/${subPath}.js`) || source.includes(`/${pkg}/${subPath}?`);
+  return source.includes(`/${subPath}.js`) || source.includes(`/${subPath}?`);
 }
 function augmentUmoCjsNamedExports(code, spec) {
   const named = UMO_CJS_NAMED_EXPORTS[spec] ?? UMO_CJS_NAMED_EXPORTS[spec.split("/")[0] ?? ""];
@@ -653,8 +671,24 @@ function docxPreviewViteFix() {
     }
   };
 }
+function coreVxeTableViteFix() {
+  return {
+    name: "core-vxe-table-vite",
+    config() {
+      return {
+        optimizeDeps: {
+          exclude: [
+            "@vxe-ui/plugin-render-element",
+            "@vxe-ui/plugin-export-xlsx",
+            "@vxe-ui/plugin-export-pdf"
+          ]
+        }
+      };
+    }
+  };
+}
 function coreOfficePreviewVitePlugins() {
-  return [createProjectRootPlugin(), umoCjsVirtual(), docxPreviewViteFix()];
+  return [createProjectRootPlugin(), umoCjsVirtual(), docxPreviewViteFix(), coreVxeTableViteFix()];
 }
 function coreUmoVitePlugins() {
   return [
@@ -663,6 +697,7 @@ function coreUmoVitePlugins() {
     highlightJsLibVirtual(),
     umoCjsVirtual(),
     docxPreviewViteFix(),
+    coreVxeTableViteFix(),
     tiptapUmoResolve(),
     yjsPeerResolve()
   ];

package/vite/umoIntegration.ts

@@ -23,12 +23,30 @@ function docxPreviewViteFix(): Plugin {
   }
 }
 
+/** vxe-ui 插件为 CJS，交由 umoCjsVirtual 转 ESM，避免 Vite 直接解析 index.common.js */
+function coreVxeTableViteFix(): Plugin {
+  return {
+    name: 'core-vxe-table-vite',
+    config() {
+      return {
+        optimizeDeps: {
+          exclude: [
+            '@vxe-ui/plugin-render-element',
+            '@vxe-ui/plugin-export-xlsx',
+            '@vxe-ui/plugin-export-pdf',
+          ],
+        },
+      }
+    },
+  }
+}
+
 /**
  * 核心包 CJS 兼容（附件预览 docx-preview/jszip、表格导出 exceljs 等）在宿主 Vite 中的插件。
  * 前端系统框架等未接入完整 Umo 插件链的宿主也应引入。
  */
 export function coreOfficePreviewVitePlugins(): Plugin[] {
-  return [createProjectRootPlugin(), umoCjsVirtual(), docxPreviewViteFix()]
+  return [createProjectRootPlugin(), umoCjsVirtual(), docxPreviewViteFix(), coreVxeTableViteFix()]
 }
 
 /**
@@ -42,6 +60,7 @@ export function coreUmoVitePlugins(): Plugin[] {
     highlightJsLibVirtual(),
     umoCjsVirtual(),
     docxPreviewViteFix(),
+    coreVxeTableViteFix(),
     tiptapUmoResolve(),
     yjsPeerResolve(),
   ]