diff --git a/.husky/lintstagedrc.js b/.husky/lintstagedrc.js index 4448b7864..17f682153 100644 --- a/.husky/lintstagedrc.js +++ b/.husky/lintstagedrc.js @@ -2,7 +2,7 @@ module.exports = { '*.{js,jsx,ts,tsx}': ['eslint --fix', 'prettier --write'], '{!(package)*.json,*.code-snippets,.!(browserslist)*rc}': ['prettier --write--parser json'], 'package.json': ['prettier --write'], - '*.vue': ['prettier --write', 'stylelint --fix'], + '*.vue': ['eslint --fix', 'prettier --write', 'stylelint --fix'], '*.{scss,less,styl,css,html}': ['stylelint --fix', 'prettier --write'], '*.md': ['prettier --write'], }; diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index f9ee423c5..d6e237bfc 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -9,6 +9,7 @@ - 移除 useFullScreen 函数 - tinymce 由 Cdn 改为 npm(打包体积偏大) +- Dashboard 重构 ### 🐛 Bug Fixes diff --git a/build/vite/alias.ts b/build/vite/alias.ts index 73dc02155..25b5e6375 100644 --- a/build/vite/alias.ts +++ b/build/vite/alias.ts @@ -2,7 +2,7 @@ import { resolve } from 'path'; import type { Alias } from 'vite'; function pathResolve(dir: string) { - return resolve(__dirname, '.', dir); + return resolve(process.cwd(), '.', dir); } export function createAlias(alias: [string, string][]): Alias[] { diff --git a/build/vite/plugin/html.ts b/build/vite/plugin/html.ts index dec546cd7..2d776d601 100644 --- a/build/vite/plugin/html.ts +++ b/build/vite/plugin/html.ts @@ -12,7 +12,7 @@ import { GLOB_CONFIG_FILE_NAME } from '../../constant'; export function configHtmlPlugin(env: ViteEnv, isBuild: boolean) { const { VITE_GLOB_APP_TITLE, VITE_PUBLIC_PATH } = env; - const path = VITE_PUBLIC_PATH.endsWith('/') ? VITE_PUBLIC_PATH : `${VITE_PUBLIC_PATH}/`; + const path = VITE_PUBLIC_PATH?.endsWith('/') ? VITE_PUBLIC_PATH : `${VITE_PUBLIC_PATH}/`; const getAppConfigSrc = () => { return `${path || '/'}${GLOB_CONFIG_FILE_NAME}?v=${pkg.version}-${new Date().getTime()}`; diff --git a/package.json b/package.json index fe2c9fec4..bab261e1e 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ }, "scripts": { "bootstrap": "yarn install", - "serve": "npx --max_old_space_size=4096 vite", - "dev": "npx --max_old_space_size=4096 vite", + "serve": "cross-env --max_old_space_size=4096 vite", + "dev": "cross-env --max_old_space_size=4096 vite", "build": "vite build && esno ./build/script/postBuild.ts", "build:no-cache": "yarn clean:cache && npm run build", "report": "cross-env REPORT=true npm run build ", @@ -32,7 +32,7 @@ }, "dependencies": { "@iconify/iconify": "^2.0.0-rc.6", - "@vueuse/core": "^4.6.2", + "@vueuse/core": "^4.6.3", "@zxcvbn-ts/core": "^0.3.0", "ant-design-vue": "^2.1.2", "apexcharts": "^3.26.0", @@ -49,7 +49,7 @@ "sortablejs": "^1.13.0", "tinymce": "^5.7.1", "vditor": "^3.8.4", - "vue": "3.0.7", + "vue": "3.0.10", "vue-i18n": "^9.0.0", "vue-router": "^4.0.5", "vue-types": "^3.0.2", @@ -60,7 +60,7 @@ "devDependencies": { "@commitlint/cli": "^12.0.1", "@commitlint/config-conventional": "^12.0.1", - "@iconify/json": "^1.1.322", + "@iconify/json": "^1.1.323", "@purge-icons/generated": "^0.7.0", "@types/crypto-js": "^4.0.1", "@types/fs-extra": "^9.0.9", @@ -72,21 +72,20 @@ "@types/qs": "^6.9.6", "@types/rollup-plugin-visualizer": "^2.6.0", "@types/sortablejs": "^1.10.6", - "@typescript-eslint/eslint-plugin": "^4.19.0", - "@typescript-eslint/parser": "^4.19.0", + "@typescript-eslint/eslint-plugin": "^4.20.0", + "@typescript-eslint/parser": "^4.20.0", "@vitejs/plugin-legacy": "^1.3.2", - "@vitejs/plugin-vue": "^1.2.0", + "@vitejs/plugin-vue": "^1.2.1", "@vitejs/plugin-vue-jsx": "^1.1.2", - "@vue/compiler-sfc": "3.0.7", + "@vue/compiler-sfc": "3.0.10", "autoprefixer": "^10.2.5", - "body-parser": "^1.19.0", "commitizen": "^4.2.3", "conventional-changelog-cli": "^2.1.1", "cross-env": "^7.0.3", "dotenv": "^8.2.0", "eslint": "^7.23.0", "eslint-config-prettier": "^8.1.0", - "eslint-define-config": "^1.0.5", + "eslint-define-config": "^1.0.6", "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-vue": "^7.8.0", "esno": "^0.5.0", @@ -97,7 +96,7 @@ "is-ci": "^3.0.0", "less": "^4.1.1", "lint-staged": "^10.5.4", - "postcss": "^8.2.8", + "postcss": "^8.2.9", "prettier": "^2.2.1", "pretty-quick": "^3.1.0", "rimraf": "^3.0.2", @@ -108,17 +107,17 @@ "stylelint-order": "^4.1.0", "ts-node": "^9.1.1", "typescript": "4.2.3", - "vite": "2.1.3", + "vite": "2.1.5", "vite-plugin-compression": "^0.2.3", "vite-plugin-html": "^2.0.3", "vite-plugin-imagemin": "^0.2.9", - "vite-plugin-mock": "^2.4.0", + "vite-plugin-mock": "^2.4.1", "vite-plugin-purge-icons": "^0.7.0", "vite-plugin-pwa": "^0.6.4", "vite-plugin-style-import": "^0.9.1", "vite-plugin-svg-icons": "^0.4.0", "vite-plugin-theme": "^0.5.0", - "vite-plugin-windicss": "0.11.0", + "vite-plugin-windicss": "0.10.4", "vue-eslint-parser": "^7.6.0" }, "resolutions": { diff --git a/src/assets/icons/download-count.svg b/src/assets/icons/download-count.svg new file mode 100644 index 000000000..1c951958a --- /dev/null +++ b/src/assets/icons/download-count.svg @@ -0,0 +1 @@ +Asset 91 \ No newline at end of file diff --git a/src/assets/icons/dynamic-avatar-1.svg b/src/assets/icons/dynamic-avatar-1.svg new file mode 100644 index 000000000..e1553e50e --- /dev/null +++ b/src/assets/icons/dynamic-avatar-1.svg @@ -0,0 +1 @@ +Asset 15 \ No newline at end of file diff --git a/src/assets/icons/dynamic-avatar-2.svg b/src/assets/icons/dynamic-avatar-2.svg new file mode 100644 index 000000000..c4c172233 --- /dev/null +++ b/src/assets/icons/dynamic-avatar-2.svg @@ -0,0 +1 @@ +Asset 16 \ No newline at end of file diff --git a/src/assets/icons/dynamic-avatar-3.svg b/src/assets/icons/dynamic-avatar-3.svg new file mode 100644 index 000000000..81145f9b4 --- /dev/null +++ b/src/assets/icons/dynamic-avatar-3.svg @@ -0,0 +1 @@ +Asset 17 \ No newline at end of file diff --git a/src/assets/icons/dynamic-avatar-4.svg b/src/assets/icons/dynamic-avatar-4.svg new file mode 100644 index 000000000..e586ed4e6 --- /dev/null +++ b/src/assets/icons/dynamic-avatar-4.svg @@ -0,0 +1 @@ +Asset 120 \ No newline at end of file diff --git a/src/assets/icons/dynamic-avatar-5.svg b/src/assets/icons/dynamic-avatar-5.svg new file mode 100644 index 000000000..746e4b888 --- /dev/null +++ b/src/assets/icons/dynamic-avatar-5.svg @@ -0,0 +1 @@ +Asset 110 \ No newline at end of file diff --git a/src/assets/icons/dynamic-avatar-6.svg b/src/assets/icons/dynamic-avatar-6.svg new file mode 100644 index 000000000..b2432f225 --- /dev/null +++ b/src/assets/icons/dynamic-avatar-6.svg @@ -0,0 +1 @@ +Asset 100 \ No newline at end of file diff --git a/src/assets/icons/total-sales.svg b/src/assets/icons/total-sales.svg new file mode 100644 index 000000000..eff79640a --- /dev/null +++ b/src/assets/icons/total-sales.svg @@ -0,0 +1 @@ +Asset 500 \ No newline at end of file diff --git a/src/assets/icons/transaction.svg b/src/assets/icons/transaction.svg new file mode 100644 index 000000000..7ba9e2f0e --- /dev/null +++ b/src/assets/icons/transaction.svg @@ -0,0 +1 @@ +Asset 480% \ No newline at end of file diff --git a/src/assets/icons/visit-count.svg b/src/assets/icons/visit-count.svg new file mode 100644 index 000000000..ba2a30614 --- /dev/null +++ b/src/assets/icons/visit-count.svg @@ -0,0 +1 @@ +Asset 510 \ No newline at end of file diff --git a/src/assets/images/dashboard/wokb/approve.png b/src/assets/images/dashboard/wokb/approve.png deleted file mode 100644 index 6155fb2a0..000000000 Binary files a/src/assets/images/dashboard/wokb/approve.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/attendance.png b/src/assets/images/dashboard/wokb/attendance.png deleted file mode 100644 index 185b88845..000000000 Binary files a/src/assets/images/dashboard/wokb/attendance.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/datashow1.png b/src/assets/images/dashboard/wokb/datashow1.png deleted file mode 100644 index 9af6b87dd..000000000 Binary files a/src/assets/images/dashboard/wokb/datashow1.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/datashow2.png b/src/assets/images/dashboard/wokb/datashow2.png deleted file mode 100644 index d89f105d4..000000000 Binary files a/src/assets/images/dashboard/wokb/datashow2.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/datashow3.png b/src/assets/images/dashboard/wokb/datashow3.png deleted file mode 100644 index 1c3349397..000000000 Binary files a/src/assets/images/dashboard/wokb/datashow3.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/datashow4.png b/src/assets/images/dashboard/wokb/datashow4.png deleted file mode 100644 index 4035867b9..000000000 Binary files a/src/assets/images/dashboard/wokb/datashow4.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/leave.png b/src/assets/images/dashboard/wokb/leave.png deleted file mode 100644 index a96fd5458..000000000 Binary files a/src/assets/images/dashboard/wokb/leave.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/meal.png b/src/assets/images/dashboard/wokb/meal.png deleted file mode 100644 index 6374fda87..000000000 Binary files a/src/assets/images/dashboard/wokb/meal.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/overtime.png b/src/assets/images/dashboard/wokb/overtime.png deleted file mode 100644 index 0796a1f76..000000000 Binary files a/src/assets/images/dashboard/wokb/overtime.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/performance.png b/src/assets/images/dashboard/wokb/performance.png deleted file mode 100644 index de85be79e..000000000 Binary files a/src/assets/images/dashboard/wokb/performance.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/stamp.png b/src/assets/images/dashboard/wokb/stamp.png deleted file mode 100644 index c7a733417..000000000 Binary files a/src/assets/images/dashboard/wokb/stamp.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/travel.png b/src/assets/images/dashboard/wokb/travel.png deleted file mode 100644 index dab9998c6..000000000 Binary files a/src/assets/images/dashboard/wokb/travel.png and /dev/null differ diff --git a/src/assets/images/dashboard/wokb/wokb.png b/src/assets/images/dashboard/wokb/wokb.png deleted file mode 100644 index 75c2a591c..000000000 Binary files a/src/assets/images/dashboard/wokb/wokb.png and /dev/null differ diff --git a/src/assets/svg/dashboard/analysis-down.svg b/src/assets/svg/dashboard/analysis-down.svg deleted file mode 100644 index 1e47927e2..000000000 --- a/src/assets/svg/dashboard/analysis-down.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - 下跌-24px - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/dashboard/analysis-icon1.svg b/src/assets/svg/dashboard/analysis-icon1.svg deleted file mode 100644 index 244252dde..000000000 --- a/src/assets/svg/dashboard/analysis-icon1.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - Icon1@3x - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/dashboard/analysis-icon2.svg b/src/assets/svg/dashboard/analysis-icon2.svg deleted file mode 100644 index 8b5d8722c..000000000 --- a/src/assets/svg/dashboard/analysis-icon2.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - Icon2@3x - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/dashboard/analysis-icon3.svg b/src/assets/svg/dashboard/analysis-icon3.svg deleted file mode 100644 index cc445177b..000000000 --- a/src/assets/svg/dashboard/analysis-icon3.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - Icon3@3x - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/dashboard/analysis-icon4.svg b/src/assets/svg/dashboard/analysis-icon4.svg deleted file mode 100644 index 1dc190455..000000000 --- a/src/assets/svg/dashboard/analysis-icon4.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - Icon - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/dashboard/analysis-rise.svg b/src/assets/svg/dashboard/analysis-rise.svg deleted file mode 100644 index 3d47698ec..000000000 --- a/src/assets/svg/dashboard/analysis-rise.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - 上涨-24px - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/illustration.svg b/src/assets/svg/illustration.svg new file mode 100644 index 000000000..b45215b03 --- /dev/null +++ b/src/assets/svg/illustration.svg @@ -0,0 +1 @@ +Asset 336 \ No newline at end of file diff --git a/src/components/Basic/src/BasicTitle.vue b/src/components/Basic/src/BasicTitle.vue index 47ec63ac1..a71e51f5c 100644 --- a/src/components/Basic/src/BasicTitle.vue +++ b/src/components/Basic/src/BasicTitle.vue @@ -53,7 +53,7 @@ &-normal { font-size: 14px; - font-weight: normal; + font-weight: 500; } &-show-span::before { diff --git a/src/components/Container/src/collapse/CollapseContainer.vue b/src/components/Container/src/collapse/CollapseContainer.vue index 15b248897..9cdbc2c6d 100644 --- a/src/components/Container/src/collapse/CollapseContainer.vue +++ b/src/components/Container/src/collapse/CollapseContainer.vue @@ -9,6 +9,9 @@ +
@@ -19,6 +22,10 @@
+ +
+ +
diff --git a/src/views/dashboard/analysis/components/AnalysisLine.vue b/src/views/dashboard/analysis/components/AnalysisLine.vue deleted file mode 100644 index 23ce4227a..000000000 --- a/src/views/dashboard/analysis/components/AnalysisLine.vue +++ /dev/null @@ -1,94 +0,0 @@ - - diff --git a/src/views/dashboard/analysis/components/AnalysisPie.vue b/src/views/dashboard/analysis/components/AnalysisPie.vue deleted file mode 100644 index 9efe7692d..000000000 --- a/src/views/dashboard/analysis/components/AnalysisPie.vue +++ /dev/null @@ -1,75 +0,0 @@ - - diff --git a/src/views/dashboard/analysis/components/FlowAnalysis.tsx b/src/views/dashboard/analysis/components/FlowAnalysis.tsx deleted file mode 100644 index f450d5c4e..000000000 --- a/src/views/dashboard/analysis/components/FlowAnalysis.tsx +++ /dev/null @@ -1,80 +0,0 @@ -import { defineComponent } from 'vue'; -import { Tabs, Row, Col, Progress, Divider } from 'ant-design-vue'; -import { CollapseContainer } from '/@/components/Container/index'; -import TrendLine from './TrendLine.vue'; -import './flow-ana.less'; -const prefixCls = 'flow-analysis'; -export default defineComponent({ - name: 'AnalysisFLow', - setup() { - const renderContent = () => { - return ( - - {() => ( - <> - - {() => ( - - {() => ( -
-
- 86.2分 -
-
- 排名前20% -
- - - -
    -
  • - 平均分 - 77.5 -
    • -
  • - 最高分 - 99.5 -
    • -
  • - 最低分 - 56.5 -
    • -
-
- )} - - )} - - - {() => ( - - {() => } - - )} - - - )} - - ); - }; - return () => ( - - {() => [ - - {() => renderContent()} - , - - {() => renderContent()} - , - - {() => renderContent()} - , - ]} - - ); - }, -}); diff --git a/src/views/dashboard/analysis/components/GrowCard.vue b/src/views/dashboard/analysis/components/GrowCard.vue index 9abda56d3..760ff7d1a 100644 --- a/src/views/dashboard/analysis/components/GrowCard.vue +++ b/src/views/dashboard/analysis/components/GrowCard.vue @@ -1,118 +1,43 @@