lw-cdp-ui 1.2.46 → 1.2.48

package/dist/components/lwLayout/index.vue

@@ -56,7 +56,8 @@
       <Side-m v-if="ismobile"></Side-m>
       <div class="aminui-body el-container">
         <Topbar v-if="!ismobile"></Topbar>
-        <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
+        <Tags v-if="!ismobile && layoutTags"
+              :tagShowID="tagShowID"></Tags>
         <div class="adminui-main"
              id="adminui-main">
           <slot name="routerView">
@@ -117,7 +118,8 @@
               </template>
             </userbar>
           </div>
-          <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
+          <Tags v-if="!ismobile && layoutTags"
+                :tagShowID="tagShowID"></Tags>
           <div class="adminui-main"
                id="adminui-main">
             <slot name="routerView">
@@ -170,7 +172,8 @@
     </header>
     <section class="aminui-wrapper">
       <div class="aminui-body el-container">
-        <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
+        <Tags v-if="!ismobile && layoutTags"
+              :tagShowID="tagShowID"></Tags>
         <div class="adminui-main"
              id="adminui-main">
           <slot name="routerView">
@@ -245,7 +248,8 @@
             </template>
           </userbar>
         </Topbar>
-        <Tags v-if="!ismobile && layoutTags" :tagShowID="tagShowID"></Tags>
+        <Tags v-if="!ismobile && layoutTags"
+              :tagShowID="tagShowID"></Tags>
         <div class="adminui-main"
              id="adminui-main">
           <slot name="routerView">
@@ -397,6 +401,11 @@ export default {
 
       // 获取用户信息
       let user = await this.$api.auth.user()
+
+      // 处理应用显示逻辑
+      let application = [...new Set(user.userAuthInfo.menus.map(permission => permission.split('.')[0]))]
+      user.userAuthInfo.grantedApplications = user.userAuthInfo.grantedApplications.filter(x => application.includes(x.code))
+
       this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)
       this.$tool.data.set('userAuthInfo', user.userAuthInfo)
       this.$tool.data.set('MenuPath', user.userAuthInfo.grantedApplications)

package/dist/components/lwLogin/index.vue

@@ -351,8 +351,13 @@ export default {
 
       // 获取用户信息
       let user = await this.$api.auth.user()
+      // 处理应用显示逻辑
+      let application  = [...new Set(user.userAuthInfo.menus.map(permission => permission.split('.')[0]))]
+      user.userAuthInfo.grantedApplications = user.userAuthInfo.grantedApplications.filter(x => application.includes(x.code))
+
       this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)
       this.$tool.data.set('userAuthInfo', user.userAuthInfo)
+      // 用与应用菜单显示
       this.$tool.data.set('MenuPath', user.userAuthInfo.grantedApplications)
       this.$store.state.user = user.userAuthInfo
 

package/dist/components/lwTable/index.js

@@ -274,8 +274,11 @@ export default {
 			selected.forEach((node) => {
 				// 获取 data-item 属性的值
 				const item = node.getAttribute('data-item')
-				const itemData = JSON.parse(item)
-				list.push(itemData)
+
+				if (item) {
+					const itemData = JSON.parse(item)
+					list.push(itemData)
+				}
 			})
 			this.$emit('multipleSelection', list)
 		}

package/dist/components/lwTable/index.scss

@@ -232,3 +232,7 @@
 	margin-top: 10px;
 	gap: 5px;
 }
+
+.table-card-list{
+	
+}

package/dist/components/lwTable/index.vue

@@ -199,14 +199,15 @@
          class="table-card-list"
          :style="{ minHeight: maxHeight }">
       <el-row :gutter="20">
-        <VueSelecto dragContainer=".el-main"
+        <VueSelecto dragContainer=".table-card-list"
+                    boundContainer=".table-card-list"
                     :selectableTargets="['.table-card-item']"
                     :selectByClick="true"
                     :selectFromInside="true"
                     :continueSelect="false"
                     :toggleContinueSelect='"shift"'
                     :keyContainer="window"
-                    :hitRate="100"
+                    :hitRate="50"
                     @select="onSelect" />
         <el-col :span="6"
                 v-for="item in tableData">
@@ -248,7 +249,8 @@
           </el-tooltip>
 
           <!-- 表格大小设置 -->
-          <el-dropdown @command="handleSelect">
+          <el-dropdown v-if="!isCard"
+                       @command="handleSelect">
             <span class="dropdown-trigger">
               <el-tooltip :content="$t('lwTable.tools.lineHeightName')">
                 <el-icon size="20">
@@ -272,7 +274,8 @@
           </el-dropdown>
 
           <!-- 列设置 -->
-          <el-popover placement="top-start"
+          <el-popover v-if="!isCard"
+                      placement="top-start"
                       :title="$t('lwTable.tools.columnsSetting')"
                       :width="400"
                       trigger="hover">