htui-yllkbz 1.3.63 → 1.3.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.3.63",
+  "version": "1.3.65",
   "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/HtDrawer/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2022-09-28 10:24:08
  * @LastEditors: hutao
- * @LastEditTime: 2022-09-28 11:22:34
+ * @LastEditTime: 2022-10-11 16:16:39
 -->
 <template>
   <el-drawer
@@ -42,12 +42,25 @@
     <el-divider v-if="withFooter"></el-divider>
     <slot name="foot" v-if="withFooter">
       <div>
-        <el-button style="margin-left:20px" @click="onCancel">取消</el-button>
-        <el-button style="margin-left:20px" type="primary" @click="onOk"
-          >确定</el-button
-        >
-      </div></slot
-    >
+        <template v-if="!footerRight">
+          <el-button style="margin-left:20px" @click="onCancel">取消</el-button>
+          <el-button style="margin-left:20px" type="primary" @click="onOk"
+            >确定</el-button
+          >
+        </template>
+        <template v-else>
+          <el-button
+            style="margin-right:20px;float:right"
+            type="primary"
+            @click="onOk"
+            >确定</el-button
+          >
+          <el-button style="margin-right:20px;float:right" @click="onCancel"
+            >取消</el-button
+          >
+        </template>
+      </div>
+    </slot>
   </el-drawer>
 </template>
 <script lang="ts">
@@ -89,6 +102,8 @@ export default class Index extends Vue {
   @Prop({ default: true }) withHeader!: boolean;
   /**   控制是否显示 foot 栏, 默认为 true, 当此项为 false 时, foot attribute 和 foot slot 均不生效 */
   @Prop({ default: true }) withFooter!: boolean;
+  /** footer的按钮是否靠右 */
+  @Prop({ default: false }) footerRight!: boolean;
   /** 数据 */
   state: State = {
     loading: false,

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-08-10 11:22:58
+ * @LastEditTime: 2022-10-08 14:28:29
 -->
 <template>
   <div v-loading="state.loading" style="background:#fff">
@@ -346,7 +346,7 @@
             :default-checked-keys="state.checkedColumnKeys"
             @check-change="changeColumns"
             :allow-drag="allowDrag"
-            draggable
+            :draggable="draggable"
             :allow-drop="allowDrop"
           >
             <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -472,6 +472,8 @@ export default class HtTable extends Vue {
   @Prop() headerRowClassName?: any;
   @Prop() headerCellClassName?: any;
   @Prop() headerCellStyle?: any;
+  /** 是否可以拖动排序 */
+  @Prop({ default: true }) draggable?: boolean;
 
   /** 分页的所有额外信息通过此参数传递 */
   @Prop() pagination?: any;

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";
 
@@ -89,4 +89,69 @@ 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/packages/type.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-25 17:05:17
  * @LastEditors: hutao
- * @LastEditTime: 2022-08-22 14:28:19
+ * @LastEditTime: 2022-10-08 11:43:12
  */
 /** 初始的默认条数 */
 export const defalutPageSize = 10
@@ -63,8 +63,7 @@ export interface Column {
   headerAlign?: 'left' | 'right' | 'center';
   className?: string;
   labelClassName?: string;
-  /** table头是否使用slot */
-  headerSlot?: boolean;
+
   /** 是否隐藏当前列 */
   hide?: boolean;
   /**  时间是否跨行展示 */