adtec-core-package 2.9.1 → 2.9.3

package/package.json

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

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -26,7 +26,7 @@ enum WatchType {
 }
 
 const watchHandlers = ref<Partial<Record<WatchType, WatchStopHandle>>>({})
-
+const emit = defineEmits(['onBlur', 'onChange'])
 const divRef = ref()
 let aiEditor: AiEditor | null
 const props = withDefaults(
@@ -57,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 = [
@@ -86,7 +86,7 @@ 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) {
@@ -145,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: {
@@ -158,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: ' ',
@@ -190,17 +190,21 @@ const defaultConfig = {
       { name: '六号', value: 9 },
       { name: '小六', value: 8 },
       { name: '七号', value: 6 },
-      { name: '八号', value: 5 }
-    ]
+      { name: '八号', value: 5 },
+    ],
   },
   onChange: (editor: AiEditor) => {
+    emit('onChange', { html: editor.getHtml(), text: editor.getText() })
     setFooter()
     model.value = editor.getHtml()
     text.value = editor.getText()
     setTimeout(() => {
       setContent()
     }, 200)
-  }
+  },
+  onBlur: (editor: AiEditor) => {
+    emit('onBlur', { html: editor.getHtml(), text: editor.getText() })
+  },
 }
 
 /**
@@ -229,7 +233,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()
@@ -249,7 +253,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))
 
@@ -290,7 +294,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,
         )
       }
     })
@@ -306,7 +310,7 @@ function customStringReplacement(
   startMarker: string,
   endMarker: string,
   target: string,
-  replacement: string
+  replacement: string,
 ): string {
   let result = ''
   let currentIndex = 0
@@ -362,8 +366,8 @@ 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()
@@ -391,9 +395,9 @@ onMounted(() => {
             }
           }
         },
-        { immediate: true }
+        { immediate: true },
       )
-    }
+    },
   }
   // 隐藏工具栏
   if (!props.showToolbar) {
@@ -403,7 +407,7 @@ onMounted(() => {
     aiEditor = new AiEditor(config)
   }, 100)
 })
-onActivated(()=>{
+onActivated(() => {
   const header = divRef.value?.querySelector('aie-header') as HTMLElement
   if (header) {
     const div = header.querySelector('div') as HTMLElement
@@ -423,7 +427,7 @@ const setFooter = () => {
     if (footerSpan && footerSpan.textContent) {
       footerSpan.textContent = footerSpan.textContent.replace(
         'Powered by AiEditor, Characters',
-        '字数'
+        '字数',
       )
     }
   }
@@ -452,7 +456,7 @@ defineExpose({
     if (aiEditor) {
       aiEditor.setContent(initHtml(html), focus)
     }
-  }
+  },
 })
 </script>
 <style scoped lang="scss">

package/src/components/upload/CustomElUpload.vue

@@ -156,13 +156,6 @@ const props = defineProps({
     type: String,
     default: 'default'
   },
-  /**
-   * 文件列表
-   */
-  uploadFilesList: {
-    type: Array<ISysUploadFiles>,
-    default: () => []
-  },
   /**
    * @description 是否编辑状态
    * @default 'true'
@@ -203,14 +196,18 @@ const props = defineProps({
     default: true
   },
   showOptMessage: {
-    type:Boolean,
-    default:true
+    type: Boolean,
+    default: true
   },
   watermarkCode: {
     type: String,
     default: () => undefined
-  },
+  }
 })
+/**
+ * 文件列表
+ */
+const uploadFilesList = defineModel<ISysUploadFiles[]>('uploadFilesList', { default: [] })
 const mousemove = (fileName: string) => {
   hoverfileName.value = fileName
 }
@@ -256,7 +253,7 @@ const getIcon = (fileName: string) => {
 }
 const success = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
   if (response.code === '0') {
-    props.uploadFilesList.push(response.data as ISysUploadFiles)
+    uploadFilesList.value.push(response.data as ISysUploadFiles)
   } else {
     ElMessage.error(response.msg)
     ref_upload.value?.handleRemove(uploadFile)
@@ -268,7 +265,7 @@ const success = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles
   }
   if (response.code === '0') {
     props.showOptMessage && ElMessage.success('上传成功')
-    emit('success', { files: props.uploadFilesList, deleteFiles: deleteFiles.value })
+    emit('success', { files: uploadFilesList.value, deleteFiles: deleteFiles.value })
   }
   loading.value = false
 }
