cloud-web-corejs 1.0.232 → 1.0.234

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.232",
+  "version": "1.0.234",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/layout/components/Sidebar/default.vue

@@ -1,12 +1,13 @@
 <template>
-  <div :class="{ 'has-logo': showLogo }">
+  <div :class="{ 'has-logo': showLogo, telescopMenu: !isMenu }">
     <!-- <logo v-if="showLogo" :collapse="isCollapse" /> -->
 
     <div class="hamburger-box" ref="hamhurger" @click="openUserInfo">
       <!-- <hamburger :is-active="sidebar.opened" @toggleClick="toggleSideBar" /> -->
       <div>
         <p class="name">
-          <i class="iconfont icon-ziyuan"></i><span>{{ userInfo.nickName }}</span>
+          <i class="iconfont icon-ziyuan"></i
+          ><span>{{ userInfo.nickName }}</span>
         </p>
       </div>
     </div>
@@ -46,7 +47,7 @@
         >
           <i
             class="iconfont icon-liuchengdaiban"
-            @click="toWorkflowManage()"
+            @click="$router.push('/basic/wf/wf_manage/list')"
           />
         </el-tooltip>
       </div>
@@ -57,7 +58,10 @@
           :content="$t1('获取提取码')"
           :placement="direction"
         >
-          <i class="el-icon-setting" @click="showExtractedCodeCreateDialog = true" />
+          <i
+            class="el-icon-setting"
+            @click="showExtractedCodeCreateDialog = true"
+          />
         </el-tooltip>
       </div>
       <div class="item" v-if="isBdAdmin">
@@ -67,7 +71,10 @@
           :content="$t1('查看提取码')"
           :placement="direction"
         >
-          <i class="el-icon-tickets" @click="showExtractedCodeQueryDialog = true" />
+          <i
+            class="el-icon-tickets"
+            @click="showExtractedCodeQueryDialog = true"
+          />
         </el-tooltip>
       </div>
 
@@ -99,7 +106,10 @@
               <i :class="getMenuClass(router2, 2)"></i
               ><span>{{ getMenuName(router2) }}</span>
             </div>
-            <dl v-for="(router3, index3) in router2.children" :key="'router3' + index3">
+            <dl
+              v-for="(router3, index3) in router2.children"
+              :key="'router3' + index3"
+            >
               <div
                 class="item"
                 v-if="!router3.hidden"
@@ -122,37 +132,57 @@
       :unique-opened="true"
       @mouseleave="showNav()"
       ref="seconMenus"
+      :collapse="!isMenu"
     >
       <el-scrollbar wrap-class="scrollbar-wrapper" id="menuUl">
-        <el-submenu
+        <component
           v-for="menuModule in menuModules"
+          :is="getMenuType(menuModule)"
           :index="'' + menuModule.id"
           :key="'menuModule' + menuModule.id"
           @click.native="rourteTo(menuModule)"
         >
+          <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length <= 0"></i>
           <template slot="title">
-            <i :class="getMenuClass(menuModule, 1)"></i>
+            <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length > 0"></i>
             <span>{{ getMenuName(menuModule) }}</span>
           </template>
-          <el-menu-item
-            v-for="(router1, index1) in menuModule.children"
+          <component
+            v-for="(router2, index1) in menuModule.children"
+            :is="getMenuType(router2)"
             :key="index1"
-            :index="'' + router1.id"
-            :class="getMenuClass(router1, 2)"
-            @mouseenter.native="showNav(router1, $event)"
+            :index="'' + router2.id"
+            @mouseenter.native="showNav(router2, $event)"
             @mouseleave.native="showNav()"
-            @click="rourteTo(router1)"
+            @click="rourteTo(router2)"
           >
-            {{ getMenuName(router1) }}
-            <i class="el-icon-caret-right" v-if="router1.children.length > 0" />
-          </el-menu-item>
-        </el-submenu>
-        <el-submenu @click.native="openCreateCompanyDialog" index="xx" v-if="isFormDev">
+            <template slot="title">
+              <i :class="getMenuClass(router2, 2)"></i>
+              <span>{{ getMenuName(router2) }}</span>
+            </template>
+            <el-menu-item
+              v-for="(router3, index3) in router2.children"
+              :key="index3"
+              :index="'' + router3.id"
+              @click="rourteTo(router3)"
+            >
+              <template slot="title">
+                <i :class="getMenuClass(router3, 3)"></i>
+                <span>{{ getMenuName(router3) }}</span>
+              </template>
+            </el-menu-item>
+          </component>
+        </component>
+        <el-menu-item
+          @click.native="openCreateCompanyDialog"
+          index="xx"
+          v-if="isFormDev"
+        >
           <template slot="title">
             <i :class="getMenuClass({}, 1)"></i>
             <span>新建企业</span>
           </template>
