Prechádzať zdrojové kódy

升级 base 和 trace 模块

YangZhiJie 2 rokov pred
rodič
commit
4d5890f349
4 zmenil súbory, kde vykonal 64 pridanie a 95 odobranie
  1. 46 75
      package-lock.json
  2. 3 3
      package.json
  3. 12 14
      public/index-debug.html
  4. 3 3
      webpack.base.js

+ 46 - 75
package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "prodog-pc-client",
-  "version": "1.0.35",
+  "version": "1.0.54",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "prodog-pc-client",
-      "version": "1.0.35",
+      "version": "1.0.54",
       "dependencies": {
         "@leanwo/lowcode-utils": "^1.6.0-beta.7",
         "@leanwo/lowcode-vue-renderer": "^1.6.0-beta.7",
@@ -14,19 +14,18 @@
         "ant-design-vue": "^3.2.15",
         "axios": "^0.19.2",
         "click-outside-vue3": "^4.0.1",
-        "client-base-v4": "3.0.55",
-        "client-dic-v3": "^3.0.7",
-        "client-dictionary-v3": "^3.0.3",
-        "client-eam-v3": "^3.0.34",
-        "client-role-v3": "^3.0.7",
-        "client-trace-v3": "^1.0.4",
+        "client-base-v4": "3.0.67",
+        "client-dic-v3": "^3.0.9",
+        "client-eam-v3": "^3.0.35",
+        "client-role-v3": "^3.0.8",
+        "client-trace-v3": "^1.0.17",
         "client-wms-v3": "^3.0.4",
         "dayjs": "^1.11.6",
         "dingtalk-jsapi": "^2.8.33",
         "js-cookie": "^2.2.1",
         "lodash": "^4.17.21",
         "moment": "^2.29.4",
-        "pc-component-v3": "1.0.63",
+        "pc-component-v3": "1.0.64",
         "qrcode": "^1.5.3",
         "select2": "^4.0.13",
         "select2-bootstrap-theme": "^0.1.0-beta.10",
@@ -3734,9 +3733,9 @@
       }
     },
     "node_modules/client-base-v4": {
-      "version": "3.0.55",
-      "resolved": "http://wuzhixin.vip:4873/client-base-v4/-/client-base-v4-3.0.55.tgz",
-      "integrity": "sha512-AWBYm+aP7xUUiCAY8YSiJO/ymITOIVkrK79PS6AWsr15soXa0yWPq2moduOFeHUBZO4P2iN77oxzg1TAJx9TMw==",
+      "version": "3.0.67",
+      "resolved": "http://wuzhixin.vip:4873/client-base-v4/-/client-base-v4-3.0.67.tgz",
+      "integrity": "sha512-cXW4gzfpVa17VOJAgyMfaqxAOrE8r3wYg0SiC9TP6C+x+SDLdYdgP1n4YcPy2a+98krZu07TOlDQLDzo/9UeGw==",
       "peerDependencies": {
         "@leanwo/lowcode-utils": "^1.6.0-beta.8",
         "@leanwo/lowcode-vue-renderer": "^1.6.0-beta.9",
@@ -3745,7 +3744,7 @@
         "dayjs": "^1.11.6",
         "dingtalk-jsapi": "^2.10.3",
         "moment": "^2.29.4",
-        "pc-component-v3": "1.0.63",
+        "pc-component-v3": "1.0.64",
         "qrcode": "^1.5.3",
         "uuid": "^8.3.2",
         "v-tooltip": "^4.0.0-beta.17",
@@ -3755,9 +3754,9 @@
       }
     },
     "node_modules/client-dic-v3": {
-      "version": "3.0.7",
-      "resolved": "http://wuzhixin.vip:4873/client-dic-v3/-/client-dic-v3-3.0.7.tgz",
-      "integrity": "sha512-Jtzwu6xPBlN4zpEncIL75aCmTUGHhO7YgRMHqIo7/trVKR+SDatF6Bc+3c089Yj6UlxpTvVZCReDqEkI1MIa8Q==",
+      "version": "3.0.9",
+      "resolved": "http://wuzhixin.vip:4873/client-dic-v3/-/client-dic-v3-3.0.9.tgz",
+      "integrity": "sha512-PDvB9ufx9Pim0pD96ISAWlXuzHSphv6NKaljsOAINGPKZSsiX67SZfuOzN18SlwHQKfW3ehCmytSFO/TWTmLMw==",
       "peerDependencies": {
         "ant-design-vue": "^3.2.15",
         "axios": "^0.19.2",
@@ -3765,20 +3764,10 @@
         "vue": "^3.2.31"
       }
     },
