htui-yllkbz 1.3.50 → 1.3.54

package/package.json

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

package/src/packages/HtBaseData/index.vue

@@ -11,8 +11,8 @@
       <el-cascader
         v-if="!state.configJson['departmentId'].panel"
         :disabled="!!disabled"
+        :size="size"
         popper-class="ht-cascader-poper"
-        :append-to-body="appendToBody"
         class="component-item"
         :class="comClass"
         style="width:100%"
@@ -39,10 +39,10 @@
       >
       </el-cascader>
       <el-cascader-panel
+        :size="size"
         v-if="state.configJson['departmentId'].panel"
         class="component-item"
         popper-class="ht-cascader-poper"
-        :append-to-body="appendToBody"
         :class="comClass"
         style="width:100%"
         :style="comStyle || ''"
@@ -119,7 +119,7 @@
       "
     >
       <el-cascader
-        :append-to-body="appendToBody"
+        :size="size"
         popper-class="ht-cascader-poper"
         v-if="!state.configJson['departmentUser'].panel"
         :disabled="!!disabled"
@@ -182,8 +182,8 @@
       </el-cascader>
       <el-cascader-panel
         v-else
+        :size="size"
         popper-class="ht-cascader-poper"
-        :append-to-body="appendToBody"
         :style="panStyle"
         :filterable="!state.configJson['departmentUser'].multiple"
         class="component-item"
@@ -319,8 +319,8 @@
           v-if="state.configJson[item.code] && state.configJson[item.code].show"
         >
           <el-cascader
+            :size="size"
             popper-class="ht-cascader-poper"
-            :append-to-body="appendToBody"
             v-if="!state.configJson[item.code].panel"
             :placeholder="placeholder || `请选择${item.name}`"
             :disabled="!!disabled"
@@ -349,8 +349,8 @@
           ></el-cascader>
           <el-cascader-panel
             v-else
+            :size="size"
             popper-class="ht-cascader-poper"
-            :append-to-body="appendToBody"
             @click.native="selectClick($event)"
             :placeholder="placeholder || `请选择${item.name}`"
             class="component-item"
