cloud-web-corejs 1.0.54-dev.784 → 1.0.54-dev.785

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.784",
+  "version": "1.0.54-dev.785",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/components/baseInputExport/mixins.js

@@ -1,10 +1,10 @@
-import {getToken} from "../../utils/auth";
-import {openCnPrint} from "../../components/cnPrint/index";
-import {openHiPrint} from "../../components/hiprint/index";
-import {openJdPrint} from "../../components/jdPrint/index";
-import {openPddPrint} from "../../components/pddPrint/index";
-import {openVipPrint} from "../../components/vipPrint/index";
-import {openXhsPrint} from "../../components/xhsPrint/index";
+import { getToken } from "../../utils/auth";
+import { openCnPrint } from "../../components/cnPrint/index";
+import { openHiPrint } from "../../components/hiprint/index";
+import { openJdPrint } from "../../components/jdPrint/index";
+import { openPddPrint } from "../../components/pddPrint/index";
+import { openVipPrint } from "../../components/vipPrint/index";
+import { openXhsPrint } from "../../components/xhsPrint/index";
 
 let modules;
 let configUtil = {
@@ -29,7 +29,7 @@ modules = {
   },
   computed: {
     buttonName() {
-      if(this.option.label){
+      if (this.option.label) {
         return this.option.label;
       }
       let exportTemplates = this.exportTemplates;
@@ -143,14 +143,13 @@ modules = {
     },
     getTableGrid() {
       let grid = null;
-      let tableTarget = this.option.tableTarget
+      let tableTarget = this.option.tableTarget;
       if (tableTarget) {
         if (typeof tableTarget === "function") {
           grid = tableTarget();
         } else {
           grid = tableTarget;
         }
-
       } else if (this.option.tableRef) {
         grid = this.parentTarget.$refs[this.option.tableRef];
       }
@@ -160,23 +159,22 @@ modules = {
       let checkRows = [];
       let $grid = this.getTableGrid();
 
-
       let condition = null;
-      if(this.option.customCondition){
+      if (this.option.customCondition) {
         let condition1 = this.option.customCondition(item);
-        if(condition1)condition = condition1;
+        if (condition1) condition = condition1;
       }
-      if(!condition){
+      if (!condition) {
         if ($grid) {
           checkRows = $grid.getCheckboxRecords(true);
         } else {
-          checkRows
-            = typeof this.option.param === "function"
-            ? this.option.param(item)
-            : this.option.param;
+          checkRows =
+            typeof this.option.param === "function"
+              ? this.option.param(item)
+              : this.option.param;
         }
         let ids = checkRows ? checkRows.map((row) => row.id) : [];
-        condition = ids.length ? {id: ids} : null;
+        condition = ids.length ? { id: ids } : null;
       }
       return condition;
 
@@ -222,7 +220,12 @@ modules = {
       if ($grid) {
         checkRows = $grid.getCheckboxRecords(true);
         if (!checkRows.length) {
-          this.$baseAlert(this.$t2("请选择需要导出/打印的数据", "components.baseInputExport.selectDataTip"));
+          this.$baseAlert(
+            this.$t2(
+              "请选择需要导出/打印的数据",
+              "components.baseInputExport.selectDataTip"
+            )
+          );
           return;
         }
       }
@@ -238,7 +241,9 @@ modules = {
       } else if (this.exportTypes.includes(etType)) {
         //导出excel
         let conditions = this.tableDefalutHandle(exportTemplate) || [];
-        this.$baseConfirm(this.$t2("您确定要导出吗？", "components.baseInputExport.exportTip")).then(() => {
+        this.$baseConfirm(
+          this.$t2("您确定要导出吗？", "components.baseInputExport.exportTip")
+        ).then(() => {
           let condition = $grid
             ? this.tableDefalutHandle(exportTemplate)
             : this.tableDefalutHandle(exportTemplate);
@@ -371,16 +376,17 @@ modules = {
       }
 
       function downLoadFile(row, that) {
-        let realFileName = fileName ? fileName + "-" + row.uuid : row.uuid;
-        let fileUrl
-          = configUtil.baseUrl
-          + that.option.prefix
-          + "/export_ins/download?uuid="
-          + row.uuid
-          + "&ippaaapp="
-          + row.ippaaapp
-          + "&n="
-          + realFileName;
+        let filename = row.filename || fileName;
+        let realFileName = filename ? filename + "-" + row.uuid : row.uuid;
+        let fileUrl =
+          configUtil.baseUrl +
+          that.option.prefix +
+          "/export_ins/download?uuid=" +
+          row.uuid +
+          "&ippaaapp=" +
+          row.ippaaapp +
+          "&n=" +
+          realFileName;
         var params = {};
         that.parentTarget.$http({
           method: "post",