diff --git a/build/constant.ts b/build/constant.ts index 38ff0454..1d033f12 100644 --- a/build/constant.ts +++ b/build/constant.ts @@ -1,3 +1,4 @@ +import path from 'path' export const OUTPUT_DIR = 'dist' // monaco-editor 路径 @@ -6,7 +7,7 @@ export const prefix = `monaco-editor/esm/vs` // chunk 警告大小 export const chunkSizeWarningLimit = 2000 -// 禁用 brotli 压缩大小报告 +// 禁用 brotliSize 压缩大小报告 export const brotliSize = false // 分包 @@ -14,7 +15,12 @@ export const rollupOptions = { output: { chunkFileNames: 'static/js/[name]-[hash].js', entryFileNames: 'static/js/[name]-[hash].js', - assetFileNames: 'static/[ext]/[name]-[hash].[ext]', + assetFileNames: (chunkInfo) => { + if(['.png', '.jpg', '.jpeg'].includes(path.extname(chunkInfo.name))) { + return `static/[ext]/[name].[ext]` + } + return `static/[ext]/[name]-[hash].[ext]` + }, manualChunks: { jsonWorker: [`${prefix}/language/json/json.worker`], cssWorker: [`${prefix}/language/css/css.worker`], diff --git a/package.json b/package.json index a08b8897..bc0f5a13 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "axios": "^0.27.2", "color": "^4.2.3", "crypto-js": "^4.1.1", + "dom-helpers": "^5.2.1", "echarts-liquidfill": "^3.1.0", "echarts-stat": "^1.2.0", "echarts-wordcloud": "^2.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eb14f9e6..7a0f90e3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,6 +25,7 @@ specifiers: commitlint: ^17.0.2 crypto-js: ^4.1.1 default-passive-events: ^2.0.0 + dom-helpers: ^5.2.1 echarts: ^5.3.2 echarts-liquidfill: ^3.1.0 echarts-stat: ^1.2.0 @@ -77,6 +78,7 @@ dependencies: axios: 0.27.2 color: 4.2.3 crypto-js: 4.1.1 + dom-helpers: 5.2.1 echarts-liquidfill: 3.1.0_echarts@5.3.3 echarts-stat: 1.2.0 echarts-wordcloud: 2.0.0_echarts@5.3.3 @@ -402,6 +404,13 @@ packages: - supports-color dev: true + /@babel/runtime/7.20.6: + resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.13.11 + dev: false + /@babel/template/7.16.7: resolution: {integrity: sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==} engines: {node: '>=6.9.0'} @@ -1912,7 +1921,7 @@ packages: dev: true /csstype/2.6.20: - resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/csstype/-/csstype-2.6.20.tgz} + resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==} dev: false /csstype/3.0.11: @@ -2065,6 +2074,13 @@ packages: resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==} dev: true + /dom-helpers/5.2.1: + resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==} + dependencies: + '@babel/runtime': 7.20.6 + csstype: 3.0.11 + dev: false + /dom-serializer/1.4.1: resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==} dependencies: @@ -3074,7 +3090,7 @@ packages: source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: 3.16.0 + uglify-js: 3.17.4 dev: true /hard-rejection/2.1.0: @@ -4462,6 +4478,10 @@ packages: strip-indent: 3.0.0 dev: true + /regenerator-runtime/0.13.11: + resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} + dev: false + /regexp.prototype.flags/1.4.3: resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==} engines: {node: '>= 0.4'} @@ -5014,8 +5034,8 @@ packages: hasBin: true dev: true - /uglify-js/3.16.0: - resolution: {integrity: sha512-FEikl6bR30n0T3amyBh3LoiBdqHRy/f4H80+My34HOesOKyHfOsxAPAxOoqC0JUnC1amnO0IwkYC3sko51caSw==} + /uglify-js/3.17.4: + resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==} engines: {node: '>=0.8.0'} hasBin: true requiresBuild: true diff --git a/src/api/http.ts b/src/api/http.ts index 16307d15..a7d8a130 100644 --- a/src/api/http.ts +++ b/src/api/http.ts @@ -116,7 +116,6 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req if (!targetParams || !globalParams) { return } - // 全局 const { // 全局请求源地址 diff --git a/src/assets/images/canvas/noData.png b/src/assets/images/canvas/noData.png new file mode 100644 index 00000000..d65bc8ed Binary files /dev/null and b/src/assets/images/canvas/noData.png differ diff --git a/src/components/GoSystemInfo/index.vue b/src/components/GoSystemInfo/index.vue index 5073c8b9..d38c1e03 100644 --- a/src/components/GoSystemInfo/index.vue +++ b/src/components/GoSystemInfo/index.vue @@ -42,15 +42,21 @@ diff --git a/src/packages/components/Decorates/Mores/FlipperNumber/index.ts b/src/packages/components/Decorates/Mores/FlipperNumber/index.ts index 16aa2137..b4fce9cd 100644 --- a/src/packages/components/Decorates/Mores/FlipperNumber/index.ts +++ b/src/packages/components/Decorates/Mores/FlipperNumber/index.ts @@ -6,7 +6,7 @@ export const FlipperNumberConfig: ConfigType = { key: 'FlipperNumber', chartKey: 'VFlipperNumber', conKey: 'VCFlipperNumber', - title: '数字翻牌', + title: '数字翻牌-需动态触发', category: ChatCategoryEnum.MORE, categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.DECORATES, diff --git a/src/packages/public/publicConfig.ts b/src/packages/public/publicConfig.ts index ab85be64..49dda2b0 100644 --- a/src/packages/public/publicConfig.ts +++ b/src/packages/public/publicConfig.ts @@ -20,7 +20,7 @@ import { chartInitConfig } from '@/settings/designSetting' import cloneDeep from 'lodash/cloneDeep' // 请求基础属性 -const requestConfig: RequestConfigType = { +export const requestConfig: RequestConfigType = { requestDataType: RequestDataTypeEnum.STATIC, requestHttpType: RequestHttpEnum.GET, requestUrl: '', diff --git a/src/plugins/naive.ts b/src/plugins/naive.ts index 9354a285..ab4dbb1f 100644 --- a/src/plugins/naive.ts +++ b/src/plugins/naive.ts @@ -7,6 +7,7 @@ import { NH2, NH3, NH4, + NH5, NCode, NCountdown, NText, @@ -109,6 +110,7 @@ const naive = create({ NH2, NH3, NH4, + NH5, NCode, NCountdown, NText, diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 6d56e05c..51b296ae 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -273,15 +273,21 @@ export const objToCookie = (obj: RequestParamsObjType) => { * @returns */ export const setKeyboardDressShow = (keyCode?: number) => { - const code = new Map([[17, WinKeyboard.CTRL]]) + const code = new Map([ + [17, WinKeyboard.CTRL], + [32, WinKeyboard.SPACE] + ]) const dom = document.getElementById('keyboard-dress-show') if (!dom) return if (!keyCode) { + window.onKeySpacePressHold?.(false) dom.innerText = '' return } if (keyCode && code.has(keyCode)) { + if (keyCode == 32) window.onKeySpacePressHold?.(true) dom.innerText = `按下了「${code.get(keyCode)}」键` } } + diff --git a/src/views/chart/ContentBox/index.vue b/src/views/chart/ContentBox/index.vue index 826bbb85..8f7b5e5d 100644 --- a/src/views/chart/ContentBox/index.vue +++ b/src/views/chart/ContentBox/index.vue @@ -18,14 +18,14 @@ -
-