@@ -293,7 +290,7 @@ const hasPendingFiles = computed(() => {
 //   { deep: true }
 // )
 const beforeUpload = async (file: File) => {
-  const f = props.uploadFilesList.find((c) => c.name === file.name)
+  const f = uploadFilesList.value.find((c) => c.name === file.name)
   if (f) {
     ElMessage.warning(file.name + ',文件已存在')
     return false
@@ -341,8 +338,8 @@ const handleFileChange = (file, newFileList) => {
 }
 // 处理覆盖逻辑
 const exceed = async (files: File[], uploadFiles: UploadUserFile[]) => {
-  if (props.limit === 1 && props.overwrite && props.uploadFilesList.length >= 1) {
-    const existingFile = props.uploadFilesList[0]
+  if (props.limit === 1 && props.overwrite && uploadFilesList.value.length >= 1) {
+    const existingFile = uploadFilesList.value[0]
     if (!props.isConfirmDelete) {
       const flag = await ElMessageBox.confirm('只允许上传一个附件，是否点击确定覆盖原有附件？', '提示', {
         confirmButtonText: '确定',
@@ -364,7 +361,7 @@ const exceed = async (files: File[], uploadFiles: UploadUserFile[]) => {
         loading.value = false
       }
     }
-    props.uploadFilesList.splice(0, 1)
+    uploadFilesList.value = []
     ref_upload.value?.clearFiles()
     if (files.length > 0) {
       const canUpload = await beforeUpload(files[0])
@@ -373,7 +370,7 @@ const exceed = async (files: File[], uploadFiles: UploadUserFile[]) => {
         ref_upload.value?.handleStart(files[0])
         props.autoUpload && ref_upload.value?.submit()
       } else {
-        props.uploadFilesList.push(existingFile)
+        uploadFilesList.value.push(existingFile)
       }
     }
   } else {
@@ -390,7 +387,7 @@ const error = (error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles) =
   loading.value = false
 }
 const preview = async (uploadFile: UploadFile) => {
-  const file = props.uploadFilesList.find((c) => c.name === uploadFile.name)
+  const file = uploadFilesList.value.find((c) => c.name === uploadFile.name)
   if (file) {
     //if ((uploadFile.response as any).code === '0') {
     // const data = (uploadFile.response as any).data as ISysUploadFiles
@@ -400,13 +397,13 @@ const preview = async (uploadFile: UploadFile) => {
 const remove = async (file: UploadFile, isConfirm: boolean = true) => {
   // if ((file.response as any).code === '0') {
   // const data = (file.response as any).data as ISysUploadFiles
-  const find = props.uploadFilesList.find((c) => c.name === file.name)
+  const find = uploadFilesList.value.find((c) => c.name === file.name)
   if (find) {
     try {
       if (!isConfirm && !props.isConfirmDelete) {
         await documentApi.delSysUploadFile(find.id)
       }
-      props.uploadFilesList.splice(props.uploadFilesList.indexOf(find), 1)
+      uploadFilesList.value.splice(uploadFilesList.value.indexOf(find), 1)
       deleteFiles.value.push(find)
     } catch (err: any) {
       frameworkUtils.messageError(err)
@@ -417,7 +414,7 @@ const remove = async (file: UploadFile, isConfirm: boolean = true) => {
 const progress = (event: { percent: number }, file: UploadFile) => {
   loading.value = true
 }
-const confirm = async (autoDelete: boolean=true) => {
+const confirm = async (autoDelete: boolean = true) => {
   try {
     loading.value = true
     if (props.isConfirmDelete && deleteFiles.value.length > 0 && autoDelete) {
@@ -429,7 +426,7 @@ const confirm = async (autoDelete: boolean=true) => {
         ref_upload.value?.submit()
       } else {
         props.showOptMessage && ElMessage.success('操作成功')
-        emit('success', { files: props.uploadFilesList, deleteFiles: deleteFiles.value })
+        emit('success', { files: uploadFilesList.value, deleteFiles: deleteFiles.value })
       }
     }
   } catch (err: any) {

package/src/utils/commonUtils.ts

@@ -316,7 +316,17 @@ export default {
           return x >= a && x < b;
         }
       }
-
+      if (rule.includes('≤x≤')) {
+        const match = rule.match(/^([+-]?\d+(\.\d+)?)≤x≤([+-]?\d+(\.\d+)?)$/);
+        if (match) {
+          const a = parseFloat(match[1]);
+          const b = parseFloat(match[3]);
+          if (isNaN(a) || isNaN(b)) {
+            throw new Error(`Invalid rule values: ${match[1]} or ${match[3]}`);
+          }
+          return x >= a && x <= b;
+        }
+      }
     } catch (error) {
       throw new Error(`Rule parsing error: ${(error as Error).message}`);
     }