Merge branch 'master' of https://prodog.leanwo.com:3000/client-2022/client-trace-v3

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "client-trace-v3",
-  "version": "1.0.0",
+  "version": "1.0.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "client-trace-v3",
-      "version": "1.0.0",
+      "version": "1.0.8",
       "devDependencies": {
         "@babel/core": "^7.17.5",
         "@babel/eslint-parser": "^7.17.0",
@@ -36,7 +36,7 @@
         "ant-design-vue": "^3.2.15",
         "gantt": "^3.1.1",
         "moment": "^2.29.4",
-        "pc-component-v3": "^1.0.45",
+        "pc-component-v3": "^1.0.64",
         "v-tooltip": "^4.0.0-beta.17",
         "vue-select": "^4.0.0-beta.6",
         "vuedraggable": "^4.1.0"
@@ -6793,9 +6793,9 @@
       }
     },
     "node_modules/pc-component-v3": {
-      "version": "1.0.49",
-      "resolved": "http://wuzhixin.vip:4873/pc-component-v3/-/pc-component-v3-1.0.49.tgz",
-      "integrity": "sha512-USSWhDMk6DC2WbWkh1b+ktYm/V/7cVUY9pSti70Y0TdC9gRnZeS1quDyH9BxW/hftr6zqy45RCMEGB3drUh+Lw==",
+      "version": "1.0.64",
+      "resolved": "http://wuzhixin.vip:4873/pc-component-v3/-/pc-component-v3-1.0.64.tgz",
+      "integrity": "sha512-bJgdDLsWw5uEgMAN8ODc0G6b5E6txLR47DsPWFYUF5JSLcw4A5KlEq6KLJWvQcvRtZxUn9fj0N2f+/VKCpOpWw==",
       "peer": true,
       "peerDependencies": {
         "v-tooltip": "^4.0.0-beta.17",
@@ -14153,9 +14153,9 @@
       "dev": true
     },
     "pc-component-v3": {
-      "version": "1.0.49",
-      "resolved": "http://wuzhixin.vip:4873/pc-component-v3/-/pc-component-v3-1.0.49.tgz",
-      "integrity": "sha512-USSWhDMk6DC2WbWkh1b+ktYm/V/7cVUY9pSti70Y0TdC9gRnZeS1quDyH9BxW/hftr6zqy45RCMEGB3drUh+Lw==",
+      "version": "1.0.64",
+      "resolved": "http://wuzhixin.vip:4873/pc-component-v3/-/pc-component-v3-1.0.64.tgz",
+      "integrity": "sha512-bJgdDLsWw5uEgMAN8ODc0G6b5E6txLR47DsPWFYUF5JSLcw4A5KlEq6KLJWvQcvRtZxUn9fj0N2f+/VKCpOpWw==",
       "peer": true,
       "requires": {}
     },

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-trace-v3",
   "description": "client-trace-v3",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "author": "yangzhijie <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "webpack serve --config ./webpack.dev.js",

src/main.js

@@ -12,9 +12,10 @@ import Antd from 'ant-design-vue';
 
 import 'jquery';
 
-import gantt from 'gantt';
+// gantt 全局引用
+// import gantt from 'gantt';
 
-console.log(gantt);
+// console.log(gantt);
 // bug fixed by jack 
 // 在加载 css 的时候 font 不能被正确的加载
 // import './assets/summernote.css';

src/trace/ProjectManagement.vue

@@ -23,14 +23,14 @@ import Common from '../common/Common.js';
 
 import GanttScale from '../widget/GanttScale2.vue';
 
-import gantt from 'gantt';
+// import gantt from 'gantt';
 
 export default {
 
   components: {
     
     
-    gantt,
+    // gantt,
     GanttScale,
   },
   data: function () {

src/widget/GanttScale2.vue

@@ -50,7 +50,7 @@
 
 import Common from '../common/Common.js';
 
-import gantt from 'gantt';
+// import gantt from 'gantt';
 import { Notify } from 'pc-component-v3';
 
 

webpack.base.js

@@ -74,7 +74,7 @@ module.exports = {
     'vue-i18n': 'VueI18n',
     'vue-router': 'VueRouter',
     'vuex': 'Vuex',
-    'gantt': 'gantt'
+    // 'gantt': 'gantt'
   },
   
   plugins: [