-    "node_modules/client-dictionary-v3": {
-      "version": "3.0.3",
-      "integrity": "sha512-5uOLwRxEcaUbJK6Nh2q387ezxqlpuAzoCP4pPRi45QDjjI7AAMovnbzGeZSY6Vhe4XAwXE5/cRkbaZKxwdzwqg==",
-      "peerDependencies": {
-        "jquery": "^3.6.3",
-        "moment": "^2.29.4",
-        "pc-component-v3": "^1.0.44",
-        "vue": "^3.2.31"
-      }
-    },
     "node_modules/client-eam-v3": {
-      "version": "3.0.34",
-      "resolved": "http://wuzhixin.vip:4873/client-eam-v3/-/client-eam-v3-3.0.34.tgz",
-      "integrity": "sha512-ulbFzFMx4UV83sAS6QHyUWQ5+WqcLClwWbZRjhCr6iio/+6ZIrSL+7jaecMJwfju0BO8twIncs0/yJw3ttytcw==",
+      "version": "3.0.35",
+      "resolved": "http://wuzhixin.vip:4873/client-eam-v3/-/client-eam-v3-3.0.35.tgz",
+      "integrity": "sha512-XM5d1DoEPRgvOGY48Kds+cZcQf0ZsptTYNkDvoMf1TnSal+8aUQvgCOU7ypfXNBpgzx51/Oj34rcAjNvGngDFw==",
       "peerDependencies": {
         "ant-design-vue": "^3.2.15",
         "moment": "^2.29.4",
@@ -3788,9 +3777,9 @@
       }
     },
     "node_modules/client-role-v3": {
-      "version": "3.0.7",
-      "resolved": "http://wuzhixin.vip:4873/client-role-v3/-/client-role-v3-3.0.7.tgz",
-      "integrity": "sha512-g1CnvwcKxQH/8MOnFSwd9YqjUCBHJehUbd0ErRBhW/eoO7qc8bhmf22r84cWGM9Cg33YWiz4BnAz6NL1DoMg6A==",
+      "version": "3.0.8",
+      "resolved": "http://wuzhixin.vip:4873/client-role-v3/-/client-role-v3-3.0.8.tgz",
+      "integrity": "sha512-MtWonHxFWmZN6PsbAn+V78+G2TOV0Hy4MjcZe1GTUjoIq0oWZi8O/pFFvZ2D9moH15Mq+Xroy3kgMrctb4UUZQ==",
       "peerDependencies": {
         "ant-design-vue": "^3.2.15",
         "axios": "^0.19.2",
@@ -3802,14 +3791,13 @@
       }
     },
     "node_modules/client-trace-v3": {
-      "version": "1.0.4",
-      "resolved": "http://wuzhixin.vip:4873/client-trace-v3/-/client-trace-v3-1.0.4.tgz",
-      "integrity": "sha512-6KK+Ir63jpZ1vNTc5pBNFZD4TFv8LgnXs/oCM1OsZtLYb1DP8DU/XzRYym4YcgxnOT2eVlnCH6WkZvuBxyY5aQ==",
+      "version": "1.0.17",
+      "resolved": "http://wuzhixin.vip:4873/client-trace-v3/-/client-trace-v3-1.0.17.tgz",
+      "integrity": "sha512-Ipbu22xx8i/74qbFshWD2NG4ZeKVQ+sGmxmfVXtVHb6KNJ3ULBLG7Qm6ndOaVkysTyMYLjII1OZf9ghdgzSHLw==",
       "peerDependencies": {
         "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"
@@ -5281,12 +5269,6 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
-    "node_modules/gantt": {
-      "version": "3.1.1",
-      "resolved": "http://wuzhixin.vip:4873/gantt/-/gantt-3.1.1.tgz",
-      "integrity": "sha512-CseX/T3HHL/jE/W7VvxHvvyKxpTpJVqXAUCAo6BEQppXlNec/8RGQNQx4l823f60EtAj+RmTdBbdZccJ3xqBbA==",
-      "peer": true
-    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
@@ -7055,9 +7037,9 @@
       "dev": true
     },
     "node_modules/pc-component-v3": {
-      "version": "1.0.63",
-      "resolved": "http://wuzhixin.vip:4873/pc-component-v3/-/pc-component-v3-1.0.63.tgz",
-      "integrity": "sha512-72MYlOPbq4drITLdfnpMu+WebZx5/wNW4/QWbq/DM0T7TFL6v5B3/sanJ7uqEBlTnC+LIOnFOXKd/zQQKeNmMA==",
+      "version": "1.0.64",
+      "resolved": "http://wuzhixin.vip:4873/pc-component-v3/-/pc-component-v3-1.0.64.tgz",
+      "integrity": "sha512-bJgdDLsWw5uEgMAN8ODc0G6b5E6txLR47DsPWFYUF5JSLcw4A5KlEq6KLJWvQcvRtZxUn9fj0N2f+/VKCpOpWw==",
       "peerDependencies": {
         "v-tooltip": "^4.0.0-beta.17",
         "vue": "^3.2.31",
@@ -12582,38 +12564,33 @@
       "integrity": "sha512-sbplNecrup5oGqA3o4bo8XmvHRT6q9fvw21Z67aDbTqB9M6LF7CuYLTlLvNtOgKU6W3zst5H5zJuEh4auqA34g=="
     },
     "client-base-v4": {
-      "version": "3.0.55",
-      "resolved": "http://wuzhixin.vip:4873/client-base-v4/-/client-base-v4-3.0.55.tgz",
-      "integrity": "sha512-AWBYm+aP7xUUiCAY8YSiJO/ymITOIVkrK79PS6AWsr15soXa0yWPq2moduOFeHUBZO4P2iN77oxzg1TAJx9TMw==",
+      "version": "3.0.67",
+      "resolved": "http://wuzhixin.vip:4873/client-base-v4/-/client-base-v4-3.0.67.tgz",
+      "integrity": "sha512-cXW4gzfpVa17VOJAgyMfaqxAOrE8r3wYg0SiC9TP6C+x+SDLdYdgP1n4YcPy2a+98krZu07TOlDQLDzo/9UeGw==",
       "requires": {}
     },
     "client-dic-v3": {
-      "version": "3.0.7",
-      "resolved": "http://wuzhixin.vip:4873/client-dic-v3/-/client-dic-v3-3.0.7.tgz",
-      "integrity": "sha512-Jtzwu6xPBlN4zpEncIL75aCmTUGHhO7YgRMHqIo7/trVKR+SDatF6Bc+3c089Yj6UlxpTvVZCReDqEkI1MIa8Q==",
-      "requires": {}
-    },
-    "client-dictionary-v3": {
-      "version": "3.0.3",
-      "integrity": "sha512-5uOLwRxEcaUbJK6Nh2q387ezxqlpuAzoCP4pPRi45QDjjI7AAMovnbzGeZSY6Vhe4XAwXE5/cRkbaZKxwdzwqg==",
+      "version": "3.0.9",
+      "resolved": "http://wuzhixin.vip:4873/client-dic-v3/-/client-dic-v3-3.0.9.tgz",
+      "integrity": "sha512-PDvB9ufx9Pim0pD96ISAWlXuzHSphv6NKaljsOAINGPKZSsiX67SZfuOzN18SlwHQKfW3ehCmytSFO/TWTmLMw==",
       "requires": {}
     },
     "client-eam-v3": {
-      "version": "3.0.34",
-      "resolved": "http://wuzhixin.vip:4873/client-eam-v3/-/client-eam-v3-3.0.34.tgz",
-      "integrity": "sha512-ulbFzFMx4UV83sAS6QHyUWQ5+WqcLClwWbZRjhCr6iio/+6ZIrSL+7jaecMJwfju0BO8twIncs0/yJw3ttytcw==",
+      "version": "3.0.35",
+      "resolved": "http://wuzhixin.vip:4873/client-eam-v3/-/client-eam-v3-3.0.35.tgz",
+      "integrity": "sha512-XM5d1DoEPRgvOGY48Kds+cZcQf0ZsptTYNkDvoMf1TnSal+8aUQvgCOU7ypfXNBpgzx51/Oj34rcAjNvGngDFw==",
       "requires": {}
     },
     "client-role-v3": {
-      "version": "3.0.7",
-      "resolved": "http://wuzhixin.vip:4873/client-role-v3/-/client-role-v3-3.0.7.tgz",
-      "integrity": "sha512-g1CnvwcKxQH/8MOnFSwd9YqjUCBHJehUbd0ErRBhW/eoO7qc8bhmf22r84cWGM9Cg33YWiz4BnAz6NL1DoMg6A==",
+      "version": "3.0.8",
+      "resolved": "http://wuzhixin.vip:4873/client-role-v3/-/client-role-v3-3.0.8.tgz",
+      "integrity": "sha512-MtWonHxFWmZN6PsbAn+V78+G2TOV0Hy4MjcZe1GTUjoIq0oWZi8O/pFFvZ2D9moH15Mq+Xroy3kgMrctb4UUZQ==",
       "requires": {}
     },
     "client-trace-v3": {
-      "version": "1.0.4",
-      "resolved": "http://wuzhixin.vip:4873/client-trace-v3/-/client-trace-v3-1.0.4.tgz",
-      "integrity": "sha512-6KK+Ir63jpZ1vNTc5pBNFZD4TFv8LgnXs/oCM1OsZtLYb1DP8DU/XzRYym4YcgxnOT2eVlnCH6WkZvuBxyY5aQ==",
+      "version": "1.0.17",
+      "resolved": "http://wuzhixin.vip:4873/client-trace-v3/-/client-trace-v3-1.0.17.tgz",
+      "integrity": "sha512-Ipbu22xx8i/74qbFshWD2NG4ZeKVQ+sGmxmfVXtVHb6KNJ3ULBLG7Qm6ndOaVkysTyMYLjII1OZf9ghdgzSHLw==",
       "requires": {}
     },
     "client-wms-v3": {
@@ -13729,12 +13706,6 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
-    "gantt": {
-      "version": "3.1.1",
-      "resolved": "http://wuzhixin.vip:4873/gantt/-/gantt-3.1.1.tgz",
-      "integrity": "sha512-CseX/T3HHL/jE/W7VvxHvvyKxpTpJVqXAUCAo6BEQppXlNec/8RGQNQx4l823f60EtAj+RmTdBbdZccJ3xqBbA==",
-      "peer": true
-    },
     "gensync": {
       "version": "1.0.0-beta.2",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
@@ -15013,9 +14984,9 @@
       "dev": true
     },
     "pc-component-v3": {
-      "version": "1.0.63",
-      "resolved": "http://wuzhixin.vip:4873/pc-component-v3/-/pc-component-v3-1.0.63.tgz",
-      "integrity": "sha512-72MYlOPbq4drITLdfnpMu+WebZx5/wNW4/QWbq/DM0T7TFL6v5B3/sanJ7uqEBlTnC+LIOnFOXKd/zQQKeNmMA==",
+      "version": "1.0.64",
+      "resolved": "http://wuzhixin.vip:4873/pc-component-v3/-/pc-component-v3-1.0.64.tgz",
+      "integrity": "sha512-bJgdDLsWw5uEgMAN8ODc0G6b5E6txLR47DsPWFYUF5JSLcw4A5KlEq6KLJWvQcvRtZxUn9fj0N2f+/VKCpOpWw==",
       "requires": {}
     },
     "picocolors": {

+ 3 - 3
package.json

@@ -1,7 +1,7 @@
 {
   "name": "prodog-pc-client",
   "description": "Leanwo Prodog Client",
-  "version": "1.0.54",
+  "version": "1.0.55",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
@@ -18,12 +18,12 @@
     "ant-design-vue": "^3.2.15",
     "axios": "^0.19.2",
     "click-outside-vue3": "^4.0.1",
-    "client-base-v4": "3.0.65",
+    "client-base-v4": "3.0.67",
     "client-dic-v3": "^3.0.9",
     "client-eam-v3": "^3.0.35",
     "client-role-v3": "^3.0.8",
     "client-wms-v3": "^3.0.4",
-    "client-trace-v3": "^1.0.14",
+    "client-trace-v3": "^1.0.17",
     "dayjs": "^1.11.6",
     "dingtalk-jsapi": "^2.8.33",
     "js-cookie": "^2.2.1",

+ 12 - 14
public/index-debug.html

@@ -43,14 +43,7 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap3-dialog/dist/js/bootstrap-dialog.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/colResizable/colResizable-1.6.js"></script>
 
-	<script defer="defer" src="/static/bootstrap-treeview/bootstrap-treeview.js"></script>
-	<script defer="defer" src="/static/dhtmlxgantt/dhtmlxgantt.js"></script>
-	<script defer="defer" src="/static/dhtmlxgantt/locale/locale_cn.js"></script>
-	<script defer="defer" src="/static/dhtmlxgantt/ext/dhtmlxgantt_auto_scheduling.js"></script>
-	<script defer="defer" src="/static/dhtmlxgantt/ext/dhtmlxgantt_smart_rendering.js"></script>
-	<script defer="defer" src="/static/dhtmlxgantt/ext/dhtmlxgantt_undo.js"></script>
-	<script defer="defer" src="/static/dhtmlxgantt/ext/dhtmlxgantt_fullscreen.js"></script>
-	<script defer="defer" src="/static/dhtmlxgantt/ext/api.js"></script>
+	<script nonce="*NONCE_TOKEN*" defer="defer" src="/static/bootstrap-treeview/bootstrap-treeview.js"></script>
 
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/jQuery-ResizableColumns/jQuery.resizableColumns.js"></script>
 	<!-- <script src="../static/js/api.js"></script> -->
@@ -77,7 +70,6 @@
 	<link rel="stylesheet" type="text/css" href="/static/summernote/dist/summernote.min.css">
 	
 	
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/antv/x6/dist/x6.js"></script>
 	
 
 	
@@ -92,16 +84,22 @@
 	<div id="app">
 	</div>
 
-	<script defer="defer" nonce="*NONCE_TOKEN*"  src="/static/echarts/dist/echarts.min.js"></script>
+	<script defer="defer" src="/static/echarts/dist/echarts.min.js"></script>
 	
 
+	<script defer="defer" type="text/javascript" src="/static/summernote/dist/summernote.min.js"></script>
+	<script defer="defer" type="text/javascript" src="/static/summernote/dist/lang/summernote-zh-CN.min.js"></script>
 
-	
-	<script src="/static/summernote/dist/summernote.min.js"></script>
-	<script src="/static/summernote/dist/lang/summernote-zh-CN.min.js"></script>
-
+	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/dhtmlxgantt.js"></script>
+	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/locale/locale_cn.js"></script>
+	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_auto_scheduling.js"></script>
+	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_smart_rendering.js"></script>
+	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_undo.js"></script>
+	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/ext/dhtmlxgantt_fullscreen.js"></script>
+	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/ext/api.js"></script>
 	<!-- <script src="../static/js/fullscreen-api.js"></script> -->
 	<!-- <script src="../static/js/problem-feedback-api.js"></script> -->
+	<script defer="defer" type="text/javascript" src="/static/antv/x6/dist/x6.js"></script>
 
 </body>
 

+ 3 - 3
webpack.base.js

@@ -89,11 +89,11 @@ module.exports = {
     'vue-i18n': 'VueI18n',
     'vue-router': 'VueRouter',
     'vuex': 'Vuex',
-    '@antv/x6': 'X6',
-    'X6': 'X6',
+    // '@antv/x6': 'X6',
+    // 'X6': 'X6',
     'axios': 'axios',
     'sortablejs': 'Sortable',
-    'gantt': 'gantt'
+    // 'gantt': 'gantt'
   },
   
   plugins: [