vue2-client 1.8.327 → 1.8.328

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.327",
+  "version": "1.8.328",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XTable/XTable.vue

@@ -30,6 +30,7 @@
                   type="ordered-list"/>导出选中数据</a-menu-item>
                 <a-menu-item key="2" @click="handleExport(false)"><a-icon :style="iconStyle" type="snippets"/>导出本页数据</a-menu-item>
                 <a-menu-item key="3" @click="handleExportByQuery"><a-icon :style="iconStyle" type="download"/>导出所有符合条件的数据</a-menu-item>
+                <a-menu-item key="4" @click="handleAsyncExportByQuery"><a-icon :style="iconStyle" type="download"/>异步导出所有符合条件的数据</a-menu-item>
               </a-menu>
               <a-button>导出 <a-icon type="down" :style="iconStyle"/> </a-button>
             </a-dropdown>
@@ -159,7 +160,7 @@ import { formatDate } from '@vue2-client/utils/util'
 import XBadge from '@vue2-client/base-client/components/common/XBadge'
 import TableSetting from '@vue2-client/components/TableSetting/TableSetting'
 import { exportJson } from '@vue2-client/utils/excel/Export2Excel'
-import { exportData, query, querySummary, queryWithResource, remove } from '@vue2-client/services/api/common'
+import { exportData, query, querySummary, queryWithResource, remove, asyncRunTask } from '@vue2-client/services/api/common'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
 import { Modal } from 'ant-design-vue'
 import { post } from '@vue2-client/services/api'
@@ -565,6 +566,53 @@ export default {
         }
       })
     },
+    handleAsyncExportByQuery () {
+      const that = this
+      const conditionParams = Object.assign(that.form, that.fixedQueryForm)
+      this.$confirm({
+        title: '是否确认导出?',
+        content: (h) => (
+          <div>
+            <p>此操作将导出当前条件下所有数据而非选中数据</p>
+            <a-input
+              placeholder="请输入导出文件名"
+              onChange={(e) => this.exportFileName = e.target.value}
+            />
+          </div>
+        ),
+        onOk: () => {
+          if (!this.exportFileName) {
+            this.$message.error('文件名不能为空');
+            return Promise.reject(); // 阻止对话框关闭
+          }
+          // 在这里执行导出的逻辑，并使用 this.exportFileName 作为文件名
+          const queryData = {
+            queryParamsName: that.queryParamsName,
+            queryParams: that.queryParams,
+            form: conditionParams,
+            userId: that.currUser.id
+          }
+          const date = formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')
+
+          asyncRunTask({
+            f_task_type: 'commonExport',
+            f_task_class: 'com.af.v4.system.common.impl.CommonExportHandlerImpl',
+            f_user_id: that.currUser.id,
+            f_tag1: queryData,
+            f_tag2: this.exportFileName + '_' + that.currUser.username,
+            f_service_name: that.serviceName || process.env.VUE_APP_SYSTEM_NAME,
+            f_task_name: `${this.exportFileName}_${that.currUser.username}_${date}`
+          }, that.serviceName, that.env === 'dev')
+            .then(res => {
+          }).catch(error => {
+            // 失败时的处理
+            console.log('失败:', error);
+          });
+        },
+        onCancel () {
+        }
+      });
+    },
     // 新增业务
     add () {
       this.$emit('add')

package/src/services/api/common.js

@@ -41,6 +41,8 @@ const commonApi = {
   getColumnsJson: '/api/af-system/logic/getColumns',
   //  v4文件删除
   deleteFile: 'resource/delete',
+  // 异步任务执行
+  asyncRunTask: 'logic/clientTaskSend'
 }
 
 /**
@@ -210,6 +212,18 @@ export function importData (parameter, serviceName = process.env.VUE_APP_SYSTEM_
   return post(apiPre + serviceName + '/' + commonApi.importData, parameter, null)
 }
 
+/**
+ * 异步导出
+ */
+export function asyncRunTask(parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  debugger
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.asyncRunTask, parameter, null)
+}
+
 /**
  * 通用导出
  */