adtec-core-package 2.6.9 → 2.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.6.9",
+  "version": "2.7.1",
   "private": false,
   "type": "module",
   "scripts": {

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -18,7 +18,12 @@
 import { AiEditor } from 'aieditor'
 import 'aieditor/dist/style.css'
 import { onMounted, onUnmounted, ref, watch, nextTick } from 'vue'
+import type { WatchStopHandle } from 'vue'
 import { ElMessage } from 'element-plus'
+enum WatchType {
+  initWatch = 'initWatch',
+}
+const watchHandlers = ref<Partial<Record<WatchType, WatchStopHandle>>>({});
 
 const divRef = ref()
 let aiEditor: AiEditor | null
@@ -322,29 +327,18 @@ function customStringReplacement(
   return result
 }
 
-watch(
-  () => props.isEdit,
-  (val) => {
-    if (aiEditor) {
-      aiEditor.setEditable(val)
-      //头尾显隐
-      const footer = divRef.value?.querySelector('aie-footer') as HTMLElement
-      if (footer) {
-        footer.style.display = val ? '' : 'none'
-      }
-      const header = divRef.value?.querySelector('aie-header') as HTMLElement
-      if (header) {
-        header.style.display = val ? '' : 'none'
-      }
-    }
-  },
-  { immediate: true },
-)
+
 function initHtml(html: string) {
   html = customStringReplacement(html, '<img', '>', 'height="[0-9]+"', 'height="auto"')
   return convertPtToPx(html)
 }
-
+const stopWatchByType = (type: WatchType) => {
+  const stopHandle = watchHandlers.value[type]
+  if (stopHandle) {
+    stopHandle()
+    delete watchHandlers.value[type]
+  }
+}
 onMounted(() => {
   const config = {
     element: divRef.value as Element,
@@ -363,7 +357,27 @@ onMounted(() => {
         { name: 'Times New Roman', value: 'Times New Roman' },
       ],
     },
-    onCreated: (editor: AiEditor) => {},
+    onCreated: (editor: AiEditor) => {
+      stopWatchByType(WatchType.initWatch)
+      watchHandlers.value[WatchType.initWatch] =watch(
+        () => props.isEdit,
+        (val) => {
+          if (aiEditor) {
+            aiEditor.setEditable(val)
+            //头尾显隐
+            const footer = divRef.value?.querySelector('aie-footer') as HTMLElement
+            if (footer) {
+              footer.style.display = val ? '' : 'none'
+            }
+            const header = divRef.value?.querySelector('aie-header') as HTMLElement
+            if (header) {
+              header.style.display = val ? '' : 'none'
+            }
+          }
+        },
+        { immediate: true },
+      )
+    },
   }
   // 隐藏工具栏
   if (!props.showToolbar) {

package/src/components/upload/ElUploads.vue

@@ -196,13 +196,13 @@ const mouseout = () => {
 }
 const getAccept = computed(() => {
   if (props.accept === 'images') {
-    return '.jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP'
+    return '.jpg,.jpeg,.png,.gif,.bmp'
   } else if (props.accept === 'document') {
     return '.txt,.pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx'
   } else if (props.accept === 'txt') {
     return '.txt'
   } else if (props.accept === 'pdf') {
-    return '.pdf'
+    return '.pdf' // 正确配置，仅允许 pdf
   } else if (props.accept === 'word') {
     return '.doc,.docx'
   } else if (props.accept === 'excel') {
@@ -266,6 +266,17 @@ const beforeUpload = (file: File) => {
     ElMessage.warning('文件大小不能超过' + props.size + 'MB')
     return false
   }
+  const acceptSuffixes = getAccept.value
+    ?.split(',')
+    .map(suffix => suffix.slice(1).toLowerCase())
+  const fileSuffix = file.name.split('.').pop()?.toLowerCase()
+  if (acceptSuffixes && !acceptSuffixes.includes(fileSuffix)) {
+    ElMessage.error(`文件 ${file.name} 格式不支持，仅允许 ${getAccept.value}！`)
+    setTimeout(() => {
+      ref_upload.value?.clearFiles(["ready"])
+    }, 1)
+    return false
+  }
   loadingFiles.value.push(file.name)
   return true
 }