From dbeb1e3c16bdf0969c18e092eae8a4d08345e9c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 1 Aug 2023 11:18:38 +0800
Subject: [PATCH] getLoginName

---
 Code/Fe/src/components/rowDrop/index.vue | 5 +++--
 Code/Fe/src/mixins/mixins.js             | 6 ++++--
 Code/Fe/src/utils/auth.js                | 6 ++++++
 Code/Fe/src/utils/defaultButtons.js      | 3 ++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Code/Fe/src/components/rowDrop/index.vue b/Code/Fe/src/components/rowDrop/index.vue
index e390263..3e5bcfb 100644
--- a/Code/Fe/src/components/rowDrop/index.vue
+++ b/Code/Fe/src/components/rowDrop/index.vue
@@ -47,6 +47,7 @@
 <script>
 import draggable from "vuedraggable";
 import Sortable from "sortablejs";
+import { getLoginName } from "@/utils/auth"
 export default {
   components: {
     draggable,
@@ -61,7 +62,7 @@ export default {
       dataList: [],
       // 全选 allSelect hasSelect NoSelect
       allSeletType:'NoSelect',
-      userName:this.$store.getters.currentUserInfo.userName
+      userName: getLoginName()
     }
   },
   props: {
@@ -100,7 +101,7 @@ export default {
         type: 'warning',
         cancelButtonClass:'rowDropNotHideItem'
       }).then(() => {
-        // 先set是为了字段设置按钮可以监听到缓存变化，之后在移除缓存  this.$store.getters.currentUserInfo.userName
+        // 先set是为了字段设置按钮可以监听到缓存变化，之后在移除缓存
         localStorage.setItem('file_Columns_' + this.source + '_' + this.userName + '_' + this.$route.name, JSON.stringify([]))
         localStorage.removeItem('file_Columns_' + this.source + '_' +this.userName + '_' + this.$route.name)
         // let _resetCol = this.$isTableColumns[this.$route.name]
diff --git a/Code/Fe/src/mixins/mixins.js b/Code/Fe/src/mixins/mixins.js
index 03e8d2e..7f8b689 100644
--- a/Code/Fe/src/mixins/mixins.js
+++ b/Code/Fe/src/mixins/mixins.js
@@ -3,6 +3,8 @@ import {
   postImport,
 } from '@/api/wms-api'
 import * as allUrlOption from '@/utils/baseData/urlOption'
+import { getLoginName } from "@/utils/auth"
+
 export const mixins = {
   data() {
     return {
@@ -74,8 +76,8 @@ export const mixins = {
       let _list_defalut = columnsData ? columnsData : this.$isTableColumns[this.$route.name]
       let _type = type ? type : 'list_api'
       if(!_list_defalut)return
-      let _local = localStorage.getItem('file_Columns_' + _type + '_' + this.$store.getters.currentUserInfo.userName + '_' + this.$route.name)
-      let _list_local = JSON.parse(localStorage.getItem('file_Columns_' + _type + '_' + this.$store.getters.currentUserInfo.userName + '_' + this.$route.name))
+      let _local = localStorage.getItem('file_Columns_' + _type + '_' + getLoginName() + '_' + this.$route.name)
+      let _list_local = JSON.parse(localStorage.getItem('file_Columns_' + _type + '_' + getLoginName() + '_' + this.$route.name))
       let _new_list = [] //格式化后的数据
       // 如果没有缓存则直接为默认值
       if(!_local){
diff --git a/Code/Fe/src/utils/auth.js b/Code/Fe/src/utils/auth.js
index f696136..45b74fa 100644
--- a/Code/Fe/src/utils/auth.js
+++ b/Code/Fe/src/utils/auth.js
@@ -1,4 +1,5 @@
 import Cookies from 'js-cookie'
+import store from '@/store'
 
 const TokenKey = 'Admin-Token'
 const CompanyKey = 'Admin-Company'
@@ -15,3 +16,8 @@ export function setToken(token) {
 export function removeToken() {
   return Cookies.remove(TokenKey)
 }
+
+// fast-new
+export function getLoginName() {
+  return (store.getters.currentUserInfo && store.getters.currentUserInfo.name) ? store.getters.currentUserInfo.name : localStorage.getItem('isLoginName')
+}
\ No newline at end of file
diff --git a/Code/Fe/src/utils/defaultButtons.js b/Code/Fe/src/utils/defaultButtons.js
index ef91b38..d88391f 100644
--- a/Code/Fe/src/utils/defaultButtons.js
+++ b/Code/Fe/src/utils/defaultButtons.js
@@ -1,5 +1,6 @@
 // 页面基础按钮样式
 import i18n from "@/lang"
+import { getLoginName } from "@/utils/auth"
 /**
  * 如果需要更改配置，格式如：defaultExportBtn({label:'自定义'})
  * @param {*} option 
@@ -44,7 +45,7 @@ export function defaultExportBtn(option) {
 export function defaultFieldSettingBtn(option,source) {
     let _source = source ? source : 'list_api'
     // todo:监听已经配置过的字段按钮更改状态特殊显示
-    let _local = localStorage.getItem('file_Columns_' + _source + '_' + this.$store.getters.currentUserInfo.userName + '_' + this.$route.name)
+    let _local = localStorage.getItem('file_Columns_' + _source + '_' + getLoginName() + '_' + this.$route.name)
     let _type = ''
     let _num = 0
     if(_local){