diff --git a/package.json b/package.json index b2e9cd6..a449e33 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "vue": "3.4.4", "vue-demi": "0.14.10", "vue-pdf-embed": "2.1.1", + "vue-pdf-next": "^0.0.16", "vue-router": "^4.1.6", "vue3-pdfjs": "^0.1.6", "vue3-print-nb": "^0.1.4", diff --git a/package.json b/package.json index b2e9cd6..a449e33 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "vue": "3.4.4", "vue-demi": "0.14.10", "vue-pdf-embed": "2.1.1", + "vue-pdf-next": "^0.0.16", "vue-router": "^4.1.6", "vue3-pdfjs": "^0.1.6", "vue3-print-nb": "^0.1.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd1fedd..05992d1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -115,6 +115,9 @@ vue-pdf-embed: specifier: 2.1.1 version: 2.1.1(vue@3.4.4) + vue-pdf-next: + specifier: ^0.0.16 + version: 0.0.16(typescript@4.9.5) vue-router: specifier: ^4.1.6 version: 4.4.5(vue@3.4.4) @@ -1739,6 +1742,10 @@ - typescript dev: true + /@types/web-bluetooth@0.0.14: + resolution: {integrity: sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A==} + dev: false + /@types/web-bluetooth@0.0.16: resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==} @@ -2243,6 +2250,24 @@ /@vue/shared@3.5.13: resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==} + /@vueuse/core@8.9.4(vue@3.4.4): + resolution: {integrity: sha512-B/Mdj9TK1peFyWaPof+Zf/mP9XuGAngaJZBwPaXBvU3aCTZlx3ltlrFFFyMV4iGBwsjSCeUCgZrtkEj9dS2Y3Q==} + peerDependencies: + '@vue/composition-api': ^1.1.0 + vue: ^2.6.0 || ^3.2.0 + peerDependenciesMeta: + '@vue/composition-api': + optional: true + vue: + optional: true + dependencies: + '@types/web-bluetooth': 0.0.14 + '@vueuse/metadata': 8.9.4 + '@vueuse/shared': 8.9.4(vue@3.4.4) + vue: 3.4.4(typescript@4.9.5) + vue-demi: 0.14.10(vue@3.4.4) + dev: false + /@vueuse/core@9.13.0(vue@3.4.4): resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==} dependencies: @@ -2303,9 +2328,28 @@ - vue dev: false + /@vueuse/metadata@8.9.4: + resolution: {integrity: sha512-IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw==} + dev: false + /@vueuse/metadata@9.13.0: resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==} + /@vueuse/shared@8.9.4(vue@3.4.4): + resolution: {integrity: sha512-wt+T30c4K6dGRMVqPddexEVLa28YwxW5OFIPmzUHICjphfAuBFTTdDoyqREZNDOFJZ44ARH1WWQNCUK8koJ+Ag==} + peerDependencies: + '@vue/composition-api': ^1.1.0 + vue: ^2.6.0 || ^3.2.0 + peerDependenciesMeta: + '@vue/composition-api': + optional: true + vue: + optional: true + dependencies: + vue: 3.4.4(typescript@4.9.5) + vue-demi: 0.14.10(vue@3.4.4) + dev: false + /@vueuse/shared@9.13.0(vue@3.4.4): resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==} dependencies: @@ -9687,6 +9731,187 @@ vue: 3.4.4(typescript@4.9.5) dev: false + /vue-pdf-next@0.0.10(typescript@4.9.5): + resolution: {integrity: sha512-v4hAYaKcnHFywMKnCBZ/JZOsYQwXRHlvFut0EA4l1JudecW5C51XHCC7SgC/jJp+Wmd9PeXSgxcmieiMiWEsBw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.9(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.11(typescript@4.9.5): + resolution: {integrity: sha512-5uonLMo0L3CoJdTYg8KCR16iLHifxeTKrhoB71mXeOUkHzQ/1YaU5b/fNe3X353zJc8IfdrvuLIrWy0qqnQ21Q==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.10(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.12(typescript@4.9.5): + resolution: {integrity: sha512-UARWsS9DMk9etrC/B8lPMq3f1hV+vg9san1df9wv0lQTR2L0c2Y+fjTEZ+oNAyYklRIXhj5pTtJemEz9BqNGtA==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.11(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.13(typescript@4.9.5): + resolution: {integrity: sha512-j+y0WCCApy4X+MBb9fh3F/Tz40v0NwoOXdMESoz8hzzZ5DQ3GSVr75Qd2OnreYZnIYWsv3COV8oRVmLmeGEYsQ==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.12(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.14(typescript@4.9.5): + resolution: {integrity: sha512-KQd3/OyyYo1QVSSU7YX9xS9HSVIdr1TkluzP1NULDqLqakibvLnOTj5PWP6xDotH/pkfoJZFpGipS4EpYNCTvg==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.13(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.15(typescript@4.9.5): + resolution: {integrity: sha512-3HsQtL5bs+M01m7u/9wQDhowTswqtBMRbv1grJtAfszJHhScJepAyxRjzWeNAooeIIe0xH07TkLH/dJgUS4Uzw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.14(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.16(typescript@4.9.5): + resolution: {integrity: sha512-IZ7zZ1dFzAH+KxUQUOoAi6KvC6SxeG4v7BAHYVhU2l0ubaGxz0QXa750DFOrj8X01hKOusWzIfXNgkNI7nPNvA==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.15(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.3(typescript@4.9.5): + resolution: {integrity: sha512-oY5P5+ZcSwQdi7Ovb25FvePF/9h9wiAaCHo6yYpRVpCfwYy0pyg88pwQIA/w+Wvb+UJRd/1VLItzGkvXpR9F+g==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.4(typescript@4.9.5): + resolution: {integrity: sha512-LFUJZlDJs3niKSLTTJfuYe7QOE/XmeRUolK20ORnD0D9Bse7HM45dRBVDWTYB1TcymXEiDYo477R89ZNkQz+Mw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.3(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.5(typescript@4.9.5): + resolution: {integrity: sha512-IwCG3xbLYJJp0kypbvENgZ265DORVn8Jk+0D9DhjdK+kL3jCjqwOxfHbJLKIVgH3k7bTU/Fv/wZUde5BZp419w==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.4(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.6(typescript@4.9.5): + resolution: {integrity: sha512-nVjHMRJTaa4trTDsi4ZOj/+p2x2OxgC/0Pp8jmwYfnSSDxP4YhWn9OkofXvZYHAeCxnqibMmJ51UzmdTPQBw2A==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.5(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.7(typescript@4.9.5): + resolution: {integrity: sha512-i32NPpGdem263qTlyXihm5PbWiGZL5GTK7WoZbXuv9JMS60PqUx0nrvuK2+XR8tKYqCIkFBRGAueQsQN75ZnLw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.6(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.8(typescript@4.9.5): + resolution: {integrity: sha512-v1i9UlAE6DwR4KsEFMXtJwo6VT93HQDtKpAO1+/bE28KzxM46QqHpWklBoVOz2TqatFIc2iKFmaJzXnhOhaHNA==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.7(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.9(typescript@4.9.5): + resolution: {integrity: sha512-Cei+PuBSDuOi4dQH8Z6luj/KuAg9ujdUGUt3c1Oq/o6yglPzksrtKZSDA7mtWf8/lu7pZcFRt4iPEZ4XZPDdbg==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.8(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + /vue-router@4.4.5(vue@3.4.4): resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==} peerDependencies: diff --git a/package.json b/package.json index b2e9cd6..a449e33 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "vue": "3.4.4", "vue-demi": "0.14.10", "vue-pdf-embed": "2.1.1", + "vue-pdf-next": "^0.0.16", "vue-router": "^4.1.6", "vue3-pdfjs": "^0.1.6", "vue3-print-nb": "^0.1.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd1fedd..05992d1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -115,6 +115,9 @@ vue-pdf-embed: specifier: 2.1.1 version: 2.1.1(vue@3.4.4) + vue-pdf-next: + specifier: ^0.0.16 + version: 0.0.16(typescript@4.9.5) vue-router: specifier: ^4.1.6 version: 4.4.5(vue@3.4.4) @@ -1739,6 +1742,10 @@ - typescript dev: true + /@types/web-bluetooth@0.0.14: + resolution: {integrity: sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A==} + dev: false + /@types/web-bluetooth@0.0.16: resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==} @@ -2243,6 +2250,24 @@ /@vue/shared@3.5.13: resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==} + /@vueuse/core@8.9.4(vue@3.4.4): + resolution: {integrity: sha512-B/Mdj9TK1peFyWaPof+Zf/mP9XuGAngaJZBwPaXBvU3aCTZlx3ltlrFFFyMV4iGBwsjSCeUCgZrtkEj9dS2Y3Q==} + peerDependencies: + '@vue/composition-api': ^1.1.0 + vue: ^2.6.0 || ^3.2.0 + peerDependenciesMeta: + '@vue/composition-api': + optional: true + vue: + optional: true + dependencies: + '@types/web-bluetooth': 0.0.14 + '@vueuse/metadata': 8.9.4 + '@vueuse/shared': 8.9.4(vue@3.4.4) + vue: 3.4.4(typescript@4.9.5) + vue-demi: 0.14.10(vue@3.4.4) + dev: false + /@vueuse/core@9.13.0(vue@3.4.4): resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==} dependencies: @@ -2303,9 +2328,28 @@ - vue dev: false + /@vueuse/metadata@8.9.4: + resolution: {integrity: sha512-IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw==} + dev: false + /@vueuse/metadata@9.13.0: resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==} + /@vueuse/shared@8.9.4(vue@3.4.4): + resolution: {integrity: sha512-wt+T30c4K6dGRMVqPddexEVLa28YwxW5OFIPmzUHICjphfAuBFTTdDoyqREZNDOFJZ44ARH1WWQNCUK8koJ+Ag==} + peerDependencies: + '@vue/composition-api': ^1.1.0 + vue: ^2.6.0 || ^3.2.0 + peerDependenciesMeta: + '@vue/composition-api': + optional: true + vue: + optional: true + dependencies: + vue: 3.4.4(typescript@4.9.5) + vue-demi: 0.14.10(vue@3.4.4) + dev: false + /@vueuse/shared@9.13.0(vue@3.4.4): resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==} dependencies: @@ -9687,6 +9731,187 @@ vue: 3.4.4(typescript@4.9.5) dev: false + /vue-pdf-next@0.0.10(typescript@4.9.5): + resolution: {integrity: sha512-v4hAYaKcnHFywMKnCBZ/JZOsYQwXRHlvFut0EA4l1JudecW5C51XHCC7SgC/jJp+Wmd9PeXSgxcmieiMiWEsBw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.9(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.11(typescript@4.9.5): + resolution: {integrity: sha512-5uonLMo0L3CoJdTYg8KCR16iLHifxeTKrhoB71mXeOUkHzQ/1YaU5b/fNe3X353zJc8IfdrvuLIrWy0qqnQ21Q==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.10(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.12(typescript@4.9.5): + resolution: {integrity: sha512-UARWsS9DMk9etrC/B8lPMq3f1hV+vg9san1df9wv0lQTR2L0c2Y+fjTEZ+oNAyYklRIXhj5pTtJemEz9BqNGtA==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.11(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.13(typescript@4.9.5): + resolution: {integrity: sha512-j+y0WCCApy4X+MBb9fh3F/Tz40v0NwoOXdMESoz8hzzZ5DQ3GSVr75Qd2OnreYZnIYWsv3COV8oRVmLmeGEYsQ==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.12(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.14(typescript@4.9.5): + resolution: {integrity: sha512-KQd3/OyyYo1QVSSU7YX9xS9HSVIdr1TkluzP1NULDqLqakibvLnOTj5PWP6xDotH/pkfoJZFpGipS4EpYNCTvg==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.13(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.15(typescript@4.9.5): + resolution: {integrity: sha512-3HsQtL5bs+M01m7u/9wQDhowTswqtBMRbv1grJtAfszJHhScJepAyxRjzWeNAooeIIe0xH07TkLH/dJgUS4Uzw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.14(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.16(typescript@4.9.5): + resolution: {integrity: sha512-IZ7zZ1dFzAH+KxUQUOoAi6KvC6SxeG4v7BAHYVhU2l0ubaGxz0QXa750DFOrj8X01hKOusWzIfXNgkNI7nPNvA==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.15(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.3(typescript@4.9.5): + resolution: {integrity: sha512-oY5P5+ZcSwQdi7Ovb25FvePF/9h9wiAaCHo6yYpRVpCfwYy0pyg88pwQIA/w+Wvb+UJRd/1VLItzGkvXpR9F+g==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.4(typescript@4.9.5): + resolution: {integrity: sha512-LFUJZlDJs3niKSLTTJfuYe7QOE/XmeRUolK20ORnD0D9Bse7HM45dRBVDWTYB1TcymXEiDYo477R89ZNkQz+Mw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.3(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.5(typescript@4.9.5): + resolution: {integrity: sha512-IwCG3xbLYJJp0kypbvENgZ265DORVn8Jk+0D9DhjdK+kL3jCjqwOxfHbJLKIVgH3k7bTU/Fv/wZUde5BZp419w==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.4(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.6(typescript@4.9.5): + resolution: {integrity: sha512-nVjHMRJTaa4trTDsi4ZOj/+p2x2OxgC/0Pp8jmwYfnSSDxP4YhWn9OkofXvZYHAeCxnqibMmJ51UzmdTPQBw2A==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.5(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.7(typescript@4.9.5): + resolution: {integrity: sha512-i32NPpGdem263qTlyXihm5PbWiGZL5GTK7WoZbXuv9JMS60PqUx0nrvuK2+XR8tKYqCIkFBRGAueQsQN75ZnLw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.6(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.8(typescript@4.9.5): + resolution: {integrity: sha512-v1i9UlAE6DwR4KsEFMXtJwo6VT93HQDtKpAO1+/bE28KzxM46QqHpWklBoVOz2TqatFIc2iKFmaJzXnhOhaHNA==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.7(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.9(typescript@4.9.5): + resolution: {integrity: sha512-Cei+PuBSDuOi4dQH8Z6luj/KuAg9ujdUGUt3c1Oq/o6yglPzksrtKZSDA7mtWf8/lu7pZcFRt4iPEZ4XZPDdbg==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.8(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + /vue-router@4.4.5(vue@3.4.4): resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==} peerDependencies: diff --git a/src/components/ApprovalCustom/ApprovalDialog.vue b/src/components/ApprovalCustom/ApprovalDialog.vue index 11deb65..7f67de7 100644 --- a/src/components/ApprovalCustom/ApprovalDialog.vue +++ b/src/components/ApprovalCustom/ApprovalDialog.vue @@ -5,10 +5,9 @@ import dayjs from 'dayjs' import useUserStore from '@/store/modules/user' import { fetchApproval, submitApproval } from '@/api/approval' -import { addApprovalUser } from '@/api/system/process' +import { addApprovalUser, getProcessDetail } from '@/api/system/process' import { getUserList } from '@/api/system/user' import request from '@/api/index' -import { getProcessDetail } from '@/api/system/process' /** * 审批弹窗 */ @@ -36,9 +35,14 @@ formId: { type: String, default: '', - } + }, + defaultTitle: { + type: Boolean, + default: false, + }, }) const emit = defineEmits(['onSuccess', 'refuse', 'reject', 'sendApprovalRecord']) +const currentApprovalNode = ref('') // 当前审批节点名称 // 弹窗显示状态 const dialogVisible = ref(false) // 默认表单 @@ -65,7 +69,7 @@ const userInfo = useUserStore() // 是否展示 下一节点审批节点 审批人 const isShowUser = ref(false) -const nextText = ref('') // 下一审批节点名称 +const nextText = ref('') // 下一审批节点名称 // ---------------表单提交-------------------------------- // 表单对象 const dataFormRef = ref() @@ -172,33 +176,34 @@ } fetchDict() // 获取当前审批节点的下一节点 -const getApprovalNextRecord= (data: any[]) => { - if(!$props.formId) { +const getApprovalNextRecord = (data: any[]) => { + if (!$props.formId) { nextText.value = '' - return + return } if (!data.length) { nextText.value = '' } else { - getProcessDetail($props.formId).then(res => { + getProcessDetail($props.formId).then((res) => { if (res.data?.nodeConfig) { - function flattenObject(obj: any, parentKey: string = '', result: any = {}): any { - for (let key in obj) { + function flattenObject(obj: any, parentKey = '', result: any = {}): any { + for (const key in obj) { if (obj.hasOwnProperty(key)) { - const newKey = parentKey ? `${parentKey}.${key}` : key; + const newKey = parentKey ? `${parentKey}.${key}` : key if (typeof obj[key] === 'object' && obj[key] !== null && !Array.isArray(obj[key])) { - flattenObject(obj[key], newKey, result); - } else { - result[newKey] = obj[key]; + flattenObject(obj[key], newKey, result) + } + else { + result[newKey] = obj[key] } } } - return result; + return result } const response = flattenObject(res.data.nodeConfig) const result = [] - for (let key in response) { + for (const key in response) { if (key.includes('nodeName')) { // console.log(key) result.push(response[key]) @@ -221,6 +226,7 @@ if (res.data.length) { const data = res.data[res.data.length - 1] if (data.length) { + currentApprovalNode.value = data[data.length - 1].taskName if (data[data.length - 1].taskName === $props.lastName) { isShowUser.value = false } @@ -274,7 +280,7 @@ - + + + + + + + + + diff --git a/package.json b/package.json index b2e9cd6..a449e33 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "vue": "3.4.4", "vue-demi": "0.14.10", "vue-pdf-embed": "2.1.1", + "vue-pdf-next": "^0.0.16", "vue-router": "^4.1.6", "vue3-pdfjs": "^0.1.6", "vue3-print-nb": "^0.1.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd1fedd..05992d1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -115,6 +115,9 @@ vue-pdf-embed: specifier: 2.1.1 version: 2.1.1(vue@3.4.4) + vue-pdf-next: + specifier: ^0.0.16 + version: 0.0.16(typescript@4.9.5) vue-router: specifier: ^4.1.6 version: 4.4.5(vue@3.4.4) @@ -1739,6 +1742,10 @@ - typescript dev: true + /@types/web-bluetooth@0.0.14: + resolution: {integrity: sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A==} + dev: false + /@types/web-bluetooth@0.0.16: resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==} @@ -2243,6 +2250,24 @@ /@vue/shared@3.5.13: resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==} + /@vueuse/core@8.9.4(vue@3.4.4): + resolution: {integrity: sha512-B/Mdj9TK1peFyWaPof+Zf/mP9XuGAngaJZBwPaXBvU3aCTZlx3ltlrFFFyMV4iGBwsjSCeUCgZrtkEj9dS2Y3Q==} + peerDependencies: + '@vue/composition-api': ^1.1.0 + vue: ^2.6.0 || ^3.2.0 + peerDependenciesMeta: + '@vue/composition-api': + optional: true + vue: + optional: true + dependencies: + '@types/web-bluetooth': 0.0.14 + '@vueuse/metadata': 8.9.4 + '@vueuse/shared': 8.9.4(vue@3.4.4) + vue: 3.4.4(typescript@4.9.5) + vue-demi: 0.14.10(vue@3.4.4) + dev: false + /@vueuse/core@9.13.0(vue@3.4.4): resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==} dependencies: @@ -2303,9 +2328,28 @@ - vue dev: false + /@vueuse/metadata@8.9.4: + resolution: {integrity: sha512-IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw==} + dev: false + /@vueuse/metadata@9.13.0: resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==} + /@vueuse/shared@8.9.4(vue@3.4.4): + resolution: {integrity: sha512-wt+T30c4K6dGRMVqPddexEVLa28YwxW5OFIPmzUHICjphfAuBFTTdDoyqREZNDOFJZ44ARH1WWQNCUK8koJ+Ag==} + peerDependencies: + '@vue/composition-api': ^1.1.0 + vue: ^2.6.0 || ^3.2.0 + peerDependenciesMeta: + '@vue/composition-api': + optional: true + vue: + optional: true + dependencies: + vue: 3.4.4(typescript@4.9.5) + vue-demi: 0.14.10(vue@3.4.4) + dev: false + /@vueuse/shared@9.13.0(vue@3.4.4): resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==} dependencies: @@ -9687,6 +9731,187 @@ vue: 3.4.4(typescript@4.9.5) dev: false + /vue-pdf-next@0.0.10(typescript@4.9.5): + resolution: {integrity: sha512-v4hAYaKcnHFywMKnCBZ/JZOsYQwXRHlvFut0EA4l1JudecW5C51XHCC7SgC/jJp+Wmd9PeXSgxcmieiMiWEsBw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.9(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.11(typescript@4.9.5): + resolution: {integrity: sha512-5uonLMo0L3CoJdTYg8KCR16iLHifxeTKrhoB71mXeOUkHzQ/1YaU5b/fNe3X353zJc8IfdrvuLIrWy0qqnQ21Q==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.10(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.12(typescript@4.9.5): + resolution: {integrity: sha512-UARWsS9DMk9etrC/B8lPMq3f1hV+vg9san1df9wv0lQTR2L0c2Y+fjTEZ+oNAyYklRIXhj5pTtJemEz9BqNGtA==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.11(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.13(typescript@4.9.5): + resolution: {integrity: sha512-j+y0WCCApy4X+MBb9fh3F/Tz40v0NwoOXdMESoz8hzzZ5DQ3GSVr75Qd2OnreYZnIYWsv3COV8oRVmLmeGEYsQ==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.12(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.14(typescript@4.9.5): + resolution: {integrity: sha512-KQd3/OyyYo1QVSSU7YX9xS9HSVIdr1TkluzP1NULDqLqakibvLnOTj5PWP6xDotH/pkfoJZFpGipS4EpYNCTvg==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.13(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.15(typescript@4.9.5): + resolution: {integrity: sha512-3HsQtL5bs+M01m7u/9wQDhowTswqtBMRbv1grJtAfszJHhScJepAyxRjzWeNAooeIIe0xH07TkLH/dJgUS4Uzw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.14(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.16(typescript@4.9.5): + resolution: {integrity: sha512-IZ7zZ1dFzAH+KxUQUOoAi6KvC6SxeG4v7BAHYVhU2l0ubaGxz0QXa750DFOrj8X01hKOusWzIfXNgkNI7nPNvA==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.15(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.3(typescript@4.9.5): + resolution: {integrity: sha512-oY5P5+ZcSwQdi7Ovb25FvePF/9h9wiAaCHo6yYpRVpCfwYy0pyg88pwQIA/w+Wvb+UJRd/1VLItzGkvXpR9F+g==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.4(typescript@4.9.5): + resolution: {integrity: sha512-LFUJZlDJs3niKSLTTJfuYe7QOE/XmeRUolK20ORnD0D9Bse7HM45dRBVDWTYB1TcymXEiDYo477R89ZNkQz+Mw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.3(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.5(typescript@4.9.5): + resolution: {integrity: sha512-IwCG3xbLYJJp0kypbvENgZ265DORVn8Jk+0D9DhjdK+kL3jCjqwOxfHbJLKIVgH3k7bTU/Fv/wZUde5BZp419w==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.4(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.6(typescript@4.9.5): + resolution: {integrity: sha512-nVjHMRJTaa4trTDsi4ZOj/+p2x2OxgC/0Pp8jmwYfnSSDxP4YhWn9OkofXvZYHAeCxnqibMmJ51UzmdTPQBw2A==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.5(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.7(typescript@4.9.5): + resolution: {integrity: sha512-i32NPpGdem263qTlyXihm5PbWiGZL5GTK7WoZbXuv9JMS60PqUx0nrvuK2+XR8tKYqCIkFBRGAueQsQN75ZnLw==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.6(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.8(typescript@4.9.5): + resolution: {integrity: sha512-v1i9UlAE6DwR4KsEFMXtJwo6VT93HQDtKpAO1+/bE28KzxM46QqHpWklBoVOz2TqatFIc2iKFmaJzXnhOhaHNA==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.7(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + + /vue-pdf-next@0.0.9(typescript@4.9.5): + resolution: {integrity: sha512-Cei+PuBSDuOi4dQH8Z6luj/KuAg9ujdUGUt3c1Oq/o6yglPzksrtKZSDA7mtWf8/lu7pZcFRt4iPEZ4XZPDdbg==} + dependencies: + '@vueuse/core': 8.9.4(vue@3.4.4) + pdfjs-dist: 2.16.105 + vue: 3.4.4(typescript@4.9.5) + vue-pdf-next: 0.0.8(typescript@4.9.5) + transitivePeerDependencies: + - '@vue/composition-api' + - typescript + - worker-loader + dev: false + /vue-router@4.4.5(vue@3.4.4): resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==} peerDependencies: diff --git a/src/components/ApprovalCustom/ApprovalDialog.vue b/src/components/ApprovalCustom/ApprovalDialog.vue index 11deb65..7f67de7 100644 --- a/src/components/ApprovalCustom/ApprovalDialog.vue +++ b/src/components/ApprovalCustom/ApprovalDialog.vue @@ -5,10 +5,9 @@ import dayjs from 'dayjs' import useUserStore from '@/store/modules/user' import { fetchApproval, submitApproval } from '@/api/approval' -import { addApprovalUser } from '@/api/system/process' +import { addApprovalUser, getProcessDetail } from '@/api/system/process' import { getUserList } from '@/api/system/user' import request from '@/api/index' -import { getProcessDetail } from '@/api/system/process' /** * 审批弹窗 */ @@ -36,9 +35,14 @@ formId: { type: String, default: '', - } + }, + defaultTitle: { + type: Boolean, + default: false, + }, }) const emit = defineEmits(['onSuccess', 'refuse', 'reject', 'sendApprovalRecord']) +const currentApprovalNode = ref('') // 当前审批节点名称 // 弹窗显示状态 const dialogVisible = ref(false) // 默认表单 @@ -65,7 +69,7 @@ const userInfo = useUserStore() // 是否展示 下一节点审批节点 审批人 const isShowUser = ref(false) -const nextText = ref('') // 下一审批节点名称 +const nextText = ref('') // 下一审批节点名称 // ---------------表单提交-------------------------------- // 表单对象 const dataFormRef = ref() @@ -172,33 +176,34 @@ } fetchDict() // 获取当前审批节点的下一节点 -const getApprovalNextRecord= (data: any[]) => { - if(!$props.formId) { +const getApprovalNextRecord = (data: any[]) => { + if (!$props.formId) { nextText.value = '' - return + return } if (!data.length) { nextText.value = '' } else { - getProcessDetail($props.formId).then(res => { + getProcessDetail($props.formId).then((res) => { if (res.data?.nodeConfig) { - function flattenObject(obj: any, parentKey: string = '', result: any = {}): any { - for (let key in obj) { + function flattenObject(obj: any, parentKey = '', result: any = {}): any { + for (const key in obj) { if (obj.hasOwnProperty(key)) { - const newKey = parentKey ? `${parentKey}.${key}` : key; + const newKey = parentKey ? `${parentKey}.${key}` : key if (typeof obj[key] === 'object' && obj[key] !== null && !Array.isArray(obj[key])) { - flattenObject(obj[key], newKey, result); - } else { - result[newKey] = obj[key]; + flattenObject(obj[key], newKey, result) + } + else { + result[newKey] = obj[key] } } } - return result; + return result } const response = flattenObject(res.data.nodeConfig) const result = [] - for (let key in response) { + for (const key in response) { if (key.includes('nodeName')) { // console.log(key) result.push(response[key]) @@ -221,6 +226,7 @@ if (res.data.length) { const data = res.data[res.data.length - 1] if (data.length) { + currentApprovalNode.value = data[data.length - 1].taskName if (data[data.length - 1].taskName === $props.lastName) { isShowUser.value = false } @@ -274,7 +280,7 @@ - + + + + + + + + + diff --git a/src/views/quality/internal/dissatisfied/components/edit.vue b/src/views/quality/internal/dissatisfied/components/edit.vue index 5de62df..a90c208 100644 --- a/src/views/quality/internal/dissatisfied/components/edit.vue +++ b/src/views/quality/internal/dissatisfied/components/edit.vue @@ -135,7 +135,7 @@ if (valid) { const data = { ...ruleForm.value, - groupNo: deptAllList.value.filter((item: any) => item.deptId === ruleForm.value.deptId)[0]?.groupNo + groupNo: deptAllList.value.filter((item: any) => item.deptId === ruleForm.value.deptId)[0]?.groupNo, // DissatisfiedSchedules: scheduleRef.value.list, // fileName: `${ruleForm.value.yearTime}年第${ruleForm.value.yearNum}次内部审核检查表`, } @@ -359,11 +359,14 @@