From c443c35437c092de8e2e24aa57b21a9a9dc5421e Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Mon, 25 Dec 2023 14:17:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BD=93=E6=95=B0=E6=8D=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=91=E7=94=9F=E7=BF=BB=E9=A1=B5=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=89=E6=BB=9A=E5=8A=A8=E6=9D=A1=E5=8C=BA=E5=9F=9F=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=BB=9A=E5=8A=A8=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BigScreenDesign/PageDesignTop.vue       |  6 +++---
 .../BigScreenDesign/RightSetting/ElDragSelect.vue    |  4 +---
 data-room-ui/packages/js/mixins/datasetMixin.js      |  7 +++++++
 data-room-ui/packages/js/mixins/page.js              | 12 ++++++++++++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue
index e182035a..b67801b4 100644
--- a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue
+++ b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue
@@ -595,17 +595,17 @@ export default {
     //   // 暂停跑马灯动画
     //   EventBus.$emit('stopMarquee')
     //   const node = document.querySelector('.render-theme-wrap')
-    //   // 获取node 下的所有img标签，拿到他们的src，重新请求资源，并加上请求头  'Access-Control-Allow-Origin': '*'
+    //   // 获取node 下的所有img标签，拿到他们的src
     //   const imgTags = node.querySelectorAll('img')
     //   const requests = Array.from(imgTags).map(img => {
     //     const src = img.getAttribute('src')
-    //     return  (src, {
+    //     return fetch(src, {
     //       headers: { 'Access-Control-Allow-Origin': '*' }
     //     }).then(response => {
     //       if (response.ok) {
     //         return response.blob()
     //       } else {
-    //         throw new Error('Network response was not ok.')
+    //         throw new Error('网络请求失败')
     //       }
     //     }).then(blob => {
     //       return new Promise((resolve, reject) => {
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/ElDragSelect.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/ElDragSelect.vue
index 5f09a3bf..0841146e 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/ElDragSelect.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/ElDragSelect.vue
@@ -69,9 +69,7 @@ export default {
   },
   methods: {
     setSort () {
-      const el = this.$refs.dragSelect.$el.querySelectorAll(
-        '.el-select__tags > span'
-      )[0]
+      const el = this.$refs.dragSelect.$el.querySelectorAll('.el-select__tags > span')[0]
       if (el) {
         this.sortable = Sortable.create(el, {
           animation: 350,
diff --git a/data-room-ui/packages/js/mixins/datasetMixin.js b/data-room-ui/packages/js/mixins/datasetMixin.js
index 6771d5ca..ded2e44f 100644
--- a/data-room-ui/packages/js/mixins/datasetMixin.js
+++ b/data-room-ui/packages/js/mixins/datasetMixin.js
@@ -129,6 +129,13 @@ const datasetMixins = {
     currentChangeHandle (value) {
       this.current = value
       this.datasetTest(false)
+      const tableBodyWrapperEl = document.querySelector('.el-table__body-wrapper') || {}
+      this.$nextTick(() => {
+        if (tableBodyWrapperEl) {
+          // 表格滚动到顶部
+          tableBodyWrapperEl.scrollTop = 0
+        }
+      })
     },
     // 表头添加提示
     renderHeader (h, { column, index }) {
diff --git a/data-room-ui/packages/js/mixins/page.js b/data-room-ui/packages/js/mixins/page.js
index eec6dbe9..2839d6ff 100644
--- a/data-room-ui/packages/js/mixins/page.js
+++ b/data-room-ui/packages/js/mixins/page.js
@@ -111,6 +111,18 @@ const pageMixins = {
     currentChangeHandle (val) {
       this.current = val
       this.getDataList()
+      const bsScrollbarEl = document.querySelector('.bs-scrollbar') || {}
+      const tableBodyWrapperEl = document.querySelector('.el-table__body-wrapper') || {}
+      this.$nextTick(() => {
+        if (bsScrollbarEl) {
+          // 类名bs-scrollbar的元素滚动到顶部
+          bsScrollbarEl.scrollTop = 0
+        }
+        if (tableBodyWrapperEl) {
+          // 表格滚动到顶部
+          tableBodyWrapperEl.scrollTop = 0
+        }
+      })
     },
     getSortForm () {
       return {