adtec-core-package 3.0.8 → 3.0.9

package/AGENTS.md

@@ -1,7 +1,7 @@
 <!-- gitnexus:start -->
 # GitNexus — Code Intelligence
 
-This project is indexed by GitNexus as **adtec-front-end-core-package** (6158 symbols, 8961 relationships, 149 execution flows). Use the GitNexus MCP tools to understand code, assess impact, and navigate safely.
+This project is indexed by GitNexus as **adtec-front-end-core-package** (6187 symbols, 9025 relationships, 155 execution flows). Use the GitNexus MCP tools to understand code, assess impact, and navigate safely.
 
 > If any GitNexus tool warns the index is stale, run `npx gitnexus analyze` in terminal first.
 

package/CLAUDE.md

@@ -1,7 +1,7 @@
 <!-- gitnexus:start -->
 # GitNexus — Code Intelligence
 
-This project is indexed by GitNexus as **adtec-front-end-core-package** (6158 symbols, 8961 relationships, 149 execution flows). Use the GitNexus MCP tools to understand code, assess impact, and navigate safely.
+This project is indexed by GitNexus as **adtec-front-end-core-package** (6187 symbols, 9025 relationships, 155 execution flows). Use the GitNexus MCP tools to understand code, assess impact, and navigate safely.
 
 > If any GitNexus tool warns the index is stale, run `npx gitnexus analyze` in terminal first.
 

package/package.json

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

package/src/api/workflow/workflowInstApi.ts

@@ -4,6 +4,10 @@ import type { IWfProcessInstVo, IWfTaskVo } from '../../interface/workflow/IWfTa
 import type { IWfTaskAskVo } from '../../interface/workflow/IWfTaskAskVo'
 import type { IWfTaskUsersVo } from '../../interface/workflow/IWfTaskUsersVo'
 import type { IWfReturnNodeVo } from '../../interface/workflow/IWfReturnNodeVo'
