lw-cdp-ui 1.3.4 → 1.3.6

package/dist/components/lwLayout/components/tags.vue

@@ -179,11 +179,14 @@ export default {
     closeSelectedTag(tag, autoPushLatestView = true) {
       let item = this.menu[0]
       if (item.children) {
-        item = item.children[0]
+        item =  item.children[0]
       }
-      if (this.tagList.length == 1 && item.path == this.$route.fullPath) {
-        return false
+
+      // 兼容合并菜单
+      if (item.meta?.code) {
+        item.path = `/i/${item.name}`
       }
+
       this.$store.commit("removeViewTags", tag)
       this.$store.commit("removeIframeList", tag)
       this.$store.commit("removeKeepLive", tag.name)
@@ -193,7 +196,7 @@ export default {
         if (latestView) {
           this.$router.push(latestView)
         } else {
-          this.$router.push('/')
+          this.$router.push({ path: item.path })
         }
       }
     },

package/dist/components/lwLayout/index.vue

@@ -199,7 +199,7 @@ export default {
     }
   },
   beforeCreate() {
-    // 挂载菜单订阅
+    // 挂载自定义菜单订阅
     this.$bus.$on('setMenu', (menu) => {
       this.changeMenu = true
       this.menu = this.filterUrl(menu)
@@ -214,12 +214,6 @@ export default {
     this.$store.state.global.menuIsCollapse = !!isMenuIsCollapse
   },
   async created() {
-    // 标识当前项目
-    let isCombined = this.$tool.data.get("MENUCOMBINED")
-    if (isCombined) {
-      this.$tool.data.set("MENUCOMBINEDNMAE", this.$config.APP_NAME);
-    }
-
     this.onLayoutResize();
     window.addEventListener('resize', this.onLayoutResize);
     this.getUserInfo();
@@ -261,10 +255,15 @@ export default {
       let application = [...new Set(user.userAuthInfo.menus.map(permission => permission.split('.')[0].split('_')[0]))]
       user.userAuthInfo.grantedApplications = user.userAuthInfo.grantedApplications.filter(x => application.includes(x.code))
 
+      let userAuthInfo = {
+        ...user.userAuthInfo,
+        combined: user.combined,
+        loginPage: user.loginPage,
+        menuContent: user.menuContent,
+      }
       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
+      this.$tool.data.set('userAuthInfo', userAuthInfo)
+      this.$store.state.user = userAuthInfo
     },
 
 

package/dist/components/lwLogin/index.vue

@@ -173,11 +173,6 @@ export default {
       type: Boolean,
       default: true
     },
-    // 是否手动合并菜单到同一个项目
-    isCombined: {
-      type: Boolean,
-      default: true
-    },
     // 是否加密登录
     isEncryption: {
       type: Boolean,
@@ -304,6 +299,7 @@ export default {
     this.$store.commit("clearViewTags");
     this.$store.commit("clearKeepLive");
     this.$store.commit("clearIframeList")
+    this.$tool.data.remove("MENU_LIST")
   },
   methods: {
     // 加密
@@ -324,7 +320,7 @@ export default {
         username: this.ruleForm.user,
         password: this.ruleForm.password,
       };
-      
+
       if (this.isEncryption) {
         const publicKey = await this.$api.auth.key()
         if (publicKey) {
@@ -356,14 +352,19 @@ export default {
       // 获取用户信息
       let user = await this.$api.auth.user()
       // 处理应用显示逻辑
-      let application  = [...new Set(user.userAuthInfo.menus.map(permission => permission.split('.')[0].split('_')[0]))]
+      let application = [...new Set(user.userAuthInfo.menus.map(permission => permission.split('.')[0].split('_')[0]))]
       user.userAuthInfo.grantedApplications = user.userAuthInfo.grantedApplications.filter(x => application.includes(x.code))
 
+      let userAuthInfo = {
+        ...user.userAuthInfo,
+        combined: user.combined,
+        loginPage: user.loginPage,
+        menuContent: user.menuContent,
+      }
       this.$tool.data.set('tenantId', user.userAuthInfo.tenantId)
-      this.$tool.data.set('userAuthInfo', user.userAuthInfo)
+      this.$tool.data.set('userAuthInfo', userAuthInfo)
       // 用与应用菜单显示
-      this.$tool.data.set('MenuPath', user.userAuthInfo.grantedApplications)
-      this.$store.state.user = user.userAuthInfo
+      this.$store.state.user = userAuthInfo
 
 
       // 兼容旧项目设置信息
@@ -372,42 +373,8 @@ export default {
       sessionStorage.setItem('easyweb_session_passport_bu_list', JSON.stringify({ v: bu }))
       document.cookie = `Authorization=Bearer ${token}`;
 
-      // 获取合并菜单信息  isCombined  这参数后期要加是否要合并菜单展示 现在默认tue
-      /**
-       * 此处进行 获取的数据路由router文件进行合并
-       * 需要开发一个接口返回  权限与具体页面路径映射数据 （这个功能要开发）
-       * 需要在  platform  菜单管理中  配置isCombined参数  用于标识是否合并项目菜单
-       * 原有的数据要加两个配置项 icon  path
-       * 返回的数据是
-       * [
-       *  {
-          "id": "ma_menu.workplace",
-          "tenantId": "connext",
-          "name": "工作台",
-          "type": "MENU",
-          ...
-          "applications": ["ma"],
-          "icon": 'el-icon-discount', // icon
-          "path": '/reach/flow-template/, // 菜单路径
-          "authority": [
-            "ma.marketing_center.locate",
-            "ma.marketing_center_operation.locate",
-          ]
-        }
-      * ]
-      */
-      if (user.combined || this.isCombined) {
-        let menu = await this.$api.auth.menu();
-        this.$tool.data.set("MENUCOMBINED", menu);
-        // 注入 用于判断子项目 是否扁平化
-        this.$tool.data.set("MENUCOMBINEDNMAE", this.$config.APP_NAME);
-      } else {
-        this.$tool.data.remove("MENUCOMBINED");
-        this.$tool.data.remove("MENUCOMBINEDNMAE");
-      }
 
       // 检验是否初始化
-
       if (this.isInitialized) {
         let initialized = await this.$api.auth.initialized()
         this.$tool.data.set('zoneInitialized', initialized)

package/dist/components/lwTable/components/TableColumn.vue

@@ -162,46 +162,42 @@
                     :preview-teleported="true" />
         </template>
 
-        <!-- switch -->
-        <template v-else-if="col.switch">
-          <el-switch v-model="scope.row[col.dataIndex]"
-                     inline-prompt
-                     :active-text="col?.activeText || '是'"
-                     :inactive-text="col?.inactiveText || '否'"
-                     :active-value="col?.activeValue || true"
-                     :inactive-value="col?.inactiveValue || false"
-                     @click="col.callback(scope.row[col.dataIndex], scope.row)"></el-switch>
-        </template>
-
-        <!-- 选项列 -->
-        <template v-else-if="!col.switch && col.options?.length">
-          <template v-if="scope.row.isEdit && col.canEdit">
-            <el-select v-model="scope.row[col.editSource]"
-                       :value-key="col.editValue || 'code'"
-                       class="select-select number"
-                       placeholder=""
-                       allow-clear
-                       allow-search
-                       filter-option
-                       @change="val => col.callback(val, scope.row)">
-              <el-option v-for="item in col.options"
-                         :key="item"
-                         :value="item">
-                {{ col.editValue ? item[col.editValue] : item.name }}
-              </el-option>
-            </el-select>
+        <!-- 日期转换 -->
+        <template v-else-if="col.date">
+          <template v-if="Array.isArray(scope.row[col.dataIndex])">
+            {{ scope.row[col.dataIndex] ? dayjs(scope.row[col.dataIndex]).format('YYYY-MM-DD HH:mm:ss') : '--'}}
+            到
+            {{ scope.row[col.dataIndex] ? dayjs(scope.row[col.dataIndex][1]).format('YYYY-MM-DD HH:mm:ss') : '--'}}
           </template>
           <template v-else>
-            <span v-for="(item, index) in col.options"
-                  :key="item + index">
-              <span
-                    v-if="scope.row[col.dataIndex] == item[col.editValue || 'code']">
-                <span v-if="item.statusColor"
-                      :style="`background-color: ${item.statusColor}; border-radius: 100%; padding: 4px; display: inline-block; margin-right: 5px;`" />
-                {{ col.editValue ? item[col.editValue] : item.name }}
-              </span>
-            </span>
+            {{ dayjs(scope.row[col.dataIndex]).format('YYYY-MM-DD HH:mm:ss')}}
           </template>
+
+        </template>
+
+        <!-- 开关 -->
+        <template v-else-if="col.switch">
+          <el-switch :inline-prompt="true"
+                     :active-text="col.activeText || '是'"
+                     :inactive-text="col.inactiveText || '否'"
+                     style="--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #c6c6c6"
+                     v-model="scope.row[col.dataIndex]"
+                     :active-value="col.activeValue ?? true"
+                     :inactive-value="col.inactiveValue ?? false"
+                     :disabled="col.disabled ? col.disabled(scope.row) : false"
+                     @change="(v) => {col.clickFun(v, scope.row)}" />
+        </template>
+
+        <!-- 视频 -->
+        <template v-else-if="col.video">
+          <video width="40"
+                 :src="scope.row[col.dataIndex]"
+                 style="margin: 5px 0" />
+        </template>
+
+        <!-- 数组转string -->
+        <template v-else-if="col.array">
+          <span>{{ scope.row[col.dataIndex]  ? scope.row[col.dataIndex].toString() : '' }}</span>
         </template>
 
         <!-- 自定义组件 -->
@@ -231,6 +227,7 @@
 </template>
 
 <script >
+import dayjs from 'dayjs'
 export default {
   name: 'TableColumn',
   props: {
@@ -239,6 +236,11 @@ export default {
       default: () => []
     }
   },
+  data() {
+    return {
+      dayjs
+    }
+  },
   methods: {
     /**
      * 过滤列表操作按钮

package/dist/components/lwTable/index.js

@@ -19,7 +19,7 @@ export default {
 		bordered: { type: Boolean, default: true }, // 是否显示边框
 		stripe: { type: Boolean, default: false }, // 是否显示斑马纹
 		hoverable: { type: Boolean, default: true }, // 是否启用鼠标悬停效果
-		maxHeight: { type: String, default: 'calc(100vh - 270px)' }, // 表格最大高度
+		maxHeight: { type: String, default: '' }, // 表格最大高度
 		height: { type: String, default: '' }, // 表格高度
 
 		// 选择功能配置
@@ -117,9 +117,9 @@ export default {
 		// 监听窗口大小变化
 		window.addEventListener('resize', this.handleResize)
 
-    this.$nextTick(() => {
-      this.handleResize()
-    })
+		this.$nextTick(() => {
+			this.handleResize()
+		})
 	},
 
 	beforeDestroy() {
@@ -249,12 +249,19 @@ export default {
 				this.isFullscreen = false
 			}
 
-      // 自动计算稿表格高度
-      const container = document.querySelector('.adminui-main > .el-container')
+			// 自动计算稿表格高度
+			const container = document.querySelector('.adminui-main > .el-container') || { clientHeight: 0 }
+			const btnContainer = document.querySelector('.table-block > .btn-container')
 			const searchCard = document.querySelector('.lw-search-card')
-			if (container && searchCard) {
-				this.tableHeight =  container.clientHeight - searchCard.clientHeight - 160
+			this.tableHeight = container.clientHeight
+			console.log(btnContainer, searchCard)
+			if (searchCard) {
+				this.tableHeight = this.tableHeight - searchCard.clientHeight
 			}
+			if (btnContainer) {
+				this.tableHeight = this.tableHeight - btnContainer.clientHeight - 10
+			}
+			this.tableHeight = this.tableHeight - 110
 		},
 		// 拖动选中
 		onSelect({ selected }) {

package/dist/components/lwTable/index.vue

@@ -7,7 +7,7 @@
               :columns="tableHeaders"
               :data="tableData"
               :row-key="rowKey"
-              :max-height="maxHeight"
+              :max-height="maxHeight || tableHeight"
               :height="height || tableHeight"
               :size="localTableSize"
               :stripe="stripe"