Browse Source

Merge pull request #2842 in DEC/decision-webui-dcm from final/10.0 to release/10.0

* commit 'cdf2b4695f8af93deb510db29ffa9ac22de8580e':
  DEC-20201 feat: 【迭代】【驱动管理】屏蔽驱动管理入口以及相关功能
release/10.0
superman 3 years ago
parent
commit
a39ef330e3
  1. 2
      src/modules/pages/connection/connection.ts
  2. 19
      src/modules/pages/maintain/components/driverselector/driverselector.ts

2
src/modules/pages/connection/connection.ts

@ -79,7 +79,7 @@ export class Connection extends BI.Widget {
right: [ right: [
{ {
type: 'dec.connection.driver.entry', type: 'dec.connection.driver.entry',
invisible: !BI.Services.getService('dec.service.global').isAdmin(), invisible: true,
from: '.dec-dcm', from: '.dec-dcm',
listeners: [ listeners: [
{ {

19
src/modules/pages/maintain/components/driverselector/driverselector.ts

@ -30,18 +30,14 @@ export class DriverSelector extends BI.Widget {
customDrivers: SearchTextValueCombo = null; customDrivers: SearchTextValueCombo = null;
beforeRender(cb: Function) {
this.store.initDriverClassList(cb);
}
watch = { watch = {
driverClassItems: items => { driverClassItems: items => {
this.customDrivers.populate(items); // this.customDrivers.populate(items);
this.customDrivers.setValue(this.model.customDriver.value); // this.customDrivers.setValue(this.model.customDriver.value);
}, },
driverManageEntryVisible: b => { driverManageEntryVisible: b => {
this.driverManageEntry.setVisible(b); this.driverManageEntry.setVisible(false);
}, },
}; };
@ -59,6 +55,7 @@ export class DriverSelector extends BI.Widget {
type: BI.TextValueCombo.xtype, type: BI.TextValueCombo.xtype,
width: 86, width: 86,
value: this.model.selectedDriverType, value: this.model.selectedDriverType,
invisible: true,
items: [ items: [
{ {
text: BI.i18nText('Dec-Basic_Default'), text: BI.i18nText('Dec-Basic_Default'),
@ -98,7 +95,7 @@ export class DriverSelector extends BI.Widget {
this.defaultDrivers = _ref; this.defaultDrivers = _ref;
}, },
invisible: this.model.driverSource !== '', invisible: this.model.driverSource !== '',
width: 204, width: 300,
items: this.model.defaultDrivers, items: this.model.defaultDrivers,
value: this.model.defaultDriver.driver, value: this.model.defaultDriver.driver,
listeners: [ listeners: [
@ -119,7 +116,7 @@ export class DriverSelector extends BI.Widget {
ref: _ref => { ref: _ref => {
this.customDrivers = _ref; this.customDrivers = _ref;
}, },
invisible: this.model.driverSource === '', invisible: true,
width: 204, width: 204,
watermark: BI.i18nText('Dec-Please_Input'), watermark: BI.i18nText('Dec-Please_Input'),
items: this.model.driverClassItems, items: this.model.driverClassItems,
@ -149,7 +146,7 @@ export class DriverSelector extends BI.Widget {
text: BI.i18nText('Dec-Dcm_Create_New_Driver'), text: BI.i18nText('Dec-Dcm_Create_New_Driver'),
}, },
from: '.dec-dcm', from: '.dec-dcm',
invisible: !this.model.driverManageEntryVisible, invisible: true,
listeners: [ listeners: [
{ {
eventName: 'EVENT_CLOSE', eventName: 'EVENT_CLOSE',
@ -178,7 +175,7 @@ export class DriverSelector extends BI.Widget {
getValue() { getValue() {
return { return {
driverSource: this.model.driverSource, // driverSource: this.model.driverSource,
driver: this.model.driverSource === '' ? this.model.defaultDriver.driver : this.model.customDriver.driver, driver: this.model.driverSource === '' ? this.model.defaultDriver.driver : this.model.customDriver.driver,
}; };
} }

Loading…
Cancel
Save