Merge branch 'develop' of github.com:Tencent/tdesign-vue-next-starter

Tencent · Jul 12, 2023 · 455b69e · 455b69e
2 parents d69cc3b + 109db68
commit 455b69e
Show file tree

Hide file tree

Showing 13 changed files with 354 additions and 106 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tencent/tdesign-vue-next-starter",
-  "version": "0.7.7",
+  "version": "0.8.0",
   "scripts": {
     "dev:mock": "vite --open --mode mock",
     "dev": "vite --open --mode development",
@@ -12,68 +12,67 @@
     "lint": "eslint --ext .vue,.js,.jsx,.ts,.tsx ./ --max-warnings 0",
     "lint:fix": "eslint --ext .vue,.js,jsx,.ts,.tsx ./ --max-warnings 0 --fix",
     "stylelint": "stylelint src/**/*.{html,vue,sass,less}",
-    "stylelint:fix": "stylelint --fix src/**/*.{html,vue,vss,sass,less}",
+    "stylelint:fix": "stylelint --fix src/**/*.{html,vue,css,sass,less}",
     "prepare": "husky install",
     "site:preview": "npm run build && cp -r dist _site",
     "test": "echo \"no test specified,work in process\"",
     "test:coverage": "echo \"no test:coverage specified,work in process\""
   },
   "dependencies": {
     "axios": "^1.4.0",
-    "dayjs": "^1.11.8",
+    "dayjs": "^1.11.9",
     "echarts": "5.1.2",
     "lodash": "^4.17.21",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.33",
+    "pinia": "^2.1.4",
     "pinia-plugin-persistedstate": "^3.1.0",
-    "qrcode.vue": "^3.3.4",
-    "qs": "^6.11.1",
+    "qrcode.vue": "^3.4.0",
+    "qs": "^6.11.2",
     "tdesign-icons-vue-next": "^0.1.11",
-    "tdesign-vue-next": "^1.3.8",
+    "tdesign-vue-next": "^1.3.10",
     "tvision-color": "^1.6.0",
     "vue": "^3.3.4",
     "vue-clipboard3": "^2.0.0",
-    "vue-router": "~4.2.2"
+    "vue-router": "~4.2.3"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.3.0",
-    "@commitlint/config-conventional": "^17.3.0",
-    "@types/echarts": "^4.9.16",
-    "@types/lodash": "^4.14.191",
+    "@commitlint/cli": "^17.6.6",
+    "@commitlint/config-conventional": "^17.6.6",
+    "@types/echarts": "^4.9.18",
+    "@types/lodash": "^4.14.195",
     "@types/nprogress": "^0.2.0",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.47.1",
-    "@typescript-eslint/parser": "^5.47.1",
-    "@vitejs/plugin-vue": "^4.2.3 ",
-    "@vitejs/plugin-vue-jsx": "^3.0.1 ",
-    "@vue/compiler-sfc": "^3.2.47",
-    "@vue/eslint-config-typescript": "^11.0.2",
-    "commitizen": "^4.2.4",
+    "@typescript-eslint/eslint-plugin": "^5.61.0",
+    "@typescript-eslint/parser": "^5.61.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",
+    "commitizen": "^4.3.0",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^8.30.0",
+    "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-vue": "^9.8.0",
-    "eslint-plugin-vue-scoped-css": "^2.2.0",
-    "husky": "^8.0.2",
+    "eslint-plugin-vue": "^9.15.1",
+    "eslint-plugin-vue-scoped-css": "^2.5.0",
+    "husky": "^8.0.3",
     "less": "^4.1.3",
-    "lint-staged": "^13.1.0",
+    "lint-staged": "^13.2.3",
     "mockjs": "^1.1.0",
     "postcss-html": "^1.5.0",
     "postcss-less": "^6.0.0",
-    "prettier": "^2.8.1",
-    "stylelint": "~14.9.1",
-    "stylelint-config-prettier": "~9.0.4",
-    "stylelint-less": "1.0.6",
-    "stylelint-order": "~6.0.1",
-    "typescript": "~4.9.5",
+    "prettier": "^2.8.8",
+    "stylelint": "~15.10.0",
+    "stylelint-config-standard": "^34.0.0",
+    "stylelint-order": "~6.0.3",
+    "typescript": "~5.1.6",
     "vite": "^4.3.9",
-    "vite-plugin-mock": "^2.9.6",
+    "vite-plugin-mock": "^3.0.0",
     "vite-svg-loader": "^4.0.0",
-    "vue-tsc": "^1.8.2"
+    "vue-tsc": "^1.8.4"
   },
   "config": {
     "commitizen": {
@@ -85,7 +84,7 @@
       "prettier --write",
       "npm run lint:fix"
     ],
-    "*.{html,vue,vss,sass,less}": [
+    "*.{html,vue,css,sass,less}": [
       "npm run stylelint:fix"
     ]
   }

diff --git a/src/layouts/components/Content.vue b/src/layouts/components/Content.vue
@@ -1,6 +1,6 @@
 <template>
   <router-view v-if="!isRefreshing" v-slot="{ Component }">
-    <transition name="fade" mode="out-in">
+    <transition name="fade">
       <keep-alive :include="aliveViews">
         <component :is="Component" />
       </keep-alive>
@@ -53,6 +53,7 @@ const isRefreshing = computed(() => {
 .fade-enter-active {
   transition: opacity @anim-duration-slow @anim-time-fn-easing;
 }
+
 .fade-enter,
 .fade-leave-to {
   opacity: 0;

diff --git a/src/layouts/setting.vue b/src/layouts/setting.vue
@@ -206,7 +206,6 @@ watchEffect(() => {
   position: fixed;
   bottom: 200px;
   right: 0;
-  transition: transform 0.3s cubic-bezier(0.7, 0.3, 0.1, 1), visibility 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
   height: 40px;
   width: 40px;
   border-radius: 20px 0 0 20px;
@@ -252,9 +251,9 @@ watchEffect(() => {
 .setting-group-title {
   font-size: 14px;
   line-height: 22px;
-  margin: 32px 0 24px 0;
+  margin: 32px 0 24px;
   text-align: left;
-  font-family: PingFang SC;
+  font-family: 'PingFang SC', var(--td-font-family);
   font-style: normal;
   font-weight: 500;
   color: var(--td-text-color-primary);
@@ -283,6 +282,7 @@ watchEffect(() => {
   .setting-container {
     padding-bottom: 100px;
   }
+
   .t-radio-group.t-size-m {
     min-height: 32px;
     width: 100%;
@@ -306,6 +306,7 @@ watchEffect(() => {
       padding: 8px;
       border-radius: var(--td-radius-default);
       border: 2px solid var(--td-component-border);
+
       > .t-radio-button__label {
         display: inline-flex;
       }

diff --git a/src/pages/list/components/CommonTable.vue b/src/pages/list/components/CommonTable.vue
@@ -22,6 +22,7 @@
                   class="form-item-content"
                   :options="CONTRACT_STATUS_OPTIONS"
                   placeholder="请选择合同状态"
+                  clearable
                 />
               </t-form-item>
             </t-col>
@@ -43,6 +44,7 @@
                   class="form-item-content"
                   :options="CONTRACT_TYPE_OPTIONS"
                   placeholder="请选择合同类型"
+                  clearable
                 />
               </t-form-item>
             </t-col>
@@ -120,6 +122,13 @@ import {
 } from '@/constants';
 import { useSettingStore } from '@/store';
 
+interface FormData {
+  name: string;
+  no: string;
+  status?: number;
+  type: string;
+}
+
 const store = useSettingStore();
 
 const COLUMNS: PrimaryTableCol[] = [
@@ -168,11 +177,10 @@ const COLUMNS: PrimaryTableCol[] = [
 const searchForm = {
   name: '',
   no: '',
-  status: typeof CONTRACT_STATUS,
   type: '',
 };
 
-const formData = ref({ ...searchForm });
+const formData = ref<FormData>({ ...searchForm });
 const rowKey = 'index';
 const verticalAlign = 'top' as const;
 const hover = true;
@@ -242,6 +250,7 @@ const onReset = (val: unknown) => {
 };
 const onSubmit = (val: unknown) => {
   console.log(val);
+  console.log(formData.value);
 };
 const rehandlePageChange = (pageInfo: PageInfo, newDataSource: TableRowData[]) => {
   console.log('分页变化', pageInfo, newDataSource);
@@ -281,6 +290,7 @@ const headerAffixedTop = computed(
   display: flex;
   justify-content: flex-end;
   align-items: center;
+
   .expand {
     .t-button__text {
       display: flex;

diff --git a/src/style/layout.less b/src/style/layout.less
@@ -27,7 +27,7 @@
   text-decoration: none;
   margin-right: 24px;
   cursor: pointer;
-  transition: color 0.2s cubic-bezier(0.38, 0, 0.24, 1);
+  transition: color .2s cubic-bezier(.38, 0, .24, 1);
 }
 
 .left-operation-container,
@@ -45,7 +45,8 @@
 }
 
 .t-menu--dark .t-menu__operations .t-icon {
-  color: rgba(255, 255, 255, 0.55);
+  color: rgba(255, 255, 255, 55%);
+
   &:hover {
     cursor: pointer;
   }
@@ -81,6 +82,7 @@
   &-layout {
     height: calc(100vh - var(--td-comp-size-xxxl));
     overflow-y: scroll;
+
     &-tabs-nav {
       max-width: 100%;
       position: fixed;
@@ -127,7 +129,7 @@
     top: 0;
     bottom: 0;
     z-index: 200;
-    transition: all 0.3s;
+    transition: all .3s;
     min-height: 100%;
 
     &-mix {
@@ -153,6 +155,7 @@
       align-items: center;
       justify-content: center;
       width: 100%;
+
       &:hover {
         cursor: pointer;
       }
@@ -173,19 +176,19 @@
     &-logo-normal {
       color: var(--td-brand-color);
       font: var(--td-font-body-large);
-      transition: all 0.3s;
+      transition: all .3s;
     }
   }
 
   &-side-nav-placeholder {
     flex: 1 1 232px;
     min-width: 232px;
-    transition: all 0.3s;
+    transition: all .3s;
 
     &-hidden {
       flex: 1 1 72px;
       min-width: 72px;
-      transition: all 0.3s;
+      transition: all .3s;
     }
   }
 }
@@ -204,7 +207,7 @@
 
 .version-container {
   color: var(--td-text-color-primary);
-  opacity: 0.4;
+  opacity: .4;
 }
 
 .t-menu__popup {

diff --git a/src/style/reset.less b/src/style/reset.less
@@ -1,8 +1,8 @@
 // 对部分样式进行重置
 body {
   color: var(--td-text-color-secondary);
-  font-family: -apple-system, BlinkMacSystemFont, var(--td-font-family);
   font: var(--td-font-body-medium);
+  font-family: -apple-system, BlinkMacSystemFont, var(--td-font-family);
   -webkit-font-smoothing: antialiased;
   padding: 0;
   margin: 0;