htui-yllkbz 1.2.58 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.2.58",
+  "version": "1.3.2",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",
   "style": "lib/htui.css",

package/src/packages/HtAsyncTable/index.vue

@@ -5,7 +5,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-13 15:02:13
+ * @LastEditTime: 2022-02-15 10:14:46
 -->
 <template>
   <div v-loading="state.loading">
@@ -195,7 +195,6 @@ export default class HtTable extends Vue {
     },
   };
   created() {
-    // console.log("this", this.$props);
     this.setPageInfo(this.pageInfo);
   }
   getPropByPath(obj: any, path: string, strict: boolean) {
@@ -224,30 +223,7 @@ export default class HtTable extends Vue {
     // };
     return tempObj ? tempObj[keyArr[i]] : null;
   }
-  /** 遍历循环展示row数据 */
-  showValue(row: any, key: string) {
-    if (key) {
-      if (key.includes(".")) {
-        //存在多级的情况
-        //console.log("eval", key, eval(row[key]));
-        // const arrKey = key.split(".");
-        // let data = row;
-        // arrKey.forEach((item) => {
-        //   if (data[item]) {
-        //     data = data[item];
-        //   } else {
-        //     data = "";
-        //   }
-        // });
-        return "";
-      } else {
-        //如果不存在多级数据
-        return row[key];
-      }
-    } else {
-      return "";
-    }
-  }
+
   /** 监听 */
   @Watch("pageInfo")
   setPageInfo(val?: PageInfoType) {

package/src/packages/HtTable/index.vue

@@ -5,7 +5,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2022-02-14 11:07:24
+ * @LastEditTime: 2022-02-20 17:54:42
 -->
 <template>
   <div v-loading="state.loading"
@@ -240,6 +240,7 @@
         <el-button type="primary"
                    @click="confirmSortAndshow">确定</el-button>
         <el-button @click="state.visibleFilter=false">取消</el-button>
+        <el-button @click="resetColumn">重置</el-button>
       </span>
     </el-dialog>
     <!-- 附件详情弹框 -->
@@ -373,6 +374,15 @@ export default class HtTable extends Vue {
       this.creatInitColumnKey(this.columns || []);
     }
   }
+  resetColumn() {
+    this.creatInitColumnKey(this.columns || []);
+    if (this.uuId) {
+      window.localStorage.setItem(
+        "table_" + this.uuId,
+        JSON.stringify(this.columns || [])
+      );
+    }
+  }
   /** 获取展示的keys值 */
   getShowKeys(data: Column[]) {
     const arr: string[] = [];
@@ -390,11 +400,11 @@ export default class HtTable extends Vue {
     this.state.allColumns.forEach((item) => {
       item.checked = true;
     });
+    this.$nextTick(() => {
+      (this.$refs.comTable as any).doLayout();
+      // el-table加ref="comTable"
+    });
     this.getShowKeys(this.state.allColumns);
-    // this.state.showColumnKeys = this.columns.reduce((arr: string[], item) => {
-    //   arr.push(item.key);
-    //   return arr;
-    // }, []);
   }
   /** 展示附件信息 */
   showFiles(val = "") {
@@ -424,15 +434,12 @@ export default class HtTable extends Vue {
     //   dropType === "before"
     //     ? data.splice(index, 0, currentColumn)
     //     : data.splice(index + 1, 0, currentColumn);
-    // console.log("tree drag end: ", currentColumn, showColumnKeys);
+
     if (currentColumn && checkedColumnKeys.includes(currentColumn.key)) {
       setTimeout(() => {
         (this.$refs.tree as any).setChecked(currentColumn, true);
       }, 0);
     }
-    //console.log("handleDragEnd", this.columns);
-
-    // }
   }
   handleDrop() {
     // console.log("tree drop: ", dropNode, dropType);
@@ -492,6 +499,7 @@ export default class HtTable extends Vue {
   confirmSortAndshow() {
     this.state.loading = true;
     this.state.showColumns = [];
+    this.state.allColumns = this.getAllColumns;
     const { allColumns, checkedColumnKeys } = this.state;
     //对列表check复制
     allColumns.forEach(
@@ -510,33 +518,15 @@ export default class HtTable extends Vue {
     this.state.showColumns = allColumns;
     this.state.visibleFilter = false;
     this.state.loading = false;
+    this.$nextTick(() => {
+      (this.$refs.comTable as any).doLayout();
+      // el-table加ref="multipleTable"
+    });
+
     /** 自定义列回调 */
     this.$emit("customColumn", allColumns);
   }
-  /** 遍历循环展示row数据 */
-  showValue(row: any, key: string) {
-    if (key) {
-      if (key.includes(".")) {
-        //存在多级的情况
-        //console.log("eval", key, eval(row[key]));
-        // const arrKey = key.split(".");
-        // let data = row;
-        // arrKey.forEach((item) => {
-        //   if (data[item]) {
-        //     data = data[item];
-        //   } else {
-        //     data = "";
-        //   }
-        // });
-        return "";
-      } else {
-        //如果不存在多级数据
-        return row[key];
-      }
-    } else {
-      return "";
-    }
-  }
+
   /** 获取显示出来的table头信息 */
   get showColumns() {
     const { showColumnKeys, showColumns } = this.state;

package/src/packages/HtUploadFiles/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2022-02-11 14:26:23
  * @LastEditors: hutao
- * @LastEditTime: 2022-02-11 14:36:54
+ * @LastEditTime: 2022-02-15 10:14:00
 -->
 <!--
  * @Descripttion: 附件列表  ------没有搞完
@@ -135,7 +135,7 @@ export default class HtUploadFiles extends Vue {
   }
   /** 附件上传成功 */
   onSuccess(response: { fileToken: string }) {
-    console.log("response, file, fileList", response.fileToken);
+    // console.log("response, file, fileList", response.fileToken);
     //this.state.files.push(response.fileToken);
     this.getFileInfo(response.fileToken);
   }