jobdone-shared-files 0.0.1-beta.69 → 0.0.1-beta.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -54,6 +54,23 @@
|
|
|
54
54
|
</a>
|
|
55
55
|
</div>
|
|
56
56
|
</nav>
|
|
57
|
+
<nav class="navbar-nav navbar-main navbar-line navbar-line-lg ms-auto">
|
|
58
|
+
<div class="nav-item navbar-line-item btn nav-link border-0 dropdown"
|
|
59
|
+
:class="{'active':activeLinkType==0}">
|
|
60
|
+
<a class="dropdown-link" :href="finalRootDomain + 'Profile'">
|
|
61
|
+
<div class="thumbnail-content thumbnail-32 rounded-circle me-1" :style="'background-image: url(' + userInfo.picture + ');'"></div>
|
|
62
|
+
<span class="text-user-name text-overflow">{{userInfo.displayName}}</span>
|
|
63
|
+
<small class="ms-1">
|
|
64
|
+
(<span class="text-user-name text-overflow">{{userInfo.lastName}} {{userInfo.firstName}}</span>)
|
|
65
|
+
</small>
|
|
66
|
+
</a>
|
|
67
|
+
</div>
|
|
68
|
+
<div class="nav-item navbar-line-item btn nav-link border-0 dropdown">
|
|
69
|
+
<a class="dropdown-link" :href="finalRootDomain + logOutUrl">
|
|
70
|
+
登出
|
|
71
|
+
</a>
|
|
72
|
+
</div>
|
|
73
|
+
</nav>
|
|
57
74
|
</div>
|
|
58
75
|
</div>
|
|
59
76
|
</div>
|
|
@@ -119,6 +136,14 @@
|
|
|
119
136
|
apiProjectApps: {
|
|
120
137
|
type: String,
|
|
121
138
|
required: true
|
|
139
|
+
},
|
|
140
|
+
apiCurrentUser: {
|
|
141
|
+
type: String,
|
|
142
|
+
required: true
|
|
143
|
+
},
|
|
144
|
+
logOutUrl: {
|
|
145
|
+
type: String,
|
|
146
|
+
required: true
|
|
122
147
|
}
|
|
123
148
|
},
|
|
124
149
|
setup(props) {
|
|
@@ -151,6 +176,13 @@
|
|
|
151
176
|
selfIsApp: false
|
|
152
177
|
});
|
|
153
178
|
|
|
179
|
+
const userInfo = ref({
|
|
180
|
+
displayName: '',
|
|
181
|
+
lastName: '',
|
|
182
|
+
firstName: '',
|
|
183
|
+
picture: ''
|
|
184
|
+
});
|
|
185
|
+
|
|
154
186
|
const finalRootDomain = ref(props.rootDomain);
|
|
155
187
|
|
|
156
188
|
|
|
@@ -162,10 +194,12 @@
|
|
|
162
194
|
|
|
163
195
|
const data = await Promise.all([
|
|
164
196
|
axios.get(props.apiProjectInfo),
|
|
165
|
-
axios.get(props.apiProjectApps)
|
|
197
|
+
axios.get(props.apiProjectApps),
|
|
198
|
+
axios.get(props.apiCurrentUser)
|
|
166
199
|
]);
|
|
167
200
|
Object.assign(projectInfo.value, data[0].data);
|
|
168
201
|
Object.assign(navLinkObj.value, data[1].data);
|
|
202
|
+
Object.assign(userInfo.value, data[2].data);
|
|
169
203
|
|
|
170
204
|
let navbarElements = document.getElementsByClassName('navbar-content');
|
|
171
205
|
Array.from(navbarElements).forEach(function(item){
|
|
@@ -239,4 +273,8 @@
|
|
|
239
273
|
padding-left: 5.25rem;
|
|
240
274
|
padding-right: 1rem;
|
|
241
275
|
}
|
|
276
|
+
|
|
277
|
+
.text-user-name{
|
|
278
|
+
max-width: 5.5rem;
|
|
279
|
+
}
|
|
242
280
|
</style>
|