diff --git a/src/assets/approve.svg b/src/assets/approve.svg new file mode 100644 index 0000000..5fcb468 --- /dev/null +++ b/src/assets/approve.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 18bc3a3..f4d859a 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -1,3 +1,5 @@ +import { title } from 'process'; + export default { user: { title0: 'Component Size', @@ -7,6 +9,7 @@ export default { title4: 'News', title5: 'Full Screen On', title6: 'Full Screen Off', + title7: 'Approve', titleApp: 'Client', dropdownLarge: 'Large', dropdownDefault: 'Default', @@ -34,7 +37,7 @@ export default { fullscreen: 'Fullscreen', closeFullscreen: 'Close Fullscreen', favorite: 'Favorite', - favoriteMax: 'The number of shortcut navigation exceeds the upper limit. Please remove some shortcuts' + favoriteMax: 'The number of shortcut navigation exceeds the upper limit. Please remove some shortcuts', }, notFound: { foundTitle: 'Wrong Address Input, Please Re-enter the Address~', diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts index 4bd68d7..7137c54 100644 --- a/src/i18n/lang/zh-cn.ts +++ b/src/i18n/lang/zh-cn.ts @@ -1,3 +1,5 @@ +import { title } from 'process'; + // 定义内容 export default { user: { @@ -8,6 +10,7 @@ export default { title4: '消息', title5: '开全屏', title6: '关全屏', + title7: '审批', titleApp: '客户端', dropdownLarge: '大型', dropdownDefault: '默认', @@ -35,7 +38,7 @@ export default { fullscreen: '当前页全屏', closeFullscreen: '关闭全屏', favorite: '收藏', - favoriteMax: '快捷导航数量超过上限,请移除部分' + favoriteMax: '快捷导航数量超过上限,请移除部分', }, notFound: { foundTitle: '地址输入错误,请重新输入地址~', diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue index 9004d12..8b3c4d7 100644 --- a/src/layout/navBars/breadcrumb/user.vue +++ b/src/layout/navBars/breadcrumb/user.vue @@ -1,5 +1,5 @@ - + + + + diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue index f97812e..5f040ba 100644 --- a/src/views/home/widgets/index.vue +++ b/src/views/home/widgets/index.vue @@ -17,7 +17,9 @@ - + + + - + + + + + + + + + + + + + + + + + {{ $t(allComps[element].title) }} + + + + + + @@ -165,13 +200,13 @@ - + @@ -231,6 +266,9 @@ const customizing = ref(false); const widgets = ref(); const widgetsKey = ref('widgets'); const grid = ref(cloneDeep(toValue(defaultGrid))); +// 默认布局是4组 +// const isDefaultLayout = ref(true); +const isDefaultLayout = ref(grid.value.copmsList.length === 4); const allComponentList = computed(() => { const list = []; @@ -294,15 +332,21 @@ const custom = () => { const setLayout = (layout: Array) => { grid.value.layout = layout; - if (layout.join(',') === '24') { - if (grid.value.copmsList[1]) { - grid.value.copmsList[0].push(...grid.value.copmsList[1]); - } - if (grid.value.copmsList[2]) { - grid.value.copmsList[0].push(...grid.value.copmsList[2]); - } - grid.value.copmsList.splice(1, 2); + // 默认布局是4组,非默认布局是3组,所以要合并,不然会丢组件 + if (isDefaultLayout.value && grid.value.copmsList.length === 4) { + grid.value.copmsList[1] = [...grid.value.copmsList[1], ...grid.value.copmsList[3]]; + grid.value.copmsList.splice(3, 1); } + isDefaultLayout.value = false; + // if (layout.join(',') === '24') { + // if (grid.value.copmsList[1]) { + // grid.value.copmsList[0].push(...grid.value.copmsList[1]); + // } + // if (grid.value.copmsList[2]) { + // grid.value.copmsList[0].push(...grid.value.copmsList[2]); + // } + // grid.value.copmsList.splice(1, 2); + // } }; const push = (item: any) => { @@ -320,6 +364,7 @@ const save = () => { }; const backDefault = () => { + isDefaultLayout.value = true; customizing.value = false; widgets.value.style.removeProperty('transform'); grid.value = cloneDeep(toValue(defaultGrid));