fay 7 years ago
parent
commit
a2e8a18adc
  1. 22
      dist/_fineui.min.js
  2. 42
      dist/bundle.js
  3. 22
      dist/bundle.min.js
  4. 22
      dist/fineui.min.js
  5. 42
      dist/widget.js
  6. 21
      src/widget/filter/filter.constant.js
  7. 22
      src/widget/filter/operation/filter.operation.js

22
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

42
dist/bundle.js vendored

@ -93513,26 +93513,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
}]
});
}());/** }());/**
* 过滤 * 过滤
* *
@ -93843,7 +93823,23 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
expander: {}, expander: {},
items: [], items: [],
selections: [BI.AbstractFilterItem.FILTER_OPERATION_CONDITION, BI.AbstractFilterItem.FILTER_OPERATION_FORMULA], selections: [BI.AbstractFilterItem.FILTER_OPERATION_CONDITION, BI.AbstractFilterItem.FILTER_OPERATION_FORMULA],
itemsCreator: BI.emptyFn itemsCreator: BI.emptyFn,
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
}]
}
}, },
render: function () { render: function () {
@ -93988,13 +93984,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;
} }

22
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

22
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

42
dist/widget.js vendored

@ -6376,26 +6376,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
}]
});
}());/** }());/**
* 过滤 * 过滤
* *
@ -6706,7 +6686,23 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
expander: {}, expander: {},
items: [], items: [],
selections: [BI.AbstractFilterItem.FILTER_OPERATION_CONDITION, BI.AbstractFilterItem.FILTER_OPERATION_FORMULA], selections: [BI.AbstractFilterItem.FILTER_OPERATION_CONDITION, BI.AbstractFilterItem.FILTER_OPERATION_FORMULA],
itemsCreator: BI.emptyFn itemsCreator: BI.emptyFn,
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
}]
}
}, },
render: function () { render: function () {
@ -6851,13 +6847,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
}]
});
}());

22
src/widget/filter/operation/filter.operation.js

@ -13,7 +13,23 @@
expander: {}, expander: {},
items: [], items: [],
selections: [BI.AbstractFilterItem.FILTER_OPERATION_CONDITION, BI.AbstractFilterItem.FILTER_OPERATION_FORMULA], selections: [BI.AbstractFilterItem.FILTER_OPERATION_CONDITION, BI.AbstractFilterItem.FILTER_OPERATION_FORMULA],
itemsCreator: BI.emptyFn itemsCreator: BI.emptyFn,
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
}]
}
}, },
render: function () { render: function () {
@ -158,13 +174,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