mooho-base-admin-plus 2.0.39 → 2.0.41

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.0.39",
+  "version": "2.0.41",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/public/setting.js

@@ -64,7 +64,7 @@ window.setting = {
     // 全局面包屑是否显示图标，开启 showBreadcrumb 时有效
     showBreadcrumbIcon: false,
     // 是否显示多语言
-    showI18n: true,
+    showI18n: false,
     // 是否支持动态修改布局配置，移动端下会自动强制关闭
     enableSetting: false,
     // 退出登录时，是否二次确认

package/src/layouts/basic-layout/menu-side/index.vue

@@ -19,10 +19,10 @@
       :open-names="openNames"
       width="auto"
     >
-      <template v-for="(item, index) in filterSider">
+      <template v-for="(item, index) in filterSider" :key="index">
         <template v-if="!menuCollapse">
           <i-menu-side-item v-if="item.children == null || !item.children.length" :menu="item" :key="index" />
-          <i-menu-side-submenu v-else :menu="item" :key="'submenu' + index" />
+          <i-menu-side-submenu v-else :menu="item" />
         </template>
         <template v-else>
           <Tooltip
@@ -34,7 +34,7 @@
           >
             <i-menu-side-item class="i-layout-menu-side-collapse-top-item" :menu="item" hide-title />
           </Tooltip>
-          <i-menu-side-collapse v-else :menu="item" top-level :key="'collapse' + index" />
+          <i-menu-side-collapse v-else :menu="item" top-level />
         </template>
       </template>
     </Menu>

package/src/layouts/basic-layout/menu-side/menu-collapse.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dropdown :transfer="true" boundaries-element="viewport" placement="right-start" :class="dropdownClasses">
+  <Dropdown boundaries-element="viewport" placement="right-start" :class="dropdownClasses">
     <li :class="menuItemClasses" v-if="topLevel">
       <i-menu-side-title :menu="menu" hide-title collapse />
     </li>
@@ -12,13 +12,13 @@
         <div class="i-layout-menu-side-collapse-title" v-if="showCollapseMenuTitle">
           <i-menu-side-title :menu="menu" collapse />
         </div>
-        <template v-for="(item, index) in menu.children">
-          <i-link :to="item.path" :target="item.target" v-if="item.children === undefined || !item.children.length" :key="index" @click="handleClick(item.path)">
+        <template v-for="(item, index) in menu.children" :key="index">
+          <i-link :to="item.path" :target="item.target" v-if="item.children == null || !item.children.length" @click="handleClick(item.path)">
             <DropdownItem :divided="item.divided" :class="{ 'i-layout-menu-side-collapse-item-selected': item.path === activePath }">
               <i-menu-side-title :menu="item" collapse />
             </DropdownItem>
           </i-link>
-          <i-menu-side-collapse v-else :menu="item" :key="'collapse-' + index" />
+          <i-menu-side-collapse v-else :menu="item" />
         </template>
       </DropdownMenu>
     </template>

package/src/setting.js

@@ -1,3 +1,5 @@
+import { assign } from 'lodash';
+
 /**
  * 默认配置
  * */
@@ -176,23 +178,23 @@ const Setting = {
   sameRouteForceUpdate: false
 };
 
-const copyTo = (source, target) => {
-  for (let key in source) {
-    if (typeof source[key] === 'object') {
-      if (target[key] == null) {
-        target[key] = {};
-      }
-      copyTo(source[key], target[key]);
-    } else {
-      target[key] = source[key];
-    }
-  }
-};
+// const copyTo = (source, target) => {
+//   for (let key in source) {
+//     if (typeof source[key] === 'object') {
+//       if (target[key] == null) {
+//         target[key] = {};
+//       }
+//       copyTo(source[key], target[key]);
+//     } else {
+//       target[key] = source[key];
+//     }
+//   }
+// };
 
 let localSetting = window.setting;
 
 if (localSetting) {
-  copyTo(localSetting, Setting);
+  assign(Setting, localSetting);
 }
 
 export default Setting;

package/vite.config.js

@@ -68,7 +68,8 @@ const lib = defineConfig({
   },
   resolve: {
     alias: {
-      '@': resolve(__dirname, '.', 'src')
+      '@': resolve(__dirname, '.', 'src'),
+      'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js'
     }
     // extensions: ['.js', '.json', '.vue']
   }