chore: sync fix to site (#654)

* chore: update version (#616) * fix: echarts resize error (#622) * fix: mock menu (#630) * fix(i18n): pages.result.fail.modify中文未定义 (#632) * fix(i18n): 修复用户中心词条不生效的问题 (#634) * fix: 修复husky可能找不到npx命令的问题 (#635) * fix(i18n): 修复用户中心词条不生效的问题 (#634) (#636) * feat: 升级依赖到最新版本 (#637) * feat: 升级依赖到最新版本 * fix(style): 使用新版格式修复文件 * fix(style): eslint自动格式化 * feat(hook): 替换窗口大小变化监听器 (#638) * feat(hook): 替换窗口大小变化监听器 * feat(state): 替换响应式数据监听器 * feat(clipboard): 移除无用依赖，替换剪贴方法 * fix: 补上遗漏的逗号 * fix: 移除重复出现的依赖项 * feat: use $t (#640) * fix: ts error (#652) * fix: 修复循环过深的问题 (#650) * fix: 修复循环过深的问题 * fix: 修复依赖更新导致的类型错误 --------- Co-authored-by: Cosmos <[email protected]> Co-authored-by: liweijie0812 <[email protected]> Co-authored-by: 悠静萝莉 <[email protected]> Co-authored-by: PY <[email protected]>
Tencent · Dec 6, 2023 · 6b21e52 · 6b21e52
1 parent badc73e
commit 6b21e52
Show file tree

Hide file tree

Showing 35 changed files with 201 additions and 136 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,8 +18,11 @@ yarn-error.log
 *.zip
 .history
 .stylelintcache
-yarn.lock
-package-lock.json
-pnpm-lock.yaml
+
 .env.local
 .env.*.local
+
+# lock文件 请根据自身项目或团队需求选择具体的包管理工具 并移除具体的ignore的lock文件
+yarn.lock
+package-lock.json
+pnpm-lock.yaml
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1,8 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx --no-install commitlint -e $GIT_PARAMS
+if [[ "$OS" == "Windows_NT" ]]; then
+  npx.cmd --no-install commitlint -e $GIT_PARAMS
+else
+  npx --no-install commitlint -e $GIT_PARAMS
+fi
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,8 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx lint-staged
+if [[ "$OS" == "Windows_NT" ]]; then
+  npx.cmd lint-staged
+else
+  npx lint-staged
+fi
diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg
@@ -3,4 +3,8 @@
 [ -n "$CI" ] && exit 0
 . "$(dirname "$0")/_/husky.sh"
 
-exec < /dev/tty && npx git-cz --hook || true
+if [[ "$OS" == "Windows_NT" ]]; then
+  exec < /dev/tty && npx.cmd git-cz --hook || true
+else
+  exec < /dev/tty && npx git-cz --hook || true
+fi
diff --git a/mock/index.ts b/mock/index.ts
@@ -145,7 +145,7 @@ export default [
     },
   },
   {
-    url: '/api/get-menu-list',
+    url: '/api/get-menu-list-i18n',
     method: 'get',
     timeout: 2000,
     response: {
@@ -159,7 +159,10 @@ export default [
               component: 'LAYOUT',
               redirect: '/list/base',
               meta: {
-                title: '列表页',
+                title: {
+                  zh_CN: '列表页',
+                  en_US: 'List',
+                },
                 icon: 'view-list',
               },
               children: [
@@ -168,31 +171,43 @@ export default [
                   name: 'ListBase',
                   component: '/list/base/index',
                   meta: {
-                    title: '基础列表页',
+                    title: {
+                      zh_CN: '基础列表页',
+                      en_US: 'Base List',
+                    },
                   },
                 },
                 {
                   path: 'card',
                   name: 'ListCard',
                   component: '/list/card/index',
                   meta: {
-                    title: '卡片列表页',
+                    title: {
+                      zh_CN: '卡片列表页',
+                      en_US: 'Card List',
+                    },
                   },
                 },
                 {
                   path: 'filter',
                   name: 'ListFilter',
                   component: '/list/filter/index',
                   meta: {
-                    title: '筛选列表页',
+                    title: {
+                      zh_CN: '筛选列表页',
+                      en_US: 'Filter List',
+                    },
                   },
                 },
                 {
                   path: 'tree',
                   name: 'ListTree',
                   component: '/list/tree/index',
                   meta: {
-                    title: '树状筛选列表页',
+                    title: {
+                      zh_CN: '树状筛选列表页',
+                      en_US: 'Tree List',
+                    },
                   },
                 },
               ],
@@ -203,7 +218,10 @@ export default [
               component: 'LAYOUT',
               redirect: '/form/base',
               meta: {
-                title: '表单页',
+                title: {
+                  zh_CN: '表单页',
+                  en_US: 'Form',
+                },
                 icon: 'edit-1',
               },
               children: [
@@ -212,16 +230,21 @@ export default [
                   name: 'FormBase',
                   component: '/form/base/index',
                   meta: {
-                    title: '基础表单页',
+                    title: {
+                      zh_CN: '基础表单页',
+                      en_US: 'Base Form',
+                    },
                   },
                 },
                 {
                   path: 'step',
                   name: 'FormStep',
                   component: '/form/step/index',
                   meta: {
-                    title: '分步表单页',
-                    keepAlive: false,
+                    title: {
+                      zh_CN: '分步表单页',
+                      en_US: 'Step Form',
+                    },
                   },
                 },
               ],
@@ -232,7 +255,10 @@ export default [
               component: 'LAYOUT',
               redirect: '/detail/base',
               meta: {
-                title: '详情页',
+                title: {
+                  zh_CN: '详情页',
+                  en_US: 'Detail',
+                },
                 icon: 'layers',
               },
               children: [
@@ -241,31 +267,43 @@ export default [
                   name: 'DetailBase',
                   component: '/detail/base/index',
                   meta: {
-                    title: '基础详情页',
+                    title: {
+                      zh_CN: '基础详情页',
+                      en_US: 'Base Detail',
+                    },
                   },
                 },
                 {
                   path: 'advanced',
                   name: 'DetailAdvanced',
                   component: '/detail/advanced/index',
                   meta: {
-                    title: '多卡片详情页',
+                    title: {
+                      zh_CN: '多卡片详情页',
+                      en_US: 'Card Detail',
+                    },
                   },
                 },
                 {
                   path: 'deploy',
                   name: 'DetailDeploy',
                   component: '/detail/deploy/index',
                   meta: {
-                    title: '数据详情页',
+                    title: {
+                      zh_CN: '数据详情页',
+                      en_US: 'Data Detail',
+                    },
                   },
                 },
                 {
                   path: 'secondary',
                   name: 'DetailSecondary',
                   component: '/detail/secondary/index',
                   meta: {
-                    title: '二级详情页',
+                    title: {
+                      zh_CN: '二级详情页',
+                      en_US: 'Secondary Detail',
+                    },
                   },
                 },
               ],
@@ -277,7 +315,10 @@ export default [
               redirect: '/frame/doc',
               meta: {
                 icon: 'internet',
-                title: '外部页面',
+                title: {
+                  zh_CN: '外部页面',
+                  en_US: 'External',
+                },
               },
               children: [
                 {
@@ -286,7 +327,10 @@ export default [
                   component: 'IFrame',
                   meta: {
                     frameSrc: 'https://tdesign.tencent.com/starter/docs/vue-next/get-started',
-                    title: '使用文档（内嵌）',
+                    title: {
+                      zh_CN: '使用文档（内嵌）',
+                      en_US: 'Documentation(IFrame)',
+                    },
                   },
                 },
                 {
@@ -295,7 +339,10 @@ export default [
                   component: 'IFrame',
                   meta: {
                     frameSrc: 'https://tdesign.tencent.com/vue-next/getting-started',
-                    title: 'TDesign 文档（内嵌）',
+                    title: {
+                      zh_CN: 'TDesign 文档（内嵌）',
+                      en_US: 'TDesign (IFrame)',
+                    },
                   },
                 },
                 {
@@ -305,7 +352,10 @@ export default [
                   meta: {
                     frameSrc: 'https://tdesign.tencent.com/vue-next/getting-started',
                     frameBlank: true,
-                    title: 'TDesign 文档（外链）',
+                    title: {
+                      zh_CN: 'TDesign 文档（外链',
+                      en_US: 'TDesign Doc(Link)',
+                    },
                   },
                 },
               ],

diff --git a/package.json b/package.json
@@ -19,63 +19,63 @@
     "test:coverage": "echo \"no test:coverage specified,work in process\""
   },
   "dependencies": {
-    "axios": "^1.4.0",
-    "dayjs": "^1.11.9",
+    "@vueuse/core": "^10.6.1",
+    "axios": "^1.6.2",
+    "dayjs": "^1.11.10",
     "echarts": "5.1.2",
     "lodash": "^4.17.21",
     "nprogress": "^0.2.0",
-    "pinia": "^2.1.6",
+    "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.0",
-    "qrcode.vue": "^3.4.0",
+    "qrcode.vue": "^3.4.1",
     "qs": "^6.11.2",
-    "tdesign-icons-vue-next": "^0.2.0",
-    "tdesign-vue-next": "^1.4.1",
+    "tdesign-icons-vue-next": "^0.2.2",
+    "tdesign-vue-next": "^1.6.8",
     "tdesign-site-components": "^0.12.9",
     "tdesign-theme-generator": "^1.0.5",
     "tvision-color": "^1.6.0",
-    "vue": "^3.3.4",
-    "vue-clipboard3": "^2.0.0",
-    "vue-i18n": "^9.4.1",
+    "vue": "^3.3.8",
+    "vue-i18n": "^9.6.5",
     "vue-router": "~4.2.4"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.7",
-    "@commitlint/config-conventional": "^17.6.7",
-    "@types/echarts": "^4.9.18",
-    "@types/lodash": "^4.14.196",
-    "@types/nprogress": "^0.2.0",
-    "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
-    "@vitejs/plugin-vue": "^4.2.3",
-    "@vitejs/plugin-vue-jsx": "^3.0.1",
-    "@vue/compiler-sfc": "^3.3.4",
-    "@vue/eslint-config-typescript": "^11.0.3",
+    "@commitlint/cli": "^18.4.1",
+    "@commitlint/config-conventional": "^18.4.0",
+    "@types/echarts": "^4.9.21",
+    "@types/lodash": "^4.14.201",
+    "@types/nprogress": "^0.2.3",
+    "@types/qs": "^6.9.10",
+    "@typescript-eslint/eslint-plugin": "^6.11.0",
+    "@typescript-eslint/parser": "^6.11.0",
+    "@vitejs/plugin-vue": "^4.4.1",
+    "@vitejs/plugin-vue-jsx": "^3.0.2",
+    "@vue/compiler-sfc": "^3.3.8",
+    "@vue/eslint-config-typescript": "^12.0.0",
     "commitizen": "^4.3.0",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^8.45.0",
+    "eslint": "^8.53.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^8.9.0",
-    "eslint-plugin-import": "^2.28.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-vue": "^9.15.1",
-    "eslint-plugin-vue-scoped-css": "^2.5.0",
+    "eslint-plugin-vue": "^9.18.1",
+    "eslint-plugin-vue-scoped-css": "^2.5.1",
     "husky": "^8.0.3",
-    "less": "^4.1.3",
-    "lint-staged": "^13.2.3",
+    "less": "^4.2.0",
+    "lint-staged": "^15.1.0",
     "mockjs": "^1.1.0",
     "postcss-html": "^1.5.0",
     "postcss-less": "^6.0.0",
-    "prettier": "^2.8.8",
-    "stylelint": "~15.10.2",
+    "prettier": "^3.1.0",
+    "stylelint": "~15.11.0",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-order": "~6.0.3",
-    "typescript": "~5.1.6",
-    "vite": "^4.4.7",
+    "typescript": "~5.3.2",
+    "vite": "^4.5.0",
     "vite-plugin-mock": "^3.0.0",
     "vite-svg-loader": "^4.0.0",
-    "vue-tsc": "^1.8.8"
+    "vue-tsc": "^1.8.22"
   },
   "config": {
     "commitizen": {
@@ -94,4 +94,4 @@
   "engines": {
     "node": ">=16.0.0"
   }
-}
+}
diff --git a/src/components/common-table/index.vue b/src/components/common-table/index.vue
@@ -294,7 +294,7 @@ const headerAffixedTop = computed(
     ({
       offsetTop: store.isUseTabsRouter ? 48 : 0,
       container: `.${prefix}-layout`,
-    } as any), // TO BE FIXED
+    }) as any, // TO BE FIXED
 );
 </script>
 

diff --git a/src/components/result/index.vue b/src/components/result/index.vue
@@ -83,10 +83,10 @@ const dynamicComponent = computed(() => {
   }
 
   &-title {
+    font: var(--td-font-title-large);
     font-style: normal;
     margin-top: var(--td-comp-margin-l);
     color: var(--td-text-color-primary);
-    font: var(--td-font-title-large);
   }
 
   &-tip {

diff --git a/src/components/thumbnail/index.vue b/src/components/thumbnail/index.vue
@@ -24,7 +24,7 @@ const className = computed(() => {
 });
 </script>
 <style lang="less" scoped>
-@import url('@/style/index.less');
+@import '@/style/index.less';
 
 .thumbnail {
   &-container {