htui-yllkbz 1.5.34 → 1.5.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.5.34",
+  "version": "1.5.36",
   "port": "8082",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",

package/src/packages/HtExport/index.vue

@@ -4,10 +4,11 @@
  * @Author: hutao
  * @Date: 2021-09-02 09:03:43
  * @LastEditors: hutao
- * @LastEditTime: 2023-04-26 10:20:37
+ * @LastEditTime: 2024-11-13 14:29:20
 -->
 <template>
-  <span @click="exportExcel" v-loading="state.loading">
+  <span @click="exportExcel"
+        v-loading="state.loading">
     <slot :loading="state.loading">
       <el-button type="primary">
         导出Excel
@@ -16,9 +17,10 @@
   </span>
 </template>
 <script lang="ts">
-import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
-import { AxiosRequestConfig, Method } from 'axios';
-import { _axios } from 'vue-kst-auth';
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import { AxiosRequestConfig, Method } from "axios";
+import { _axios } from "vue-kst-auth";
+_axios.defaults.timeout = 0;
 /** 设置axios返回类型 */
 Vue.config.productionTip = false;
 interface State {
@@ -27,7 +29,7 @@ interface State {
   canExport?: boolean;
 }
 @Component({
-  name: 'HtExport',
+  name: "HtExport",
 })
 export default class HtExport extends Vue {
   /**  请求方式 */
@@ -50,9 +52,9 @@ export default class HtExport extends Vue {
   /** 方法 */
   /** 手动导出 */
   handelExport(params?: object) {
-    let fileName = this.fileName || '未知文件名.xlsx';
+    let fileName = this.fileName || "未知文件名.xlsx";
     let config: AxiosRequestConfig = {
-      responseType: 'blob',
+      responseType: "blob",
       params: {},
     };
     if (this.params) {
@@ -63,28 +65,28 @@ export default class HtExport extends Vue {
       config = params;
     }
     if (this.url) {
-      if (this.method === 'post') {
+      if (this.method === "post") {
         this.state.loading = true;
         _axios
-          .post(this.url, config, { responseType: 'blob' })
+          .post(this.url, config, { responseType: "blob" })
           .then((res) => {
             const content = res.data;
             if (!this.fileName) {
-              const headers = res.headers['content-disposition'];
+              const headers = res.headers["content-disposition"];
               if (!headers) {
-                this.$notify.warning('暂无数据导出');
+                this.$notify.warning("暂无数据导出");
                 return;
               }
               fileName = decodeURIComponent(
-                headers.split('filename*=UTF-8')[1]
-              ).replace("''", '');
+                headers.split("filename*=UTF-8")[1]
+              ).replace("''", "");
             }
             const blob = new Blob([content as any]);
-            if ('download' in document.createElement('a')) {
+            if ("download" in document.createElement("a")) {
               // 非IE下载
-              const elink = document.createElement('a');
+              const elink = document.createElement("a");
               elink.download = fileName;
-              elink.style.display = 'none';
+              elink.style.display = "none";
               elink.href = URL.createObjectURL(blob);
               document.body.appendChild(elink);
               elink.click();
@@ -101,21 +103,21 @@ export default class HtExport extends Vue {
       } else {
         this.state.loading = true;
         _axios
-          .get(this.url, { responseType: 'blob', params: config })
+          .get(this.url, { responseType: "blob", params: config })
           .then((res) => {
             const content = res.data;
             if (!this.fileName) {
-              const headers = res.headers['content-disposition'];
+              const headers = res.headers["content-disposition"];
               fileName = decodeURIComponent(
-                headers.split('filename*=UTF-8')[1]
-              ).replace("''", '');
+                headers.split("filename*=UTF-8")[1]
+              ).replace("''", "");
             }
             const blob = new Blob([content as any]);
-            if ('download' in document.createElement('a')) {
+            if ("download" in document.createElement("a")) {
               // 非IE下载
-              const elink = document.createElement('a');
+              const elink = document.createElement("a");
               elink.download = fileName;
-              elink.style.display = 'none';
+              elink.style.display = "none";
               elink.href = URL.createObjectURL(blob);
               document.body.appendChild(elink);
               elink.click();
@@ -141,7 +143,7 @@ export default class HtExport extends Vue {
     }
   }
   /** 监听 */
-  @Watch('exportBefore', { immediate: true })
+  @Watch("exportBefore", { immediate: true })
   getExportBefore(canExport?: boolean) {
     this.state.canExport = canExport;
   }

package/src/packages/HtTable/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2024-09-24 09:45:55
+ * @LastEditTime: 2024-10-22 11:28:41
 -->
 <template>
   <div v-loading="state.loading"
@@ -701,7 +701,7 @@ export default class HtTable extends Vue {
       const allColumns: string | null = window.localStorage.getItem(
         "table_" + this.uuId
       );
-      if (allColumns) {
+      if (allColumns && JSON.parse(allColumns)?.length) {
         this.state.allColumns = JSON.parse(allColumns);
         this.state.showColumns = JSON.parse(allColumns);
         this.getShowKeys(this.state.allColumns);

package/src/views/About.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2024-09-24 09:41:14
+ * @LastEditTime: 2024-10-22 17:11:12
 -->
 <template>
   <div>
@@ -39,9 +39,9 @@
     <div ref="ht-pdf">
       <HtTable :data="state.data"
                :showFilter="true"
-               :uuId="'dhjsgdshg8989354'"
+               :uuId="'dhjsgdshg8989353334'"
                :configShow="true"
-               :checked="false"
+               :checked="true"
                :isExpand="false"
                :height="500"
                :columns="state.columns">