fanruan
/
decision-webui-dcm
2
0
Fork 0
Code Issues 8 Pull Requests Projects Releases Wiki Activity
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
f89124a76d 73995fcdc9
commit
869cebf114
3 changed files with 6 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

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

8
src/modules/components/file_upload/file_upload.ts
Unescape View File

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

5
src/modules/pages/database/database.ts
Unescape View File

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

Write Preview
Loading…
Cancel
Save