Merge branch 'master' of http://113.105.137.151:22280/youjj/cloud-platform-ui

package-lock.json

@@ -294,9 +294,12 @@
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
     },
     "async-validator": {
-      "version": "1.6.9",
-      "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.6.9.tgz",
-      "integrity": "sha1-qDCdqouDQhzb1GKOAm1quyUZLTQ="
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
+      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
+      "requires": {
+        "babel-runtime": "6.x"
+      }
     },
     "asynckit": {
       "version": "0.4.0",
@@ -575,9 +578,9 @@
       }
     },
     "babel-helper-vue-jsx-merge-props": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.2.tgz",
-      "integrity": "sha1-rOscNzWIJ54nVeoc/TXCI5T9M/g="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+      "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
     },
     "babel-helpers": {
       "version": "6.24.1",
@@ -1121,7 +1124,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
@@ -2222,8 +2224,7 @@
     "core-js": {
       "version": "2.5.1",
       "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.5.1.tgz",
-      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
-      "dev": true
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -2646,7 +2647,7 @@
     "deepmerge": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M="
+      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
     },
     "define-property": {
       "version": "2.0.2",
@@ -2936,13 +2937,15 @@
       "dev": true
     },
     "element-ui": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-1.4.1.tgz",
-      "integrity": "sha1-9EccrbQ9x3nDCY3HNjSuqU0D8lU=",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.12.0.tgz",
+      "integrity": "sha512-DapyT0PW4i/1ETPHk8K8Qbe8B6hj10+dXsRTrOTFryV9wAs6e9mCxbV65awokyR2/v/KuIHJmqX+mH3wUa4rOQ==",
       "requires": {
-        "async-validator": "1.6.9",
+        "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
         "deepmerge": "^1.2.0",
+        "normalize-wheel": "^1.0.1",
+        "resize-observer-polyfill": "^1.5.0",
         "throttle-debounce": "^1.0.1"
       }
     },
@@ -7290,6 +7293,11 @@
         "sort-keys": "^1.0.0"
       }
     },
+    "normalize-wheel": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+    },
     "normalize.css": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-3.0.2.tgz",
@@ -9499,8 +9507,7 @@
     "regenerator-runtime": {
       "version": "0.11.0",
       "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE=",
-      "dev": true
+      "integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE="
     },
     "regenerator-transform": {
       "version": "0.10.1",
@@ -9757,6 +9764,11 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
+    "resize-observer-polyfill": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+    },
     "resolve": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
@@ -10806,9 +10818,9 @@
       "dev": true
     },
     "throttle-debounce": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.0.1.tgz",
-      "integrity": "sha1-2tD+Ew+drzcZ/eoz3Dao5rp/MLU="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
+      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
     },
     "through": {
       "version": "2.3.8",

package.json

@@ -17,7 +17,7 @@
     "codemirror": "5.26.0",
     "dropzone": "5.1.0",
     "echarts": "3.6.2",
-    "element-ui": "1.4.1",
+    "element-ui": "^2.12.0",
     "file-saver": "1.3.3",
     "jquery": "^3.4.0",
     "js-cookie": "2.1.4",