diff --git a/app.platform/build.gradle b/app.platform/build.gradle index 583824a5..2ebf2916 100644 --- a/app.platform/build.gradle +++ b/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.executor"), + project(":io.sc.platform.scheduler.manager"), + 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.frontend"), +// project(":erm"), +// project(":erm.frontend"), -// project(":io.sc.standard"), + project(":io.sc.standard"), ) } diff --git a/io.sc.platform.app/build.gradle b/io.sc.platform.app/build.gradle index de3537ea..285406a5 100644 --- a/io.sc.platform.app/build.gradle +++ b/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"), diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/WExpression.vue b/io.sc.platform.core.frontend/src/platform/components/expression/WExpression.vue index 45ccb417..e30db4f1 100644 --- a/io.sc.platform.core.frontend/src/platform/components/expression/WExpression.vue +++ b/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 = zoomLevel > 10 ? 10 : zoomLevel > 8 ? 8 : zoomLevel > 6 ? 6 : zoomLevel > 4 ? 4 : 2; - const w = 2; + const w = 8; 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') { - element = mspace.nextElementSibling; - } else if (position === 'right') { + 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'); } diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/dialog/XmlDialog.vue b/io.sc.platform.core.frontend/src/platform/components/expression/dialog/XmlDialog.vue index 0b9b2995..b8276582 100644 --- a/io.sc.platform.core.frontend/src/platform/components/expression/dialog/XmlDialog.vue +++ b/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(); diff --git a/io.sc.platform.core.frontend/src/views/testcase/math/MathEditor.vue b/io.sc.platform.core.frontend/src/views/testcase/math/MathEditor.vue index 38a4da59..b6f16bbe 100644 --- a/io.sc.platform.core.frontend/src/views/testcase/math/MathEditor.vue +++ b/io.sc.platform.core.frontend/src/views/testcase/math/MathEditor.vue @@ -6,8 +6,7 @@