lw-cdp-ui 1.2.62 → 1.2.63

package/dist/components/lwLayout/components/iframeView.vue

@@ -35,6 +35,7 @@
 		},
 		methods: {
 			push(route){
+				console.log(route)
 				if(route.meta.type == 'iframe'){
 					if(this.ismobile || !this.layoutTags){
 						this.$store.commit("setIframeList", route)

package/dist/components/lwLayout/index.vue

@@ -365,14 +365,11 @@ export default {
     }
     let isMenuIsCollapse = this.$tool.data.get("APP_menuIsCollapse")
     this.$store.state.global.menuIsCollapse = !!isMenuIsCollapse
+
+    // 标志当前应用
+    this.$tool.data.set("MENUCOMBINEDNMAE", this.$config.APP_NAME);
   },
   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();
@@ -414,10 +411,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,
+        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
     },
 
 

package/dist/components/lwLogin/index.vue

@@ -173,11 +173,6 @@ export default {
       type: Boolean,
       default: true
     },
-    // 是否手动合并菜单到同一个项目
-    isCombined: {
-      type: Boolean,
-      default: true
-    },
     // 是否加密登录
     isEncryption: {
       type: Boolean,
@@ -324,7 +319,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 +351,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,
+        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 +372,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,48 +162,76 @@
                     :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">
+        <!-- 枚举options -->
+        <template
+                  v-else-if="!col.switch && col.options && col.options.length > 0">
           <template v-if="scope.row.isEdit && col.canEdit">
-            <el-select v-model="scope.row[col.editSource]"
+            <el-select class="select-select number"
                        :value-key="col.editValue || 'code'"
-                       class="select-select number"
+                       v-model="scope.row[col.editSource]"
                        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>
+                       @change="(val) => {col.callback(val, scope.row)}">
+              <el-option :value="item"
+                         v-for="item in col.options"
+                         :key="item">{{ col.editValue ? item[col.editValue] : item.name }}</el-option>
             </el-select>
           </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>
+                    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;`"></span>{{ col.editValue ? item[col.editValue] : item.name }}</span>
             </span>
           </template>
         </template>
 
+        <!-- 日期起始 -->
+        <template v-else-if="col.type === 'startToEnd'">
+          <div style="margin-bottom: 5px">
+            <span class="start-span">起</span>
+            {{ scope.row[col.dataIndexList[0]] ? dayjs(scope.row[col.dataIndexList[0]]).format('YYYY-MM-DD HH:mm:ss') : '--' }}
+          </div>
+          <div>
+            <span class="end-span">止</span>
+            {{ scope.row[col.dataIndexList[1]] ? dayjs(scope.row[col.dataIndexList[1]]).format('YYYY-MM-DD HH:mm:ss') : '--' }}
+          </div>
+        </template>
+
+        <!-- 日期转换 -->
+        <template v-else-if="col.dataType">
+          {{ dayjs(scope.row[col.dataIndex]).format('YYYY-MM-DD HH:mm:ss')}}
+        </template>
+
+        <!-- 开关 -->
+        <template v-else-if="col.switch">
+          <el-switch :inline-prompt="col.isShowMessage"
+                     :active-text="col.isShowMessage ? col.activeText : '是'"
+                     :inactive-text="col.isShowMessage ? 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.isVideo">
+          <video width="40"
+                 :src="scope.row[col.dataIndex]"
+                 style="margin: 5px 0" />
+        </template>
+
+        <!-- 数组转string -->
+        <template v-else-if="col.arrayList">
+          <span>{{ scope.row[col.dataIndex] !== null && scope.row[col.dataIndex].length > 0 ? scope.row[col.dataIndex].toString() : '' }}</span>
+        </template>
+
         <!-- 自定义组件 -->
         <template v-else-if="col.component">
           <slot :name="col.component"