htui-yllkbz 1.5.24 → 1.5.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.5.24",
+  "version": "1.5.29",
   "port": "8082",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",
@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "@microsoft/signalr": "^8.0.0",
+    "@types/node": "^22.5.5",
     "axios": "^0.21.0",
     "core-js": "^3.6.5",
     "element-ui": "^2.14.1",

package/src/packages/HtShowBaseData/index.vue

@@ -273,6 +273,7 @@ export default class CommonDatas extends Vue {
   /** 计算属性 */
   /** 基础数据 */
   get baseDataItem() {
+    console.log('this.state.baseDataItem',this.state.baseDataItem);
     return this.state.baseDataItem || {};
   }
   /** 获取严重等级 */

package/src/packages/HtTable/htTableColumn.vue

@@ -25,6 +25,10 @@
 
     <template v-if="item.children && item.children.length">
       <HtTableColumn :item="child"
+                     :getAllBaseData="getAllBaseData"
+                     :getAllOrg="getAllOrg"
+                     :getAllRole="getAllRole"
+                     :getAllUser="getAllUser"
                      v-for="(child, childindex) in item.children"
                      @showFiles="(val) => $emit('showFiles', val)"
                      :fromColumn="true"
@@ -56,35 +60,25 @@
             :rowIndex="$index">
         <!-- 处理部门 -->
         <template v-if="item.type === 'org'">
-          <HtOrgInfo v-if="getPropByPath(row, item.key)"
+          <el-tag v-if="getPropByPath(row, item.key)"> {{getAllOrg[getPropByPath(row, item.key)]?.displayName  }}</el-tag>
+          <!-- <HtOrgInfo v-if="getPropByPath(row, item.key)"
                      :org-id="getPropByPath(row, item.key)"
-                     type="tag"></HtOrgInfo>
+                     type="tag"></HtOrgInfo> -->
           <span v-else>--</span>
         </template>
         <!-- 处理基础数据 -->
         <template v-else-if="item.type === 'common'">
-          <HtShowBaseData v-if="getPropByPath(row, item.key)"
+          <span v-if="item.commonType === 'userId'&&getPropByPath(row, item.key)">
+            {{ getAllUser[getPropByPath(row, item.key)]?.value }}</span>
+          <span v-else-if="item.commonType === 'departmentId'&&getPropByPath(row, item.key)">
+            {{ getAllOrg[getPropByPath(row, item.key)]?.displayName }}</span>
+          <span v-else-if="item.commonType === 'roleId'&&getPropByPath(row, item.key)">
+            {{ getAllRole[getPropByPath(row, item.key)]?.name }}</span>
+          <span v-else-if="item.commonType === 'baseDataId'&&getPropByPath(row, item.key)">
+            {{ getAllBaseData[getPropByPath(row, item.key)]?.name }}<span v-if="!item.hideCode">({{ getAllBaseData[getPropByPath(row, item.key)]?.value }})</span></span>
+
+          <HtShowBaseData v-else-if="getPropByPath(row, item.key)&&(item.commonType === 'baseDataValue'|| item.commonType === 'baseDataName')"
                           :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)
@@ -102,11 +96,8 @@
         </template>
         <!-- 处理部门人员 -->
         <template v-else-if="item.type === 'userId'">
-          <HtShowBaseData v-if="getPropByPath(row, item.key)"
-                          :user-id="JSON.stringify(getPropByPath(row, item.key))"
-                          :base-data-info="true">
-          </HtShowBaseData>
-
+          <span v-if="getPropByPath(row, item.key)">
+            {{ getAllUser[getPropByPath(row, item.key)]?.value }}</span>
           <span v-else>--</span>
         </template>
         <!-- 处理时间 yyyy-mm-dd HH:mm:ss -->
