Merge pull request 'feat:修改冲突' (#211) from fix/updatesyspic into test

Reviewed-on: #211

components.d.ts

@@ -10,17 +10,40 @@ declare module 'vue' {
     Application: typeof import('./src/components/Application/Application.vue')['default']
     BasicModal: typeof import('./src/components/Modal/BasicModal.vue')['default']
     DataHeader: typeof import('./src/components/DataHeader/index.vue')['default']
+    NAvatar: typeof import('naive-ui')['NAvatar']
     NButton: typeof import('naive-ui')['NButton']
+    NCard: typeof import('naive-ui')['NCard']
     NCheckbox: typeof import('naive-ui')['NCheckbox']
+    NCollapse: typeof import('naive-ui')['NCollapse']
+    NCollapseItem: typeof import('naive-ui')['NCollapseItem']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
+    NDatePicker: typeof import('naive-ui')['NDatePicker']
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
+    NDivider: typeof import('naive-ui')['NDivider']
+    NDropdown: typeof import('naive-ui')['NDropdown']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
+    NGrid: typeof import('naive-ui')['NGrid']
+    NGridItem: typeof import('naive-ui')['NGridItem']
+    NImage: typeof import('naive-ui')['NImage']
     NInput: typeof import('naive-ui')['NInput']
     NMessageProvider: typeof import('naive-ui')['NMessageProvider']
     NModal: typeof import('naive-ui')['NModal']
     NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
     NotPassed: typeof import('./src/components/NotPassed.vue')['default']
+    NPopover: typeof import('naive-ui')['NPopover']
+    NPopselect: typeof import('naive-ui')['NPopselect']
+    NProgress: typeof import('naive-ui')['NProgress']
+    NScrollbar: typeof import('naive-ui')['NScrollbar']
+    NSelect: typeof import('naive-ui')['NSelect']
+    NSlider: typeof import('naive-ui')['NSlider']
+    NSpace: typeof import('naive-ui')['NSpace']
+    NSpin: typeof import('naive-ui')['NSpin']
+    NSwitch: typeof import('naive-ui')['NSwitch']
+    NTag: typeof import('naive-ui')['NTag']
+    NTooltip: typeof import('naive-ui')['NTooltip']
+    NUpload: typeof import('naive-ui')['NUpload']
+    NUploadDragger: typeof import('naive-ui')['NUploadDragger']
     Quill: typeof import('./src/components/RichEditor/Quill.vue')['default']
     Robot: typeof import('./src/components/Robot/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']

src/views/home/content/Content.vue

@@ -1027,6 +1027,34 @@ defineExpose({
 
     .scroll {
       overflow-y: scroll;
+      // 滚动条整体部分
+      &::-webkit-scrollbar {
+        width: 6px;
+        height: 6px;
+        background: #f1f1f1;
+        display: none;
+      }
+      &:hover {
+        &::-webkit-scrollbar {
+          display: block;
+        }
+      }
+      /* 定义滚动条轨道的样式 */
+      &::-webkit-scrollbar-track {
+        background-color: #e1e1e1;
+        border-radius: 10px; /* 圆角 */
+      }
+
+      /* 定义滚动条滑块的样式 */
+      &::-webkit-scrollbar-thumb {
+        background-color: #888;
+        border-radius: 10px; /* 圆角 */
+      }
+
+      /* 滑块hover时的样式 */
+      &::-webkit-scrollbar-thumb:hover {
+        background-color: #555;
+      }
     }
   }
   .flex-btn-icon {