adtec-core-package 2.3.1 → 2.3.3

package/package.json

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

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -9,7 +9,7 @@
       :style="{
         height: '100%',
         width: '100%',
-        fontSize: '14px'
+        fontSize: '14px',
       }"
     />
   </el-flex>
@@ -52,120 +52,134 @@ const props = withDefaults(
     editorConfig: {},
   },
 )
-const model = defineModel({ type: String, required: true })
+const model = defineModel({
+  type: [String, null, undefined],
+  required: false,
+  default: null
+})
 const text = defineModel('text', {
   type: String,
-  required: false
+  required: false,
 })
 //字体对照表
 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 }
-];
+  { 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) {
   // 创建临时div用于解析HTML
-  const tempDiv = document.createElement('div');
-  tempDiv.innerHTML = html;
+  const tempDiv = document.createElement('div')
+  tempDiv.innerHTML = html
   // 获取所有p元素
-  const pElements = tempDiv.querySelectorAll('p');
+  const pElements = tempDiv.querySelectorAll('p')
 
-  pElements.forEach(p => {
+  pElements.forEach((p) => {
     // 检查是否有内联样式设置了fontSize
-    const hasInlineFontSize = !!p.style.fontSize;
+    const hasInlineFontSize = !!p.style.fontSize
     // 只有当没有设置字体大小时才添加
     if (!hasInlineFontSize) {
-      p.style.fontSize = '14px';
+      p.style.fontSize = '14px'
     }
-  });
+  })
   return tempDiv.innerHTML
 }
 function convertPxToPt(html: string) {
   html = setDefaultPx(html)
-  const regex = /font-size: (\d+)px/g;
+  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);
+    const px = parseInt(pxValue, 10)
+    const entry = fontSizes.find((item) => item.px === px)
     if (entry) {
-      return `font-size: ${entry.pt}pt`;
+      return `font-size: ${entry.pt}pt`
     }
-    return match;
-  });
+    return match
+  })
 }
 function convertPtToPx(html: string) {
-  const regex = /font-size: (\d+)pt/g;
+  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);
+    const pt = parseFloat(ptValue)
+    const entry = fontSizes.find((item) => item.pt === pt)
     if (entry) {
-      return `font-size: ${entry.px}px`;
+      return `font-size: ${entry.px}px`
     }
