update

app.platform/build.gradle

@@ -17,8 +17,8 @@ dependencies {
 //		project(":io.sc.platform.security.oauth2.server.resource"),
 		project(":io.sc.platform.security.loginform"),
 
-//		project(":io.sc.platform.scheduler.manager"),
+		project(":io.sc.platform.scheduler.manager"),
-//		project(":io.sc.platform.scheduler.executor"),
+		project(":io.sc.platform.scheduler.executor"),
 
 //		project(":io.sc.engine.mv"),
 //		project(":io.sc.engine.mv.frontend"),
@@ -33,10 +33,10 @@ dependencies {
 //		project(":io.sc.engine.st"),
 //		project(":io.sc.engine.st.frontend"),
 //
-		project(":erm"),
+//		project(":erm"),
-		project(":erm.frontend"),
+//		project(":erm.frontend"),
 
-//		project(":io.sc.standard"),
+		project(":io.sc.standard"),
 	)
 }
 

io.sc.platform.app/build.gradle

@@ -7,7 +7,6 @@ dependencies {
         project(":io.sc.platform.jdbc.liquibase"),
         project(":io.sc.platform.jdbc.schemacrawler"),
         project(":io.sc.platform.lcdp"),
-        project(":io.sc.platform.lcdp.frontend"),
         project(":io.sc.platform.orm.mybatis"),
         project(":io.sc.platform.poi"),
         project(":io.sc.platform.system"),

io.sc.platform.core.frontend/src/platform/components/expression/WExpression.vue

@@ -74,7 +74,10 @@ const { height } = dom;
 const mathEditorRef = ref();
 const contextMenuRef = ref();
 const editorRef = ref();
-const highLightBgColor = 'bg-orange-500';
+const selectedElementClass = '';
+const selectedElementHighLightClass = 'bg-gray-300';
+const mspaceClass = 'bg-blue-200';
+const mspaceHighLightClass = 'bg-red-500';
 
 const contextmenu = (event) => {
   event.preventDefault();
@@ -82,7 +85,10 @@ const contextmenu = (event) => {
 };
 
 const dblclick = (event) => {
-  editorRef.value.show(event.srcElement);
+  const tagName = event.target.tagName.toLowerCase();
+  if (tagName === 'mi' || tagName === 'mo') {
+    editorRef.value.show(event.srcElement);
+  }
 };
 
 const mouseover = (event) => {
@@ -91,7 +97,11 @@ const mouseover = (event) => {
   if (tagName === 'math' || tagName === 'mspace') {
     return;
   }
-  event.target.className = highLightBgColor;
+  if (tagName === 'mo' && event.target.innerHTML === '-') {
+    event.target.style.paddingTop = 5;
+    event.target.style.paddingBottom = 5;
+  }
+  event.target.className = selectedElementHighLightClass;
 };
 
 const mouseout = (event) => {
@@ -100,14 +110,14 @@ const mouseout = (event) => {
   if (tagName === 'math' || tagName === 'mspace') {
     return;
   }
-  event.target.className = '';
+  event.target.className = selectedElementClass;
 };
 
 const dragover = (event) => {
   event.preventDefault();
   const tagName = event.target.tagName.toLowerCase();
   if (tagName === 'mspace') {
-    event.target.className = 'bg-red-900';
+    event.target.className = mspaceHighLightClass;
   }
 };
 
@@ -117,7 +127,7 @@ const dragleave = (event) => {
   if (tagName === 'math') {
     return;
   }
-  event.target.className = '';
+  event.target.className = mspaceClass;
 };
 
 const drop = (event) => {
@@ -126,7 +136,7 @@ const drop = (event) => {
   if (tagName === 'math') {
     return;
   }
-  event.target.outerHTML = event.target.outerHTML + event.dataTransfer.getData('math');
+  event.target.outerHTML = event.dataTransfer.getData('math');
   event.target.className = '';
   setTimeout(refresh, 100);
 };
@@ -142,24 +152,22 @@ const init = () => {
 
 const refresh = () => {
   setTimeout(() => {
-    //zoomLevel = Tools.isEmpty(zoomLevel) ? ZoomLevelMap[props.zoom] : zoomLevel;
+    const w = 8;
-    //const w = zoomLevel > 10 ? 10 : zoomLevel > 8 ? 8 : zoomLevel > 6 ? 6 : zoomLevel > 4 ? 4 : 2;
-    const w = 2;
     const mspaces = mathEditorRef.value.getElementsByTagName('mspace');
     for (const mspace of mspaces) {
       let h = 30;
       let element = null;
       const position = mspace.getAttribute('position');
-      if (position === 'left') {
+      if (position === 'right') {
-        element = mspace.nextElementSibling;
-      } else if (position === 'right') {
         element = mspace.previousElementSibling;
+      } else {
+        element = mspace.nextElementSibling;
       }
       if (element) {
         h = window.Math.ceil(height(element));
       }
       h = h > 20 ? h : 20;
-      mspace.className = highLightBgColor;
+      mspace.className = mspaceClass;
       mspace.setAttribute('width', w + 'px');
       mspace.setAttribute('height', h + 'px');
     }

io.sc.platform.core.frontend/src/platform/components/expression/dialog/XmlDialog.vue

@@ -11,7 +11,7 @@ const dialogRef = ref();
 const xml = ref();
 const open = (container) => {
   const parser = new DOMParser();
-  const mathElementClone = parser.parseFromString(container.getMathElement().outerHTML, 'text/xml');
+  const mathElementClone = parser.parseFromString(container.getEditor().outerHTML, 'text/xml');
   const elements = mathElementClone.querySelectorAll('*');
   for (const element of elements) {
     const names = element.getAttributeNames();

io.sc.platform.core.frontend/src/views/testcase/math/MathEditor.vue

@@ -6,8 +6,7 @@
 <script setup lang="ts">
 const formula = '';
 const formula2 = 'hello world';
-const formula3 = `
+const formula3 = `<mrow>
-<mrow>
   <mi>0.12</mi>
   <mo>&#xD7;</mo>
   <mrow>

io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json

@@ -146,7 +146,6 @@
   "lcdp.frontend.export.frontendWebContextPath":"前端应用上下文路径",
   "lcdp.frontend.export.backendApiWebContextPath":"后端应用上下文路径",
 
-
   "lcdp.bpm.tabs.processDefine": "流程定义",
   "lcdp.bpm.tabs.processInstance": "流程实例",
   "lcdp.bpm.tabs.task": "工作任务",

io.sc.platform.system.frontend/src/views/corporation/Corporation.vue

@@ -35,10 +35,10 @@
             'export',
           ]"
           :columns="[
-            { width: '100%', name: 'name', label: $t('name') },
+            { width: 300, name: 'name', label: $t('name') },
             { width: 150, name: 'code', label: $t('code') },
             { width: 60, name: 'order', label: $t('order') },
-            { width: 80, name: 'enable', label: $t('status'), format: Formater.enableTag() },
+            { width: 70, name: 'enable', label: $t('status'), align: 'center', format: Formater.enableTag() },
             { width: 100, name: 'lastModifier', label: $t('lastModifier') },
             { width: 110, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
           ]"