导出

src/views/project/gist/list.vue

@@ -40,7 +40,7 @@
 import { onMounted, ref } from 'vue'
 import HcTableList from '../modules/gist-list.vue'
 import { getDictionaryData } from '~src/utils/tools'
-import { arrToId, downloadBlob, getArrValue } from 'js-fast-way'
+import { arrToId, getArrValue, newDownBlob } from 'js-fast-way'
 import mainApi from '~api/project/gist'
 
 //事件
@@ -121,13 +121,14 @@ const delTableItem = async (_, resolve) => {
 //批量导出
 const deriveTableItem = async (_, resolve) => {
     const ids = arrToId(tableCheckKeys.value)
-    const { error, disposition, res } = await mainApi.exportWorkfocus(ids)
-    resolve()
-    if (!error && disposition) {
-        downloadBlob(res, disposition)
-    } else {
+    const { error, val } = await mainApi.exportWorkfocus(ids)
+    if (error) {
         window.$message?.error('数据异常')
+        resolve()
+        return
     }
+    await newDownBlob(val)
+    resolve()
 }
 
 //项目数据导入

src/views/project/ledger.vue

@@ -54,7 +54,7 @@
 <script setup>
 import { onMounted, ref } from 'vue'
 import { getDictionaryData } from '~src/utils/tools'
-import { arrToId, downloadBlob, getArrValue } from 'js-fast-way'
+import { arrToId, getArrValue, newDownBlob } from 'js-fast-way'
 import mainApi from '~api/project/gist'
 
 //子组件
@@ -164,13 +164,14 @@ const deriveTableItem1 = async (_, resolve) => {
 //批量导出
 const deriveTableItem2 = async (_, resolve) => {
     const ids = arrToId(tableCheckKeys2.value)
-    const { error, disposition, res } = await mainApi.exportWorkfocus(ids)
-    resolve()
-    if (!error && disposition) {
-        downloadBlob(res, disposition)
-    } else {
+    const { error, val } = await mainApi.exportWorkfocus(ids)
+    if (error) {
         window.$message?.error('数据异常')
+        resolve()
+        return
     }
+    await newDownBlob(val)
+    resolve()
 }
 </script>
 

src/views/project/modules/gist-list.vue

@@ -120,7 +120,7 @@
 <script setup>
 import { ref, watch } from 'vue'
 import mainApi from '~api/project/gist'
-import { downloadBlob } from 'js-fast-way'
+import { newDownBlob } from 'js-fast-way'
 
 const props = defineProps({
     isAdmin: {
@@ -238,13 +238,14 @@ const delTableItem = async ({ item }, resolve) => {
 
 //导出数据
 const deriveTableItem = async ({ item }, resolve) => {
-    const { error, disposition, res } = await mainApi.exportWorkfocus(item.id)
-    resolve()
-    if (!error && disposition) {
-        downloadBlob(res, disposition)
-    } else {
+    const { error, val } = await mainApi.exportWorkfocus(item.id)
+    if (error) {
         window.$message?.error('数据异常')
+        resolve()
+        return
     }
+    await newDownBlob(val)
+    resolve()
 }
 
 //年数据