diff --git a/app.platform/src/main/java/app/platform/Application.java b/app.platform/src/main/java/app/platform/Application.java index 1c689c6e..e8a7f8e9 100644 --- a/app.platform/src/main/java/app/platform/Application.java +++ b/app.platform/src/main/java/app/platform/Application.java @@ -5,15 +5,12 @@ import io.sc.platform.core.PlatformSpringBootServletInitializer; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.web.WebApplicationInitializer; -import java.util.UUID; - /** * 应用程序入口 */ @SpringBootApplication(proxyBeanMethods = false) public class Application extends PlatformSpringBootServletInitializer implements WebApplicationInitializer { public static void main(String[] args) throws Exception { - System.out.println(UUID.randomUUID().toString()); ApplicationLauncher.run(Application.class,args); } } diff --git a/io.sc.engine.st.frontend/src/views/DepFactor/DepFactor.vue b/io.sc.engine.st.frontend/src/views/DepFactor/DepFactor.vue index 2e1b4216..fc96ce59 100644 --- a/io.sc.engine.st.frontend/src/views/DepFactor/DepFactor.vue +++ b/io.sc.engine.st.frontend/src/views/DepFactor/DepFactor.vue @@ -49,7 +49,7 @@ { width: 60, name: 'year', label: t('year'), align: 'right' }, { width: 60, name: 'quarter', label: t('quarter'), align: 'right' }, { width: 60, name: 'month', label: t('month'), align: 'right' }, - { width: 150, name: 'value', label: t('value') }, + { width: 100, name: 'value', label: t('value') }, ]" :editor="{ dialog: { @@ -119,8 +119,8 @@ @after-request-data=" () => { const rows = gridRef.getRows(); - const xAxisData = []; - const seriesData = []; + const xAxisData: string[] = []; + const seriesData: number[] = []; for (const row of rows) { xAxisData.push(row.year + (row.month ? '-' + row.month : '')); seriesData.push(row.value); @@ -128,7 +128,13 @@ echartsOptionRef = { title: { text: factorDefine.name, - left: 'center', + align: 'left', + textStyle: { + fontSize: 14, + }, + }, + tooltip: { + trigger: 'axis', }, xAxis: { type: 'category', diff --git a/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuMathTeXGyre.woff2 b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuMathTeXGyre.woff2 new file mode 100644 index 00000000..c74b7517 Binary files /dev/null and b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuMathTeXGyre.woff2 differ diff --git a/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-Bold.woff2 b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-Bold.woff2 new file mode 100644 index 00000000..c3620b3b Binary files /dev/null and b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-Bold.woff2 differ diff --git a/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-BoldItalic.woff2 b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-BoldItalic.woff2 new file mode 100644 index 00000000..3d641e3d Binary files /dev/null and b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-BoldItalic.woff2 differ diff --git a/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-Italic.woff2 b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-Italic.woff2 new file mode 100644 index 00000000..163819b5 Binary files /dev/null and b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-Italic.woff2 differ diff --git a/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif.woff2 b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif.woff2 new file mode 100644 index 00000000..51776932 Binary files /dev/null and b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif.woff2 differ diff --git a/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/Garamond/EBGaramond12-Italic.woff2 b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/Garamond/EBGaramond12-Italic.woff2 new file mode 100644 index 00000000..21fe6278 Binary files /dev/null and b/io.sc.platform.core.frontend/public/webjars/mathfonts/1.0.0/Garamond/EBGaramond12-Italic.woff2 differ diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/context-menu/ContextMenu.vue b/io.sc.platform.core.frontend/src/platform/components/expression/context-menu/ContextMenu.vue new file mode 100644 index 00000000..1a99e412 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/context-menu/ContextMenu.vue @@ -0,0 +1,49 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/actions/Clean.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/actions/Clean.vue new file mode 100644 index 00000000..948bac7f --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/actions/Clean.vue @@ -0,0 +1,20 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/base/Addition.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/base/Addition.vue new file mode 100644 index 00000000..1b47d4c1 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/base/Addition.vue @@ -0,0 +1,31 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/base/And.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/base/And.vue new file mode 100644 index 00000000..e4c5c018 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/base/And.vue @@ -0,0 +1,29 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/base/Division.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/base/Division.vue new file mode 100644 index 00000000..25329818 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/base/Division.vue @@ -0,0 +1,43 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/formater/Comma.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/formater/Comma.vue new file mode 100644 index 00000000..e5b479f5 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/formater/Comma.vue @@ -0,0 +1,32 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/number/Abs.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/number/Abs.vue new file mode 100644 index 00000000..86fa4455 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/number/Abs.vue @@ -0,0 +1,22 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/number/Ceil.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/number/Ceil.vue new file mode 100644 index 00000000..62e039bf --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/number/Ceil.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/Degrees.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/Degrees.vue new file mode 100644 index 00000000..731a53eb --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/Degrees.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/hyperbolic/Cosh.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/hyperbolic/Cosh.vue new file mode 100644 index 00000000..90079387 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/hyperbolic/Cosh.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/hyperbolic/Csch.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/hyperbolic/Csch.vue new file mode 100644 index 00000000..bbfec1a4 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/hyperbolic/Csch.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcCosh.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcCosh.vue new file mode 100644 index 00000000..f6698f0f --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcCosh.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcCoth.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcCoth.vue new file mode 100644 index 00000000..0646fff5 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcCoth.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcCsch.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcCsch.vue new file mode 100644 index 00000000..d27d4975 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcCsch.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcSech.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcSech.vue new file mode 100644 index 00000000..a9edb6a3 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcSech.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcSinh.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcSinh.vue new file mode 100644 index 00000000..0c07e122 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcSinh.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcTanh.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcTanh.vue new file mode 100644 index 00000000..21b26996 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseHyperbolic/ArcTanh.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcCos.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcCos.vue new file mode 100644 index 00000000..2e20168b --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcCos.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcCot.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcCot.vue new file mode 100644 index 00000000..ae81a817 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcCot.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcSec.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcSec.vue new file mode 100644 index 00000000..20c8474b --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcSec.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcTan.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcTan.vue new file mode 100644 index 00000000..78e32faf --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/inverseTrigonometric/ArcTan.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/trigonometric/Cos.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/trigonometric/Cos.vue new file mode 100644 index 00000000..0b7b065f --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/trigonometric/Cos.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/trigonometric/Cot.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/trigonometric/Cot.vue new file mode 100644 index 00000000..72945d4a --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/trigonometric/Cot.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/trigonometric/Csc.vue b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/trigonometric/Csc.vue new file mode 100644 index 00000000..ee28dca1 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/expression/toolbar/functions/trigonometric/trigonometric/Csc.vue @@ -0,0 +1,28 @@ + + diff --git a/io.sc.platform.system.frontend/src/views/dictionary/Dictionary.vue b/io.sc.platform.system.frontend/src/views/dictionary/Dictionary.vue index 81e313d7..94e9c50e 100644 --- a/io.sc.platform.system.frontend/src/views/dictionary/Dictionary.vue +++ b/io.sc.platform.system.frontend/src/views/dictionary/Dictionary.vue @@ -8,7 +8,7 @@ :data-url="Environment.apiContextPath('/api/system/dictionary')" :query-form-fields="[{ name: 'code', label: $t('code'), type: 'text' }]" :toolbar-configure="{ noIcon: false }" - :toolbar-actions="['refresh', 'separator', 'add', 'clone', 'edit', 'remove', 'separator', 'view', 'separator', 'export']" + :toolbar-actions="['query', 'refresh', 'separator', 'add', 'clone', 'edit', 'remove', 'separator', 'view', 'separator', 'export']" :columns="[ { name: 'code', label: $t('code') }, { diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/autoconfigure/support/DatabaseMessageSource.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/autoconfigure/support/DatabaseMessageSource.java index edf0aab6..83058b49 100644 --- a/io.sc.platform.system/src/main/java/io/sc/platform/system/autoconfigure/support/DatabaseMessageSource.java +++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/autoconfigure/support/DatabaseMessageSource.java @@ -140,7 +140,7 @@ public class DatabaseMessageSource implements MessageSource, PlatformMessageSour } private synchronized Map> load(){ - List entities =this.repository.findAll(); + List entities =this.repository.findByOrderByCodeDesc(); if(entities==null || entities.isEmpty()){ return Collections.emptyMap(); } diff --git a/org.webjars.mathfonts-1.0.0/src/main/resources/META-INF/resources/webjars/mathfonts/1.0.0/Asana/Asana-Math.woff2 b/org.webjars.mathfonts-1.0.0/src/main/resources/META-INF/resources/webjars/mathfonts/1.0.0/Asana/Asana-Math.woff2 new file mode 100644 index 00000000..3eaca1ac Binary files /dev/null and b/org.webjars.mathfonts-1.0.0/src/main/resources/META-INF/resources/webjars/mathfonts/1.0.0/Asana/Asana-Math.woff2 differ diff --git a/org.webjars.mathfonts-1.0.0/src/main/resources/META-INF/resources/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-BoldItalic.woff2 b/org.webjars.mathfonts-1.0.0/src/main/resources/META-INF/resources/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-BoldItalic.woff2 new file mode 100644 index 00000000..3d641e3d Binary files /dev/null and b/org.webjars.mathfonts-1.0.0/src/main/resources/META-INF/resources/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif-BoldItalic.woff2 differ diff --git a/org.webjars.mathfonts-1.0.0/src/main/resources/META-INF/resources/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif.woff2 b/org.webjars.mathfonts-1.0.0/src/main/resources/META-INF/resources/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif.woff2 new file mode 100644 index 00000000..51776932 Binary files /dev/null and b/org.webjars.mathfonts-1.0.0/src/main/resources/META-INF/resources/webjars/mathfonts/1.0.0/DejaVu/DejaVuSerif.woff2 differ