Skip to content

Commit 16dde3a

Browse files
authored
fix(toolkits/pro) Upgrading the Ndoe Version, The version release error is rectified;the tinyvue template adapts to the latest version @opentiny/vue (#114)
* fix(toolkits/pro) Upgrading the Ndoe Version, The version release error is rectified;the tinyvue template adapts to the latest version @opentiny/vue
1 parent 9a7a843 commit 16dde3a

File tree

6 files changed

+54
-6
lines changed

6 files changed

+54
-6
lines changed

packages/toolkits/pro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"devDependencies": {
6868
"@bitjson/npm-scripts-info": "^1.0.0",
6969
"@types/inquirer": "^9.0.3",
70-
"@types/node": "^12.6.8",
70+
"@types/node": "^14.18.63",
7171
"ava": "2.2.0",
7272
"codecov": "^3.5.0",
7373
"cz-conventional-changelog": "^2.1.0",

packages/toolkits/pro/src/lib/init.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ const createDatabase = async (answers: ProjectInfo) => {
148148
const connection = await mysql.createConnection({
149149
host,
150150
port,
151-
user: username,
152151
password,
152+
user: username,
153153
multipleStatements: true,
154154
});
155155

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

packages/toolkits/pro/template/tinyvue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"dependencies": {
3131
"@opentiny/hwc-client": "^0.0.14",
32-
"@opentiny/vue": "^3.6.8",
32+
"@opentiny/vue": "^3.11.1",
3333
"@types/mockjs": "^1.0.4",
3434
"@vueuse/core": "^7.3.0",
3535
"@vueuse/head": "^0.7.9",

packages/toolkits/pro/template/tinyvue/src/assets/style/menu.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

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

2121
// 主标题点击后显示背景色

packages/toolkits/pro/template/tinyvue/src/components/menu/index.vue

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@
297297
height: 1.3em;
298298
}
299299
}
300+
300301
:deep(.tiny-tree-node__wrapper > .is-current > .tiny-tree-node__content) {
301302
color: #000 !important;
302303
background: none !important;
@@ -306,6 +307,7 @@
306307
color: #fff !important;
307308
}
308309
}
310+
309311
:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
310312
> .tiny-tree-node__wrapper > .is-current > .tiny-tree-node__content
311313
) {
@@ -315,9 +317,55 @@
315317
background: var(--ti-tree-menu-node-hover-bg-color) !important;
316318
}
317319
}
320+
321+
:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
322+
.tiny-tree-node__wrapper .is-current .tiny-tree-node__content .tree-node-name) {
323+
border-left: 2px solid var(--ti-tree-menu-square-left-border-color, '#fff') !important;
324+
}
325+
326+
:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
327+
.tiny-tree-node__wrapper .is-current .tiny-tree-node__content .tiny-tree-node__content-right) {
328+
background-color: var(--ti-tree-menu-node-hover-bg-color) !important;
329+
}
330+
331+
:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
332+
.tiny-tree-node__wrapper .is-current .tiny-tree-node__content .tiny-tree-node__content-left
333+
.tiny-tree-node__content-box) {
334+
background-color: var(--ti-tree-menu-node-hover-bg-color) !important;
335+
}
336+
337+
:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
338+
.tiny-tree-node__wrapper .is-current .tiny-tree-node__content .tiny-tree-node__content-left
339+
.tiny-tree-node__content-box:before) {
340+
display: none !important;
341+
}
342+
343+
:deep(.tiny-tree-node__wrapper > .is-expanded > .tiny-tree-node__children
344+
.tiny-tree-node__wrapper .is-current .tiny-tree-node__content .tiny-tree-node__content-left:before) {
345+
display: none !important;
346+
}
347+
348+
:deep(.tiny-tree-node__wrapper > .is-current > .tiny-tree-node__content) {
349+
background-color: #fff !important;
350+
}
351+
352+
:deep(.tiny-tree-node__wrapper > .is-current > .tiny-tree-node__content .tiny-tree-node__content-box) {
353+
background-color: #fff !important;
354+
}
355+
356+
:deep(.tiny-tree-node__content:hover) {
357+
background-color: var(--ti-tree-node-content-hover-bg-color) !important;
358+
}
359+
360+
:deep(.tiny-tree-menu__wrap > .tiny-tree-node__wrapper > .is-root > .tiny-tree-node__content
361+
> .tiny-tree-node__content-left .tiny-tree-node__content-box .tree-node-name) {
362+
padding: 0 8px !important;
363+
}
364+
318365
:deep(.tiny-tree-node > .tiny-tree-node__content) {
319366
margin-left: 0 !important;
320367
}
368+
321369
.tiny-tree-menu
322370
.tiny-tree
323371
.tiny-tree-node.is-current

packages/toolkits/pro/template/tinyvue/src/layout/default-layout.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
// 路由子菜单选中后的样式
188188
:deep(.tiny-tree-node__children .tiny-tree-node__content) {
189189
.tree-node-name {
190-
margin-left: 60px !important;
190+
margin-left: 28px !important;
191191
padding-left: 6px !important;
192192
}
193193
}

0 commit comments

Comments
 (0)