Skip to content

fix: Pro套件启动报错, 菜单优化, 国际化词条未生效 #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fengyon merged 11 commits into from
Sep 8, 2023
Merged

fix: Pro套件启动报错, 菜单优化, 国际化词条未生效 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c480b3c
同步主题配置
wjiangwang Aug 8, 2023
9471d1e
控制菜单显隐属性添加
jishuai-cool Aug 29, 2023
29061c9
控制菜单显隐属性添加
jishuai-cool Aug 29, 2023
2964ff6
菜单属性显隐控制
jishuai-cool Aug 30, 2023
07ef3e7
菜单属性显隐控制-优化
jishuai-cool Aug 30, 2023
c97b9bd
解决冲突
jishuai-cool Sep 4, 2023
e7a7674
问题单处理
jishuai-cool Sep 7, 2023
fd8d8f6
问题单处理-更新dev
jishuai-cool Sep 7, 2023
ae4ff56
问题单处理
jishuai-cool Sep 7, 2023
1d701ff
问题单处理-检视修改
jishuai-cool Sep 8, 2023
2d351aa
问题单处理-vue-i18n版本升级
jishuai-cool Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/toolkits/pro/template/tinyvue/config/vite.config.base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const config = {
},
{
find: 'vue-i18n',
replacement: 'vue-i18n/dist/vue-i18n.cjs.js', // Resolve the i18n warning issue
replacement: 'vue-i18n/dist/vue-i18n.esm-bundler.js', // Resolve the i18n warning issue
},
{
find: 'vue',
Expand Down
2 changes: 1 addition & 1 deletion packages/toolkits/pro/template/tinyvue/config/vite.config.preview.base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default defineConfig({
},
{
find: 'vue-i18n',
replacement: 'vue-i18n/dist/vue-i18n.cjs.js', // Resolve the i18n warning issue
replacement: 'vue-i18n/dist/vue-i18n.esm-bundler.js', // Resolve the i18n warning issue
},
{
find: 'vue',
Expand Down
2 changes: 1 addition & 1 deletion packages/toolkits/pro/template/tinyvue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"query-string": "^7.0.1",
"vue": "^3.2.31",
"vue-eslint-parser": "^9.1.0",
"vue-i18n": "^9.2.0-beta.17",
"vue-i18n": "^9.3.0",
"vue-router": "^4.0.14"
},
"devDependencies": {
Expand Down
14 changes: 13 additions & 1 deletion packages/toolkits/pro/template/tinyvue/src/components/menu/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@
overflow: hidden;
text-overflow: ellipsis;
word-break: break-all;
color: #000;
}

.title {
Expand All @@ -297,7 +298,18 @@
}
}
:deep(.tiny-tree-node__wrapper > .is-current > .tiny-tree-node__content) {
background: var(--ti-tree-menu-node-hover-bg-color);
color: #000 !important;
background: none !important;
margin-left: 0 !important;
&:hover {
background: #fff !important;
color: #fff !important;
}
}
:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
> .tiny-tree-node__wrapper > .is-current > .tiny-tree-node__content
) {
background-color: var(--ti-tree-menu-node-hover-bg-color) !important;
margin-left: 0 !important;
&:hover {
background: var(--ti-tree-menu-node-hover-bg-color) !important;
Expand Down
4 changes: 3 additions & 1 deletion packages/toolkits/pro/template/tinyvue/src/components/navbar/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
<div class="divider"></div>
</li>
<li @click="changeLan">
<span>{{ i18.locale.value }}</span>
<span v-if="i18.locale.value === 'zhCN'">中文</span>
<span v-else>English</span>
<img src="@/assets/images/lan.png" alt="lan" class="navbar-lan" />
<div v-if="lan" class="trigger-lan">
<li
Expand Down Expand Up @@ -122,6 +123,7 @@

const switchRoles = async () => {
const res = await userStore.switchRoles();

Modal.message({
message: res as string,
status: 'success',
Expand Down