Merge remote-tracking branch 'origin/develop-2.1.0' into develop-2.1.0

mgqa34 · Feb 28, 2024 · 3ae8375 · 3ae8375
2 parents dd1a606 + 42cbdeb
commit 3ae8375
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git 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/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fateboard</groupId>
     <artifactId>fateboard</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

diff --git 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<unknown> {
   ConsolePrinting?: boolean;
@@ -149,7 +150,12 @@ export default function HTTPRequest<B extends BasicConfigForParameter>(
             const fileReader: FileReader = new FileReader();
 
             fileReader.addEventListener('loadend', function () {
-              const result = JSON.parse(<string>fileReader.result);
+              let result
+              if (filename.match(/json/i)) {
+                result = JSON.parse(<string>fileReader.result);
+              } else {
+                result = JSYmal.load(fileReader.result)
+              }
               if (result.code !== undefined) {
                 resolve(<unknown>bodyExplain(result));
               } else {

diff --git 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
@@ -1,3 +1,4 @@
 declare module 'encryptlong';
 declare module 'file-saver';
 declare module 'lodash-es';
+declare module 'js-yaml';