From a7725c7e7112b0613f576f3c647b703050621a0a Mon Sep 17 00:00:00 2001
From: wangshaoping <wspsc@163.com>
Date: Fri, 13 Sep 2024 22:02:05 +0800
Subject: [PATCH] update

---
 build.gradle                                  |   1 +
 erm.frontend/package.json                     |   2 +-
 gradle.properties                             |   2 +-
 io.sc.engine.mv.frontend/package.json         |   2 +-
 io.sc.engine.rule.frontend/package.json       |   2 +-
 io.sc.engine.st.frontend/package.json         |   2 +-
 io.sc.platform.core.frontend/package.json     |   2 +-
 .../components/code-mirror/WCodeMirror.vue    | 185 ++++++++----------
 .../testcase/code-mirror/code-mirror.vue      |   8 +-
 .../template-project/package.json             |   4 +-
 .../testcase/code-mirror/code-mirror.vue      |   8 +-
 .../package.json                              |   2 +-
 io.sc.platform.lcdp.frontend/package.json     |   2 +-
 io.sc.platform.mvc.frontend/package.json      |   2 +-
 .../package.json                              |   2 +-
 io.sc.platform.system.frontend/package.json   |   2 +-
 io.sc.standard.frontend/package.json          |   2 +-
 17 files changed, 109 insertions(+), 121 deletions(-)

diff --git a/build.gradle b/build.gradle
index 649df4c2..65f2d8f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -699,6 +699,7 @@ subprojects {
     idea {
         module {
             excludeDirs += file('node_modules')
+            excludeDirs += file('dist')
         }
     }
 }
diff --git a/erm.frontend/package.json b/erm.frontend/package.json
index f2257ffa..c02d1864 100644
--- a/erm.frontend/package.json
+++ b/erm.frontend/package.json
@@ -92,7 +92,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.2.2",
-    "platform-core": "8.1.334",
+    "platform-core": "8.1.335",
     "quasar": "2.16.11",
     "tailwindcss": "3.4.10",
     "vue": "3.5.4",
diff --git a/gradle.properties b/gradle.properties
index 4990067d..b885a67e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -38,7 +38,7 @@ application_version=1.0.0
 platform_group=io.sc
 platform_version=8.1.48
 platform_plugin_version=8.1.48
-platform_core_frontend_version=8.1.334
+platform_core_frontend_version=8.1.335
 
 ###########################################################
 # dependencies version
diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json
index 1a95977f..51c276a1 100644
--- a/io.sc.engine.mv.frontend/package.json
+++ b/io.sc.engine.mv.frontend/package.json
@@ -92,7 +92,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.2.2",
-    "platform-core": "8.1.334",
+    "platform-core": "8.1.335",
     "quasar": "2.16.11",
     "tailwindcss": "3.4.10",
     "vue": "3.5.4",
diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json
index 8507cc61..0a7af54f 100644
--- a/io.sc.engine.rule.frontend/package.json
+++ b/io.sc.engine.rule.frontend/package.json
@@ -92,7 +92,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.2.2",
-    "platform-core": "8.1.334",
+    "platform-core": "8.1.335",
     "quasar": "2.16.11",
     "tailwindcss": "3.4.10",
     "vue": "3.5.4",
diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json
index 40f66139..ba4582c4 100644
--- a/io.sc.engine.st.frontend/package.json
+++ b/io.sc.engine.st.frontend/package.json
@@ -92,7 +92,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.2.2",
-    "platform-core": "8.1.334",
+    "platform-core": "8.1.335",
     "quasar": "2.16.11",
     "tailwindcss": "3.4.10",
     "vue": "3.5.4",
diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json
index c36f60ed..24154358 100644
--- a/io.sc.platform.core.frontend/package.json
+++ b/io.sc.platform.core.frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "platform-core",
-  "version": "8.1.334",
+  "version": "8.1.335",
   "description": "前端核心包,用于快速构建前端的脚手架",
   "//main": "库的主文件",
   "main": "dist/platform-core.js",
