cloud-web-corejs 1.0.54-dev.546 → 1.0.54-dev.548
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.
|
@@ -35,7 +35,7 @@ function _typeof(obj) {
|
|
|
35
35
|
/**
|
|
36
36
|
* import 相关资源
|
|
37
37
|
*/
|
|
38
|
-
import
|
|
38
|
+
import jquery from "jquery";
|
|
39
39
|
// js颜色选择
|
|
40
40
|
import "@claviska/jquery-minicolors/jquery.minicolors.min";
|
|
41
41
|
// 条形码
|
|
@@ -59,7 +59,12 @@ import Canvg from 'canvg';
|
|
|
59
59
|
// 默认自定义拖拽列表
|
|
60
60
|
import defaultTypeProvider from "./etypes/default-etyps-provider";
|
|
61
61
|
|
|
62
|
-
window.$ = window.jQuery = $;
|
|
62
|
+
// window.$ = window.jQuery = $;
|
|
63
|
+
if(window.$){
|
|
64
|
+
window.jQuery = window.$;
|
|
65
|
+
}else{
|
|
66
|
+
window.$ = window.jQuery = jquery;
|
|
67
|
+
}
|
|
63
68
|
window.autoConnect = false;
|
|
64
69
|
window.io = io;
|
|
65
70
|
|