htui-yllkbz 2.0.14 → 2.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "port": "8082",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",
@@ -57,4 +57,4 @@
     "typescript": "~3.9.3",
     "vue-template-compiler": "^2.6.11"
   }
-}
+}

package/src/packages/HtBaseData/index.vue

@@ -409,13 +409,13 @@ import {
   DictionaryCategoryDto,
   DictionaryDataDto,
   SeverityLevelDto,
-} from "@/plugins/commonApi";
+} from "../../plugins/commonApi";
 /* eslint-disable @typescript-eslint/camelcase */
 import {
   ListResultDto_1OfOfOrganizationUnitWithUsersAndContractsAnd_0AndCulture_neutralAndPublicKeyToken_null,
   OrganizationUnitWithDetailsDto,
   OrganizationUnitDto,
-} from "@/plugins/Auth";
+} from "../../plugins/Auth";
 import { _axios, baseConfig } from "vue-kst-auth";
 interface Inuser {
   concurrencyStamp: string;

package/src/packages/HtMore/index.vue

@@ -38,7 +38,7 @@
 </template>
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator';
-import HtPopover from '@/packages/HtPopover/index.vue';
+import HtPopover from '../HtPopover/index.vue';
 interface State {
   /** 数据状态 */
   loading: boolean;

package/src/packages/HtPopover/index.vue

@@ -52,7 +52,7 @@
 </template>
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator';
-import '@/packages/style.scss';
+import '../style.scss';
 
 interface State {
   /** 数据状态 */

package/src/packages/HtSelectBaseData/index.vue

@@ -58,8 +58,8 @@
 </template>
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import HtShowBaseData from "@/packages/HtShowBaseData";
-import HtBaseData from "@/packages/HtBaseData";
+import HtShowBaseData from "../HtShowBaseData";
+import HtBaseData from "../HtBaseData";
 interface State {
   /** 数据状态 */
   loading: boolean;

package/src/packages/HtSelectOrg/index.vue

@@ -35,8 +35,8 @@
 </template>
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator';
-import HtShowBaseData from '@/packages/HtShowBaseData';
-import HtBaseData from '@/packages/HtBaseData';
+import HtShowBaseData from '../HtShowBaseData';
+import HtBaseData from '../HtBaseData';
 import { getCommDataItem } from '../common';
 interface State {
   /** 数据状态 */

package/src/packages/HtSelectUser/index.vue

@@ -20,8 +20,8 @@
 </template>
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
-import HtShowBaseData from "@/packages/HtShowBaseData";
-import HtBaseData from "@/packages/HtBaseData";
+import HtShowBaseData from "../HtShowBaseData";
+import HtBaseData from "../HtBaseData";
 import { getCommDataItem } from "../common";
 interface State {
   /** 数据状态 */

package/src/packages/HtTable/htTableColumn.vue

@@ -1,38 +1,65 @@
 <template>
-  <el-table-column :label="item.title" :fixed="item.fixed" :align="item.align"
-    v-if="fromColumn ? !item.hide : !item.hide && item.checked" :resizable="item.resizable === false ? false : true"
-    :header-align="item.headerAlign" :column-key="item.columnKey" :class-name="item.className" :prop="item.key"
-    :show-overflow-tooltip="item.type === 'common' || item.type === 'org' || item.type === 'userId'
+  <el-table-column :label="item.title"
+                   :fixed="item.fixed"
+                   :align="item.align"
+                   v-if="fromColumn ? !item.hide : !item.hide && item.checked"
+                   :resizable="item.resizable === false ? false : true"
+                   :header-align="item.headerAlign"
+                   :column-key="item.columnKey"
+                   :class-name="item.className"
+                   :prop="item.key"
+                   :show-overflow-tooltip="item.type === 'common' || item.type === 'org' || item.type === 'userId'
       ? false
       : item.showOverflowTooltip === false
         ? false
         : true
-      " :sortable="item.sortable" :sort-method="item.sortMethod" :sort-orders="item.sortOrders"
-    :formatter="item.formatter" :sort-by="item.sortBy" :min-width="item.minWidth" :width="item.width">
+      "
+                   :sortable="item.sortable"
+                   :sort-method="item.sortMethod"
+                   :sort-orders="item.sortOrders"
+                   :formatter="item.formatter"
+                   :sort-by="item.sortBy"
+                   :min-width="item.minWidth"
+                   :width="item.width">
 
     <template v-if="item.children && item.children.length">
-      <HtTableColumn :item="child" :getAllBaseData="getAllBaseData" :getAllOrg="getAllOrg" :getAllRole="getAllRole"
-        :getAllUser="getAllUser" v-for="(child, childindex) in item.children"
-        @showFiles="(val) => $emit('showFiles', val)" :fromColumn="true" :key="`${child.key}_${childindex}_1`">
-        <template :slot="child.key" slot-scope="scope">
-          <slot :name="child.key" :row="scope.row" :column="scope.column" :rowIndex="scope.rowIndex">
+      <HtTableColumn :item="child"
+                     :getAllBaseData="getAllBaseData"
+                     :getAllOrg="getAllOrg"
+                     :getAllRole="getAllRole"
+                     :getAllUser="getAllUser"
+                     v-for="(child, childindex) in item.children"
+                     @showFiles="emitShowFiles"
+                     :fromColumn="true"
+                     :key="`${child.key}_${childindex}_1`">
+        <template :slot="child.key"
+                  slot-scope="scope">
+          <slot :name="child.key"
+                :row="scope.row"
+                :column="scope.column"
+                :rowIndex="scope.rowIndex">
           </slot>
         </template>
         <!-- <template slot="title" slot-scope="{ data }">
           <slot name="title" :data="data"></slot
         ></template> -->
-        <template slot-scope="scope" :slot="'header_' + child.key">
-          <slot :name="'header_' + child.key" :column="scope.column" :$index="scope.$index"></slot>
+        <template slot-scope="scope"
+                  :slot="'header_' + child.key">
+          <slot :name="'header_' + child.key"
+                :column="scope.column"
+                :$index="scope.$index"></slot>
         </template>
       </HtTableColumn>
     </template>
     <template slot-scope="{ row, column, $index }">
 
-      <slot :name="item.key" :row="row" :column="column" :rowIndex="$index">
+      <slot :name="item.key"
+            :row="row"
+            :column="column"
+            :rowIndex="$index">
         <!-- 处理部门 -->
         <template v-if="item.type === 'org'">
-          <el-tag v-if="getPropByPath(row, item.key)"> {{ getAllOrg[getPropByPath(row, item.key)]?.displayName
-            }}</el-tag>
+          <el-tag v-if="getPropByPath(row, item.key)">{{ getOrgDisplayName(getPropByPath(row, item.key)) }}</el-tag>
           <!-- <HtOrgInfo v-if="getPropByPath(row, item.key)"
                      :org-id="getPropByPath(row, item.key)"
                      type="tag"></HtOrgInfo> -->
@@ -43,22 +70,24 @@
           <span v-if="item.commonType === 'userId' && getPropByPath(row, item.key)">
             {{ getAllUser[getPropByPath(row, item.key)]?.value }}</span>
           <span v-else-if="item.commonType === 'departmentId' && getPropByPath(row, item.key)">
-            {{ getAllOrg[getPropByPath(row, item.key)]?.displayName }}</span>
+            {{ getOrgDisplayName(getPropByPath(row, item.key)) }}</span>
           <span v-else-if="item.commonType === 'roleId' && getPropByPath(row, item.key)">
             {{ getAllRole[getPropByPath(row, item.key)]?.name }}</span>
           <span v-else-if="item.commonType === 'baseDataId' && getPropByPath(row, item.key)">
             {{ getAllBaseData[getPropByPath(row, item.key)]?.name }}<span v-if="!item.hideCode">({{
       getAllBaseData[getPropByPath(row, item.key)]?.value }})</span></span>
 
-          <HtShowBaseData
-            v-else-if="getPropByPath(row, item.key) && (item.commonType === 'baseDataValue' || item.commonType === 'baseDataName')"
-            :hide-code="item.hideCode" :base-data-value="item.commonType === 'baseDataValue'
+          <HtShowBaseData v-else-if="getPropByPath(row, item.key) && (item.commonType === 'baseDataValue' || item.commonType === 'baseDataName')"
+                          :hide-code="item.hideCode"
+                          :base-data-value="item.commonType === 'baseDataValue'
       ? getPropByPath(row, item.key)
       : ''
-      " :base-data-name="item.commonType === 'baseDataName'
+      "
+                          :base-data-name="item.commonType === 'baseDataName'
       ? getPropByPath(row, item.key)
       : ''
-      " :base-data-info="true">
+      "
+                          :base-data-info="true">
           </HtShowBaseData>
 
           <span v-else>--</span>
@@ -71,7 +100,8 @@
         </template>
         <!-- 处理时间 yyyy-mm-dd HH:mm:ss -->
         <template v-else-if="item.type === 'time'">
-          <div v-if="getPropByPath(row, item.key)" class="ht-column-cell">
+          <div v-if="getPropByPath(row, item.key)"
+               class="ht-column-cell">
             <span v-if="!item.spread">
               {{
       getPropByPath(row, item.key)
@@ -95,7 +125,8 @@
         </template>
         <!-- 处理日期 yyyy-mm-dd -->
         <template v-else-if="item.type === 'date'">
-          <div v-if="getPropByPath(row, item.key)" class="ht-column-cell">
+          <div v-if="getPropByPath(row, item.key)"
+               class="ht-column-cell">
             <span>
               {{
       getPropByPath(row, item.key)
@@ -107,23 +138,31 @@
         </template>
         <!-- 处理布尔值显示 -->
         <template v-else-if="item.type === 'boolean'">
-          <el-tag :type="'success'" :size="'small'" v-if="getPropByPath(row, item.key)">是</el-tag>
-          <el-tag type="danger" :size="'small'" v-else>否</el-tag>
+          <el-tag :type="'success'"
+                  :size="'small'"
+                  v-if="getPropByPath(row, item.key)">是</el-tag>
+          <el-tag type="danger"
+                  :size="'small'"
+                  v-else>否</el-tag>
         </template>
         <!-- 处理新资产的单位 -->
         <template v-else-if="item.type === 'unit'">
-          <HtSelectUnit :readonly="true" :value="getPropByPath(row, item.key)"></HtSelectUnit>
+          <HtSelectUnit :readonly="true"
+                        :value="getPropByPath(row, item.key)"></HtSelectUnit>
         </template>
         <!-- 处理新资产的单位 -->
         <template v-else-if="item.type === 'position'">
-          <HtSelectPosition :readonly="true" :value="getPropByPath(row, item.key)"></HtSelectPosition>
+          <HtSelectPosition :readonly="true"
+                            :value="getPropByPath(row, item.key)"></HtSelectPosition>
         </template>
         <!-- 处理图片显示 -->
         <template v-else-if="item.type === 'img'">
           <span v-if="getPropByPath(row, item.key)">
-            <el-image style="width: 38px; height: 38px;margin-right:5px" :key="fileToken"
-              v-for="fileToken in getPropByPath(row, item.key).split(',')"
-              :src="`/${proxy}/api/filing/file/download/` + fileToken" :preview-src-list="[
+            <el-image style="width: 38px; height: 38px;margin-right:5px"
+                      :key="fileToken"
+                      v-for="fileToken in getPropByPath(row, item.key).split(',')"
+                      :src="`/${proxy}/api/filing/file/download/` + fileToken"
+                      :preview-src-list="[
       `/${proxy}/api/filing/file/download/` + fileToken,
     ]">
             </el-image>
@@ -132,8 +171,9 @@
         <!-- 处理附件显示 -->
         <template v-else-if="item.type === 'file'">
           <span v-if="getPropByPath(row, item.key)">
-            <i class="el-icon-paperclip" @click="$emit('showFiles', getPropByPath(row, item.key))"
-              style="color:var(--primary);cursor:pointer">{{
+            <i class="el-icon-paperclip"
+               @click="$emit('showFiles', getPropByPath(row, item.key))"
+               style="color:var(--primary);cursor:pointer">{{
       Array.isArray(getPropByPath(row, item.key))
         ? getPropByPath(row, item.key).length
         : getPropByPath(row, item.key).split(',').length
@@ -142,14 +182,18 @@
           <span v-else>--</span>
         </template>
         <!-- 其他 -->
-        <span :style="item.style" v-else>{{
+        <span :style="item.style"
+              v-else>{{
           getPropByPath(row, item.key)
           }}</span>
       </slot>
     </template>
     <!-- 处理重定义table头相关信息 header_key -->
-    <template slot-scope="{ column, $index }" slot="header">
-      <slot :name="'header_' + item.key" :column="column" :$index="$index">{{
+    <template slot-scope="{ column, $index }"
+              slot="header">
+      <slot :name="'header_' + item.key"
+            :column="column"
+            :$index="$index">{{
         item.title
         }}</slot>
     </template>
@@ -158,10 +202,10 @@
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
 import { Column } from "../type";
-import HtShowBaseData from "@/packages/HtShowBaseData";
-import HtOrgInfo from "@/packages/HtOrgInfo";
-import HtUploadFiles from "@/packages/HtUploadFiles/index.vue";
-import HtSelectUnit from "@/packages/HtSelectUnit";
+import HtShowBaseData from "../HtShowBaseData";
+import HtOrgInfo from "../HtOrgInfo";
+import HtUploadFiles from "../HtUploadFiles/index.vue";
+import HtSelectUnit from "../HtSelectUnit";
 
 interface State {
   /** 数据状态 */
@@ -179,6 +223,10 @@ interface State {
   },
 })
 export default class Index extends Vue {
+  private pathKeyCache = new Map<string, string[]>();
+
+  private rowValueCache = new WeakMap<object, { [key: string]: any }>();
+
   /** 单个Column信息 */
   @Prop() item!: Column;
   @Prop() getAllBaseData!: any;
@@ -192,22 +240,38 @@ export default class Index extends Vue {
   state: State = {
     loading: false,
   };
-  /** 生命周期 */
-  /** 方法 */
-  // getPropByPath(obj: any, path: string, strict = true) {
-  //   return getPropByPath(obj, path, strict);
-  // }
+  beforeUpdate() {
+    this.rowValueCache = new WeakMap<object, { [key: string]: any }>();
+  }
+  getPathKeys(path: string) {
+    const cachePath = path || "";
+    const cacheKeys = this.pathKeyCache.get(cachePath);
+    if (cacheKeys) {
+      return cacheKeys;
+    }
+    const normalizedPath = cachePath
+      .replace(/\[(\w+)\]/g, ".$1")
+      .replace(/^\./, "");
+    const keys = normalizedPath ? normalizedPath.split(".") : [];
+    this.pathKeyCache.set(cachePath, keys);
+    return keys;
+  }
   getPropByPath(obj: any, path: string, strict = true) {
-    let tempObj = obj;
-    path = path.replace(/\[(\w+)\]/g, ".$1");
-    path = path.replace(/^\./, "");
+    if (!obj || typeof obj !== "object") {
+      return null;
+    }
+    const cache = this.rowValueCache.get(obj);
+    if (cache && path in cache) {
+      return cache[path];
+    }
 
-    const keyArr = path.split(".");
+    let tempObj = obj;
+    const keyArr = this.getPathKeys(path);
     let i = 0;
     for (let len = keyArr.length; i < len - 1; ++i) {
       if (!tempObj && !strict) break;
       const key = keyArr[i];
-      if (key in tempObj) {
+      if (tempObj && key in tempObj) {
         tempObj = tempObj[key];
       } else {
         if (strict) {
@@ -216,12 +280,48 @@ export default class Index extends Vue {
         break;
       }
     }
-    // return {
-    //   o: tempObj,
-    //   k: keyArr[i],
-    //   v: tempObj ? tempObj[keyArr[i]] : null,
-    // };
-    return tempObj ? tempObj[keyArr[i]] : null;
+    const value = tempObj && keyArr.length ? tempObj[keyArr[i]] : null;
+    this.rowValueCache.set(obj, {
+      ...(cache || {}),
+      [path]: value,
+    });
+    return value;
+  }
+  getOrgDisplayName(orgId: string) {
+    const orgMap = this.getAllOrg || {};
+    if (orgMap[orgId]?.displayName) {
+      return orgMap[orgId].displayName;
+    }
+
+    const commonDatas = window.localStorage.getItem("commonDatas");
+    if (!commonDatas) {
+      return "--";
+    }
+
+    try {
+      const { organizationUnit = [] } = JSON.parse(commonDatas);
+      return this.findOrgName(orgId, organizationUnit);
+    } catch (_error) {
+      return "--";
+    }
+  }
+  findOrgName(orgId: string, organizationUnit: any[] = []): string {
+    for (let i = 0; i < organizationUnit.length; i++) {
+      const item = organizationUnit[i];
+      if (item.id === orgId) {
+        return item.displayName || "--";
+      }
+      if (item.children?.length) {
+        const childName = this.findOrgName(orgId, item.children);
+        if (childName !== "--") {
+          return childName;
+        }
+      }
+    }
+    return "--";
+  }
+  emitShowFiles(val: string | string[]) {
+    this.$emit("showFiles", val);
   }
   /** 监听 */
   /** 计算属性 */