diff --git a/io.sc.platform.core.frontend/src/platform/components/code-mirror/WCodeMirror.vue b/io.sc.platform.core.frontend/src/platform/components/code-mirror/WCodeMirror.vue
index 02bcff6a..3a27a34f 100644
--- a/io.sc.platform.core.frontend/src/platform/components/code-mirror/WCodeMirror.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/code-mirror/WCodeMirror.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-show="fieldMethodsClass.getShow(props, modelValue)">
+  <div v-show="fieldMethods.getShow(props, modelValue)">
     <q-field
       ref="fieldRef"
       v-model="modelValue"
@@ -9,23 +9,16 @@
       :dense="true"
       v-bind="attrs"
       style="position: relative"
-      :rules="fieldMethodsClass.getRules(props, modelValue, fieldRef, undefined)"
-      :readonly="fieldMethodsClass.getReadOnly(props, modelValue)"
-      :disable="fieldMethodsClass.getDisable(props, modelValue)"
-      @focus.stop.prevent="focus"
-      @blur.stop.prevent="blur"
+      :rules="fieldMethods.getRules(props, modelValue, fieldRef, undefined)"
+      :readonly="fieldMethods.getReadOnly(props, modelValue)"
+      :disable="fieldMethods.getDisable(props, modelValue)"
     >
-      <template #label><w-label :required="fieldMethodsClass.getRequired(props, modelValue)" :label="attrs.label"></w-label></template>
+      <template #label><w-label :required="fieldMethods.getRequired(props, modelValue)" :label="attrs.label"></w-label></template>
       <template #control>
         <div v-if="editable && toolbar" class="w-full pt-2 border-b border-b-gray-200">
           <Toolbar :source-code-editor="editorView" :user-defined-functions="userDefinedFunctions"></Toolbar>
         </div>
-        <div
-          ref="codemirrorRef"
-          :style="`width:100%; padding-top: ${lineNumber ? 4 : 2}px; overflow: auto;`"
-          @focus.stop.prevent="() => {}"
-          @click.stop.prevent="() => {}"
-        ></div>
+        <div ref="codemirrorContainerRef" :style="`width:100%; padding-top: ${lineNumber ? 4 : 2}px; overflow: auto;`"></div>
       </template>
       <template v-if="!Tools.isEmpty(modelValue) && attrs.button" #append>
         <q-btn
@@ -57,12 +50,12 @@ import * as search from '@codemirror/search';
 import * as autocomplete from '@codemirror/autocomplete';
 
 import { LanguageSupport } from '@codemirror/language';
-import { html, htmlLanguage } from '@codemirror/lang-html';
-import { java, javaLanguage } from '@codemirror/lang-java';
-import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
-import { json, jsonLanguage } from '@codemirror/lang-json';
+import { html } from '@codemirror/lang-html';
+import { java } from '@codemirror/lang-java';
+import { javascript } from '@codemirror/lang-javascript';
+import { json } from '@codemirror/lang-json';
 import { sql } from '@codemirror/lang-sql';
-import { xml, xmlLanguage } from '@codemirror/lang-xml';
+import { xml } from '@codemirror/lang-xml';
 
 import PlaceholderPlugin from './w-code-mirror/PlaceholderPlugin';
 import Toolbar from '@/platform/components/math/toolbar/Toolbar.vue';
@@ -71,9 +64,10 @@ import { FormFieldProps } from '@/platform/components/form/FormField.ts';
 import { FormFieldMethods } from '../form/FormField';
 
 const fieldRef = ref();
-const codemirrorRef = ref();
+const codemirrorContainerRef = ref();
 const attrs = useAttrs();
 const modelValue = defineModel<string>();
