adtec-core-package 2.9.7 → 2.9.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.9.7",
+  "version": "2.9.9",
   "private": false,
   "type": "module",
   "scripts": {
@@ -16,6 +16,7 @@
     "@element-plus/icons-vue": "^2.3.1",
     "@onlyoffice/document-editor-vue": "1.4.0",
     "@types/echarts": "^5.0.0",
+    "@umoteam/editor": "^10.2.1",
     "@vueuse/components": "^13.0.0",
     "@vueuse/core": "^13.0.0",
     "@vxe-ui/plugin-export-pdf": "4.2.4",

package/src/api/workflow/workflowCommentApi.ts

@@ -17,7 +17,10 @@ export default {
   addOrEditComment(tpReviewBatch: ITpReviewBatch) {
     return request.post<ITpReviewBatch>('/api/tm/tpApplyCheck/updateBatchInfo', tpReviewBatch)
   },
-  getBatchInfo(tpApplyId: string) {
-    return request.get<ITpReviewBatch>('/api/tm/tpApplyCheck/getBatchInfo', { tpApplyId })
+  getBatchInfo(tpApplyId: string, batchPrefer: 'max' | 'min' = 'max') {
+    return request.get<ITpReviewBatch>('/api/tm/tpApplyCheck/getBatchInfo', { tpApplyId, batchPrefer })
+  },
+  getBatchInfoByTaskId(taskId: string) {
+    return request.get<ITpReviewBatch>('/api/tm/tpApplyCheck/getBatchInfoByTaskId', { taskId })
   },
 }

package/src/components/RichTextEditor/UmoRichTextEditor.vue

@@ -0,0 +1,257 @@
+<!-- Umo Editor 封装：与 RichTextEditor 保持相同对外 API，供结题验收等模块试点 -->
+<template>
+  <el-flex ref="rootRef" class="umo-rich-text-editor-root" :style="{ height: '100%', width: '100%' }">
+    <UmoEditor
+      ref="editorRef"
+      class="umo-rich-text-editor"
+      v-bind="umoOptions"
+      @created="onEditorCreated"
+      @changed="onEditorChanged"
+      @blur="onEditorBlur"
+    />
+  </el-flex>
+</template>
+
+<script setup lang="ts">
+import { UmoEditor } from '@umoteam/editor'
+import '@umoteam/editor/style'
+import { ElMessage } from 'element-plus'
+import { computed, nextTick, onUnmounted, ref, watch } from 'vue'
+import { v4 as uuidv4 } from 'uuid'
+import { finalizeHtml, initHtml } from './richTextHtmlUtils'
+
+export type RichTextEditorConfig = {
+  placeholder?: string
+  editable?: boolean
+  [key: string]: unknown
+}
+
+const emit = defineEmits<{
+  onBlur: [payload: { html: string; text: string }]
+  onChange: [payload: { html: string; text: string }]
+}>()
+
+const props = withDefaults(
+  defineProps<{
+    showToolbar?: boolean
+    borderWidth?: string
+    editorConfig?: RichTextEditorConfig
+    isEdit?: boolean
+  }>(),
+  {
+    showToolbar: true,
+    borderWidth: '1px',
+    editorConfig: () => ({}),
+    isEdit: true,
+  },
+)
+
+const model = defineModel<string | null | undefined>({
+  required: false,
+  default: null,
+})
+const text = defineModel<string>('text', {
+  required: false,
+})
+
+const editorRef = ref<InstanceType<typeof UmoEditor> | null>(null)
+const rootRef = ref<HTMLElement | null>(null)
+const editorKey = `umo-${uuidv4()}`
+const ready = ref(false)
+const syncingContent = ref(false)
+
+const placeholderText = computed(() => {
+  const raw = props.editorConfig?.placeholder
+  if (typeof raw === 'string' && raw.trim()) return raw
+  return '请输入内容...'
+})
+
+const editable = computed(() => {
+  if (!props.isEdit) return false
+  if (props.editorConfig?.editable === false) return false
+  return true
+})
+
+const umoOptions = computed(() => ({
+  editorKey,
+  locale: 'zh-CN',
+  theme: 'light',
+  height: '100%',
+  toolbar: {
+    showSaveLabel: false,
+    defaultMode: 'classic',
+    menus: props.showToolbar ? ['base', 'insert', 'table', 'tools'] : ['base'],
+  },
+  page: {
+    layouts: ['web'],
+  },
+  document: {
+    title: '',
+    content: initHtml(model.value ?? ''),
+    placeholder: {
+      zh_CN: placeholderText.value,
+    },
+    readOnly: !editable.value,
+    enableMarkdown: false,
+    enableSpellcheck: false,
+    autoSave: {
+      enabled: false,
+    },
+  },
+  shareUrl: typeof location !== 'undefined' ? location.href : '',
+  async onFileUpload(file: File) {
+    if (file.type.startsWith('image/') && file.size > 2 * 1024 * 1024) {
+      ElMessage.warning('图片大小不能超过2M')
+      throw new Error('image too large')
+    }
+    const url = await readFileAsDataUrl(file)
+    return {
+      id: uuidv4(),
+      url,
+    }
+  },
+}))
+
+function readFileAsDataUrl(file: File) {
+  return new Promise<string>((resolve, reject) => {
+    const reader = new FileReader()
+    reader.onload = () => resolve(String(reader.result ?? ''))
+    reader.onerror = () => reject(reader.error)
+    reader.readAsDataURL(file)
+  })
+}
+
+function getEditorInstance() {
+  return editorRef.value as unknown as {
+    getHTML?: () => string
+    getText?: () => string
+    setContent?: (content: string, options?: Record<string, unknown>) => void
+    setReadOnly?: (value: boolean) => void
+    setToolbar?: (payload: { mode?: string; show?: boolean }) => void
+    setLayout?: (layout: 'page' | 'web') => void
+  } | null
+}
+
+function getRawHtml() {
+  const editor = getEditorInstance()
+  return editor?.getHTML?.() ?? ''
+}
+
+function getPlainText() {
+  const editor = getEditorInstance()
+  return editor?.getText?.() ?? ''
+}
+
+function applyEditorHtml(html: string, focus = false) {
+  const editor = getEditorInstance()
+  editor?.setContent?.(initHtml(html), {
+    emitUpdate: false,
+    focusPosition: focus ? 'end' : false,
+  })
+}
+
+function syncEditorPresentation() {
+  const editor = getEditorInstance()
+  if (!editor) return
+  editor.setLayout?.('web')
+  editor.setReadOnly?.(!editable.value)
+  editor.setToolbar?.({
+    mode: 'classic',
+    show: props.showToolbar && editable.value,
+  })
+}
+
+function publishModelFromEditor(finalize = false) {
+  const editor = getEditorInstance()
+  if (!editor) return
+  let html = getRawHtml()
+  if (finalize) {
+    html = finalizeHtml(html, rootRef.value)
+  }
+  syncingContent.value = true
+  model.value = html
+  text.value = getPlainText()
+  syncingContent.value = false
+  emit('onChange', { html, text: getPlainText() })
+}
+
+function onEditorCreated() {
+  ready.value = true
+  syncEditorPresentation()
+  applyEditorHtml(model.value ?? '', false)
+}
+
+function onEditorChanged() {
+  if (!ready.value || syncingContent.value) return
+  publishModelFromEditor(false)
+}
+
+function onEditorBlur() {
+  publishModelFromEditor(true)
+  emit('onBlur', { html: model.value ?? '', text: getPlainText() })
+}
+
+watch(
+  () => model.value,
+  (value) => {
+    if (!ready.value || syncingContent.value) return
+    const current = getRawHtml()
+    if ((value ?? '') === current) return
+    applyEditorHtml(value ?? '', false)
+  },
+)
+
+watch(
+  () => [editable.value, props.showToolbar] as const,
+  async () => {
+    if (!ready.value) return
+    await nextTick()
+    syncEditorPresentation()
+  },
+)
+
+watch(placeholderText, () => {
+  if (!ready.value) return
+  getEditorInstance()?.setContent?.(getRawHtml(), { emitUpdate: false })
+})
+
+defineExpose({
+  getHtml: () => {
+    if (!ready.value) return model.value ?? ''
+    return finalizeHtml(getRawHtml(), rootRef.value)
+  },
+  getText: () => {
+    if (!ready.value) return text.value ?? ''
+    return getPlainText()
+  },
+  setContent: (html: string, focus = false) => {
+    model.value = html
+    if (ready.value) {
+      applyEditorHtml(html, focus)
+    }
+  },
+})
+
+onUnmounted(() => {
+  ready.value = false
+})
+</script>
+
+<style scoped lang="scss">
+.umo-rich-text-editor-root {
+  min-height: 280px;
+}
+
+:deep(.umo-rich-text-editor) {
+  width: 100%;
+  height: 100%;
+  border-width: v-bind(borderWidth);
+  border-style: solid;
+  border-color: #dcdfe6;
+  box-sizing: border-box;
+}
+
+:deep(.umo-editor-container) {
+  min-height: 240px;
+}
+</style>

package/src/components/RichTextEditor/richTextHtmlUtils.ts

@@ -0,0 +1,166 @@
+const fontSizes = [
+  { name: '八号', pt: 5, px: 5 },
+  { name: '七号', pt: 5.5, px: 6 },
+  { name: '小六', pt: 6.5, px: 8 },
+  { name: '六号', pt: 7.5, px: 9 },
+  { name: '小五', pt: 9, px: 11 },
+  { name: '五号', pt: 10.5, px: 12 },
+  { name: '小四', pt: 12, px: 14 },
+  { name: '四号', pt: 14, px: 16 },
+  { name: '小三', pt: 15, px: 18 },
+  { name: '三号', pt: 16, px: 19 },
+  { name: '小二', pt: 18, px: 21 },
+  { name: '二号', pt: 22, px: 26 },
+  { name: '小一', pt: 24, px: 28 },
+  { name: '一号', pt: 26, px: 30 },
+  { name: '小初', pt: 36, px: 42 },
+  { name: '初号', pt: 42, px: 49 },
+]
+
+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 tempDiv.innerHTML
+}
+
+export function convertPxToPt(html: string) {
+  html = setDefaultPx(html)
+  const regex = /font-size: (\d+)px/g
+  return html.replace(regex, (match, pxValue) => {
+    const px = parseInt(pxValue, 10)
+    const entry = fontSizes.find((item) => item.px === px)
+    if (entry) {
+      return `font-size: ${entry.pt}pt`
+    }
+    return match
+  })
+}
+
+export function convertPtToPx(html: string) {
+  const regex = /font-size: (\d+)pt/g
+  return html.replace(regex, (match, ptValue) => {
+    const pt = parseFloat(ptValue)
+    const entry = fontSizes.find((item) => item.pt === pt)
+    if (entry) {
+      return `font-size: ${entry.px}px`
+    }
+    return match
+  })
+}
+
+function normalizeStyleString(style: string): string {
+  style = style.trim()
+  if (!style) return ''
+  if (style.charAt(style.length - 1) !== ';') {
+    style += ';'
+  }
+  return style
+}
+
+export function removeAllFontFamilyStyles(html: string): string {
+  const tempDiv = document.createElement('div')
+  tempDiv.innerHTML = html
+
+  function processElement(element: Element) {
+    if (element.hasAttribute('style')) {
+      let style = element.getAttribute('style') || ''
+      style = normalizeStyleString(style)
+      style = style.replace(
+        /(?:font-family|mso-(?:ascii|hansi|bidi|fareast|east-asian|font)-font-family)\s*:\s*[^;]+;/gi,
+        '',
+      )
+      style = style.trim()
+      if (style) {
+        element.setAttribute('style', style)
+      } else {
+        element.removeAttribute('style')
+      }
+    }
+
+    const fontFamilyAttrs = [
+      'font-family',
+      'face',
+      'mso-hansi-font-family',
+      'mso-bidi-font-family',
+      'mso-ascii-font-family',
+      'mso-fareast-font-family',
+      'mso-east-asian-font-family',
+      'mso-font-font-family',
+    ]
+    fontFamilyAttrs.forEach((attr) => element.removeAttribute(attr))
+    Array.from(element.children).forEach((child) => processElement(child))
+  }
+
+  Array.from(tempDiv.children).forEach((child) => processElement(child))
+  return tempDiv.innerHTML
+}
+
+function customStringReplacement(
+  str: string,
+  startMarker: string,
+  endMarker: string,
+  target: string,
+  replacement: string,
+): string {
+  let result = ''
+  let currentIndex = 0
+
+  while (true) {
+    const startIndex = str.indexOf(startMarker, currentIndex)
+    if (startIndex === -1) {
+      result += str.slice(currentIndex)
+      break
+    }
+
+    const endIndex = str.indexOf(endMarker, startIndex + startMarker.length)
+    if (endIndex === -1) {
+      result += str.slice(currentIndex)
+      break
+    }
+
+    result += str.slice(currentIndex, startIndex + startMarker.length)
+    const middle = str.slice(startIndex + startMarker.length, endIndex)
+    const newMiddle = middle.replace(new RegExp(target, 'g'), replacement)
+    result += newMiddle
+    result += endMarker
+    currentIndex = endIndex + 1
+  }
+
+  return result
+}
+
+export function calcImagesHeight(html: string, root?: HTMLElement | null) {
+  if (!root) return html
+  const map = new Map<string, number>()
+  const imageElements = root.querySelectorAll('img')
+  imageElements.forEach((imageElement) => {
+    const width = imageElement.offsetWidth
+    const height = imageElement.offsetHeight
+    if (width > 1 && height > 1) {
+      const src =
+        imageElement.src.length > 100 ? imageElement.src.substring(0, 100) : imageElement.src
+      map.set(src, height)
+    }
+  })
+  for (const [key, value] of map) {
+    html = customStringReplacement(html, `${key}`, '>', 'height="auto"', `height="${value}"`)
+  }
+  return html
+}
+
+export function initHtml(html: string) {
+  if (!html) return ''
+  html = customStringReplacement(html, '<img', '>', 'height="[0-9]+"', 'height="auto"')
+  return convertPtToPx(html)
+}
+
+export function finalizeHtml(html: string, root?: HTMLElement | null) {
+  let result = html || ''
+  result = calcImagesHeight(result, root)
+  return convertPxToPt(result)
+}

package/src/components/upload/FileView.vue

@@ -115,27 +115,31 @@ const title = useVModel(props, 'title', emit)
 const fileId = useVModel(props, 'fileId', emit)
 const url = useVModel(props, 'url', emit)
 const edit = useVModel(props, 'edit', emit)
-const getFileType = () => {
-  if ((url.value + '').indexOf('.docx') !== -1 || (url.value + '').indexOf('.doc') !== -1) {
-    return 'docx'
-  } else if ((url.value + '').indexOf('.pdf') !== -1) {
-    return 'pdf'
-  } else if ((url.value + '').indexOf('.xlsx') !== -1 || (url.value + '').indexOf('.xls') !== -1) {
-    return 'xlsx'
-  } else if ((url.value + '').indexOf('.pptx') !== -1 || (url.value + '').indexOf('.pptx') !== -1) {
-    return 'pptx'
+
+const resolveFileExt = (type?: string, name?: string, fileUrl?: string) => {
+  const normalizedType = (type || '').toLowerCase().replace(/^\./, '')
+  if (normalizedType) {
+    return normalizedType === 'doc' ? 'docx' : normalizedType
+  }
+  const fromName = (name || '').match(/\.([a-z0-9]+)$/i)?.[1]?.toLowerCase()
+  if (fromName) {
+    return fromName === 'doc' ? 'docx' : fromName
   }
+  const urlStr = (fileUrl || '').toLowerCase()
+  if (urlStr.includes('.docx') || urlStr.includes('.doc')) return 'docx'
+  if (urlStr.includes('.pdf')) return 'pdf'
+  if (urlStr.includes('.xlsx') || urlStr.includes('.xls')) return 'xlsx'
+  if (urlStr.includes('.pptx') || urlStr.includes('.ppt')) return 'pptx'
+  return ''
 }
+
+const getFileType = () => resolveFileExt(undefined, title.value, url.value)
 const getDocumentType = () => {
-  if ((url.value + '').indexOf('.docx') !== -1 || (url.value + '').indexOf('.doc') !== -1) {
-    return 'word'
-  } else if ((url.value + '').indexOf('.pdf') !== -1) {
-    return 'pdf'
-  } else if ((url.value + '').indexOf('.xlsx') !== -1 || (url.value + '').indexOf('.xls') !== -1) {
-    return 'cell'
-  } else if ((url.value + '').indexOf('.pptx') !== -1 || (url.value + '').indexOf('.pptx') !== -1) {
-    return 'slide'
-  }
+  const ext = getFileType()
+  if (ext === 'docx' || ext === 'doc') return 'word'
+  if (ext === 'pdf') return 'pdf'
+  if (ext === 'xlsx' || ext === 'xls') return 'cell'
+  if (ext === 'pptx' || ext === 'ppt') return 'slide'
 }
 const download= async ()=>{
   try{

package/src/components/workflow/components/AddOrMinusMultiDialog.vue

@@ -54,6 +54,7 @@ import { ElMessage } from 'element-plus'
 import { userInfoStore } from '../../../stores/userInfoStore'
 import type { ISysUserInfo } from '../../../interface/ISysUserInfo'
 import frameworkUtils from '../../../utils/FrameworkUtils.ts'
+const emit = defineEmits<{ success: [] }>()
 const userInfo = userInfoStore()
 const data = ref<IWfTaskUsersVo>({
   assignee: [],
@@ -81,6 +82,11 @@ const open = async (taskId: string, type: string) => {
     data.value = { ...(await workflowInstApi.getTaskCandidate(taskId)), assignee: [] }
     //设置当前的审批人
     defaultAssignee.value = data.value.candidate?.map((e:ISysUserInfo) => e.id!) || []
+    if (type === 'minusMulti' && defaultAssignee.value.length <= 1) {
+      ElMessage.warning('至少需保留一名审核人，当前仅剩一名审核人，无法减签')
+      dialogVisible.value = false
+      return
+    }
     data.value.assignee = [...defaultAssignee.value]
   } catch (err: any) {
     frameworkUtils.messageError(err)
@@ -122,18 +128,26 @@ const disableFunc = (val: string) => {
   }
 }
 const save = async () => {
-  if (data.value.candidate?.length == 0 || data.value.assignee.length == 0) {
+  if (data.value.candidate?.length == 0) {
     ElMessage.warning('请指定执行人！')
     return
   }
   //加签逻辑判断
   if (dialogType.value === 'addMulti') {
+    if (data.value.assignee.length == 0) {
+      ElMessage.warning('请指定执行人！')
+      return
+    }
     if (data.value.assignee.length <= defaultAssignee.value.length) {
       ElMessage.warning('加签必须选择非原审批人！')
       return
     }
   } else if (dialogType.value === 'minusMulti') {
-    //减签逻辑判断
+    //减签逻辑判断：至少保留一名审核人
+    if (data.value.assignee.length < 1) {
+      ElMessage.warning('至少需保留一名审核人')
+      return
+    }
     if (data.value.assignee.length >= defaultAssignee.value.length) {
       ElMessage.warning('减签必须取消选中原审批人！')
       return
@@ -145,6 +159,7 @@ const save = async () => {
     await workflowInstApi.addOrMinusAssignee(data.value)
     ElMessage.success('操作成功')
     dialogVisible.value = false
+    emit('success')
   } catch (err: any) {
     frameworkUtils.messageError(err)
   } finally {

package/src/components/workflow/components/CheckDialog.vue

@@ -201,6 +201,9 @@ const open = async (
     //转办
     dialogLabel.value = '转办原因'
     dialogTitle.value = '转办审批'
+    // 每次打开转办弹窗清空原因与转办人，避免复用 taskVo 上次的审批/转办意见
+    task.value.comment = ''
+    transferUser.value = { id: '', userName: '' }
   }
   loading.value = false
 }

package/src/components/workflow/components/ProcessInstanceStep.vue

@@ -220,13 +220,28 @@ const getStatus = (task: IWfTaskVo) => {
   }
 }
 const compParam = ref()
+const resolveReviewBatch = async (task: IWfTaskVo) => {
+  if (task.taskId) {
+    const byTask = await workflowcommentApi.getBatchInfoByTaskId(task.taskId)
+    if (byTask?.revMeetingId) {
+      return byTask
+    }
+  }
+  const batchPrefer = task.taskName === '专家会审(答辩)' ? 'max' : 'min'
+  return workflowcommentApi.getBatchInfo(task.businessId ?? '', batchPrefer)
+}
 const viewDetail = async (task: IWfTaskVo) => {
   if (task.taskName === '专家评审' || task.taskName === '专家会审(答辩)') {
-    //获取第二批次信息
-    const batchInfo = await workflowcommentApi.getBatchInfo(task.businessId ?? '')
+    const batchInfo = await resolveReviewBatch(task)
+    if (!batchInfo?.revMeetingId) {
+      ElMessage.warning('暂无评审详情')
+      return
+    }
     const taskInfo = {
       businessId: batchInfo.revMeetingId + '_' + (task.businessId ?? ''),
       nodeTag: 'TECPM:/src/views/meetingHost/componets/comp.viewResult.vue',
+      nodeParam: batchInfo.reviewType ?? '10',
+      taskName: task.taskName,
     }
     await showTodoDialog(ref(taskInfo as IWfTaskVo), compParam)
   } else {

package/src/types/umoteam-editor.d.ts

@@ -0,0 +1,8 @@
+declare module '@umoteam/editor' {
+  import type { DefineComponent } from 'vue'
+
+  export const UmoEditor: DefineComponent<Record<string, unknown>, Record<string, unknown>, any>
+  export function useUmoEditor(options?: Record<string, unknown>): void
+}
+
+declare module '@umoteam/editor/style'