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

Merge branch 'master' of https://code.fineres.com/scm/visual/fineui

es6
imp 3 years ago
parent
89a3dd58a2 e16215f2cf
commit
7d68d6e506
41 changed files with 165 additions and 116 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. 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. 26
      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. 26
      dist/core.js
  13. 2
      dist/core.js.map
  14. 2
      dist/demo.css
  15. 26
      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. 26
      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. 2
      dist/fineui.proxy.css
  26. 26
      dist/fineui.proxy.js
  27. 2
      dist/fineui.proxy.js.map
  28. 2
      dist/fineui.proxy.min.css
  29. 4
      dist/fineui.proxy.min.js
  30. 2
      dist/fineui.proxy.min.js.map
  31. 26
      dist/fineui_without_jquery_polyfill.js
  32. 2
      dist/fineui_without_jquery_polyfill.js.map
  33. 2
      dist/font.css
  34. 2
      dist/resource.css
  35. 26
      dist/utils.js
  36. 2
      dist/utils.js.map
  37. 4
      dist/utils.min.js
  38. 2
      dist/utils.min.js.map
  39. 2
      examples/dev.html
  40. 2
      package.json
  41. 21
      src/core/6.inject.js

2
dist/2.0/fineui.css vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

26
dist/2.0/fineui.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-7-26 23:30:33 */ /*! time: 2021-7-27 10:30:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -4158,10 +4158,15 @@ if (!_global.BI) {
if (moduleInjection[xtype] != null) { if (moduleInjection[xtype] != null) {
_global.console && console.error("module： [" + xtype + "] 已经注册过了"); _global.console && console.error("module： [" + xtype + "] 已经注册过了");
} }
var key; if (BI.isFunction(cls)) {
cls = cls();
}
for (var k in moduleInjectionMap) { for (var k in moduleInjectionMap) {
if(cls[k]){ if (cls[k]) {
for (key in cls[k]) { for (var key in cls[k]) {
if (!moduleInjectionMap[k]) {
continue;
}
if (!moduleInjectionMap[k][key]) { if (!moduleInjectionMap[k][key]) {
moduleInjectionMap[k][key] = []; moduleInjectionMap[k][key] = [];
} }
@ -4250,24 +4255,25 @@ if (!_global.BI) {
var conf = queue[i]; var conf = queue[i];
var version = conf.opt.version; var version = conf.opt.version;
var fn = conf.fn; var fn = conf.fn;
if(modules && version) { if (modules && version) {
var findVersion = false; var findVersion = false;
for (var j = 0; j < modules.length; j++) { for (var j = 0; j < modules.length; j++) {
var module = modules[i]; var module = modules[i];
if (module && dependencies[module.moduleId] && module.version === version) { if (module && dependencies[module.moduleId] && module.version === version) {
var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion; var minVersion = dependencies[module.moduleId].minVersion,
if (minVersion && module.version < minVersion){ maxVersion = dependencies[module.moduleId].maxVersion;
if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
findVersion = true; findVersion = true;
break; break;
} }
if(maxVersion && module.version > maxVersion){ if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
findVersion = true; findVersion = true;
break; break;
} }
} }
} }
if(findVersion === true){ if (findVersion === true) {
_global.console && console.error("module: [" + type + "] 版本: [" + module.version + "] 已过期"); _global.console && console.error("moduleId: [" + module.moduleId + "] 接口: [" + type + "] 接口版本: [" + version + "] 已过期，版本要求为：", dependencies[module.moduleId], "=>", moduleInjection[module.moduleId]);
continue; continue;
} }
} }

2
dist/2.0/fineui.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/core.css vendored
View File

File diff suppressed because one or more lines are too long

26
dist/core.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-7-26 23:30:33 */ /*! time: 2021-7-27 10:30:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -4158,10 +4158,15 @@ if (!_global.BI) {
if (moduleInjection[xtype] != null) { if (moduleInjection[xtype] != null) {
_global.console && console.error("module： [" + xtype + "] 已经注册过了"); _global.console && console.error("module： [" + xtype + "] 已经注册过了");
} }
var key; if (BI.isFunction(cls)) {
cls = cls();
}
for (var k in moduleInjectionMap) { for (var k in moduleInjectionMap) {
if(cls[k]){ if (cls[k]) {
for (key in cls[k]) { for (var key in cls[k]) {
if (!moduleInjectionMap[k]) {
continue;
}
if (!moduleInjectionMap[k][key]) { if (!moduleInjectionMap[k][key]) {
moduleInjectionMap[k][key] = []; moduleInjectionMap[k][key] = [];
} }
@ -4250,24 +4255,25 @@ if (!_global.BI) {
var conf = queue[i]; var conf = queue[i];
var version = conf.opt.version; var version = conf.opt.version;
var fn = conf.fn; var fn = conf.fn;
if(modules && version) { if (modules && version) {
var findVersion = false; var findVersion = false;
for (var j = 0; j < modules.length; j++) { for (var j = 0; j < modules.length; j++) {
var module = modules[i]; var module = modules[i];
if (module && dependencies[module.moduleId] && module.version === version) { if (module && dependencies[module.moduleId] && module.version === version) {
var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion; var minVersion = dependencies[module.moduleId].minVersion,
if (minVersion && module.version < minVersion){ maxVersion = dependencies[module.moduleId].maxVersion;
if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
findVersion = true; findVersion = true;
break; break;
} }
if(maxVersion && module.version > maxVersion){ if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
findVersion = true; findVersion = true;
break; break;
} }
} }
} }
if(findVersion === true){ if (findVersion === true) {
_global.console && console.error("module: [" + type + "] 版本: [" + module.version + "] 已过期"); _global.console && console.error("moduleId: [" + module.moduleId + "] 接口: [" + type + "] 接口版本: [" + version + "] 已过期，版本要求为：", dependencies[module.moduleId], "=>", moduleInjection[module.moduleId]);
continue; continue;
} }
} }

2
dist/core.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/demo.css vendored
View File

File diff suppressed because one or more lines are too long

26
dist/demo.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-7-26 23:30:33 */ /*! time: 2021-7-27 10:30:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -4158,10 +4158,15 @@ if (!_global.BI) {
if (moduleInjection[xtype] != null) { if (moduleInjection[xtype] != null) {
_global.console && console.error("module： [" + xtype + "] 已经注册过了"); _global.console && console.error("module： [" + xtype + "] 已经注册过了");
} }
var key; if (BI.isFunction(cls)) {
cls = cls();
}
for (var k in moduleInjectionMap) { for (var k in moduleInjectionMap) {
if(cls[k]){ if (cls[k]) {
for (key in cls[k]) { for (var key in cls[k]) {
if (!moduleInjectionMap[k]) {
continue;
}
if (!moduleInjectionMap[k][key]) { if (!moduleInjectionMap[k][key]) {
moduleInjectionMap[k][key] = []; moduleInjectionMap[k][key] = [];
} }
@ -4250,24 +4255,25 @@ if (!_global.BI) {
var conf = queue[i]; var conf = queue[i];
var version = conf.opt.version; var version = conf.opt.version;
var fn = conf.fn; var fn = conf.fn;
if(modules && version) { if (modules && version) {
var findVersion = false; var findVersion = false;
for (var j = 0; j < modules.length; j++) { for (var j = 0; j < modules.length; j++) {
var module = modules[i]; var module = modules[i];
if (module && dependencies[module.moduleId] && module.version === version) { if (module && dependencies[module.moduleId] && module.version === version) {
var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion; var minVersion = dependencies[module.moduleId].minVersion,
if (minVersion && module.version < minVersion){ maxVersion = dependencies[module.moduleId].maxVersion;
if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
findVersion = true; findVersion = true;
break; break;
} }
if(maxVersion && module.version > maxVersion){ if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
findVersion = true; findVersion = true;
break; break;
} }
} }
} }
if(findVersion === true){ if (findVersion === true) {
_global.console && console.error("module: [" + type + "] 版本: [" + module.version + "] 已过期"); _global.console && console.error("moduleId: [" + module.moduleId + "] 接口: [" + type + "] 接口版本: [" + version + "] 已过期，版本要求为：", dependencies[module.moduleId], "=>", moduleInjection[module.moduleId]);
continue; continue;
} }
} }

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

26
dist/fineui.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-7-26 23:30:33 */ /*! time: 2021-7-27 10:30:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -4158,10 +4158,15 @@ if (!_global.BI) {
if (moduleInjection[xtype] != null) { if (moduleInjection[xtype] != null) {
_global.console && console.error("module： [" + xtype + "] 已经注册过了"); _global.console && console.error("module： [" + xtype + "] 已经注册过了");
} }
var key; if (BI.isFunction(cls)) {
cls = cls();
}
for (var k in moduleInjectionMap) { for (var k in moduleInjectionMap) {
if(cls[k]){ if (cls[k]) {
for (key in cls[k]) { for (var key in cls[k]) {
if (!moduleInjectionMap[k]) {
continue;
}
if (!moduleInjectionMap[k][key]) { if (!moduleInjectionMap[k][key]) {
moduleInjectionMap[k][key] = []; moduleInjectionMap[k][key] = [];
} }
@ -4250,24 +4255,25 @@ if (!_global.BI) {
var conf = queue[i]; var conf = queue[i];
var version = conf.opt.version; var version = conf.opt.version;
var fn = conf.fn; var fn = conf.fn;
if(modules && version) { if (modules && version) {
var findVersion = false; var findVersion = false;
for (var j = 0; j < modules.length; j++) { for (var j = 0; j < modules.length; j++) {
var module = modules[i]; var module = modules[i];
if (module && dependencies[module.moduleId] && module.version === version) { if (module && dependencies[module.moduleId] && module.version === version) {
var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion; var minVersion = dependencies[module.moduleId].minVersion,
if (minVersion && module.version < minVersion){ maxVersion = dependencies[module.moduleId].maxVersion;
if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
findVersion = true; findVersion = true;
break; break;
} }
if(maxVersion && module.version > maxVersion){ if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
findVersion = true; findVersion = true;
break; break;
} }
} }
} }
if(findVersion === true){ if (findVersion === true) {
_global.console && console.error("module: [" + type + "] 版本: [" + module.version + "] 已过期"); _global.console && console.error("moduleId: [" + module.moduleId + "] 接口: [" + type + "] 接口版本: [" + version + "] 已过期，版本要求为：", dependencies[module.moduleId], "=>", moduleInjection[module.moduleId]);
continue; continue;
} }
} }

2
dist/fineui.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

2
dist/fineui.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.css vendored
View File

File diff suppressed because one or more lines are too long

26
dist/fineui.proxy.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-7-26 23:30:33 */ /*! time: 2021-7-27 10:30:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -2475,10 +2475,15 @@ if (!_global.BI) {
if (moduleInjection[xtype] != null) { if (moduleInjection[xtype] != null) {
_global.console && console.error("module： [" + xtype + "] 已经注册过了"); _global.console && console.error("module： [" + xtype + "] 已经注册过了");
} }
var key; if (BI.isFunction(cls)) {
cls = cls();
}
for (var k in moduleInjectionMap) { for (var k in moduleInjectionMap) {
if(cls[k]){ if (cls[k]) {
for (key in cls[k]) { for (var key in cls[k]) {
if (!moduleInjectionMap[k]) {
continue;
}
if (!moduleInjectionMap[k][key]) { if (!moduleInjectionMap[k][key]) {
moduleInjectionMap[k][key] = []; moduleInjectionMap[k][key] = [];
} }
@ -2567,24 +2572,25 @@ if (!_global.BI) {
var conf = queue[i]; var conf = queue[i];
var version = conf.opt.version; var version = conf.opt.version;
var fn = conf.fn; var fn = conf.fn;
if(modules && version) { if (modules && version) {
var findVersion = false; var findVersion = false;
for (var j = 0; j < modules.length; j++) { for (var j = 0; j < modules.length; j++) {
var module = modules[i]; var module = modules[i];
if (module && dependencies[module.moduleId] && module.version === version) { if (module && dependencies[module.moduleId] && module.version === version) {
var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion; var minVersion = dependencies[module.moduleId].minVersion,
if (minVersion && module.version < minVersion){ maxVersion = dependencies[module.moduleId].maxVersion;
if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
findVersion = true; findVersion = true;
break; break;
} }
if(maxVersion && module.version > maxVersion){ if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
findVersion = true; findVersion = true;
break; break;
} }
} }
} }
if(findVersion === true){ if (findVersion === true) {
_global.console && console.error("module: [" + type + "] 版本: [" + module.version + "] 已过期"); _global.console && console.error("moduleId: [" + module.moduleId + "] 接口: [" + type + "] 接口版本: [" + version + "] 已过期，版本要求为：", dependencies[module.moduleId], "=>", moduleInjection[module.moduleId]);
continue; continue;
} }
} }

2
dist/fineui.proxy.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.proxy.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

26
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-7-26 23:30:33 */ /*! time: 2021-7-27 10:30:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -2475,10 +2475,15 @@ if (!_global.BI) {
if (moduleInjection[xtype] != null) { if (moduleInjection[xtype] != null) {
_global.console && console.error("module： [" + xtype + "] 已经注册过了"); _global.console && console.error("module： [" + xtype + "] 已经注册过了");
} }
var key; if (BI.isFunction(cls)) {
cls = cls();
}
for (var k in moduleInjectionMap) { for (var k in moduleInjectionMap) {
if(cls[k]){ if (cls[k]) {
for (key in cls[k]) { for (var key in cls[k]) {
if (!moduleInjectionMap[k]) {
continue;
}
if (!moduleInjectionMap[k][key]) { if (!moduleInjectionMap[k][key]) {
moduleInjectionMap[k][key] = []; moduleInjectionMap[k][key] = [];
} }
@ -2567,24 +2572,25 @@ if (!_global.BI) {
var conf = queue[i]; var conf = queue[i];
var version = conf.opt.version; var version = conf.opt.version;
var fn = conf.fn; var fn = conf.fn;
if(modules && version) { if (modules && version) {
var findVersion = false; var findVersion = false;
for (var j = 0; j < modules.length; j++) { for (var j = 0; j < modules.length; j++) {
var module = modules[i]; var module = modules[i];
if (module && dependencies[module.moduleId] && module.version === version) { if (module && dependencies[module.moduleId] && module.version === version) {
var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion; var minVersion = dependencies[module.moduleId].minVersion,
if (minVersion && module.version < minVersion){ maxVersion = dependencies[module.moduleId].maxVersion;
if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
findVersion = true; findVersion = true;
break; break;
} }
if(maxVersion && module.version > maxVersion){ if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
findVersion = true; findVersion = true;
break; break;
} }
} }
} }
if(findVersion === true){ if (findVersion === true) {
_global.console && console.error("module: [" + type + "] 版本: [" + module.version + "] 已过期"); _global.console && console.error("moduleId: [" + module.moduleId + "] 接口: [" + type + "] 接口版本: [" + version + "] 已过期，版本要求为：", dependencies[module.moduleId], "=>", moduleInjection[module.moduleId]);
continue; continue;
} }
} }

2
dist/fineui_without_jquery_polyfill.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/font.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored
View File

File diff suppressed because one or more lines are too long

26
dist/utils.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-7-26 23:30:33 */ /*! time: 2021-7-27 10:30:32 */
/******/ (function(modules) { // webpackBootstrap /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -5372,10 +5372,15 @@ if (!_global.BI) {
if (moduleInjection[xtype] != null) { if (moduleInjection[xtype] != null) {
_global.console && console.error("module： [" + xtype + "] 已经注册过了"); _global.console && console.error("module： [" + xtype + "] 已经注册过了");
} }
var key; if (BI.isFunction(cls)) {
cls = cls();
}
for (var k in moduleInjectionMap) { for (var k in moduleInjectionMap) {
if(cls[k]){ if (cls[k]) {
for (key in cls[k]) { for (var key in cls[k]) {
if (!moduleInjectionMap[k]) {
continue;
}
if (!moduleInjectionMap[k][key]) { if (!moduleInjectionMap[k][key]) {
moduleInjectionMap[k][key] = []; moduleInjectionMap[k][key] = [];
} }
@ -5464,24 +5469,25 @@ if (!_global.BI) {
var conf = queue[i]; var conf = queue[i];
var version = conf.opt.version; var version = conf.opt.version;
var fn = conf.fn; var fn = conf.fn;
if(modules && version) { if (modules && version) {
var findVersion = false; var findVersion = false;
for (var j = 0; j < modules.length; j++) { for (var j = 0; j < modules.length; j++) {
var module = modules[i]; var module = modules[i];
if (module && dependencies[module.moduleId] && module.version === version) { if (module && dependencies[module.moduleId] && module.version === version) {
var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion; var minVersion = dependencies[module.moduleId].minVersion,
if (minVersion && module.version < minVersion){ maxVersion = dependencies[module.moduleId].maxVersion;
if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
findVersion = true; findVersion = true;
break; break;
} }
if(maxVersion && module.version > maxVersion){ if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
findVersion = true; findVersion = true;
break; break;
} }
} }
} }
if(findVersion === true){ if (findVersion === true) {
_global.console && console.error("module: [" + type + "] 版本: [" + module.version + "] 已过期"); _global.console && console.error("moduleId: [" + module.moduleId + "] 接口: [" + type + "] 接口版本: [" + version + "] 已过期，版本要求为：", dependencies[module.moduleId], "=>", moduleInjection[module.moduleId]);
continue; continue;
} }
} }

2
dist/utils.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/utils.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
examples/dev.html
Unescape View File

@ -28,7 +28,7 @@
BI.config("bi.provider.system", function (provider) { BI.config("bi.provider.system", function (provider) {
provider.addDependencies({ provider.addDependencies({
"my.module": { "my.module": {
minVersion: "1.0", minVersion: "2.0",
maxVersion: "4.0" maxVersion: "4.0"
} }
}) })

2
package.json
Unescape View File

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

21
src/core/6.inject.js
Unescape View File

@ -11,9 +11,15 @@
if (moduleInjection[xtype] != null) { if (moduleInjection[xtype] != null) {
_global.console && console.error("module： [" + xtype + "] 已经注册过了"); _global.console && console.error("module： [" + xtype + "] 已经注册过了");
} }
if (BI.isFunction(cls)) {
cls = cls();
}
for (var k in moduleInjectionMap) { for (var k in moduleInjectionMap) {
if(cls[k]){ if (cls[k]) {
for (var key in cls[k]) { for (var key in cls[k]) {
if (!moduleInjectionMap[k]) {
continue;
}
if (!moduleInjectionMap[k][key]) { if (!moduleInjectionMap[k][key]) {
moduleInjectionMap[k][key] = []; moduleInjectionMap[k][key] = [];
} }
@ -102,24 +108,25 @@
var conf = queue[i]; var conf = queue[i];
var version = conf.opt.version; var version = conf.opt.version;
var fn = conf.fn; var fn = conf.fn;
if(modules && version) { if (modules && version) {
var findVersion = false; var findVersion = false;
for (var j = 0; j < modules.length; j++) { for (var j = 0; j < modules.length; j++) {
var module = modules[i]; var module = modules[i];
if (module && dependencies[module.moduleId] && module.version === version) { if (module && dependencies[module.moduleId] && module.version === version) {
var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion; var minVersion = dependencies[module.moduleId].minVersion,
if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion){ maxVersion = dependencies[module.moduleId].maxVersion;
if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
findVersion = true; findVersion = true;
break; break;
} }
if(maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion){ if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
findVersion = true; findVersion = true;
break; break;
} }
} }
} }
if(findVersion === true){ if (findVersion === true) {
_global.console && console.error("module: [" + type + "] 版本: [" + module.version + "] 已过期"); _global.console && console.error("moduleId: [" + module.moduleId + "] 接口: [" + type + "] 接口版本: [" + version + "] 已过期，版本要求为：", dependencies[module.moduleId], "=>", moduleInjection[module.moduleId]);
continue; continue;
} }
} }

Write Preview
Loading…
Cancel
Save