htui-yllkbz 1.5.35 → 1.5.37

package/src/packages/HtExport/index.vue

@@ -4,10 +4,11 @@
  * @Author: hutao
  * @Date: 2021-09-02 09:03:43
  * @LastEditors: hutao
- * @LastEditTime: 2023-04-26 10:20:37
+ * @LastEditTime: 2024-11-13 14:29:20
 -->
 <template>
-  <span @click="exportExcel" v-loading="state.loading">
+  <span @click="exportExcel"
+        v-loading="state.loading">
     <slot :loading="state.loading">
       <el-button type="primary">
         导出Excel
@@ -16,9 +17,10 @@
   </span>
 </template>
 <script lang="ts">
-import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
-import { AxiosRequestConfig, Method } from 'axios';
-import { _axios } from 'vue-kst-auth';
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import { AxiosRequestConfig, Method } from "axios";
+import { _axios } from "vue-kst-auth";
+_axios.defaults.timeout = 0;
 /** 设置axios返回类型 */
 Vue.config.productionTip = false;
 interface State {
@@ -27,7 +29,7 @@ interface State {
   canExport?: boolean;
 }
 @Component({
-  name: 'HtExport',
+  name: "HtExport",
 })
 export default class HtExport extends Vue {
   /**  请求方式 */
@@ -50,9 +52,9 @@ export default class HtExport extends Vue {
   /** 方法 */
   /** 手动导出 */
   handelExport(params?: object) {
-    let fileName = this.fileName || '未知文件名.xlsx';
+    let fileName = this.fileName || "未知文件名.xlsx";
     let config: AxiosRequestConfig = {
-      responseType: 'blob',
+      responseType: "blob",
       params: {},
     };
     if (this.params) {
@@ -63,28 +65,28 @@ export default class HtExport extends Vue {
       config = params;
     }
     if (this.url) {
-      if (this.method === 'post') {
+      if (this.method === "post") {
         this.state.loading = true;
         _axios
-          .post(this.url, config, { responseType: 'blob' })
+          .post(this.url, config, { responseType: "blob" })
           .then((res) => {
             const content = res.data;
             if (!this.fileName) {
-              const headers = res.headers['content-disposition'];
+              const headers = res.headers["content-disposition"];
               if (!headers) {
-                this.$notify.warning('暂无数据导出');
+                this.$notify.warning("暂无数据导出");
                 return;
               }
               fileName = decodeURIComponent(
-                headers.split('filename*=UTF-8')[1]
-              ).replace("''", '');
+                headers.split("filename*=UTF-8")[1]
+              ).replace("''", "");
             }
             const blob = new Blob([content as any]);
-            if ('download' in document.createElement('a')) {
+            if ("download" in document.createElement("a")) {
               // 非IE下载
-              const elink = document.createElement('a');
+              const elink = document.createElement("a");
               elink.download = fileName;
-              elink.style.display = 'none';
+              elink.style.display = "none";
               elink.href = URL.createObjectURL(blob);
               document.body.appendChild(elink);
               elink.click();
@@ -101,21 +103,21 @@ export default class HtExport extends Vue {
       } else {
         this.state.loading = true;
         _axios
-          .get(this.url, { responseType: 'blob', params: config })
+          .get(this.url, { responseType: "blob", params: config })
           .then((res) => {
             const content = res.data;
             if (!this.fileName) {
-              const headers = res.headers['content-disposition'];
+              const headers = res.headers["content-disposition"];
               fileName = decodeURIComponent(
-                headers.split('filename*=UTF-8')[1]
-              ).replace("''", '');
+                headers.split("filename*=UTF-8")[1]
+              ).replace("''", "");
             }
             const blob = new Blob([content as any]);
-            if ('download' in document.createElement('a')) {
+            if ("download" in document.createElement("a")) {
               // 非IE下载
-              const elink = document.createElement('a');
+              const elink = document.createElement("a");
               elink.download = fileName;
-              elink.style.display = 'none';
+              elink.style.display = "none";
               elink.href = URL.createObjectURL(blob);
               document.body.appendChild(elink);
               elink.click();
@@ -141,7 +143,7 @@ export default class HtExport extends Vue {
     }
   }
   /** 监听 */
-  @Watch('exportBefore', { immediate: true })
+  @Watch("exportBefore", { immediate: true })
   getExportBefore(canExport?: boolean) {
     this.state.canExport = canExport;
   }

package/src/packages/HtSelectBaseData/index.vue

@@ -10,45 +10,17 @@
 <template>
   <div>
     <template v-if="!readonly">
-      <el-select
-        value=""
-        v-if="!dataTypeId"
-        :disabled="disabled"
-        style="width:100%"
-        placeholder="请选择"
-      ></el-select>
-      <HtBaseData
-        v-else
-        :org="org"
-        ref="htBaseData"
-        :size="size"
-        :appendToBody="appendToBody"
-        :only-parent="onlyParent"
-        :parent-id="parentId"
-        :placeholder="placeholder"
-        :hide-code="hideCode"
-        :disabled="disabled"
-        :com-class="
-          heightAuto
-            ? 'component-item-heightAuto ht-item-common'
-            : 'component-item-height ht-item-common'
-        "
-        com-style="background:#fff"
-        :config-json="configJson"
-        @change="getCommonData"
-      ></HtBaseData>
+      <el-select value="" v-if="!dataTypeId" :disabled="disabled" style="width:100%" placeholder="请选择"></el-select>
+      <HtBaseData v-else :org="org" ref="htBaseData" :size="size" :appendToBody="appendToBody" :only-parent="onlyParent"
+        :parent-id="parentId" :placeholder="placeholder" :hide-code="hideCode" :disabled="disabled" :com-class="heightAuto
+        ? 'component-item-heightAuto ht-item-common'
+        : 'component-item-height ht-item-common'
+      " com-style="background:#fff" :config-json="configJson" @change="getCommonData"></HtBaseData>
     </template>
     <div v-else>
-      <HtShowBaseData
-        :hide-code="hideCode"
-        :dataTypeId="dataTypeId"
-        :show-all-level="showAllLevels"
-        :base-data-id="!byCode ? value : undefined"
-        :base-data-value="byCode ? value : undefined"
-        :base-data-info="true"
-        com-style="font-size:12px"
-        style="font-size:12px"
-      >
+      <HtShowBaseData :hide-code="hideCode" :dataTypeId="dataTypeId" :isTag="isTag" :show-all-level="showAllLevels"
+        :base-data-id="!byCode ? value : undefined" :base-data-value="byCode ? value : undefined" :base-data-info="true"
+        com-style="font-size:12px" style="font-size:12px">
       </HtShowBaseData>
 
       <!-- <div is='common-datas-info-id'
@@ -79,6 +51,7 @@ interface State {
 export default class HtSelectBaseData extends Vue {
   @Prop() value!: string;
   @Prop() org?: string;
+  @Prop() isTag?: boolean;
   @Prop() size?: string;
   @Prop() heightAuto?: string;
   @Prop() placeholder?: string;

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;
     }
   }

package/src/views/About.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2024-10-22 11:24:18
+ * @LastEditTime: 2024-10-22 17:11:12
 -->
 <template>
   <div>
@@ -41,7 +41,7 @@
                :showFilter="true"
                :uuId="'dhjsgdshg8989353334'"
                :configShow="true"
-               :checked="false"
+               :checked="true"
                :isExpand="false"
                :height="500"
                :columns="state.columns">