htui-yllkbz 1.3.46 → 1.3.49

package/package.json

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

package/src/packages/HtBaseData/index.vue

@@ -11,6 +11,7 @@
       <el-cascader
         v-if="!state.configJson['departmentId'].panel"
         :disabled="!!disabled"
+        poper-class="ht-cascader-poper"
         :append-to-body="appendToBody"
         class="component-item"
         :class="comClass"
@@ -40,6 +41,7 @@
       <el-cascader-panel
         v-if="state.configJson['departmentId'].panel"
         class="component-item"
+        poper-class="ht-cascader-poper"
         :append-to-body="appendToBody"
         :class="comClass"
         style="width:100%"
@@ -118,6 +120,7 @@
     >
       <el-cascader
         :append-to-body="appendToBody"
+        poper-class="ht-cascader-poper"
         v-if="!state.configJson['departmentUser'].panel"
         :disabled="!!disabled"
         class="component-item"
@@ -179,6 +182,7 @@
       </el-cascader>
       <el-cascader-panel
         v-else
+        poper-class="ht-cascader-poper"
         :append-to-body="appendToBody"
         :style="panStyle"
         :filterable="!state.configJson['departmentUser'].multiple"
@@ -315,6 +319,7 @@
           v-if="state.configJson[item.code] && state.configJson[item.code].show"
         >
           <el-cascader
+            poper-class="ht-cascader-poper"
             :append-to-body="appendToBody"
             v-if="!state.configJson[item.code].panel"
             :placeholder="placeholder || `请选择${item.name}`"
@@ -344,6 +349,7 @@
           ></el-cascader>
           <el-cascader-panel
             v-else
+            poper-class="ht-cascader-poper"
             :append-to-body="appendToBody"
             @click.native="selectClick($event)"
             :placeholder="placeholder || `请选择${item.name}`"

package/src/packages/HtSelectOrg/index.vue

@@ -4,14 +4,14 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-08-07 15:05:01
+ * @LastEditTime: 2022-08-24 15:33:10
 -->
 <template>
   <span v-if="readonly">
     <HtShowBaseData
       v-if="value"
       :org="org"
-      :department-id="JSON.stringify([value])"
+      :department-id="orgId"
     ></HtShowBaseData>
     <span v-else> </span>
   </span>
@@ -103,6 +103,13 @@ export default class HtSelectOrg extends Vue {
       },
     });
   }
+  get orgId() {
+    if (Array.isArray(this.value)) {
+      return JSON.stringify(this.value);
+    } else {
+      return JSON.stringify([this.value]);
+    }
+  }
   /** 计算属性 */
 }
 </script>

package/src/packages/HtSelectUser/index.vue

@@ -4,15 +4,11 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-08-07 15:04:46
+ * @LastEditTime: 2022-08-24 15:32:01
 -->
 <template>
   <span v-if="readonly">
-    <HtShowBaseData
-      v-if="value"
-      :user-id="JSON.stringify([value])"
-      :org="org"
-    ></HtShowBaseData>
+    <HtShowBaseData v-if="value" :user-id="userId" :org="org"></HtShowBaseData>
     <span v-else> </span>
   </span>
   <HtBaseData
@@ -103,6 +99,13 @@ export default class HtSelectUser extends Vue {
       },
     });
   }
+  get userId() {
+    if (Array.isArray(this.value)) {
+      return JSON.stringify(this.value);
+    } else {
+      return JSON.stringify([this.value]);
+    }
+  }
   /** 计算属性 */
 }
 </script>

package/src/packages/PageInfo/index.vue

@@ -4,48 +4,36 @@
  * @Author: hutao
  * @Date: 2021-12-08 11:30:56
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-09 18:04:54
--->
-
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: hutao
- * @Date: 2021-11-22 10:00:05
- * @LastEditors: hutao
- * @LastEditTime: 2021-11-22 18:07:40
+ * @LastEditTime: 2022-08-22 14:28:25
 -->
 <template>
