adtec-core-package 2.7.6 → 2.7.8

package/package.json

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

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -17,13 +17,14 @@
 <script setup lang="ts">
 import { AiEditor } from 'aieditor'
 import 'aieditor/dist/style.css'
-import type { WatchStopHandle } from 'vue'
+import { onActivated, type WatchStopHandle } from 'vue'
 import { onMounted, onUnmounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 
 enum WatchType {
   initWatch = 'initWatch',
 }
+
 const watchHandlers = ref<Partial<Record<WatchType, WatchStopHandle>>>({})
 
 const divRef = ref()
@@ -56,17 +57,17 @@ const props = withDefaults(
     showToolbar: true,
     borderWidth: '1px',
     editorConfig: {},
-    isEdit: true,
-  },
+    isEdit: true
+  }
 )
 const model = defineModel({
   type: [String, null, undefined],
   required: false,
-  default: null,
+  default: null
 })
 const text = defineModel('text', {
   type: String,
-  required: false,
+  required: false
 })
 //字体对照表
 const fontSizes = [
@@ -85,8 +86,9 @@ const fontSizes = [
   { name: '小一', pt: 24, px: 28 },
   { name: '一号', pt: 26, px: 30 },
   { name: '小初', pt: 36, px: 42 },
-  { name: '初号', pt: 42, px: 49 },
+  { name: '初号', pt: 42, px: 49 }
 ]
+
 function setDefaultPx(html: string) {
   // 创建临时div用于解析HTML
   const tempDiv = document.createElement('div')
@@ -104,6 +106,7 @@ function setDefaultPx(html: string) {
   })
   return tempDiv.innerHTML
 }
+
 function convertPxToPt(html: string) {
   html = setDefaultPx(html)
   const regex = /font-size: (\d+)px/g
@@ -116,6 +119,7 @@ function convertPxToPt(html: string) {
     return match
   })
 }
+
 function convertPtToPx(html: string) {
   const regex = /font-size: (\d+)pt/g
   return html.replace(regex, (match, ptValue) => {
@@ -127,6 +131,7 @@ function convertPtToPx(html: string) {
     return match
   })
 }
+
 //默认的配置
 const defaultConfig = {
   placeholder: '请输入内容...',
@@ -140,11 +145,11 @@ const defaultConfig = {
     'video',
     'ai',
     'quote',
-    'emoji',
+    'emoji'
   ],
   textSelectionBubbleMenu: {
     enable: true,
-    items: ['Bold', 'Italic', 'Underline', 'Strike', 'code', 'comment'],
+    items: ['Bold', 'Italic', 'Underline', 'Strike', 'code', 'comment']
   },
   image: {
     uploaderEvent: {
@@ -153,18 +158,18 @@ const defaultConfig = {
           ElMessage.warning('图片大小不能超过2M')
           return false
         }
-      },
+      }
       // onSuccess: (file, response) => {
       //   console.log('onSuccess', file, response)
       // }
-    },
+    }
   },
   htmlPasteConfig: {
     pasteProcessor: (html) => {
       // return html;
       // console.log('html:', html, 'xxxxxx', removeAllFontFamilyStyles(html))
       return removeAllFontFamilyStyles(html)
-    },
+    }
   },
   fontSize: {
     defaultValue: ' ',
@@ -185,8 +190,8 @@ const defaultConfig = {
       { name: '六号', value: 9 },
       { name: '小六', value: 8 },
       { name: '七号', value: 6 },
-      { name: '八号', value: 5 },
-    ],
+      { name: '八号', value: 5 }
+    ]
   },
   onChange: (editor: AiEditor) => {
     setFooter()
@@ -195,7 +200,7 @@ const defaultConfig = {
     setTimeout(() => {
       setContent()
     }, 200)
-  },
+  }
 }
 
 /**
@@ -224,7 +229,7 @@ function removeAllFontFamilyStyles(html: string): string {
       // 使用简化的正则表达式移除字体相关属性（现在可以安全地假设每个属性后都有分号）
       style = style.replace(
         /(?:font-family|mso-(?:ascii|hansi|bidi|fareast|east-asian|font)-font-family)\s*:\s*[^;]+;/gi,
-        '',
+        ''
       )
       // 清理空样式
       style = style.trim()
@@ -244,7 +249,7 @@ function removeAllFontFamilyStyles(html: string): string {
       'mso-ascii-font-family',
       'mso-fareast-font-family',
       'mso-east-asian-font-family',
-      'mso-font-font-family',
+      'mso-font-font-family'
     ]
     fontFamilyAttrs.forEach((attr) => element.removeAttribute(attr))
 
@@ -271,6 +276,7 @@ function removeAllFontFamilyStyles(html: string): string {
   Array.from(tempDiv.children).forEach((child) => processElement(child))
   return tempDiv.innerHTML
 }
+
 /**
  * 计算富文本框中图片的高度并赋值
  */
