htui-yllkbz 1.3.11 → 1.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.3.11",
+  "version": "1.3.15",
   "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-03-08 14:47:24
+ * @LastEditTime: 2022-04-12 17:45:27
 -->
 
 <template>
@@ -24,12 +24,19 @@
 
     </template>
     <div v-else>
-      <div is='common-datas-info-id'
+      <HtShowBaseData v-if="this.value"
+                      :hide-code="hideCode"
+                      :base-data-id='this.value'
+                      :base-data-info='true'
+                      com-style="font-size:12px"
+                      style="font-size:12px">
+      </HtShowBaseData>
+      <!-- <div is='common-datas-info-id'
            com-style="font-size:12px"
            v-if="this.value"
            :hide-code="hideCode"
            :base-data-id='this.value'
-           :base-data-info='true'></div>
+           :base-data-info='true'></div> -->
     </div>
 
   </div>
@@ -37,6 +44,7 @@
 </template>
 <script lang='ts'>
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import HtShowBaseData from "@/packages/HtShowBaseData";
 interface State {
   /** 数据状态 */
   loading: boolean;
@@ -44,6 +52,9 @@ interface State {
 }
 @Component({
   name: "HtSelectBaseData",
+  components: {
+    HtShowBaseData,
+  },
 })
 export default class HtSelectBaseData extends Vue {
   @Prop() value!: string;

package/src/packages/HtShowBaseData/index.ts

@@ -0,0 +1,15 @@
+/*
+ * @Descripttion: 基础数据展示组件
+ * @version: 
+ * @Author: hutao
+ * @Date: 2022-04-12 17:34:51
+ * @LastEditors: hutao
+ * @LastEditTime: 2022-04-12 17:43:38
+ */
+
+import HtShowBaseData from "./index.vue";
+(HtShowBaseData as any).install = function (Vue: any) {
+
+  Vue.component("HtShowBaseData", HtShowBaseData);
+};
+export default HtShowBaseData;

package/src/packages/HtShowBaseData/index.vue

@@ -0,0 +1,316 @@
+<template>
+  <div class="show-common-item">
+    <!-- 时间 -->
+    <template v-if="timeStr">
+      <span>
+        {{ timeFormat }}
+      </span>
+    </template>
+    <!-- 部门 -->
+    <template v-if="departmentId">
+      <span class="item"
+            v-for="item in departmentData"
+            :key="item">
+        {{ getorgById(item).displayName || empty }}
+      </span>
+    </template>
+    <!-- 用户 -->
+    <template v-if="userId">
+      <span class="item"
+            v-for="item in userData"
+            :key="item.id">
+        {{ item.value || empty }}
+      </span>
+    </template>
+    <!-- 角色 -->
+    <template v-if="roleId">
+      <span class="item"
+            v-for="item in roleData"
+            :key="item.id">
+        {{ item.name || empty }}
+      </span>
+    </template>
+    <!-- 基础数据,以id查找 -->
+    <template v-if="baseDataId">
+      <span class="item"
+            v-if="baseDataItem[baseDataId]">
+        <!-- {{ baseDataItem[baseDataId].name || empty }}
+        <span v-if="baseDataInfo&&!hideCode">
+          ({{ baseDataItem[baseDataId].value || empty }})
+        </span> -->
+        {{state.text}}
+      </span>
+      <span v-else> {{ empty }}</span>
+    </template>
+    <!-- 基础数据,以value查找 -->
+    <template v-if="baseDataValue">
+      <span class="item"
+            v-if="baseDataItem[baseDataValue]">
+        {{ baseDataItem[baseDataValue].name || empty }}
+        <span v-if="baseDataInfo&&!hideCode">
+          ({{ baseDataItem[baseDataValue].value || empty }})
+        </span>
+      </span>
+      <span v-else> {{ empty }}</span>
+    </template>
+    <!-- 基础数据,以namg查找 -->
+    <template v-if="baseDataName">
+      <span class="item"
+            v-if="baseDataItem[baseDataName]">
+        {{ baseDataItem[baseDataName].name || empty }}
+        <span v-if="baseDataInfo&&!hideCode">
+          ({{ baseDataItem[baseDataName].value || empty }})
+        </span>
+      </span>
+      <span v-else> {{ empty }}</span>
+    </template>
+  </div>
+</template>
+
+<script lang="ts">
+import { Vue, Prop, Component, Watch } from "vue-property-decorator";
+import { baseConfig } from "vue-kst-auth";
+interface Inuser {
+  concurrencyStamp: string;
+  email: string;
+  emailConfirmed: boolean;
+  extraProperties: any;
+  id: string;
+  isLockedOut: boolean;
+  lockoutEnabled: boolean;
+  name: string;
+  organizationIds: string[];
+  phoneNumber: string;
+  phoneNumberConfirmed: boolean;
+  surname: string;
+  tenantId: string;
+  userName: string;
+  value: string;
+}
+interface State {
+  /** api返回数据 */
+  resData: {
+    /** 基础数据 */
+    baseData: {
+      items: any[];
+    };
+    /** 字典类别 */
+    dictionaryCategory: {
+      items: any[];
+    };
+    /** 字典数据 */
+    dictionaryData: any[];
+    /** 严重等级 */
+    severityLevel: any[];
+    /** 部门 */
+    organizationUnit: any[];
+    /** 部门树结构 */
+    organizationUsersTree: any[];
+    /** 用户 */
+    users: {
+      items?: Array<Inuser>;
+    };
+    /** 当前登录用户相关信息 */
+    SessionState: any;
+    /** 当前登录用户所在部门 */
+    userInOrganiza: any[];
+    organizationUsers: any;
+    roleList: any[];
+  };
+  /** 递归基础数据 */
+  baseDataItem: {
+    [key: string]: any;
+  };
+  text: string;
+}
+
+@Component({
+  name: "HtShowBaseData",
+})
+export default class CommonDatas extends Vue {
+  /** 查找不到为空时显示 */
+  @Prop({ default: "" }) empty?: string;
+  /** 显示用户信息 */
+  @Prop() userId?: string;
+  /** 是否展示所有关联节点 */
+  @Prop() showAllLevel?: boolean;
+  /** 隐藏编码 */
+  @Prop() hideCode?: boolean;
+  /** 显示角色信息 */
+  @Prop() roleId?: string;
+  /** 显示部门信息 */
+  @Prop() departmentId?: string;
+  /** 严重性信息 */
+  @Prop() severityValue?: string;
+  /** 时间格式处理 */
+  @Prop() timeStr?: string;
+  /** 基础数据 */
+  @Prop() baseDataId?: string;
+  /** 基础数据value */
+  @Prop() baseDataValue?: string;
+  /** 基础数据name */
+  @Prop() baseDataName?: string;
+  /** 基础数据详情,显示名称加编码 */
+  @Prop({ default: false }) baseDataInfo?: boolean;
+  /** 人员 */
+  /** 数据 */
+  state: State = {
+    text: "",
+    resData: {
+      baseData: {
+        items: [],
+      },
+      dictionaryCategory: {
+        items: [],
+      },
+      dictionaryData: [],
+      severityLevel: [],
+      organizationUnit: [],
+      organizationUsersTree: [],
+      users: {
+        items: [],
+      },
+      SessionState: "",
+      userInOrganiza: [],
+      organizationUsers: {},
+      roleList: [],
+    },
+    baseDataItem: {},
+  };
+  /** 生命周期 */
+  created() {
+    if (!baseConfig.getLoginState()) {
+      return;
+    }
+    const data = window.localStorage.getItem("commonDatas");
+    if (data) {
+      this.state.resData = Object.assign(this.state.resData, JSON.parse(data));
+    }
+    const { items = [] } = this.state.resData.baseData;
+    this.getBaseDataItem(items);
+    this.setText();
+  }
+  /** 方法 */
+  /** 根据id获取用户部门 */
+  getorgById(id: string) {
+    return (
+      this.state.resData.organizationUnit.find((val) => val.id == id) || {}
+    );
+  }
+  /** 递归处理基础数据 */
+  getBaseDataItem(list: any[]) {
+    // const list = this.state.resData.baseData.items || []
+    list.forEach((item) => {
+      this.state.baseDataItem[item.id || ""] = item;
+      this.state.baseDataItem[item.value || ""] = item;
+      this.state.baseDataItem[item.name || ""] = item;
+      if (item.children) {
+        this.getBaseDataItem(item.children);
+      }
+    });
+  }
+  /** 获取节点相关的所有父节点信息--只针对基础数据 */
+  setAllLevel(id: any) {
+    const { baseDataItem } = this.state;
+    const hideCode = this.hideCode;
+    let text = "";
+
+    if (baseDataItem[id]) {
+      if (hideCode) {
+        text = `${baseDataItem[id].name || ""}`;
+      } else {
+        text = `${baseDataItem[id].name || ""}(${baseDataItem[id].value})`;
+      }
+      if (baseDataItem[id].parentId && this.showAllLevel) {
+        const tempText = this.setAllLevel(baseDataItem[id]["parentId"]);
+        text = `${tempText}/${text}`;
+      }
+    }
+
+    return text;
+  }
+  @Watch("baseDataItem")
+  setText() {
+    if (this.baseDataId) {
+      const tempText = this.setAllLevel(this.baseDataId);
+      this.state.text = tempText;
+    }
+  }
+
+  /** 计算属性 */
+  /** 基础数据 */
+  get baseDataItem() {
+    return this.state.baseDataItem || {};
+  }
+  /** 获取严重等级 */
+  get SeverityLevel() {
+    return this.state.resData.severityLevel || [];
+  }
+  /** 获取用户数据 */
+  get userDataList() {
+    return this.state.resData.users.items || [];
+  }
+  /** 根据id获取用户数据 */
+  get userData() {
+    if (!this.userId) {
+      return [];
+    }
+
+    if (this.state.resData.users.items) {
+      const ids: string[] = JSON.parse(this.userId);
+
+      const data = this.state.resData.users.items.filter((val) =>
+        ids.includes(val.id)
+      );
+      return data;
+    } else {
+      return [];
+    }
+  }
+  /** 根据id获取角色数据 */
+  get roleData() {
+    if (!this.roleId) {
+      return [];
+    }
+
+    if (this.state.resData.roleList) {
+      const ids: string[] = JSON.parse(this.roleId);
+
+      const data = this.state.resData.roleList.filter((val) =>
+        ids.includes(val.id || "")
+      );
+      return data;
+    } else {
+      return [];
+    }
+  }
+  /** 根据id获取部门数据 */
+  get departmentData() {
+    if (!this.departmentId) {
+      return [];
+    }
+    const ids = JSON.parse(this.departmentId);
+
+    return ids;
+  }
+  /** 时间格式 */
+  get timeFormat() {
+    if (this.timeStr && this.timeStr.startsWith("0")) {
+      return this.empty;
+    } else {
+      return this.timeStr?.replace(/T/, " ").slice(0, 19) || this.empty;
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.show-common-item {
+  display: inline-block;
+  .item {
+    + .item {
+      padding-left: 10px;
+    }
+  }
+}
+</style>

package/src/packages/HtTable/index.vue

@@ -5,7 +5,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-06 17:25:14
+ * @LastEditTime: 2022-04-12 17:54:52
 -->
 <template>
   <div v-loading="state.loading"
@@ -105,6 +105,7 @@
                     :rowIndex="rowIndex">
                 <!-- 处理部门 -->
                 <template v-if="item.type==='org'">
+
                   <common-org-info v-if="getPropByPath(row,item.key)"
                                    :org-id="getPropByPath(row,item.key)"
                                    type="tag"></common-org-info>
@@ -112,25 +113,26 @@
                 </template>
                 <!-- 处理基础数据 -->
                 <template v-else-if="item.type==='common'">
+                  <HtShowBaseData v-if="getPropByPath(row,item.key)"
+                                  :hide-code="item.hideCode"
+                                  :user-id="item.commonType==='userId'?JSON.stringify([getPropByPath(row,item.key)]):'[]'"
+                                  :department-id="item.commonType==='departmentId'?JSON.stringify([getPropByPath(row,item.key)]):'[]'"
+                                  :role-id="item.commonType==='roleId'?JSON.stringify([getPropByPath(row,item.key)]):'[]'"
+                                  :base-data-id="item.commonType==='baseDataId'?getPropByPath(row,item.key):''"
+                                  :base-data-value="item.commonType==='baseDataValue'?getPropByPath(row,item.key):''"
+                                  :base-data-name="item.commonType==='baseDataName'?getPropByPath(row,item.key):''"
+                                  :base-data-info='true'>
+                  </HtShowBaseData>
 
-                  <div v-if="getPropByPath(row,item.key)"
-                       is='common-datas-info-id'
-                       :hide-code="item.hideCode"
-                       :user-id="item.commonType==='userId'?JSON.stringify([getPropByPath(row,item.key)]):'[]'"
-                       :department-id="item.commonType==='departmentId'?JSON.stringify([getPropByPath(row,item.key)]):'[]'"
-                       :role-id="item.commonType==='roleId'?JSON.stringify([getPropByPath(row,item.key)]):'[]'"
-                       :base-data-id="item.commonType==='baseDataId'?getPropByPath(row,item.key):''"
-                       :base-data-value="item.commonType==='baseDataValue'?getPropByPath(row,item.key):''"
-                       :base-data-name="item.commonType==='baseDataName'?getPropByPath(row,item.key):''"
-                       :base-data-info='true'></div>
                   <span v-else>--</span>
                 </template>
                 <!-- 处理部门人员 -->
                 <template v-else-if="item.type==='userId'">
-                  <div is='common-datas-info-id'
-                       v-if="getPropByPath(row,item.key)"
-                       :user-id="JSON.stringify(getPropByPath(row,item.key))"
-                       :base-data-info='true'></div>
+                  <HtShowBaseData v-if="getPropByPath(row,item.key)"
+                                  :user-id="JSON.stringify(getPropByPath(row,item.key))"
+                                  :base-data-info='true'>
+                  </HtShowBaseData>
+
                   <span v-else>--</span>
                 </template>
                 <!-- 处理时间 -->
@@ -274,6 +276,7 @@ import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import { Column, PageInfoType } from "@/packages/type";
 import PageInfo from "@/packages/PageInfo/index.vue";
 import HtUploadFiles from "@/packages/HtUploadFiles/index.vue";
+import HtShowBaseData from "@/packages/HtShowBaseData";
 interface State {
   pageInfo: PageInfoType;
   loading: boolean;
@@ -299,6 +302,7 @@ interface State {
   components: {
     PageInfo,
     HtUploadFiles,
+    HtShowBaseData,
   },
 })
 export default class HtTable extends Vue {
@@ -381,26 +385,29 @@ export default class HtTable extends Vue {
         this.getShowKeys(this.state.allColumns);
       } else {
         if (this.configShow) {
-          this.creatInitColumnKey(
-            this.columns.filter((item) => item.deafaultShow)
-          );
+          this.columns.forEach((item) => (item.checked = !!item.deafaultShow));
+          this.creatInitColumnKey(this.columns);
         } else {
           this.creatInitColumnKey(this.columns || []);
         }
       }
     } else {
       if (this.configShow) {
-        this.creatInitColumnKey(
-          this.columns.filter((item) => item.deafaultShow)
-        );
+        this.columns.forEach((item) => (item.checked = !!item.deafaultShow));
+        this.creatInitColumnKey(this.columns);
       } else {
         this.creatInitColumnKey(this.columns || []);
       }
     }
+    console.log("this.columns", this.columns);
   }
   resetColumn() {
     if (this.configShow) {
-      this.creatInitColumnKey(this.columns.filter((item) => item.deafaultShow));
+      this.columns.forEach((item) => {
+        item.checked = !!item.deafaultShow;
+      });
+
+      this.creatInitColumnKey(this.columns);
     } else {
       this.creatInitColumnKey(this.columns || []);
     }
@@ -427,8 +434,9 @@ export default class HtTable extends Vue {
   creatInitColumnKey(columns: Column[]) {
     this.state.allColumns = columns;
     this.state.showColumns = columns;
+
     this.state.allColumns.forEach((item) => {
-      item.checked = true;
+      item.checked = item.checked === false ? false : true;
     });
     this.$nextTick(() => {
       (this.$refs.comTable as any).doLayout();
@@ -591,6 +599,7 @@ export default class HtTable extends Vue {
   }
   get getAllColumns() {
     const { allColumns } = this.state;
+
     return allColumns.filter((item) => !item.hide);
   }
   @Watch("columns")

package/src/views/About.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2022-03-09 15:08:19
+ * @LastEditTime: 2022-04-06 18:02:23
 -->
 <template>
   <div>
@@ -29,6 +29,7 @@
            :subfield="true"></ht-md> -->
     <div ref="ht-pdf">
       <HtTable :data="state.data"
+               :configShow="true"
                :checked="true"
                :height="200"
                uuId="54598fs1okdsfsdfk2"
@@ -84,6 +85,7 @@ export default class Index extends Vue {
       {
         name: "胡涛",
         selectable: true,
+
         age: 12,
         sex: "e49961a4f385e5d341ce3a01ee674c90ea9e037b734228fe26753a01ee674c90,e49961a4f385e5d341ce3a01ee674c90ea9e037b734228fe26753a01ee674c90",
         id: 1,
@@ -131,6 +133,7 @@ export default class Index extends Vue {
         width: "300px",
         property: "base",
         disabled: true,
+        deafaultShow: true,
       },
       {
         title: "姓额外名",
@@ -145,6 +148,7 @@ export default class Index extends Vue {
         type: "time",
         spread: true,
         key: "time",
+        deafaultShow: true,
       },
       {
         title: "性别",