n20-common-lib 2.2.35 → 2.2.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.2.35",
+  "version": "2.2.37",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/FileUploadTable/index.vue

@@ -104,7 +104,7 @@
           <slot slot="header" slot-scope="scope" name="time-header" :column="scope.column">{{ '上传时间' | $lc }}</slot>
           <slot slot-scope="{ row }" name="time" :row="row">{{ row[keys.time] }}</slot>
         </el-table-column>
-        <el-table-column :label="'上传人' | $lc" :prop="keys.user">
+        <el-table-column v-if="!hideUser" :label="'上传人' | $lc" :prop="keys.user">
           <slot slot="header" slot-scope="scope" name="user-header" :column="scope.column">{{ '上传人' | $lc }}</slot>
           <slot slot-scope="{ row }" name="user" :row="row">{{ row[keys.user] }}</slot>
         </el-table-column>
@@ -320,6 +320,10 @@ export default {
     getFileMethod: {
       type: Function,
       default: undefined
+    },
+    hideUser: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

package/src/components/Layout/SubContent/index.vue

@@ -16,7 +16,7 @@ export default {
   filters: {
     keyF({ path, query = {} }) {
       path = path.replace(/^\//, routerBase)
-      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + (window._tab_route_key[path] || 0)
+      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + window._tab_route_key[path]
     }
   },
   props: {

package/src/components/Layout/index.vue

@@ -51,7 +51,7 @@ export default {
   },
   filters: {
     keyF({ path, query = {} }) {
-      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + (window._tab_route_key[path] || 0)
+      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + window._tab_route_key[path]
     }
   },
   props: {
@@ -227,13 +227,18 @@ export default {
       }
     },
     addRouterKey(path, query) {
-      let keys = window._tab_route_key
-      if (!keys[path]) {
-        keys[path] = 1
+      let nuPath = window.sessionStorage.getItem('not-update-path')
+      if (nuPath === path) {
+        window.sessionStorage.removeItem('not-update-path')
       } else {
-        keys[path] = keys[path] + 1
+        let keys = window._tab_route_key
+        if (!keys[path]) {
+          keys[path] = 1
+        } else {
+          keys[path] = keys[path] + 1
+        }
+        this.CompatibleUpdateCache(path) // 兼容旧的子模块清除缓存
       }
-      this.CompatibleUpdateCache(path) // 兼容旧的子模块清除缓存
     },
     routerPush({ path, query }) {
       this.$router.push({ path, query })

package/src/components/Layout/indexN.vue

@@ -51,7 +51,7 @@ export default {
   },
   filters: {
     keyF({ path, query = {} }) {
-      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + (window._tab_route_key[path] || 0)
+      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + window._tab_route_key[path]
     }
   },
   props: {
@@ -237,13 +237,18 @@ export default {
       }
     },
     addRouterKey(path, query) {
-      let keys = window._tab_route_key
-      if (!keys[path]) {
-        keys[path] = 1
+      let nuPath = window.sessionStorage.getItem('not-update-path')
+      if (nuPath === path) {
+        window.sessionStorage.removeItem('not-update-path')
       } else {
-        keys[path] = keys[path] + 1
+        let keys = window._tab_route_key
+        if (!keys[path]) {
+          keys[path] = 1
+        } else {
+          keys[path] = keys[path] + 1
+        }
+        this.CompatibleUpdateCache(path) // 兼容旧的子模块清除缓存
       }
-      this.CompatibleUpdateCache(path) // 兼容旧的子模块清除缓存
     },
     routerPush({ path, query }) {
       this.$router.push({ path, query })