cloud-web-corejs 1.0.231 → 1.0.232
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -36,7 +36,7 @@ function _typeof(obj) {
|
|
|
36
36
|
* import 相关资源
|
|
37
37
|
*/
|
|
38
38
|
import jquery from "jquery";
|
|
39
|
-
// js
|
|
39
|
+
// js颜色选择（webpack 下会注册在 npm jquery 实例上，需与全局 jQuery 同步）
|
|
40
40
|
import "@claviska/jquery-minicolors/jquery.minicolors.min";
|
|
41
41
|
// 条形码
|
|
42
42
|
import JsBarcode from "jsbarcode";
|
|
@@ -60,11 +60,18 @@ import Canvg from 'canvg';
|
|
|
60
60
|
import defaultTypeProvider from "./etypes/default-etyps-provider";
|
|
61
61
|
|
|
62
62
|
// window.$ = window.jQuery = $;
|
|
63
|
-
if(window.$){
|
|
63
|
+
if (window.$) {
|
|
64
64
|
window.jQuery = window.$;
|
|
65
|
-
}else{
|
|
65
|
+
} else {
|
|
66
66
|
window.$ = window.jQuery = jquery;
|
|
67
67
|
}
|
|
68
|
+
// minicolors 通过 require('jquery') 挂载，与页面 script 引入的全局 jQuery 可能不是同一实例
|
|
69
|
+
if (window.jQuery !== jquery && jquery.fn.minicolors && !window.jQuery.fn.minicolors) {
|
|
70
|
+
window.jQuery.fn.minicolors = jquery.fn.minicolors;
|
|
71
|
+
}
|
|
72
|
+
if (window.jQuery !== jquery && jquery.minicolors && !window.jQuery.minicolors) {
|
|
73
|
+
window.jQuery.minicolors = jquery.minicolors;
|
|
74
|
+
}
|
|
68
75
|
window.autoConnect = false;
|
|
69
76
|
window.io = io;
|
|
70
77
|
|