diff --git a/console/atest-ui/index.html b/console/atest-ui/index.html index bf4815fe..9ed8ca5b 100644 --- a/console/atest-ui/index.html +++ b/console/atest-ui/index.html @@ -1,5 +1,5 @@ - + diff --git a/console/atest-ui/package-lock.json b/console/atest-ui/package-lock.json index 64c5324d..d0cd015e 100644 --- a/console/atest-ui/package-lock.json +++ b/console/atest-ui/package-lock.json @@ -11,14 +11,14 @@ "@vueuse/core": "^10.11.0", "codemirror": "^5.65.17", "diff-match-patch": "^1.0.5", - "element-plus": "^2.9.6", + "element-plus": "^2.10.2", "intro.js": "^7.0.1", "jsonlint-mod": "^1.7.6", - "jsonpath-plus": "^10.0.7", + "jsonpath-plus": "10.3.0", "skywalking-client-js": "^0.10.0", "vue": "^3.3.4", "vue-codemirror": "^5.1.0", - "vue-i18n": "^9.2.2", + "vue-i18n": "11.1.2", "vue-json-viewer": "^3.0.4", "vue-router": "^4.2.2" }, @@ -1559,60 +1559,47 @@ } }, "node_modules/@intlify/core-base": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz", - "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==", + "version": "11.1.2", + "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-11.1.2.tgz", + "integrity": "sha512-nmG512G8QOABsserleechwHGZxzKSAlggGf9hQX0nltvSwyKNVuB/4o6iFeG2OnjXK253r8p8eSDOZf8PgFdWw==", + "license": "MIT", "dependencies": { - "@intlify/devtools-if": "9.2.2", - "@intlify/message-compiler": "9.2.2", - "@intlify/shared": "9.2.2", - "@intlify/vue-devtools": "9.2.2" + "@intlify/message-compiler": "11.1.2", + "@intlify/shared": "11.1.2" }, "engines": { - "node": ">= 14" - } - }, - "node_modules/@intlify/devtools-if": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz", - "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==", - "dependencies": { - "@intlify/shared": "9.2.2" + "node": ">= 16" }, - "engines": { - "node": ">= 14" + "funding": { + "url": "https://github.com/sponsors/kazupon" } }, "node_modules/@intlify/message-compiler": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz", - "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==", + "version": "11.1.2", + "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-11.1.2.tgz", + "integrity": "sha512-T/xbNDzi+Yv0Qn2Dfz2CWCAJiwNgU5d95EhhAEf4YmOgjCKktpfpiUSmLcBvK1CtLpPQ85AMMQk/2NCcXnNj1g==", + "license": "MIT", "dependencies": { - "@intlify/shared": "9.2.2", - "source-map": "0.6.1" + "@intlify/shared": "11.1.2", + "source-map-js": "^1.0.2" }, "engines": { - "node": ">= 14" + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/kazupon" } }, "node_modules/@intlify/shared": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz", - "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==", + "version": "11.1.2", + "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-11.1.2.tgz", + "integrity": "sha512-dF2iMMy8P9uKVHV/20LA1ulFLL+MKSbfMiixSmn6fpwqzvix38OIc7ebgnFbBqElvghZCW9ACtzKTGKsTGTWGA==", + "license": "MIT", "engines": { - "node": ">= 14" - } - }, - "node_modules/@intlify/vue-devtools": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz", - "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==", - "dependencies": { - "@intlify/core-base": "9.2.2", - "@intlify/shared": "9.2.2" + "node": ">= 16" }, - "engines": { - "node": ">= 14" + "funding": { + "url": "https://github.com/sponsors/kazupon" } }, "node_modules/@istanbuljs/load-nyc-config": { @@ -4934,9 +4921,10 @@ "dev": true }, "node_modules/element-plus": { - "version": "2.9.6", - "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.9.6.tgz", - "integrity": "sha512-D9zU28Ce0s/9O/Vp3ewemikxzFVA6gdZyMwmWijHijo+t5/9H3sHRTIm1WlfeNpFW2Yq0y8nHXD0fU5YxU6qlQ==", + "version": "2.10.2", + "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.10.2.tgz", + "integrity": "sha512-p2KiAa0jEGXrzdlTAfpiS7HQFAhla4gvx6H7RuDf+OO0uC3DGpolxvdHjFR8gt7+vaWyxQNcHa1sAdBkmjqlgA==", + "license": "MIT", "dependencies": { "@ctrl/tinycolor": "^3.4.1", "@element-plus/icons-vue": "^2.3.1", @@ -8921,13 +8909,14 @@ } }, "node_modules/jsonpath-plus": { - "version": "10.0.7", - "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-10.0.7.tgz", - "integrity": "sha512-GDA8d8fu9+s4QzAzo5LMGiLL/9YjecAX+ytlnqdeXYpU55qME57StDgaHt9R2pA7Dr8U31nwzxNJMJiHkrkRgw==", + "version": "10.3.0", + "resolved": "https://registry.npmmirror.com/jsonpath-plus/-/jsonpath-plus-10.3.0.tgz", + "integrity": "sha512-8TNmfeTCk2Le33A3vRRwtuworG/L5RrgMvdjhKZxvyShO+mBu2fP50OWUjRLNtvw344DdDarFh9buFAZs5ujeA==", + "license": "MIT", "dependencies": { - "@jsep-plugin/assignment": "^1.2.1", - "@jsep-plugin/regex": "^1.0.3", - "jsep": "^1.3.9" + "@jsep-plugin/assignment": "^1.3.0", + "@jsep-plugin/regex": "^1.0.4", + "jsep": "^1.4.0" }, "bin": { "jsonpath": "bin/jsonpath-cli.js", @@ -10784,6 +10773,7 @@ "version": "0.6.1", "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -11904,17 +11894,20 @@ } }, "node_modules/vue-i18n": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz", - "integrity": "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==", + "version": "11.1.2", + "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-11.1.2.tgz", + "integrity": "sha512-MfdkdKGUHN+jkkaMT5Zbl4FpRmN7kfelJIwKoUpJ32ONIxdFhzxZiLTVaAXkAwvH3y9GmWpoiwjDqbPIkPIMFA==", + "license": "MIT", "dependencies": { - "@intlify/core-base": "9.2.2", - "@intlify/shared": "9.2.2", - "@intlify/vue-devtools": "9.2.2", - "@vue/devtools-api": "^6.2.1" + "@intlify/core-base": "11.1.2", + "@intlify/shared": "11.1.2", + "@vue/devtools-api": "^6.5.0" }, "engines": { - "node": ">= 14" + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/kazupon" }, "peerDependencies": { "vue": "^3.0.0" @@ -13306,46 +13299,27 @@ "dev": true }, "@intlify/core-base": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz", - "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==", + "version": "11.1.2", + "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-11.1.2.tgz", + "integrity": "sha512-nmG512G8QOABsserleechwHGZxzKSAlggGf9hQX0nltvSwyKNVuB/4o6iFeG2OnjXK253r8p8eSDOZf8PgFdWw==", "requires": { - "@intlify/devtools-if": "9.2.2", - "@intlify/message-compiler": "9.2.2", - "@intlify/shared": "9.2.2", - "@intlify/vue-devtools": "9.2.2" - } - }, - "@intlify/devtools-if": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz", - "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==", - "requires": { - "@intlify/shared": "9.2.2" + "@intlify/message-compiler": "11.1.2", + "@intlify/shared": "11.1.2" } }, "@intlify/message-compiler": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz", - "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==", + "version": "11.1.2", + "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-11.1.2.tgz", + "integrity": "sha512-T/xbNDzi+Yv0Qn2Dfz2CWCAJiwNgU5d95EhhAEf4YmOgjCKktpfpiUSmLcBvK1CtLpPQ85AMMQk/2NCcXnNj1g==", "requires": { - "@intlify/shared": "9.2.2", - "source-map": "0.6.1" + "@intlify/shared": "11.1.2", + "source-map-js": "^1.0.2" } }, "@intlify/shared": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz", - "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==" - }, - "@intlify/vue-devtools": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz", - "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==", - "requires": { - "@intlify/core-base": "9.2.2", - "@intlify/shared": "9.2.2" - } + "version": "11.1.2", + "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-11.1.2.tgz", + "integrity": "sha512-dF2iMMy8P9uKVHV/20LA1ulFLL+MKSbfMiixSmn6fpwqzvix38OIc7ebgnFbBqElvghZCW9ACtzKTGKsTGTWGA==" }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", @@ -15927,9 +15901,9 @@ "dev": true }, "element-plus": { - "version": "2.9.6", - "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.9.6.tgz", - "integrity": "sha512-D9zU28Ce0s/9O/Vp3ewemikxzFVA6gdZyMwmWijHijo+t5/9H3sHRTIm1WlfeNpFW2Yq0y8nHXD0fU5YxU6qlQ==", + "version": "2.10.2", + "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.10.2.tgz", + "integrity": "sha512-p2KiAa0jEGXrzdlTAfpiS7HQFAhla4gvx6H7RuDf+OO0uC3DGpolxvdHjFR8gt7+vaWyxQNcHa1sAdBkmjqlgA==", "requires": { "@ctrl/tinycolor": "^3.4.1", "@element-plus/icons-vue": "^2.3.1", @@ -18909,13 +18883,13 @@ } }, "jsonpath-plus": { - "version": "10.0.7", - "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-10.0.7.tgz", - "integrity": "sha512-GDA8d8fu9+s4QzAzo5LMGiLL/9YjecAX+ytlnqdeXYpU55qME57StDgaHt9R2pA7Dr8U31nwzxNJMJiHkrkRgw==", + "version": "10.3.0", + "resolved": "https://registry.npmmirror.com/jsonpath-plus/-/jsonpath-plus-10.3.0.tgz", + "integrity": "sha512-8TNmfeTCk2Le33A3vRRwtuworG/L5RrgMvdjhKZxvyShO+mBu2fP50OWUjRLNtvw344DdDarFh9buFAZs5ujeA==", "requires": { - "@jsep-plugin/assignment": "^1.2.1", - "@jsep-plugin/regex": "^1.0.3", - "jsep": "^1.3.9" + "@jsep-plugin/assignment": "^1.3.0", + "@jsep-plugin/regex": "^1.0.4", + "jsep": "^1.4.0" } }, "jsprim": { @@ -20336,7 +20310,8 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true }, "source-map-js": { "version": "1.0.2", @@ -21141,14 +21116,13 @@ } }, "vue-i18n": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz", - "integrity": "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==", - "requires": { - "@intlify/core-base": "9.2.2", - "@intlify/shared": "9.2.2", - "@intlify/vue-devtools": "9.2.2", - "@vue/devtools-api": "^6.2.1" + "version": "11.1.2", + "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-11.1.2.tgz", + "integrity": "sha512-MfdkdKGUHN+jkkaMT5Zbl4FpRmN7kfelJIwKoUpJ32ONIxdFhzxZiLTVaAXkAwvH3y9GmWpoiwjDqbPIkPIMFA==", + "requires": { + "@intlify/core-base": "11.1.2", + "@intlify/shared": "11.1.2", + "@vue/devtools-api": "^6.5.0" } }, "vue-json-viewer": { diff --git a/console/atest-ui/package.json b/console/atest-ui/package.json index d2991ec6..05f91d38 100644 --- a/console/atest-ui/package.json +++ b/console/atest-ui/package.json @@ -19,14 +19,14 @@ "@vueuse/core": "^10.11.0", "codemirror": "^5.65.17", "diff-match-patch": "^1.0.5", - "element-plus": "^2.9.6", + "element-plus": "^2.10.2", "intro.js": "^7.0.1", "jsonlint-mod": "^1.7.6", - "jsonpath-plus": "^10.0.7", + "jsonpath-plus": "^10.3.0", "skywalking-client-js": "^0.10.0", "vue": "^3.3.4", "vue-codemirror": "^5.1.0", - "vue-i18n": "^9.2.2", + "vue-i18n": "^11.1.2", "vue-json-viewer": "^3.0.4", "vue-router": "^4.2.2" }, diff --git a/console/atest-ui/src/App.vue b/console/atest-ui/src/App.vue index 845f078d..b64fcb5c 100644 --- a/console/atest-ui/src/App.vue +++ b/console/atest-ui/src/App.vue @@ -147,6 +147,8 @@ const toHistoryPanel = ({ ID: selectID, panelName: historyPanelName }) => { + + diff --git a/console/atest-ui/src/main.ts b/console/atest-ui/src/main.ts index 835b3617..10e444e4 100644 --- a/console/atest-ui/src/main.ts +++ b/console/atest-ui/src/main.ts @@ -13,6 +13,7 @@ import en from './locales/en.json' import zh from './locales/zh.json' import ClientMonitor from 'skywalking-client-js' import { name, version } from '../package' +import 'element-plus/theme-chalk/dark/css-vars.css' const app = createApp(App) diff --git a/console/atest-ui/src/theme.ts b/console/atest-ui/src/theme.ts index 0c5e0341..8426857e 100644 --- a/console/atest-ui/src/theme.ts +++ b/console/atest-ui/src/theme.ts @@ -1,27 +1,3 @@ -const lightTheme: { [k: string]: string } = { - '--color-background': 'var(--vt-c-white)', - '--color-background-soft': 'var(--vt-c-white-soft)', - '--color-background-mute': 'var(--vt-c-white-mute)', - '--color-border': 'var(--vt-c-divider-light-2)', - '--color-border-hover': 'var(--vt-c-divider-light-1)', - '--color-heading': 'var(--vt-c-text-light-1)', - '--color-text': 'var(--vt-c-text-light-1)' -} - -const darkTheme: { [k: string]: string } = { - '--color-background': 'var(--vt-c-black)', - '--color-background-soft': 'var(--vt-c-black-soft)', - '--color-background-mute': 'var(--vt-c-black-mute)', - '--color-border': 'var(--vt-c-divider-dark-2)', - '--color-border-hover': 'var(--vt-c-divider-dark-1)', - '--color-heading': 'var(--vt-c-text-dark-1)', - '--color-text': 'var(--vt-c-text-dark-2)' -} - - export default function setAsDarkTheme(darkMode: boolean) { - const theme = darkMode ? darkTheme : lightTheme - Object.keys(theme).forEach((key) => { - document.documentElement.style.setProperty(key, theme[key]) - }) + document.documentElement.className = darkMode ? 'dark' : 'light' }