diff --git a/build.gradle b/build.gradle index 10aec02a..2b8e15fd 100644 --- a/build.gradle +++ b/build.gradle @@ -157,9 +157,12 @@ subprojects { } clean { - //delete 'dist' //删除前端自动生成的资源目录 - //delete 'bin' //删除 eclipse 编译的 bin 目录 + delete 'bin' //删除 eclipse 编译的 bin 目录 delete 'build' //删除 gradle 构建目录 + delete 'dist' //删除前端打包后的目录 + delete 'node_modules' //删除前端 node_modules 目录 + delete 'pnpm-lock.yaml' //删除前端 pnpm 文件 + delete 'package-lock.json' //删除前端 npm 文件 } /*----------------------------------------------------------------- @@ -746,16 +749,6 @@ subprojects { excludeDirs += file('dist') } } - - clean { - doFirst{ - if(isFrontendProject(file('.'))) { - delete 'dist' - delete 'node_modules' - delete 'pnpm-lock.yaml' - } - } - } } /*********************************************************************** diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 524bba6e..049354c4 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.2", "pinia": "2.2.2", "pinia-undo": "0.2.4", - "platform-core": "8.1.391", + "platform-core": "8.1.405", "quasar": "2.17.0", "svg-path-commander": "2.0.10", "tailwindcss": "3.4.10", diff --git a/erm.frontend/public/index.html b/erm.frontend/public/index.html index cf3966b6..bd6ee3e0 100644 --- a/erm.frontend/public/index.html +++ b/erm.frontend/public/index.html @@ -20,7 +20,7 @@ - + + diff --git a/erm.frontend/src/views/appetite/Spread.vue b/erm.frontend/src/views/appetite/Spread.vue index e21d7d19..d6600a26 100644 --- a/erm.frontend/src/views/appetite/Spread.vue +++ b/erm.frontend/src/views/appetite/Spread.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/appetite/Threshold.vue b/erm.frontend/src/views/appetite/Threshold.vue index 4a51c9ea..8177538c 100644 --- a/erm.frontend/src/views/appetite/Threshold.vue +++ b/erm.frontend/src/views/appetite/Threshold.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/appetite/Validate.vue b/erm.frontend/src/views/appetite/Validate.vue index 5eee1c85..adbc4f2b 100644 --- a/erm.frontend/src/views/appetite/Validate.vue +++ b/erm.frontend/src/views/appetite/Validate.vue @@ -104,6 +104,7 @@ + diff --git a/erm.frontend/src/views/appetite/spread/Spread.vue b/erm.frontend/src/views/appetite/spread/Spread.vue index dbd59488..b20e93f0 100644 --- a/erm.frontend/src/views/appetite/spread/Spread.vue +++ b/erm.frontend/src/views/appetite/spread/Spread.vue @@ -99,6 +99,7 @@ + diff --git a/erm.frontend/src/views/assessment/Concentration.vue b/erm.frontend/src/views/assessment/Concentration.vue index 0880947c..2aa5c5ce 100644 --- a/erm.frontend/src/views/assessment/Concentration.vue +++ b/erm.frontend/src/views/assessment/Concentration.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/assessment/Interest.vue b/erm.frontend/src/views/assessment/Interest.vue index 7cda22b9..d53a8ac7 100644 --- a/erm.frontend/src/views/assessment/Interest.vue +++ b/erm.frontend/src/views/assessment/Interest.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/assessment/LevelResult.vue b/erm.frontend/src/views/assessment/LevelResult.vue index e0cb3e25..c27455a8 100644 --- a/erm.frontend/src/views/assessment/LevelResult.vue +++ b/erm.frontend/src/views/assessment/LevelResult.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/assessment/Liquidity.vue b/erm.frontend/src/views/assessment/Liquidity.vue index 2608110d..9fe7962e 100644 --- a/erm.frontend/src/views/assessment/Liquidity.vue +++ b/erm.frontend/src/views/assessment/Liquidity.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/assessment/ManagementResult.vue b/erm.frontend/src/views/assessment/ManagementResult.vue index c1bf470b..e6b8c0b4 100644 --- a/erm.frontend/src/views/assessment/ManagementResult.vue +++ b/erm.frontend/src/views/assessment/ManagementResult.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/assessment/ReEvaluation.vue b/erm.frontend/src/views/assessment/ReEvaluation.vue index e00f1603..ed26d44a 100644 --- a/erm.frontend/src/views/assessment/ReEvaluation.vue +++ b/erm.frontend/src/views/assessment/ReEvaluation.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/assessment/Reputation.vue b/erm.frontend/src/views/assessment/Reputation.vue index 75d88d37..cdd0ce0f 100644 --- a/erm.frontend/src/views/assessment/Reputation.vue +++ b/erm.frontend/src/views/assessment/Reputation.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/assessment/SelfEvaluation.vue b/erm.frontend/src/views/assessment/SelfEvaluation.vue index a3a5b2f8..49a24ccc 100644 --- a/erm.frontend/src/views/assessment/SelfEvaluation.vue +++ b/erm.frontend/src/views/assessment/SelfEvaluation.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/assessment/Strategy.vue b/erm.frontend/src/views/assessment/Strategy.vue index fa48e256..25482b5c 100644 --- a/erm.frontend/src/views/assessment/Strategy.vue +++ b/erm.frontend/src/views/assessment/Strategy.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/capitalMonitor/Car.vue b/erm.frontend/src/views/capitalMonitor/Car.vue index cc7ebf6a..061e313e 100644 --- a/erm.frontend/src/views/capitalMonitor/Car.vue +++ b/erm.frontend/src/views/capitalMonitor/Car.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/capitalMonitor/InterBank.vue b/erm.frontend/src/views/capitalMonitor/InterBank.vue index 2c878c6e..c00c55e8 100644 --- a/erm.frontend/src/views/capitalMonitor/InterBank.vue +++ b/erm.frontend/src/views/capitalMonitor/InterBank.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/capitalMonitor/Regulatory.vue b/erm.frontend/src/views/capitalMonitor/Regulatory.vue index 4be94046..c7a1bf9a 100644 --- a/erm.frontend/src/views/capitalMonitor/Regulatory.vue +++ b/erm.frontend/src/views/capitalMonitor/Regulatory.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/capitalPlan/Insufficiency.vue b/erm.frontend/src/views/capitalPlan/Insufficiency.vue index 99c7b0ea..f8930e2f 100644 --- a/erm.frontend/src/views/capitalPlan/Insufficiency.vue +++ b/erm.frontend/src/views/capitalPlan/Insufficiency.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/capitalPlan/Parameter.vue b/erm.frontend/src/views/capitalPlan/Parameter.vue index defc575a..97e4e2d9 100644 --- a/erm.frontend/src/views/capitalPlan/Parameter.vue +++ b/erm.frontend/src/views/capitalPlan/Parameter.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/capitalPlan/Result.vue b/erm.frontend/src/views/capitalPlan/Result.vue index 2f0a0daa..c927e633 100644 --- a/erm.frontend/src/views/capitalPlan/Result.vue +++ b/erm.frontend/src/views/capitalPlan/Result.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/capitalPlan/StrategicTarget.vue b/erm.frontend/src/views/capitalPlan/StrategicTarget.vue index 6bb8bfc5..cc4af986 100644 --- a/erm.frontend/src/views/capitalPlan/StrategicTarget.vue +++ b/erm.frontend/src/views/capitalPlan/StrategicTarget.vue @@ -72,6 +72,7 @@ + diff --git a/erm.frontend/src/views/economicCapital/Result.vue b/erm.frontend/src/views/economicCapital/Result.vue index e7d1f3a7..c6b1e25c 100644 --- a/erm.frontend/src/views/economicCapital/Result.vue +++ b/erm.frontend/src/views/economicCapital/Result.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/economicCapital/Schema.vue b/erm.frontend/src/views/economicCapital/Schema.vue index 8d0234ee..c6af9272 100644 --- a/erm.frontend/src/views/economicCapital/Schema.vue +++ b/erm.frontend/src/views/economicCapital/Schema.vue @@ -68,6 +68,7 @@ + diff --git a/erm.frontend/src/views/icaap/Template.vue b/erm.frontend/src/views/icaap/Template.vue index 58fd610d..21274b1b 100644 --- a/erm.frontend/src/views/icaap/Template.vue +++ b/erm.frontend/src/views/icaap/Template.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/identify/Credit.vue b/erm.frontend/src/views/identify/Credit.vue index 84751abb..b1a5d47a 100644 --- a/erm.frontend/src/views/identify/Credit.vue +++ b/erm.frontend/src/views/identify/Credit.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/identify/Market.vue b/erm.frontend/src/views/identify/Market.vue index 64febed4..ac4dc7fc 100644 --- a/erm.frontend/src/views/identify/Market.vue +++ b/erm.frontend/src/views/identify/Market.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/identify/Operation.vue b/erm.frontend/src/views/identify/Operation.vue index dcda52dd..efa3dc5d 100644 --- a/erm.frontend/src/views/identify/Operation.vue +++ b/erm.frontend/src/views/identify/Operation.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/identify/Result.vue b/erm.frontend/src/views/identify/Result.vue index 2f0a0daa..c927e633 100644 --- a/erm.frontend/src/views/identify/Result.vue +++ b/erm.frontend/src/views/identify/Result.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/kpi/Indicator.vue b/erm.frontend/src/views/kpi/Indicator.vue index 2ce97587..b6495932 100644 --- a/erm.frontend/src/views/kpi/Indicator.vue +++ b/erm.frontend/src/views/kpi/Indicator.vue @@ -245,6 +245,7 @@ > + diff --git a/erm.frontend/src/views/limit/Threshold.vue b/erm.frontend/src/views/limit/Threshold.vue index 4a51c9ea..8177538c 100644 --- a/erm.frontend/src/views/limit/Threshold.vue +++ b/erm.frontend/src/views/limit/Threshold.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/report/Report.vue b/erm.frontend/src/views/report/Report.vue index f98396f9..efb18921 100644 --- a/erm.frontend/src/views/report/Report.vue +++ b/erm.frontend/src/views/report/Report.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/report/Template.vue b/erm.frontend/src/views/report/Template.vue index 58fd610d..21274b1b 100644 --- a/erm.frontend/src/views/report/Template.vue +++ b/erm.frontend/src/views/report/Template.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/stressTest/Report.vue b/erm.frontend/src/views/stressTest/Report.vue index f98396f9..efb18921 100644 --- a/erm.frontend/src/views/stressTest/Report.vue +++ b/erm.frontend/src/views/stressTest/Report.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/stressTest/Template.vue b/erm.frontend/src/views/stressTest/Template.vue index 58fd610d..21274b1b 100644 --- a/erm.frontend/src/views/stressTest/Template.vue +++ b/erm.frontend/src/views/stressTest/Template.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/src/views/stressTest/Test.vue b/erm.frontend/src/views/stressTest/Test.vue index 89bf6ae5..15bda2e1 100644 --- a/erm.frontend/src/views/stressTest/Test.vue +++ b/erm.frontend/src/views/stressTest/Test.vue @@ -1,4 +1,6 @@ - + diff --git a/erm.frontend/webpack.config.common.cjs b/erm.frontend/webpack.config.common.cjs index f83a66c3..e8726c5b 100644 --- a/erm.frontend/webpack.config.common.cjs +++ b/erm.frontend/webpack.config.common.cjs @@ -58,6 +58,9 @@ module.exports = { { loader: 'postcss-loader', }, + { + loader: 'sass-loader', + }, ], }, diff --git a/gradle.properties b/gradle.properties index 0e3ab521..78c50af1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.1.49 platform_plugin_version=8.1.49 -platform_core_frontend_version=8.1.391 +platform_core_frontend_version=8.1.405 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 96f8e7e5..f4d8c035 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.2", "pinia": "2.2.2", "pinia-undo": "0.2.4", - "platform-core": "8.1.391", + "platform-core": "8.1.405", "quasar": "2.17.0", "svg-path-commander": "2.0.10", "tailwindcss": "3.4.10", diff --git a/io.sc.engine.mv.frontend/public/index.html b/io.sc.engine.mv.frontend/public/index.html index cf3966b6..bd6ee3e0 100644 --- a/io.sc.engine.mv.frontend/public/index.html +++ b/io.sc.engine.mv.frontend/public/index.html @@ -20,7 +20,7 @@ - + diff --git a/io.sc.engine.mv.frontend/src/views/config/chiSquare.vue b/io.sc.engine.mv.frontend/src/views/config/chiSquare.vue index 5666119c..a668c5c7 100644 --- a/io.sc.engine.mv.frontend/src/views/config/chiSquare.vue +++ b/io.sc.engine.mv.frontend/src/views/config/chiSquare.vue @@ -47,5 +47,6 @@ > diff --git a/io.sc.engine.mv.frontend/src/views/config/cutOffPoint.vue b/io.sc.engine.mv.frontend/src/views/config/cutOffPoint.vue index e7c188fe..9bf4c78c 100644 --- a/io.sc.engine.mv.frontend/src/views/config/cutOffPoint.vue +++ b/io.sc.engine.mv.frontend/src/views/config/cutOffPoint.vue @@ -56,6 +56,7 @@ > diff --git a/io.sc.engine.mv.frontend/src/views/config/executor.vue b/io.sc.engine.mv.frontend/src/views/config/executor.vue index add99cec..19534c78 100644 --- a/io.sc.engine.mv.frontend/src/views/config/executor.vue +++ b/io.sc.engine.mv.frontend/src/views/config/executor.vue @@ -32,5 +32,6 @@ > diff --git a/io.sc.engine.mv.frontend/src/views/config/model.vue b/io.sc.engine.mv.frontend/src/views/config/model.vue index 9ac607dd..d5460f4b 100644 --- a/io.sc.engine.mv.frontend/src/views/config/model.vue +++ b/io.sc.engine.mv.frontend/src/views/config/model.vue @@ -63,6 +63,7 @@ > diff --git a/io.sc.engine.mv.frontend/src/views/config/threshold.vue b/io.sc.engine.mv.frontend/src/views/config/threshold.vue index 92b5d1fe..46245d74 100644 --- a/io.sc.engine.mv.frontend/src/views/config/threshold.vue +++ b/io.sc.engine.mv.frontend/src/views/config/threshold.vue @@ -63,5 +63,6 @@ > diff --git a/io.sc.engine.mv.frontend/src/views/result/Executor.vue b/io.sc.engine.mv.frontend/src/views/result/Executor.vue index 335106f4..480515f4 100644 --- a/io.sc.engine.mv.frontend/src/views/result/Executor.vue +++ b/io.sc.engine.mv.frontend/src/views/result/Executor.vue @@ -34,6 +34,7 @@ - + - + - + diff --git a/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue b/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue index 1f90d8bc..16dee6dc 100644 --- a/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue +++ b/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue @@ -10,14 +10,7 @@ v-model="formData[field.name]" v-bind="field" :form="instance" - :class=" - (field.colFirst ? 'col-start-1 ' : ' ') + - (field.colSpan === 'full' - ? ' col-span-' + screenColsNumComputed - : field.colSpan && screenColsNumComputed >= field.colSpan - ? ' col-span-' + field.colSpan - : ' col-span-1') - " + :style="fieldStyleComputed(field)" @update:model-value="updateModelValue(field.name, formData[field.name])" > @@ -27,14 +20,7 @@ :ref="(el) => setComponentRef(el, field.name)" v-bind="field" :form="instance" - :class=" - (field.colFirst ? 'col-start-1 ' : ' ') + - (field.colSpan === 'full' - ? ' col-span-' + screenColsNumComputed - : field.colSpan && screenColsNumComputed >= field.colSpan - ? ' col-span-' + field.colSpan - : ' col-span-1') - " + :style="fieldStyleComputed(field)" > @@ -158,11 +144,7 @@ const formLayoutClassComputed = computed(() => { }); /** - * 说明: 以下代码等同于生成 class="grid-cols-xxx gap-x-[yyy] gap-y-[zzz]", grid-cols, gap-x, gap-y 均为 tailwindcss 的样式。 - * 即通过上面 formLayoutClassComputed 计算属性生成 html 的 class 属性。 - * 由于 tailwindcss 是通过在文件中查找 class="?????" 模式查找需要的 css, - * 对于通过程序生成的 class, tailwindcss 是无法生成相应的 css style 文件, - * 故只能通过直接编写 style="??????"来实现相同的效果 + * 采用 style 替换动态 tailwindcss class 名 */ const formLayoutStyleComputed = computed(() => { const style = {}; @@ -176,6 +158,33 @@ const formLayoutStyleComputed = computed(() => { return style; }); +/** + * 采用 style 替换动态 tailwindcss class 名 + */ +const fieldStyleComputed = (field) => { + const style = {}; + if (field) { + if (field.colFirst) { + // col-start-1 + style['grid-column-start'] = 1; + } else { + if (field.colSpan === 'full') { + // col-span-${screenColsNumComputed.value} + style['grid-column'] = `span ${screenColsNumComputed.value} / span ${screenColsNumComputed.value}`; + } else { + if (field.colSpan && screenColsNumComputed.value >= field.colSpan) { + // col-span-${field.colSpan} + style['grid-column'] = `span ${field.colSpan} / span ${field.colSpan}`; + } else { + // col-span-1 + style['grid-column'] = 'span 1 / span 1'; + } + } + } + } + return style; +}; + const updateModelValue = (name, value) => { if (formFields[name].error) { formFields[name].error = false; diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/css/grid.css b/io.sc.platform.core.frontend/src/platform/components/grid/css/grid.css index 7ae8f6eb..bc6c5dc0 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/css/grid.css +++ b/io.sc.platform.core.frontend/src/platform/components/grid/css/grid.css @@ -6,6 +6,7 @@ } .w-grid .q-table__top { padding: var(--tableTopPadding) var(--tableTopPadding); + border-bottom: 0px !important; } .w-grid .q-table__middle .q-table th { padding: var(--tableHeaderPadding) 8px; @@ -55,6 +56,7 @@ border-style: solid; border-left-width: 1px; border-right-width: 1px; + border-top-width: 1px; border-bottom-width: 1px; } @@ -648,4 +650,4 @@ z-index: 1; position: sticky; left: var(--column9Width); -} \ No newline at end of file +} diff --git a/io.sc.platform.core.frontend/src/platform/components/layout/WVLayout.vue b/io.sc.platform.core.frontend/src/platform/components/layout/WVLayout.vue index d637d97c..f80be877 100644 --- a/io.sc.platform.core.frontend/src/platform/components/layout/WVLayout.vue +++ b/io.sc.platform.core.frontend/src/platform/components/layout/WVLayout.vue @@ -1,11 +1,6 @@ \ No newline at end of file +const props = defineProps({}); + diff --git a/io.sc.platform.core.frontend/src/platform/components/math/toolbar/base/And.vue b/io.sc.platform.core.frontend/src/platform/components/math/toolbar/base/And.vue index e0b816f3..3ef696aa 100644 --- a/io.sc.platform.core.frontend/src/platform/components/math/toolbar/base/And.vue +++ b/io.sc.platform.core.frontend/src/platform/components/math/toolbar/base/And.vue @@ -6,6 +6,7 @@ diff --git a/io.sc.platform.core.frontend/src/platform/css/tailwind.css b/io.sc.platform.core.frontend/src/platform/css/tailwind.css deleted file mode 100644 index b5c61c95..00000000 --- a/io.sc.platform.core.frontend/src/platform/css/tailwind.css +++ /dev/null @@ -1,3 +0,0 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; diff --git a/io.sc.platform.core.frontend/src/platform/index.ts b/io.sc.platform.core.frontend/src/platform/index.ts index c83ae5c3..1dd03267 100644 --- a/io.sc.platform.core.frontend/src/platform/index.ts +++ b/io.sc.platform.core.frontend/src/platform/index.ts @@ -8,12 +8,12 @@ import VueDOMPurifyHTML from 'vue-dompurify-html'; // 必须包含以下 css,才能在打包时将需要的 css 打入 platform-core.css 中,供其他前端使用 import 'quasar/dist/quasar.css'; + import '@quasar/extras/bootstrap-icons/bootstrap-icons.css'; import '@quasar/extras/material-icons/material-icons.css'; -//import '@quasar/extras/material-symbols-outlined/material-symbols-outlined.css'; -// 引入 tailwind css -import '@/platform/css/tailwind.css'; +// 引入 tailwindcss +import 'tailwindcss/utilities.css'; // 引入 maxgraph css // 官方推荐 import '@maxgraph/core/css/common.css'; diff --git a/io.sc.platform.core.frontend/src/views/likm/Grid.vue b/io.sc.platform.core.frontend/src/views/likm/Grid.vue index fee1edf1..e9cae36c 100644 --- a/io.sc.platform.core.frontend/src/views/likm/Grid.vue +++ b/io.sc.platform.core.frontend/src/views/likm/Grid.vue @@ -29,7 +29,8 @@ ], 'query', ]" - :query-form-fields="[{ name: 'code', label: '编码', type: 'w-text' }]" + :query-form-cols-num="12" + :query-form-fields="[{ colSpan: 3, name: 'code', label: '编码', type: 'w-text' }]" :columns="[ { name: 'code', label: '编码', type: 'w-text' }, { name: 'name', label: '名称', type: 'w-text' }, diff --git a/io.sc.platform.core.frontend/src/views/testcase/word/Word.vue b/io.sc.platform.core.frontend/src/views/testcase/word/Word.vue index 908512b1..9755579d 100644 --- a/io.sc.platform.core.frontend/src/views/testcase/word/Word.vue +++ b/io.sc.platform.core.frontend/src/views/testcase/word/Word.vue @@ -1,4 +1,12 @@ - + - + diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Components.vue b/io.sc.platform.developer.frontend/src/views/plugin/Components.vue index cc4303f9..c9777b74 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Components.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Components.vue @@ -39,5 +39,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Directories.vue b/io.sc.platform.developer.frontend/src/views/plugin/Directories.vue index acea4002..d22010b4 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Directories.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Directories.vue @@ -14,5 +14,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/FrontendModule.vue b/io.sc.platform.developer.frontend/src/views/plugin/FrontendModule.vue index 64a13afc..30a410b1 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/FrontendModule.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/FrontendModule.vue @@ -40,5 +40,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/FrontendRoutes.vue b/io.sc.platform.developer.frontend/src/views/plugin/FrontendRoutes.vue index 91155d01..c8ebbf60 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/FrontendRoutes.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/FrontendRoutes.vue @@ -18,5 +18,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Initializer.vue b/io.sc.platform.developer.frontend/src/views/plugin/Initializer.vue index 9fd1b03a..5a72faa1 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Initializer.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Initializer.vue @@ -14,5 +14,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/JsonSerializers.vue b/io.sc.platform.developer.frontend/src/views/plugin/JsonSerializers.vue index 635b11b4..1e8a0038 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/JsonSerializers.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/JsonSerializers.vue @@ -14,5 +14,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Liquibase.vue b/io.sc.platform.developer.frontend/src/views/plugin/Liquibase.vue index b3022abc..447eb294 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Liquibase.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Liquibase.vue @@ -29,5 +29,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Menus.vue b/io.sc.platform.developer.frontend/src/views/plugin/Menus.vue index 5a5cd1c7..5fa37815 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Menus.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Menus.vue @@ -73,5 +73,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Messages.vue b/io.sc.platform.developer.frontend/src/views/plugin/Messages.vue index 884966a3..11096f6b 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Messages.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Messages.vue @@ -39,5 +39,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/P6spy.vue b/io.sc.platform.developer.frontend/src/views/plugin/P6spy.vue index 2fc890ed..f8e61735 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/P6spy.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/P6spy.vue @@ -25,5 +25,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Parameters.vue b/io.sc.platform.developer.frontend/src/views/plugin/Parameters.vue index af739a81..e05a7092 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Parameters.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Parameters.vue @@ -18,5 +18,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Repositories.vue b/io.sc.platform.developer.frontend/src/views/plugin/Repositories.vue index 108f3671..68b3e03c 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Repositories.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Repositories.vue @@ -39,5 +39,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/RestartProperties.vue b/io.sc.platform.developer.frontend/src/views/plugin/RestartProperties.vue index ed84a7b9..f4704f1f 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/RestartProperties.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/RestartProperties.vue @@ -39,5 +39,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Security.vue b/io.sc.platform.developer.frontend/src/views/plugin/Security.vue index 2980b6c7..253de387 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Security.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Security.vue @@ -25,5 +25,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Swagger.vue b/io.sc.platform.developer.frontend/src/views/plugin/Swagger.vue index 91537926..561cb2cd 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Swagger.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Swagger.vue @@ -1,4 +1,6 @@ - + diff --git a/io.sc.platform.developer.frontend/src/views/plugin/SystemProperties.vue b/io.sc.platform.developer.frontend/src/views/plugin/SystemProperties.vue index 5c14c73f..bec92a65 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/SystemProperties.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/SystemProperties.vue @@ -13,5 +13,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Ws.vue b/io.sc.platform.developer.frontend/src/views/plugin/Ws.vue index 2432876c..dccf62c5 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Ws.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Ws.vue @@ -14,5 +14,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/springboot/Autoconfigure.vue b/io.sc.platform.developer.frontend/src/views/springboot/Autoconfigure.vue index bda3b3db..310050c3 100644 --- a/io.sc.platform.developer.frontend/src/views/springboot/Autoconfigure.vue +++ b/io.sc.platform.developer.frontend/src/views/springboot/Autoconfigure.vue @@ -29,5 +29,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/springboot/Bean.vue b/io.sc.platform.developer.frontend/src/views/springboot/Bean.vue index c1880240..17b519de 100644 --- a/io.sc.platform.developer.frontend/src/views/springboot/Bean.vue +++ b/io.sc.platform.developer.frontend/src/views/springboot/Bean.vue @@ -51,5 +51,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/springboot/Environment.vue b/io.sc.platform.developer.frontend/src/views/springboot/Environment.vue index e882f672..f61b7f01 100644 --- a/io.sc.platform.developer.frontend/src/views/springboot/Environment.vue +++ b/io.sc.platform.developer.frontend/src/views/springboot/Environment.vue @@ -23,5 +23,6 @@ > diff --git a/io.sc.platform.developer.frontend/src/views/springboot/Mapping.vue b/io.sc.platform.developer.frontend/src/views/springboot/Mapping.vue index e80b6890..5e5b19ff 100644 --- a/io.sc.platform.developer.frontend/src/views/springboot/Mapping.vue +++ b/io.sc.platform.developer.frontend/src/views/springboot/Mapping.vue @@ -112,6 +112,7 @@ - + - + - + - + diff --git a/io.sc.platform.system.frontend/src/views/application/Application.vue b/io.sc.platform.system.frontend/src/views/application/Application.vue index 9450cfe2..fa891c4a 100644 --- a/io.sc.platform.system.frontend/src/views/application/Application.vue +++ b/io.sc.platform.system.frontend/src/views/application/Application.vue @@ -95,6 +95,7 @@ + diff --git a/io.sc.platform.system.frontend/src/views/license/License2.vue b/io.sc.platform.system.frontend/src/views/license/License2.vue deleted file mode 100644 index a90367c5..00000000 --- a/io.sc.platform.system.frontend/src/views/license/License2.vue +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/io.sc.platform.system.frontend/src/views/menu/Menu.vue b/io.sc.platform.system.frontend/src/views/menu/Menu.vue index aed4a978..987535f7 100644 --- a/io.sc.platform.system.frontend/src/views/menu/Menu.vue +++ b/io.sc.platform.system.frontend/src/views/menu/Menu.vue @@ -258,6 +258,7 @@ diff --git a/io.sc.platform.system.frontend/src/views/org/Org.vue b/io.sc.platform.system.frontend/src/views/org/Org.vue index a772e34b..56fdfb54 100644 --- a/io.sc.platform.system.frontend/src/views/org/Org.vue +++ b/io.sc.platform.system.frontend/src/views/org/Org.vue @@ -121,6 +121,7 @@ - + diff --git a/io.sc.standard.frontend/src/views/standard/Bond.vue b/io.sc.standard.frontend/src/views/standard/Bond.vue index 89d154c4..5fbeefa0 100644 --- a/io.sc.standard.frontend/src/views/standard/Bond.vue +++ b/io.sc.standard.frontend/src/views/standard/Bond.vue @@ -102,5 +102,6 @@ > diff --git a/io.sc.standard.frontend/src/views/standard/BussinessProduct.vue b/io.sc.standard.frontend/src/views/standard/BussinessProduct.vue index e5de1254..0113b383 100644 --- a/io.sc.standard.frontend/src/views/standard/BussinessProduct.vue +++ b/io.sc.standard.frontend/src/views/standard/BussinessProduct.vue @@ -98,5 +98,6 @@ > diff --git a/io.sc.standard.frontend/src/views/standard/Collateral.vue b/io.sc.standard.frontend/src/views/standard/Collateral.vue index d1d58b2c..c8fd9663 100644 --- a/io.sc.standard.frontend/src/views/standard/Collateral.vue +++ b/io.sc.standard.frontend/src/views/standard/Collateral.vue @@ -103,5 +103,6 @@ > diff --git a/io.sc.standard.frontend/src/views/standard/Counterparty.vue b/io.sc.standard.frontend/src/views/standard/Counterparty.vue index 671b311e..e1bb9762 100644 --- a/io.sc.standard.frontend/src/views/standard/Counterparty.vue +++ b/io.sc.standard.frontend/src/views/standard/Counterparty.vue @@ -72,5 +72,6 @@ > diff --git a/io.sc.standard.frontend/src/views/standard/Country.vue b/io.sc.standard.frontend/src/views/standard/Country.vue index cbf6ebaa..687af97c 100644 --- a/io.sc.standard.frontend/src/views/standard/Country.vue +++ b/io.sc.standard.frontend/src/views/standard/Country.vue @@ -124,6 +124,7 @@ > diff --git a/io.sc.standard.frontend/src/views/standard/Industry.vue b/io.sc.standard.frontend/src/views/standard/Industry.vue index 304f774d..b714d96c 100644 --- a/io.sc.standard.frontend/src/views/standard/Industry.vue +++ b/io.sc.standard.frontend/src/views/standard/Industry.vue @@ -101,5 +101,6 @@ > diff --git a/io.sc.standard.frontend/src/views/standard/LoanProduct.vue b/io.sc.standard.frontend/src/views/standard/LoanProduct.vue index 53c3c0a6..2a9117cd 100644 --- a/io.sc.standard.frontend/src/views/standard/LoanProduct.vue +++ b/io.sc.standard.frontend/src/views/standard/LoanProduct.vue @@ -98,5 +98,6 @@ > diff --git a/io.sc.standard.frontend/src/views/standard/PerformanceStatus.vue b/io.sc.standard.frontend/src/views/standard/PerformanceStatus.vue index 05ab39a6..62218e9f 100644 --- a/io.sc.standard.frontend/src/views/standard/PerformanceStatus.vue +++ b/io.sc.standard.frontend/src/views/standard/PerformanceStatus.vue @@ -69,5 +69,6 @@ > diff --git a/io.sc.standard.frontend/src/views/standard/TradeFinanceProduct.vue b/io.sc.standard.frontend/src/views/standard/TradeFinanceProduct.vue index ca21f826..e1805927 100644 --- a/io.sc.standard.frontend/src/views/standard/TradeFinanceProduct.vue +++ b/io.sc.standard.frontend/src/views/standard/TradeFinanceProduct.vue @@ -98,5 +98,6 @@ > diff --git a/io.sc.standard.frontend/webpack.config.common.cjs b/io.sc.standard.frontend/webpack.config.common.cjs index f83a66c3..e8726c5b 100644 --- a/io.sc.standard.frontend/webpack.config.common.cjs +++ b/io.sc.standard.frontend/webpack.config.common.cjs @@ -58,6 +58,9 @@ module.exports = { { loader: 'postcss-loader', }, + { + loader: 'sass-loader', + }, ], }, diff --git a/io.sc.website/package.json b/io.sc.website/package.json index 8781bce7..ee7b0ab7 100644 --- a/io.sc.website/package.json +++ b/io.sc.website/package.json @@ -28,6 +28,6 @@ }, "dependencies": { "vue": "3.5.10", - "platform-core": "8.1.391" + "platform-core": "8.1.405" } } \ No newline at end of file