htui-yllkbz 1.3.19 → 1.3.22

package/package.json

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

package/src/packages/HtSelectBaseData/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 15:47:47
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-19 09:45:04
+ * @LastEditTime: 2022-04-24 09:46:42
 -->
 
 <template>
@@ -102,7 +102,7 @@ export default class HtSelectBaseData extends Vue {
       }
     }
     this.$emit("input", data);
-    this.$emit("change", data);
+    this.$emit("change", data, dep);
     // this.$emit("input", id);
     // this.$emit("change", id, data[this.dataTypeId][0]);
   }

package/src/packages/HtShowBaseData/index.vue

@@ -234,6 +234,17 @@ export default class CommonDatas extends Vue {
     if (this.baseDataId) {
       const tempText = this.setAllLevel(this.baseDataId);
       this.state.text = tempText;
+    } else {
+      this.state.text = "";
+    }
+  }
+  @Watch("baseDataId")
+  getText(val: string) {
+    if (val && this.baseDataItem) {
+      const tempText = this.setAllLevel(val);
+      this.state.text = tempText;
+    } else {
+      this.state.text = "";
     }
   }
 

package/src/packages/HtTable/index.vue

@@ -5,7 +5,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-13 13:26:54
+ * @LastEditTime: 2022-04-29 09:45:54
 -->
 <template>
   <div v-loading="state.loading"
@@ -211,6 +211,7 @@
     <!-- 详情弹框 -->
     <el-dialog :visible.sync="state.visibleFilter"
                title="属性设置"
+               v-if="state.visibleFilter"
                :append-to-body="true"
                :close-on-click-modal="true"
                width="400px">
@@ -253,6 +254,7 @@
     </el-dialog>
     <!-- 附件详情弹框 -->
     <el-dialog :visible.sync="state.visibleFile"
+               v-if="state.visibleFile"
                title="附件查看"
                :append-to-body="true"
                :close-on-click-modal="true"
@@ -371,35 +373,7 @@ export default class HtTable extends Vue {
   created() {
     this.setPageInfo(this.pageInfo);
     //this.setColumns(this.columns);
-    if (this.uuId) {
-      //通过uuid获取缓存起来的header显示信息
-      //-todo
-      //---columns 要改变
-      //---showColumnKeys 要改变
-      //---排列顺序要改变 todo
-      const allColumns: string | null = window.localStorage.getItem(
-        "table_" + this.uuId
-      );
-      if (allColumns) {
-        this.state.allColumns = JSON.parse(allColumns);
-        this.state.showColumns = JSON.parse(allColumns);
-        this.getShowKeys(this.state.allColumns);
-      } else {
-        if (this.configShow) {
-          this.columns.forEach((item) => (item.checked = !!item.deafaultShow));
-          this.creatInitColumnKey(this.columns);
-        } else {
-          this.creatInitColumnKey(this.columns || []);
-        }
-      }
-    } else {
-      if (this.configShow) {
-        this.columns.forEach((item) => (item.checked = !!item.deafaultShow));
-        this.creatInitColumnKey(this.columns);
-      } else {
-        this.creatInitColumnKey(this.columns || []);
-      }
-    }
+
     // console.log("this.columns", this.columns);
   }
   resetColumn() {
@@ -603,43 +577,40 @@ export default class HtTable extends Vue {
 
     return allColumns.filter((item) => !item.hide);
   }
-  @Watch("columns")
+  @Watch("columns", { immediate: true })
   setColumns(columns?: Column[]) {
-    const { showColumns } = this.state;
-    /** 当前所有key */
-    let allKeys: any = {};
-    /** 新来的所有key */
-    let newKeys: any = {};
-    showColumns.forEach((item) => {
-      allKeys = { ...allKeys, [item.key]: true };
-    });
-    columns?.forEach((item) => {
-      newKeys = { ...newKeys, [item.key]: true };
-    });
-    /** 查找出所有的当前不存在的key */
-    const newColumns = columns?.filter((item) => !allKeys[item.key]);
-    /** 查找出当前已有的key */
-    const successColumns = showColumns?.filter((item) => newKeys[item.key]);
-    const tempColumns: Column[] = [];
-    const lastColumn: Column[] = [];
-    successColumns.forEach((item, index) => {
-      /** 去除操作列 */
-      if (item.key !== "handel") {
-        tempColumns.push(item);
+    if (!columns) {
+      return;
+    }
+    if (this.uuId) {
+      //通过uuid获取缓存起来的header显示信息
+      //-todo
+      //---columns 要改变
+      //---showColumnKeys 要改变
+      //---排列顺序要改变 todo
+      const allColumns: string | null = window.localStorage.getItem(
+        "table_" + this.uuId
+      );
+      if (allColumns) {
+        this.state.allColumns = JSON.parse(allColumns);
+        this.state.showColumns = JSON.parse(allColumns);
+        this.getShowKeys(this.state.allColumns);
       } else {
-        lastColumn.push(item);
+        if (this.configShow) {
+          columns.forEach((item) => (item.checked = !!item.deafaultShow));
+          this.creatInitColumnKey(columns);
+        } else {
+          this.creatInitColumnKey(columns || []);
+        }
       }
-    });
-    newColumns?.forEach((item, index) => {
-      /** 去除操作列 */
-      if (item.key !== "handel") {
-        tempColumns.push(item);
+    } else {
+      if (this.configShow) {
+        columns.forEach((item) => (item.checked = !!item.deafaultShow));
+        this.creatInitColumnKey(columns);
       } else {
-        lastColumn.push(item);
+        this.creatInitColumnKey(columns || []);
       }
-    });
-    /** 去除多余并且添加新增的 */
-    this.creatInitColumnKey([...tempColumns, ...lastColumn]);
+    }
   }
 }
 </script>