adtec-core-package 2.9.2 → 2.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.9.2",
+  "version": "2.9.4",
   "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/css/vxeTableUI/components/grid.scss

@@ -37,6 +37,7 @@
   }
   .vxe-grid--table-container {
     display: flex;
+    height:100%;
     flex-direction: row;
   }
   .vxe-grid--left-wrapper,

package/src/css/vxeTableUI/components/table.scss

@@ -79,6 +79,37 @@
   overflow-x: scroll;
 }
 
+/* 仅显示外层滚动条：鼠标进入表格显示，移出隐藏 */
+.vxe-table--scroll-x-handle,
+.vxe-table--scroll-y-handle {
+  scrollbar-width: none;
+  -ms-overflow-style: none;
+  &::-webkit-scrollbar {
+    width: 8px;
+    height: 8px;
+    background: transparent;
+  }
+  &::-webkit-scrollbar-thumb {
+    background: transparent;
+    border-radius: 4px;
+  }
+  &::-webkit-scrollbar-track {
+    background: transparent;
+  }
+}
+
+.vxe-table:hover {
+  .vxe-table--scroll-x-handle,
+  .vxe-table--scroll-y-handle {
+    scrollbar-width: thin;
+    scrollbar-color: #DDDEE0 transparent;
+  }
+  .vxe-table--scroll-x-handle::-webkit-scrollbar-thumb,
+  .vxe-table--scroll-y-handle::-webkit-scrollbar-thumb {
+    background: #DDDEE0;
+  }
+}
+
 .vxe-loading--custom-wrapper {
   display: none;
   position: absolute;
@@ -573,10 +604,10 @@
     }
   }
   .vxe-table--scroll-x-virtual {
-    height: 0;
+    height: 0 !important;
   }
   .vxe-table--scroll-y-virtual {
-    width: 0;
+    width: 0px !important;
   }
   .vxe-table--scroll-x-virtual,
   .vxe-table--scroll-y-virtual {
@@ -604,10 +635,10 @@
   .vxe-table--scroll-x-handle {
     overflow-y: hidden;
     overflow-x: scroll;
-    height: 18px;
+    height: 8px;
   }
   .vxe-table--scroll-x-wrapper {
-    height: 100%;
+    height: 8px;
   }
   .vxe-table--scroll-y-handle,
   .vxe-table--scroll-y-wrapper {
@@ -619,7 +650,7 @@
   .vxe-table--scroll-y-handle {
     overflow-y: scroll;
     overflow-x: hidden;
-    width: 18px;
+    width: 8px;
     height: 100%;
   }
   .vxe-table--scroll-x-space {
@@ -873,6 +904,7 @@
 
 /*table*/
 .vxe-table--render-default {
+  height:100%;
   position: relative;
   font-size: var(--vxe-ui-font-size-default);
   color: var(--vxe-ui-font-color);
@@ -893,6 +925,12 @@
     border-collapse: separate;
     table-layout: fixed;
   }
+  .vxe-table--render-wrapper{
+    height:100%;
+    .vxe-table--layout-wrapper {
+      height:100%
+    }
+  }
   &:not(.is--empty) {
     &.is--footer {
       &.is--scroll-x {
@@ -1173,7 +1211,7 @@
         &::after {
           bottom: 0;
           height: calc(100% + var(--vxe-ui-table-border-width));
-          border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
+          //border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
         }
       }
     }

package/src/interface/IUserPermissionVo.ts

@@ -39,6 +39,7 @@ export interface IUserPermissionVo {
   isIup?: string
   roleCodes?: string[]
   topDeptId?: string
+  topDeptName?: string
   mdmDeptId?: string
-  deptName?:string
+  deptName?: string
 }

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}`);
     }