diff --git a/src/components/common-form-control/control-child.vue b/src/components/common-form-control/control-child.vue new file mode 100644 index 0000000..553c9e7 --- /dev/null +++ b/src/components/common-form-control/control-child.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/components/common-form-control/index.vue b/src/components/common-form-control/index.vue index 49e6cd3..9c3a480 100644 --- a/src/components/common-form-control/index.vue +++ b/src/components/common-form-control/index.vue @@ -1,76 +1,102 @@ diff --git a/src/components/index.js b/src/components/index.js index 83ae7d7..ed6fd52 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,4 +1,5 @@ import CommonIcon from '@/components/common-icon/index.vue' +import CommonForm from '@/components/common-form/index.vue' import CommonFormControl from '@/components/common-form-control/index.vue' import CommonMenu from '@/components/common-menu/index.vue' import CommonMenuItem from '@/components/common-menu-item/index.vue' @@ -13,6 +14,7 @@ export default { */ install (Vue) { Vue.component('CommonIcon', CommonIcon) + Vue.component('CommonForm', CommonForm) Vue.component('CommonFormControl', CommonFormControl) Vue.component('CommonMenu', CommonMenu) Vue.component('CommonMenuItem', CommonMenuItem) diff --git a/src/components/utils/index.js b/src/components/utils/index.js index c2283d2..3d9065e 100644 --- a/src/components/utils/index.js +++ b/src/components/utils/index.js @@ -15,9 +15,7 @@ export const MENU_INFO_LIST = ref({}) export const useMenuInfo = item => { const path = item.path if (path !== '/') { - const menuInfo = MENU_INFO_LIST.value[path] - console.info('config menu:', menuInfo) - return menuInfo + return MENU_INFO_LIST.value[path] } } diff --git a/src/services/global/GlobalService.js b/src/services/global/GlobalService.js index d3ea1b9..1516516 100644 --- a/src/services/global/GlobalService.js +++ b/src/services/global/GlobalService.js @@ -40,22 +40,6 @@ export const useBaseTopMenus = () => { icon: 'Setting', click: () => globalConfigStore.changeShowSettings(true) }, - { - icon: 'AutoAwesomeMosaicFilled', - isDropdown: true, - children: [ - { - iconIf: () => globalConfigStore.layoutMode === GlobalLayoutMode.LEFT ? 'check' : '', - labelKey: 'common.label.layoutLeft', - click: () => globalConfigStore.changeLayout(GlobalLayoutMode.LEFT) - }, - { - iconIf: () => globalConfigStore.layoutMode === GlobalLayoutMode.TOP ? 'check' : '', - labelKey: 'common.label.layoutTop', - click: () => globalConfigStore.changeLayout(GlobalLayoutMode.TOP) - } - ] - }, { icon: 'user', isDropdown: true, diff --git a/src/stores/TabsViewStore.js b/src/stores/TabsViewStore.js index b454c8d..d84863c 100644 --- a/src/stores/TabsViewStore.js +++ b/src/stores/TabsViewStore.js @@ -94,21 +94,18 @@ export const useTabsViewStore = defineStore('tabsView', () => { isShowTabIcon, historyTabs, cachedTabs, - changeTabMode () { - isTabMode.value = !isTabMode.value + changeTabMode (val) { + isTabMode.value = val if (!isTabMode.value) { clearHistoryTabs() } }, - changeCachedTabMode () { - isCachedTabMode.value = !isCachedTabMode.value + changeCachedTabMode (val) { + isCachedTabMode.value = val if (!isCachedTabMode.value) { cachedTabs.value = [] } }, - changeShowTabIcon () { - isShowTabIcon.value = !isShowTabIcon.value - }, removeHistoryTab, removeOtherHistoryTabs, clearHistoryTabs, diff --git a/src/views/components/global/GlobalSettings.vue b/src/views/components/global/GlobalSettings.vue index 27090c4..c1dccdf 100644 --- a/src/views/components/global/GlobalSettings.vue +++ b/src/views/components/global/GlobalSettings.vue @@ -1,22 +1,109 @@