diff --git a/resources-front-end/packages/fate-board/src/components/Pearson/Pearson.vue b/resources-front-end/packages/fate-board/src/components/Pearson/Pearson.vue index 228226ba..b2d70ecd 100644 --- a/resources-front-end/packages/fate-board/src/components/Pearson/Pearson.vue +++ b/resources-front-end/packages/fate-board/src/components/Pearson/Pearson.vue @@ -4,8 +4,8 @@ class="f-p-table" :header="header" :data="data" - :pageSize="10" - :total="total" + :size="10" + :total="data.length" :index="true" > @@ -40,6 +40,7 @@ :max="1" :min="0" :pearson="false" + :ext="tooltipFormatter" > @@ -49,8 +50,10 @@ diff --git a/resources-front-end/packages/fate-board/src/views/dashboard/Log/Log.vue b/resources-front-end/packages/fate-board/src/views/dashboard/Log/Log.vue index 0e736bcd..59aa580e 100644 --- a/resources-front-end/packages/fate-board/src/views/dashboard/Log/Log.vue +++ b/resources-front-end/packages/fate-board/src/views/dashboard/Log/Log.vue @@ -40,7 +40,7 @@ v-if="(counts as any)[key] > 0" class="f-log-subtab-count" :class="`f-log-${item}-total`" - >({{ (counts as any)[key] }}){{ (counts as any)[key] }} @@ -474,6 +474,7 @@ export default { line-height: 16px; text-align: center; color: #fff; + // font-weight: bold; } } @@ -482,6 +483,9 @@ export default { .f-log-subtab-content { color: var(--el-color-primary); } + .f-log-subtab-count { + font-weight: normal; + } } } .f-log-containers { @@ -496,19 +500,19 @@ export default { } .f-log-error-total { - color: var(--el-color-error) !important; + background-color: var(--el-color-error) !important; } .f-log-warning-total { - color: var(--el-color-warning) !important; + background-color: var(--el-color-warning) !important; } .f-log-info-total { - color: var(--el-color-info) !important; + background-color: var(--el-color-success) !important; } .f-log-debug-total { - color: var(--el-color-primary) !important; + background-color: var(--el-color-primary) !important; } } .f-log-expended { diff --git a/resources-front-end/packages/fate-board/src/views/detail/Detail.vue b/resources-front-end/packages/fate-board/src/views/detail/Detail.vue index 3bfbc472..8538b15a 100644 --- a/resources-front-end/packages/fate-board/src/views/detail/Detail.vue +++ b/resources-front-end/packages/fate-board/src/views/detail/Detail.vue @@ -43,8 +43,9 @@ const jobDataset = computed(() => store.state.job.dataset?.dataset) const btnDisable = ref(true) const componentChoose = async (comp?: any) => { - parameter.value.getParameter(comp) + await parameter.value.getParameter(comp) btnDisable.value = false + dialog.value.refreshed() } const componentRetry = (retryd: boolean) => { diff --git a/resources-front-end/packages/fate-board/src/views/detail/Information/ModelOutput.vue b/resources-front-end/packages/fate-board/src/views/detail/Information/ModelOutput.vue index 561f325a..5635bee2 100644 --- a/resources-front-end/packages/fate-board/src/views/detail/Information/ModelOutput.vue +++ b/resources-front-end/packages/fate-board/src/views/detail/Information/ModelOutput.vue @@ -56,8 +56,8 @@ onBeforeMount(() => { modelComponent(); }); -const refreshing = () => { - store.dispatch('modelRefresh') +const refreshing = async () => { + await store.dispatch('modelRefresh') } defineExpose({ refresh: refreshing diff --git a/resources-front-end/packages/fate-board/src/views/detail/Information/outputs.vue b/resources-front-end/packages/fate-board/src/views/detail/Information/outputs.vue index ac58650c..5ff3a126 100644 --- a/resources-front-end/packages/fate-board/src/views/detail/Information/outputs.vue +++ b/resources-front-end/packages/fate-board/src/views/detail/Information/outputs.vue @@ -9,7 +9,7 @@ :modal="false" class="f-output-dialog" > -
+
Refresh
@@ -44,6 +44,7 @@ const active = ref('model'); const store = useStore(); +const loading = ref(true) const component = computed(() => store.state.comp.information.name); const compType = computed(() => store.state.comp.information.type); const firstModelLabel = computed(() => { @@ -77,15 +78,19 @@ const firstModelLabel = computed(() => { const model = ref() const data = ref() const log = ref() -const refreshing = () => { +const refreshing = async () => { + loading.value = true if (model.value) - model.value.refresh() + await model.value.refresh() if (data.value) - data.value.refresh() + await data.value.refresh() if (log.value) - log.value.refresh() + await log.value.refresh() emits('refresh') } +const refreshed = () => { + loading.value = false +} const on = () => { display.value = true; @@ -97,6 +102,7 @@ const off = () => { defineExpose({ on, off, + refreshed }); diff --git a/resources-front-end/packages/fate-board/src/views/detail/jobSummary/Dataset.vue b/resources-front-end/packages/fate-board/src/views/detail/jobSummary/Dataset.vue index af58393f..3f851995 100644 --- a/resources-front-end/packages/fate-board/src/views/detail/jobSummary/Dataset.vue +++ b/resources-front-end/packages/fate-board/src/views/detail/jobSummary/Dataset.vue @@ -27,7 +27,7 @@ @@ -171,6 +171,8 @@ watch( .f-dataset-popover { @include flex-row(); + align-items: center; + justify-content: flex-start; @include text-size-small(); color: var(--el-color-info-dark-2); @@ -178,6 +180,10 @@ watch( padding-right: $pale; } } + + .f-dataset-view { + @include text-size-small(); + } } .f-dataset-content { diff --git a/resources-front-end/packages/fate-board/src/views/detail/jobSummary/Download.vue b/resources-front-end/packages/fate-board/src/views/detail/jobSummary/Download.vue index 94637caf..c9074c14 100644 --- a/resources-front-end/packages/fate-board/src/views/detail/jobSummary/Download.vue +++ b/resources-front-end/packages/fate-board/src/views/detail/jobSummary/Download.vue @@ -48,7 +48,7 @@ const download = () => { cursor: pointer; :deep(.f-summary-link) { @include text-size-small(); - color: var(--el-color-primary-light-3); + color: var(--el-color-primary); } } diff --git a/resources-front-end/packages/fate-board/src/views/history/table/Table.vue b/resources-front-end/packages/fate-board/src/views/history/table/Table.vue index fdfbefee..8881ebee 100644 --- a/resources-front-end/packages/fate-board/src/views/history/table/Table.vue +++ b/resources-front-end/packages/fate-board/src/views/history/table/Table.vue @@ -7,6 +7,7 @@ :current="parameter.pageNum" :size="parameter.pageSize" :total="total" + :layout="'total, sizes, prev, pager, next'" position="center" class="f-history-table" @sizeChange="sizeChange" diff --git a/resources-front-end/packages/fate-board/src/views/layout/GlobalLayout.vue b/resources-front-end/packages/fate-board/src/views/layout/GlobalLayout.vue index d62dee50..8c0abe8c 100644 --- a/resources-front-end/packages/fate-board/src/views/layout/GlobalLayout.vue +++ b/resources-front-end/packages/fate-board/src/views/layout/GlobalLayout.vue @@ -54,4 +54,14 @@ import LayoutHeader from './LayoutHeader.vue'; @include padding-pale(0, 0); } } + +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.5s ease; +} + +.fade-enter-from, +.fade-leave-to { + opacity: 0 +} diff --git a/resources-front-end/packages/fate-ui-component/lib/components/Table/Table.vue b/resources-front-end/packages/fate-ui-component/lib/components/Table/Table.vue index c3347b0c..51408e05 100644 --- a/resources-front-end/packages/fate-ui-component/lib/components/Table/Table.vue +++ b/resources-front-end/packages/fate-ui-component/lib/components/Table/Table.vue @@ -1,8 +1,8 @@