@@ -555,6 +555,8 @@ export default class CommonDatas extends Vue {
   @Prop() panStyle?: string;
   /** 所属部门 */
   @Prop() org?: string;
+  /**  尺寸 */
+  @Prop() size?: string;
   /** 是否禁用 */
   @Prop() disabled?: string;
   @Prop({ default: true }) appendToBody?: boolean;
@@ -872,12 +874,17 @@ export default class CommonDatas extends Vue {
         cur.childrenList = [];
         if (cur.users) {
           cur.users.map((item) => {
-            item.name =
-              item.surname || item.name
-                ? `${item.surname}${item.name}`
-                : item.userName;
+            if (item.userName) {
+              item.name = item.userName;
+            } else {
+              if (item.displayName) {
+                item.name = item.displayName;
+              } else {
+                item.name = `${item.surname || ''}${item.name || ''}`;
+              }
+            }
+            item.displayName = item.name;
             item.childrenList = undefined;
-
             return item;
           });
         }

package/src/packages/HtSelectBaseData/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 15:47:47
  * @LastEditors: hutao
- * @LastEditTime: 2022-08-07 15:09:05
+ * @LastEditTime: 2022-08-26 16:13:00
 -->
 
 <template>
@@ -20,6 +20,7 @@
       <HtBaseData
         v-else
         :org="org"
+        :size="size"
         :appendToBody="appendToBody"
         :placeholder="placeholder"
         :hide-code="hideCode"
@@ -68,6 +69,7 @@ interface State {
 export default class HtSelectBaseData extends Vue {
   @Prop() value!: string;
   @Prop() org?: string;
+  @Prop() size?: string;
   @Prop() placeholder?: string;
   /** 是否禁用 */
   @Prop({ default: false }) disabled?: boolean;

package/src/packages/HtSelectOrg/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-08-24 15:33:10
+ * @LastEditTime: 2022-08-26 16:11:31
 -->
 <template>
   <span v-if="readonly">
@@ -20,6 +20,7 @@
     :org="org"
     :placeholder="placeholder"
     :disabled="disabled"
+    :size="size"
     :appendToBody="appendToBody"
     com-style="background:#fff"
     :config-json="configJson"
@@ -48,6 +49,7 @@ export default class HtSelectOrg extends Vue {
   @Prop() disabled?: boolean;
   @Prop() placeholder?: string;
   @Prop() org?: string;
+  @Prop() size?: string;
   /** 是否可以清除 */
   @Prop() clearable?: boolean;
   @Prop({ default: true }) show?: boolean;

package/src/packages/HtSelectUser/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-08-24 15:32:01
+ * @LastEditTime: 2022-08-26 16:11:46
 -->
 <template>
   <span v-if="readonly">
@@ -13,6 +13,7 @@
   </span>
   <HtBaseData
     v-else
+    :size="size"
     :org="org"
     :placeholder="placeholder"
     :disabled="disabled"
@@ -41,6 +42,7 @@ interface State {
 export default class HtSelectUser extends Vue {
   @Prop() value!: string;
   @Prop() org!: string;
+  @Prop() size!: string;
   /** 是否禁用 */
   @Prop() disabled?: boolean;
   @Prop() placeholder?: string;

package/src/packages/HtShowBaseData/index.vue

@@ -8,46 +8,38 @@
     </template>
     <!-- 部门 -->
     <template v-if="departmentId">
-      <span class="item"
-            v-for="item in departmentData"
-            :key="item">
+      <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">
+      <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">
+      <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]">
+      <span class="item" v-if="baseDataItem[baseDataId]">
         <!-- {{ baseDataItem[baseDataId].name || empty }}
         <span v-if="baseDataInfo&&!hideCode">
           ({{ baseDataItem[baseDataId].value || empty }})
         </span> -->
-        {{state.text}}
+        {{ state.text }}
       </span>
       <span v-else> {{ empty }}</span>
     </template>
     <!-- 基础数据,以value查找 -->
     <template v-if="baseDataValue">
-      <span class="item"
-            v-if="baseDataItem[baseDataValue]">
+      <span class="item" v-if="baseDataItem[baseDataValue]">
         {{ baseDataItem[baseDataValue].name || empty }}
-        <span v-if="baseDataInfo&&!hideCode">
+        <span v-if="baseDataInfo && !hideCode">
           ({{ baseDataItem[baseDataValue].value || empty }})
         </span>
       </span>
@@ -55,10 +47,9 @@
     </template>
     <!-- 基础数据,以namg查找 -->
     <template v-if="baseDataName">
-      <span class="item"
-            v-if="baseDataItem[baseDataName]">
+      <span class="item" v-if="baseDataItem[baseDataName]">
         {{ baseDataItem[baseDataName].name || empty }}
-        <span v-if="baseDataInfo&&!hideCode">
+        <span v-if="baseDataInfo && !hideCode">
           ({{ baseDataItem[baseDataName].value || empty }})
         </span>
       </span>
@@ -68,8 +59,8 @@
 </template>
 
 <script lang="ts">
-import { Vue, Prop, Component, Watch } from "vue-property-decorator";
-import { baseConfig } from "vue-kst-auth";
+import { Vue, Prop, Component, Watch } from 'vue-property-decorator';
+import { baseConfig } from 'vue-kst-auth';
 interface Inuser {
   concurrencyStamp: string;
   email: string;
@@ -125,11 +116,11 @@ interface State {
 }
 
 @Component({
-  name: "HtShowBaseData",
+  name: 'HtShowBaseData',
 })
 export default class CommonDatas extends Vue {
   /** 查找不到为空时显示 */
-  @Prop({ default: "" }) empty?: string;
+  @Prop({ default: '' }) empty?: string;
   /** 显示用户信息 */
   @Prop() userId?: string;
   /** 是否展示所有关联节点 */
@@ -155,7 +146,7 @@ export default class CommonDatas extends Vue {
   /** 人员 */
   /** 数据 */
   state: State = {
-    text: "",
+    text: '',
     resData: {
       baseData: {
         items: [],
@@ -170,7 +161,7 @@ export default class CommonDatas extends Vue {
       users: {
         items: [],
       },
-      SessionState: "",
+      SessionState: '',
       userInOrganiza: [],
       organizationUsers: {},
       roleList: [],
@@ -182,7 +173,7 @@ export default class CommonDatas extends Vue {
     if (!baseConfig.getLoginState()) {
       return;
     }
-    const data = window.localStorage.getItem("commonDatas");
+    const data = window.localStorage.getItem('commonDatas');
     if (data) {
       this.state.resData = Object.assign(this.state.resData, JSON.parse(data));
     }
@@ -201,9 +192,9 @@ export default class CommonDatas extends Vue {
   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;
+      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);
       }
@@ -213,38 +204,38 @@ export default class CommonDatas extends Vue {
   setAllLevel(id: any) {
     const { baseDataItem } = this.state;
     const hideCode = this.hideCode;
-    let text = "";
+    let text = '';
 
     if (baseDataItem[id]) {
       if (hideCode) {
-        text = `${baseDataItem[id].name || ""}`;
+        text = `${baseDataItem[id].name || ''}`;
       } else {
-        text = `${baseDataItem[id].name || ""}(${baseDataItem[id].value})`;
+        text = `${baseDataItem[id].name || ''}(${baseDataItem[id].value})`;
       }
       if (baseDataItem[id].parentId && this.showAllLevel) {
-        const tempText = this.setAllLevel(baseDataItem[id]["parentId"]);
+        const tempText = this.setAllLevel(baseDataItem[id]['parentId']);
         text = `${tempText}/${text}`;
       }
     }
 
     return text;
   }
-  @Watch("baseDataItem")
+  @Watch('baseDataItem')
   setText() {
     if (this.baseDataId) {
       const tempText = this.setAllLevel(this.baseDataId);
       this.state.text = tempText;
     } else {
-      this.state.text = "";
+      this.state.text = '';
     }
   }
-  @Watch("baseDataId")
+  @Watch('baseDataId')
   getText(val: string) {
     if (val && this.baseDataItem) {
       const tempText = this.setAllLevel(val);
       this.state.text = tempText;
     } else {
-      this.state.text = "";
+      this.state.text = '';
     }
   }
 
@@ -288,7 +279,7 @@ export default class CommonDatas extends Vue {
       const ids: string[] = JSON.parse(this.roleId);
 
       const data = this.state.resData.roleList.filter((val) =>
-        ids.includes(val.id || "")
+        ids.includes(val.id || '')
       );
       return data;
     } else {
@@ -306,10 +297,10 @@ export default class CommonDatas extends Vue {
   }
   /** 时间格式 */
   get timeFormat() {
-    if (this.timeStr && this.timeStr.startsWith("0")) {
+    if (this.timeStr && this.timeStr.startsWith('0')) {
       return this.empty;
     } else {
-      return this.timeStr?.replace(/T/, " ").slice(0, 19) || this.empty;
+      return this.timeStr?.replace(/T/, ' ').slice(0, 19) || this.empty;
     }
   }
 }