Skip to content

公瑾 / lucky-draw

Go to a project
Toggle navigation
Toggle navigation pinning
c78ed693 by vito
Options

修复名单导入不能叠加问题

1 parent a8e64a63
Inline Side-by-side
Showing 4 changed files with 43 additions and 134 deletions
...@@ -39,22 +39,24 @@ ...@@ -39,22 +39,24 @@
39 <span 39 <span
40 class="key" 40 class="key"
41 :style="{ 41 :style="{
42 fontSize: list[item] && list[item].name ? '36px' : null, 42 fontSize: list[item - 1] && list[item - 1].name ? '36px' : null,
43 lineHeight: list[item] && list[item].name ? '80px' : null 43 lineHeight:
44 list[item - 1] && list[item - 1].name ? '80px' : null
44 }" 45 }"
45 v-if="list[item] && list[item].name" 46 v-if="list[item - 1] && list[item - 1].name"
46 > 47 >
47 {{ item }} 48 {{ item }}
48 </span> 49 </span>
49 <span 50 <span
50 class="cont" 51 class="cont"
51 :style="{ 52 :style="{
52 fontSize: list[item] && list[item].name ? '36px' : null, 53 fontSize: list[item - 1] && list[item - 1].name ? '36px' : null,
53 lineHeight: list[item] && list[item].name ? '80px' : null 54 lineHeight:
55 list[item - 1] && list[item - 1].name ? '80px' : null
54 }" 56 }"
55 > 57 >
56 <span v-if="list[item] && list[item].name"> 58 <span v-if="list[item - 1] && list[item - 1].name">
57 {{ list[item].name }} 59 {{ list[item - 1].name }}
58 </span> 60 </span>
59 <span v-else> 61 <span v-else>
60 {{ item }} 62 {{ item }}
...@@ -66,7 +68,12 @@ ...@@ -66,7 +68,12 @@
66 </transition> 68 </transition>
67 69
68 <LotteryConfig :visible.sync="showConfig" @resetconfig="reloadTagCanvas" /> 70 <LotteryConfig :visible.sync="showConfig" @resetconfig="reloadTagCanvas" />
69 <Tool @toggle="toggle" @resetConfig="reloadTagCanvas" :running="running" /> 71 <Tool
72 @toggle="toggle"
73 @resetConfig="reloadTagCanvas"
74 :running="running"
75 :closeRes="closeRes"
76 />
70 <Result :visible.sync="showResult"></Result> 77 <Result :visible.sync="showResult"></Result>
71 78
72 <span class="copy-right"> 79 <span class="copy-right">
...@@ -134,10 +141,10 @@ export default { ...@@ -134,10 +141,10 @@ export default {
134 }, 141 },
135 datas() { 142 datas() {
136 const datas = []; 143 const datas = [];
137 for (let index = 0; index < this.config.number; index++) { 144 for (let index = 1; index <= this.config.number; index++) {
138 const listData = this.list.find(d => d.key === index); 145 const listData = this.list.find(d => d.key === index);
139 datas.push({ 146 datas.push({
140 key: index + 1, 147 key: index,
141 name: listData ? listData.name : '' 148 name: listData ? listData.name : ''
142 }); 149 });
143 } 150 }
...@@ -214,16 +221,23 @@ export default { ...@@ -214,16 +221,23 @@ export default {
214 reloadTagCanvas() { 221 reloadTagCanvas() {
215 window.TagCanvas.Reload('rootcanvas'); 222 window.TagCanvas.Reload('rootcanvas');
216 }, 223 },
224 closeRes() {
225 this.showRes = false;
226 },
217 toggle(form) { 227 toggle(form) {
218 const { speed, config } = this; 228 const { speed, config } = this;
219 if (this.running) { 229 if (this.running) {
220 window.TagCanvas.SetSpeed('rootcanvas', speed()); 230 window.TagCanvas.SetSpeed('rootcanvas', speed());
221 this.showRes = true; 231 this.showRes = true;
232 this.running = !this.running;
222 this.$nextTick(() => { 233 this.$nextTick(() => {
223 this.reloadTagCanvas(); 234 this.reloadTagCanvas();
224 }); 235 });
225 } else { 236 } else {
226 this.showRes = false; 237 this.showRes = false;
238 if (!form) {
239 return;
240 }
227 const { number } = config; 241 const { number } = config;
228 const { category, mode, qty, remain, allin } = form; 242 const { category, mode, qty, remain, allin } = form;
229 let num = 1; 243 let num = 1;
...@@ -251,8 +265,8 @@ export default { ...@@ -251,8 +265,8 @@ export default {
251 }); 265 });
252 this.result = data; 266 this.result = data;
253 window.TagCanvas.SetSpeed('rootcanvas', [5, 1]); 267 window.TagCanvas.SetSpeed('rootcanvas', [5, 1]);
268 this.running = !this.running;
254 } 269 }
255 this.running = !this.running;
256 } 270 }
257 } 271 }
258 }; 272 };
...@@ -298,7 +312,7 @@ export default { ...@@ -298,7 +312,7 @@ export default {
298 animation: bounce-in 1.5s; 312 animation: bounce-in 1.5s;
299 } 313 }
300 .bounce-leave-active { 314 .bounce-leave-active {
301 animation: bounce-in 0.2s reverse; 315 animation: bounce-in 0s reverse;
302 } 316 }
303 } 317 }
304 #main { 318 #main {
......
...@@ -105,7 +105,8 @@ import { clearData, conversionCategoryName } from '@/helper/index'; ...@@ -105,7 +105,8 @@ import { clearData, conversionCategoryName } from '@/helper/index';
105 105
106 export default { 106 export default {
107 props: { 107 props: {
108 running: Boolean 108 running: Boolean,
109 closeRes: Function
109 }, 110 },
110 computed: { 111 computed: {
111 config: { 112 config: {
...@@ -165,7 +166,7 @@ export default { ...@@ -165,7 +166,7 @@ export default {
165 .then(() => { 166 .then(() => {
166 clearData(); 167 clearData();
167 this.$store.commit('setClearStore'); 168 this.$store.commit('setClearStore');
168 169 this.closeRes && this.closeRes();
169 this.$message({ 170 this.$message({
170 type: 'success', 171 type: 'success',
171 message: '重置成功!' 172 message: '重置成功!'
...@@ -209,9 +210,8 @@ export default { ...@@ -209,9 +210,8 @@ export default {
209 ); 210 );
210 }, 211 },
211 startHandler() { 212 startHandler() {
212 if (this.running) { 213 this.$emit('toggle');
213 this.$emit('toggle'); 214 if (!this.running) {
214 } else {
215 this.showSetwat = true; 215 this.showSetwat = true;
216 } 216 }
217 }, 217 },
...@@ -224,7 +224,7 @@ export default { ...@@ -224,7 +224,7 @@ export default {
224 const rows = listStr.split('\n'); 224 const rows = listStr.split('\n');
225 if (rows && rows.length > 0) { 225 if (rows && rows.length > 0) {
226 rows.forEach(item => { 226 rows.forEach(item => {
227 const rowList = item.split('\t'); 227 const rowList = item.split(/\t|\s/);
228 if (rowList.length >= 2) { 228 if (rowList.length >= 2) {
229 const key = Number(rowList[0].trim()); 229 const key = Number(rowList[0].trim());
230 const name = rowList[1].trim(); 230 const name = rowList[1].trim();
......
...@@ -73,9 +73,9 @@ export default new Vuex.Store({ ...@@ -73,9 +73,9 @@ export default new Vuex.Store({
73 setList(state, list) { 73 setList(state, list) {
74 const arr = state.list; 74 const arr = state.list;
75 list.forEach(item => { 75 list.forEach(item => {
76 const arrItem = arr.find(data => data.key === item.key); 76 const arrIndex = arr.findIndex(data => data.key === item.key);
77 if (arrItem) { 77 if (arrIndex > -1) {
78 arrItem.name === item.name; 78 arr[arrIndex].name = item.name;
79 } else { 79 } else {
80 arr.push(item); 80 arr.push(item);
81 } 81 }
......
...@@ -2366,7 +2366,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3: ...@@ -2366,7 +2366,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
2366 dependencies: 2366 dependencies:
2367 ms "2.0.0" 2367 ms "2.0.0"
2368 2368
2369 debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: 2369 debug@^3.0.0, debug@^3.1.1, debug@^3.2.5:
2370 version "3.2.6" 2370 version "3.2.6"
2371 resolved "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" 2371 resolved "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
2372 dependencies: 2372 dependencies:
...@@ -2397,10 +2397,6 @@ deep-equal@^1.0.1: ...@@ -2397,10 +2397,6 @@ deep-equal@^1.0.1:
2397 object-keys "^1.1.1" 2397 object-keys "^1.1.1"
2398 regexp.prototype.flags "^1.2.0" 2398 regexp.prototype.flags "^1.2.0"
2399 2399
2400 deep-extend@^0.6.0:
2401 version "0.6.0"
2402 resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
2403
2404 deep-is@~0.1.3: 2400 deep-is@~0.1.3:
2405 version "0.1.3" 2401 version "0.1.3"
2406 resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" 2402 resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
...@@ -2488,10 +2484,6 @@ destroy@~1.0.4: ...@@ -2488,10 +2484,6 @@ destroy@~1.0.4:
2488 version "1.0.4" 2484 version "1.0.4"
2489 resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" 2485 resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
2490 2486
2491 detect-libc@^1.0.2:
2492 version "1.0.3"
2493 resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
2494
2495 detect-node@^2.0.4: 2487 detect-node@^2.0.4:
2496 version "2.0.4" 2488 version "2.0.4"
2497 resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" 2489 resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
...@@ -3231,12 +3223,6 @@ fs-extra@^7.0.1: ...@@ -3231,12 +3223,6 @@ fs-extra@^7.0.1:
3231 jsonfile "^4.0.0" 3223 jsonfile "^4.0.0"
3232 universalify "^0.1.0" 3224 universalify "^0.1.0"
3233 3225
3234 fs-minipass@^1.2.5:
3235 version "1.2.7"
3236 resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
3237 dependencies:
3238 minipass "^2.6.0"
3239
3240 fs-minipass@^2.0.0: 3226 fs-minipass@^2.0.0:
3241 version "2.0.0" 3227 version "2.0.0"
3242 resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" 3228 resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1"
...@@ -3682,7 +3668,7 @@ human-signals@^1.1.1: ...@@ -3682,7 +3668,7 @@ human-signals@^1.1.1:
3682 version "1.1.1" 3668 version "1.1.1"
3683 resolved "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" 3669 resolved "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
3684 3670
3685 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: 3671 iconv-lite@0.4.24, iconv-lite@^0.4.24:
3686 version "0.4.24" 3672 version "0.4.24"
3687 resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" 3673 resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
3688 dependencies: 3674 dependencies:
...@@ -3702,12 +3688,6 @@ iferr@^0.1.5: ...@@ -3702,12 +3688,6 @@ iferr@^0.1.5:
3702 version "0.1.5" 3688 version "0.1.5"
3703 resolved "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" 3689 resolved "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
3704 3690
3705 ignore-walk@^3.0.1:
3706 version "3.0.3"
3707 resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
3708 dependencies:
3709 minimatch "^3.0.4"
3710
3711 ignore@^3.3.5: 3691 ignore@^3.3.5:
3712 version "3.3.10" 3692 version "3.3.10"
3713 resolved "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" 3693 resolved "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
...@@ -3794,10 +3774,6 @@ inherits@2.0.3: ...@@ -3794,10 +3774,6 @@ inherits@2.0.3:
3794 version "2.0.3" 3774 version "2.0.3"
3795 resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" 3775 resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
3796 3776
3797 ini@~1.3.0:
3798 version "1.3.5"
3799 resolved "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
3800
3801 inquirer@^6.2.2: 3777 inquirer@^6.2.2:
3802 version "6.5.2" 3778 version "6.5.2"
3803 resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" 3779 resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
...@@ -4608,25 +4584,12 @@ minipass-pipeline@^1.2.2: ...@@ -4608,25 +4584,12 @@ minipass-pipeline@^1.2.2:
4608 dependencies: 4584 dependencies:
4609 minipass "^3.0.0" 4585 minipass "^3.0.0"
4610 4586
4611 minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
4612 version "2.9.0"
4613 resolved "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
4614 dependencies:
4615 safe-buffer "^5.1.2"
4616 yallist "^3.0.0"
4617
4618 minipass@^3.0.0, minipass@^3.1.1: 4587 minipass@^3.0.0, minipass@^3.1.1:
4619 version "3.1.1" 4588 version "3.1.1"
4620 resolved "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" 4589 resolved "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
4621 dependencies: 4590 dependencies:
4622 yallist "^4.0.0" 4591 yallist "^4.0.0"
4623 4592
4624 minizlib@^1.2.1:
4625 version "1.3.3"
4626 resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
4627 dependencies:
4628 minipass "^2.9.0"
4629
4630 mississippi@^3.0.0: 4593 mississippi@^3.0.0:
4631 version "3.0.0" 4594 version "3.0.0"
4632 resolved "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" 4595 resolved "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
...@@ -4725,14 +4688,6 @@ natural-compare@^1.4.0: ...@@ -4725,14 +4688,6 @@ natural-compare@^1.4.0:
4725 version "1.4.0" 4688 version "1.4.0"
4726 resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" 4689 resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
4727 4690
4728 needle@^2.2.1:
4729 version "2.4.0"
4730 resolved "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
4731 dependencies:
4732 debug "^3.2.6"
4733 iconv-lite "^0.4.4"
4734 sax "^1.2.4"
4735
4736 negotiator@0.6.2: 4691 negotiator@0.6.2:
4737 version "0.6.2" 4692 version "0.6.2"
4738 resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" 4693 resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
...@@ -4808,21 +4763,6 @@ node-libs-browser@^2.2.1: ...@@ -4808,21 +4763,6 @@ node-libs-browser@^2.2.1:
4808 util "^0.11.0" 4763 util "^0.11.0"
4809 vm-browserify "^1.0.1" 4764 vm-browserify "^1.0.1"
4810 4765
4811 node-pre-gyp@*:
4812 version "0.14.0"
4813 resolved "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
4814 dependencies:
4815 detect-libc "^1.0.2"
4816 mkdirp "^0.5.1"
4817 needle "^2.2.1"
4818 nopt "^4.0.1"
4819 npm-packlist "^1.1.6"
4820 npmlog "^4.0.2"
4821 rc "^1.2.7"
4822 rimraf "^2.6.1"
4823 semver "^5.3.0"
4824 tar "^4.4.2"
4825
4826 node-releases@^1.1.42: 4766 node-releases@^1.1.42:
4827 version "1.1.44" 4767 version "1.1.44"
4828 resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.44.tgz#cd66438a6eb875e3eb012b6a12e48d9f4326ffd7" 4768 resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.44.tgz#cd66438a6eb875e3eb012b6a12e48d9f4326ffd7"
...@@ -4857,13 +4797,6 @@ node-sass@^4.13.0: ...@@ -4857,13 +4797,6 @@ node-sass@^4.13.0:
4857 dependencies: 4797 dependencies:
4858 abbrev "1" 4798 abbrev "1"
4859 4799
4860 nopt@^4.0.1:
4861 version "4.0.1"
4862 resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
4863 dependencies:
4864 abbrev "1"
4865 osenv "^0.1.4"
4866
4867 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0: 4800 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
4868 version "2.5.0" 4801 version "2.5.0"
4869 resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" 4802 resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
...@@ -4908,23 +4841,6 @@ normalize-wheel@^1.0.1: ...@@ -4908,23 +4841,6 @@ normalize-wheel@^1.0.1:
4908 version "1.0.1" 4841 version "1.0.1"
4909 resolved "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz#aec886affdb045070d856447df62ecf86146ec45" 4842 resolved "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz#aec886affdb045070d856447df62ecf86146ec45"
4910 4843
4911 npm-bundled@^1.0.1:
4912 version "1.1.1"
4913 resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
4914 dependencies:
4915 npm-normalize-package-bin "^1.0.1"
4916
4917 npm-normalize-package-bin@^1.0.1:
4918 version "1.0.1"
4919 resolved "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
4920
4921 npm-packlist@^1.1.6:
4922 version "1.4.7"
4923 resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848"
4924 dependencies:
4925 ignore-walk "^3.0.1"
4926 npm-bundled "^1.0.1"
4927
4928 npm-run-path@^2.0.0: 4844 npm-run-path@^2.0.0:
4929 version "2.0.2" 4845 version "2.0.2"
4930 resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" 4846 resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
...@@ -4937,7 +4853,7 @@ npm-run-path@^4.0.0: ...@@ -4937,7 +4853,7 @@ npm-run-path@^4.0.0:
4937 dependencies: 4853 dependencies:
4938 path-key "^3.0.0" 4854 path-key "^3.0.0"
4939 4855
4940 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: 4856 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
4941 version "4.1.2" 4857 version "4.1.2"
4942 resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" 4858 resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
4943 dependencies: 4859 dependencies:
...@@ -5138,7 +5054,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: ...@@ -5138,7 +5054,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
5138 version "1.0.2" 5054 version "1.0.2"
5139 resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" 5055 resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
5140 5056
5141 osenv@0, osenv@^0.1.4: 5057 osenv@0:
5142 version "0.1.5" 5058 version "0.1.5"
5143 resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" 5059 resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
5144 dependencies: 5060 dependencies:
...@@ -5872,15 +5788,6 @@ raw-body@2.4.0: ...@@ -5872,15 +5788,6 @@ raw-body@2.4.0:
5872 iconv-lite "0.4.24" 5788 iconv-lite "0.4.24"
5873 unpipe "1.0.0" 5789 unpipe "1.0.0"
5874 5790
5875 rc@^1.2.7:
5876 version "1.2.8"
5877 resolved "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
5878 dependencies:
5879 deep-extend "^0.6.0"
5880 ini "~1.3.0"
5881 minimist "^1.2.0"
5882 strip-json-comments "~2.0.1"
5883
5884 read-pkg-up@^1.0.1: 5791 read-pkg-up@^1.0.1:
5885 version "1.0.1" 5792 version "1.0.1"
5886 resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" 5793 resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
...@@ -6215,7 +6122,7 @@ sass-loader@^8.0.0: ...@@ -6215,7 +6122,7 @@ sass-loader@^8.0.0:
6215 schema-utils "^2.1.0" 6122 schema-utils "^2.1.0"
6216 semver "^6.3.0" 6123 semver "^6.3.0"
6217 6124
6218 sax@^1.2.4, sax@~1.2.4: 6125 sax@~1.2.4:
6219 version "1.2.4" 6126 version "1.2.4"
6220 resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" 6127 resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
6221 6128
...@@ -6251,7 +6158,7 @@ selfsigned@^1.10.7: ...@@ -6251,7 +6158,7 @@ selfsigned@^1.10.7:
6251 dependencies: 6158 dependencies:
6252 node-forge "0.9.0" 6159 node-forge "0.9.0"
6253 6160
6254 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: 6161 "semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
6255 version "5.7.1" 6162 version "5.7.1"
6256 resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" 6163 resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
6257 6164
...@@ -6752,7 +6659,7 @@ strip-indent@^2.0.0: ...@@ -6752,7 +6659,7 @@ strip-indent@^2.0.0:
6752 version "2.0.0" 6659 version "2.0.0"
6753 resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" 6660 resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
6754 6661
6755 strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: 6662 strip-json-comments@^2.0.1:
6756 version "2.0.1" 6663 version "2.0.1"
6757 resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" 6664 resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
6758 6665
...@@ -6829,18 +6736,6 @@ tar@^2.0.0: ...@@ -6829,18 +6736,6 @@ tar@^2.0.0:
6829 fstream "^1.0.12" 6736 fstream "^1.0.12"
6830 inherits "2" 6737 inherits "2"
6831 6738
6832 tar@^4.4.2:
6833 version "4.4.13"
6834 resolved "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
6835 dependencies:
6836 chownr "^1.1.1"
6837 fs-minipass "^1.2.5"
6838 minipass "^2.8.6"
6839 minizlib "^1.2.1"
6840 mkdirp "^0.5.0"
6841 safe-buffer "^5.1.2"
6842 yallist "^3.0.3"
6843
6844 terser-webpack-plugin@^1.4.3: 6739 terser-webpack-plugin@^1.4.3:
6845 version "1.4.3" 6740 version "1.4.3"
6846 resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" 6741 resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
...@@ -7530,7 +7425,7 @@ yallist@^2.1.2: ...@@ -7530,7 +7425,7 @@ yallist@^2.1.2:
7530 version "2.1.2" 7425 version "2.1.2"
7531 resolved "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" 7426 resolved "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
7532 7427
7533 yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: 7428 yallist@^3.0.2:
7534 version "3.1.1" 7429 version "3.1.1"
7535 resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" 7430 resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
7536 7431
......