htui-yllkbz 1.5.36 → 1.5.38

package/src/packages/HtSelectUser/index.vue

@@ -4,31 +4,19 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2024-05-13 14:00:36
+ * @LastEditTime: 2024-12-17 17:39:06
 -->
 <template>
   <span v-if="readonly">
-    <HtShowBaseData v-if="value"
-                    :user-id="userId"
-                    :org="org"></HtShowBaseData>
+    <HtShowBaseData :isTag="isTag" v-if="value" :user-id="userId" :org="org"></HtShowBaseData>
     <span v-else> </span>
   </span>
-  <HtBaseData v-else
-              :size="size"
-              :org="org"
-              ref="htBaseData"
-              :placeholder="placeholder"
-              :disabled="disabled"
-              com-style="background:#fff"
-              :showLocked="showLocked"
-              :appendToBody="appendToBody"
-              :config-json="configJson"
-              :com-class="
-      heightAuto
-        ? 'component-item-heightAuto ht-item-common'
-        : 'component-item-height ht-item-common'
-    "
-              @change="searchCommonData"></HtBaseData>
+  <HtBaseData v-else :size="size" :org="org" ref="htBaseData" :placeholder="placeholder" :disabled="disabled"
+    com-style="background:#fff" :showLocked="showLocked" :appendToBody="appendToBody" :config-json="configJson"
+    :com-class="heightAuto
+    ? 'component-item-heightAuto ht-item-common'
+    : 'component-item-height ht-item-common'
+    " @change="searchCommonData"></HtBaseData>
 </template>
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
@@ -54,7 +42,8 @@ export default class HtSelectUser extends Vue {
   @Prop() disabled?: boolean;
   @Prop() heightAuto?: boolean;
   @Prop() placeholder?: string;
-
+  /** 是否已tag形式展示 */
+  @Prop() isTag?: boolean;
   /** 是否可以清除 */
   @Prop() clearable?: boolean;
   @Prop({ default: true }) show?: boolean;

package/src/packages/HtShowBaseData/index.vue

@@ -8,32 +8,42 @@
     </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">
+    <!-- <template v-if="userId">
+      <span class="item" v-for="item in userData" :key="item.id">
         {{ item.value || empty }}
       </span>
+    </template> -->
+    <!-- 用户 -->
+    <template v-if="userId && !isTag">
+
+      <span class="item ht-show-user ht-show-user-span" v-for="(item, key) in userData" :key="item.id">
+        <span>{{ item.value || empty }}</span>
+        <span v-show="userData.length - 1 !== key">,</span>
+      </span>
+
+    </template>
+
+    <template v-if="userId && isTag">
+      <div class="ht-show-user ht-show-user-tags">
+        <el-tag :size="'mini'" style="margin:0 4px 0 0" type="primary" v-for="(item) in userData" :key="item.id">{{
+      item.value || empty
+    }}</el-tag>
+      </div>
     </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 !== undefined && baseDataId !== null">
-      <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 }})
@@ -44,15 +54,13 @@
     </template>
     <!-- 基础数据,以value查找 -->
     <template v-if="baseDataValue">
-      <span class="item"
-            v-if="dataTypeId && baseDataItem[`${dataTypeId}_${baseDataValue}`]">
+      <span class="item" v-if="dataTypeId && baseDataItem[`${dataTypeId}_${baseDataValue}`]">
         {{ baseDataItem[`${dataTypeId}_${baseDataValue}`].name || empty }}
         <!-- <span v-if="baseDataInfo && !hideCode">
           ({{ baseDataItem[baseDataValue].value || empty }})
         </span> -->
       </span>
-      <span class="item"
-            v-else-if="baseDataItem[baseDataValue]">
+      <span class="item" v-else-if="baseDataItem[baseDataValue]">
         {{ baseDataItem[baseDataValue].name || empty }}
         <span v-if="baseDataInfo && !hideCode">
           ({{ baseDataItem[baseDataValue].value || empty }})
@@ -62,8 +70,7 @@
     </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">
           ({{ baseDataItem[baseDataName].value || empty }})
@@ -143,6 +150,8 @@ export default class CommonDatas extends Vue {
   @Prop() showAllLevel?: boolean;
   /** 隐藏编码 */
   @Prop() hideCode?: boolean;
+  /** 是否已tag形式展示 */
+  @Prop() isTag?: boolean;
   /** 显示角色信息 */
   @Prop() roleId?: string;
   /** 显示部门信息 */
@@ -341,8 +350,9 @@ export default class CommonDatas extends Vue {
 <style lang="scss" scoped>
 .show-common-item {
   display: inline-block;
+
   .item {
-    + .item {
+    +.item {
       padding-left: 10px;
     }
   }