-        </el-submenu>
+        </el-menu-item>
       </el-scrollbar>
     </el-menu>
     <div class="menu-btn">
@@ -264,11 +294,13 @@ import extractedCodeCreateDialog from "../extractedCode/createDialog.vue";
 import extractedCodeQueryDialog from "../extractedCode/queryDialog.vue";
 import { getBdFlag } from "@base/api/user";
 import createCompanyDialog from "@base/layout/components/createCompany/createCompanyDialog.vue";
-import { getLogicParamValue } from "@base/api/user";
 
 export default {
   props: {
     option: Object,
+    isMenu: {
+      type: Boolean,
+    },
   },
   components: {
     userInfo,
@@ -313,7 +345,6 @@ export default {
       showExtractedCodeQueryDialog: false,
       isDev: false,
       showCreateCompanyDialog: false,
-      workflowManageRoute: "",
     };
   },
   computed: {
@@ -369,22 +400,14 @@ export default {
     initPddLog(); //初始化拼多多日志
     this.initIsFormDev();
     this.getBdEnv();
-    //初始化流程待办路由
-    this.initWorkflowManageRoute();
   },
   methods: {
-    initWorkflowManageRoute() {
-      //初始化流程待办路由
-      getLogicParamValue({
-        data: { paramCode: "workflowManageRoute" },
-        success: (res) => {
-          let value = res?.objx;
-          this.workflowManageRoute = value || "/basic/wf/wf_manage/list";
-        },
-      });
-    },
-    toWorkflowManage() {
-      this.$router.push(this.workflowManageRoute);
+    getMenuType(item) {
+      if (item.children && item.children.length > 0) {
+        return "el-submenu";
+      } else {
+        return "el-menu-item";
+      }
     },
     getBdEnv() {
       getBdFlag({
@@ -449,7 +472,10 @@ export default {
       if (match) {
         const customReqUrl = decodeURIComponent(match[1]);
         // 移除匹配到的参数部分
-        const newUrl = url.replace(match[0], match[0].startsWith("?") ? "?" : "");
+        const newUrl = url.replace(
+          match[0],
+          match[0].startsWith("?") ? "?" : ""
+        );
 
         return {
           custom_req_url: customReqUrl,
@@ -615,7 +641,9 @@ export default {
     // 异步树叶子节点懒加载逻辑
     loadNode(node, resolve) {
       let companyCode =
-        node && node.data && node.data.companyCode ? node.data.companyCode || "" : "";
+        node && node.data && node.data.companyCode
+          ? node.data.companyCode || ""
+          : "";
       let url = !companyCode
         ? USER_PREFIX + "/user_company_info/getAllList"
         : USER_PREFIX + "/user_company_info/getChildren";
@@ -632,7 +660,6 @@ export default {
           datas.forEach((item) => {
             item.leaf = !item.hasChild;
             let label = this.$t1(item.companyName);
-
             /*if(companyCode){
               label = label + '('+companyTypeMap[item.companyType]+')'
             }*/
@@ -744,6 +771,7 @@ export default {
       this.showUserInfoDialog = true;
     },
     showNav(route, event) {
+      if (!this.isMenu) return;
       let id = route && route.id ? route.id : null;
       if (id != null) {
         if (!route.children || !route.children.length) {
@@ -756,7 +784,7 @@ export default {
           let dom = event.target;
           let domAttr = dom.getBoundingClientRect();
           // var sh1 = dom.offsetTop;
-          var sh1 = domAttr.top;
+          var sh1 = domAttr.top + 5;
           let $snav = this.$refs["seconMenus" + id][0];
           let snavAttr = $snav.getBoundingClientRect();
 
@@ -769,10 +797,11 @@ export default {
           if (sh >= 0) {
             $snav.style["margin-top"] = sh1 + "px";
           } else if (sh < 0) {
-            let bd = sh1 + sh;
+            let bd = sh1 + sh ;
 
             $snav.style["margin-top"] = bd + "px";
-            $snav.querySelector(".ico-arrow").style["margin-top"] = sh1 - bd + "px";
+            $snav.querySelector(".ico-arrow").style["margin-top"] =
+              sh1 - bd + "px";
           }
         });
       } else {
@@ -905,6 +934,7 @@ export default {
       line-height: 16px;
       overflow: hidden;
       vertical-align: middle;
+      white-space: nowrap;
     }
 
     &.name {
@@ -929,6 +959,11 @@ export default {
 
   p {
     margin: 0;
+    display: -webkit-box;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
   }
 }
 
@@ -1022,66 +1057,135 @@ export default {
     position: relative;
     background-color: rgba(0, 0, 0, 0.2);
     word-break: break-word;
-
-    .el-submenu {
-      overflow: hidden; //有点电脑分辨率问题
-      .el-submenu__title {
-        padding: 0 11px !important;
-        height: 48px;
-        line-height: 48px;
-
-        i {
-          color: #fff;
-          font-size: 13px;
-          margin-right: 0;
-          width: 18px;
-
-          &.iconfont {
-            margin-right: 5px;
-            font-size: 19px;
-            float: left;
+    .el-scrollbar__view >{
+      .el-menu-item{padding:0 11px !important;
+        span{font-size:14px;}
+      }
+      .el-submenu > .el-submenu__title{padding:0 11px !important;
+        span{font-size:14px;}
+        ~ .el-menu{
+          padding:5px 0;display: grid;
+          > .el-menu-item{
+             span{line-height:1.4;height: 26px;}
           }
-
-          &.el-submenu__icon-arrow {
-            right: 3px;
-            text-align: center;
-            font-size: 12px;
-            margin-top: -5px;
-            display: none;
+          .el-submenu.is-opened .el-submenu__title{background-color:#FFF;opacity:1;
+            span{color:$baseColor;}
+            i.iconfont{color:$baseColor}
           }
         }
 
-        > span {
-          height: 48px;
-          display: table-cell;
-          width: 114px;
-          vertical-align: middle;
-          font-size: 13px;
-          white-space: normal;
-          line-height: 16px;
+      }
+    }
+    .el-submenu__title,.el-menu-item {
+      padding: 0 11px;
+      height: 48px;
+      line-height: 48px;
+      &:hover,&.is-active{background-color:rgba(0, 0, 0, 0.29)}
+      i {
+        color: #fff;
+        font-size: 13px;
+        margin-right: 0;
+        width: 18px;
+
+        &.iconfont {
+          margin-right: 5px;
+          font-size: 19px;
+          float: left;
+        }
+
+        &.el-submenu__icon-arrow {
+          right: 3px;
+          text-align: center;
+          font-size: 12px;
+          margin-top: -5px;
+          display: none;
         }
       }
 
+      > span {
+        height: 48px;
+        display: table-cell;
+        width: 114px;
+        vertical-align: middle;
+        font-size: 13px;
+        white-space: normal;
+        line-height: 16px;
+      }
+    }
+
+    .el-submenu {
+      overflow: hidden; //有点电脑分辨率问题
+
       &.is-opened .el-submenu__title {
         //background-color: rgba(27, 66, 97) !important;
       }
+      .el-submenu .el-menu{display:none}
     }
 
     .el-submenu {
+      &.is-opened{
+        > .el-submenu__title{background-color:rgba(0, 0, 0, 0.29)}
+      }
       .el-menu {
-        background: rgba(0, 0, 0, 0.35) !important;
+        background: rgba(0, 0, 0, 0.35);
         box-shadow: 0px -5px 8px #00000014 inset;
         //padding:4px 0;
+        .el-submenu__title{
+          height: auto;
+          line-height: 1.4;
+          font-size: 12px;
+          opacity: 0.8;
+          margin: 5px 0 5px 14px;
+          padding: 7px 2px 7px 33px !important;
+          border-radius: 8px;
+          text-align: left;
+          min-width: 81px;
+          white-space: normal;
+          margin-right: 10px;
+          word-break: break-word;
+          i.iconfont {
+            position: absolute;
+            top: 50%;
+            height: 20px;
+            margin-top: -10px;
+            line-height: 20px;
+            left: 7px;
+            font-size: 18px;
+          }
+
+          [class^="el-icon-"] {
+            font-size: 12px;
+            color: #fff;
+            position: absolute;
+            right: 2px;
+            top: 50%;
+            margin-top: -5px;
+            width: 14px;
+            zoom: 0.8;
+            display: none;
+          }
+          span{height:auto;text-align: left !important;}
+          &:hover,
+          &.on {
+            opacity: 1;
+            background-color: #fbfdfe !important;
+            color: $baseColor !important;
+            i.iconfont{color:$baseColor}
+            .el-icon-arrow-right {
+              color: $baseColor;
+            }
+          }
+        }
       }
 
-      .el-menu-item {
+      .el-menu-item{
         height: auto;
         line-height: 1.4;
         padding-left: 33px !important;
         font-size: 12px;
         opacity: 0.8;
-        margin: 10px 0 10px 14px;
-        padding: 7px 2px 7px 0px;
+        margin: 5px 0 5px 14px;
+        padding: 2px 2px 2px 0px;
         border-radius: 8px;
         text-align: left;
         min-width: 81px !important;
@@ -1089,7 +1193,7 @@ export default {
         margin-right: 10px;
         word-break: break-word;
 
-        &:before {
+        i.iconfont {
           position: absolute;
           top: 50%;
           height: 20px;
@@ -1097,6 +1201,7 @@ export default {
           line-height: 20px;
           left: 7px;
           font-size: 18px;
+          color:#D0D6DB;
         }
 
         [class^="el-icon-"] {
@@ -1109,6 +1214,7 @@ export default {
           width: 14px;
           zoom: 0.8;
           display: none;
+
         }
 
         &:hover,
@@ -1117,7 +1223,7 @@ export default {
           background-color: #fbfdfe !important;
           color: $baseColor !important;
 
-          .el-icon-arrow-right {
+          .el-icon-arrow-right,i.iconfont {
             color: $baseColor;
           }
         }
@@ -1130,7 +1236,6 @@ export default {
       .el-submenu {
         .el-submenu__title {
           > span {
-            font-size: 14px;
             text-align: center;
           }
 
@@ -1438,8 +1543,62 @@ export default {
     }
   }
 }
-
 // .el-submenu .el-menu {
 //   height: auto !important;
 // }
+.el-menu--vertical{
+   > .el-menu--popup{overflow: hidden;
+      .el-submenu__title, .el-menu-item{
+        height: auto !important;
+        line-height: 1.4 !important;
+        padding: 8px 0;
+        text-align: left;
+        white-space: normal;
+        word-break: break-word;
+        background:none;
+        i.iconfont{color:#FFF;margin-right:8px;}
+      }
+   }
+  .el-submenu{
+    .el-submenu__title{
+      .el-submenu__icon-arrow{display:none}
+    }
+    &:hover{
+      .el-submenu__title{
+        background-color: rgba(0, 0, 0, 0.29) !important;
+        i.iconfont{color:$baseColor}
+      }
+    }
+
+    &.is-opened{
+      .el-submenu__title{
+        background-color: rgba(0, 0, 0, 0.29) !important;
+        i.iconfont{color:$baseColor}
+      }
+    }
+  }
+  .el-menu-item{
+    &:hover{
+        background-color: rgba(0, 0, 0, 0.29) !important;
+        i.iconfont{color:$baseColor}
+    }
+
+    &.is-opened{
+        background-color: rgba(0, 0, 0, 0.29) !important;
+        i.iconfont{color:$baseColor}
+    }
+  }
+  // .el-menu-item{
+  //   &:hover{
+  //     background:#FFF !important;opacity:1;
+  //     span{color:$baseColor}
+  //     i.iconfont{color:$baseColor}
+  //   }
+  //   &.is-opened{
+  //     background:#FFF;opacity:1;
+  //     span{color:$baseColor}
+  //     i.iconfont{color:$baseColor}
+  //   }
+  // }
+}
 </style>

package/src/layout/components/Sidebar/index.vue

@@ -1,10 +1,15 @@
 <template>
-  <defaultView></defaultView>
+  <defaultView :isMenu.sync="isMenu"></defaultView>
 </template>
 
 <script>
 import defaultView from "./default.vue";
 export default {
+  props: {
+    isMenu: {
+      type: Boolean
+    }
+  },
   data() {
     return {};
   },

package/src/layout/components/TagsView/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div id="tags-view-container" class="navbar-tag">
+    <div @click="$baseEventBus.$emit('triggerMenu')" class="telescopMenuIcon"><i class="iconfont" :class="isMenu?'icon-shouqi':'icon-shouqi-copy'"></i></div>
     <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
       <router-link
         v-for="tag in visitedViews"
@@ -15,7 +16,8 @@
         <i class="el-icon-s-home" v-if="tag.name =='home'"></i>
         {{ getMenuName(tag) }}
 
-        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)"/>
+        <span v-if="!!tag.meta.user_affix" class="el-icon-close is-disabled"/>
+        <span v-else-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)"/>
       </router-link>
     </scroll-pane>
     <div class="tags-operBox">
@@ -27,12 +29,25 @@
         <i class="el-icon-arrow-right" ayadmin-event="rightPage"
            one-link-mark="yes" @click="$refs.scrollPane.handleScrollRight()"/>
       </el-tooltip>
-      <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('刷新')" placement="bottom">
+      <el-dropdown >
+        <span class="el-dropdown-link" style="padding-right:10px;padding-left:4px;">
+          <i class="el-icon-more el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item @click.native="refreshSelectedTag($route)" :disabled="getIsLock()">
+            <i class="el-icon-refresh"/><span>{{ $t1('刷新') }}</span>
+          </el-dropdown-item>
+          <el-dropdown-item @click.native="closeAllTags(selectedTag)">
+            <i class="el-icon-close"/><span>{{ $t1('全部关闭') }}</span>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+      <!-- <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('刷新')" placement="bottom">
         <i class="el-icon-refresh" @click="refreshSelectedTag($route)"/>
       </el-tooltip>
       <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('全部关闭')" placement="bottom">
         <i class="el-icon-close" @click="closeAllTags(selectedTag)"/>
-      </el-tooltip>
+      </el-tooltip> -->
     </div>
     <!-- <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
@@ -49,6 +64,11 @@ import path from 'path'
 
 export default {
   components: {ScrollPane},
+  props: {
+    isMenu: {
+      type: Boolean
+    }
+  },
   data() {
     return {
       visible: false,
@@ -86,8 +106,8 @@ export default {
   methods: {
     getMenuName(item) {
       let locale = this.$i18n?.locale;
-      let zhTitle = (item.meta ? item.meta.title : '');
-      let enTitle = (item.meta ? item.meta.enTitle : '');
+      let zhTitle = item.meta?.title || "";
+      let enTitle = item.meta?.enTitle || '';
       let title;
       if (locale == "en") {
         title = enTitle || zhTitle;
@@ -178,6 +198,7 @@ export default {
       } */
     },
     closeSelectedTag(view) {
+      if(view.meta.user_affix)return
       this.$store.dispatch('tagsView/delView', view).then(({visitedViews}) => {
         if (this.isActive(view)) {
           this.toLastView(visitedViews, view)
@@ -191,11 +212,13 @@ export default {
       })
     },
     closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({visitedViews}) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
+      this.$baseConfirm(this.$t1('您确定要全部关闭吗？')).then(() => {
+        this.$store.dispatch('tagsView/delAllViews').then(({visitedViews}) => {
+          if (this.affixTags.some(tag => tag.path === view.path)) {
+            return
+          }
+          this.toLastView(visitedViews, view)
+        })
       })
     },
     toLastView(visitedViews, view) {
@@ -235,7 +258,13 @@ export default {
     },
     handleScroll() {
       this.closeMenu()
-    }
+    },
+    getIsLock() {
+      let path = this.$route.path;
+      let visitedViews = this.$store.state.tagsView.visitedViews
+      let currentItem = visitedViews.find(item => item.path == path)
+      return !!currentItem?.meta?.user_affix;
+    },
   }
 }
 </script>
@@ -249,6 +278,9 @@ export default {
 </style>
 <style lang="scss">
 //reset element css of el-icon-close
+span.el-icon-close.is-disabled{
+  cursor: not-allowed;
+}
 .tags-view-wrapper {
   .tags-view-item {
     .el-icon-close {