lw-cdp-ui 1.2.47 → 1.2.48

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.
@@ -56,7 +56,8 @@
56
56
  <Side-m v-if="ismobile"></Side-m>
57
57
  <div class="aminui-body el-container">
58
58
  <Topbar v-if="!ismobile"></Topbar>
59
- <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
59
+ <Tags v-if="!ismobile && layoutTags"
60
+ :tagShowID="tagShowID"></Tags>
60
61
  <div class="adminui-main"
61
62
  id="adminui-main">
62
63
  <slot name="routerView">
@@ -117,7 +118,8 @@
117
118
  </template>
118
119
  </userbar>
119
120
  </div>
120
- <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
121
+ <Tags v-if="!ismobile && layoutTags"
122
+ :tagShowID="tagShowID"></Tags>
121
123
  <div class="adminui-main"
122
124
  id="adminui-main">
123
125
  <slot name="routerView">
@@ -170,7 +172,8 @@
170
172
  </header>
171
173
  <section class="aminui-wrapper">
172
174
  <div class="aminui-body el-container">
173
- <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
175
+ <Tags v-if="!ismobile && layoutTags"
176
+ :tagShowID="tagShowID"></Tags>
174
177
  <div class="adminui-main"
175
178
  id="adminui-main">
176
179
  <slot name="routerView">
@@ -245,7 +248,8 @@
245
248
  </template>
246
249
  </userbar>
247
250
  </Topbar>
248
- <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
251
+ <Tags v-if="!ismobile && layoutTags"
252
+ :tagShowID="tagShowID"></Tags>
249
253
  <div class="adminui-main"
250
254
  id="adminui-main">
251
255
  <slot name="routerView">
@@ -397,6 +401,11 @@ export default {
397
401
 
398
402
  // 获取用户信息
399
403
  let user = await this.$api.auth.user()
404
+
405
+ // 处理应用显示逻辑
406
+ let application = [...new Set(user.userAuthInfo.menus.map(permission => permission.split('.')[0]))]
407
+ user.userAuthInfo.grantedApplications = user.userAuthInfo.grantedApplications.filter(x => application.includes(x.code))
408
+
400
409
  this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)
401
410
  this.$tool.data.set('userAuthInfo', user.userAuthInfo)
402
411
  this.$tool.data.set('MenuPath', user.userAuthInfo.grantedApplications)
@@ -351,8 +351,13 @@ export default {
351
351
 
352
352
  // 获取用户信息
353
353
  let user = await this.$api.auth.user()
354
+ // 处理应用显示逻辑
355
+ let application = [...new Set(user.userAuthInfo.menus.map(permission => permission.split('.')[0]))]
356
+ user.userAuthInfo.grantedApplications = user.userAuthInfo.grantedApplications.filter(x => application.includes(x.code))
357
+
354
358
  this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)
355
359
  this.$tool.data.set('userAuthInfo', user.userAuthInfo)
360
+ // 用与应用菜单显示
356
361
  this.$tool.data.set('MenuPath', user.userAuthInfo.grantedApplications)
357
362
  this.$store.state.user = user.userAuthInfo
358
363
 
@@ -249,7 +249,8 @@
249
249
  </el-tooltip>
250
250
 
251
251
  <!-- 表格大小设置 -->
252
- <el-dropdown @command="handleSelect">
252
+ <el-dropdown v-if="!isCard"
253
+ @command="handleSelect">
253
254
  <span class="dropdown-trigger">
254
255
  <el-tooltip :content="$t('lwTable.tools.lineHeightName')">
255
256
  <el-icon size="20">
@@ -273,7 +274,8 @@
273
274
  </el-dropdown>
274
275
 
275
276
  <!-- 列设置 -->
276
- <el-popover placement="top-start"
277
+ <el-popover v-if="!isCard"
278
+ placement="top-start"
277
279
  :title="$t('lwTable.tools.columnsSetting')"
278
280
  :width="400"
279
281
  trigger="hover">