From bff088b06b13bfe970041ee6667f32980d6855a7 Mon Sep 17 00:00:00 2001 From: dailer Date: Fri, 27 Aug 2021 10:23:05 +0800 Subject: [PATCH] =?UTF-8?q?DEC-20201=20feat:=20=E3=80=90=E8=BF=AD=E4=BB=A3?= =?UTF-8?q?=E3=80=91=E3=80=90=E9=A9=B1=E5=8A=A8=E7=AE=A1=E7=90=86=E3=80=91?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=A9=B1=E5=8A=A8=E7=AE=A1=E7=90=86=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/connection/connection.ts | 2 +- .../driverselector/driverselector.ts | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/modules/pages/connection/connection.ts b/src/modules/pages/connection/connection.ts index 90f5ba1..f8d175c 100644 --- a/src/modules/pages/connection/connection.ts +++ b/src/modules/pages/connection/connection.ts @@ -79,7 +79,7 @@ export class Connection extends BI.Widget { right: [ { type: 'dec.connection.driver.entry', - invisible: !BI.Services.getService('dec.service.global').isAdmin(), + invisible: true, from: '.dec-dcm', listeners: [ { diff --git a/src/modules/pages/maintain/components/driverselector/driverselector.ts b/src/modules/pages/maintain/components/driverselector/driverselector.ts index 896c157..ef6c351 100644 --- a/src/modules/pages/maintain/components/driverselector/driverselector.ts +++ b/src/modules/pages/maintain/components/driverselector/driverselector.ts @@ -30,18 +30,14 @@ export class DriverSelector extends BI.Widget { customDrivers: SearchTextValueCombo = null; - beforeRender(cb: Function) { - this.store.initDriverClassList(cb); - } - watch = { driverClassItems: items => { - this.customDrivers.populate(items); - this.customDrivers.setValue(this.model.customDriver.value); + // this.customDrivers.populate(items); + // this.customDrivers.setValue(this.model.customDriver.value); }, driverManageEntryVisible: b => { - this.driverManageEntry.setVisible(b); + this.driverManageEntry.setVisible(false); }, }; @@ -59,6 +55,7 @@ export class DriverSelector extends BI.Widget { type: BI.TextValueCombo.xtype, width: 86, value: this.model.selectedDriverType, + invisible: true, items: [ { text: BI.i18nText('Dec-Basic_Default'), @@ -98,7 +95,7 @@ export class DriverSelector extends BI.Widget { this.defaultDrivers = _ref; }, invisible: this.model.driverSource !== '', - width: 204, + width: 300, items: this.model.defaultDrivers, value: this.model.defaultDriver.driver, listeners: [ @@ -119,7 +116,7 @@ export class DriverSelector extends BI.Widget { ref: _ref => { this.customDrivers = _ref; }, - invisible: this.model.driverSource === '', + invisible: true, width: 204, watermark: BI.i18nText('Dec-Please_Input'), items: this.model.driverClassItems, @@ -149,7 +146,7 @@ export class DriverSelector extends BI.Widget { text: BI.i18nText('Dec-Dcm_Create_New_Driver'), }, from: '.dec-dcm', - invisible: !this.model.driverManageEntryVisible, + invisible: true, listeners: [ { eventName: 'EVENT_CLOSE', @@ -178,7 +175,7 @@ export class DriverSelector extends BI.Widget { getValue() { return { - driverSource: this.model.driverSource, + // driverSource: this.model.driverSource, driver: this.model.driverSource === '' ? this.model.defaultDriver.driver : this.model.customDriver.driver, }; }