-  <el-pagination @current-change="handleCurrentChange"
-                 :background="background"
-                 @size-change="handelSizeChange"
-                 :hide-on-single-page="hideOnSinglePage"
-                 :disabled="!!disabled"
-                 :small="!!small"
-                 :current-page="state.pageInfo.currentPage"
-                 :page-size="state.pageInfo.maxResultCount"
-                 :page-sizes="pageSizes||[10, 20, 30, 40, 50, 100]"
-                 :layout="layout||'total, sizes, prev, pager, next, jumper'"
-                 :total="state.pageInfo.totalCount">
+  <el-pagination
+    @current-change="handleCurrentChange"
+    :background="background"
+    @size-change="handelSizeChange"
+    :hide-on-single-page="hideOnSinglePage"
+    :disabled="!!disabled"
+    :small="!!small"
+    :current-page="state.pageInfo.currentPage"
+    :page-size="state.pageInfo.maxResultCount"
+    :page-sizes="pageSizes || [10, 20, 30, 40, 50, 100]"
+    :layout="layout || 'total, sizes, prev, pager, next, jumper'"
+    :total="state.pageInfo.totalCount"
+  >
   </el-pagination>
 </template>
-<script lang='ts'>
-import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import { PageInfoType } from "../type";
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import { PageInfoType, PageType } from '../type';
 interface State {
   /** 数据状态 */
   loading: boolean;
   /** 分页信息 */
-  pageInfo: {
-    currentPage: number;
-    maxResultCount: number;
-    skipCount: number;
-    totalCount: number;
-  };
+  pageInfo: PageType;
 }
 
 @Component({
-  name: "HtPagination",
+  name: 'HtPagination',
 })
 export default class HtPagination extends Vue {
   /**  通用样式 */
@@ -91,7 +79,7 @@ export default class HtPagination extends Vue {
     this.state.pageInfo.currentPage = val || 1;
     const { maxResultCount = 0, currentPage } = this.state.pageInfo;
     this.state.pageInfo.skipCount = (currentPage - 1) * maxResultCount;
-    this.$emit("onchange", this.state.pageInfo);
+    this.$emit('onchange', this.state.pageInfo);
   }
   /** 更新每页条数 */
   handelSizeChange(val: number) {
@@ -100,7 +88,7 @@ export default class HtPagination extends Vue {
     this.handleCurrentChange(1);
   }
   /** 监听 */
-  @Watch("pageInfo")
+  @Watch('pageInfo')
   setpageInfo(val: PageInfoType) {
     const pageInfo: PageInfoType = val;
     this.state.pageInfo = {

package/src/packages/common.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2022-07-18 15:01:02
  * @LastEditors: hutao
- * @LastEditTime: 2022-07-18 15:03:00
+ * @LastEditTime: 2022-08-10 18:34:12
  */
 import moment from "moment";
 
@@ -67,4 +67,26 @@ export const dateLess = (fromDate: string, toDate: string) => {
     return "-"
   }
 
+}
+/** 根据id获取基础信息中名称
+ * @parmas id 基础数据id
+ * @parmas showobj 是否返回单个对象 否则返回name
+ */
+export function getCommDataName(id?: string, showobj = false) {
+  if (!id) {
+    return undefined
+  }
+  /** 基础数据 */
+  const commonDatas = window.localStorage.getItem("commonDatas") || "";
+  if (commonDatas) {
+    const baseData = JSON.parse(commonDatas).baseData.items;
+    const data = baseData.find((item: any) => item.id === id)
+    if (showobj) {
+      return data
+    }
+    else {
+      return data.name
+    }
+  }
+  return undefined;
 }

package/src/packages/type.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-25 17:05:17
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-06 17:22:32
+ * @LastEditTime: 2022-08-22 14:28:19
  */
 /** 初始的默认条数 */
 export const defalutPageSize = 10
@@ -91,6 +91,15 @@ export interface PageInfoType {
   skipCount: number;
   totalCount: number;
 }
+/** 分页返回时候的分页信息 */
+export interface PageType {
+
+  currentPage: number;
+  maxResultCount: number;
+  skipCount: number;
+  totalCount: number;
+
+}
 /**  附件相关配置 */
 export interface InFile {
   fileName: string;