paas-component-library 1.1.2 → 1.1.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "paas-component-library",
   "private": false,
-  "version": "1.1.2",
+  "version": "1.1.4",
   "type": "module",
   "files": [
     "dist",
@@ -32,7 +32,6 @@
     "./PaasUploadModal": "./src/components/PaasUploadModal/index.vue",
     "./PaasUpload": "./src/components/PaasUpload/index.vue",
     "./PaasEditor": "./src/components/PaasEditor/index.vue",
-    "./PaasMdEditor": "./src/components/PaasMdEditor/index.vue",
     "./PaasTreePanel": "./src/components/PaasTreePanel/index.vue",
     "./PaasIcon": "./src/components/PaasIcon/index.vue",
     "./PaasForm": "./src/components/PaasForm/index.vue",
@@ -74,12 +73,6 @@
     "@codemirror/state": "^6.5.3",
     "@codemirror/theme-one-dark": "^6.1.3",
     "@codemirror/view": "^6.39.8",
-    "@toast-ui/editor-plugin-chart": "^3.0.1",
-    "@toast-ui/editor-plugin-code-syntax-highlight": "^3.1.0",
-    "@toast-ui/editor-plugin-color-syntax": "^3.1.0",
-    "@toast-ui/editor-plugin-table-merged-cell": "^3.1.0",
-    "@toast-ui/editor-plugin-uml": "^3.0.1",
-    "@toast-ui/vue-editor": "^3",
     "@vueup/vue-quill": "^1.2.0",
     "ant-design-vue": "4.x",
     "axios": "^1.7.7",

package/src/components/MentionInput/index.vue

@@ -434,7 +434,7 @@ export default {
       }
 
       // 创建完整的路径值和标签
-      const fullValue = this.SAVE_SYMBOL + this.currentPathValues.join('.');
+      const fullValue = '${' + this.currentPathValues.join('.') + '}';
       const fullLabel = this.currentPathLabels.join('/');
 
       // 在当前位置插入标签（只在后方添加空格）
@@ -487,8 +487,8 @@ export default {
         const spaceAfter = document.createTextNode(' ');
         mentionEl.parentNode?.insertBefore(spaceAfter, mentionEl.nextSibling);
 
-        // 在标签后插入零宽字符作为光标位置
-        const cursorMarker = document.createTextNode('\u200B');
+        // 在标签后插入空格作为光标位置
+        const cursorMarker = document.createTextNode(' ');
         mentionEl.parentNode?.insertBefore(cursorMarker, spaceAfter.nextSibling);
 
         // 设置光标位置
@@ -505,8 +505,8 @@ export default {
         // 如果出现索引错误，使用替代方案
         console.error("Error inserting mention tag:", e);
 
-        // 创建零宽字符用于光标定位
-        const cursorMarker = document.createTextNode('\u200B');
+        // 创建空格用于光标定位
+        const cursorMarker = document.createTextNode(' ');
 
         // 直接在光标位置插入整个HTML片段
         const fragment = document.createDocumentFragment();
@@ -516,7 +516,7 @@ export default {
         range.deleteContents();
         range.insertNode(fragment);
 
-        // 设置光标到零宽字符位置
+        // 设置光标到空格位置
         const selection = window.getSelection();
         if (selection) {
           const cursorRange = document.createRange();
@@ -574,7 +574,7 @@ export default {
           const text = textNode.textContent || '';
           if (startOffset <= text.length) {
             const prevChar = text[startOffset - 1];
-            if (prevChar === '\u200B') { // 零宽字符，通常在标签后
+            if (prevChar === ' ') { // 空格字符，光标位置标记
               // 检查前一个节点是否是标签
               const prevNode = textNode.previousSibling;
               if (prevNode && prevNode.classList && prevNode.classList.contains('mention-tag')) {
@@ -798,7 +798,7 @@ export default {
         }
       } else if (target.classList.contains('mention-tag')) {
         // 如果点击标签本身，将光标移到标签后
-        const cursorMarker = document.createTextNode('\u200B');
+        const cursorMarker = document.createTextNode(' ');
         target.parentNode?.insertBefore(cursorMarker, target.nextSibling);
 
         const newRange = document.createRange();
@@ -825,11 +825,8 @@ export default {
         let remainingText = value;
         let lastIndex = 0;
 
-        // 匹配 自定义符号后跟着标识符格式
-        // 表达式以 $ 开头，以空格或字符串结尾
-        // 支持格式：$aaa, $aaa.bbb, $xxx-bbb, $aaa_bb, $user_name.first-name 等
-        // 支持任意非空白字符（包括字母、数字、符号、中文、-、_ 等）
-        const mentionRegex = new RegExp(`\\${this.SAVE_SYMBOL}[^\\s]+(?=\\s|$)`, 'g');
+        // 匹配 ${xxx.xxx.xxx} 格式
+        const mentionRegex = /\$\{[^\}]+\}/g;
         let match;
 
         while ((match = mentionRegex.exec(remainingText)) !== null) {
@@ -841,7 +838,7 @@ export default {
 
           // 创建标签
           const fullMatch = match[0];
-          const pathWithoutPrefix = fullMatch.substring(this.SAVE_SYMBOL.length); // 移除保存符号
+          const pathWithoutPrefix = fullMatch.substring(2, fullMatch.length - 1); // 移除 ${ 和 }
 
           // 从路径到名称的映射中获取标签名称
           let label = this.pathToNameMap.get(pathWithoutPrefix) || pathWithoutPrefix;
@@ -861,8 +858,8 @@ export default {
           htmlContent += this.convertTextToHtml(remaining);
         }
 
-        // 在末尾添加零宽字符作为光标位置
-        htmlContent += '\u200B';
+        // 在末尾添加空格作为光标位置
+        htmlContent += ' ';
 
         // 将换行符转换为 <br> 标签以便在 contenteditable 中正确显示
         this.inputRef.innerHTML = htmlContent.replace(/\n/g, '<br>');

package/src/components/index.js

@@ -2,14 +2,6 @@ import './style.css';
 
 import '@vueup/vue-quill/dist/vue-quill.snow.css';
 
-import '@toast-ui/chart/dist/toastui-chart.css';
-import 'tui-color-picker/dist/tui-color-picker.css';
-
-import '@toast-ui/editor-plugin-code-syntax-highlight/dist/toastui-editor-plugin-code-syntax-highlight.css';
-import '@toast-ui/editor-plugin-color-syntax/dist/toastui-editor-plugin-color-syntax.css';
-import '@toast-ui/editor-plugin-table-merged-cell/dist/toastui-editor-plugin-table-merged-cell.css';
-import '@toast-ui/editor/dist/toastui-editor.css';
-
 import PaasDate from "./PaasDate/index.vue";
 import PaasMenu from "./PaasMenu/index.vue";
 import MentionInput from "./MentionInput/index.vue";
@@ -31,7 +23,6 @@ import FormTextarea from "./form/FormTextarea/index.vue";
 import FormRadio from "./form/FormRadio/index.vue";
 import FormCheckbox from "./form/FormCheckbox/index.vue";
 import PaasEditor from "./PaasEditor/index.vue";
-import PaasMdEditor from "./PaasMdEditor/index.vue";
 import PaasTreePanel from "./PaasTreePanel/index.vue";
 import PaasIcon from "./PaasIcon/index.vue";
 import PaasCodeEditor from "./PaasCodeEditor/index.vue";
@@ -68,7 +59,6 @@ const component = [
     FormDateRange,
     PaasUpload,
     PaasEditor,
-    PaasMdEditor,
     PaasTreePanel,
     PaasForm,
     FormTextarea,
@@ -118,7 +108,6 @@ export {
     FormDateRange,
     PaasUpload,
     PaasEditor,
-    PaasMdEditor,
     PaasTreePanel,
     PaasForm,
     FormTextarea,

package/src/components/PaasMdEditor/index.vue

@@ -1,89 +0,0 @@
-<template>
-    <div ref="editorRef"></div>
-</template>
-
-<script>
-import '@toast-ui/editor/dist/i18n/zh-cn';
-import Editor from '@toast-ui/editor';
-
-//uml插件
-import uml from '@toast-ui/editor-plugin-uml';
-//代码高亮插件
-import codeSyntaxHighlight from '@toast-ui/editor-plugin-code-syntax-highlight';
-//图表插件
-import chart from '@toast-ui/editor-plugin-chart';
-//文本颜色选择插件
-import colorSyntax from '@toast-ui/editor-plugin-color-syntax';
-//表格合并插件
-import tableMergedCell from '@toast-ui/editor-plugin-table-merged-cell';
-
-export default {
-    name: 'PaasMdEditor',
-    computed: {
-        see() {
-            return this.$store?.forms?.see || false;
-        }
-    },
-    props: {
-        height: {
-            type: String,
-            default: '55vh'
-        },
-        modelValue: {
-            type: String,
-            default: ''
-        }
-    },
-    emits: ['update:modelValue'],
-    data() {
-        return {
-            editorInstance: null,
-            hostname: window.location.protocol + '//' + window.location.host,
-        };
-    },
-    mounted() {
-        const editorContainer = this.$refs.editorRef;
-        let markdown = '';
-        if (this.modelValue) {
-            markdown = this.modelValue.replace("$hostname", this.hostname);
-        }
-        this.editorInstance = new Editor({
-            el: editorContainer,
-            height: this.height,
-            previewStyle: 'vertical',
-            initialEditType: 'wysiwyg',
-            initialValue: markdown,
-            language: 'zh-CN',
-            usageStatistics: false,
-            readOnly: this.see,
-            plugins: this.see ? [] : [codeSyntaxHighlight, chart, uml, colorSyntax, tableMergedCell],
-            hooks: this.see ? {} : {
-                addImageBlobHook: async (blob, callback) => {
-                    let url;
-                    const uploadUrl = "/system/open/minio/image/uploadFile";
-                    const formData = new FormData();
-                    formData.append('file', blob, blob.name || 'image.png');
-                    let res = await this.$upload(uploadUrl, formData);
-                    if (res.data.code == this.$success) {
-                        this.$message.success(res.data.msg);
-                        url = res.data.data.newName;
-                    }
-                    callback(this.hostname + '/system/open/minio/preview?filename=' + url, blob.name || '图片');
-                }
-            }
-        });
-
-        this.editorInstance.on('change', () => {
-            let markdown = this.editorInstance.getMarkdown();
-
-            markdown = markdown.replace(this.hostname, "$hostname");
-            if (markdown !== this.modelValue) {
-                this.$emit('update:modelValue', markdown);
-            }
-        });
-    },
-    beforeDestroy() {
-        this.editorInstance && this.editorInstance.destroy();
-    }
-};
-</script>