fanruan
/
fineui
4
1
Fork 2
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui 

# Conflicts:
#	dist/bundle.js
#	dist/bundle.min.js
#	dist/fineui.js
es6
Dailer 6 years ago
parent
7b2be17fd1 4617b93fa7
commit
ea99065925
17 changed files with 64 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      demo/js/widget/multiselect/demo.multi_select_tree.js
  2. 2
      demo/version.js
  3. 28
      dist/_fineui.min.js
  4. 9
      dist/bundle.js
  5. 24
      dist/bundle.min.js
  6. 4
      dist/case.js
  7. 2
      dist/config.js
  8. 2
      dist/demo.js
  9. 9
      dist/fineui.js
  10. 28
      dist/fineui.min.js
  11. 3
      dist/widget.js
  12. 2
      public/js/index.js
  13. 2
      src/case/colorchooser/colorpicker/editor.colorpicker.js
  14. 2
      src/case/colorchooser/colorpicker/editor.colorpicker.simple.js
  15. 2
      src/widget/multiselect/search/multiselect.search.insert.pane.js
  16. 1
      src/widget/multiselectlist/multiselectlist.insert.js
  17. 2
      ui/js/index.js

2
demo/js/widget/multiselect/demo.multi_select_tree.js
Unescape View File

@ -13,7 +13,7 @@ Demo.MultiSelectList = BI.inherit(BI.Widget, {
_createMultiSelectCombo: function () {
var self = this;
var widget = BI.createWidget({
type: "bi.multi_select_insert_no_bar_list",
type: "bi.multi_select_insert_list",
ref: function (ref) {
self.list = ref;
},

2
demo/version.js
Unescape View File

@ -165,7 +165,7 @@ BI.i18n = {
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Click_To_Add_Text": "+点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",

28
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
dist/bundle.js vendored
Unescape View File

@ -77027,7 +77027,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.storeValue = {};
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
cls: "color-picker-editor-display bi-card bi-border",
height: 16,
width: 16
});
@ -77263,7 +77263,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
cls: "color-picker-editor-display bi-card bi-border",
height: 16,
width: 16
});
@ -99128,7 +99128,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
});
this.addNotMatchTip = BI.createWidget({
type: "bi.label",
type: "bi.text_button",
invisible: true,
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
height: this.constants.height,
@ -100188,6 +100188,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
self.fireEvent(BI.MultiSelectInsertList.EVENT_CHANGE);
});
}
self._showAdapter();
}
}, {
eventName: BI.Searcher.EVENT_SEARCHING,
@ -114417,7 +114418,7 @@ BI.i18n = {
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Click_To_Add_Text": "+点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",

24
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/case.js vendored
Unescape View File

@ -4471,7 +4471,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.storeValue = {};
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
cls: "color-picker-editor-display bi-card bi-border",
height: 16,
width: 16
});
@ -4707,7 +4707,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
cls: "color-picker-editor-display bi-card bi-border",
height: 16,
width: 16
});

2
dist/config.js vendored
Unescape View File

@ -165,7 +165,7 @@ BI.i18n = {
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Click_To_Add_Text": "+点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",

2
dist/demo.js vendored
Unescape View File

@ -12853,7 +12853,7 @@ Demo.MultiSelectList = BI.inherit(BI.Widget, {
_createMultiSelectCombo: function () {
var self = this;
var widget = BI.createWidget({
type: "bi.multi_select_insert_no_bar_list",
type: "bi.multi_select_insert_list",
ref: function (ref) {
self.list = ref;
},

9
dist/fineui.js vendored
Unescape View File

@ -77276,7 +77276,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.storeValue = {};
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
cls: "color-picker-editor-display bi-card bi-border",
height: 16,
width: 16
});
@ -77512,7 +77512,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
cls: "color-picker-editor-display bi-card bi-border",
height: 16,
width: 16
});
@ -99377,7 +99377,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
});
this.addNotMatchTip = BI.createWidget({
type: "bi.label",
type: "bi.text_button",
invisible: true,
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
height: this.constants.height,
@ -100437,6 +100437,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
self.fireEvent(BI.MultiSelectInsertList.EVENT_CHANGE);
});
}
self._showAdapter();
}
}, {
eventName: BI.Searcher.EVENT_SEARCHING,
@ -114666,7 +114667,7 @@ BI.i18n = {
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Click_To_Add_Text": "+点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",

28
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/widget.js vendored
Unescape View File

@ -11232,7 +11232,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
});
this.addNotMatchTip = BI.createWidget({
type: "bi.label",
type: "bi.text_button",
invisible: true,
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
height: this.constants.height,
@ -12292,6 +12292,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
self.fireEvent(BI.MultiSelectInsertList.EVENT_CHANGE);
});
}
self._showAdapter();
}
}, {
eventName: BI.Searcher.EVENT_SEARCHING,

2
public/js/index.js
Unescape View File

@ -165,7 +165,7 @@ BI.i18n = {
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Click_To_Add_Text": "+点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",

2
src/case/colorchooser/colorpicker/editor.colorpicker.js
Unescape View File

@ -21,7 +21,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.storeValue = {};
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
cls: "color-picker-editor-display bi-card bi-border",
height: 16,
width: 16
});

2
src/case/colorchooser/colorpicker/editor.colorpicker.simple.js
Unescape View File

@ -20,7 +20,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
cls: "color-picker-editor-display bi-card bi-border",
height: 16,
width: 16
});

2
src/widget/multiselect/search/multiselect.search.insert.pane.js
Unescape View File

@ -35,7 +35,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
});
this.addNotMatchTip = BI.createWidget({
type: "bi.label",
type: "bi.text_button",
invisible: true,
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
height: this.constants.height,

1
src/widget/multiselectlist/multiselectlist.insert.js
Unescape View File

@ -118,6 +118,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
self.fireEvent(BI.MultiSelectInsertList.EVENT_CHANGE);
});
}
self._showAdapter();
}
}, {
eventName: BI.Searcher.EVENT_SEARCHING,

2
ui/js/index.js
Unescape View File

@ -165,7 +165,7 @@ BI.i18n = {
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Click_To_Add_Text": "+点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",

Write Preview
Loading…
Cancel
Save