Cauchy.Ke
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

merge

master
windy 7 years ago
parent
09ad48399d 33475fffd6
commit
017328574e
11 changed files with 112 additions and 504 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. 34
      bi/case.js
  2. 120
      bi/core.js
  3. 154
      dist/bundle.js
  4. 34
      dist/case.js
  5. 120
      dist/core.js
  6. 10
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  7. 11
      src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
  8. 10
      src/case/combo/textvaluecombo/combo.textvalue.js
  9. 3
      src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js
  10. 12
      src/core/shortcut.js
  11. 108
      src/core/utils/chinesePY.js

34
bi/case.js
Unescape View File

@ -5462,9 +5462,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-icon-text-value-combo", baseClass: "bi-icon-text-value-combo",
height: 30, height: 30,
text: "", value: "",
el: {} el: {}
}) });
}, },
_init: function () { _init: function () {
@ -5473,8 +5473,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, { this.trigger = BI.createWidget(o.el, {
type: "bi.select_icon_text_trigger", type: "bi.select_icon_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height
text: o.text
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup", type: "bi.icon_text_value_combo_popup",
@ -5498,6 +5497,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
}, },
setValue: function (v) { setValue: function (v) {
@ -5650,8 +5652,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
width: 100, width: 100,
height: 24, height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE, chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "" value: ""
}) });
}, },
_init: function () { _init: function () {
@ -5660,8 +5662,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height
text: o.text
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
@ -5686,6 +5687,10 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
}, },
setTitle: function (title) { setTitle: function (title) {
@ -5844,9 +5849,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
baseClass: "bi-text-value-combo", baseClass: "bi-text-value-combo",
height: 30, height: 30,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE, chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "", value: "",
el: {} el: {}
}) });
}, },
_init: function () { _init: function () {
@ -5855,8 +5860,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, { this.trigger = BI.createWidget(o.el, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height
text: o.text
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_combo_popup", type: "bi.text_value_combo_popup",
@ -5881,6 +5885,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
}, },
setValue: function (v) { setValue: function (v) {
@ -6027,8 +6034,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-value-down-list-combo", baseCls: "bi-text-value-down-list-combo",
height: 30, height: 30
text: ""
}) })
}, },

120
bi/core.js
View File

File diff suppressed because one or more lines are too long

154
dist/bundle.js vendored
View File

File diff suppressed because one or more lines are too long

34
dist/case.js vendored
Unescape View File

@ -5462,9 +5462,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-icon-text-value-combo", baseClass: "bi-icon-text-value-combo",
height: 30, height: 30,
text: "", value: "",
el: {} el: {}
}) });
}, },
_init: function () { _init: function () {
@ -5473,8 +5473,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, { this.trigger = BI.createWidget(o.el, {
type: "bi.select_icon_text_trigger", type: "bi.select_icon_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height
text: o.text
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup", type: "bi.icon_text_value_combo_popup",
@ -5498,6 +5497,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
}, },
setValue: function (v) { setValue: function (v) {
@ -5650,8 +5652,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
width: 100, width: 100,
height: 24, height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE, chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "" value: ""
}) });
}, },
_init: function () { _init: function () {
@ -5660,8 +5662,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height
text: o.text
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
@ -5686,6 +5687,10 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
}, },
setTitle: function (title) { setTitle: function (title) {
@ -5844,9 +5849,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
baseClass: "bi-text-value-combo", baseClass: "bi-text-value-combo",
height: 30, height: 30,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE, chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "", value: "",
el: {} el: {}
}) });
}, },
_init: function () { _init: function () {
@ -5855,8 +5860,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, { this.trigger = BI.createWidget(o.el, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height
text: o.text
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_combo_popup", type: "bi.text_value_combo_popup",
@ -5881,6 +5885,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
}, },
setValue: function (v) { setValue: function (v) {
@ -6027,8 +6034,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-value-down-list-combo", baseCls: "bi-text-value-down-list-combo",
height: 30, height: 30
text: ""
}) })
}, },

