htui-yllkbz 1.5.17 → 1.5.18

package/package.json

@@ -1,55 +1,55 @@
-{
-  "name": "htui-yllkbz",
-  "version": "1.5.17",
-  "port": "8082",
-  "typings": "types/index.d.ts",
-  "main": "lib/htui.common.js",
-  "style": "lib/htui.css",
-  "private": false,
-  "files": [
-    "lib/**",
-    "types",
-    "src"
-  ],
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
-    "lib": "vue-cli-service build --target lib --name htui --dest lib src/packages/index.ts",
-    "publish": "npm run lib && npm publish",
-    "build-exports": "vue-cli-service build --dest dist/components --target wc-async --name xhsj src/exports/* --inline-vue"
-  },
-  "dependencies": {
-    "@microsoft/signalr": "^8.0.0",
-    "axios": "^0.21.0",
-    "core-js": "^3.6.5",
-    "element-ui": "^2.14.1",
-    "mavon-editor": "^2.10.4",
-    "moment": "^2.29.1",
-    "vue": "^2.6.11",
-    "vue-class-component": "^7.2.3",
-    "vue-kst-auth": "^2.1.15",
-    "vue-property-decorator": "^8.4.2",
-    "vue-router": "^3.2.0",
-    "vuex": "^3.4.0"
-  },
-  "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^2.33.0",
-    "@typescript-eslint/parser": "^2.33.0",
-    "@vue/cli-plugin-babel": "^4.5.0",
-    "@vue/cli-plugin-eslint": "^4.5.0",
-    "@vue/cli-plugin-typescript": "^4.5.0",
-    "@vue/cli-service": "^4.5.0",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/eslint-config-typescript": "^5.0.2",
-    "compression-webpack-plugin": "^3.0.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-prettier": "^3.1.3",
-    "eslint-plugin-vue": "^6.2.2",
-    "prettier": "^1.19.1",
-    "sass": "^1.26.5",
-    "sass-loader": "^8.0.2",
-    "typescript": "~3.9.3",
-    "vue-template-compiler": "^2.6.11"
-  }
-}
+{
+  "name": "htui-yllkbz",
+  "version": "1.5.18",
+  "port": "8082",
+  "typings": "types/index.d.ts",
+  "main": "lib/htui.common.js",
+  "style": "lib/htui.css",
+  "private": false,
+  "files": [
+    "lib/**",
+    "types",
+    "src"
+  ],
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint",
+    "lib": "vue-cli-service build --target lib --name htui --dest lib src/packages/index.ts",
+    "publish": "npm run lib && npm publish",
+    "build-exports": "vue-cli-service build --dest dist/components --target wc-async --name xhsj src/exports/* --inline-vue"
+  },
+  "dependencies": {
+    "@microsoft/signalr": "^8.0.0",
+    "axios": "^0.21.0",
+    "core-js": "^3.6.5",
+    "element-ui": "^2.14.1",
+    "mavon-editor": "^2.10.4",
+    "moment": "^2.29.1",
+    "vue": "^2.6.11",
+    "vue-class-component": "^7.2.3",
+    "vue-kst-auth": "^2.1.15",
+    "vue-property-decorator": "^8.4.2",
+    "vue-router": "^3.2.0",
+    "vuex": "^3.4.0"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^2.33.0",
+    "@typescript-eslint/parser": "^2.33.0",
+    "@vue/cli-plugin-babel": "^4.5.0",
+    "@vue/cli-plugin-eslint": "^4.5.0",
+    "@vue/cli-plugin-typescript": "^4.5.0",
+    "@vue/cli-service": "^4.5.0",
+    "@vue/eslint-config-prettier": "^6.0.0",
+    "@vue/eslint-config-typescript": "^5.0.2",
+    "compression-webpack-plugin": "^3.0.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-plugin-vue": "^6.2.2",
+    "prettier": "^1.19.1",
+    "sass": "^1.26.5",
+    "sass-loader": "^8.0.2",
+    "typescript": "~3.9.3",
+    "vue-template-compiler": "^2.6.11"
+  }
+}

package/src/packages/HtShowBaseData/index.vue

