|
@@ -1222,9 +1222,9 @@
|
|
|
},
|
|
|
"dependencies": {
|
|
|
"core-js": {
|
|
|
- "version": "3.9.1",
|
|
|
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz",
|
|
|
- "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg=="
|
|
|
+ "version": "3.29.1",
|
|
|
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.29.1.tgz",
|
|
|
+ "integrity": "sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw=="
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -1984,9 +1984,15 @@
|
|
|
},
|
|
|
"dependencies": {
|
|
|
"@babel/parser": {
|
|
|
+<<<<<<< HEAD
|
|
|
"version": "7.21.2",
|
|
|
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
|
|
|
"integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="
|
|
|
+=======
|
|
|
+ "version": "7.21.3",
|
|
|
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
|
|
|
+ "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ=="
|
|
|
+>>>>>>> 1a5cd462e1f0e1c42d45d0ca1136eb824ca51caf
|
|
|
},
|
|
|
"postcss": {
|
|
|
"version": "8.4.21",
|
|
@@ -2423,9 +2429,9 @@
|
|
|
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
|
|
|
},
|
|
|
"ant-design-vue": {
|
|
|
- "version": "1.7.4",
|
|
|
- "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.7.4.tgz",
|
|
|
- "integrity": "sha512-f9/4I34Yq562X70aspSFzw4BCuKRICzDvIocXpsYCC+B9+kjB8db246fpSMtV/1anqxcmGHf7Vh0XJ+ovHJKMw==",
|
|
|
+ "version": "1.7.8",
|
|
|
+ "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.7.8.tgz",
|
|
|
+ "integrity": "sha512-F1hmiS9vwbyfuFvlamdW5l9bHKqRlj9wHaGDIE41NZMWXyWy8qL0UFa/+I0Wl8gQWZCqODW5pN6Yfoyn85At3A==",
|
|
|
"requires": {
|
|
|
"@ant-design/icons": "^2.1.1",
|
|
|
"@ant-design/icons-vue": "^2.0.0",
|
|
@@ -2698,9 +2704,9 @@
|
|
|
"dev": true
|
|
|
},
|
|
|
"async-validator": {
|
|
|
- "version": "3.5.1",
|
|
|
- "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.5.1.tgz",
|
|
|
- "integrity": "sha512-DDmKA7sdSAJtTVeNZHrnr2yojfFaoeW8MfQN8CeuXg8DDQHTqKk9Fdv38dSvnesHoO8MUwMI2HphOeSyIF+wmQ=="
|
|
|
+ "version": "3.5.2",
|
|
|
+ "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.5.2.tgz",
|
|
|
+ "integrity": "sha512-8eLCg00W9pIRZSB781UUX/H6Oskmm8xloZfr09lz5bikRpBVDlJ3hRVuxxP1SxcwsEYfJ4IU8Q19Y8/893r3rQ=="
|
|
|
},
|
|
|
"asynckit": {
|
|
|
"version": "0.4.0",
|
|
@@ -3866,9 +3872,9 @@
|
|
|
}
|
|
|
},
|
|
|
"classnames": {
|
|
|
- "version": "2.2.6",
|
|
|
- "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
|
|
|
- "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
|
|
|
+ "version": "2.3.2",
|
|
|
+ "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
|
|
|
+ "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
|
|
|
},
|
|
|
"clean-css": {
|
|
|
"version": "4.2.1",
|
|
@@ -4268,7 +4274,7 @@
|
|
|
"component-classes": {
|
|
|
"version": "1.2.6",
|
|
|
"resolved": "https://registry.npmjs.org/component-classes/-/component-classes-1.2.6.tgz",
|
|
|
- "integrity": "sha1-xkI5TDYYpNiwuJGe/Mu9kw5c1pE=",
|
|
|
+ "integrity": "sha512-hPFGULxdwugu1QWW3SvVOCUHLzO34+a2J6Wqy0c5ASQkfi9/8nZcBB0ZohaEbXOQlCflMAEMmEWk7u7BVs4koA==",
|
|
|
"requires": {
|
|
|
"component-indexof": "0.0.3"
|
|
|
}
|
|
@@ -4282,7 +4288,7 @@
|
|
|
"component-indexof": {
|
|
|
"version": "0.0.3",
|
|
|
"resolved": "https://registry.npmjs.org/component-indexof/-/component-indexof-0.0.3.tgz",
|
|
|
- "integrity": "sha1-EdCRMSI5648yyPJa6csAL/6NPCQ="
|
|
|
+ "integrity": "sha512-puDQKvx/64HZXb4hBwIcvQLaLgux8o1CbWl39s41hrIIZDl1lJiD5jc22gj3RBeGK0ovxALDYpIbyjqDUUl0rw=="
|
|
|
},
|
|
|
"compressible": {
|
|
|
"version": "2.0.17",
|
|
@@ -5708,14 +5714,14 @@
|
|
|
}
|
|
|
},
|
|
|
"dom-align": {
|
|
|
- "version": "1.12.0",
|
|
|
- "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.12.0.tgz",
|
|
|
- "integrity": "sha512-YkoezQuhp3SLFGdOlr5xkqZ640iXrnHAwVYcDg8ZKRUtO7mSzSC2BA5V0VuyAwPSJA4CLIc6EDDJh4bEsD2+zA=="
|
|
|
+ "version": "1.12.4",
|
|
|
+ "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.12.4.tgz",
|
|
|
+ "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw=="
|
|
|
},
|
|
|
"dom-closest": {
|
|
|
"version": "0.2.0",
|
|
|
"resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
|
|
|
- "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
|
|
|
+ "integrity": "sha512-6neTn1BtJlTSt+XSISXpnOsF1uni1CHsP/tmzZMGWxasYFHsBOqrHPnzmneqEgKhpagnfnfSfbvRRW0xFsBHAA==",
|
|
|
"requires": {
|
|
|
"dom-matches": ">=1.0.1"
|
|
|
}
|
|
@@ -5738,7 +5744,7 @@
|
|
|
"dom-matches": {
|
|
|
"version": "2.0.0",
|
|
|
"resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
|
|
|
- "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
|
|
|
+ "integrity": "sha512-2VI856xEDCLXi19W+4BechR5/oIS6bKCKqcf16GR8Pg7dGLJ/eBOWVbCmQx2ISvYH6wTNx5Ef7JTOw1dRGRx6A=="
|
|
|
},
|
|
|
"dom-scroll-into-view": {
|
|
|
"version": "2.0.1",
|
|
@@ -5858,12 +5864,21 @@
|
|
|
}
|
|
|
},
|
|
|
"echarts": {
|
|
|
+<<<<<<< HEAD
|
|
|
"version": "5.4.1",
|
|
|
"resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.1.tgz",
|
|
|
"integrity": "sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==",
|
|
|
"requires": {
|
|
|
"tslib": "2.3.0",
|
|
|
"zrender": "5.4.1"
|
|
|
+=======
|
|
|
+ "version": "5.4.2",
|
|
|
+ "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.2.tgz",
|
|
|
+ "integrity": "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==",
|
|
|
+ "requires": {
|
|
|
+ "tslib": "2.3.0",
|
|
|
+ "zrender": "5.4.3"
|
|
|
+>>>>>>> 1a5cd462e1f0e1c42d45d0ca1136eb824ca51caf
|
|
|
},
|
|
|
"dependencies": {
|
|
|
"tslib": {
|
|
@@ -9075,7 +9090,7 @@
|
|
|
"intersperse": {
|
|
|
"version": "1.0.0",
|
|
|
"resolved": "https://registry.npmjs.org/intersperse/-/intersperse-1.0.0.tgz",
|
|
|
- "integrity": "sha1-8lYfsc/vn1J3zDNHoiiGtDUaUYE="
|
|
|
+ "integrity": "sha512-LGcfug7OTeWkaQ8PEq8XbTy9Jl6uCNg8DrPnQUmwxSY8UETj1Y+LLmpdD0qHdEj6KVchuH3BE3ZzIXQ1t3oFUw=="
|
|
|
},
|
|
|
"invariant": {
|
|
|
"version": "2.2.4",
|
|
@@ -9271,9 +9286,9 @@
|
|
|
"integrity": "sha512-wW/SXnYJkTjs++tVK5b6kVITZpAZPtUrt9SF80vvxGiF/Oywal+COk1jlRkiVq15RFNEQKQY31TkV24/1T5cVg=="
|
|
|
},
|
|
|
"is-negative-zero": {
|
|
|
- "version": "2.0.1",
|
|
|
- "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
|
|
|
- "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
|
|
|
+ "version": "2.0.2",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
|
|
|
+ "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
|
|
|
},
|
|
|
"is-number": {
|
|
|
"version": "3.0.0",
|
|
@@ -11253,7 +11268,7 @@
|
|
|
"json2mq": {
|
|
|
"version": "0.2.0",
|
|
|
"resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
|
|
|
- "integrity": "sha1-tje9O6nqvhIsg+lyBIOusQ0skEo=",
|
|
|
+ "integrity": "sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==",
|
|
|
"requires": {
|
|
|
"string-convert": "^0.2.0"
|
|
|
}
|
|
@@ -11620,11 +11635,6 @@
|
|
|
"resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
|
|
|
"integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ="
|
|
|
},
|
|
|
- "lodash.toarray": {
|
|
|
- "version": "4.4.0",
|
|
|
- "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
|
|
|
- "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE="
|
|
|
- },
|
|
|
"lodash.transform": {
|
|
|
"version": "4.6.0",
|
|
|
"resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
|
|
@@ -12177,9 +12187,15 @@
|
|
|
"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
|
|
|
},
|
|
|
"nanoid": {
|
|
|
+<<<<<<< HEAD
|
|
|
"version": "3.3.4",
|
|
|
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
|
|
|
"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
|
|
|
+=======
|
|
|
+ "version": "3.3.6",
|
|
|
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
|
|
|
+ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
|
|
|
+>>>>>>> 1a5cd462e1f0e1c42d45d0ca1136eb824ca51caf
|
|
|
},
|
|
|
"nanomatch": {
|
|
|
"version": "1.2.13",
|
|
@@ -12209,9 +12225,9 @@
|
|
|
}
|
|
|
},
|
|
|
"nanopop": {
|
|
|
- "version": "2.1.0",
|
|
|
- "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.1.0.tgz",
|
|
|
- "integrity": "sha512-jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw=="
|
|
|
+ "version": "2.2.0",
|
|
|
+ "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.2.0.tgz",
|
|
|
+ "integrity": "sha512-E9JaHcxh3ere8/BEZHAcnuD10RluTSPyTToBvoFWS9/7DcCx6gyKjbn7M7Bx7E1veCxCuY1iO6h4+gdAf1j73Q=="
|
|
|
},
|
|
|
"natural-compare": {
|
|
|
"version": "1.4.0",
|
|
@@ -12256,11 +12272,18 @@
|
|
|
}
|
|
|
},
|
|
|
"node-emoji": {
|
|
|
- "version": "1.10.0",
|
|
|
- "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
|
|
|
- "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==",
|
|
|
+ "version": "1.11.0",
|
|
|
+ "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
|
|
|
+ "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==",
|
|
|
"requires": {
|
|
|
- "lodash.toarray": "^4.4.0"
|
|
|
+ "lodash": "^4.17.21"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "lodash": {
|
|
|
+ "version": "4.17.21",
|
|
|
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
|
|
+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
"node-fetch": {
|
|
@@ -15920,7 +15943,7 @@
|
|
|
"string-convert": {
|
|
|
"version": "0.2.1",
|
|
|
"resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
|
|
|
- "integrity": "sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c="
|
|
|
+ "integrity": "sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A=="
|
|
|
},
|
|
|
"string-length": {
|
|
|
"version": "2.0.0",
|
|
@@ -18169,9 +18192,9 @@
|
|
|
}
|
|
|
},
|
|
|
"zrender": {
|
|
|
- "version": "5.4.1",
|
|
|
- "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.1.tgz",
|
|
|
- "integrity": "sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==",
|
|
|
+ "version": "5.4.3",
|
|
|
+ "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.3.tgz",
|
|
|
+ "integrity": "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==",
|
|
|
"requires": {
|
|
|
"tslib": "2.3.0"
|
|
|
},
|