@@ -284,7 +290,7 @@ function calcImagesHeight(html: string) {
       if (width > 1 && height > 1) {
         map.set(
           imageElement.src.length > 100 ? imageElement.src.substring(0, 100) : imageElement.src,
-          height,
+          height
         )
       }
     })
@@ -300,7 +306,7 @@ function customStringReplacement(
   startMarker: string,
   endMarker: string,
   target: string,
-  replacement: string,
+  replacement: string
 ): string {
   let result = ''
   let currentIndex = 0
@@ -333,6 +339,7 @@ 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) {
@@ -355,10 +362,11 @@ onMounted(() => {
         { name: '微软雅黑', value: 'Microsoft YaHei' },
         { name: '方正仿宋简体_GBK', value: 'FangSong_GB2312' },
         { name: 'Arial', value: 'Arial' },
-        { name: 'Times New Roman', value: 'Times New Roman' },
-      ],
+        { name: 'Times New Roman', value: 'Times New Roman' }
+      ]
     },
     onCreated: (editor: AiEditor) => {
+      setFooter()
       stopWatchByType(WatchType.initWatch)
       watchHandlers.value[WatchType.initWatch] = watch(
         () => props.isEdit,
@@ -366,19 +374,26 @@ onMounted(() => {
           if (aiEditor) {
             aiEditor.setEditable(val)
             //头尾显隐
-            const footer = divRef.value?.querySelector('aie-footer') as HTMLElement
-            if (footer) {
-              footer.style.display = val ? '' : 'none'
-            }
+            // 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'
+              const div = header.querySelector('div') as HTMLElement
+              div.style.justifyContent = val ? '' : 'end'
+              const menuItems = header.querySelectorAll('.aie-menu-item:not(:last-child)')
+              if (menuItems.length) {
+                menuItems.forEach((item) => {
+                  item.style.display = val ? '' : 'none'
+                })
+              }
             }
           }
         },
-        { immediate: true },
+        { immediate: true }
       )
-    },
+    }
   }
   // 隐藏工具栏
   if (!props.showToolbar) {
@@ -386,23 +401,21 @@ onMounted(() => {
   }
   setTimeout(() => {
     aiEditor = new AiEditor(config)
-    setTimeout(() => {
-      //当隐藏工具栏时，也隐藏 aie-footer/aie-header 元素
-      if (!props.showToolbar || props.editorConfig?.editable === false) {
-        const footer = divRef.value?.querySelector('aie-footer') as HTMLElement
-        if (footer) {
-          footer.style.display = 'none'
-        }
-        const header = divRef.value?.querySelector('aie-header') as HTMLElement
-        if (header) {
-          header.style.display = 'none'
-        }
-      }
-      setFooter()
-    }, 100)
   }, 100)
 })
-
+onActivated(()=>{
+  const header = divRef.value?.querySelector('aie-header') as HTMLElement
+  if (header) {
+    const div = header.querySelector('div') as HTMLElement
+    div.style.justifyContent = props.isEdit ? '' : 'end'
+    const menuItems = header.querySelectorAll('.aie-menu-item:not(:last-child)')
+    if (menuItems.length) {
+      menuItems.forEach((item) => {
+        item.style.display = props.isEdit ? '' : 'none'
+      })
+    }
+  }
+})
 const setFooter = () => {
   const footer = divRef.value?.querySelector('aie-footer') as HTMLElement
   if (footer) {
@@ -410,7 +423,7 @@ const setFooter = () => {
     if (footerSpan && footerSpan.textContent) {
       footerSpan.textContent = footerSpan.textContent.replace(
         'Powered by AiEditor, Characters',
-        '字数',
+        '字数'
       )
     }
   }
@@ -439,7 +452,7 @@ defineExpose({
     if (aiEditor) {
       aiEditor.setContent(initHtml(html), focus)
     }
-  },
+  }
 })
 </script>
 <style scoped lang="scss">
@@ -448,6 +461,7 @@ defineExpose({
     border-width: v-bind(borderWidth);
     border-color: #dcdfe6;
   }
+
   .aie-content {
     p {
       margin: 6px 0;

package/src/components/Search/ElIconSearch.vue

@@ -75,7 +75,7 @@
           ></el-icons>
         </el-flex>
       </el-flex>
-      <slot @submit.prevent ></slot>
+      <slot></slot>
       <el-flex align="flex-end" justify="flex-end" height="40px" style="border-top: var(--border)">
         <el-button @click="reset">重置</el-button>
         <el-button type="primary" @click="search">查询</el-button>