cloud-web-corejs 1.0.54-dev.6 → 1.0.54-dev.61

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.6",
+  "version": "1.0.54-dev.61",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
@@ -17,6 +17,7 @@
   },
   "dependencies": {
     "@vue/preload-webpack-plugin": "^2.0.0",
+    "@zxing/library": "^0.21.3",
     "axios": "0.18.1",
     "concurrent-tasks": "1.0.7",
     "copy-webpack-plugin": "5.1.2",
@@ -26,6 +27,7 @@
     "js-base64": "^3.7.7",
     "js-cookie": "2.2.0",
     "jsqr": "^1.4.0",
+    "jszip": "^3.10.1",
     "less": "^4.2.0",
     "less-loader": "^7.0.1",
     "lodash": "4.17.21",
@@ -34,7 +36,10 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "qrcode": "^1.5.1",
+    "qrcode-decoder": "^0.3.4",
+    "qrcode-reader": "^1.0.4",
     "qs": "6.10.3",
+    "quagga": "^0.12.1",
     "sortablejs": "1.8.4",
     "spark-md5": "^3.0.1",
     "swiper": "4.0.7",
@@ -44,7 +49,8 @@
     "vue-router": "3.0.2",
     "vuex": "3.1.0",
     "vxe-table": "3.5.4",
-    "xlsx": "0.14.1"
+    "xlsx": "0.14.1",
+    "zxing": "^0.1.2"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",

package/src/components/VabUpload/index.vue

@@ -104,7 +104,8 @@
                 <p>{{ formatFileSize(file.size) }}</p>
                 <p class="f-red" v-if="file.status=='fail'">{{ file.failMsg }}</p>
               </div>
-              <el-progress :percentage="file.percentage" v-if="file.status == 'uploading'"></el-progress>
+              <el-progress :percentage="file.percentage"
+                           v-if="file.status == 'uploading' || file.status == 'preUpload'"></el-progress>
               <div class="el-upload-list__item-status-label error" v-else-if="file.status == 'fail'"><i
                 class="el-icon-upload-success iconfont icon-gantanhao"></i></div>
               <div class="el-upload-list__item-status-label" v-else-if="file.percentage==100"><i