Merge branch 'ts' into dev

# Conflicts:
#	package.json
#	src/layout/components/TagsView/index.vue

src/layout/components/AppMain.vue

@@ -56,3 +56,25 @@ watch(()=> useSettingsStore().animationEnable, (val) => {
   }
 }
 </style>
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 6px;
+  }
+}
+
+::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+::-webkit-scrollbar-track {
+  background-color: #f1f1f1;
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: #c0c0c0;
+  border-radius: 3px;
+}
+</style>

src/layout/components/TagsView/ScrollPane.vue

@@ -96,7 +96,7 @@ defineExpose({
     bottom: 0px;
   }
   :deep(.el-scrollbar__wrap) {
-    height: 49px;
+    height: 39px;
   }
 }
 </style>

src/layout/components/TagsView/index.vue

@@ -246,9 +246,10 @@ onMounted(() => {
       position: relative;
       cursor: pointer;
       height: 26px;
-      line-height: 26px;
+      line-height: 23px;
       background-color: var(--el-bg-color);
       border: 1px solid var(--el-border-color-light);
+      color: #495060;
       padding: 0 8px;
       font-size: 12px;
       margin-left: 5px;