Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 7 years ago
parent
commit
9af6caa79b
  1. 4
      dist/_fineui.min.js
  2. 45
      dist/bundle.js
  3. 2
      dist/bundle.min.js
  4. 4
      dist/fineui.min.js
  5. 45
      dist/widget.js
  6. 21
      src/widget/filter/filter.constant.js
  7. 25
      src/widget/filter/operation/filter.operation.js

4
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

45
dist/bundle.js vendored

@ -93562,26 +93562,6 @@ BI.extend(BI.AbstractFilterItem, {
} }
}); });
BI.shortcut("bi.filter_expander", FilterExpander); BI.shortcut("bi.filter_expander", FilterExpander);
}());/**
* Created by Urthur on 2017/12/21.
*/
!(function () {
BI.constant("bi.constant.component.filter", {
FORMULA_COMBO: [{
text: BI.i18nText("BI-Conf_Formula_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_AND
}, {
text: BI.i18nText("BI-Conf_Formula_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_OR
}],
CONDITION_COMBO: [{
text: BI.i18nText("BI-Conf_Condition_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_AND
}, {
text: BI.i18nText("BI-Conf_Condition_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_OR
}]
});
}());/** }());/**
* 过滤 * 过滤
* *
@ -93887,6 +93867,27 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
!(function () { !(function () {
var OPERATION_ADD_CONDITION = 0, OPERATION_ADD_ANDOR_CONDITION = 1; var OPERATION_ADD_CONDITION = 0, OPERATION_ADD_ANDOR_CONDITION = 1;
var FilterOperation = BI.inherit(BI.Widget, { var FilterOperation = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(FilterOperation.superclass._defaultConfig.apply(this, arguments), {
constants: {
FORMULA_COMBO: [{
text: BI.i18nText("BI-Conf_Formula_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_AND
}, {
text: BI.i18nText("BI-Conf_Formula_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_OR
}],
CONDITION_COMBO: [{
text: BI.i18nText("BI-Conf_Condition_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_AND
}, {
text: BI.i18nText("BI-Conf_Condition_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_OR
}]
}
});
},
props: { props: {
baseCls: "bi-filter-operation", baseCls: "bi-filter-operation",
expander: {}, expander: {},
@ -94037,13 +94038,13 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
case BI.AbstractFilterItem.FILTER_OPERATION_FORMULA: case BI.AbstractFilterItem.FILTER_OPERATION_FORMULA:
text = BI.i18nText("BI-Conf_Add_Formula"); text = BI.i18nText("BI-Conf_Add_Formula");
cls = "filter-formula-font"; cls = "filter-formula-font";
items = BI.Constants.getConstant("bi.constant.component.filter").FORMULA_COMBO; items = this.options.constants.FORMULA_COMBO;
break; break;
case BI.AbstractFilterItem.FILTER_OPERATION_CONDITION: case BI.AbstractFilterItem.FILTER_OPERATION_CONDITION:
default: default:
text = BI.i18nText("BI-Conf_Add_Condition"); text = BI.i18nText("BI-Conf_Add_Condition");
cls = "filter-condition-font"; cls = "filter-condition-font";
items = BI.Constants.getConstant("bi.constant.component.filter").CONDITION_COMBO; items = this.options.constants.CONDITION_COMBO;
break; break;
} }

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

45
dist/widget.js vendored

@ -6411,26 +6411,6 @@ BI.extend(BI.AbstractFilterItem, {
} }
}); });
BI.shortcut("bi.filter_expander", FilterExpander); BI.shortcut("bi.filter_expander", FilterExpander);
}());/**
* Created by Urthur on 2017/12/21.
*/
!(function () {
BI.constant("bi.constant.component.filter", {
FORMULA_COMBO: [{
text: BI.i18nText("BI-Conf_Formula_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_AND
}, {
text: BI.i18nText("BI-Conf_Formula_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_OR
}],
CONDITION_COMBO: [{
text: BI.i18nText("BI-Conf_Condition_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_AND
}, {
text: BI.i18nText("BI-Conf_Condition_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_OR
}]
});
}());/** }());/**
* 过滤 * 过滤
* *
@ -6736,6 +6716,27 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
!(function () { !(function () {
var OPERATION_ADD_CONDITION = 0, OPERATION_ADD_ANDOR_CONDITION = 1; var OPERATION_ADD_CONDITION = 0, OPERATION_ADD_ANDOR_CONDITION = 1;
var FilterOperation = BI.inherit(BI.Widget, { var FilterOperation = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(FilterOperation.superclass._defaultConfig.apply(this, arguments), {
constants: {
FORMULA_COMBO: [{
text: BI.i18nText("BI-Conf_Formula_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_AND
}, {
text: BI.i18nText("BI-Conf_Formula_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_OR
}],
CONDITION_COMBO: [{
text: BI.i18nText("BI-Conf_Condition_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_AND
}, {
text: BI.i18nText("BI-Conf_Condition_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_OR
}]
}
});
},
props: { props: {
baseCls: "bi-filter-operation", baseCls: "bi-filter-operation",
expander: {}, expander: {},
@ -6886,13 +6887,13 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
case BI.AbstractFilterItem.FILTER_OPERATION_FORMULA: case BI.AbstractFilterItem.FILTER_OPERATION_FORMULA:
text = BI.i18nText("BI-Conf_Add_Formula"); text = BI.i18nText("BI-Conf_Add_Formula");
cls = "filter-formula-font"; cls = "filter-formula-font";
items = BI.Constants.getConstant("bi.constant.component.filter").FORMULA_COMBO; items = this.options.constants.FORMULA_COMBO;
break; break;
case BI.AbstractFilterItem.FILTER_OPERATION_CONDITION: case BI.AbstractFilterItem.FILTER_OPERATION_CONDITION:
default: default:
text = BI.i18nText("BI-Conf_Add_Condition"); text = BI.i18nText("BI-Conf_Add_Condition");
cls = "filter-condition-font"; cls = "filter-condition-font";
items = BI.Constants.getConstant("bi.constant.component.filter").CONDITION_COMBO; items = this.options.constants.CONDITION_COMBO;
break; break;
} }

21
src/widget/filter/filter.constant.js

@ -1,21 +0,0 @@
/**
* Created by Urthur on 2017/12/21.
*/
!(function () {
BI.constant("bi.constant.component.filter", {
FORMULA_COMBO: [{
text: BI.i18nText("BI-Conf_Formula_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_AND
}, {
text: BI.i18nText("BI-Conf_Formula_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_OR
}],
CONDITION_COMBO: [{
text: BI.i18nText("BI-Conf_Condition_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_AND
}, {
text: BI.i18nText("BI-Conf_Condition_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_OR
}]
});
}());

25
src/widget/filter/operation/filter.operation.js

@ -8,6 +8,27 @@
!(function () { !(function () {
var OPERATION_ADD_CONDITION = 0, OPERATION_ADD_ANDOR_CONDITION = 1; var OPERATION_ADD_CONDITION = 0, OPERATION_ADD_ANDOR_CONDITION = 1;
var FilterOperation = BI.inherit(BI.Widget, { var FilterOperation = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(FilterOperation.superclass._defaultConfig.apply(this, arguments), {
constants: {
FORMULA_COMBO: [{
text: BI.i18nText("BI-Conf_Formula_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_AND
}, {
text: BI.i18nText("BI-Conf_Formula_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_FORMULA_OR
}],
CONDITION_COMBO: [{
text: BI.i18nText("BI-Conf_Condition_And"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_AND
}, {
text: BI.i18nText("BI-Conf_Condition_Or"),
value: BI.AbstractFilterItem.FILTER_OPERATION_CONDITION_OR
}]
}
});
},
props: { props: {
baseCls: "bi-filter-operation", baseCls: "bi-filter-operation",
expander: {}, expander: {},
@ -158,13 +179,13 @@
case BI.AbstractFilterItem.FILTER_OPERATION_FORMULA: case BI.AbstractFilterItem.FILTER_OPERATION_FORMULA:
text = BI.i18nText("BI-Conf_Add_Formula"); text = BI.i18nText("BI-Conf_Add_Formula");
cls = "filter-formula-font"; cls = "filter-formula-font";
items = BI.Constants.getConstant("bi.constant.component.filter").FORMULA_COMBO; items = this.options.constants.FORMULA_COMBO;
break; break;
case BI.AbstractFilterItem.FILTER_OPERATION_CONDITION: case BI.AbstractFilterItem.FILTER_OPERATION_CONDITION:
default: default:
text = BI.i18nText("BI-Conf_Add_Condition"); text = BI.i18nText("BI-Conf_Add_Condition");
cls = "filter-condition-font"; cls = "filter-condition-font";
items = BI.Constants.getConstant("bi.constant.component.filter").CONDITION_COMBO; items = this.options.constants.CONDITION_COMBO;
break; break;
} }

Loading…
Cancel
Save