+import type {
+  IWfNodeLastApprovalBatchVo,
+  IWfNodeLastApprovalQueryVo,
+} from '../../interface/workflow/IWfNodeLastApprovalVo'
 
 /**
  * 创建人：xux
@@ -72,4 +76,12 @@ export default {
   getWfProcessInstByBusinessId(businessId: string) {
     return request.get<IWfTaskVo>(baseUrl + '/getUserTaskInfo', { businessId })
   },
+  /** 获取指定节点最后一轮审批人及审批意见（支持多节点，不限制流程是否结束） */
+  getLastNodeApprovalByBusinessId(businessId: string, nodeCodes: string | string[]) {
+    const query: IWfNodeLastApprovalQueryVo = {
+      businessId,
+      nodeCodes: Array.isArray(nodeCodes) ? nodeCodes : [nodeCodes],
+    }
+    return request.post<IWfNodeLastApprovalBatchVo>(baseUrl + '/lastNodeApproval', query)
+  },
 }

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -217,9 +217,7 @@ async function remountEditor() {
   if (remounting || !umoMountOptions.value) return
   remounting = true
   try {
-    const html = ready.value
-      ? finalizeHtml(getRawHtml(), getRootElement())
-      : initHtml(model.value ?? '')
+    const html = ready.value ? getRawHtml() : (model.value ?? '')
     ready.value = false
     editorRef.value = null
     umoMountOptions.value = null
@@ -286,7 +284,7 @@ async function ensureBlockImageNodeView() {
   const editor = getEditorInstance()
   if (editor?.setContent && ready.value) {
     const html = initHtml(getRawHtml() || (model.value ?? ''))
-    editor.setContent(html, { emitUpdate: false })
+    editor.setContent(html, { emitUpdate: false, parseOptions: { preserveWhitespace: 'full' } })
     await nextTick()
     await waitEditorPaintFrames()
     if (!usesPlainImageDom(rootRef.value)) {
@@ -296,7 +294,7 @@ async function ensureBlockImageNodeView() {
   }
 
   if (ready.value) {
-    publishModelFromEditor(true)
+    publishModelFromEditor()
   }
   await remountEditor()
   await nextTick()
@@ -449,16 +447,15 @@ function applyEditorHtml(html: string, focus = false) {
   editor?.setContent?.(initHtml(html), {
     emitUpdate: false,
     focusPosition: focus ? 'end' : false,
+    parseOptions: { preserveWhitespace: 'full' },
   })
 }
 
-function publishModelFromEditor(finalize = false) {
+/** 将编辑器 HTML 同步到 v-model；始终使用 getRawHtml，不经 finalizeHtml（避免保存/blur 路径折叠空白） */
+function publishModelFromEditor() {
   const editor = getEditorInstance()
   if (!editor) return
-  let html = getRawHtml()
-  if (finalize) {
-    html = finalizeHtml(html, getRootElement())
-  }
+  const html = getRawHtml()
   syncingContent.value = true
   model.value = html
   text.value = getPlainText()
@@ -498,11 +495,11 @@ async function onEditorCreated() {
 
 function onEditorChanged() {
   if (!ready.value || syncingContent.value) return
-  publishModelFromEditor(false)
+  publishModelFromEditor()
 }
 
 function onEditorBlur() {
-  publishModelFromEditor(true)
+  publishModelFromEditor()
   emit('onBlur', { html: model.value ?? '', text: getPlainText() })
 }
 
@@ -537,7 +534,7 @@ watch(editable, async (now, prev) => {
   if (lastMountEditable.value === now) return
   if (!umoMountOptions.value) return
   if (ready.value) {
-    publishModelFromEditor(true)
+    publishModelFromEditor()
   }
   await remountEditor()
 })
@@ -549,7 +546,7 @@ watch(
     if (now === prev) return
     if (!umoMountOptions.value) return
     if (ready.value) {
-      publishModelFromEditor(true)
+      publishModelFromEditor()
     }
     await remountEditor()
   },
@@ -573,9 +570,11 @@ watch(
 )
 
 defineExpose({
-  getHtml: () => {
+  /** 默认返回编辑器原始 HTML（保留空白）；导出/含图存档时传 { finalize: true } */
+  getHtml: (options?: { finalize?: boolean }) => {
     if (!ready.value) return model.value ?? ''
-    return finalizeHtml(getRawHtml(), getRootElement())
+    const html = getRawHtml()
+    return options?.finalize ? finalizeHtml(html, getRootElement()) : html
   },
   getText: () => {
     if (!ready.value) return text.value ?? ''

package/src/components/RichTextEditor/richTextHtmlUtils.ts

@@ -17,15 +17,23 @@ const fontSizes = [
   { name: '初号', pt: 42, px: 49 },
 ]
 
+/** 纯字符串处理，避免 innerHTML 解析时合并连续空格 */
 function setDefaultPx(html: string) {
-  const tempDiv = document.createElement('div')
-  tempDiv.innerHTML = html
-  tempDiv.querySelectorAll('p').forEach((p) => {
-    if (!p.style.fontSize) {
-      p.style.fontSize = '14px'
+  return html.replace(/<p\b([^>]*)>/gi, (full, attrs: string) => {
+    const attrStr = attrs ?? ''
+    if (/style\s*=\s*["'][^"']*font-size\s*:/i.test(attrStr)) {
+      return full
+    }
+    if (/style\s*=\s*(["'])(.*?)\1/i.test(attrStr)) {
+      return full.replace(
+        /style\s*=\s*(["'])(.*?)\1/i,
+        (_m, quote: string, style: string) =>
+          `style=${quote}${normalizeStyleString(style)}font-size: 14px;${quote}`,
+      )
     }
+    const trimmed = attrStr.trim()
+    return trimmed ? `<p ${trimmed} style="font-size: 14px;">` : '<p style="font-size: 14px;">'
   })
-  return tempDiv.innerHTML
 }
 
 export function convertPxToPt(html: string) {
@@ -151,6 +159,45 @@ function srcMatchKey(src: string) {
   return src.length > 100 ? src.substring(0, 100) : src
 }
 
+function upsertImgDimensionsInHtml(
+  html: string,
+  srcKey: string,
+  width: number,
+  height: number,
+  fallbackIndex: number,
+): string {
+  if (!srcKey) return html
+
+  const imgTagPattern = /<img\b[^>]*\/?>/gi
+  const matches = [...html.matchAll(imgTagPattern)]
+  if (matches.length === 0) return html
+
+  let targetIndex = matches.findIndex((match) => {
+    const tag = match[0]
+    const srcMatch = tag.match(/\ssrc=(["'])(.*?)\1/i) ?? tag.match(/\ssrc=([^\s>]+)/i)
+    const src = srcMatch?.[2] ?? srcMatch?.[1] ?? ''
+    if (!src) return false
+    return src.startsWith(srcKey) || srcKey.startsWith(srcMatchKey(src))
+  })
+  if (targetIndex < 0) {
+    targetIndex = fallbackIndex < matches.length ? fallbackIndex : -1
+  }
+  if (targetIndex < 0) return html
+
+  const target = matches[targetIndex]
+  const start = target.index ?? 0
+  const end = start + target[0].length
+  let nextTag = target[0]
+    .replace(/\swidth=(["'])[^"']*\1/gi, '')
+    .replace(/\sheight=(["'])[^"']*\1/gi, '')
+    .replace(/\swidth=[^\s>]+/gi, '')
+    .replace(/\sheight=[^\s>]+/gi, '')
+    .replace(/\sstyle=(["'])[^"']*\1/gi, '')
+  nextTag = nextTag.replace(/\/?>$/, ` width="${width}" height="${height}">`)
+
+  return html.slice(0, start) + nextTag + html.slice(end)
+}
+
 /** 失焦/保存时把编辑器 DOM 中的图片尺寸写回 HTML（兜底 NodeView attrs 未同步） */
 export function syncImageDimensions(html: string, root?: DomRoot) {
   const domRoot = resolveDomRoot(root)
@@ -164,51 +211,26 @@ export function syncImageDimensions(html: string, root?: DomRoot) {
   const liveImages = Array.from(contentRoot.querySelectorAll('img'))
   if (liveImages.length === 0) return html
 
-  const tempDiv = document.createElement('div')
-  tempDiv.innerHTML = html
-  const htmlImages = Array.from(tempDiv.querySelectorAll('img'))
-  if (htmlImages.length === 0) return html
-
+  let result = html
   liveImages.forEach((liveImg, index) => {
     const width = Math.round(liveImg.offsetWidth)
     const height = Math.round(liveImg.offsetHeight)
     if (width <= 1 || height <= 1) return
 
     const liveKey = srcMatchKey(liveImg.getAttribute('src') || liveImg.src || '')
-    let htmlImg =
-      htmlImages.find((img) => {
-        const src = img.getAttribute('src') || ''
-        if (!src || !liveKey) return false
-        return src.startsWith(liveKey) || liveKey.startsWith(srcMatchKey(src))
-      }) ?? htmlImages[index]
-
-    if (!htmlImg) return
-
-    htmlImg.setAttribute('width', String(width))
-    htmlImg.setAttribute('height', String(height))
-    htmlImg.removeAttribute('style')
+    result = upsertImgDimensionsInHtml(result, liveKey, width, height, index)
   })
 
-  return tempDiv.innerHTML
+  return result
 }
 
 function sanitizeBrokenImages(html: string) {
-  if (typeof document === 'undefined') {
-    return html
-      .replace(/\ssrc=(["'])(null|undefined)\1/gi, '')
-      .replace(/\ssrc=(null|undefined)(?=\s|>|\/)/gi, '')
-      .replace(/\ssrc=(["'])\s*\1/gi, '')
-  }
-
-  const tempDiv = document.createElement('div')
-  tempDiv.innerHTML = html
-  tempDiv.querySelectorAll('img').forEach((img) => {
-    const src = (img.getAttribute('src') ?? '').trim()
-    if (!src || src === 'null' || src === 'undefined') {
-      img.remove()
-    }
-  })
-  return tempDiv.innerHTML
+  if (!html) return ''
+  // 仅用正则，避免 innerHTML 往返合并文本中的连续空格
+  return html
+    .replace(/<img\b[^>]*\ssrc=(["'])(null|undefined)\1[^>]*\/?>/gi, '')
+    .replace(/<img\b[^>]*\ssrc=(null|undefined)(?=\s|>|\/)[^>]*\/?>/gi, '')
+    .replace(/<img\b[^>]*\ssrc=(["'])\s*\1[^>]*\/?>/gi, '')
 }
 
 export function initHtml(html: string) {
@@ -219,6 +241,7 @@ export function initHtml(html: string) {
   return convertPtToPx(html)
 }
 
+/** 导出/存档用：同步图片尺寸并将 px 字号转为 pt；全程正则/DOM 读尺寸，不经 innerHTML 文本往返 */
 export function finalizeHtml(html: string, root?: DomRoot) {
   let result = html || ''
   result = calcImagesHeight(result, root)

package/src/interface/workflow/IWfNodeLastApprovalVo.ts

@@ -0,0 +1,25 @@
+import type { IWfTaskVo } from './IWfTaskVo'
+
+/** 单个节点最后一轮审批信息 */
+export interface IWfNodeLastApprovalVo {
+  /** BPMN 节点 id（taskDefKey） */
+  nodeCode?: string
+  /** 该节点最后一轮审批记录（会签时可能多条） */
+  approvalList?: IWfTaskVo[]
+}
+
+/** 多节点最后一轮审批查询入参 */
+export interface IWfNodeLastApprovalQueryVo {
+  businessId?: string
+  nodeCodes?: string[]
+}
+
+/** 多节点最后一轮审批查询结果 */
+export interface IWfNodeLastApprovalBatchVo {
+  businessId?: string
+  procInsId?: string
+  procEndTime?: string
+  /** 流程是否已结束（仅信息字段，不影响查询） */
+  finished?: boolean
+  nodeApprovalList?: IWfNodeLastApprovalVo[]
+}

package/src/utils/AxiosConfig.ts

@@ -30,7 +30,7 @@ const request = axios.create({
 })
 function setHeaders(config: any) {
   //数据防止篡改
-  const Authorization = sessionStorage.getItem('Authorization')
+  const Authorization = config.skipAuthorization ? '' : sessionStorage.getItem('Authorization')
   const signa = 'F2E49299-D0D2-4AA1-87A3-270272EA3D6A'
   let dataJson: string = ''
   if (config.method === 'get') {
@@ -56,7 +56,7 @@ function setHeaders(config: any) {
   // @ts-ignore
   dataJson=dataJson.replace(/[^\u4E00-\u9FA5A-Za-z0-9]/g, '')
   dataJson = dataJson.split('').sort().join('').trim()
-  config.headers.sessionId = sessionStorage.getItem('sessionId')
+  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)