diff --git a/RELEASE.md b/RELEASE.md index ffa5313d..576b4fab 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,12 @@ +# Release 2.1.0 + +#### Major Features and Improvements +**Major Features** + +* Added table targeting search for summary display +* Limit the zoom range of line charts and bar charts +* Display problem optimization + # Release 2.0.0 #### Major Features and Improvements diff --git a/bin/service.sh b/bin/service.sh index 78f018cd..f39fbeff 100644 --- a/bin/service.sh +++ b/bin/service.sh @@ -80,10 +80,12 @@ eval action=\$$# main_class=org.fedai.fate.board.bootstrap.Bootstrap module=fateboard -version=2.0.0 +version=2.1.0 +start_type=background if [ $action = starting ];then action=start + start_type=front elif [ $action = restarting ];then action=restart fi @@ -252,7 +254,7 @@ start() { cmd="$JAVA_HOME/bin/java -Dspring.config.location=$configpath/application.properties -Dssh_config_file=$basepath/ssh/ -Xmx2048m -Xms2048m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError -cp $libpath/*:$basepath/${module}-${version}.jar ${main_class}" print_info "The command is: $cmd" - if [[ $1 == "front" ]]; then + if [[ ${start_type} == "front" ]]; then exec $cmd >> ${BOARD_HOME}/logs/bootstrap.${module}.out 2>>${BOARD_HOME}/logs/bootstrap.${module}.err else exec $cmd >> ${BOARD_HOME}/logs/bootstrap.${module}.out 2>>${BOARD_HOME}/logs/bootstrap.${module}.err & diff --git a/pom.xml b/pom.xml index 04d91f95..44c52410 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 fateboard fateboard - 2.0.0 + 2.1.0 org.springframework.boot diff --git a/resources-front-end/package.json b/resources-front-end/package.json index 5ba2d8b6..9ac168de 100644 --- a/resources-front-end/package.json +++ b/resources-front-end/package.json @@ -53,7 +53,7 @@ "vue": "^3.3.4" }, "scripts": { - "dev": "lerna run dev --scope=fate-board", + "dev": "lerna run build && lerna run dev --scope=fate-board", "build": "lerna run build" } } diff --git a/resources-front-end/packages/fate-board/src/transform/metric/summary.ts b/resources-front-end/packages/fate-board/src/transform/metric/summary.ts index a1161c4c..ba77b5c8 100644 --- a/resources-front-end/packages/fate-board/src/transform/metric/summary.ts +++ b/resources-front-end/packages/fate-board/src/transform/metric/summary.ts @@ -143,7 +143,10 @@ export default function Summary( }, parameter: ['SummaryMetricSelection.modelValue'], } - : tableData + : tableData, + { + needSearch: true + } ) ); diff --git a/resources-front-end/packages/fate-board/src/views/detail/Information/DataOutput.vue b/resources-front-end/packages/fate-board/src/views/detail/Information/DataOutput.vue index cd9c5be5..1fa30293 100644 --- a/resources-front-end/packages/fate-board/src/views/detail/Information/DataOutput.vue +++ b/resources-front-end/packages/fate-board/src/views/detail/Information/DataOutput.vue @@ -1,155 +1,155 @@ - - - - - + + + + + diff --git a/resources-front-end/packages/fate-board/src/views/history/filter/Filter.vue b/resources-front-end/packages/fate-board/src/views/history/filter/Filter.vue index ee50f92f..f040fa43 100644 --- a/resources-front-end/packages/fate-board/src/views/history/filter/Filter.vue +++ b/resources-front-end/packages/fate-board/src/views/history/filter/Filter.vue @@ -105,7 +105,7 @@ onBeforeUnmount(() => { } :deep(.el-form-item__content) { - max-width: 140px; + width: 140px; } .h-filter-btn { 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 6fc48291..2cd8ec9a 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 @@ -32,7 +32,9 @@ const requesting = ref(true) // table header confgiuration const header = computed(() => { return cols( - (content: string, { $index }: any) => data[$index].notes = content, + (content: string, { $index }: any) => { + data[$index].notes = content + }, () => dataRequest(), () => dataRequest()) }); diff --git a/resources-front-end/packages/fate-tools/lib/toRequest/service.ts b/resources-front-end/packages/fate-tools/lib/toRequest/service.ts index aab8dc92..d966ea21 100644 --- a/resources-front-end/packages/fate-tools/lib/toRequest/service.ts +++ b/resources-front-end/packages/fate-tools/lib/toRequest/service.ts @@ -7,6 +7,7 @@ import axios, { import { ElMessage } from 'element-plus'; import { isBoolean, isNull, isObject, isUndefined } from 'lodash'; import toFile from '../toFile'; +import JSYmal from 'js-yaml'; export interface BasicConfigForParameter extends CreateAxiosDefaults { ConsolePrinting?: boolean; @@ -149,7 +150,12 @@ export default function HTTPRequest( const fileReader: FileReader = new FileReader(); fileReader.addEventListener('loadend', function () { - const result = JSON.parse(fileReader.result); + let result + if (filename.match(/json/i)) { + result = JSON.parse(fileReader.result); + } else { + result = JSYmal.load(fileReader.result) + } if (result.code !== undefined) { resolve(bodyExplain(result)); } else { diff --git a/resources-front-end/packages/fate-tools/package.json b/resources-front-end/packages/fate-tools/package.json index 485ffa86..c4f602e4 100644 --- a/resources-front-end/packages/fate-tools/package.json +++ b/resources-front-end/packages/fate-tools/package.json @@ -16,7 +16,8 @@ "build:dev": "tsc && webpack --mode=development" }, "dependencies": { - "axios": "^1.5.1", + "axios": "^1.6.4", + "js-yaml": "^4.1.0", "encryptlong": "^3.1.4", "file-saver": "^2.0.5" }, diff --git a/resources-front-end/packages/fate-tools/shims.d.ts b/resources-front-end/packages/fate-tools/shims.d.ts index f8844c97..4043b705 100644 --- a/resources-front-end/packages/fate-tools/shims.d.ts +++ b/resources-front-end/packages/fate-tools/shims.d.ts @@ -1,3 +1,4 @@ declare module 'encryptlong'; declare module 'file-saver'; declare module 'lodash-es'; +declare module 'js-yaml'; diff --git a/resources-front-end/packages/fate-ui-component/html/Table.vue b/resources-front-end/packages/fate-ui-component/html/Table.vue index af9528b4..a028bd0e 100644 --- a/resources-front-end/packages/fate-ui-component/html/Table.vue +++ b/resources-front-end/packages/fate-ui-component/html/Table.vue @@ -5,10 +5,12 @@ :data="dataForTable" :current="currentPage" :size="pageSize" + :total="dataForTable.length" :index="true" :row-class-name="rowClassName" :range="range" - :column="true" + :column="false" + :needSearch="true" position="right" @sizeChange="sizeChange" @currentChange="currentChange" diff --git a/resources-front-end/packages/fate-ui-component/lib/components/Table/Table.scss b/resources-front-end/packages/fate-ui-component/lib/components/Table/Table.scss index cc871636..241b2725 100644 --- a/resources-front-end/packages/fate-ui-component/lib/components/Table/Table.scss +++ b/resources-front-end/packages/fate-ui-component/lib/components/Table/Table.scss @@ -7,6 +7,18 @@ align-items: center; justify-content: flex-end; + .fb-table-searching { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 12px; + + .fb-table-pagination-search { + max-width: 240px; + } + } + .fb-table-columns { width: 100%; flex: 1 1 95%; 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 23956247..8887310c 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,6 +1,15 @@