diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue index be3a573a..f6784710 100644 --- a/src/components/ThemePicker/index.vue +++ b/src/components/ThemePicker/index.vue @@ -1,6 +1,7 @@ <template> <el-color-picker v-model="theme" + :predefine="['#409EFF', '#11a983', '#13c2c2', '#6959CD', '#f5222d', '#eb2f96', '#DB7093', '#e6a23c', '#8B8989', '#212121']" class="theme-picker" popper-class="theme-picker-dropdown" /> diff --git a/src/utils/index.js b/src/utils/index.js index ebe58ff8..1df0f45d 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -274,7 +274,7 @@ export function debounce(func, wait, immediate) { */ export function deepClone(source) { if (!source && typeof source !== 'object') { - throw new Error('error arguments', 'shallowClone') + throw new Error('error arguments', 'deepClone') } const targetObj = source.constructor === Array ? [] : {} Object.keys(source).forEach(keys => { diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue index 9664ffb6..42c167fa 100644 --- a/src/views/layout/components/Sidebar/SidebarItem.vue +++ b/src/views/layout/components/Sidebar/SidebarItem.vue @@ -2,9 +2,9 @@ <div v-if="!item.hidden" class="menu-wrapper"> <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow"> - <app-link :to="resolvePath(onlyOneChild.path)"> + <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)"> <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}"> - <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="generateTitle(onlyOneChild.meta.title)" /> + <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="generateTitle(onlyOneChild.meta.title)" /> </el-menu-item> </app-link> </template>