Browse Source

Merge remote-tracking branch 'origin/master' into bugfix

es6
iapyang 4 years ago
parent
commit
d6b5a25e32
  1. 2
      dist/2.0/fineui.css
  2. 4
      dist/2.0/fineui.ie.min.js
  3. 2
      dist/2.0/fineui.ie.min.js.map
  4. 45
      dist/2.0/fineui.js
  5. 2
      dist/2.0/fineui.js.map
  6. 2
      dist/2.0/fineui.min.css
  7. 4
      dist/2.0/fineui.min.js
  8. 2
      dist/2.0/fineui.min.js.map
  9. 2
      dist/2.0/fineui_without_normalize.css
  10. 2
      dist/2.0/fineui_without_normalize.min.css
  11. 2
      dist/core.css
  12. 45
      dist/core.js
  13. 2
      dist/core.js.map
  14. 2
      dist/demo.css
  15. 45
      dist/demo.js
  16. 2
      dist/demo.js.map
  17. 2
      dist/fineui.css
  18. 4
      dist/fineui.ie.min.js
  19. 2
      dist/fineui.ie.min.js.map
  20. 45
      dist/fineui.js
  21. 2
      dist/fineui.js.map
  22. 2
      dist/fineui.min.css
  23. 4
      dist/fineui.min.js
  24. 2
      dist/fineui.min.js.map
  25. 45
      dist/fineui_without_jquery_polyfill.js
  26. 2
      dist/fineui_without_jquery_polyfill.js.map
  27. 2
      dist/font.css
  28. 2
      dist/resource.css
  29. 18
      dist/utils.js
  30. 2
      dist/utils.js.map
  31. 4
      dist/utils.min.js
  32. 2
      dist/utils.min.js.map
  33. 2
      package.json
  34. 16
      src/core/inject.js

2
dist/2.0/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

45
dist/2.0/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-12-2 16:40:29 */
/*! time: 2020-12-4 10:11:16 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -11209,6 +11209,22 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
// 如果config被重新配置的话,需要删除掉之前的实例
if (providerInstance[type]) {
delete providerInstance[type];
}
return configFn(providers[type]);
}
return BI.Plugin.configWidget(type, configFn, opt);
}
if (!configFunctions[type]) {
configFunctions[type] = [];
}
@ -48619,9 +48635,6 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-select-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -48814,13 +48827,19 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},
_getShowText: function () {
@ -49868,9 +49887,6 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-single-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -50063,13 +50079,20 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},

2
dist/2.0/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/core.css vendored

File diff suppressed because one or more lines are too long

45
dist/core.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-12-2 16:40:29 */
/*! time: 2020-12-4 10:11:16 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -11209,6 +11209,22 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
// 如果config被重新配置的话,需要删除掉之前的实例
if (providerInstance[type]) {
delete providerInstance[type];
}
return configFn(providers[type]);
}
return BI.Plugin.configWidget(type, configFn, opt);
}
if (!configFunctions[type]) {
configFunctions[type] = [];
}
@ -48619,9 +48635,6 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-select-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -48814,13 +48827,19 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},
_getShowText: function () {
@ -49868,9 +49887,6 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-single-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -50063,13 +50079,20 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},

2
dist/core.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/demo.css vendored

File diff suppressed because one or more lines are too long

45
dist/demo.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-12-2 16:40:29 */
/*! time: 2020-12-4 10:11:16 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -11209,6 +11209,22 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
// 如果config被重新配置的话,需要删除掉之前的实例
if (providerInstance[type]) {
delete providerInstance[type];
}
return configFn(providers[type]);
}
return BI.Plugin.configWidget(type, configFn, opt);
}
if (!configFunctions[type]) {
configFunctions[type] = [];
}
@ -48619,9 +48635,6 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-select-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -48814,13 +48827,19 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},
_getShowText: function () {
@ -49868,9 +49887,6 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-single-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -50063,13 +50079,20 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

45
dist/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-12-2 16:40:29 */
/*! time: 2020-12-4 10:11:16 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -11209,6 +11209,22 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
// 如果config被重新配置的话,需要删除掉之前的实例
if (providerInstance[type]) {
delete providerInstance[type];
}
return configFn(providers[type]);
}
return BI.Plugin.configWidget(type, configFn, opt);
}
if (!configFunctions[type]) {
configFunctions[type] = [];
}
@ -48619,9 +48635,6 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-select-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -48814,13 +48827,19 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},
_getShowText: function () {
@ -49868,9 +49887,6 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-single-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -50063,13 +50079,20 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},

2
dist/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css 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

2
dist/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

45
dist/fineui_without_jquery_polyfill.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-12-2 16:40:29 */
/*! time: 2020-12-4 10:11:16 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -8670,6 +8670,22 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
// 如果config被重新配置的话,需要删除掉之前的实例
if (providerInstance[type]) {
delete providerInstance[type];
}
return configFn(providers[type]);
}
return BI.Plugin.configWidget(type, configFn, opt);
}
if (!configFunctions[type]) {
configFunctions[type] = [];
}
@ -44646,9 +44662,6 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-select-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -44841,13 +44854,19 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},
_getShowText: function () {
@ -45895,9 +45914,6 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
return {
extraCls: "bi-multi-layer-single-tree-trigger bi-border bi-focus-shadow bi-border-radius",
height: 24,
valueFormatter: function (v) {
return v;
},
itemsCreator: BI.emptyFn,
watermark: BI.i18nText("BI-Basic_Search"),
allowSearchValue: false,
@ -46090,13 +46106,20 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
_digest: function (v) {
var o = this.options;
if(o.itemsCreator === BI.emptyFn) {
if (BI.isFunction(o.valueFormatter)) {
return o.valueFormatter(v);
}
if (o.itemsCreator === BI.emptyFn) {
var result = BI.find(o.items, function (i, item) {
return item.value === v;
});
return BI.isNotNull(result) ? result.text : o.text;
}
return o.valueFormatter(v);
return v;
},

2
dist/fineui_without_jquery_polyfill.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/font.css vendored

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored

File diff suppressed because one or more lines are too long

18
dist/utils.js vendored

@ -1,4 +1,4 @@
/*! time: 2020-12-2 16:40:29 */
/*! time: 2020-12-4 10:11:16 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -8403,6 +8403,22 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
// 如果config被重新配置的话,需要删除掉之前的实例
if (providerInstance[type]) {
delete providerInstance[type];
}
return configFn(providers[type]);
}
return BI.Plugin.configWidget(type, configFn, opt);
}
if (!configFunctions[type]) {
configFunctions[type] = [];
}

2
dist/utils.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/utils.min.js.map vendored

File diff suppressed because one or more lines are too long

2
package.json

@ -1,6 +1,6 @@
{
"name": "fineui",
"version": "2.0.20201202164151",
"version": "2.0.20201204101218",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",

16
src/core/inject.js

@ -49,6 +49,22 @@
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
// 如果config被重新配置的话,需要删除掉之前的实例
if (providerInstance[type]) {
delete providerInstance[type];
}
return configFn(providers[type]);
}
return BI.Plugin.configWidget(type, configFn, opt);
}
if (!configFunctions[type]) {
configFunctions[type] = [];
}

Loading…
Cancel
Save