diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index 7ed34f509d..7a6879be0c 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -76,6 +76,7 @@ module.exports = { 'no-underscore-dangle': 'off', 'vue/attributes-order': 1, 'simple-import-sort/exports': 'error', + 'no-case-declarations': 'off', // 调整导入语句的顺序 'simple-import-sort/imports': [ 'error', @@ -97,6 +98,7 @@ module.exports = { '^color$', '^localforage$', 'vue-draggable-plus', + 'jsonpath-plus', ], // node依赖 ['.*/assets/.*', '^@/assets$'], // 项目静态资源 ['^@/components/pure/.*', '^@/components/business/.*', '.*\\.vue$'], // 组件 diff --git a/frontend/package.json b/frontend/package.json index d133189bd4..a1c7915580 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -48,6 +48,7 @@ "@tiptap/vue-3": "^2.1.13", "@types/color": "^3.0.4", "@vueuse/core": "^10.4.1", + "@xmldom/xmldom": "^0.8.10", "ace-builds": "^1.24.2", "ahooks-vue": "^0.15.1", "axios": "^1.6.5", @@ -56,6 +57,7 @@ "fastq": "^1.15.0", "hotbox-minder": "1.0.15", "jsencrypt": "^3.3.2", + "jsonpath-plus": "^8.0.0", "localforage": "^1.10.0", "lodash-es": "^4.17.21", "mitt": "^3.0.1", @@ -75,7 +77,9 @@ "vue-i18n": "^9.3.0", "vue-router": "^4.2.4", "vue3-ace-editor": "^2.2.3", - "vue3-colorpicker": "^2.2.2" + "vue3-colorpicker": "^2.2.2", + "xml-beautify": "^1.2.3", + "xpath": "^0.0.34" }, "devDependencies": { "@arco-plugins/vite-vue": "^1.4.5", diff --git a/frontend/src/api/modules/api-test/index.ts b/frontend/src/api/modules/api-test/index.ts index 94364c1d45..2c7b2e2275 100644 --- a/frontend/src/api/modules/api-test/index.ts +++ b/frontend/src/api/modules/api-test/index.ts @@ -1,17 +1,16 @@ import MSR from '@/api/http/index'; import { GetApiTestList, GetApiTestListUrl } from '@/api/requrls/api-test'; -import { APIListItemI } from '@/models/api-test'; import { CommonList, TableQueryParams } from '@/models/common'; export function getTableList(params: TableQueryParams) { const { current, pageSize, sort, filter, keyword } = params; - return MSR.post>({ + return MSR.post>({ url: GetApiTestList, data: { current, pageSize, sort, filter, keyword, projectId: 'test-project-id' }, }); } export function getlist() { - return MSR.get>({ url: GetApiTestListUrl }); + return MSR.get>({ url: GetApiTestListUrl }); } diff --git a/frontend/src/assets/icon-font/iconfont.css b/frontend/src/assets/icon-font/iconfont.css index cdcf17cb24..7f4cf0fab7 100644 --- a/frontend/src/assets/icon-font/iconfont.css +++ b/frontend/src/assets/icon-font/iconfont.css @@ -1,7 +1,7 @@ @font-face { font-family: iconfont; /* Project id 3462279 */ - src: url('iconfont.woff2?t=1702433539155') format('woff2'), url('iconfont.woff?t=1702433539155') format('woff'), - url('iconfont.ttf?t=1702433539155') format('truetype'), url('iconfont.svg?t=1702433539155#iconfont') format('svg'); + src: url('iconfont.woff2?t=1705549750803') format('woff2'), url('iconfont.woff?t=1705549750803') format('woff'), + url('iconfont.ttf?t=1705549750803') format('truetype'), url('iconfont.svg?t=1705549750803#iconfont') format('svg'); } .iconfont { font-size: 16px; @@ -10,6 +10,18 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-icon_carriage_return2::before { + content: '\e79a'; +} +.icon-icon_carriage_return1::before { + content: '\e799'; +} +.icon-icon_swagger::before { + content: '\e798'; +} +.icon-a-icon_file-json::before { + content: '\e797'; +} .icon-icon_keyboard::before { content: '\e796'; } diff --git a/frontend/src/assets/icon-font/iconfont.js b/frontend/src/assets/icon-font/iconfont.js index a07ad652aa..f11ec41353 100644 --- a/frontend/src/assets/icon-font/iconfont.js +++ b/frontend/src/assets/icon-font/iconfont.js @@ -1,5 +1,5 @@ (window._iconfont_svg_string_3462279 = - ''), + ''), (function (h) { var a = (a = document.getElementsByTagName('script'))[a.length - 1], l = a.getAttribute('data-injectcss'), diff --git a/frontend/src/assets/icon-font/iconfont.json b/frontend/src/assets/icon-font/iconfont.json index bd29ed70f4..3077b1f206 100644 --- a/frontend/src/assets/icon-font/iconfont.json +++ b/frontend/src/assets/icon-font/iconfont.json @@ -5,6 +5,34 @@ "css_prefix_text": "icon-", "description": "DE、MS项目icon管理", "glyphs": [ + { + "icon_id": "38923289", + "name": "icon_carriage_return", + "font_class": "icon_carriage_return2", + "unicode": "e79a", + "unicode_decimal": 59290 + }, + { + "icon_id": "38923258", + "name": "icon_delete", + "font_class": "icon_carriage_return1", + "unicode": "e799", + "unicode_decimal": 59289 + }, + { + "icon_id": "38884170", + "name": "icon_swagger", + "font_class": "icon_swagger", + "unicode": "e798", + "unicode_decimal": 59288 + }, + { + "icon_id": "38747707", + "name": "icon_file- json", + "font_class": "a-icon_file-json", + "unicode": "e797", + "unicode_decimal": 59287 + }, { "icon_id": "38499852", "name": "icon_keyboard", diff --git a/frontend/src/assets/icon-font/iconfont.svg b/frontend/src/assets/icon-font/iconfont.svg index ba42440b65..02bf9776a8 100644 --- a/frontend/src/assets/icon-font/iconfont.svg +++ b/frontend/src/assets/icon-font/iconfont.svg @@ -14,6 +14,14 @@ /> + + + + + + + + diff --git a/frontend/src/assets/icon-font/iconfont.ttf b/frontend/src/assets/icon-font/iconfont.ttf index c649173843..f8584e10fb 100644 Binary files a/frontend/src/assets/icon-font/iconfont.ttf and b/frontend/src/assets/icon-font/iconfont.ttf differ diff --git a/frontend/src/assets/icon-font/iconfont.woff b/frontend/src/assets/icon-font/iconfont.woff index 3a3b0f52ea..aaa08498f1 100644 Binary files a/frontend/src/assets/icon-font/iconfont.woff and b/frontend/src/assets/icon-font/iconfont.woff differ diff --git a/frontend/src/assets/icon-font/iconfont.woff2 b/frontend/src/assets/icon-font/iconfont.woff2 index 7ec961574b..bd1a47ad9f 100644 Binary files a/frontend/src/assets/icon-font/iconfont.woff2 and b/frontend/src/assets/icon-font/iconfont.woff2 differ diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index 7d01178b40..a2deb9eb54 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -177,6 +177,12 @@ .btn-text-sec-active(); .btn-text-sec-disabled(); } +.arco-btn-text--secondary { + color: var(--color-text-3) !important; + .btn-text-sec-hover(); + .btn-text-sec-active(); + .btn-text-sec-disabled(); +} .arco-btn-text--danger { color: rgb(var(--danger-6)) !important; .btn-text-danger-hover(); diff --git a/frontend/src/components/business/ms-params-input/index.vue b/frontend/src/components/business/ms-params-input/index.vue index 2ee50870fd..4d4d5aa1db 100644 --- a/frontend/src/components/business/ms-params-input/index.vue +++ b/frontend/src/components/business/ms-params-input/index.vue @@ -211,7 +211,7 @@ @select="selectAutoComplete" >