cloud-web-corejs 1.0.54-dev.650 → 1.0.54-dev.651

package/package.json

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

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

@@ -45,7 +45,10 @@
           :content="$t1('流程待办')"
           :placement="direction"
         >
-          <i class="iconfont icon-liuchengdaiban" @click="toWorkflowManage()" />
+          <i
+            class="iconfont icon-liuchengdaiban"
+            @click="$router.push('/basic/wf/wf_manage/list')"
+          />
         </el-tooltip>
       </div>
       <div class="item" v-if="isDev && isBdAdmin">
@@ -139,15 +142,9 @@
           :key="'menuModule' + menuModule.id"
           @click.native="rourteTo(menuModule)"
         >
-          <i
-            :class="getMenuClass(menuModule, 1)"
-            v-if="menuModule.children.length <= 0"
-          ></i>
+          <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length <= 0"></i>
           <template slot="title">
-            <i
-              :class="getMenuClass(menuModule, 1)"
-              v-if="menuModule.children.length > 0"
-            ></i>
+            <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length > 0"></i>
             <span>{{ getMenuName(menuModule) }}</span>
           </template>
           <component
@@ -297,7 +294,6 @@ 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: {
@@ -349,7 +345,6 @@ export default {
       showExtractedCodeQueryDialog: false,
       isDev: false,
       showCreateCompanyDialog: false,
-      workflowManageRoute: "",
     };
   },
   computed: {
@@ -405,23 +400,8 @@ 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";
@@ -817,7 +797,7 @@ 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"] =
@@ -1077,34 +1057,30 @@ export default {
     position: relative;
     background-color: rgba(0, 0, 0, 0.2);
     word-break: break-word;
-    .el-scrollbar__view > .el-submenu > .el-submenu__title {
-      padding: 0 11px !important;
-      span {
-        font-size: 14px;
+    .el-scrollbar__view >{
+      .el-menu-item{padding:0 11px !important;
+        span{font-size:14px;}
       }
-      ~ .el-menu {
-        padding: 5px 0;
-        .el-submenu.is-opened .el-submenu__title {
-          background-color: #fff;
-          opacity: 1;
-          span {
-            color: $baseColor;
+      .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;}
           }
-          i.iconfont {
-            color: $baseColor;
+          .el-submenu.is-opened .el-submenu__title{background-color:#FFF;opacity:1;
+            span{color:$baseColor;}
+            i.iconfont{color:$baseColor}
           }
         }
+
       }
     }
-    .el-submenu__title,
-    .el-menu-item {
+    .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);
-      }
+      &:hover,&.is-active{background-color:rgba(0, 0, 0, 0.29)}
       i {
         color: #fff;
         font-size: 13px;
@@ -1143,22 +1119,18 @@ export default {
       &.is-opened .el-submenu__title {
         //background-color: rgba(27, 66, 97) !important;
       }
-      .el-submenu .el-menu {
-        display: none;
-      }
+      .el-submenu .el-menu{display:none}
     }
 
     .el-submenu {
-      &.is-opened {
-        > .el-submenu__title {
-          background-color: rgba(0, 0, 0, 0.29);
-        }
+      &.is-opened{
+        > .el-submenu__title{background-color:rgba(0, 0, 0, 0.29)}
       }
       .el-menu {
         background: rgba(0, 0, 0, 0.35);
         box-shadow: 0px -5px 8px #00000014 inset;
         //padding:4px 0;
-        .el-submenu__title {
+        .el-submenu__title{
           height: auto;
           line-height: 1.4;
           font-size: 12px;
@@ -1192,18 +1164,13 @@ export default {
             zoom: 0.8;
             display: none;
           }
-          span {
-            height: auto;
-            text-align: left !important;
-          }
+          span{height:auto;text-align: left !important;}
           &:hover,
           &.on {
             opacity: 1;
             background-color: #fbfdfe !important;
             color: $baseColor !important;
-            i.iconfont {
-              color: $baseColor;
-            }
+            i.iconfont{color:$baseColor}
             .el-icon-arrow-right {
               color: $baseColor;
             }
@@ -1211,14 +1178,14 @@ export default {
         }
       }
 
-      .el-menu-item {
+      .el-menu-item{
         height: auto;
         line-height: 1.4;
         padding-left: 33px !important;
         font-size: 12px;
         opacity: 0.8;
         margin: 5px 0 5px 14px;
-        padding: 7px 2px 7px 0px;
+        padding: 2px 2px 2px 0px;
         border-radius: 8px;
         text-align: left;
         min-width: 81px !important;
@@ -1234,7 +1201,7 @@ export default {
           line-height: 20px;
           left: 7px;
           font-size: 18px;
-          color: #d0d6db;
+          color:#D0D6DB;
         }
 
         [class^="el-icon-"] {
@@ -1247,6 +1214,7 @@ export default {
           width: 14px;
           zoom: 0.8;
           display: none;
+
         }
 
         &:hover,
@@ -1255,8 +1223,7 @@ export default {
           background-color: #fbfdfe !important;
           color: $baseColor !important;
 
-          .el-icon-arrow-right,
-          i.iconfont {
+          .el-icon-arrow-right,i.iconfont {
             color: $baseColor;
           }
         }
@@ -1579,82 +1546,59 @@ 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;
-      opacity: 0.8;
-      margin: 5px 0 5px 14px;
-      padding: 7px 2px 7px 12px !important;
-      border-radius: 8px;
-      text-align: left;
-      min-width: 81px !important;
-      white-space: normal;
-      margin-right: 10px;
-      word-break: break-word;
-      i.iconfont {
-        color: #fff;
-        margin-right: 8px;
-      }
-    }
-  }
-  .el-submenu {
-    .el-submenu__title {
-      height: 36px;
-      line-height: 36px;
-      .el-submenu__icon-arrow {
-        display: none;
+.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: #fff;
-        span {
-          color: #fff;
-        }
-        i.iconfont {
-          color: $baseColor;
-        }
+    &:hover{
+      .el-submenu__title{
+        background-color: rgba(0, 0, 0, 0.29) !important;
+        i.iconfont{color:$baseColor}
       }
     }
 
-    &.is-opened {
-      .el-submenu__title {
-        background-color: #fff;
-        opacity: 1;
-        span {
-          color: $baseColor;
-        }
-        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: #fff !important;
-      opacity: 1;
-      span {
-        color: $baseColor;
-      }
-      i.iconfont {
-        color: $baseColor;
-      }
+  .el-menu-item{
+    &:hover{
+        background-color: rgba(0, 0, 0, 0.29) !important;
+        i.iconfont{color:$baseColor}
     }
-    &.is-opened {
-      background: #fff;
-      opacity: 1;
-      span {
-        color: $baseColor;
-      }
-      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>