+let editorView = null;
 
 interface FieldProps extends FormFieldProps {
   // 语言
@@ -100,8 +94,11 @@ interface FieldProps extends FormFieldProps {
   lineBreak?: boolean;
   // 是否开启变量替换
   placeholder?: boolean;
+  // 自动完成函数
   autoCompletion?: () => void;
+  // 用户自定义函数
   userDefinedFunctions?: Array<() => void>;
+  //
   activateOnCompletion?: () => void;
 }
 const props = withDefaults(defineProps<FieldProps>(), {
@@ -143,16 +140,14 @@ class FieldMethods extends FormFieldMethods {
     return editorView.state.doc.toString();
   };
   clearValue = () => {
-    modelValue.value = undefined;
+    modelValue.value = '';
   };
 }
-const fieldMethodsClass = new FieldMethods();
+const fieldMethods = new FieldMethods();
 
 const basicSetup = [
   EditorState.allowMultipleSelections.of(true),
 
-  //view.lineNumbers(),
-  //view.highlightActiveLine(),
   view.highlightActiveLineGutter(),
   view.highlightSpecialChars(),
   view.drawSelection(),
@@ -162,13 +157,10 @@ const basicSetup = [
 
   commands.history(),
 
-  //language.foldGutter(),
   language.indentOnInput(),
   language.syntaxHighlighting(language.defaultHighlightStyle, { fallback: true }),
   language.bracketMatching(),
 
-  //search.highlightSelectionMatches(),
-
   view.keymap.of([
     ...commands.defaultKeymap,
     ...commands.historyKeymap,
@@ -200,9 +192,14 @@ const getLanguage = (lang: string): LanguageSupport => {
   }
 };
 
-let editorView;
-let isFocus = false;
+// 配置编辑器的特性
+// 是否可编辑
+basicSetup.push(EditorView.editable.of(props.editable));
 
+if (props.lineWrap) {
+  // 自动换行
+  basicSetup.push(EditorView.lineWrapping);
+}
 if (props.lineNumber) {
   // 行号
   basicSetup.push(view.lineNumbers());
@@ -219,87 +216,77 @@ if (props.placeholder) {
   basicSetup.push(PlaceholderPlugin);
 }
 
-if (props.lineWrap) {
-  basicSetup.push(EditorView.lineWrapping);
-}
-
-// 是否可编辑
-basicSetup.push(EditorView.editable.of(props.editable));
-
 onMounted(() => {
-  if (codemirrorRef.value) {
-    let language = new Compartment();
-    let tabSize = new Compartment();
-    editorView = new EditorView({
-      extensions: [
-        basicSetup,
-        language.of(getLanguage(props.lang)),
-        tabSize.of(EditorState.tabSize.of(props.tabSize)),
-        EditorState.readOnly.of(fieldMethodsClass.getReadOnly(props, modelValue.value)),
-        EditorView.theme({
-          '&': {
-            outline: 'none !important',
-            width: Tools.px(props.width),
-            height: props.height ? Tools.px(props.height) : props.rows * 20 + (props.lineNumber ? 8 : 6) + 'px',
-          },
-          '.cm-content': {
-            'line-height': props.lineHeight + 'px',
-          },
-        }),
+  let language = new Compartment();
+  let tabSize = new Compartment();
+  editorView = new EditorView({
+    extensions: [
+      // 基本安装
+      basicSetup,
+      // 语言
+      language.of(getLanguage(props.lang)),
+      // tab size
+      tabSize.of(EditorState.tabSize.of(props.tabSize)),
+      // 只读
+      EditorState.readOnly.of(fieldMethods.getReadOnly(props, modelValue.value)),
+      // 主题
+      EditorView.theme({
+        '&': {
+          outline: 'none !important',
+          width: Tools.px(props.width),
+          height: props.height ? Tools.px(props.height) : props.rows * 20 + (props.lineNumber ? 8 : 6) + 'px',
+        },
+        '.cm-content': {
+          'line-height': props.lineHeight + 'px',
+        },
+      }),
 
-        // 以下代码可以添加内容变化后的操作, 为避免重复操作, 更新操作放到 blur 方法中了
-        EditorView.updateListener.of(function (e) {
-          // emits('update:modelValue', e.state.doc.toString());
+      // 事件监听
+      EditorView.updateListener.of((e) => {
+        // 如果文档内容发生变化时
+        if (e.docChanged) {
           let content = e.state.doc.toString();
+          // 如果不允许换行, 则将回车换行替换掉
           if (!props.lineBreak) {
             content = content?.replace(/[\r\n]/g, '');
           }
-          if (content !== modelValue.value) {
-            fieldMethodsClass.updateValue(content);
+          // 如果开启变量替换
+          if (props.placeholder) {
+            const reg = /\$\{(.+?)\}\.\$\{(.+?)\}/g;
+            while (reg.test(content)) {
+              content = content.replace(reg, '${$1.$2}');
+            }
           }
-          //updateModelValue(content);
-        }),
-      ],
-      parent: codemirrorRef.value,
-      doc: modelValue.value,
-    });
-    watch(
-      () => modelValue.value,
-      () => {
-        // 当未获得焦点时,更新变更, 当获得焦点时不能更新
-        if (!isFocus) {
-          let content = modelValue.value;
-          if (!props.lineBreak && !Tools.isEmpty(content)) {
-            content = content.replace(/[\r\n]/g, '');
-          }
-          editorView.dispatch({ changes: { from: 0, to: editorView.state.doc.length, insert: content } });
+          // 更新表单字段的模型值
+          modelValue.value = content;
         }
-      },
-    );
-  }
+      }),
+    ],
+    parent: codemirrorContainerRef.value,
+    // 内容
+    doc: modelValue.value,
+  });
+
+  watch(
+    () => modelValue.value,
+    () => {
+      // 如果当前没有处于编辑状态时, 需要更新编辑器的内容, 以便外部更新内容后能够在编辑器中保持一致
+      // 如果当前正处于编辑状态时, 不需要更新编辑器的内容,
+      if (!editorView.hasFocus) {
+        let content = modelValue.value;
+        if (!props.lineBreak && !Tools.isEmpty(content)) {
+          content = content.replace(/[\r\n]/g, '');
+        }
+        editorView.dispatch({ changes: { from: 0, to: editorView.state.doc.length, insert: content } });
+      }
+    },
+  );
 });
 
 onUnmounted(() => {
   editorView.destroy();
 });
 
-const focus = () => {
-  isFocus = true;
-};
-
-const blur = () => {
-  isFocus = false;
-  let content = editorView.state.doc.toString();
-  if (Tools.isUndefinedOrNull(content) || content === modelValue.value) {
-    return;
-  }
-  const reg = /\$\{(.+?)\}\.\$\{(.+?)\}/g;
-  while (reg.test(content)) {
-    content = content.replace(reg, '${$1.$2}');
-  }
-  modelValue.value = content;
-};
-
 const configure = (values) => {
   editorView.dispatch({ effects: StateEffect.reconfigure.of(values) });
 };
@@ -314,10 +301,10 @@ const buttonClick = (button) => {
 };
 
 defineExpose({
-  validate: fieldMethodsClass.validate,
-  setValue: fieldMethodsClass.setValue,
-  getValue: fieldMethodsClass.getValue,
-  clearValue: fieldMethodsClass.clearValue,
+  validate: fieldMethods.validate,
+  setValue: fieldMethods.setValue,
+  getValue: fieldMethods.getValue,
+  clearValue: fieldMethods.clearValue,
   configure,
 });
 </script>
diff --git a/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue b/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue
index 0f789965..539b7452 100644
--- a/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue
+++ b/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue
@@ -16,10 +16,10 @@ import { AutoCompletionManager } from './AutoCompletionManager';
 import { AutoCompletionManager2 } from './AutoCompletionManager2';
 
 const autoCompletionManager = new AutoCompletionManager();
-axios.get(Environment.apiContextPath('/api/re/common/listParameterAndValueTypeByIndicatorId/bc8add2e-df95-44f3-96f5-e9d106a48729')).then((response) => {
-  autoCompletionManager.setParameters(response.data.parameters);
-  autoCompletionManager.setValueTypes(response.data.valueTypes);
-});
+// axios.get(Environment.apiContextPath('/api/re/common/listParameterAndValueTypeByIndicatorId/bc8add2e-df95-44f3-96f5-e9d106a48729')).then((response) => {
+//   autoCompletionManager.setParameters(response.data.parameters);
+//   autoCompletionManager.setValueTypes(response.data.valueTypes);
+// });
 
 const autoCompletion = (context) => {
   return autoCompletionManager.autoCompletion(context);
diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json
index cd427722..adcdfc77 100644
--- a/io.sc.platform.core.frontend/template-project/package.json
+++ b/io.sc.platform.core.frontend/template-project/package.json
@@ -1,6 +1,6 @@
 {
   "name": "platform-core",
-  "version": "8.1.334",
+  "version": "8.1.335",
   "description": "前端核心包,用于快速构建前端的脚手架",
   "private": false,
   "keywords": [],
@@ -105,7 +105,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.2.2",
-    "platform-core": "8.1.334",
+    "platform-core": "8.1.335",
     "quasar": "2.16.11",
     "svg-path-commander": "2.0.10",
     "tailwindcss": "3.4.10",
diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/code-mirror.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/code-mirror.vue
index 0f789965..539b7452 100644
--- a/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/code-mirror.vue
+++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/code-mirror.vue
@@ -16,10 +16,10 @@ import { AutoCompletionManager } from './AutoCompletionManager';
 import { AutoCompletionManager2 } from './AutoCompletionManager2';
 
 const autoCompletionManager = new AutoCompletionManager();
-axios.get(Environment.apiContextPath('/api/re/common/listParameterAndValueTypeByIndicatorId/bc8add2e-df95-44f3-96f5-e9d106a48729')).then((response) => {
-  autoCompletionManager.setParameters(response.data.parameters);
-  autoCompletionManager.setValueTypes(response.data.valueTypes);
-});
+// axios.get(Environment.apiContextPath('/api/re/common/listParameterAndValueTypeByIndicatorId/bc8add2e-df95-44f3-96f5-e9d106a48729')).then((response) => {
+//   autoCompletionManager.setParameters(response.data.parameters);
+//   autoCompletionManager.setValueTypes(response.data.valueTypes);
+// });
 
 const autoCompletion = (context) => {
   return autoCompletionManager.autoCompletion(context);
diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json
index f65c0467..232e1c4c 100644
--- a/io.sc.platform.developer.frontend/package.json
+++ b/io.sc.platform.developer.frontend/package.json
@@ -92,7 +92,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.2.2",
-    "platform-core": "8.1.334",
+    "platform-core": "8.1.335",
     "quasar": "2.16.11",
     "svg-path-commander": "2.0.10",
     "tailwindcss": "3.4.10",
diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json
index 00815c9a..542ebe94 100644
--- a/io.sc.platform.lcdp.frontend/package.json
+++ b/io.sc.platform.lcdp.frontend/package.json
@@ -92,7 +92,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.2.2",
-    "platform-core": "8.1.334",
+    "platform-core": "8.1.335",
     "quasar": "2.16.11",
     "tailwindcss": "3.4.10",
     "vue": "3.5.4",
diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json
index 683d25d3..badcaae5 100644
--- a/io.sc.platform.mvc.frontend/package.json
+++ b/io.sc.platform.mvc.frontend/package.json
@@ -92,7 +92,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.2.2",
-    "platform-core": "8.1.334",
+    "platform-core": "8.1.335",
     "quasar": "2.16.11",
     "tailwindcss": "3.4.10",
     "vue": "3.5.4",
diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json
index 55e4b2db..2ab7b86f 100644
--- a/io.sc.platform.scheduler.manager.frontend/package.json
+++ b/io.sc.platform.scheduler.manager.frontend/package.json
@@ -92,7 +92,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.2.2",
-    "platform-core": "8.1.334",
+    "platform-core": "8.1.335",
     "quasar": "2.16.11",
     "tailwindcss": "3.4.10",
     "vue": "3.5.4",
diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json
index 7df04747..0b8a61e5 100644
--- a/io.sc.platform.system.frontend/package.json
+++ b/io.sc.platform.system.frontend/package.json
@@ -92,7 +92,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.2.2",
-    "platform-core": "8.1.334",
+    "platform-core": "8.1.335",
     "quasar": "2.16.11",
     "tailwindcss": "3.4.10",
     "vue": "3.5.4",
diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json
index 02afc1b5..d2abc785 100644
--- a/io.sc.standard.frontend/package.json
+++ b/io.sc.standard.frontend/package.json
@@ -92,7 +92,7 @@
     "luckyexcel": "1.0.1",
     "mockjs": "1.1.0",
     "pinia": "2.2.2",
-    "platform-core": "8.1.334",
+    "platform-core": "8.1.335",
     "quasar": "2.16.11",
     "tailwindcss": "3.4.10",
     "vue": "3.5.4",