Merge remote-tracking branch 'origin/branch20241月中旬'

src/components/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "anticon-jeecg"; /* Project id 2798517 */
-  src: url('iconfont.woff2?t=1631613073967') format('woff2'),
-       url('iconfont.woff?t=1631613073967') format('woff'),
-       url('iconfont.ttf?t=1631613073967') format('truetype');
+  src: url('iconfont.woff2?t=1705570227820') format('woff2'),
+       url('iconfont.woff?t=1705570227820') format('woff'),
+       url('iconfont.ttf?t=1705570227820') format('truetype');
 }
 
 .anticon-jeecg {
@@ -13,6 +13,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.anticondraftgroup:before {
+  content: "\e65e";
+}
+
+.anticonothermeeting:before {
+  content: "\e621";
+}
+
+.anticonworking:before {
+  content: "\e61f";
+}
+
+.anticoninternational:before {
+  content: "\e61e";
+}
+
+.anticondatamembers:before {
+  content: "\e61d";
+}
+
+.anticoncommittee:before {
+  content: "\e613";
+}
+
 .anticonmeeting:before {
   content: "\e60f";
 }

src/components/iconfont/iconfont.json

@@ -5,6 +5,48 @@
   "css_prefix_text": "anticon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "3009589",
+      "name": "cus_draftgroup",
+      "font_class": "gongzuopai",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "26512409",
+      "name": "cue_othermeeting",
+      "font_class": "othermeeting",
+      "unicode": "e621",
+      "unicode_decimal": 58913
+    },
+    {
+      "icon_id": "26512248",
+      "name": "cus_working",
+      "font_class": "working",
+      "unicode": "e61f",
+      "unicode_decimal": 58911
+    },
+    {
+      "icon_id": "26512241",
+      "name": "cus_international",
+      "font_class": "international",
+      "unicode": "e61e",
+      "unicode_decimal": 58910
+    },
+    {
+      "icon_id": "26512231",
+      "name": "cus_datamembers",
+      "font_class": "datamembers",
+      "unicode": "e61d",
+      "unicode_decimal": 58909
+    },
+    {
+      "icon_id": "26511116",
+      "name": "cus_committee",
+      "font_class": "committee",
+      "unicode": "e613",
+      "unicode_decimal": 58899
+    },
     {
       "icon_id": "24340808",
       "name": "cus_meeting",

src/components/menu/SideMenu.vue

@@ -175,11 +175,5 @@ export default {
     }
   }
 }
-// icon图片默认是选中的图片，如果没被选中，就设置灰掉
-.ant-menu-item:not(.ant-menu-item-selected) {
-  .icon-img {
-    filter: grayscale(100%);
-  }
-}
 </style>
 <!-- update_end author:sunjianlei date:20190530 for: 选中首页的时候不显示背景颜色 -->

src/components/menu/index.js

@@ -147,13 +147,6 @@ export default {
       )
     },
     renderIcon (icon) {
-      // 图片做菜单icon，cus_img_xxx.png, xxx-act.png放在assets/imgs/icon/
-      // (act是激活后的图片，未激活时通过样式置灰)
-      if (icon !== 'none' && icon !== undefined && icon.indexOf('cus_img_') !== -1) {
-        const img = require('@/assets/imgs/icon/' + icon.substr(8) + '_act.png')
-        return (<img style="width:16px;height:16px;user-select:none;margin-right:8px;vertical-align:sub;"
-                     src={img} alt="" class="icon-img"/>)
-      }
       if (icon !== 'none' && icon !== undefined && icon.indexOf('cus_') !== -1) {
         let className = `anticon-jeecg anticon${icon.substr(4)}`
         return <i class={className} style='margin-right: 8px'></i>

src/components/page/GlobalLayout.vue

@@ -696,4 +696,11 @@ body {
     }
   }
 }
+
+// 自定义图标收小隐藏文字
+.ant-menu-inline-collapsed {
+  .anticon-jeecg + span {
+    opacity: 0!important;
+  }
+}
 </style>

src/components/tools/Logo.vue

@@ -3,8 +3,8 @@
     <router-link :to="{name:'dashboard'}">
 
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-      <img v-if="navTheme === 'dark'" src="~@/assets/logo.png" alt="logo">
-      <img v-else src="~@/assets/logo.png" alt="logo">
+      <img v-if="navTheme === 'dark'" src="~@/assets/logo.png" alt="logo" :class='smallImg ? "smallImg": ""'>
+      <img v-else src="~@/assets/logo.png" alt="logo" :class='smallImg ? "smallImg": ""'>
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
 
       <h1 v-if="showTitle">{{ title }}</h1>
@@ -29,6 +29,16 @@
         default: true,
         required: false
       }
+    },
+    data() {
+      return {
+        smallImg: false
+      }
+    },
+    watch: {
+      sidebarOpened(val) {
+        this.smallImg = !val
+      }
     }
   }
 </script>
@@ -55,5 +65,8 @@
     &.light .logo {
       background-color: @primary-color;
     }
+    .smallImg {
+      height: 16px;
+    }
   }
 </style>

src/config/router.config.js

@@ -139,7 +139,7 @@ export const routerData = [
     component: 'draftTeam/DraftTeam',
     route: '1',
     meta: {
-      icon: 'cus_img_icon_drafting_group', // 菜单前图标
+      icon: 'cus_draftgroup', // 菜单前图标
       componentName: 'DraftTeam',
       keepAlive: false,
       title: '起草组' // 菜单名称