@@ -236,6 +227,10 @@ interface State {
 export default class Index extends Vue {
   /** 单个Column信息 */
   @Prop() item!: Column;
+  @Prop() getAllBaseData!: any;
+  @Prop() getAllOrg!: any;
+  @Prop() getAllRole!: any;
+  @Prop() getAllUser!: any;
   /** 是否来自循环嵌套 */
   @Prop() fromColumn!: boolean;
   /** 数据 */

package/src/packages/HtTable/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2024-08-03 16:22:31
+ * @LastEditTime: 2024-09-24 09:45:55
 -->
 <template>
   <div v-loading="state.loading"
@@ -137,6 +137,10 @@
 
           <HtTableColumn :key="`${item.key}_${index}`"
                          :item="item"
+                         :getAllBaseData="getAllBaseData"
+                         :getAllOrg="getAllOrg"
+                         :getAllRole="getAllRole"
+                         :getAllUser="getAllUser"
                          @showFiles="showFiles">
             <template v-for="child in allChildren"
                       :slot="child.key"
@@ -274,6 +278,7 @@ import HtSelectUnit from "@/packages/HtSelectUnit";
 import HtTableColumn from "./htTableColumn.vue";
 import ElmentUI from "element-ui";
 import { getSpanMethod } from "./table-span-method";
+import { getAllBaseData, getAllOrg, getAllRole, getAllUser } from "../common";
 Vue.use(ElmentUI);
 interface State {
   pageInfo: PageInfoType;
@@ -638,6 +643,26 @@ export default class HtTable extends Vue {
     });
     return allchildren;
   }
+  /** 获取所有基础信息 */
+  get getAllBaseData() {
+    // console.log("获取所有基础信息", getAllBaseData());
+    return getAllBaseData();
+  }
+  /** 获取所有部门信息 */
+  get getAllOrg() {
+    // console.log("获取所有部门信息", getAllOrg());
+    return getAllOrg();
+  }
+  /** 获取所有用户信息 */
+  get getAllUser() {
+    //console.log("获取所有用户信息", getAllUser());
+    return getAllUser();
+  }
+  /** 获取所有角色信息 */
+  get getAllRole() {
+    // console.log("获取所有角色信息", getAllRole());
+    return getAllRole();
+  }
 
   /** 监听 */
   @Watch("pageInfo")

package/src/packages/common.ts

@@ -4,10 +4,11 @@
  * @Author: hutao
  * @Date: 2022-07-18 15:01:02
  * @LastEditors: hutao
- * @LastEditTime: 2024-05-30 14:56:32
+ * @LastEditTime: 2024-09-24 09:01:39
  */
 import moment from "moment";
 import { FormValues, TimeModes } from "./type";
+import { baseConfig } from "vue-kst-auth";
 
 /**    生成唯一Id
  * @params e 生成的id位数 默认32
@@ -241,3 +242,180 @@ export const roundHalfToEven = (num: number, precision = 2) => {
   // 将结果除以10的precision次方，得到最终舍入后的结果  
   return tempNum / factor;
 }
+
+/** 获取所有部门信息 */
+export const getAllOrg = () => {
+  const baseDataItem: any = {}
+  let resData = {
+    baseData: {
+      items: [],
+    },
+    dictionaryCategory: {
+      items: [],
+    },
+    dictionaryData: [],
+    severityLevel: [],
+    organizationUnit: [],
+    organizationUsersTree: [],
+    users: {
+      items: [],
+    },
+    SessionState: "",
+    userInOrganiza: [],
+    organizationUsers: {},
+    roleList: [],
+  }
+  if (!baseConfig.getLoginState()) {
+    return;
+  }
+  let data = window.localStorage.getItem("commonDatas");
+  if (data) {
+    resData = Object.assign(resData, JSON.parse(data));
+    data = null;
+  }
+  const organizationUnit = resData.organizationUnit;
+  /** 递归处理基础数据 */
+  function getBaseDataItem(list: any[]) {
+    list.forEach((item) => {
+      baseDataItem[item.id || ""] = item;
+      if (item.children) {
+        getBaseDataItem(item.children);
+      }
+    });
+  }
+  getBaseDataItem(organizationUnit);
+  return baseDataItem
+}
+/** 获取所有角色信息 */
+export const getAllRole = () => {
+  const baseDataItem: any = {}
+  let resData = {
+    baseData: {
+      items: [],
+    },
+    dictionaryCategory: {
+      items: [],
+    },
+    dictionaryData: [],
+    severityLevel: [],
+    organizationUnit: [],
+    organizationUsersTree: [],
+    users: {
+      items: [],
+    },
+    SessionState: "",
+    userInOrganiza: [],
+    organizationUsers: {},
+    roleList: [],
+  }
+  if (!baseConfig.getLoginState()) {
+    return;
+  }
+  let data = window.localStorage.getItem("commonDatas");
+  if (data) {
+    resData = Object.assign(resData, JSON.parse(data));
+    data = null;
+  }
+  const roleList = resData.roleList;
+  /** 递归处理基础数据 */
+  function getBaseDataItem(list: any[]) {
+    list.forEach((item) => {
+      baseDataItem[item.id || ""] = item;
+      if (item.children) {
+        getBaseDataItem(item.children);
+      }
+    });
+  }
+  getBaseDataItem(roleList);
+  return baseDataItem
+}
+/** 获取所有用户信息 */
+export const getAllUser = () => {
+  const baseDataItem: any = {}
+  let resData = {
+    baseData: {
+      items: [],
+    },
+    dictionaryCategory: {
+      items: [],
+    },
+    dictionaryData: [],
+    severityLevel: [],
+    organizationUnit: [],
+    organizationUsersTree: [],
+    users: {
+      items: [],
+    },
+    SessionState: "",
+    userInOrganiza: [],
+    organizationUsers: {},
+    roleList: [],
+  }
+  if (!baseConfig.getLoginState()) {
+    return;
+  }
+  let data = window.localStorage.getItem("commonDatas");
+  if (data) {
+    resData = Object.assign(resData, JSON.parse(data));
+    data = null;
+  }
+  const { items = [] } = resData.users;
+
+  /** 递归处理基础数据 */
+  function getBaseDataItem(list: any[]) {
+    list.forEach((item) => {
+      baseDataItem[item.id || ""] = item;
+      if (item.children) {
+        getBaseDataItem(item.children);
+      }
+    });
+  }
+  getBaseDataItem(items);
+  return baseDataItem
+}
+
+/** 获取所有的base信息通过KEY:VALUE形式 */
+export const getAllBaseData = () => {
+  const baseDataItem: any = {}
+  let resData = {
+    baseData: {
+      items: [],
+    },
+    dictionaryCategory: {
+      items: [],
+    },
+    dictionaryData: [],
+    severityLevel: [],
+    organizationUnit: [],
+    organizationUsersTree: [],
+    users: {
+      items: [],
+    },
+    SessionState: "",
+    userInOrganiza: [],
+    organizationUsers: {},
+    roleList: [],
+  }
+  if (!baseConfig.getLoginState()) {
+    return;
+  }
+  let data = window.localStorage.getItem("commonDatas");
+  if (data) {
+    resData = Object.assign(resData, JSON.parse(data));
+    data = null;
+  }
+  const { items = [] } = resData.baseData;
+  /** 递归处理基础数据 */
+  function getBaseDataItem(list: any[]) {
+    list.forEach((item) => {
+      baseDataItem[item.id || ""] = item;
+      if (item.children) {
+        getBaseDataItem(item.children);
+      }
+    });
+  }
+  getBaseDataItem(items);
+
+  return baseDataItem
+}
+

package/src/views/About.vue

@@ -4,10 +4,11 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2024-08-03 14:28:13
+ * @LastEditTime: 2024-09-24 09:41:14
 -->
 <template>
   <div>
+
     <el-button @click="state.visible = true">打开</el-button>
     <!-- <ht-row :gutter="16" :copies="10" colMinHeight="56px">
       <ht-col :span="2">iii</ht-col>
@@ -79,6 +80,7 @@ import HtBread from "@/packages/HtBread";
 import HtMore from "@/packages/HtMore";
 import { getSpanMethod } from "@/packages/HtTable/table-span-method";
 import HtMd from "@/packages/HtMd";
+import { getAllBaseData } from "@/packages/common";
 
 interface State {
   /** 数据状态 */
@@ -115,7 +117,9 @@ export default class Index extends Vue {
     data: [
       {
         name: "胡涛",
-        userId: "f6f09c3c-cf45-863a-d625-3a0955dccc4c",
+        userId: "50eb2d57-8529-00fb-4244-3a0c8ec117b0",
+        basedata: "0af4e2e8-21a8-85ed-bca5-3a0f9d36eb5f",
+        orgId: "2c3f739e-3c8d-3095-c7c4-3a0e59500dc0",
         selectable: true,
         times: 1,
 
@@ -127,7 +131,7 @@ export default class Index extends Vue {
       },
       {
         name: "胡涛",
-        userId: "f6f09c3c-cf45-863a-d625-3a0955dccc4c",
+        userId: "50eb2d57-8529-00fb-4244-3a0c8ec117b0",
         times: 1,
         age: 12,
         selectable: false,
@@ -138,7 +142,7 @@ export default class Index extends Vue {
       },
       {
         name: "胡涛1",
-        userId: "f6f09c3c-cf45-863a-d625-3a0955dccc4c",
+        userId: "50eb2d57-8529-00fb-4244-3a0c8ec117b0",
         age: 13,
         times: 1,
         sex: "tt",
@@ -148,7 +152,7 @@ export default class Index extends Vue {
       },
       {
         name: "胡涛",
-        userId: "f6f09c3c-cf45-863a-d625-3a0955dccc4c",
+        userId: "50eb2d57-8529-00fb-4244-3a0c8ec117b0",
         age: 13,
         times: 4,
         file: [],
@@ -159,7 +163,7 @@ export default class Index extends Vue {
       },
       {
         name: "胡涛",
-        userId: "f6f09c3c-cf45-863a-d625-3a0955dccc4c",
+        userId: "50eb2d57-8529-00fb-4244-3a0c8ec117b0",
         age: 12,
         times: 8,
         sex: "tt",
@@ -184,6 +188,19 @@ export default class Index extends Vue {
         width: "300px",
         type: "userId",
       },
+      {
+        title: "basedata",
+        key: "basedata",
+        width: "300px",
+        type: "common",
+        commonType: "baseDataId",
+      },
+      {
+        title: "orgId",
+        key: "orgId",
+        width: "300px",
+        type: "org",
+      },
       {
         title: "姓额外名",
         key: "namey",
@@ -251,6 +268,10 @@ export default class Index extends Vue {
   }
   /** 监听 */
   /** 计算属性 */
+  get test() {
+    console.log("getAllBaseData", getAllBaseData());
+    return getAllBaseData();
+  }
 }
 </script>
 <style lang="scss" scoped></style>