Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"devDependencies": {
"@bitjson/npm-scripts-info": "^1.0.0",
"@types/inquirer": "^9.0.3",
"@types/node": "^12.6.8",
"@types/node": "^14.18.63",
"ava": "2.2.0",
"codecov": "^3.5.0",
"cz-conventional-changelog": "^2.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/toolkits/pro/src/lib/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ const createDatabase = async (answers: ProjectInfo) => {
const connection = await mysql.createConnection({
host,
port,
user: username,
password,
user: username,
multipleStatements: true,
});

Expand Down Expand Up @@ -376,7 +376,7 @@ export default async () => {
await createDatabase(projectInfo);
} catch (e) {
log.error(
'数据库初始化失败,请确认数据库配置信息正确并手动初始化数据库' + e
`数据库初始化失败,请确认数据库配置信息正确并手动初始化数据库${e}`
);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/toolkits/pro/template/tinyvue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"dependencies": {
"@opentiny/hwc-client": "^0.0.14",
"@opentiny/vue": "^3.6.8",
"@opentiny/vue": "^3.11.1",
"@types/mockjs": "^1.0.4",
"@vueuse/core": "^7.3.0",
"@vueuse/head": "^0.7.9",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// 解决切换闪动
:deep(.tiny-tree-menu .tiny-tree .tree-node-name) {
border-left: 2px solid transparent;
border-left: 2px solid transparent !important;
}

// 主标题点击后显示背景色
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@
height: 1.3em;
}
}

:deep(.tiny-tree-node__wrapper > .is-current > .tiny-tree-node__content) {
color: #000 !important;
background: none !important;
Expand All @@ -306,6 +307,7 @@
color: #fff !important;
}
}

:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
> .tiny-tree-node__wrapper > .is-current > .tiny-tree-node__content
) {
Expand All @@ -315,9 +317,55 @@
background: var(--ti-tree-menu-node-hover-bg-color) !important;
}
}

:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
.tiny-tree-node__wrapper .is-current .tiny-tree-node__content .tree-node-name) {
border-left: 2px solid var(--ti-tree-menu-square-left-border-color, '#fff') !important;
}

:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
.tiny-tree-node__wrapper .is-current .tiny-tree-node__content .tiny-tree-node__content-right) {
background-color: var(--ti-tree-menu-node-hover-bg-color) !important;
}

:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
.tiny-tree-node__wrapper .is-current .tiny-tree-node__content .tiny-tree-node__content-left
.tiny-tree-node__content-box) {
background-color: var(--ti-tree-menu-node-hover-bg-color) !important;
}

:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
.tiny-tree-node__wrapper .is-current .tiny-tree-node__content .tiny-tree-node__content-left
.tiny-tree-node__content-box:before) {
display: none !important;
}

:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
.tiny-tree-node__wrapper .is-current .tiny-tree-node__content .tiny-tree-node__content-left:before) {
display: none !important;
}

:deep(.tiny-tree-node__wrapper > .is-current > .tiny-tree-node__content) {
background-color: #fff !important;
}

:deep(.tiny-tree-node__wrapper > .is-current > .tiny-tree-node__content .tiny-tree-node__content-box) {
background-color: #fff !important;
}

:deep(.tiny-tree-node__content:hover) {
background-color: var(--ti-tree-node-content-hover-bg-color) !important;
}

:deep(.tiny-tree-menu__wrap > .tiny-tree-node__wrapper > .is-root > .tiny-tree-node__content
> .tiny-tree-node__content-left .tiny-tree-node__content-box .tree-node-name) {
padding: 0 8px !important;
}

:deep(.tiny-tree-node > .tiny-tree-node__content) {
margin-left: 0 !important;
}

.tiny-tree-menu
.tiny-tree
.tiny-tree-node.is-current
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
// 路由子菜单选中后的样式
:deep(.tiny-tree-node__children .tiny-tree-node__content) {
.tree-node-name {
margin-left: 60px !important;
margin-left: 28px !important;
padding-left: 6px !important;
}
}
Expand Down