htui-yllkbz 1.3.64 → 1.3.66

package/package.json

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

package/src/App.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2022-09-27 14:50:29
+ * @LastEditTime: 2022-10-13 11:38:50
 -->
 <template>
   <div id="app">
@@ -23,12 +23,12 @@
       v-model="state.value"
       @change="change"
     ></HtSelectBaseData>
-    <HtSelectOrg
+    <HtSelectUser
       :clearable="true"
-      :multiple="false"
+      :multiple="true"
       v-model="state.value"
       @change="testuser"
-    ></HtSelectOrg>
+    ></HtSelectUser>
     <!-- <HtSelectOrg :clearable="true"
                  v-model="state.value"
                  @change="testuser"></HtSelectOrg> -->
@@ -49,6 +49,7 @@ import { mgr } from '@/plugins/oidc-client';
     HtSelectBaseData,
     HtSelectOrg,
     HtShowBaseType,
+    HtSelectUser,
   },
 })
 export default class App extends Vue {
@@ -75,8 +76,8 @@ export default class App extends Vue {
   change() {
     // console.log("eeee", e);
   }
-  testuser(e: any) {
-    //console.log('eee', e);
+  testuser(e: any, data: any) {
+    //console.log('eee', e, data);
   }
   test(e: any) {
     //mgr.removeUser();

package/src/packages/HtSelectOrg/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-08-26 16:11:31
+ * @LastEditTime: 2022-10-13 11:22:49
 -->
 <template>
   <span v-if="readonly">
@@ -32,6 +32,7 @@
 import { Component, Prop, Vue } from 'vue-property-decorator';
 import HtShowBaseData from '@/packages/HtShowBaseData';
 import HtBaseData from '@/packages/HtBaseData';
+import { getCommDataItem } from '../common';
 interface State {
   /** 数据状态 */
   loading: boolean;
@@ -71,7 +72,7 @@ export default class HtSelectOrg extends Vue {
   searchCommonData(res: any) {
     const dep = res['departmentId'];
 
-    let data = undefined;
+    let data: string | undefined | string[] = undefined;
     if (dep.length) {
       if (this.multiple) {
         const arr: string[] = [];
@@ -84,7 +85,8 @@ export default class HtSelectOrg extends Vue {
       }
     }
     this.$emit('input', data);
-    this.$emit('change', data);
+
+    this.$emit('change', data, getCommDataItem('org', data));
   }
   /** 监听 */
   get configJson() {

package/src/packages/HtSelectUser/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-08-26 16:11:46
+ * @LastEditTime: 2022-10-13 11:36:25
 -->
 <template>
   <span v-if="readonly">
@@ -28,6 +28,7 @@
 import { Component, Prop, Vue } from 'vue-property-decorator';
 import HtShowBaseData from '@/packages/HtShowBaseData';
 import HtBaseData from '@/packages/HtBaseData';
+import { getCommDataItem } from '../common';
 interface State {
   /** 数据状态 */
   loading: boolean;
@@ -80,7 +81,7 @@ export default class HtSelectUser extends Vue {
       }
     }
     this.$emit('input', data);
-    this.$emit('change', data);
+    this.$emit('change', data, getCommDataItem('user', data));
   }
   /** 监听 */
   get configJson() {

package/src/packages/HtTable/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2022-10-08 14:28:29
+ * @LastEditTime: 2022-10-24 14:22:09
 -->
 <template>
   <div v-loading="state.loading" style="background:#fff">
@@ -83,6 +83,18 @@
           type="selection"
         >
         </el-table-column>
+        <el-table-column v-if="isExpand" type="expand">
+          <!-- 展开行专用 -->
+          <template slot-scope="props">
+            <slot
+              name="expand"
+              :row="props.row"
+              :column="props.column"
+              :rowIndex="props.rowIndex"
+            >
+            </slot>
+          </template>
+        </el-table-column>
         <el-table-column
           v-if="!hideOrder"
           :resizable="false"
@@ -436,6 +448,8 @@ export default class HtTable extends Vue {
   @Prop() data!: any[];
   /**  序号对应的名称 */
   @Prop() keyName?: string;
+  /** 是否启用展开行功能 */
+  @Prop() isExpand?: boolean;
   /** 打开配置列 */
   @Prop() configShow?: boolean;
   /**  是否增加筛选功能 */

package/src/packages/common.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2022-07-18 15:01:02
  * @LastEditors: hutao
- * @LastEditTime: 2022-08-10 18:34:12
+ * @LastEditTime: 2022-10-13 11:22:09
  */
 import moment from "moment";
 
@@ -90,3 +90,68 @@ export function getCommDataName(id?: string, showobj = false) {
   }
   return undefined;
 }
+/** 获取基础数据的相关内容
+ * @parmas type 想要查询的类型 
+ * @params keys 查询的内容
+ */
+export function getCommDataItem(type: "users" | "organizationUnit" | "dictionaryCategory" | "dictionaryData" | 'user' | 'org' | "baseData", keys?: string | string[]) {
+  const commen = window.localStorage.getItem("commonDatas");
+  if (!commen) {
+    return undefined
+  }
+  const commonDatas = JSON.parse(commen)
+
+  switch (type) {
+    case "users"://返回所有人员
+      return commonDatas.users.items;
+    case "organizationUnit"://返回所有部门
+      return commonDatas.organizationUnit;
+    case "dictionaryData"://返回所有dictionaryData
+      return commonDatas.dictionaryData;
+    case "dictionaryCategory":
+      return commonDatas.dictionaryCategory.items;
+    case "user"://查询所有的关联的人员信息
+      const users = commonDatas.users.items;
+      if (keys) {
+        if (Array.isArray(keys)) {
+          return users.filter((item: any) => keys.toString().includes(item.id))
+        }
+        else {
+          return users.find((item: any) => item.id === keys)
+        }
+      }
+      else {
+        return undefined;
+      }
+    case "org"://查询所有的关联的部门信息
+      const organizationUnit = commonDatas.organizationUnit;
+      if (keys) {
+        if (Array.isArray(keys)) {
+          return organizationUnit.filter((item: any) => keys.toString().includes(item.id))
+        }
+        else {
+          return organizationUnit.find((item: any) => item.id === keys)
+        }
+      }
+      else {
+        return undefined;
+      }
+    case "baseData"://查询所有的id关联的基础数据
+      const baseData = commonDatas.baseData.items;
+      if (keys) {
+        if (Array.isArray(keys)) {
+          return baseData.filter((item: any) => keys.toString().includes(item.id))
+        }
+        else {
+          return baseData.find((item: any) => item.id === keys)
+        }
+      }
+      else {
+        return baseData
+      }
+  }
+
+  return
+
+
+}

package/src/views/About.vue

@@ -4,13 +4,19 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2022-05-09 10:05:08
+ * @LastEditTime: 2022-10-24 14:38:38
 -->
 <template>
   <div>
     ...................
-    <HtSelectUser :value="['be12db32-1718-a43d-1cf8-39f97d1d872f','5f2d6558-4e98-9054-413f-39fc4c63ebac','959f6988-a74b-f6f7-0fb6-3a0314e0eaad']"
-                  :multiple="true"></HtSelectUser>
+    <HtSelectUser
+      :value="[
+        'be12db32-1718-a43d-1cf8-39f97d1d872f',
+        '5f2d6558-4e98-9054-413f-39fc4c63ebac',
+        '959f6988-a74b-f6f7-0fb6-3a0314e0eaad',
+      ]"
+      :multiple="true"
+    ></HtSelectUser>
     <!-- <el-button type=""
                @click="test">test</el-button> -->
     <!-- <ht-count-down :stopwatch="true"
@@ -30,14 +36,17 @@
     <!-- <ht-md v-model="state.content"
            :subfield="true"></ht-md> -->
     <div ref="ht-pdf">
-      <HtTable :data="state.data"
-               :configShow="true"
-               :checked="true"
-               :height="200"
-               uuId="54598fs1okdsfsdfk2"
-               :showFilter="true"
-               :columns="state.columns">
-
+      <HtTable
+        :data="state.data"
+        :configShow="true"
+        :checked="true"
+        :isExpand="true"
+        :height="200"
+        uuId="54598fs1okdsfsdfk2"
+        :showFilter="true"
+        :columns="state.columns"
+      >
+        <span slot="expand"></span>
       </HtTable>
     </div>
     <!-- <el-dropdown>
@@ -56,13 +65,13 @@
     </el-dropdown> -->
   </div>
 </template>
-<script lang='ts'>
-import { Component, Vue } from "vue-property-decorator";
-import HtTable from "@/packages/HtTable/index.vue";
-import HtCountDown from "@/packages/HtCountDown/index.vue";
-import HtSelectUser from "@/packages/HtSelectUser/index.vue";
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator';
+import HtTable from '@/packages/HtTable/index.vue';
+import HtCountDown from '@/packages/HtCountDown/index.vue';
+import HtSelectUser from '@/packages/HtSelectUser/index.vue';
 
-import "htui-yllkbz/lib/htui.css";
+import 'htui-yllkbz/lib/htui.css';
 interface State {
   /** 数据状态 */
   loading: boolean;
@@ -83,80 +92,81 @@ export default class Index extends Vue {
   state: State = {
     loading: false,
     start: false,
-    content: "",
+    content: '',
     data: [
       {
-        name: "胡涛",
+        name: '胡涛',
         selectable: true,
 
         age: 12,
-        sex: "e49961a4f385e5d341ce3a01ee674c90ea9e037b734228fe26753a01ee674c90,e49961a4f385e5d341ce3a01ee674c90ea9e037b734228fe26753a01ee674c90",
+        sex:
+          'e49961a4f385e5d341ce3a01ee674c90ea9e037b734228fe26753a01ee674c90,e49961a4f385e5d341ce3a01ee674c90ea9e037b734228fe26753a01ee674c90',
         id: 1,
-        test: { title: "33476c23-9faa-22d3-3ee6-39f97d173566" },
-        time: "2022-01-20T00:00:00+08:00",
+        test: { title: '33476c23-9faa-22d3-3ee6-39f97d173566' },
+        time: '2022-01-20T00:00:00+08:00',
       },
       {
-        name: "胡涛",
+        name: '胡涛',
         age: 12,
         selectable: false,
-        sex: "e49961a4f385e5d341ce3a01ee674c90ea9e037b734228fe26753a01ee674c90",
+        sex: 'e49961a4f385e5d341ce3a01ee674c90ea9e037b734228fe26753a01ee674c90',
         id: 2,
-        test: { title: "测试" },
-        time: "2022-01-20T00:00:00+08:00",
+        test: { title: '测试' },
+        time: '2022-01-20T00:00:00+08:00',
       },
       {
-        name: "胡涛",
+        name: '胡涛',
         age: 12,
-        sex: "tt",
+        sex: 'tt',
         id: 3,
-        test: { title: "测试" },
-        time: "2022-01-20T00:00:00+08:00",
+        test: { title: '测试' },
+        time: '2022-01-20T00:00:00+08:00',
       },
       {
-        name: "胡涛",
+        name: '胡涛',
         age: 12,
-        sex: "tt",
+        sex: 'tt',
         id: 4,
-        test: { title: "测试" },
-        time: "2022-01-20T00:00:00+08:00",
+        test: { title: '测试' },
+        time: '2022-01-20T00:00:00+08:00',
       },
       {
-        name: "胡涛",
+        name: '胡涛',
         age: 12,
-        sex: "tt",
+        sex: 'tt',
         id: 41,
-        test: { title: "测试" },
-        time: "2022-01-20T00:00:00+08:00",
+        test: { title: '测试' },
+        time: '2022-01-20T00:00:00+08:00',
       },
     ],
     columns: [
       {
-        title: "姓名",
-        key: "test.title",
-        width: "300px",
-        property: "base",
+        title: '姓名',
+        key: 'test.title',
+        width: '300px',
+        property: 'base',
         disabled: true,
         deafaultShow: true,
       },
       {
-        title: "姓额外名",
-        key: "name",
+        title: '姓额外名',
+        key: 'name',
       },
       {
-        title: "age",
-        key: "age",
+        title: 'age',
+        key: 'age',
       },
       {
-        title: "time",
-        type: "time",
+        title: 'time',
+        type: 'time',
         spread: true,
-        key: "time",
+        key: 'time',
         deafaultShow: true,
       },
       {
-        title: "性别",
-        key: "sex",
-        type: "file",
+        title: '性别',
+        key: 'sex',
+        type: 'file',
       },
     ],
   };
@@ -186,4 +196,4 @@ export default class Index extends Vue {
   /** 计算属性 */
 }
 </script>
-<style lang='scss' scoped></style>
+<style lang="scss" scoped></style>