From fafe4813bf4114f2c517ed6148513e6f593e6b6c Mon Sep 17 00:00:00 2001 From: lixg Date: Mon, 13 Feb 2023 16:26:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=85=B3=E5=8D=A1?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 992 ++++++++++++++++-- package.json | 2 + src/api/api.js | 4 +- src/api/request.js | 15 +- .../image/pathDetails/pathDetailBack.png | Bin 0 -> 22342 bytes .../image/pathDetails/pathDetailImg.png | Bin 0 -> 4649 bytes .../image/pathDetails/pathDetailImgSelect.png | Bin 0 -> 5660 bytes src/components/PathDetailImage.vue | 147 +++ src/views/discuss/DiscussPage.vue | 157 ++- src/views/discuss/DiscussUpload.vue | 140 ++- src/views/pathmap/PathDetails.vue | 119 +++ src/views/projectdetails/ProjectPath.vue | 2 +- 12 files changed, 1422 insertions(+), 156 deletions(-) create mode 100644 src/assets/image/pathDetails/pathDetailBack.png create mode 100644 src/assets/image/pathDetails/pathDetailImg.png create mode 100644 src/assets/image/pathDetails/pathDetailImgSelect.png create mode 100644 src/components/PathDetailImage.vue create mode 100644 src/views/pathmap/PathDetails.vue diff --git a/package-lock.json b/package-lock.json index bd50f1b..a840f86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "jdfstudy", "version": "0.1.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, -<<<<<<< HEAD -======= "packages": { "": { "name": "jdfstudy", "version": "0.1.0", "dependencies": { + "@wangeditor/editor": "^5.1.23", + "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", "core-js": "^3.26.0", "dayjs": "^1.11.6", @@ -1696,7 +1696,6 @@ "version": "7.19.0", "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.19.0.tgz", "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==", - "dev": true, "dependencies": { "regenerator-runtime": "^0.13.4" }, @@ -2414,6 +2413,11 @@ "node": ">=10" } }, + "node_modules/@transloadit/prettier-bytes": { + "version": "0.0.7", + "resolved": "https://registry.npmmirror.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz", + "integrity": "sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==" + }, "node_modules/@trysound/sax": { "version": "0.2.0", "resolved": "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz", @@ -2487,6 +2491,11 @@ "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==", "dev": true }, + "node_modules/@types/event-emitter": { + "version": "0.3.3", + "resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.3.tgz", + "integrity": "sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==" + }, "node_modules/@types/express": { "version": "4.17.14", "resolved": "https://registry.npmmirror.com/@types/express/-/express-4.17.14.tgz", @@ -2650,6 +2659,56 @@ "@types/node": "*" } }, + "node_modules/@uppy/companion-client": { + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@uppy/companion-client/-/companion-client-2.2.2.tgz", + "integrity": "sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==", + "dependencies": { + "@uppy/utils": "^4.1.2", + "namespace-emitter": "^2.0.1" + } + }, + "node_modules/@uppy/core": { + "version": "2.3.4", + "resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz", + "integrity": "sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==", + "dependencies": { + "@transloadit/prettier-bytes": "0.0.7", + "@uppy/store-default": "^2.1.1", + "@uppy/utils": "^4.1.3", + "lodash.throttle": "^4.1.1", + "mime-match": "^1.0.2", + "namespace-emitter": "^2.0.1", + "nanoid": "^3.1.25", + "preact": "^10.5.13" + } + }, + "node_modules/@uppy/store-default": { + "version": "2.1.1", + "resolved": "https://registry.npmmirror.com/@uppy/store-default/-/store-default-2.1.1.tgz", + "integrity": "sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==" + }, + "node_modules/@uppy/utils": { + "version": "4.1.3", + "resolved": "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.3.tgz", + "integrity": "sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==", + "dependencies": { + "lodash.throttle": "^4.1.1" + } + }, + "node_modules/@uppy/xhr-upload": { + "version": "2.1.3", + "resolved": "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz", + "integrity": "sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==", + "dependencies": { + "@uppy/companion-client": "^2.2.2", + "@uppy/utils": "^4.1.2", + "nanoid": "^3.1.25" + }, + "peerDependencies": { + "@uppy/core": "^2.3.3" + } + }, "node_modules/@vitejs/plugin-legacy": { "version": "2.3.1", "resolved": "https://registry.npmmirror.com/@vitejs/plugin-legacy/-/plugin-legacy-2.3.1.tgz", @@ -3480,6 +3539,156 @@ } } }, + "node_modules/@wangeditor/basic-modules": { + "version": "1.1.7", + "resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz", + "integrity": "sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==", + "dependencies": { + "is-url": "^1.2.4" + }, + "peerDependencies": { + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "lodash.throttle": "^4.1.1", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/code-highlight": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz", + "integrity": "sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==", + "dependencies": { + "prismjs": "^1.23.0" + }, + "peerDependencies": { + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/core": { + "version": "1.1.19", + "resolved": "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.19.tgz", + "integrity": "sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==", + "dependencies": { + "@types/event-emitter": "^0.3.3", + "event-emitter": "^0.3.5", + "html-void-elements": "^2.0.0", + "i18next": "^20.4.0", + "scroll-into-view-if-needed": "^2.2.28", + "slate-history": "^0.66.0" + }, + "peerDependencies": { + "@uppy/core": "^2.1.1", + "@uppy/xhr-upload": "^2.0.3", + "dom7": "^3.0.0", + "is-hotkey": "^0.2.0", + "lodash.camelcase": "^4.3.0", + "lodash.clonedeep": "^4.5.0", + "lodash.debounce": "^4.0.8", + "lodash.foreach": "^4.5.0", + "lodash.isequal": "^4.5.0", + "lodash.throttle": "^4.1.1", + "lodash.toarray": "^4.4.0", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/editor": { + "version": "5.1.23", + "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz", + "integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==", + "dependencies": { + "@uppy/core": "^2.1.1", + "@uppy/xhr-upload": "^2.0.3", + "@wangeditor/basic-modules": "^1.1.7", + "@wangeditor/code-highlight": "^1.0.3", + "@wangeditor/core": "^1.1.19", + "@wangeditor/list-module": "^1.0.5", + "@wangeditor/table-module": "^1.1.4", + "@wangeditor/upload-image-module": "^1.0.2", + "@wangeditor/video-module": "^1.1.4", + "dom7": "^3.0.0", + "is-hotkey": "^0.2.0", + "lodash.camelcase": "^4.3.0", + "lodash.clonedeep": "^4.5.0", + "lodash.debounce": "^4.0.8", + "lodash.foreach": "^4.5.0", + "lodash.isequal": "^4.5.0", + "lodash.throttle": "^4.1.1", + "lodash.toarray": "^4.4.0", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/editor-for-vue": { + "version": "5.1.12", + "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", + "peerDependencies": { + "@wangeditor/editor": ">=5.1.0", + "vue": "^3.0.5" + } + }, + "node_modules/@wangeditor/list-module": { + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.5.tgz", + "integrity": "sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==", + "peerDependencies": { + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/table-module": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.4.tgz", + "integrity": "sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==", + "peerDependencies": { + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "lodash.isequal": "^4.5.0", + "lodash.throttle": "^4.1.1", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/upload-image-module": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz", + "integrity": "sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==", + "peerDependencies": { + "@uppy/core": "^2.0.3", + "@uppy/xhr-upload": "^2.0.3", + "@wangeditor/basic-modules": "1.x", + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "lodash.foreach": "^4.5.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "node_modules/@wangeditor/video-module": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.4.tgz", + "integrity": "sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==", + "peerDependencies": { + "@uppy/core": "^2.1.4", + "@uppy/xhr-upload": "^2.0.7", + "@wangeditor/core": "1.x", + "dom7": "^3.0.0", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, "node_modules/@webassemblyjs/ast": { "version": "1.11.1", "resolved": "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.11.1.tgz", @@ -4581,6 +4790,11 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, + "node_modules/compute-scroll-into-view": { + "version": "1.0.20", + "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz", + "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==" + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz", @@ -5114,6 +5328,15 @@ "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz", "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" }, + "node_modules/d": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "dependencies": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, "node_modules/dayjs": { "version": "1.11.7", "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.7.tgz", @@ -5398,6 +5621,14 @@ "entities": "^2.0.0" } }, + "node_modules/dom7": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/dom7/-/dom7-3.0.0.tgz", + "integrity": "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==", + "dependencies": { + "ssr-window": "^3.0.0-alpha.1" + } + }, "node_modules/domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz", @@ -5580,6 +5811,39 @@ "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", "dev": true }, + "node_modules/es5-ext": { + "version": "0.10.62", + "resolved": "https://registry.npmmirror.com/es5-ext/-/es5-ext-0.10.62.tgz", + "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", + "hasInstallScript": true, + "dependencies": { + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.3", + "next-tick": "^1.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "node_modules/es6-symbol": { + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.3.tgz", + "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", + "dependencies": { + "d": "^1.0.1", + "ext": "^1.1.2" + } + }, "node_modules/esbuild": { "version": "0.15.18", "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.15.18.tgz", @@ -6517,6 +6781,15 @@ "node": ">= 0.6" } }, + "node_modules/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, "node_modules/event-pubsub": { "version": "4.3.0", "resolved": "https://registry.npmmirror.com/event-pubsub/-/event-pubsub-4.3.0.tgz", @@ -6628,6 +6901,19 @@ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true }, + "node_modules/ext": { + "version": "1.7.0", + "resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz", + "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", + "dependencies": { + "type": "^2.7.2" + } + }, + "node_modules/ext/node_modules/type": { + "version": "2.7.2", + "resolved": "https://registry.npmmirror.com/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -7193,6 +7479,11 @@ "node": ">=8" } }, + "node_modules/html-void-elements": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/html-void-elements/-/html-void-elements-2.0.1.tgz", + "integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==" + }, "node_modules/html-webpack-plugin": { "version": "5.5.0", "resolved": "https://registry.npmmirror.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz", @@ -7299,6 +7590,14 @@ "node": ">=10.17.0" } }, + "node_modules/i18next": { + "version": "20.6.1", + "resolved": "https://registry.npmmirror.com/i18next/-/i18next-20.6.1.tgz", + "integrity": "sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==", + "dependencies": { + "@babel/runtime": "^7.12.0" + } + }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -7338,6 +7637,11 @@ "node": ">= 4" } }, + "node_modules/immer": { + "version": "9.0.19", + "resolved": "https://registry.npmmirror.com/immer/-/immer-9.0.19.tgz", + "integrity": "sha512-eY+Y0qcsB4TZKwgQzLaE/lqYMlKhv5J9dyd2RhhtGhNo2njPXDqU9XPfcNfa3MIDsdtZt5KlkIsirlo4dHsWdQ==" + }, "node_modules/immutable": { "version": "4.1.0", "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.1.0.tgz", @@ -7493,6 +7797,11 @@ "node": ">=0.10.0" } }, + "node_modules/is-hotkey": { + "version": "0.2.0", + "resolved": "https://registry.npmmirror.com/is-hotkey/-/is-hotkey-0.2.0.tgz", + "integrity": "sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==" + }, "node_modules/is-interactive": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/is-interactive/-/is-interactive-1.0.0.tgz", @@ -7565,6 +7874,11 @@ "node": ">=10" } }, + "node_modules/is-url": { + "version": "1.2.4", + "resolved": "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" + }, "node_modules/is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz", @@ -7885,11 +8199,20 @@ "lodash-es": "*" } }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" + }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==" + }, "node_modules/lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true + "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" }, "node_modules/lodash.defaultsdeep": { "version": "4.6.1", @@ -7897,6 +8220,16 @@ "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==", "dev": true }, + "node_modules/lodash.foreach": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz", + "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==" + }, + "node_modules/lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" + }, "node_modules/lodash.kebabcase": { "version": "4.1.1", "resolved": "https://registry.npmmirror.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", @@ -7921,6 +8254,16 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/lodash.throttle": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==" + }, + "node_modules/lodash.toarray": { + "version": "4.4.0", + "resolved": "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz", + "integrity": "sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==" + }, "node_modules/lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmmirror.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -8265,6 +8608,19 @@ "node": ">= 0.6" } }, + "node_modules/mime-match": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/mime-match/-/mime-match-1.0.2.tgz", + "integrity": "sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==", + "dependencies": { + "wildcard": "^1.1.0" + } + }, + "node_modules/mime-match/node_modules/wildcard": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/wildcard/-/wildcard-1.1.2.tgz", + "integrity": "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==" + }, "node_modules/mime-types": { "version": "2.1.35", "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz", @@ -8432,6 +8788,11 @@ "thenify-all": "^1.0.0" } }, + "node_modules/namespace-emitter": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz", + "integrity": "sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==" + }, "node_modules/nanoid": { "version": "3.3.4", "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz", @@ -8464,6 +8825,11 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/next-tick": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" + }, "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz", @@ -9574,6 +9940,11 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, + "node_modules/preact": { + "version": "10.12.0", + "resolved": "https://registry.npmmirror.com/preact/-/preact-10.12.0.tgz", + "integrity": "sha512-+w8ix+huD8CNZemheC53IPjMUFk921i02o30u0K6h53spMX41y/QhVDnG/nU2k42/69tvqWmVsgNLIiwRAcmxg==" + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -9606,6 +9977,14 @@ "renderkid": "^3.0.0" } }, + "node_modules/prismjs": { + "version": "1.29.0", + "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz", + "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==", + "engines": { + "node": ">=6" + } + }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -9826,8 +10205,7 @@ "node_modules/regenerator-runtime": { "version": "0.13.11", "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "dev": true + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "node_modules/regenerator-transform": { "version": "0.15.0", @@ -10132,6 +10510,14 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, + "node_modules/scroll-into-view-if-needed": { + "version": "2.2.31", + "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz", + "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==", + "dependencies": { + "compute-scroll-into-view": "^1.0.20" + } + }, "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz", @@ -10402,6 +10788,51 @@ "node": ">=8" } }, + "node_modules/slate": { + "version": "0.72.8", + "resolved": "https://registry.npmmirror.com/slate/-/slate-0.72.8.tgz", + "integrity": "sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==", + "dependencies": { + "immer": "^9.0.6", + "is-plain-object": "^5.0.0", + "tiny-warning": "^1.0.3" + } + }, + "node_modules/slate-history": { + "version": "0.66.0", + "resolved": "https://registry.npmmirror.com/slate-history/-/slate-history-0.66.0.tgz", + "integrity": "sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==", + "dependencies": { + "is-plain-object": "^5.0.0" + }, + "peerDependencies": { + "slate": ">=0.65.3" + } + }, + "node_modules/slate-history/node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/slate/node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snabbdom": { + "version": "3.5.1", + "resolved": "https://registry.npmmirror.com/snabbdom/-/snabbdom-3.5.1.tgz", + "integrity": "sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==", + "engines": { + "node": ">=8.3.0" + } + }, "node_modules/snake-case": { "version": "3.0.4", "resolved": "https://registry.npmmirror.com/snake-case/-/snake-case-3.0.4.tgz", @@ -10452,7 +10883,8 @@ "node_modules/sourcemap-codec": { "version": "1.4.8", "resolved": "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", + "deprecated": "Please use @jridgewell/sourcemap-codec instead" }, "node_modules/spdx-correct": { "version": "3.1.1", @@ -10516,6 +10948,11 @@ "wbuf": "^1.7.3" } }, + "node_modules/ssr-window": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-3.0.0.tgz", + "integrity": "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz", @@ -10917,6 +11354,11 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, + "node_modules/tiny-warning": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/tiny-warning/-/tiny-warning-1.0.3.tgz", + "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" + }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -10968,6 +11410,11 @@ "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", "dev": true }, + "node_modules/type": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/type/-/type-1.2.0.tgz", + "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz", @@ -12366,7 +12813,6 @@ "dev": true } }, ->>>>>>> origin/develop "dependencies": { "@achrinza/node-ipc": { "version": "9.2.5", @@ -13518,7 +13964,6 @@ "version": "7.19.0", "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.19.0.tgz", "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==", - "dev": true, "requires": { "regenerator-runtime": "^0.13.4" } @@ -13577,7 +14022,8 @@ "@element-plus/icons-vue": { "version": "2.0.9", "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.0.9.tgz", - "integrity": "sha512-okdrwiVeKBmW41Hkl0eMrXDjzJwhQMuKiBOu17rOszqM+LS/yBYpNQNV5Jvoh06Wc+89fMmb/uhzf8NZuDuUaQ==" + "integrity": "sha512-okdrwiVeKBmW41Hkl0eMrXDjzJwhQMuKiBOu17rOszqM+LS/yBYpNQNV5Jvoh06Wc+89fMmb/uhzf8NZuDuUaQ==", + "requires": {} }, "@esbuild/android-arm": { "version": "0.15.18", @@ -13813,8 +14259,6 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", "dev": true }, -<<<<<<< HEAD -======= "@popperjs/core": { "version": "npm:@sxzz/popperjs-es@2.11.7", "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", @@ -13861,7 +14305,6 @@ } } }, ->>>>>>> origin/develop "@sideway/address": { "version": "4.1.4", "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz", @@ -14040,6 +14483,11 @@ "dev": true, "optional": true }, + "@transloadit/prettier-bytes": { + "version": "0.0.7", + "resolved": "https://registry.npmmirror.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz", + "integrity": "sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==" + }, "@trysound/sax": { "version": "0.2.0", "resolved": "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz", @@ -14110,6 +14558,11 @@ "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==", "dev": true }, + "@types/event-emitter": { + "version": "0.3.3", + "resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.3.tgz", + "integrity": "sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==" + }, "@types/express": { "version": "4.17.14", "resolved": "https://registry.npmmirror.com/@types/express/-/express-4.17.14.tgz", @@ -14123,7 +14576,7 @@ } }, "@types/express-serve-static-core": { - "version": "4.17.30", + "version": "4.17.31", "resolved": "https://registry.npmmirror.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz", "integrity": "sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ==", "dev": true, @@ -14272,6 +14725,53 @@ "@types/node": "*" } }, + "@uppy/companion-client": { + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@uppy/companion-client/-/companion-client-2.2.2.tgz", + "integrity": "sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==", + "requires": { + "@uppy/utils": "^4.1.2", + "namespace-emitter": "^2.0.1" + } + }, + "@uppy/core": { + "version": "2.3.4", + "resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz", + "integrity": "sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==", + "requires": { + "@transloadit/prettier-bytes": "0.0.7", + "@uppy/store-default": "^2.1.1", + "@uppy/utils": "^4.1.3", + "lodash.throttle": "^4.1.1", + "mime-match": "^1.0.2", + "namespace-emitter": "^2.0.1", + "nanoid": "^3.1.25", + "preact": "^10.5.13" + } + }, + "@uppy/store-default": { + "version": "2.1.1", + "resolved": "https://registry.npmmirror.com/@uppy/store-default/-/store-default-2.1.1.tgz", + "integrity": "sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==" + }, + "@uppy/utils": { + "version": "4.1.3", + "resolved": "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.3.tgz", + "integrity": "sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==", + "requires": { + "lodash.throttle": "^4.1.1" + } + }, + "@uppy/xhr-upload": { + "version": "2.1.3", + "resolved": "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz", + "integrity": "sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==", + "requires": { + "@uppy/companion-client": "^2.2.2", + "@uppy/utils": "^4.1.2", + "nanoid": "^3.1.25" + } + }, "@vitejs/plugin-legacy": { "version": "2.3.1", "resolved": "https://registry.npmmirror.com/@vitejs/plugin-legacy/-/plugin-legacy-2.3.1.tgz", @@ -14534,7 +15034,8 @@ "version": "5.0.8", "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz", "integrity": "sha512-HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA==", - "dev": true + "dev": true, + "requires": {} }, "@vue/cli-service": { "version": "5.0.8", @@ -14597,29 +15098,6 @@ "webpack-merge": "^5.7.3", "webpack-virtual-modules": "^0.4.2", "whatwg-fetch": "^3.6.2" - }, - "dependencies": { - "@vue/vue-loader-v15": { - "version": "npm:vue-loader@15.10.1", - "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz", - "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==", - "dev": true, - "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" - }, - "dependencies": { - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", - "dev": true - } - } - } } }, "@vue/cli-shared-utils": { @@ -14884,6 +15362,27 @@ "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.45.tgz", "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==" }, + "@vue/vue-loader-v15": { + "version": "npm:vue-loader@15.10.0", + "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz", + "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==", + "dev": true, + "requires": { + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" + }, + "dependencies": { + "hash-sum": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz", + "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", + "dev": true + } + } + }, "@vue/web-component-wrapper": { "version": "1.3.0", "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz", @@ -14904,7 +15403,8 @@ "vue-demi": { "version": "0.13.11", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.11.tgz", - "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==" + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", + "requires": {} } } }, @@ -14924,10 +15424,98 @@ "vue-demi": { "version": "0.13.11", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.11.tgz", - "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==" + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", + "requires": {} } } }, + "@wangeditor/basic-modules": { + "version": "1.1.7", + "resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz", + "integrity": "sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==", + "requires": { + "is-url": "^1.2.4" + } + }, + "@wangeditor/code-highlight": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz", + "integrity": "sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==", + "requires": { + "prismjs": "^1.23.0" + } + }, + "@wangeditor/core": { + "version": "1.1.19", + "resolved": "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.19.tgz", + "integrity": "sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==", + "requires": { + "@types/event-emitter": "^0.3.3", + "event-emitter": "^0.3.5", + "html-void-elements": "^2.0.0", + "i18next": "^20.4.0", + "scroll-into-view-if-needed": "^2.2.28", + "slate-history": "^0.66.0" + } + }, + "@wangeditor/editor": { + "version": "5.1.23", + "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz", + "integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==", + "requires": { + "@uppy/core": "^2.1.1", + "@uppy/xhr-upload": "^2.0.3", + "@wangeditor/basic-modules": "^1.1.7", + "@wangeditor/code-highlight": "^1.0.3", + "@wangeditor/core": "^1.1.19", + "@wangeditor/list-module": "^1.0.5", + "@wangeditor/table-module": "^1.1.4", + "@wangeditor/upload-image-module": "^1.0.2", + "@wangeditor/video-module": "^1.1.4", + "dom7": "^3.0.0", + "is-hotkey": "^0.2.0", + "lodash.camelcase": "^4.3.0", + "lodash.clonedeep": "^4.5.0", + "lodash.debounce": "^4.0.8", + "lodash.foreach": "^4.5.0", + "lodash.isequal": "^4.5.0", + "lodash.throttle": "^4.1.1", + "lodash.toarray": "^4.4.0", + "nanoid": "^3.2.0", + "slate": "^0.72.0", + "snabbdom": "^3.1.0" + } + }, + "@wangeditor/editor-for-vue": { + "version": "5.1.12", + "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", + "requires": {} + }, + "@wangeditor/list-module": { + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.5.tgz", + "integrity": "sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==", + "requires": {} + }, + "@wangeditor/table-module": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.4.tgz", + "integrity": "sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==", + "requires": {} + }, + "@wangeditor/upload-image-module": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz", + "integrity": "sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==", + "requires": {} + }, + "@wangeditor/video-module": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.4.tgz", + "integrity": "sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==", + "requires": {} + }, "@webassemblyjs/ast": { "version": "1.11.1", "resolved": "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.11.1.tgz", @@ -15106,13 +15694,15 @@ "version": "1.8.0", "resolved": "https://registry.npmmirror.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true + "dev": true, + "requires": {} }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true + "dev": true, + "requires": {} }, "acorn-walk": { "version": "8.2.0", @@ -15147,21 +15737,6 @@ "ajv": "^8.0.0" } }, -<<<<<<< HEAD - "ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true - }, - "ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true - }, -======= ->>>>>>> origin/develop "ansi-escapes": { "version": "3.2.0", "resolved": "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz", @@ -15867,6 +16442,11 @@ } } }, + "compute-scroll-into-view": { + "version": "1.0.20", + "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz", + "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz", @@ -16118,7 +16698,8 @@ "version": "6.3.1", "resolved": "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz", "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==", - "dev": true + "dev": true, + "requires": {} }, "css-loader": { "version": "6.7.1", @@ -16271,7 +16852,8 @@ "version": "3.1.0", "resolved": "https://registry.npmmirror.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz", "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", - "dev": true + "dev": true, + "requires": {} }, "csso": { "version": "4.2.0", @@ -16287,6 +16869,15 @@ "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz", "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" }, + "d": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "requires": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, "dayjs": { "version": "1.11.7", "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.7.tgz", @@ -16504,6 +17095,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/dom7/-/dom7-3.0.0.tgz", + "integrity": "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==", + "requires": { + "ssr-window": "^3.0.0-alpha.1" + } + }, "domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz", @@ -16596,13 +17195,6 @@ "lodash-unified": "^1.0.2", "memoize-one": "^6.0.0", "normalize-wheel-es": "^1.2.0" - }, - "dependencies": { - "@popperjs/core": { - "version": "npm:@sxzz/popperjs-es@2.11.7", - "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", - "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==" - } } }, "emoji-regex": { @@ -16672,6 +17264,35 @@ "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", "dev": true }, + "es5-ext": { + "version": "0.10.62", + "resolved": "https://registry.npmmirror.com/es5-ext/-/es5-ext-0.10.62.tgz", + "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", + "requires": { + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.3", + "next-tick": "^1.1.0" + } + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", + "requires": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "es6-symbol": { + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.3.tgz", + "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", + "requires": { + "d": "^1.0.1", + "ext": "^1.1.2" + } + }, "esbuild": { "version": "0.15.18", "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.15.18.tgz", @@ -17286,6 +17907,15 @@ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "requires": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, "event-pubsub": { "version": "4.3.0", "resolved": "https://registry.npmmirror.com/event-pubsub/-/event-pubsub-4.3.0.tgz", @@ -17387,6 +18017,21 @@ } } }, + "ext": { + "version": "1.7.0", + "resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz", + "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", + "requires": { + "type": "^2.7.2" + }, + "dependencies": { + "type": { + "version": "2.7.2", + "resolved": "https://registry.npmmirror.com/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" + } + } + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -17850,6 +18495,11 @@ "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==", "dev": true }, + "html-void-elements": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/html-void-elements/-/html-void-elements-2.0.1.tgz", + "integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==" + }, "html-webpack-plugin": { "version": "5.5.0", "resolved": "https://registry.npmmirror.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz", @@ -17930,6 +18580,14 @@ "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "dev": true }, + "i18next": { + "version": "20.6.1", + "resolved": "https://registry.npmmirror.com/i18next/-/i18next-20.6.1.tgz", + "integrity": "sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==", + "requires": { + "@babel/runtime": "^7.12.0" + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -17943,7 +18601,8 @@ "version": "5.1.0", "resolved": "https://registry.npmmirror.com/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true + "dev": true, + "requires": {} }, "ieee754": { "version": "1.2.1", @@ -17957,6 +18616,11 @@ "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", "dev": true }, + "immer": { + "version": "9.0.19", + "resolved": "https://registry.npmmirror.com/immer/-/immer-9.0.19.tgz", + "integrity": "sha512-eY+Y0qcsB4TZKwgQzLaE/lqYMlKhv5J9dyd2RhhtGhNo2njPXDqU9XPfcNfa3MIDsdtZt5KlkIsirlo4dHsWdQ==" + }, "immutable": { "version": "4.1.0", "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.1.0.tgz", @@ -18079,6 +18743,11 @@ "is-extglob": "^2.1.1" } }, + "is-hotkey": { + "version": "0.2.0", + "resolved": "https://registry.npmmirror.com/is-hotkey/-/is-hotkey-0.2.0.tgz", + "integrity": "sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==" + }, "is-interactive": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/is-interactive/-/is-interactive-1.0.0.tgz", @@ -18130,6 +18799,11 @@ "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true }, + "is-url": { + "version": "1.2.4", + "resolved": "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" + }, "is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz", @@ -18388,13 +19062,23 @@ "lodash-unified": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.2.tgz", - "integrity": "sha512-OGbEy+1P+UT26CYi4opY4gebD8cWRDxAT6MAObIVQMiqYdxZr1g3QHWCToVsm31x2NkLS4K3+MC2qInaRMa39g==" + "integrity": "sha512-OGbEy+1P+UT26CYi4opY4gebD8cWRDxAT6MAObIVQMiqYdxZr1g3QHWCToVsm31x2NkLS4K3+MC2qInaRMa39g==", + "requires": {} + }, + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" + }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==" }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true + "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" }, "lodash.defaultsdeep": { "version": "4.6.1", @@ -18402,6 +19086,16 @@ "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==", "dev": true }, + "lodash.foreach": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz", + "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==" + }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" + }, "lodash.kebabcase": { "version": "4.1.1", "resolved": "https://registry.npmmirror.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", @@ -18426,6 +19120,16 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "lodash.throttle": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==" + }, + "lodash.toarray": { + "version": "4.4.0", + "resolved": "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz", + "integrity": "sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==" + }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmmirror.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -18696,6 +19400,21 @@ "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" }, + "mime-match": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/mime-match/-/mime-match-1.0.2.tgz", + "integrity": "sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==", + "requires": { + "wildcard": "^1.1.0" + }, + "dependencies": { + "wildcard": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/wildcard/-/wildcard-1.1.2.tgz", + "integrity": "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==" + } + } + }, "mime-types": { "version": "2.1.35", "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz", @@ -18829,6 +19548,11 @@ "thenify-all": "^1.0.0" } }, + "namespace-emitter": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz", + "integrity": "sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==" + }, "nanoid": { "version": "3.3.4", "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz", @@ -18852,6 +19576,11 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "next-tick": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz", @@ -19368,25 +20097,29 @@ "version": "5.1.2", "resolved": "https://registry.npmmirror.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz", "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-duplicates": { "version": "5.1.0", "resolved": "https://registry.npmmirror.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-empty": { "version": "5.1.1", "resolved": "https://registry.npmmirror.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-overridden": { "version": "5.1.0", "resolved": "https://registry.npmmirror.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-loader": { "version": "6.2.1", @@ -19476,7 +20209,8 @@ "version": "3.0.0", "resolved": "https://registry.npmmirror.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -19511,7 +20245,8 @@ "version": "5.1.0", "resolved": "https://registry.npmmirror.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", - "dev": true + "dev": true, + "requires": {} }, "postcss-normalize-display-values": { "version": "5.1.0", @@ -19651,6 +20386,11 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, + "preact": { + "version": "10.12.0", + "resolved": "https://registry.npmmirror.com/preact/-/preact-10.12.0.tgz", + "integrity": "sha512-+w8ix+huD8CNZemheC53IPjMUFk921i02o30u0K6h53spMX41y/QhVDnG/nU2k42/69tvqWmVsgNLIiwRAcmxg==" + }, "prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -19674,6 +20414,11 @@ "renderkid": "^3.0.0" } }, + "prismjs": { + "version": "1.29.0", + "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz", + "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==" + }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -19855,8 +20600,7 @@ "regenerator-runtime": { "version": "0.13.11", "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "dev": true + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "regenerator-transform": { "version": "0.15.0", @@ -20084,6 +20828,14 @@ } } }, + "scroll-into-view-if-needed": { + "version": "2.2.31", + "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz", + "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==", + "requires": { + "compute-scroll-into-view": "^1.0.20" + } + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz", @@ -20321,6 +21073,43 @@ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, + "slate": { + "version": "0.72.8", + "resolved": "https://registry.npmmirror.com/slate/-/slate-0.72.8.tgz", + "integrity": "sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==", + "requires": { + "immer": "^9.0.6", + "is-plain-object": "^5.0.0", + "tiny-warning": "^1.0.3" + }, + "dependencies": { + "is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" + } + } + }, + "slate-history": { + "version": "0.66.0", + "resolved": "https://registry.npmmirror.com/slate-history/-/slate-history-0.66.0.tgz", + "integrity": "sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==", + "requires": { + "is-plain-object": "^5.0.0" + }, + "dependencies": { + "is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" + } + } + }, + "snabbdom": { + "version": "3.5.1", + "resolved": "https://registry.npmmirror.com/snabbdom/-/snabbdom-3.5.1.tgz", + "integrity": "sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==" + }, "snake-case": { "version": "3.0.4", "resolved": "https://registry.npmmirror.com/snake-case/-/snake-case-3.0.4.tgz", @@ -20426,6 +21215,11 @@ "wbuf": "^1.7.3" } }, + "ssr-window": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-3.0.0.tgz", + "integrity": "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz", @@ -20453,17 +21247,6 @@ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz", @@ -20481,6 +21264,17 @@ } } }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -20743,6 +21537,11 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, + "tiny-warning": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/tiny-warning/-/tiny-warning-1.0.3.tgz", + "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" + }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -20782,6 +21581,11 @@ "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", "dev": true }, + "type": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/type/-/type-1.2.0.tgz", + "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" + }, "type-check": { "version": "0.4.0", "resolved": "https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz", @@ -21607,7 +22411,8 @@ "version": "8.8.1", "resolved": "https://registry.npmmirror.com/ws/-/ws-8.8.1.tgz", "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==", - "dev": true + "dev": true, + "requires": {} } } }, @@ -21734,7 +22539,8 @@ "version": "7.5.9", "resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.9.tgz", "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", - "dev": true + "dev": true, + "requires": {} }, "xml-name-validator": { "version": "4.0.0", diff --git a/package.json b/package.json index 0b6cbb0..e12d2f7 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,8 @@ "build:test": "vite build --mode test" }, "dependencies": { + "@wangeditor/editor": "^5.1.23", + "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", "core-js": "^3.26.0", "dayjs": "^1.11.6", diff --git a/src/api/api.js b/src/api/api.js index 4eb02ac..03dcf03 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-01-13 11:42:48 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-02-07 17:36:05 + * @LastEditTime: 2023-02-10 15:31:15 * @FilePath: /stu_h5/src/api/api.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -59,3 +59,5 @@ export const COMMENT_COLLECTION = '/comment/collection post' // 外部考试详情接口 export const EXTERNALEXAM = `/external/exam/queryExternalExam` +//关卡列表接口 +export const ROUTERTASK_LIST = '/stu/router/chapterList post' diff --git a/src/api/request.js b/src/api/request.js index 11c13c7..fdf2a16 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -149,4 +149,17 @@ export async function boeRequest(_url, params) { }).then(res => { return JSONBigIntStr.parse(res) }) -} \ No newline at end of file +} + +const httpupload = axios.create({ + baseURL: process.env.VUE_APP_BASE_API, + timeout: 10000 * 15, + headers: { "Content-Type": "multipart/form-data" }, +}); + +export const fileUp = (data) => httpupload.post("/file/img", data, { + headers: { "Content-Type": "multipart/form-data" }, +}); +export const videoUp = (data) => httpupload.post("/file/uploadunlimit", data, { + headers: { "Content-Type": "multipart/form-data" }, +}); \ No newline at end of file diff --git a/src/assets/image/pathDetails/pathDetailBack.png b/src/assets/image/pathDetails/pathDetailBack.png new file mode 100644 index 0000000000000000000000000000000000000000..654cbd3114151c1190fcf1a68f77a96df9be4bc0 GIT binary patch literal 22342 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 NceNjA)!cE2`XA{u6gU6? literal 0 HcmV?d00001 diff --git a/src/assets/image/pathDetails/pathDetailImg.png b/src/assets/image/pathDetails/pathDetailImg.png new file mode 100644 index 0000000000000000000000000000000000000000..e4da321a841fe2b201100c8fadb81c4e2935524f GIT binary patch literal 4649 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 +
+
+
+ {{ item.name }} +
+
+
+ + + \ No newline at end of file diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index 80296a0..d77c517 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -2,7 +2,20 @@
-
{}
+
+ {{ + data && data.discussDtoList && data.discussDtoList.length !== 0 + ? data?.discussDtoList[0].discussName + : "-" + }} +
+
+ {{ + data && data.discussDtoList && data.discussDtoList.length !== 0 + ? data?.discussDtoList[0].discussExplain + : "-" + }} +
@@ -98,36 +111,15 @@ const router = useRouter(); const state = reactive({ onfo: true, discuss: [ - { - id: 1, - title: "从营销角度分析：我的团队需要这些能力", - contain: - "所谓团队协作能力，是指建立在团队的基础之上，发挥团队精神、互补互助以达到团队最大工作效率的能力。对于团队的成员来说...", - - pinglun: 317, - dianzan: 103, - isGood: false, - }, - { - id: 2, - title: "从营销角度分析：我的团队需要这些能力", - contain: - "所谓团队协作能力，是指建立在团队的基础之上，发挥团队精神、互补互助以达到团队最大工作效率的能力。对于团队的成员来说...", - - pinglun: 317, - dianzan: 103, - isGood: false, - }, - { - id: 3, - title: "从营销角度分析：我的团队需要这些能力", - contain: - "所谓团队协作能力，是指建立在团队的基础之上，发挥团队精神、互补互助以达到团队最大工作效率的能力。对于团队的成员来说...", - - pinglun: 317, - dianzan: 103, - isGood: false, - }, + // { + // id: 1, + // title: "从营销角度分析：我的团队需要这些能力", + // contain: + // "所谓团队协作能力，是指建立在团队的基础之上，发挥团队精神、互补互助以达到团队最大工作效率的能力。对于团队的成员来说...", + // pinglun: 317, + // dianzan: 103, + // isGood: false, + // }, ], }); const { onfo, discuss } = toRefs(state); @@ -155,8 +147,103 @@ const getId = (it) => { const { query: { id, type }, } = useRoute(); -const { data } = useRequest(DISCUSS_LIST, { id: 23, type }); +const { data } = useRequest(DISCUSS_LIST, { id, type }); console.log("获取讨论", data); +// 获取帖子 +function getPostList(discussId) { + console.log({ + discussId: discussId, + pageNo: state.pageNo, + pageSize: state.pageSize, + searchType: state.searchType, + }); + + request(QueryDiscussSubmitDetailByDiscussId, { + discussId: discussId, + pageNo: state.pageNo, + pageSize: state.pageSize, + searchType: state.searchType, + }) + .then((e) => { + console.log("我是当前讨论下的帖子", e); + state.postList = e.data.rows; + state.total = e.data.total; + + // 添加一条假的数据 供测试使用 + state.postList = [ + { + createTime: "", + createUser: 0, + discussCollectionCount: "234", + discussId: "", + discussLikeCount: "3576", + discussReviewCount: "12353", + discussSubmitContent: + "帖子的内容----帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容", + discussSubmitId: "", + discussSubmitPictureAddress: "", + discussSubmitTitle: "我是一个用来测试的帖子标题", + stuId: "", + stuName: "", + updateTime: "", + updateUser: 0, + + submitReviewVoList: [ + { + createTime: "", + createUser: 0, + discussLikeCount: "", + discussReviewContent: "", + discussReviewFlag: "", + discussReviewId: "", + discussReviewPictureAddress: "", + discussSubmitId: "", + stuId: "", + stuName: "", + submitReplyVoList: [ + { + createTime: "", + createUser: 0, + discussReplyId: 0, + discussReviewId: "", + replyContent: "", + replyFlag: "", + replyPictureAddress: "", + reviewStuId: "", + reviewStuName: "", + stuId: "", + stuName: "", + updateTime: "", + updateUser: 0, + }, + ], + updateTime: "", + updateUser: 0, + }, + ], + }, + ]; + state.total = 100; + }) + .catch((err) => { + console.log(err); + }); +} + +// 最新 +function nowPost(discussId) { + state.searchType = 1; + state.pageNo = 1; + state.currentPage = 1; + getPostList(discussId); +} +// 最热 +function hotPost(discussId) { + state.searchType = 2; + state.pageNo = 1; + state.currentPage = 1; + getPostList(discussId); +} //跳转到讨论详情 const goDetails = () => { @@ -182,13 +269,15 @@ const goDetails = () => { .head { margin-top: 10px; display: flex; + flex-direction: column; justify-content: center; + align-items: center; width: 100%; background-color: #fff; .title { width: 90%; - margin-top: 20px; - margin-bottom: 21px; + margin-top: 10px; + margin-bottom: 10px; color: #333330; font-size: 13px; line-height: 24px; diff --git a/src/views/discuss/DiscussUpload.vue b/src/views/discuss/DiscussUpload.vue index 60ed30a..afab1f7 100644 --- a/src/views/discuss/DiscussUpload.vue +++ b/src/views/discuss/DiscussUpload.vue @@ -13,19 +13,37 @@
- +
- + > --> + +
-
+
- diff --git a/src/views/projectdetails/ProjectPath.vue b/src/views/projectdetails/ProjectPath.vue index 49af03c..820e371 100644 --- a/src/views/projectdetails/ProjectPath.vue +++ b/src/views/projectdetails/ProjectPath.vue @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-01-19 11:28:11 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-02-09 10:20:19 + * @LastEditTime: 2023-02-11 09:47:29 * @FilePath: /stu_h5/src/views/projectdetails/ProjectPath.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE -->