diff --git a/src/less/font.less b/src/less/font.less index b824a13..c322ad7 100644 --- a/src/less/font.less +++ b/src/less/font.less @@ -5,7 +5,7 @@ .font(dcm-info-font, @font-link-info); .font(dcm-test-font, @font-link-test); .font(dcm-delete-font, @font-link-delete); -.font(dcm-back-font, @font-arrow-left); +.font(dcm-back-font, @font-back); .font(dcm-cross-font, @font-cross); .font(dcm-link-other-font, @font-link-other); .font(dcm-change-name-font, @font-change-name); diff --git a/src/less/lib/font.less b/src/less/lib/font.less index 3e580b8..5d46323 100644 --- a/src/less/lib/font.less +++ b/src/less/lib/font.less @@ -8,4 +8,5 @@ @font-change-name: "e6cc"; @font-link-edit: "e6ba"; @font-triangle-collapse: "e6d8"; -@font-triangle-expand: "e6d7"; \ No newline at end of file +@font-triangle-expand: "e6d7"; +@font-back: "e6ae"; \ No newline at end of file diff --git a/src/modules/pages/database/database_type/database_type.less b/src/modules/pages/database/database_type/database_type.less index 835a2c6..3fac961 100644 --- a/src/modules/pages/database/database_type/database_type.less +++ b/src/modules/pages/database/database_type/database_type.less @@ -3,12 +3,12 @@ .dec-dcm-datebase-type{ .bi-list-item-active{ &:hover{ - border-color :@border-color-highlight; + .box-shadow(0 1px 5px 0, fade(@color-bi-background-black, 20)); } } &:active, &.active { .bi-list-item-active{ - border-color :@border-color-highlight; + .box-shadow(0 1px 5px 0, fade(@color-bi-background-black, 20)); } } } \ No newline at end of file diff --git a/src/modules/pages/database/database_type/database_type.model.ts b/src/modules/pages/database/database_type/database_type.model.ts index 510b9b3..1417d95 100644 --- a/src/modules/pages/database/database_type/database_type.model.ts +++ b/src/modules/pages/database/database_type/database_type.model.ts @@ -6,13 +6,17 @@ export class DatebaseTypeModel extends Model< { context: { datebaseTypeSelected: AppModel['$$childContext']['datebaseTypeSelected']; + pageIndex: AppModel['$$childContext']['pageIndex']; } }> { - context = ['datebaseTypeSelected']; + context = ['datebaseTypeSelected', 'pageIndex']; actions = { setDatebaseTypeSelected: (datebaseTypeSelected: string) => { this.model.datebaseTypeSelected = datebaseTypeSelected; }, + setPageIndex: (index: string) => { + this.model.pageIndex = index; + }, } } diff --git a/src/modules/pages/database/database_type/database_type.ts b/src/modules/pages/database/database_type/database_type.ts index f573495..3e1a419 100644 --- a/src/modules/pages/database/database_type/database_type.ts +++ b/src/modules/pages/database/database_type/database_type.ts @@ -3,6 +3,7 @@ import { Vtape, Label, Absolute, Img } from 'ui'; import { DatebaseTypeModel, DatebaseTypeModelXtype } from './database_type.model'; import { ImgPrefix, PluginImgPrefix } from '@constants/env'; import './database_type.less'; +import { PAGE_INDEX } from '@constants/constant'; export const DatebaseTypeXtype = 'dec.dcm.datebase.type'; @shortcut(DatebaseTypeXtype) @@ -66,6 +67,7 @@ export class DatebaseType extends BI.BasicButton { doClick() { const { value } = this.options; this.store.setDatebaseTypeSelected(value); + this.store.setPageIndex(PAGE_INDEX.MAINTAIN); } mounted() { diff --git a/src/modules/pages/maintain/maintain.ts b/src/modules/pages/maintain/maintain.ts index b097c47..dd5ca6e 100644 --- a/src/modules/pages/maintain/maintain.ts +++ b/src/modules/pages/maintain/maintain.ts @@ -30,7 +30,7 @@ export class Maintain extends BI.Widget { items: [ { type: IconButton, - height: 15, + hgap: 5, cls: 'dcm-back-font', invisible: isEdit, handler: () => {