diff --git a/.gitignore b/.gitignore index f1884987..2056a843 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ yarn-error.log* *.njsproj *.sln *.sw* + +build/env.js diff --git a/package-lock.json b/package-lock.json index dc68c583..cff6cbd3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8177,24 +8177,29 @@ "dev": true }, "iview": { - "version": "2.14.0-rc.2", - "resolved": "https://registry.npmjs.org/iview/-/iview-2.14.0-rc.2.tgz", - "integrity": "sha512-uednXFP3yH+ow8UDJTMbq6S+5fIxkjXh5Jap2W9zp2JvmunwMmntQmF7R44ZYjq9puB5yZJVYJudNlOTHQT1lw==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/iview/-/iview-2.14.1.tgz", + "integrity": "sha512-0ykE0nN+uFSpIBqJAwUPotfamajxkYIk5U/Z/SzzQdzl1++byDF/+HDL0w/ShEvHV4h1zJJP6D9jyyK+Qu08Xg==", "requires": { "async-validator": "1.8.2", - "deepmerge": "2.1.0", + "deepmerge": "2.1.1", "element-resize-detector": "1.1.14", "js-calendar": "1.2.3", "lodash.throttle": "4.1.1", "popper.js": "1.14.3", "tinycolor2": "1.4.1", - "v-click-outside-x": "2.4.0" + "v-click-outside-x": "3.0.0" }, "dependencies": { "deepmerge": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz", - "integrity": "sha512-Q89Z26KAfA3lpPGhbF6XMfYAm3jIV3avViy6KOJ2JLzFbeWHOvPQUu5aSJIWXap3gDZC2y1eF5HXEPI2wGqgvw==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.1.tgz", + "integrity": "sha512-urQxA1smbLZ2cBbXbaYObM1dJ82aJ2H57A1C/Kklfh/ZN1bgH4G/n5KWhdNfOK11W98gqZfyYj7W4frJJRwA2w==" + }, + "v-click-outside-x": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/v-click-outside-x/-/v-click-outside-x-3.0.0.tgz", + "integrity": "sha512-VKm35tQ1tlZFXZc527v05sRXbyoQ8KKT1aeefZrcRCW+mPU4KuTiPy4pe1AH8Pibjzx80iU3pNJ4gNUFSXekUQ==" } } }, @@ -14800,11 +14805,6 @@ "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", "dev": true }, - "v-click-outside-x": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/v-click-outside-x/-/v-click-outside-x-2.4.0.tgz", - "integrity": "sha512-xAouyFRaMDD074px+J3PoxhU5nGQsIj8yxXRYyFd0/PRhY1ob3F55L9mGsd35KzXkQteajEhap6SClaMB0MENg==" - }, "validate-npm-package-license": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", diff --git a/package.json b/package.json index 1a4ad0ac..4cdc1aa2 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "cropperjs": "^1.3.5", "echarts": "^4.0.4", "html2canvas": "^1.0.0-alpha.12", - "iview": "^2.14.0-rc.1", + "iview": "^2.14.1", "iview-area": "^1.5.17", "js-cookie": "^2.2.0", "sortablejs": "^1.7.0",