120
dist/core.js vendored
View File

File diff suppressed because one or more lines are too long

10
src/case/combo/icontextvaluecombo/combo.icontextvalue.js
Unescape View File

@ -7,9 +7,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-icon-text-value-combo", baseClass: "bi-icon-text-value-combo",
height: 30, height: 30,
text: "", value: "",
el: {} el: {}
}) });
}, },
_init: function () { _init: function () {
@ -18,8 +18,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, { this.trigger = BI.createWidget(o.el, {
type: "bi.select_icon_text_trigger", type: "bi.select_icon_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height
text: o.text
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup", type: "bi.icon_text_value_combo_popup",
@ -43,6 +42,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
}, },
setValue: function (v) { setValue: function (v) {

11
src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
Unescape View File

@ -10,8 +10,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
width: 100, width: 100,
height: 24, height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE, chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "" value: ""
}) });
}, },
_init: function () { _init: function () {
@ -20,8 +20,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height
text: o.text
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
@ -46,6 +45,10 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
}, },
setTitle: function (title) { setTitle: function (title) {

10
src/case/combo/textvaluecombo/combo.textvalue.js
Unescape View File

@ -10,9 +10,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
baseClass: "bi-text-value-combo", baseClass: "bi-text-value-combo",
height: 30, height: 30,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE, chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "", value: "",
el: {} el: {}
}) });
}, },
_init: function () { _init: function () {
@ -21,8 +21,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, { this.trigger = BI.createWidget(o.el, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height
text: o.text
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_combo_popup", type: "bi.text_value_combo_popup",
@ -47,6 +46,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
}, },
setValue: function (v) { setValue: function (v) {

3
src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js
Unescape View File

@ -6,8 +6,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-value-down-list-combo", baseCls: "bi-text-value-down-list-combo",
height: 30, height: 30
text: ""
}) })
}, },

12
src/core/shortcut.js
Unescape View File

@ -9,8 +9,8 @@
// 根据配置属性生成widget // 根据配置属性生成widget
var createWidget = function (config) { var createWidget = function (config) {
if (config['classType']) { if (config["classType"]) {
return new (new Function('return ' + config['classType'] + ';')())(config); return new (new Function("return " + config["classType"] + ";")())(config);
} }
var cls = kv[config.type]; var cls = kv[config.type];
@ -31,17 +31,17 @@
if (item && (item.type || options.type)) { if (item && (item.type || options.type)) {
el = BI.extend({}, options, item); el = BI.extend({}, options, item);
w = BI.Plugin.getWidget(el.type, el); w = BI.Plugin.getWidget(el.type, el);
return BI.Plugin.getObject(el.type, w.type === el.type ? createWidget(w) : BI.createWidget(BI.extend({}, item, {type: w.type}, options))); return w.type === el.type ? BI.Plugin.getObject(el.type, createWidget(w)) : BI.createWidget(BI.extend({}, item, {type: w.type}, options));
} }
if (item && item.el && (item.el.type || options.type)) { if (item && item.el && (item.el.type || options.type)) {
el = BI.extend({}, options, item.el); el = BI.extend({}, options, item.el);
w = BI.Plugin.getWidget(el.type, el); w = BI.Plugin.getWidget(el.type, el);
return BI.Plugin.getObject(el.type, w.type === el.type ? createWidget(w) : BI.createWidget(BI.extend({}, item, {type: w.type}, options))); return w.type === el.type ? BI.Plugin.getObject(el.type, createWidget(w)) : BI.createWidget(BI.extend({}, item, {type: w.type}, options));
} }
if (item && BI.isWidget(item.el)) { if (item && BI.isWidget(item.el)) {
return item.el; return item.el;
} }
throw new Error('无法根据item创建组件'); throw new Error("无法根据item创建组件");
} };
})(); })();

108
src/core/utils/chinesePY.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save