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

Merge pull request #356 in FUI/fineui from ~FAY/fineui:master to master 

* commit '6d8bba9d78f315fd4856235b713012c90cf092e8':
  放到defaultConfig中
  update
es6
guy 7 years ago
parent
01c03e28c7 6d8bba9d78
commit
46ce0f3436
7 changed files with 74 additions and 72 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. 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
View File

File diff suppressed because one or more lines are too long

45
dist/bundle.js vendored
Unescape View File

@ -93564,26 +93564,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
}]
});
}());/** }());/**
* 过滤 * 过滤
* *
@ -93889,6 +93869,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: {},
@ -94039,13 +94040,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
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

45
dist/widget.js vendored
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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;
} }

Write Preview
Loading…
Cancel
Save