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

3 years ago · 7d68d6e506
41 changed files with 165 additions and 116 deletions
--- a/dist/2.0/fineui.css
+++ b/dist/2.0/fineui.css
--- a/dist/2.0/fineui.ie.min.js
+++ b/dist/2.0/fineui.ie.min.js
--- a/dist/2.0/fineui.ie.min.js.map
+++ b/dist/2.0/fineui.ie.min.js.map
--- a/dist/2.0/fineui.js
+++ b/dist/2.0/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2021-7-26 23:30:33 */
+/*! time: 2021-7-27 10:30:32 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -4158,10 +4158,15 @@ if (!_global.BI) {
        if (moduleInjection[xtype] != null) {
            _global.console && console.error("module： [" + xtype + "] 已经注册过了");
        }
-        var key;
+        if (BI.isFunction(cls)) {
+            cls = cls();
+        }
        for (var k in moduleInjectionMap) {
            if (cls[k]) {
-                for (key in cls[k]) {
+                for (var key in cls[k]) {
+                    if (!moduleInjectionMap[k]) {
+                        continue;
+                    }
                    if (!moduleInjectionMap[k][key]) {
                        moduleInjectionMap[k][key] = [];
                    }
@ -4255,19 +4260,20 @@ if (!_global.BI) {
                        for (var j = 0; j < modules.length; j++) {
                            var module = modules[i];
                            if (module && dependencies[module.moduleId] && module.version === version) {
-                                var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion;
-                                if (minVersion && module.version < minVersion){
+                                var minVersion = dependencies[module.moduleId].minVersion,
+                                    maxVersion = dependencies[module.moduleId].maxVersion;
+                                if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
                                    findVersion = true;
                                    break;
                                }
-                                if(maxVersion && module.version > maxVersion){
+                                if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
                                    findVersion = true;
                                    break;
                                }
                            }
                        }
                        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;
                        }
                    }
--- a/dist/2.0/fineui.js.map
+++ b/dist/2.0/fineui.js.map
--- a/dist/2.0/fineui.min.css
+++ b/dist/2.0/fineui.min.css
--- a/dist/2.0/fineui.min.js
+++ b/dist/2.0/fineui.min.js
--- a/dist/2.0/fineui.min.js.map
+++ b/dist/2.0/fineui.min.js.map
--- a/dist/2.0/fineui_without_normalize.css
+++ b/dist/2.0/fineui_without_normalize.css
--- a/dist/2.0/fineui_without_normalize.min.css
+++ b/dist/2.0/fineui_without_normalize.min.css
--- a/dist/core.css
+++ b/dist/core.css
--- a/dist/core.js
+++ b/dist/core.js
@ -1,4 +1,4 @@
-/*! time: 2021-7-26 23:30:33 */
+/*! time: 2021-7-27 10:30:32 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -4158,10 +4158,15 @@ if (!_global.BI) {
        if (moduleInjection[xtype] != null) {
            _global.console && console.error("module： [" + xtype + "] 已经注册过了");
        }
-        var key;
+        if (BI.isFunction(cls)) {
+            cls = cls();
+        }
        for (var k in moduleInjectionMap) {
            if (cls[k]) {
-                for (key in cls[k]) {
+                for (var key in cls[k]) {
+                    if (!moduleInjectionMap[k]) {
+                        continue;
+                    }
                    if (!moduleInjectionMap[k][key]) {
                        moduleInjectionMap[k][key] = [];
                    }
@ -4255,19 +4260,20 @@ if (!_global.BI) {
                        for (var j = 0; j < modules.length; j++) {
                            var module = modules[i];
                            if (module && dependencies[module.moduleId] && module.version === version) {
-                                var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion;
-                                if (minVersion && module.version < minVersion){
+                                var minVersion = dependencies[module.moduleId].minVersion,
+                                    maxVersion = dependencies[module.moduleId].maxVersion;
+                                if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
                                    findVersion = true;
                                    break;
                                }
-                                if(maxVersion && module.version > maxVersion){
+                                if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
                                    findVersion = true;
                                    break;
                                }
                            }
                        }
                        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;
                        }
                    }
--- a/dist/core.js.map
+++ b/dist/core.js.map
--- a/dist/demo.css
+++ b/dist/demo.css
--- a/dist/demo.js
+++ b/dist/demo.js
@ -1,4 +1,4 @@
-/*! time: 2021-7-26 23:30:33 */
+/*! time: 2021-7-27 10:30:32 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -4158,10 +4158,15 @@ if (!_global.BI) {
        if (moduleInjection[xtype] != null) {
            _global.console && console.error("module： [" + xtype + "] 已经注册过了");
        }
-        var key;
+        if (BI.isFunction(cls)) {
+            cls = cls();
+        }
        for (var k in moduleInjectionMap) {
            if (cls[k]) {
-                for (key in cls[k]) {
+                for (var key in cls[k]) {
+                    if (!moduleInjectionMap[k]) {
+                        continue;
+                    }
                    if (!moduleInjectionMap[k][key]) {
                        moduleInjectionMap[k][key] = [];
                    }
@ -4255,19 +4260,20 @@ if (!_global.BI) {
                        for (var j = 0; j < modules.length; j++) {
                            var module = modules[i];
                            if (module && dependencies[module.moduleId] && module.version === version) {
-                                var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion;
-                                if (minVersion && module.version < minVersion){
+                                var minVersion = dependencies[module.moduleId].minVersion,
+                                    maxVersion = dependencies[module.moduleId].maxVersion;
+                                if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
                                    findVersion = true;
                                    break;
                                }
-                                if(maxVersion && module.version > maxVersion){
+                                if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
                                    findVersion = true;
                                    break;
                                }
                            }
                        }
                        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;
                        }
                    }
--- a/dist/demo.js.map
+++ b/dist/demo.js.map
--- a/dist/fineui.css
+++ b/dist/fineui.css
--- a/dist/fineui.ie.min.js
+++ b/dist/fineui.ie.min.js
--- a/dist/fineui.ie.min.js.map
+++ b/dist/fineui.ie.min.js.map
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2021-7-26 23:30:33 */
+/*! time: 2021-7-27 10:30:32 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -4158,10 +4158,15 @@ if (!_global.BI) {
        if (moduleInjection[xtype] != null) {
            _global.console && console.error("module： [" + xtype + "] 已经注册过了");
        }
-        var key;
+        if (BI.isFunction(cls)) {
+            cls = cls();
+        }
        for (var k in moduleInjectionMap) {
            if (cls[k]) {
-                for (key in cls[k]) {
+                for (var key in cls[k]) {
+                    if (!moduleInjectionMap[k]) {
+                        continue;
+                    }
                    if (!moduleInjectionMap[k][key]) {
                        moduleInjectionMap[k][key] = [];
                    }
@ -4255,19 +4260,20 @@ if (!_global.BI) {
                        for (var j = 0; j < modules.length; j++) {
                            var module = modules[i];
                            if (module && dependencies[module.moduleId] && module.version === version) {
-                                var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion;
-                                if (minVersion && module.version < minVersion){
+                                var minVersion = dependencies[module.moduleId].minVersion,
+                                    maxVersion = dependencies[module.moduleId].maxVersion;
+                                if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
                                    findVersion = true;
                                    break;
                                }
-                                if(maxVersion && module.version > maxVersion){
+                                if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
                                    findVersion = true;
                                    break;
                                }
                            }
                        }
                        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;
                        }
                    }
--- a/dist/fineui.js.map
+++ b/dist/fineui.js.map
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui.min.js.map
+++ b/dist/fineui.min.js.map
--- a/dist/fineui.proxy.css
+++ b/dist/fineui.proxy.css
--- a/dist/fineui.proxy.js
+++ b/dist/fineui.proxy.js
@ -1,4 +1,4 @@
-/*! time: 2021-7-26 23:30:33 */
+/*! time: 2021-7-27 10:30:32 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -2475,10 +2475,15 @@ if (!_global.BI) {
        if (moduleInjection[xtype] != null) {
            _global.console && console.error("module： [" + xtype + "] 已经注册过了");
        }
-        var key;
+        if (BI.isFunction(cls)) {
+            cls = cls();
+        }
        for (var k in moduleInjectionMap) {
            if (cls[k]) {
-                for (key in cls[k]) {
+                for (var key in cls[k]) {
+                    if (!moduleInjectionMap[k]) {
+                        continue;
+                    }
                    if (!moduleInjectionMap[k][key]) {
                        moduleInjectionMap[k][key] = [];
                    }
@ -2572,19 +2577,20 @@ if (!_global.BI) {
                        for (var j = 0; j < modules.length; j++) {
                            var module = modules[i];
                            if (module && dependencies[module.moduleId] && module.version === version) {
-                                var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion;
-                                if (minVersion && module.version < minVersion){
+                                var minVersion = dependencies[module.moduleId].minVersion,
+                                    maxVersion = dependencies[module.moduleId].maxVersion;
+                                if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
                                    findVersion = true;
                                    break;
                                }
-                                if(maxVersion && module.version > maxVersion){
+                                if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
                                    findVersion = true;
                                    break;
                                }
                            }
                        }
                        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;
                        }
                    }
--- a/dist/fineui.proxy.js.map
+++ b/dist/fineui.proxy.js.map
--- a/dist/fineui.proxy.min.css
+++ b/dist/fineui.proxy.min.css
--- a/dist/fineui.proxy.min.js
+++ b/dist/fineui.proxy.min.js
--- a/dist/fineui.proxy.min.js.map
+++ b/dist/fineui.proxy.min.js.map
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -1,4 +1,4 @@
-/*! time: 2021-7-26 23:30:33 */
+/*! time: 2021-7-27 10:30:32 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -2475,10 +2475,15 @@ if (!_global.BI) {
        if (moduleInjection[xtype] != null) {
            _global.console && console.error("module： [" + xtype + "] 已经注册过了");
        }
-        var key;
+        if (BI.isFunction(cls)) {
+            cls = cls();
+        }
        for (var k in moduleInjectionMap) {
            if (cls[k]) {
-                for (key in cls[k]) {
+                for (var key in cls[k]) {
+                    if (!moduleInjectionMap[k]) {
+                        continue;
+                    }
                    if (!moduleInjectionMap[k][key]) {
                        moduleInjectionMap[k][key] = [];
                    }
@ -2572,19 +2577,20 @@ if (!_global.BI) {
                        for (var j = 0; j < modules.length; j++) {
                            var module = modules[i];
                            if (module && dependencies[module.moduleId] && module.version === version) {
-                                var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion;
-                                if (minVersion && module.version < minVersion){
+                                var minVersion = dependencies[module.moduleId].minVersion,
+                                    maxVersion = dependencies[module.moduleId].maxVersion;
+                                if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
                                    findVersion = true;
                                    break;
                                }
-                                if(maxVersion && module.version > maxVersion){
+                                if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
                                    findVersion = true;
                                    break;
                                }
                            }
                        }
                        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;
                        }
                    }
--- a/dist/fineui_without_jquery_polyfill.js.map
+++ b/dist/fineui_without_jquery_polyfill.js.map
--- a/dist/font.css
+++ b/dist/font.css
--- a/dist/resource.css
+++ b/dist/resource.css
--- a/dist/utils.js
+++ b/dist/utils.js
@ -1,4 +1,4 @@
-/*! time: 2021-7-26 23:30:33 */
+/*! time: 2021-7-27 10:30:32 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -5372,10 +5372,15 @@ if (!_global.BI) {
        if (moduleInjection[xtype] != null) {
            _global.console && console.error("module： [" + xtype + "] 已经注册过了");
        }
-        var key;
+        if (BI.isFunction(cls)) {
+            cls = cls();
+        }
        for (var k in moduleInjectionMap) {
            if (cls[k]) {
-                for (key in cls[k]) {
+                for (var key in cls[k]) {
+                    if (!moduleInjectionMap[k]) {
+                        continue;
+                    }
                    if (!moduleInjectionMap[k][key]) {
                        moduleInjectionMap[k][key] = [];
                    }
@ -5469,19 +5474,20 @@ if (!_global.BI) {
                        for (var j = 0; j < modules.length; j++) {
                            var module = modules[i];
                            if (module && dependencies[module.moduleId] && module.version === version) {
-                                var minVersion = dependencies[module.moduleId].minVersion, maxVersion = dependencies[module.moduleId].maxVersion;
-                                if (minVersion && module.version < minVersion){
+                                var minVersion = dependencies[module.moduleId].minVersion,
+                                    maxVersion = dependencies[module.moduleId].maxVersion;
+                                if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
                                    findVersion = true;
                                    break;
                                }
-                                if(maxVersion && module.version > maxVersion){
+                                if (maxVersion && (moduleInjection[module.moduleId].version || version) > maxVersion) {
                                    findVersion = true;
                                    break;
                                }
                            }
                        }
                        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;
                        }
                    }
--- a/dist/utils.js.map
+++ b/dist/utils.js.map
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/dist/utils.min.js.map
+++ b/dist/utils.min.js.map
--- a/examples/dev.html
+++ b/examples/dev.html
@ -28,7 +28,7 @@
    BI.config("bi.provider.system", function (provider) {
        provider.addDependencies({
            "my.module": {
-                minVersion: "1.0",
+                minVersion: "2.0",
                maxVersion: "4.0"
            }
        })
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fineui",
-  "version": "2.0.20210726233222",
+  "version": "2.0.20210727103227",
  "description": "fineui",
  "main": "dist/fineui.min.js",
  "types": "dist/lib/index.d.ts",
--- a/src/core/6.inject.js
+++ b/src/core/6.inject.js
@ -11,9 +11,15 @@
        if (moduleInjection[xtype] != null) {
            _global.console && console.error("module： [" + xtype + "] 已经注册过了");
        }
+        if (BI.isFunction(cls)) {
+            cls = cls();
+        }
        for (var k in moduleInjectionMap) {
            if (cls[k]) {
                for (var key in cls[k]) {
+                    if (!moduleInjectionMap[k]) {
+                        continue;
+                    }
                    if (!moduleInjectionMap[k][key]) {
                        moduleInjectionMap[k][key] = [];
                    }
@ -107,7 +113,8 @@
                        for (var j = 0; j < modules.length; j++) {
                            var module = modules[i];
                            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,
+                                    maxVersion = dependencies[module.moduleId].maxVersion;
                                if (minVersion && (moduleInjection[module.moduleId].version || version) < minVersion) {
                                    findVersion = true;
                                    break;
@ -119,7 +126,7 @@
                            }
                        }
                        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;
                        }
                    }