cloud-web-corejs 1.0.54-dev.547 → 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.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "cloud-web-corejs",
3
3
  "private": false,
4
- "version": "1.0.54-dev.547",
4
+ "version": "1.0.54-dev.548",
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
7
7
  "lint": "eslint --ext .js,.vue src",
@@ -81,6 +81,7 @@
81
81
  "html-webpack-plugin": "~5.0.0",
82
82
  "husky": "1.3.1",
83
83
  "jquery": "3.6.0",
84
+ "jquery-mousewheel": "^3.2.2",
84
85
  "jsbarcode": "3.11.5",
85
86
  "lint-staged": "8.1.5",
86
87
  "nzh": "1.0.8",
@@ -35,7 +35,7 @@ function _typeof(obj) {
35
35
  /**
36
36
  * import 相关资源
37
37
  */
38
- import $ from "jquery";
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
- if(!window.$)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