-    return match;
-  });
+    return match
+  })
 }
 //默认的配置
 const defaultConfig = {
   placeholder: '请输入内容...',
   draggable: false, // 禁止拖拽
-  toolbarExcludeKeys: ['eraser', 'link', 'code', 'attachment', 'code-block', 'video', 'ai', 'quote','emoji' ],
+  toolbarExcludeKeys: [
+    'eraser',
+    'link',
+    'code',
+    'attachment',
+    'code-block',
+    'video',
+    'ai',
+    'quote',
+    'emoji',
+  ],
   textSelectionBubbleMenu: {
     enable: true,
-    items: ["Bold", "Italic", "Underline", "Strike", "code", "comment"],
+    items: ['Bold', 'Italic', 'Underline', 'Strike', 'code', 'comment'],
   },
   image: {
     uploaderEvent: {
       onUploadBefore: (file, uploadUrl, headers) => {
         if (file.size > 2 * 1024 * 1024) {
-          ElMessage.warning("图片大小不能超过2M")
+          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:{
+  fontSize: {
     defaultValue: ' ',
-    values:[
-      {name: "小四", value: 14},
-      {name: "初号", value: 49},
-      {name: "小初", value: 42},
-      {name: "一号", value: 30},
-      {name: "小一", value: 28},
-      {name: "二号", value: 26},
-      {name: "小二", value: 21},
-      {name: "三号", value: 19},
-      {name: "小三", value: 18},
-      {name: "四号", value: 16},
-      {name: "小四", value: 14},
-      {name: "五号", value: 12},
-      {name: "小五", value: 11},
-      {name: "六号", value: 9},
-      {name: "小六", value: 8},
-      {name: "七号", value: 6},
-      {name: "八号", value: 5}
-    ]
+    values: [
+      { name: '小四', value: 14 },
+      { name: '初号', value: 49 },
+      { name: '小初', value: 42 },
+      { name: '一号', value: 30 },
+      { name: '小一', value: 28 },
+      { name: '二号', value: 26 },
+      { name: '小二', value: 21 },
+      { name: '三号', value: 19 },
+      { name: '小三', value: 18 },
+      { name: '四号', value: 16 },
+      { name: '小四', value: 14 },
+      { name: '五号', value: 12 },
+      { name: '小五', value: 11 },
+      { name: '六号', value: 9 },
+      { name: '小六', value: 8 },
+      { name: '七号', value: 6 },
+      { name: '八号', value: 5 },
+    ],
   },
   onChange: (editor: AiEditor) => {
     setFooter()
@@ -174,7 +188,7 @@ const defaultConfig = {
     setTimeout(() => {
       setContent()
     }, 200)
-  }
+  },
 }
 
 /**
@@ -191,72 +205,82 @@ function setContent() {
  * @param html
  */
 function removeAllFontFamilyStyles(html: string): string {
-  const tempDiv = document.createElement('div');
-  tempDiv.innerHTML = html;
+  const tempDiv = document.createElement('div')
+  tempDiv.innerHTML = html
 
   function processElement(element: Element) {
     if (element.hasAttribute('style')) {
-      let style = element.getAttribute('style') || '';
+      let style = element.getAttribute('style') || ''
       // 规范化样式字符串：确保每个属性以分号结尾
-      style = normalizeStyleString(style);
+      style = normalizeStyleString(style)
 
       // 使用简化的正则表达式移除字体相关属性（现在可以安全地假设每个属性后都有分号）
-      style = style.replace(/(?:font-family|mso-(?:ascii|hansi|bidi|fareast|east-asian|font)-font-family)\s*:\s*[^;]+;/gi, '');
+      style = style.replace(
+        /(?:font-family|mso-(?:ascii|hansi|bidi|fareast|east-asian|font)-font-family)\s*:\s*[^;]+;/gi,
+        '',
+      )
       // 清理空样式
-      style = style.trim();
+      style = style.trim()
       if (style) {
-        element.setAttribute('style', style);
+        element.setAttribute('style', style)
       } else {
-        element.removeAttribute('style');
+        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));
+      '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(element.children).forEach((child) => processElement(child))
   }
 
   // 规范化样式字符串：确保每个属性以分号结尾
   function normalizeStyleString(style: string): string {
     // 移除首尾空格
-    style = style.trim();
+    style = style.trim()
 
     // 如果样式为空，直接返回
-    if (!style) return '';
+    if (!style) return ''
 
     // 如果最后一个字符不是分号，添加分号
     if (style.charAt(style.length - 1) !== ';') {
-      style += ';';
+      style += ';'
     }
 
-    return style;
+    return style
   }
 
-  Array.from(tempDiv.children).forEach(child => processElement(child));
-  return tempDiv.innerHTML;
+  Array.from(tempDiv.children).forEach((child) => processElement(child))
+  return tempDiv.innerHTML
 }
 /**
  * 计算富文本框中图片的高度并赋值
  */
 function calcImagesHeight(html: string) {
   const map = new Map()
-  const imageElements = divRef.value.querySelectorAll('img.resize-obj');
+  const imageElements = divRef.value.querySelectorAll('img.resize-obj')
   if (imageElements.length > 0) {
     imageElements.forEach((imageElement: any) => {
-      const width = imageElement.offsetWidth;
-      const height = imageElement.offsetHeight;
+      const width = imageElement.offsetWidth
+      const height = imageElement.offsetHeight
       if (width > 1 && height > 1) {
-        map.set(imageElement.src.length > 100 ? imageElement.src.substring(0,100) : imageElement.src, height)
+        map.set(
+          imageElement.src.length > 100 ? imageElement.src.substring(0, 100) : imageElement.src,
+          height,
+        )
       }
-    });
+    })
     for (const [key, value] of map) {
       html = customStringReplacement(html, `${key}`, '>', `height="auto"`, `height="${value}"`)
     }
@@ -264,33 +288,38 @@ function calcImagesHeight(html: string) {
   return html
 }
 
-
-function customStringReplacement(str: string, startMarker: string, endMarker: string, target: string, replacement: string): string {
-  let result = "";
-  let currentIndex = 0;
+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);
+    const startIndex = str.indexOf(startMarker, currentIndex)
     if (startIndex === -1) {
-      result += str.slice(currentIndex);
-      break;
+      result += str.slice(currentIndex)
+      break
     }
 
-    const endIndex = str.indexOf(endMarker, startIndex + startMarker.length);
+    const endIndex = str.indexOf(endMarker, startIndex + startMarker.length)
     if (endIndex === -1) {
-      result += str.slice(currentIndex);
-      break;
+      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;
+    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;
+  return result
 }
 
 watch(
@@ -309,7 +338,7 @@ watch(
       }
     }
   },
-  { immediate: true }
+  { immediate: true },
 )
 function initHtml(html: string) {
   html = customStringReplacement(html, '<img', '>', 'height="[0-9]+"', 'height="auto"')
@@ -319,23 +348,22 @@ function initHtml(html: string) {
 onMounted(() => {
   const config = {
     element: divRef.value as Element,
-    content: initHtml(model.value),
+    content: initHtml(model.value ?? ''),
     ...defaultConfig,
     ...props.editorConfig,
-    fontFamily:{
-      values:[
-        {name: "宋体", value: "SimSun"},
-        {name: "仿宋", value: "FangSong"},
-        {name: "黑体", value: "SimHei"},
-        {name: "楷体", value: "KaiTi"},
-        {name: "微软雅黑", value: "Microsoft YaHei"},
-        {name: "方正仿宋简体_GBK", value: "FangSong_GB2312"},
-        {name: "Arial", value: "Arial"},
-        {name: "Times New Roman", value: "Times New Roman"},
-      ]
+    fontFamily: {
+      values: [
+        { name: '宋体', value: 'SimSun' },
+        { name: '仿宋', value: 'FangSong' },
+        { name: '黑体', value: 'SimHei' },
+        { name: '楷体', value: 'KaiTi' },
+        { name: '微软雅黑', value: 'Microsoft YaHei' },
+        { name: '方正仿宋简体_GBK', value: 'FangSong_GB2312' },
+        { name: 'Arial', value: 'Arial' },
+        { name: 'Times New Roman', value: 'Times New Roman' },
+      ],
     },
-    onCreated: (editor: AiEditor) => {
-    }
+    onCreated: (editor: AiEditor) => {},
   }
   // 隐藏工具栏
   if (!props.showToolbar) {

package/src/css/elementUI/table-column.scss

@@ -6,8 +6,8 @@
 @include b(table-column) {
   @include m(selection) {
     .cell {
-      padding-left: 14px;
-      padding-right: 14px;
+      padding-left: 12px !important;
+      padding-right: 12px !important;
     }
   }
 }

package/src/css/elementUI/table.scss

@@ -190,7 +190,7 @@
     align-items: center;
     &.#{$namespace}-tooltip {
       white-space: nowrap;
-      min-width: 50px;
+      min-width: 40px;
     }
   }
 

package/src/interface/IUserPermissionVo.ts

@@ -38,4 +38,7 @@ export interface IUserPermissionVo {
   passwordExpired?: string
   isIup?: string
   roleCodes?: string[]
+  topDeptId?: string
+  mdmDeptId?: string
+  deptName?:string
 }