Browse Source

Pull request #176: BI-66943 fix: 【513】全局更新设置定时更新,明细频率执行,应该只有选项前面的选项是勾选状态,整一行没有蓝色选中

Merge in DEC/decision-webui-dcm from ~DAILER/decision-webui-dcm:release/10.0 to release/10.0

* commit '0e6c33e42422d300e8ed66aa9ead526a6915c767':
  BI-66943 fix: 【513】全局更新设置定时更新,明细频率执行,应该只有选项前面的选项是勾选状态,整一行没有蓝色选中
research/10.0
parent
commit
d02345397d
  1. 16
      src/modules/pages/connection/list/list_item/list_item.ts
  2. 2
      src/modules/pages/connection_pool/list_item/list_item.ts
  3. 6
      src/modules/pages/database/filter/filter.less
  4. 5
      src/modules/pages/database/filter/filter.ts

16
src/modules/pages/connection/list/list_item/list_item.ts

@ -16,7 +16,7 @@ export class ListItem extends BI.BasicButton {
creator: '', creator: '',
databaseType: '', databaseType: '',
height: 25, height: 25,
baseCls: 'dec-dcm-connection-list-item bi-list-item-active', baseCls: 'dec-dcm-connection-list-item bi-list-item-active2',
} }
store: ListItemModel['store']; store: ListItemModel['store'];
@ -39,7 +39,7 @@ export class ListItem extends BI.BasicButton {
render() { render() {
const { name, databaseType } = this.options; const { name, databaseType } = this.options;
return { return {
type: Htape, type: Htape,
items: [{ items: [{
@ -80,7 +80,7 @@ export class ListItem extends BI.BasicButton {
this.store.setIsEdit(false, name); this.store.setIsEdit(false, name);
this.nameLabel.setText(name); this.nameLabel.setText(name);
this.nameEditor.setValue(name); this.nameEditor.setValue(name);
return; return;
} }
this.store.changeName(name, newName).then(re => { this.store.changeName(name, newName).then(re => {
@ -124,10 +124,10 @@ export class ListItem extends BI.BasicButton {
this.downListCombo.setValue(''); this.downListCombo.setValue('');
}, },
}], }],
} : { } : {
type: Layout, type: Layout,
}, },
width: 25, width: 25,
}], }],
}; };
@ -153,7 +153,7 @@ export class ListItem extends BI.BasicButton {
if (!isRegistered) { if (!isRegistered) {
return [otherIcons]; return [otherIcons];
} }
return [ return [
[ [
{ {
@ -211,7 +211,7 @@ export class ListItem extends BI.BasicButton {
this.store.setPageIndex(PAGE_INDEX.MAINTAIN); this.store.setPageIndex(PAGE_INDEX.MAINTAIN);
this.store.setDatebaseTypeSelected(''); this.store.setDatebaseTypeSelected('');
}) })
.catch(() => {}); .catch(() => { });
}, },
changeName: () => { changeName: () => {
this.store.setIsEdit(true, name); this.store.setIsEdit(true, name);

2
src/modules/pages/connection_pool/list_item/list_item.ts

@ -8,7 +8,7 @@ export class ListItem extends BI.BasicButton {
props = { props = {
name: '', name: '',
height: 25, height: 25,
baseCls: 'dec-dcm-connection-pool-list-item bi-list-item-active', baseCls: 'dec-dcm-connection-pool-list-item bi-list-item-active2',
} }
store: ListItemModel['store']; store: ListItemModel['store'];

6
src/modules/pages/database/filter/filter.less

@ -1,6 +0,0 @@
@import "../../../../less/index.less";
.bi-list-item-active{
&:active, &.active {
background-color: @color-bi-light-blue-60;
}
}

5
src/modules/pages/database/filter/filter.ts

@ -1,7 +1,6 @@
import { shortcut, store } from '@core/core'; import { shortcut, store } from '@core/core';
import { Label } from 'ui'; import { Label } from 'ui';
import { FilterModel, FilterModelXtype } from './filter.model'; import { FilterModel, FilterModelXtype } from './filter.model';
import './filter.less';
export const FilterXtype = 'dec.dcm.datebase.filter'; export const FilterXtype = 'dec.dcm.datebase.filter';
@shortcut(FilterXtype) @shortcut(FilterXtype)
@ -11,12 +10,12 @@ export class Filter extends BI.BasicButton {
props = { props = {
text: '', text: '',
value: '', value: '',
baseCls: 'bi-list-item-active', baseCls: 'bi-list-item-active2',
} }
render() { render() {
const { text } = this.options; const { text } = this.options;
return { return {
type: Label, type: Label,
textAlign: 'left', textAlign: 'left',

Loading…
Cancel
Save