Commit 2f5b053b authored by 铃兰's avatar 铃兰

修复bug

parent f42b5292
Pipeline #22680 passed with stages
in 1 minute and 2 seconds
...@@ -85,6 +85,15 @@ ...@@ -85,6 +85,15 @@
"url": "https://opencollective.com/popperjs" "url": "https://opencollective.com/popperjs"
} }
}, },
"node_modules/@trysound/sax": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
"dev": true,
"engines": {
"node": ">=10.13.0"
}
},
"node_modules/@types/http-proxy": { "node_modules/@types/http-proxy": {
"version": "1.17.7", "version": "1.17.7",
"dev": true, "dev": true,
...@@ -319,7 +328,12 @@ ...@@ -319,7 +328,12 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/async-validator": { "node_modules/async-validator": {
"version": "1.6.9" "version": "1.8.5",
"resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
"integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
"dependencies": {
"babel-runtime": "6.x"
}
}, },
"node_modules/atob": { "node_modules/atob": {
"version": "2.1.2", "version": "2.1.2",
...@@ -991,7 +1005,6 @@ ...@@ -991,7 +1005,6 @@
}, },
"node_modules/babel-runtime": { "node_modules/babel-runtime": {
"version": "6.26.0", "version": "6.26.0",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"core-js": "^2.4.0", "core-js": "^2.4.0",
...@@ -1148,6 +1161,15 @@ ...@@ -1148,6 +1161,15 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/bindings": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
"optional": true,
"dependencies": {
"file-uri-to-path": "1.0.0"
}
},
"node_modules/bluebird": { "node_modules/bluebird": {
"version": "3.7.2", "version": "3.7.2",
"dev": true, "dev": true,
...@@ -1451,6 +1473,19 @@ ...@@ -1451,6 +1473,19 @@
"fsevents": "~2.3.2" "fsevents": "~2.3.2"
} }
}, },
"node_modules/chokidar/node_modules/fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"hasInstallScript": true,
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
}
},
"node_modules/chokidar/node_modules/glob-parent": { "node_modules/chokidar/node_modules/glob-parent": {
"version": "5.1.2", "version": "5.1.2",
"license": "ISC", "license": "ISC",
...@@ -1469,17 +1504,6 @@ ...@@ -1469,17 +1504,6 @@
"safe-buffer": "^5.0.1" "safe-buffer": "^5.0.1"
} }
}, },
"node_modules/clap": {
"version": "1.2.3",
"dev": true,
"license": "MIT",
"dependencies": {
"chalk": "^1.1.3"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/class-utils": { "node_modules/class-utils": {
"version": "0.3.6", "version": "0.3.6",
"license": "MIT", "license": "MIT",
...@@ -1591,16 +1615,6 @@ ...@@ -1591,16 +1615,6 @@
"node": ">= 0.12.0" "node": ">= 0.12.0"
} }
}, },
"node_modules/coa": {
"version": "1.0.4",
"dev": true,
"dependencies": {
"q": "^1.1.2"
},
"engines": {
"node": ">= 0.8.0"
}
},
"node_modules/code-point-at": { "node_modules/code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"dev": true, "dev": true,
...@@ -1666,14 +1680,6 @@ ...@@ -1666,14 +1680,6 @@
"has": "^1.0.1" "has": "^1.0.1"
} }
}, },
"node_modules/colors": {
"version": "1.1.2",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.1.90"
}
},
"node_modules/commander": { "node_modules/commander": {
"version": "2.17.1", "version": "2.17.1",
"dev": true, "dev": true,
...@@ -1821,7 +1827,6 @@ ...@@ -1821,7 +1827,6 @@
}, },
"node_modules/core-js": { "node_modules/core-js": {
"version": "2.6.12", "version": "2.6.12",
"dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT" "license": "MIT"
}, },
...@@ -1980,6 +1985,28 @@ ...@@ -1980,6 +1985,28 @@
"fastparse": "^1.1.2" "fastparse": "^1.1.2"
} }
}, },
"node_modules/css-tree": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
"dev": true,
"dependencies": {
"mdn-data": "2.0.14",
"source-map": "^0.6.1"
},
"engines": {
"node": ">=8.0.0"
}
},
"node_modules/css-tree/node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/css-what": { "node_modules/css-what": {
"version": "5.1.0", "version": "5.1.0",
"dev": true, "dev": true,
...@@ -2042,18 +2069,15 @@ ...@@ -2042,18 +2069,15 @@
} }
}, },
"node_modules/csso": { "node_modules/csso": {
"version": "2.3.2", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"clap": "^1.0.9", "css-tree": "^1.1.2"
"source-map": "^0.5.3"
},
"bin": {
"csso": "bin/csso"
}, },
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=8.0.0"
} }
}, },
"node_modules/datatables.net": { "node_modules/datatables.net": {
...@@ -2730,6 +2754,12 @@ ...@@ -2730,6 +2754,12 @@
"loader-utils": "~0.2.5" "loader-utils": "~0.2.5"
} }
}, },
"node_modules/file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
"optional": true
},
"node_modules/filesize": { "node_modules/filesize": {
"version": "3.6.1", "version": "3.6.1",
"dev": true, "dev": true,
...@@ -2872,6 +2902,24 @@ ...@@ -2872,6 +2902,24 @@
"version": "1.0.0", "version": "1.0.0",
"license": "ISC" "license": "ISC"
}, },
"node_modules/fsevents": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
"deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
"hasInstallScript": true,
"optional": true,
"os": [
"darwin"
],
"dependencies": {
"bindings": "^1.5.0",
"nan": "^2.12.1"
},
"engines": {
"node": ">= 4.0"
}
},
"node_modules/function-bind": { "node_modules/function-bind": {
"version": "1.1.0", "version": "1.1.0",
"dev": true "dev": true
...@@ -3896,6 +3944,12 @@ ...@@ -3896,6 +3944,12 @@
"safe-buffer": "^5.1.2" "safe-buffer": "^5.1.2"
} }
}, },
"node_modules/mdn-data": {
"version": "2.0.14",
"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
"dev": true
},
"node_modules/media-typer": { "node_modules/media-typer": {
"version": "0.3.0", "version": "0.3.0",
"dev": true, "dev": true,
...@@ -4067,6 +4121,12 @@ ...@@ -4067,6 +4121,12 @@
"version": "2.0.0", "version": "2.0.0",
"license": "MIT" "license": "MIT"
}, },
"node_modules/nan": {
"version": "2.17.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
"integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
"optional": true
},
"node_modules/nanomatch": { "node_modules/nanomatch": {
"version": "1.2.13", "version": "1.2.13",
"license": "MIT", "license": "MIT",
...@@ -4537,6 +4597,11 @@ ...@@ -4537,6 +4597,11 @@
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/path-dirname": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
"integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="
},
"node_modules/path-exists": { "node_modules/path-exists": {
"version": "2.1.0", "version": "2.1.0",
"dev": true, "dev": true,
...@@ -4578,6 +4643,12 @@ ...@@ -4578,6 +4643,12 @@
"node": ">=0.12" "node": ">=0.12"
} }
}, },
"node_modules/picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"dev": true
},
"node_modules/picomatch": { "node_modules/picomatch": {
"version": "2.3.0", "version": "2.3.0",
"license": "MIT", "license": "MIT",
...@@ -5167,9 +5238,10 @@ ...@@ -5167,9 +5238,10 @@
} }
}, },
"node_modules/postcss-svgo/node_modules/is-svg": { "node_modules/postcss-svgo/node_modules/is-svg": {
"version": "4.3.2", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
"integrity": "sha512-Ya1giYJUkcL/94quj0+XGcmts6cETPBW1MiFz1ReJrnDJ680F52qpAEGAEGU0nq96FRGIGPx6Yo1CyPXcOoyGw==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"html-comment-regex": "^1.1.0" "html-comment-regex": "^1.1.0"
}, },
...@@ -5307,15 +5379,6 @@ ...@@ -5307,15 +5379,6 @@
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/q": {
"version": "1.5.1",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.6.0",
"teleport": ">=0.2.0"
}
},
"node_modules/qs": { "node_modules/qs": {
"version": "6.7.0", "version": "6.7.0",
"dev": true, "dev": true,
...@@ -5497,7 +5560,6 @@ ...@@ -5497,7 +5560,6 @@
}, },
"node_modules/regenerator-runtime": { "node_modules/regenerator-runtime": {
"version": "0.11.1", "version": "0.11.1",
"dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/regenerator-transform": { "node_modules/regenerator-transform": {
...@@ -5734,11 +5796,6 @@ ...@@ -5734,11 +5796,6 @@
"version": "2.1.2", "version": "2.1.2",
"license": "MIT" "license": "MIT"
}, },
"node_modules/sax": {
"version": "1.2.4",
"dev": true,
"license": "ISC"
},
"node_modules/select": { "node_modules/select": {
"version": "1.1.2", "version": "1.1.2",
"license": "MIT" "license": "MIT"
...@@ -6079,6 +6136,13 @@ ...@@ -6079,6 +6136,13 @@
"version": "4.0.1", "version": "4.0.1",
"license": "MIT" "license": "MIT"
}, },
"node_modules/stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
"dev": true
},
"node_modules/stackframe": { "node_modules/stackframe": {
"version": "0.3.1", "version": "0.3.1",
"dev": true, "dev": true,
...@@ -6175,23 +6239,33 @@ ...@@ -6175,23 +6239,33 @@
} }
}, },
"node_modules/svgo": { "node_modules/svgo": {
"version": "0.7.2", "version": "2.8.0",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"coa": "~1.0.1", "@trysound/sax": "0.2.0",
"colors": "~1.1.2", "commander": "^7.2.0",
"csso": "~2.3.1", "css-select": "^4.1.3",
"js-yaml": "2.1.3", "css-tree": "^1.1.3",
"mkdirp": "~0.5.1", "csso": "^4.2.0",
"sax": "~1.2.1", "picocolors": "^1.0.0",
"whet.extend": "~0.9.9" "stable": "^0.1.8"
}, },
"bin": { "bin": {
"svgo": "bin/svgo" "svgo": "bin/svgo"
}, },
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=10.13.0"
}
},
"node_modules/svgo/node_modules/commander": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
"dev": true,
"engines": {
"node": ">= 10"
} }
}, },
"node_modules/swiper": { "node_modules/swiper": {
...@@ -6905,6 +6979,26 @@ ...@@ -6905,6 +6979,26 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/watchpack-chokidar2/node_modules/glob-parent": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
"dependencies": {
"is-glob": "^3.1.0",
"path-dirname": "^1.0.0"
}
},
"node_modules/watchpack-chokidar2/node_modules/glob-parent/node_modules/is-glob": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
"dependencies": {
"is-extglob": "^2.1.0"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack-chokidar2/node_modules/is-accessor-descriptor": { "node_modules/watchpack-chokidar2/node_modules/is-accessor-descriptor": {
"version": "1.0.0", "version": "1.0.0",
"license": "MIT", "license": "MIT",
...@@ -7269,14 +7363,6 @@ ...@@ -7269,14 +7363,6 @@
"watchpack-chokidar2": "^2.0.1" "watchpack-chokidar2": "^2.0.1"
} }
}, },
"node_modules/whet.extend": {
"version": "0.9.9",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.6.0"
}
},
"node_modules/which-module": { "node_modules/which-module": {
"version": "1.0.0", "version": "1.0.0",
"dev": true, "dev": true,
...@@ -7417,6 +7503,12 @@ ...@@ -7417,6 +7503,12 @@
"version": "2.11.0", "version": "2.11.0",
"peer": true "peer": true
}, },
"@trysound/sax": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
"dev": true
},
"@types/http-proxy": { "@types/http-proxy": {
"version": "1.17.7", "version": "1.17.7",
"dev": true, "dev": true,
...@@ -7582,7 +7674,12 @@ ...@@ -7582,7 +7674,12 @@
"version": "1.0.3" "version": "1.0.3"
}, },
"async-validator": { "async-validator": {
"version": "1.6.9" "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"
}
}, },
"atob": { "atob": {
"version": "2.1.2" "version": "2.1.2"
...@@ -8178,7 +8275,6 @@ ...@@ -8178,7 +8275,6 @@
}, },
"babel-runtime": { "babel-runtime": {
"version": "6.26.0", "version": "6.26.0",
"dev": true,
"requires": { "requires": {
"core-js": "^2.4.0", "core-js": "^2.4.0",
"regenerator-runtime": "^0.11.0" "regenerator-runtime": "^0.11.0"
...@@ -8281,6 +8377,15 @@ ...@@ -8281,6 +8377,15 @@
"binary-extensions": { "binary-extensions": {
"version": "2.2.0" "version": "2.2.0"
}, },
"bindings": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
"optional": true,
"requires": {
"file-uri-to-path": "1.0.0"
}
},
"bluebird": { "bluebird": {
"version": "3.7.2", "version": "3.7.2",
"dev": true "dev": true
...@@ -8505,6 +8610,12 @@ ...@@ -8505,6 +8610,12 @@
"readdirp": "~3.6.0" "readdirp": "~3.6.0"
}, },
"dependencies": { "dependencies": {
"fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"optional": true
},
"glob-parent": { "glob-parent": {
"version": "5.1.2", "version": "5.1.2",
"requires": { "requires": {
...@@ -8520,13 +8631,6 @@ ...@@ -8520,13 +8631,6 @@
"safe-buffer": "^5.0.1" "safe-buffer": "^5.0.1"
} }
}, },
"clap": {
"version": "1.2.3",
"dev": true,
"requires": {
"chalk": "^1.1.3"
}
},
"class-utils": { "class-utils": {
"version": "0.3.6", "version": "0.3.6",
"requires": { "requires": {
...@@ -8603,13 +8707,6 @@ ...@@ -8603,13 +8707,6 @@
"version": "4.6.0", "version": "4.6.0",
"dev": true "dev": true
}, },
"coa": {
"version": "1.0.4",
"dev": true,
"requires": {
"q": "^1.1.2"
}
},
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"dev": true "dev": true
...@@ -8665,10 +8762,6 @@ ...@@ -8665,10 +8762,6 @@
"has": "^1.0.1" "has": "^1.0.1"
} }
}, },
"colors": {
"version": "1.1.2",
"dev": true
},
"commander": { "commander": {
"version": "2.17.1", "version": "2.17.1",
"dev": true "dev": true
...@@ -8778,8 +8871,7 @@ ...@@ -8778,8 +8871,7 @@
} }
}, },
"core-js": { "core-js": {
"version": "2.6.12", "version": "2.6.12"
"dev": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.3" "version": "1.0.3"
...@@ -8911,6 +9003,24 @@ ...@@ -8911,6 +9003,24 @@
"fastparse": "^1.1.2" "fastparse": "^1.1.2"
} }
}, },
"css-tree": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
"dev": true,
"requires": {
"mdn-data": "2.0.14",
"source-map": "^0.6.1"
},
"dependencies": {
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
}
}
},
"css-what": { "css-what": {
"version": "5.1.0", "version": "5.1.0",
"dev": true "dev": true
...@@ -8958,11 +9068,12 @@ ...@@ -8958,11 +9068,12 @@
} }
}, },
"csso": { "csso": {
"version": "2.3.2", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
"dev": true, "dev": true,
"requires": { "requires": {
"clap": "^1.0.9", "css-tree": "^1.1.2"
"source-map": "^0.5.3"
} }
}, },
"datatables.net": { "datatables.net": {
...@@ -9439,6 +9550,12 @@ ...@@ -9439,6 +9550,12 @@
"loader-utils": "~0.2.5" "loader-utils": "~0.2.5"
} }
}, },
"file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
"optional": true
},
"filesize": { "filesize": {
"version": "3.6.1", "version": "3.6.1",
"dev": true "dev": true
...@@ -9527,6 +9644,16 @@ ...@@ -9527,6 +9644,16 @@
"fs.realpath": { "fs.realpath": {
"version": "1.0.0" "version": "1.0.0"
}, },
"fsevents": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
"optional": true,
"requires": {
"bindings": "^1.5.0",
"nan": "^2.12.1"
}
},
"function-bind": { "function-bind": {
"version": "1.1.0", "version": "1.1.0",
"dev": true "dev": true
...@@ -10187,6 +10314,12 @@ ...@@ -10187,6 +10314,12 @@
"safe-buffer": "^5.1.2" "safe-buffer": "^5.1.2"
} }
}, },
"mdn-data": {
"version": "2.0.14",
"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
"dev": true
},
"media-typer": { "media-typer": {
"version": "0.3.0", "version": "0.3.0",
"dev": true "dev": true
...@@ -10296,6 +10429,12 @@ ...@@ -10296,6 +10429,12 @@
"ms": { "ms": {
"version": "2.0.0" "version": "2.0.0"
}, },
"nan": {
"version": "2.17.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
"integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
"optional": true
},
"nanomatch": { "nanomatch": {
"version": "1.2.13", "version": "1.2.13",
"requires": { "requires": {
...@@ -10615,6 +10754,11 @@ ...@@ -10615,6 +10754,11 @@
"version": "0.0.1", "version": "0.0.1",
"dev": true "dev": true
}, },
"path-dirname": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
"integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="
},
"path-exists": { "path-exists": {
"version": "2.1.0", "version": "2.1.0",
"dev": true, "dev": true,
...@@ -10642,6 +10786,12 @@ ...@@ -10642,6 +10786,12 @@
"sha.js": "^2.4.8" "sha.js": "^2.4.8"
} }
}, },
"picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"dev": true
},
"picomatch": { "picomatch": {
"version": "2.3.0" "version": "2.3.0"
}, },
...@@ -11104,7 +11254,9 @@ ...@@ -11104,7 +11254,9 @@
}, },
"dependencies": { "dependencies": {
"is-svg": { "is-svg": {
"version": "4.3.2", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
"integrity": "sha512-Ya1giYJUkcL/94quj0+XGcmts6cETPBW1MiFz1ReJrnDJ680F52qpAEGAEGU0nq96FRGIGPx6Yo1CyPXcOoyGw==",
"dev": true, "dev": true,
"requires": { "requires": {
"html-comment-regex": "^1.1.0" "html-comment-regex": "^1.1.0"
...@@ -11198,10 +11350,6 @@ ...@@ -11198,10 +11350,6 @@
"version": "1.4.1", "version": "1.4.1",
"dev": true "dev": true
}, },
"q": {
"version": "1.5.1",
"dev": true
},
"qs": { "qs": {
"version": "6.7.0", "version": "6.7.0",
"dev": true "dev": true
...@@ -11334,8 +11482,7 @@ ...@@ -11334,8 +11482,7 @@
"dev": true "dev": true
}, },
"regenerator-runtime": { "regenerator-runtime": {
"version": "0.11.1", "version": "0.11.1"
"dev": true
}, },
"regenerator-transform": { "regenerator-transform": {
"version": "0.10.1", "version": "0.10.1",
...@@ -11500,10 +11647,6 @@ ...@@ -11500,10 +11647,6 @@
"safer-buffer": { "safer-buffer": {
"version": "2.1.2" "version": "2.1.2"
}, },
"sax": {
"version": "1.2.4",
"dev": true
},
"select": { "select": {
"version": "1.1.2" "version": "1.1.2"
}, },
...@@ -11748,6 +11891,12 @@ ...@@ -11748,6 +11891,12 @@
"ssr-window": { "ssr-window": {
"version": "4.0.1" "version": "4.0.1"
}, },
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"stackframe": { "stackframe": {
"version": "0.3.1", "version": "0.3.1",
"dev": true "dev": true
...@@ -11816,16 +11965,26 @@ ...@@ -11816,16 +11965,26 @@
"dev": true "dev": true
}, },
"svgo": { "svgo": {
"version": "0.7.2", "version": "2.8.0",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
"dev": true, "dev": true,
"requires": { "requires": {
"coa": "~1.0.1", "@trysound/sax": "0.2.0",
"colors": "~1.1.2", "commander": "^7.2.0",
"csso": "~2.3.1", "css-select": "^4.1.3",
"js-yaml": "2.1.3", "css-tree": "^1.1.3",
"mkdirp": "~0.5.1", "csso": "^4.2.0",
"sax": "~1.2.1", "picocolors": "^1.0.0",
"whet.extend": "~0.9.9" "stable": "^0.1.8"
},
"dependencies": {
"commander": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
"dev": true
}
} }
}, },
"swiper": { "swiper": {
...@@ -12316,6 +12475,25 @@ ...@@ -12316,6 +12475,25 @@
"to-regex-range": "^2.1.0" "to-regex-range": "^2.1.0"
} }
}, },
"glob-parent": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
"requires": {
"is-glob": "^3.1.0",
"path-dirname": "^1.0.0"
},
"dependencies": {
"is-glob": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
"requires": {
"is-extglob": "^2.1.0"
}
}
}
},
"is-accessor-descriptor": { "is-accessor-descriptor": {
"version": "1.0.0", "version": "1.0.0",
"requires": { "requires": {
...@@ -12577,10 +12755,6 @@ ...@@ -12577,10 +12755,6 @@
"source-map": "~0.5.3" "source-map": "~0.5.3"
} }
}, },
"whet.extend": {
"version": "0.9.9",
"dev": true
},
"which-module": { "which-module": {
"version": "1.0.0", "version": "1.0.0",
"dev": true "dev": true
......
...@@ -202,7 +202,6 @@ export default { ...@@ -202,7 +202,6 @@ export default {
Footads Footads
}, },
created: function () { created: function () {
var regex_match = var regex_match =
/(nokia|iphone|android|motorola|^mot-|softbank|foma|docomo|kddi|up.browser|up.link|htc|dopod|blazer|netfront|helio|hosin|huawei|novarra|CoolPad|webos|techfaith|palmsource|blackberry|alcatel|amoi|ktouch|nexian|samsung|^sam-|s[cg]h|^lge|ericsson|philips|sagem|wellcom|bunjalloo|maui|symbian|smartphone|midp|wap|phone|windows ce|iemobile|^spice|^bird|^zte-|longcos|pantech|gionee|^sie-|portalmmm|jigs browser|hiptop|^benq|haier|^lct|operas*mobi|opera*mini|320x320|240x320|176x220)/i; /(nokia|iphone|android|motorola|^mot-|softbank|foma|docomo|kddi|up.browser|up.link|htc|dopod|blazer|netfront|helio|hosin|huawei|novarra|CoolPad|webos|techfaith|palmsource|blackberry|alcatel|amoi|ktouch|nexian|samsung|^sam-|s[cg]h|^lge|ericsson|philips|sagem|wellcom|bunjalloo|maui|symbian|smartphone|midp|wap|phone|windows ce|iemobile|^spice|^bird|^zte-|longcos|pantech|gionee|^sie-|portalmmm|jigs browser|hiptop|^benq|haier|^lct|operas*mobi|opera*mini|320x320|240x320|176x220)/i;
var u = navigator.userAgent; var u = navigator.userAgent;
...@@ -246,34 +245,34 @@ export default { ...@@ -246,34 +245,34 @@ export default {
}, },
}, },
methods: { methods: {
period(){ // 计算禁卡表发布时间间隔
// 计算禁卡表发布时间间隔 // period() {
const today = new Date(); // const today = new Date();
const year = today.getFullYear(); // const year = today.getFullYear();
const dates = [ // const dates = [
new Date(year, 0, 1), // new Date(year, 0, 1),
new Date(year, 3, 1), // new Date(year, 3, 1),
new Date(year, 6, 1), // new Date(year, 6, 1),
new Date(year, 9, 1), // new Date(year, 9, 1),
]; // ];
const season = dates.reduce((min, date) => { // const season = dates.reduce((min, date) => {
const diff = Math.floor((today - date) / (1000 * 60 * 60 * 24)); // const diff = Math.floor((today - date) / (1000 * 60 * 60 * 24));
if (today >= date && diff >= 0 && diff < min) { // if (today >= date && diff >= 0 && diff < min) {
return diff; // return diff;
} // }
return min; // return min;
}, Infinity); // }, Infinity);
// 根据select设定对应天数 // // 根据select设定对应天数
const periodMap = { // const periodMap = {
day: 1, // day: 1,
week: 7, // week: 7,
halfmonth: 15, // halfmonth: 15,
month: 30, // month: 30,
season: season // season: season
}; // };
var selectedType = $("#type").val(); // var selectedType = $("#type").val();
return periodMap[selectedType] || 1; // return periodMap[selectedType] || 1;
}, // },
navClick(data) { navClick(data) {
// console.log('%c ---------------------src' + '\\' + 'components' + '\\' + 'Cards.vue---------------------%c:238', 'background:#f034c6', 'background:#14f1a4', // console.log('%c ---------------------src' + '\\' + 'components' + '\\' + 'Cards.vue---------------------%c:238', 'background:#f034c6', 'background:#14f1a4',
...@@ -298,217 +297,193 @@ export default { ...@@ -298,217 +297,193 @@ export default {
} else { } else {
this.isActive = false; this.isActive = false;
} }
var self = this; var self = this;
this.getCount().then(function (count) {
self.totalDeck = count; // 设置totalDeck的值
// 在获取到count后调用init2
function renderPage() { function renderPage() {
if (monsterTable) {
monsterTable.clear();
monsterTable.destroy();
}
if (spellTable) {
spellTable.clear();
spellTable.destroy();
}
if (trapTable) {
trapTable.clear();
trapTable.destroy();
}
if (exTable) {
exTable.clear();
exTable.destroy();
}
if (sideTable) {
sideTable.clear();
sideTable.destroy();
}
if (monsterTable) { var server = $("#server").val() || "mycard"
monsterTable.clear(); var source = $("#source").val() || "athletic"
monsterTable.destroy(); var final_source = server + "-" + source
}
if (spellTable) { $.get('https://sapi.moecube.com:444/ygopro/analytics/single/type', {
spellTable.clear(); type: $("#type").val(),
spellTable.destroy(); lang: localStorage.getItem('lang') || 'cn',
} extra: 'name',
if (trapTable) { source: final_source
trapTable.clear(); }, function (data) {
trapTable.destroy(); var monster = data.monster;
var spell = data.spell;
var trap = data.trap;
var side = data.side;
var ex = data.ex;
monsterTable = renderTable("#monster", monster);
spellTable = renderTable("#spell", spell);
trapTable = renderTable("#trap", trap);
exTable = renderTable("#ex", ex);
sideTable = renderTable("#side", side);
});
var lang = localStorage.getItem('lang') || 'cn';
if (lang === "cn") {
if (deckTable) {
deckTable.clear();
deckTable.destroy();
} }
if (exTable) {
exTable.clear(); $.get('https://sapi.moecube.com:444/ygopro/analytics/deck/type', {
exTable.destroy();
}
if (sideTable) {
sideTable.clear();
sideTable.destroy();
}
var server = $("#server").val() || "mycard"
var source = $("#source").val() || "athletic"
var final_source = server + "-" + source
$.get('https://sapi.moecube.com:444/ygopro/analytics/single/type', {
type: $("#type").val(), type: $("#type").val(),
lang: localStorage.getItem('lang') || 'cn',
extra: 'name',
source: final_source source: final_source
}, function (data) { }, function (data) {
var monster = data.monster; var obj = data;
var spell = data.spell; if (typeof obj === 'string')
var trap = data.trap; obj = JSON.parse(data);
var side = data.side;
var ex = data.ex; var rank = 1;
monsterTable = renderTable("#monster", monster) var processData = obj.map(function (x) {
spellTable = renderTable("#spell", spell) var tagStr = [];
trapTable = renderTable("#trap", trap) var deckName = x.name;
exTable = renderTable("#ex", ex) for (var i = 0; i < x.tags.length; i++) {
sideTable = renderTable("#side", side) var tagName = x.tags[i].name || x.tags[i].toString() || "";
// console.log(data) var short_tagName = tagName.replace(deckName + "-", "");
}); tagStr.push(short_tagName)
//卡组api https://sapi.moecube.com:444/ygopro/analytics/deck/type?type=day&source=mycard-entertain }
//只显示中文 var PickRate = (0 < (x.count / (self.totalDeck)) && (x.count / (self.totalDeck)) < 1)
var lang = localStorage.getItem('lang') || 'cn'; ? ((x.count / (self.totalDeck) * 100)).toFixed(2) + "%" : "-";
if (lang === "cn") {
if (deckTable) { // 出现-是数据算出来不在0-1之间
deckTable.clear(); return [rank++, x.name, x.count, PickRate, tagStr.join(" , ")];
deckTable.destroy(); });
}
$.get('https://sapi.moecube.com:444/ygopro/analytics/deck/type', {
type: $("#type").val(),
source: final_source
}, function (data) {
var obj = data;
if (typeof obj === 'string')
obj = JSON.parse(data);
var rank = 1;
var processData = obj.map(function (x) {
var tagStr = [];
var deckName = x.name;
for (var i = 0; i < x.tags.length; i++) {
var tagName = x.tags[i].name || x.tags[i].toString() || "";
var short_tagName = tagName.replace(deckName + "-", "");
tagStr.push(short_tagName)
}
var period = self.period();
var PickRate = (0 < (x.count / (self.totalDeck * period)) && (x.count / (self.totalDeck * period)) < 1)
? ((x.count / (self.totalDeck * period) * 100)).toFixed(2) + "%" : "-";
// 出现-是数据算出来不在0-1之间
return [rank++, x.name, x.count, PickRate, tagStr.join(" , ")];
});
deckTable = $("#deck").DataTable({ deckTable = $("#deck").DataTable({
data: processData, data: processData,
pageLength: 25, pageLength: 25,
order: [ order: [
[2, "desc"] [2, "desc"]
], ],
ordering: true, ordering: true,
columns: [ columns: [
{ {title: tb_language[lang].rank},
title: tb_language[lang].rank {title: tb_language[lang].deck},
}, {title: tb_language[lang].count},
{ {title: tb_language[lang].PickRate},
title: tb_language[lang].deck {title: tb_language[lang].topTags},
}, ],
{ columnDefs: [
title: tb_language[lang].count {
}, render: function (data, type, row) {
{ return "<a href='?name=" + data + "#/deck'>" + data + "</a>";
title: tb_language[lang].PickRate
}, },
{ targets: 1
title: tb_language[lang].topTags }
}, ],
], language: tb_language[lang]
columnDefs: [
{
render: function (data, type, row) {
return "<a href='?name=" + data + "#/deck'>" + data + "</a>";
},
targets: 1
}
],
language: tb_language[lang]
});
}); });
} });
} }
}
function renderTable(tableID, tableData) { function renderTable(tableID, tableData) {
tableData = tableData || []; tableData = tableData || [];
var lang = localStorage.getItem('lang') || 'cn'; var lang = localStorage.getItem('lang') || 'cn';
var langIndex = (lang === 'en' ? 'en-US' : 'zh-CN'); var langIndex = (lang === 'en' ? 'en-US' : 'zh-CN');
var rank = 1; var rank = 1;
var processData = tableData.map(function (d) { var processData = tableData.map(function (d) {
var period = self.period(); // var period = self.period();
var PickRate = (parseInt(d.putone) + parseInt(d.puttwo) + parseInt(d.putthree)) / self.totalDeck / period; var PickRate = (parseInt(d.putone) + parseInt(d.puttwo) + parseInt(d.putthree)) / self.totalDeck;
PickRate = (0 < PickRate && PickRate < 1) ? (PickRate * 100).toFixed(2) + "%" : "-"; PickRate = (0 < PickRate && PickRate < 1) ? (PickRate * 100).toFixed(2) + "%" : "-";
// 使用率出现-是数据算出来不在0-1之间
return [ // 使用率出现-是数据算出来不在0-1之间
rank++, d.name ? d.name[langIndex] : "未知卡片", return [
d.frequency, rank++, d.name ? d.name[langIndex] : "未知卡片",
PickRate, d.frequency,
d.putone, PickRate,
d.puttwo, d.putone,
d.putthree, d.puttwo,
d.id d.putthree,
]; d.id
}); ];
var table = $(tableID).DataTable({ });
data: processData,
pageLength: 50, var table = $(tableID).DataTable({
order: [ data: processData,
[2, "desc"] pageLength: 50,
], order: [[2, "desc"]],
"ordering": true, ordering: true,
columns: [{ columns: [
title: tb_language[lang].rank {title: tb_language[lang].rank},
}, {title: tb_language[lang].cardName},
{ {title: tb_language[lang].used},
title: tb_language[lang].cardName {title: tb_language[lang].PickRate},
}, {title: tb_language[lang].put1},
{ {title: tb_language[lang].put2},
title: tb_language[lang].used {title: tb_language[lang].put3},
}, ],
{ columnDefs: [
title: tb_language[lang].PickRate {
}, render: function (data, type, row) {
{ return "<a href='https://www.ourocg.cn/search/" + row[6] + "'>" + data + "</a>";
title: tb_language[lang].put1
}, },
{ targets: 1
title: tb_language[lang].put2 },
}, ],
{ language: tb_language[lang]
title: tb_language[lang].put3 });
},
], $(".input-sm").attr("placeholder", placeholder.Deck);
"columnDefs": [{
"render": function (data, type, row) {
return "<a href='https://www.ourocg.cn/search/" + row[6] +
"'>" + data + "</a>";
},
"targets": 1
},],
"language": tb_language[lang]
});
$(".input-sm").attr("placeholder", placeholder.Deck)
return table;
}
return table;
}
renderPage();
$("#search").click(function () {
renderPage(); renderPage();
$("#search").click(function () { return false;
renderPage();
return false;
})
}); });
}, },
onChange: function () { onChange: function () {
$("#search").trigger('click') var self = this;
this.getCount() this.getCount().then(function () {
self.init2();
});
}, },
getCount: function () { getCount: function () {
var server = $("#server").val() || "mycard" var server = $("#server").val() || "mycard"
var source = $("#source").val() || "athletic" var source = $("#source").val() || "athletic"
var opt = { var opt = {
type: $("#type").val() || "day", type: $("#type").val() || "day",
source: server + "-" + source source: server + "-" + source
} };
var self = this;
return API.getCount(opt).then((res) => { return API.getCount(opt).then((res) => {
if (isNaN(res.data)) { if (isNaN(res.data)) {
return 0; return 0;
} else { } else {
this.totalDeck = res.data; this.totalDeck = res.data;
this.$forceUpdate();
return res.data; return res.data;
} }
}); });
...@@ -531,3 +506,4 @@ export default { ...@@ -531,3 +506,4 @@ export default {
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment