Browse Source

Merge pull request #52 in DEC/decision-webui-dcm from ~ALAN/decision-webui-dcm:feature/10.0 to feature/10.0

* commit '237b31fb3d88f1462f690897a2bb1949af3b9bd7':
  fix: DEC-9772 && DEC-9871 修改交互样式,点击数据库之后直接进入编辑页面
qufenxi
alan 5 years ago
parent
commit
b61850ca1a
  1. 2
      src/less/font.less
  2. 1
      src/less/lib/font.less
  3. 4
      src/modules/pages/database/database_type/database_type.less
  4. 6
      src/modules/pages/database/database_type/database_type.model.ts
  5. 2
      src/modules/pages/database/database_type/database_type.ts
  6. 2
      src/modules/pages/maintain/maintain.ts

2
src/less/font.less

@ -5,7 +5,7 @@
.font(dcm-info-font, @font-link-info); .font(dcm-info-font, @font-link-info);
.font(dcm-test-font, @font-link-test); .font(dcm-test-font, @font-link-test);
.font(dcm-delete-font, @font-link-delete); .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-cross-font, @font-cross);
.font(dcm-link-other-font, @font-link-other); .font(dcm-link-other-font, @font-link-other);
.font(dcm-change-name-font, @font-change-name); .font(dcm-change-name-font, @font-change-name);

1
src/less/lib/font.less

@ -9,3 +9,4 @@
@font-link-edit: "e6ba"; @font-link-edit: "e6ba";
@font-triangle-collapse: "e6d8"; @font-triangle-collapse: "e6d8";
@font-triangle-expand: "e6d7"; @font-triangle-expand: "e6d7";
@font-back: "e6ae";

4
src/modules/pages/database/database_type/database_type.less

@ -3,12 +3,12 @@
.dec-dcm-datebase-type{ .dec-dcm-datebase-type{
.bi-list-item-active{ .bi-list-item-active{
&:hover{ &:hover{
border-color :@border-color-highlight; .box-shadow(0 1px 5px 0, fade(@color-bi-background-black, 20));
} }
} }
&:active, &.active { &:active, &.active {
.bi-list-item-active{ .bi-list-item-active{
border-color :@border-color-highlight; .box-shadow(0 1px 5px 0, fade(@color-bi-background-black, 20));
} }
} }
} }

6
src/modules/pages/database/database_type/database_type.model.ts

@ -6,13 +6,17 @@ export class DatebaseTypeModel extends Model<
{ {
context: { context: {
datebaseTypeSelected: AppModel['$$childContext']['datebaseTypeSelected']; datebaseTypeSelected: AppModel['$$childContext']['datebaseTypeSelected'];
pageIndex: AppModel['$$childContext']['pageIndex'];
} }
}> { }> {
context = ['datebaseTypeSelected']; context = ['datebaseTypeSelected', 'pageIndex'];
actions = { actions = {
setDatebaseTypeSelected: (datebaseTypeSelected: string) => { setDatebaseTypeSelected: (datebaseTypeSelected: string) => {
this.model.datebaseTypeSelected = datebaseTypeSelected; this.model.datebaseTypeSelected = datebaseTypeSelected;
}, },
setPageIndex: (index: string) => {
this.model.pageIndex = index;
},
} }
} }

2
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 { DatebaseTypeModel, DatebaseTypeModelXtype } from './database_type.model';
import { ImgPrefix, PluginImgPrefix } from '@constants/env'; import { ImgPrefix, PluginImgPrefix } from '@constants/env';
import './database_type.less'; import './database_type.less';
import { PAGE_INDEX } from '@constants/constant';
export const DatebaseTypeXtype = 'dec.dcm.datebase.type'; export const DatebaseTypeXtype = 'dec.dcm.datebase.type';
@shortcut(DatebaseTypeXtype) @shortcut(DatebaseTypeXtype)
@ -66,6 +67,7 @@ export class DatebaseType extends BI.BasicButton {
doClick() { doClick() {
const { value } = this.options; const { value } = this.options;
this.store.setDatebaseTypeSelected(value); this.store.setDatebaseTypeSelected(value);
this.store.setPageIndex(PAGE_INDEX.MAINTAIN);
} }
mounted() { mounted() {

2
src/modules/pages/maintain/maintain.ts

@ -30,7 +30,7 @@ export class Maintain extends BI.Widget {
items: [ items: [
{ {
type: IconButton, type: IconButton,
height: 15, hgap: 5,
cls: 'dcm-back-font', cls: 'dcm-back-font',
invisible: isEdit, invisible: isEdit,
handler: () => { handler: () => {

Loading…
Cancel
Save