Browse Source

Merge branch 'feature/x' of ssh://code.fineres.com:7999/~austin.duan/decision-webui-dcm into feature/x

feature/x
Austin.Duan 2 years ago
parent
commit
869cebf114
  1. 2
      src/modules/components/file_chooser/file_chooser.ts
  2. 8
      src/modules/components/file_upload/file_upload.ts
  3. 5
      src/modules/pages/database/database.ts

2
src/modules/components/file_chooser/file_chooser.ts

@ -41,7 +41,7 @@ export class FileChooser extends BI.Widget {
items: [
{
type: BI.SignEditor.xtype,
cls: 'bi-border bi-focus-shadow',
cls: 'bi-border-bottom bi-focus-shadow',
width,
height: 22,
watermark,

8
src/modules/components/file_upload/file_upload.ts

@ -59,7 +59,7 @@ export class FileUpload extends BI.Widget {
items: [
{
type: BI.SignEditor.xtype,
cls: 'bi-border bi-focus-shadow',
cls: 'bi-border-bottom bi-focus-shadow',
width: 300,
height: 22,
watermark,
@ -144,9 +144,9 @@ export class FileUpload extends BI.Widget {
this.fileModified = _ref;
},
}]
}],
},
tgap: 14,
lgap: 4,
@ -155,7 +155,7 @@ export class FileUpload extends BI.Widget {
type: BI.IconButton.xtype,
cls: "default-delete-font",
handler: function () {
NProgress.set(0.0);
NProgress.set(0.0);
self.xhr.abort();
self.store.setFileName('');
self.clearInfo();

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

@ -147,20 +147,18 @@ export class Datebase extends BI.Widget {
items: [
{
el: {
type: BI.HTapeLayout.xtype,
type: BI.VerticalAdaptLayout.xtype,
hgap: 20,
invisible: true,
items: [
{
type: BI.Label.xtype,
width: 70,
textAlign: 'left',
text: BI.i18nText('Dec-Dcm_Connection_Type_Filter'),
title: BI.i18nText('Dec-Dcm_Connection_Type_Filter'),
},
{
type: BI.MultiSelectItem.xtype,
width: 80,
selected: this.model.isInternal,
text: BI.i18nText('Dec-Dcm_Connection_Support_Inner'),
title: BI.i18nText('Dec-Dcm_Connection_Support_Inner'),
@ -173,7 +171,6 @@ export class Datebase extends BI.Widget {
},
{
type: BI.MultiSelectItem.xtype,
width: 80,
selected: this.model.isPlugin,
text: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'),
title: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'),

Loading…
Cancel
Save