@@ -191,9 +191,10 @@ export default class CommonDatas extends Vue {
     if (!baseConfig.getLoginState()) {
       return;
     }
-    const data = window.localStorage.getItem("commonDatas");
+    let data = window.localStorage.getItem("commonDatas");
     if (data) {
       this.state.resData = Object.assign(this.state.resData, JSON.parse(data));
+      data = null;
     }
     const { items = [] } = this.state.resData.baseData;
     this.getBaseDataItem(items);

package/src/packages/HtTable/htTableColumn.vue

@@ -1,131 +1,124 @@
 <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"
-    :header-align="item.headerAlign"
-    :column-key="item.columnKey"
-    :class-name="item.className"
-    :prop="item.key"
-    :show-overflow-tooltip="
+  <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"
-        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"
+                     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">
           </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'">
-          <HtOrgInfo
-            v-if="getPropByPath(row, item.key)"
-            :org-id="getPropByPath(row, item.key)"
-            type="tag"
-          ></HtOrgInfo>
+          <HtOrgInfo v-if="getPropByPath(row, item.key)"
+                     :org-id="getPropByPath(row, item.key)"
+                     type="tag"></HtOrgInfo>
           <span v-else>--</span>
         </template>
         <!-- 处理基础数据 -->
         <template v-else-if="item.type === 'common'">
-          <HtShowBaseData
-            v-if="getPropByPath(row, item.key)"
-            :hide-code="item.hideCode"
-            :user-id="
+          <HtShowBaseData v-if="getPropByPath(row, item.key)"
+                          :hide-code="item.hideCode"
+                          :user-id="
               item.commonType === 'userId'
                 ? JSON.stringify([getPropByPath(row, item.key)])
                 : '[]'
             "
-            :department-id="
+                          :department-id="
               item.commonType === 'departmentId'
                 ? JSON.stringify([getPropByPath(row, item.key)])
                 : '[]'
             "
-            :role-id="
+                          :role-id="
               item.commonType === 'roleId'
                 ? JSON.stringify([getPropByPath(row, item.key)])
                 : '[]'
             "
-            :base-data-id="
+                          :base-data-id="
               item.commonType === 'baseDataId'
                 ? getPropByPath(row, item.key)
                 : ''
             "
-            :base-data-value="
+                          :base-data-value="
               item.commonType === 'baseDataValue'
                 ? getPropByPath(row, item.key)
                 : ''
             "
-            :base-data-name="
+                          :base-data-name="
               item.commonType === 'baseDataName'
                 ? getPropByPath(row, item.key)
                 : ''
             "
-            :base-data-info="true"
-          >
+                          :base-data-info="true">
           </HtShowBaseData>
 
           <span v-else>--</span>
         </template>
         <!-- 处理部门人员 -->
         <template v-else-if="item.type === 'userId'">
-          <HtShowBaseData
-            v-if="getPropByPath(row, item.key)"
-            :user-id="JSON.stringify(getPropByPath(row, item.key))"
-            :base-data-info="true"
-          >
+          <HtShowBaseData v-if="getPropByPath(row, item.key)"
+                          :user-id="JSON.stringify(getPropByPath(row, item.key))"
+                          :base-data-info="true">
           </HtShowBaseData>
 
           <span v-else>--</span>
         </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)
                   .replace('T', ' ')
                   .slice(0, 19)
-              }}</span
-            >
+              }}</span>
             <template v-else>
               <p style="color:var(--primary);margin:0;padding:0">
                 {{ getPropByPath(row, item.key).slice(11, 19) }}
@@ -143,106 +136,100 @@
         </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)
                   .replace('T', ' ')
                   .slice(0, 10)
-              }}</span
-            >
+              }}</span>
           </div>
           <span v-else>--</span>
         </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="'/files/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="'/files/api/filing/file/download/' + fileToken"
+                      :preview-src-list="[
                 '/files/api/filing/file/download/' + fileToken,
-              ]"
-            >
+              ]">
             </el-image>
           </span>
         </template>
         <!-- 处理附件显示 -->
         <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
-              }}</i
-            >
+              }}</i>
           </span>
           <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>
   </el-table-column>
 </template>
 <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 { 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";
 
 interface State {
   /** 数据状态 */
   loading: boolean;
 }
 @Component({
-  name: 'HtTableColumn',
+  name: "HtTableColumn",
   components: {
     HtUploadFiles,
     HtShowBaseData,
     HtOrgInfo,
     HtSelectUnit,
-    HtTableColumn: () => import('./htTableColumn.vue'),
+    HtTableColumn: () => import("./htTableColumn.vue"),
     //  MenuItem: () => import('./menuItem.vue'),
   },
 })
@@ -262,10 +249,10 @@ export default class Index extends Vue {
   // }
   getPropByPath(obj: any, path: string, strict = true) {
     let tempObj = obj;
-    path = path.replace(/\[(\w+)\]/g, '.$1');
-    path = path.replace(/^\./, '');
+    path = path.replace(/\[(\w+)\]/g, ".$1");
+    path = path.replace(/^\./, "");
 
-    const keyArr = path.split('.');
+    const keyArr = path.split(".");
     let i = 0;
     for (let len = keyArr.length; i < len - 1; ++i) {
       if (!tempObj && !strict) break;