diff --git a/package.json b/package.json index 95301ac..0d23a70 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "version": "2.1.3", "scripts": { - "limit": "cross-env LIMIT=8192 increase-memory-limit", + "limit": "cross-env LIMIT=81920 increase-memory-limit", "dev": "vite", "build:test": "vite build --mode test", "build": "vite build", @@ -20,25 +20,25 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.10", - "@grapecity-software/spread-excelio": "^18.0.3", - "@grapecity-software/spread-sheets": "^18.0.3", - "@grapecity-software/spread-sheets-barcode": "^18.0.3", - "@grapecity-software/spread-sheets-charts": "^18.0.3", - "@grapecity-software/spread-sheets-designer": "^18.0.3", - "@grapecity-software/spread-sheets-designer-resources-cn": "^18.0.3", - "@grapecity-software/spread-sheets-designer-vue": "^18.0.3", - "@grapecity-software/spread-sheets-formula-panel": "^18.0.3", - "@grapecity-software/spread-sheets-ganttsheet": "^18.0.3", - "@grapecity-software/spread-sheets-io": "^18.0.3", - "@grapecity-software/spread-sheets-languagepackages": "^18.0.3", - "@grapecity-software/spread-sheets-pdf": "^18.0.3", - "@grapecity-software/spread-sheets-pivot-addon": "^18.0.3", - "@grapecity-software/spread-sheets-print": "^18.0.3", - "@grapecity-software/spread-sheets-reportsheet-addon": "^18.0.3", - "@grapecity-software/spread-sheets-resources-zh": "^18.0.3", - "@grapecity-software/spread-sheets-shapes": "^18.0.3", - "@grapecity-software/spread-sheets-slicers": "^18.0.3", - "@grapecity-software/spread-sheets-tablesheet": "^18.0.3", + "@grapecity-software/spread-excelio": "18.0.4", + "@grapecity-software/spread-sheets": "18.0.4", + "@grapecity-software/spread-sheets-barcode": "18.0.4", + "@grapecity-software/spread-sheets-charts": "18.0.4", + "@grapecity-software/spread-sheets-designer": "18.0.4", + "@grapecity-software/spread-sheets-designer-resources-cn": "18.0.4", + "@grapecity-software/spread-sheets-designer-vue": "18.0.4", + "@grapecity-software/spread-sheets-formula-panel": "18.0.4", + "@grapecity-software/spread-sheets-ganttsheet": "18.0.4", + "@grapecity-software/spread-sheets-io": "18.0.4", + "@grapecity-software/spread-sheets-languagepackages": "18.0.4", + "@grapecity-software/spread-sheets-pdf": "18.0.4", + "@grapecity-software/spread-sheets-pivot-addon": "18.0.4", + "@grapecity-software/spread-sheets-print": "18.0.4", + "@grapecity-software/spread-sheets-reportsheet-addon": "18.0.4", + "@grapecity-software/spread-sheets-resources-zh": "18.0.4", + "@grapecity-software/spread-sheets-shapes": "18.0.4", + "@grapecity-software/spread-sheets-slicers": "18.0.4", + "@grapecity-software/spread-sheets-tablesheet": "18.0.4", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", @@ -50,7 +50,6 @@ "element-plus": "^2.9.4", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", - "html2canvas": "^1.4.1", "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", @@ -59,15 +58,16 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", - "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", "vue-router": "^4.1.6", + "vue-pdf-embed": "^1.1.5", + "pdfjs-dist": "2.0.943", + "html2canvas": "^1.4.1", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", "xlsx": "^0.18.5" diff --git a/package.json b/package.json index 95301ac..0d23a70 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "version": "2.1.3", "scripts": { - "limit": "cross-env LIMIT=8192 increase-memory-limit", + "limit": "cross-env LIMIT=81920 increase-memory-limit", "dev": "vite", "build:test": "vite build --mode test", "build": "vite build", @@ -20,25 +20,25 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.10", - "@grapecity-software/spread-excelio": "^18.0.3", - "@grapecity-software/spread-sheets": "^18.0.3", - "@grapecity-software/spread-sheets-barcode": "^18.0.3", - "@grapecity-software/spread-sheets-charts": "^18.0.3", - "@grapecity-software/spread-sheets-designer": "^18.0.3", - "@grapecity-software/spread-sheets-designer-resources-cn": "^18.0.3", - "@grapecity-software/spread-sheets-designer-vue": "^18.0.3", - "@grapecity-software/spread-sheets-formula-panel": "^18.0.3", - "@grapecity-software/spread-sheets-ganttsheet": "^18.0.3", - "@grapecity-software/spread-sheets-io": "^18.0.3", - "@grapecity-software/spread-sheets-languagepackages": "^18.0.3", - "@grapecity-software/spread-sheets-pdf": "^18.0.3", - "@grapecity-software/spread-sheets-pivot-addon": "^18.0.3", - "@grapecity-software/spread-sheets-print": "^18.0.3", - "@grapecity-software/spread-sheets-reportsheet-addon": "^18.0.3", - "@grapecity-software/spread-sheets-resources-zh": "^18.0.3", - "@grapecity-software/spread-sheets-shapes": "^18.0.3", - "@grapecity-software/spread-sheets-slicers": "^18.0.3", - "@grapecity-software/spread-sheets-tablesheet": "^18.0.3", + "@grapecity-software/spread-excelio": "18.0.4", + "@grapecity-software/spread-sheets": "18.0.4", + "@grapecity-software/spread-sheets-barcode": "18.0.4", + "@grapecity-software/spread-sheets-charts": "18.0.4", + "@grapecity-software/spread-sheets-designer": "18.0.4", + "@grapecity-software/spread-sheets-designer-resources-cn": "18.0.4", + "@grapecity-software/spread-sheets-designer-vue": "18.0.4", + "@grapecity-software/spread-sheets-formula-panel": "18.0.4", + "@grapecity-software/spread-sheets-ganttsheet": "18.0.4", + "@grapecity-software/spread-sheets-io": "18.0.4", + "@grapecity-software/spread-sheets-languagepackages": "18.0.4", + "@grapecity-software/spread-sheets-pdf": "18.0.4", + "@grapecity-software/spread-sheets-pivot-addon": "18.0.4", + "@grapecity-software/spread-sheets-print": "18.0.4", + "@grapecity-software/spread-sheets-reportsheet-addon": "18.0.4", + "@grapecity-software/spread-sheets-resources-zh": "18.0.4", + "@grapecity-software/spread-sheets-shapes": "18.0.4", + "@grapecity-software/spread-sheets-slicers": "18.0.4", + "@grapecity-software/spread-sheets-tablesheet": "18.0.4", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", @@ -50,7 +50,6 @@ "element-plus": "^2.9.4", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", - "html2canvas": "^1.4.1", "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", @@ -59,15 +58,16 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", - "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", "vue-router": "^4.1.6", + "vue-pdf-embed": "^1.1.5", + "pdfjs-dist": "2.0.943", + "html2canvas": "^1.4.1", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", "xlsx": "^0.18.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 107fd04..c752c80 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,25 +3,25 @@ specifiers: '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 - '@grapecity-software/spread-excelio': ^18.0.3 - '@grapecity-software/spread-sheets': ^18.0.3 - '@grapecity-software/spread-sheets-barcode': ^18.0.3 - '@grapecity-software/spread-sheets-charts': ^18.0.3 - '@grapecity-software/spread-sheets-designer': ^18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': ^18.0.3 - '@grapecity-software/spread-sheets-designer-vue': ^18.0.3 - '@grapecity-software/spread-sheets-formula-panel': ^18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': ^18.0.3 - '@grapecity-software/spread-sheets-io': ^18.0.3 - '@grapecity-software/spread-sheets-languagepackages': ^18.0.3 - '@grapecity-software/spread-sheets-pdf': ^18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': ^18.0.3 - '@grapecity-software/spread-sheets-print': ^18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': ^18.0.3 - '@grapecity-software/spread-sheets-resources-zh': ^18.0.3 - '@grapecity-software/spread-sheets-shapes': ^18.0.3 - '@grapecity-software/spread-sheets-slicers': ^18.0.3 - '@grapecity-software/spread-sheets-tablesheet': ^18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -101,25 +101,25 @@ dependencies: '@element-plus/icons-vue': 2.3.1_vue@3.5.13 - '@grapecity-software/spread-excelio': 18.0.3 - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-barcode': 18.0.3 - '@grapecity-software/spread-sheets-charts': 18.0.3 - '@grapecity-software/spread-sheets-designer': 18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.3 - '@grapecity-software/spread-sheets-designer-vue': 18.0.3 - '@grapecity-software/spread-sheets-formula-panel': 18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': 18.0.3 - '@grapecity-software/spread-sheets-io': 18.0.3 - '@grapecity-software/spread-sheets-languagepackages': 18.0.3 - '@grapecity-software/spread-sheets-pdf': 18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.3 - '@grapecity-software/spread-sheets-resources-zh': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 - '@grapecity-software/spread-sheets-slicers': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@tinymce/tinymce-vue': 5.1.1_vue@3.5.13 '@vueuse/core': 9.13.0_vue@3.5.13 '@vueuse/integrations': 9.13.0_444g5qadeay4jgjlt43bfjlya4 @@ -862,116 +862,116 @@ resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} dev: false - /@grapecity-software/spread-excelio/18.0.3: - resolution: {integrity: sha512-BBGJFNr5vO8dGCJRqYzzEMh1AAulE8lvbHdWC4OSxEi/MxRJ0tInE6iF+VJ6U4QM3JxZiIuDYZikIS/0n9PK+g==} + /@grapecity-software/spread-excelio/18.0.4: + resolution: {integrity: sha512-a1oNrKpNywxgZ+Y3E7EipiD30mFJEyE6dH1BKAxlGKZQk1kVPgX/FF0gQ6/5hpmAcAYXE4Ktq4cQWWQg0R/8VA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-barcode/18.0.3: - resolution: {integrity: sha512-gM9C67cumFp2m5ARNX3wUmB/h3to7RE2+yIztTHbHlTOB6P9DJhFVuPUdIztKdV3QLB5XDLH7t+6bqnK2loWiw==} + /@grapecity-software/spread-sheets-barcode/18.0.4: + resolution: {integrity: sha512-MlIe5g1mSN1DWiaNDvQEALIYVW5Hev8Hyw6MLsowWvTMh3hJpQ9I0+qQwhJmUP9URv7yCqIZ/TWIg0/JGirC6g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-charts/18.0.3: - resolution: {integrity: sha512-hooSPXbacF7CyGSmE1+beQYBQT0vkGN3C71XxGumPkUKIG6iHixrzaGSSnqblniCYwO4NXkOxS9mppVdJLAupA==} + /@grapecity-software/spread-sheets-charts/18.0.4: + resolution: {integrity: sha512-RQlCR9yo6ge3FvEHPCecC6Yv+zVACD3Kl+tYORwMHpu3tyGUAgnGQfX3BydyX/DAITT/c5LLPB+yR63UnOLICQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-designer-resources-cn/18.0.3: - resolution: {integrity: sha512-da5rA68TD3iTNL+2BjRdUrAmva45JB+lGQPJ+Lh4qbF1fZlSZ5GaKi3f7gZE4HhWbiNi/bfwNB+FS6PBuJiqeg==} + /@grapecity-software/spread-sheets-designer-resources-cn/18.0.4: + resolution: {integrity: sha512-jUcNd89sSkiTDK+oqJIki28HKPvPVnhB3aRhxz4nnLwMqL8JFejblTjDJwJKKqQ5itnHstDhzNQ58BzcIXdaRA==} dev: false - /@grapecity-software/spread-sheets-designer-vue/18.0.3: - resolution: {integrity: sha512-AIFilAJADixA26h5PDIWTsi5kugbtbiMkFrHdvO56kIhmmy3nsfhnwkFGOVBWKAV6OkxNkW4EWyLjJs9dXeoWw==} + /@grapecity-software/spread-sheets-designer-vue/18.0.4: + resolution: {integrity: sha512-nVWZOgKcQlaDJ+tf+I+Evp6UB2zyORhis+nEiqE+Ixkhc4UJr0BojnNhA9CA+0eBsPCUtYCPAnz/W45ttrR7rg==} dev: false - /@grapecity-software/spread-sheets-designer/18.0.3: - resolution: {integrity: sha512-21DqwkHRJkSW4nCMalnogobZABBX7Q64GY3w0JfzdiSEOVkt0iOIMVf0BdBCPuGEleHyBWvFAA9CGf0HErE8qQ==} + /@grapecity-software/spread-sheets-designer/18.0.4: + resolution: {integrity: sha512-aexIhr4T99s41SpkVrAhfcl4eiAOpJdSauIjKNPoc3d5dRdS+uJrcQGmGKypvhO3ArejAdiGCHkDZadsvKHgoQ==} dev: false - /@grapecity-software/spread-sheets-formula-panel/18.0.3: - resolution: {integrity: sha512-LEHf+WHu99x2wmV3pQgllZFxQfuCKDUCV2i0jlZaS67lEWJ+Ocf80NSyb2jRenm3LX4fhrA5DBN84my7sI6baA==} + /@grapecity-software/spread-sheets-formula-panel/18.0.4: + resolution: {integrity: sha512-jCqlSe0RYiC8besCUVyXiZe/o1Kc5S40QcQBWrBMHM0FfbKVeF1qf5kKkozAWg0wdZLfpmd/h/emyGCafYxBwA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-ganttsheet/18.0.3: - resolution: {integrity: sha512-hIgUXXMlSFiybtFj/fVIxlaVzf+Q0t3qfshKGkykQZ8w1SMW0pvmSHCLAanZDaf4nz9FrAGELz7w1B8Z0Zic2w==} + /@grapecity-software/spread-sheets-ganttsheet/18.0.4: + resolution: {integrity: sha512-6GYO76CAQPUfqmO0XN2H5yRSRVOmckeLjmuag3nhKvc/nfAIYrVBm9hyYc/UoUt3hsIDF/7oSrJUyQ+Y3kE6Kw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 dev: false - /@grapecity-software/spread-sheets-io/18.0.3: - resolution: {integrity: sha512-waApTWTuLaGT3lyLD1uGrPvbaLj5ft5xzQv206oz1caVUEP8qu/CK93mHXvnD8hxeV/uvssvUo12OndcYGnXtw==} + /@grapecity-software/spread-sheets-io/18.0.4: + resolution: {integrity: sha512-SJyKtZQEjCsqO9Eoq8jXlH/MgW4cB+5E3z7GF68JNSSnJ9vBgYSJ1kimEGFeCWUa9/mbrZWBF0tbwbWpGLqp0g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-languagepackages/18.0.3: - resolution: {integrity: sha512-39N6mJIMuz5kAz2izxscT/vFQvWxDH2rqLZyEcp3SHirNjxXQWAG4pr8cNd39YybIrEH9igsW7w4MizF8CPWKw==} + /@grapecity-software/spread-sheets-languagepackages/18.0.4: + resolution: {integrity: sha512-xMEskSA39LFaMQRuz6Tr2k0muEh1Q1e0O4vFeW0uU5TKSJrDss06sH8NTpoiPSF1AIl1Jh8ElzV+Qh7HM9rk1w==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pdf/18.0.3: - resolution: {integrity: sha512-EB5Pfs/pxR1kYU3pjZiRV+6RnguiSQ0G9ob4yj4ZC0FC+MuHXmdCH3z9cw7mLddZ3H32FFYHDBFgJwFZiQNceA==} + /@grapecity-software/spread-sheets-pdf/18.0.4: + resolution: {integrity: sha512-SpgsrStTvF8jKo1GXjPEIRl12etW1ke0ERptdJjDubmMKXZnZVpEUGGJ/BT9oWGPULHje9h6bA+lEZTBnJHYSw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pivot-addon/18.0.3: - resolution: {integrity: sha512-x4VVHa3GDtSigK2PsXQZ3CdLyW6Y0yqLqXObQIEf2TNhRjIn3t21i648CUWCNs3G6ImnCLLWdd3XabbvM0+Zog==} + /@grapecity-software/spread-sheets-pivot-addon/18.0.4: + resolution: {integrity: sha512-Vkr0x/aZMj86VR5JTfuoT6nj6nI+myUmkhM2cbLSqp7PRIo9Pk/2czMV1yyRUom4h2j7jOA7uzmHxvSQHM5c6A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-print/18.0.3: - resolution: {integrity: sha512-26g1RdXtugaRqWqDQMOxIG+T9/GreZaaFfdkqWt/QSbbmGuiMLozWYKQA+quaZy15yciXSOM975uZLpZtN0/Ww==} + /@grapecity-software/spread-sheets-print/18.0.4: + resolution: {integrity: sha512-PBTgVEsQ1vv0e8noUM2Z9BP9FX4ZCaeGXfiRI8VrmpcaVVhFsoNHyTasaCXKl7LhEk6ek5JHUyvSrcw6fxpU4A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-reportsheet-addon/18.0.3: - resolution: {integrity: sha512-cbxouUnNM6ElwFcyRjkbIT6AobCnnmo9hJtHgP4OpnkLg+pqgrN0nDgCmiaVDc3DfF/mWTpdbo+VxqHDbNFCHw==} + /@grapecity-software/spread-sheets-reportsheet-addon/18.0.4: + resolution: {integrity: sha512-m6REN62ru8t3Z6sv7rltmPdzQ95oPC0k4blBqCm2RD/oEnlp1l2NtlSLYYt2Uilb7T1eB5ARhYbQ4KmbyzkIWw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-resources-zh/18.0.3: - resolution: {integrity: sha512-WH2XwcqvlAOvcGj6emoDl5m6vBvI6n9KQzz3Dq73aI8AUyoEqWS1P4weYGxwXgSHOStfZTly9guGqaBHCSlYUA==} + /@grapecity-software/spread-sheets-resources-zh/18.0.4: + resolution: {integrity: sha512-a67tmT4I1bsk2eLKga3zfDlwMUOt6kyHXJQFnGK6frob3OLoGkhOsa2Xs4fq+rJnKpm0Z6GjBD7npIumllOOlA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-shapes/18.0.3: - resolution: {integrity: sha512-zzlqA4NyKZXFh+SwW8Ljf41ahhlK69QZzqG2a+Qp3/qv9iOsvFIRupyM/BgSuTlmq1X7JiEZDHB53fitRnX4DA==} + /@grapecity-software/spread-sheets-shapes/18.0.4: + resolution: {integrity: sha512-8qH0oXGjJnjQO4AP1daQZyTZEaqSOgPesDuUi1n5RPEYIfEOMEZR2KXBBkqWgDsrMvO+9LApL/Kay/iVK64QXQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-slicers/18.0.3: - resolution: {integrity: sha512-KD3+oRjBZfh3wZvkqez9vfhWtvhie9hXys9sPVPr5qTtTdf8nyJnQrJs+fsKxoG0wdHN2pKHUq4daPvXz2CeRw==} + /@grapecity-software/spread-sheets-slicers/18.0.4: + resolution: {integrity: sha512-isGDzN+fh4hxfarGyxkFn3mbUIELeeGxRhbH5PjA+nWXAEauxCbGXSIEPQ0r3OG+fwi5gG4ri3fCtwLtF9YKKA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-tablesheet/18.0.3: - resolution: {integrity: sha512-MqbVgNIK7fVbvK3NpB7mv2NoysVUA9UugGx3VR1EuWfceTGgtVMvAmZ1yhV53b/KjsDpq+kI5Wp7/EgVgqB31g==} + /@grapecity-software/spread-sheets-tablesheet/18.0.4: + resolution: {integrity: sha512-K+aBUbm1SupFldc5pYKCClCa58ak+Q6ZVkno9i+XO9PSV+SOZ0A03DRQiy7S9HgnsYTewNVfpyO+IxGKqQ5Zfg==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets/18.0.3: - resolution: {integrity: sha512-vfGx7S4jxw7yry7Gi+TXbeoMapR7HQxurNQ0TrtyqkqNW/Eeut+WCl4dBTmn2HM/faT4jfwVFbk0bfBBYGEwlw==} + /@grapecity-software/spread-sheets/18.0.4: + resolution: {integrity: sha512-xGli6qXVwg18sstSJlgkGwd3K4ytTS8xoRiYr43cN2RBLrGUaPvmfKduJkB9IfkBKzScoZODOVfV4QO42eonTg==} dev: false /@humanwhocodes/config-array/0.13.0: diff --git a/package.json b/package.json index 95301ac..0d23a70 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "version": "2.1.3", "scripts": { - "limit": "cross-env LIMIT=8192 increase-memory-limit", + "limit": "cross-env LIMIT=81920 increase-memory-limit", "dev": "vite", "build:test": "vite build --mode test", "build": "vite build", @@ -20,25 +20,25 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.10", - "@grapecity-software/spread-excelio": "^18.0.3", - "@grapecity-software/spread-sheets": "^18.0.3", - "@grapecity-software/spread-sheets-barcode": "^18.0.3", - "@grapecity-software/spread-sheets-charts": "^18.0.3", - "@grapecity-software/spread-sheets-designer": "^18.0.3", - "@grapecity-software/spread-sheets-designer-resources-cn": "^18.0.3", - "@grapecity-software/spread-sheets-designer-vue": "^18.0.3", - "@grapecity-software/spread-sheets-formula-panel": "^18.0.3", - "@grapecity-software/spread-sheets-ganttsheet": "^18.0.3", - "@grapecity-software/spread-sheets-io": "^18.0.3", - "@grapecity-software/spread-sheets-languagepackages": "^18.0.3", - "@grapecity-software/spread-sheets-pdf": "^18.0.3", - "@grapecity-software/spread-sheets-pivot-addon": "^18.0.3", - "@grapecity-software/spread-sheets-print": "^18.0.3", - "@grapecity-software/spread-sheets-reportsheet-addon": "^18.0.3", - "@grapecity-software/spread-sheets-resources-zh": "^18.0.3", - "@grapecity-software/spread-sheets-shapes": "^18.0.3", - "@grapecity-software/spread-sheets-slicers": "^18.0.3", - "@grapecity-software/spread-sheets-tablesheet": "^18.0.3", + "@grapecity-software/spread-excelio": "18.0.4", + "@grapecity-software/spread-sheets": "18.0.4", + "@grapecity-software/spread-sheets-barcode": "18.0.4", + "@grapecity-software/spread-sheets-charts": "18.0.4", + "@grapecity-software/spread-sheets-designer": "18.0.4", + "@grapecity-software/spread-sheets-designer-resources-cn": "18.0.4", + "@grapecity-software/spread-sheets-designer-vue": "18.0.4", + "@grapecity-software/spread-sheets-formula-panel": "18.0.4", + "@grapecity-software/spread-sheets-ganttsheet": "18.0.4", + "@grapecity-software/spread-sheets-io": "18.0.4", + "@grapecity-software/spread-sheets-languagepackages": "18.0.4", + "@grapecity-software/spread-sheets-pdf": "18.0.4", + "@grapecity-software/spread-sheets-pivot-addon": "18.0.4", + "@grapecity-software/spread-sheets-print": "18.0.4", + "@grapecity-software/spread-sheets-reportsheet-addon": "18.0.4", + "@grapecity-software/spread-sheets-resources-zh": "18.0.4", + "@grapecity-software/spread-sheets-shapes": "18.0.4", + "@grapecity-software/spread-sheets-slicers": "18.0.4", + "@grapecity-software/spread-sheets-tablesheet": "18.0.4", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", @@ -50,7 +50,6 @@ "element-plus": "^2.9.4", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", - "html2canvas": "^1.4.1", "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", @@ -59,15 +58,16 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", - "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", "vue-router": "^4.1.6", + "vue-pdf-embed": "^1.1.5", + "pdfjs-dist": "2.0.943", + "html2canvas": "^1.4.1", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", "xlsx": "^0.18.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 107fd04..c752c80 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,25 +3,25 @@ specifiers: '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 - '@grapecity-software/spread-excelio': ^18.0.3 - '@grapecity-software/spread-sheets': ^18.0.3 - '@grapecity-software/spread-sheets-barcode': ^18.0.3 - '@grapecity-software/spread-sheets-charts': ^18.0.3 - '@grapecity-software/spread-sheets-designer': ^18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': ^18.0.3 - '@grapecity-software/spread-sheets-designer-vue': ^18.0.3 - '@grapecity-software/spread-sheets-formula-panel': ^18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': ^18.0.3 - '@grapecity-software/spread-sheets-io': ^18.0.3 - '@grapecity-software/spread-sheets-languagepackages': ^18.0.3 - '@grapecity-software/spread-sheets-pdf': ^18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': ^18.0.3 - '@grapecity-software/spread-sheets-print': ^18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': ^18.0.3 - '@grapecity-software/spread-sheets-resources-zh': ^18.0.3 - '@grapecity-software/spread-sheets-shapes': ^18.0.3 - '@grapecity-software/spread-sheets-slicers': ^18.0.3 - '@grapecity-software/spread-sheets-tablesheet': ^18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -101,25 +101,25 @@ dependencies: '@element-plus/icons-vue': 2.3.1_vue@3.5.13 - '@grapecity-software/spread-excelio': 18.0.3 - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-barcode': 18.0.3 - '@grapecity-software/spread-sheets-charts': 18.0.3 - '@grapecity-software/spread-sheets-designer': 18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.3 - '@grapecity-software/spread-sheets-designer-vue': 18.0.3 - '@grapecity-software/spread-sheets-formula-panel': 18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': 18.0.3 - '@grapecity-software/spread-sheets-io': 18.0.3 - '@grapecity-software/spread-sheets-languagepackages': 18.0.3 - '@grapecity-software/spread-sheets-pdf': 18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.3 - '@grapecity-software/spread-sheets-resources-zh': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 - '@grapecity-software/spread-sheets-slicers': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@tinymce/tinymce-vue': 5.1.1_vue@3.5.13 '@vueuse/core': 9.13.0_vue@3.5.13 '@vueuse/integrations': 9.13.0_444g5qadeay4jgjlt43bfjlya4 @@ -862,116 +862,116 @@ resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} dev: false - /@grapecity-software/spread-excelio/18.0.3: - resolution: {integrity: sha512-BBGJFNr5vO8dGCJRqYzzEMh1AAulE8lvbHdWC4OSxEi/MxRJ0tInE6iF+VJ6U4QM3JxZiIuDYZikIS/0n9PK+g==} + /@grapecity-software/spread-excelio/18.0.4: + resolution: {integrity: sha512-a1oNrKpNywxgZ+Y3E7EipiD30mFJEyE6dH1BKAxlGKZQk1kVPgX/FF0gQ6/5hpmAcAYXE4Ktq4cQWWQg0R/8VA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-barcode/18.0.3: - resolution: {integrity: sha512-gM9C67cumFp2m5ARNX3wUmB/h3to7RE2+yIztTHbHlTOB6P9DJhFVuPUdIztKdV3QLB5XDLH7t+6bqnK2loWiw==} + /@grapecity-software/spread-sheets-barcode/18.0.4: + resolution: {integrity: sha512-MlIe5g1mSN1DWiaNDvQEALIYVW5Hev8Hyw6MLsowWvTMh3hJpQ9I0+qQwhJmUP9URv7yCqIZ/TWIg0/JGirC6g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-charts/18.0.3: - resolution: {integrity: sha512-hooSPXbacF7CyGSmE1+beQYBQT0vkGN3C71XxGumPkUKIG6iHixrzaGSSnqblniCYwO4NXkOxS9mppVdJLAupA==} + /@grapecity-software/spread-sheets-charts/18.0.4: + resolution: {integrity: sha512-RQlCR9yo6ge3FvEHPCecC6Yv+zVACD3Kl+tYORwMHpu3tyGUAgnGQfX3BydyX/DAITT/c5LLPB+yR63UnOLICQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-designer-resources-cn/18.0.3: - resolution: {integrity: sha512-da5rA68TD3iTNL+2BjRdUrAmva45JB+lGQPJ+Lh4qbF1fZlSZ5GaKi3f7gZE4HhWbiNi/bfwNB+FS6PBuJiqeg==} + /@grapecity-software/spread-sheets-designer-resources-cn/18.0.4: + resolution: {integrity: sha512-jUcNd89sSkiTDK+oqJIki28HKPvPVnhB3aRhxz4nnLwMqL8JFejblTjDJwJKKqQ5itnHstDhzNQ58BzcIXdaRA==} dev: false - /@grapecity-software/spread-sheets-designer-vue/18.0.3: - resolution: {integrity: sha512-AIFilAJADixA26h5PDIWTsi5kugbtbiMkFrHdvO56kIhmmy3nsfhnwkFGOVBWKAV6OkxNkW4EWyLjJs9dXeoWw==} + /@grapecity-software/spread-sheets-designer-vue/18.0.4: + resolution: {integrity: sha512-nVWZOgKcQlaDJ+tf+I+Evp6UB2zyORhis+nEiqE+Ixkhc4UJr0BojnNhA9CA+0eBsPCUtYCPAnz/W45ttrR7rg==} dev: false - /@grapecity-software/spread-sheets-designer/18.0.3: - resolution: {integrity: sha512-21DqwkHRJkSW4nCMalnogobZABBX7Q64GY3w0JfzdiSEOVkt0iOIMVf0BdBCPuGEleHyBWvFAA9CGf0HErE8qQ==} + /@grapecity-software/spread-sheets-designer/18.0.4: + resolution: {integrity: sha512-aexIhr4T99s41SpkVrAhfcl4eiAOpJdSauIjKNPoc3d5dRdS+uJrcQGmGKypvhO3ArejAdiGCHkDZadsvKHgoQ==} dev: false - /@grapecity-software/spread-sheets-formula-panel/18.0.3: - resolution: {integrity: sha512-LEHf+WHu99x2wmV3pQgllZFxQfuCKDUCV2i0jlZaS67lEWJ+Ocf80NSyb2jRenm3LX4fhrA5DBN84my7sI6baA==} + /@grapecity-software/spread-sheets-formula-panel/18.0.4: + resolution: {integrity: sha512-jCqlSe0RYiC8besCUVyXiZe/o1Kc5S40QcQBWrBMHM0FfbKVeF1qf5kKkozAWg0wdZLfpmd/h/emyGCafYxBwA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-ganttsheet/18.0.3: - resolution: {integrity: sha512-hIgUXXMlSFiybtFj/fVIxlaVzf+Q0t3qfshKGkykQZ8w1SMW0pvmSHCLAanZDaf4nz9FrAGELz7w1B8Z0Zic2w==} + /@grapecity-software/spread-sheets-ganttsheet/18.0.4: + resolution: {integrity: sha512-6GYO76CAQPUfqmO0XN2H5yRSRVOmckeLjmuag3nhKvc/nfAIYrVBm9hyYc/UoUt3hsIDF/7oSrJUyQ+Y3kE6Kw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 dev: false - /@grapecity-software/spread-sheets-io/18.0.3: - resolution: {integrity: sha512-waApTWTuLaGT3lyLD1uGrPvbaLj5ft5xzQv206oz1caVUEP8qu/CK93mHXvnD8hxeV/uvssvUo12OndcYGnXtw==} + /@grapecity-software/spread-sheets-io/18.0.4: + resolution: {integrity: sha512-SJyKtZQEjCsqO9Eoq8jXlH/MgW4cB+5E3z7GF68JNSSnJ9vBgYSJ1kimEGFeCWUa9/mbrZWBF0tbwbWpGLqp0g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-languagepackages/18.0.3: - resolution: {integrity: sha512-39N6mJIMuz5kAz2izxscT/vFQvWxDH2rqLZyEcp3SHirNjxXQWAG4pr8cNd39YybIrEH9igsW7w4MizF8CPWKw==} + /@grapecity-software/spread-sheets-languagepackages/18.0.4: + resolution: {integrity: sha512-xMEskSA39LFaMQRuz6Tr2k0muEh1Q1e0O4vFeW0uU5TKSJrDss06sH8NTpoiPSF1AIl1Jh8ElzV+Qh7HM9rk1w==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pdf/18.0.3: - resolution: {integrity: sha512-EB5Pfs/pxR1kYU3pjZiRV+6RnguiSQ0G9ob4yj4ZC0FC+MuHXmdCH3z9cw7mLddZ3H32FFYHDBFgJwFZiQNceA==} + /@grapecity-software/spread-sheets-pdf/18.0.4: + resolution: {integrity: sha512-SpgsrStTvF8jKo1GXjPEIRl12etW1ke0ERptdJjDubmMKXZnZVpEUGGJ/BT9oWGPULHje9h6bA+lEZTBnJHYSw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pivot-addon/18.0.3: - resolution: {integrity: sha512-x4VVHa3GDtSigK2PsXQZ3CdLyW6Y0yqLqXObQIEf2TNhRjIn3t21i648CUWCNs3G6ImnCLLWdd3XabbvM0+Zog==} + /@grapecity-software/spread-sheets-pivot-addon/18.0.4: + resolution: {integrity: sha512-Vkr0x/aZMj86VR5JTfuoT6nj6nI+myUmkhM2cbLSqp7PRIo9Pk/2czMV1yyRUom4h2j7jOA7uzmHxvSQHM5c6A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-print/18.0.3: - resolution: {integrity: sha512-26g1RdXtugaRqWqDQMOxIG+T9/GreZaaFfdkqWt/QSbbmGuiMLozWYKQA+quaZy15yciXSOM975uZLpZtN0/Ww==} + /@grapecity-software/spread-sheets-print/18.0.4: + resolution: {integrity: sha512-PBTgVEsQ1vv0e8noUM2Z9BP9FX4ZCaeGXfiRI8VrmpcaVVhFsoNHyTasaCXKl7LhEk6ek5JHUyvSrcw6fxpU4A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-reportsheet-addon/18.0.3: - resolution: {integrity: sha512-cbxouUnNM6ElwFcyRjkbIT6AobCnnmo9hJtHgP4OpnkLg+pqgrN0nDgCmiaVDc3DfF/mWTpdbo+VxqHDbNFCHw==} + /@grapecity-software/spread-sheets-reportsheet-addon/18.0.4: + resolution: {integrity: sha512-m6REN62ru8t3Z6sv7rltmPdzQ95oPC0k4blBqCm2RD/oEnlp1l2NtlSLYYt2Uilb7T1eB5ARhYbQ4KmbyzkIWw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-resources-zh/18.0.3: - resolution: {integrity: sha512-WH2XwcqvlAOvcGj6emoDl5m6vBvI6n9KQzz3Dq73aI8AUyoEqWS1P4weYGxwXgSHOStfZTly9guGqaBHCSlYUA==} + /@grapecity-software/spread-sheets-resources-zh/18.0.4: + resolution: {integrity: sha512-a67tmT4I1bsk2eLKga3zfDlwMUOt6kyHXJQFnGK6frob3OLoGkhOsa2Xs4fq+rJnKpm0Z6GjBD7npIumllOOlA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-shapes/18.0.3: - resolution: {integrity: sha512-zzlqA4NyKZXFh+SwW8Ljf41ahhlK69QZzqG2a+Qp3/qv9iOsvFIRupyM/BgSuTlmq1X7JiEZDHB53fitRnX4DA==} + /@grapecity-software/spread-sheets-shapes/18.0.4: + resolution: {integrity: sha512-8qH0oXGjJnjQO4AP1daQZyTZEaqSOgPesDuUi1n5RPEYIfEOMEZR2KXBBkqWgDsrMvO+9LApL/Kay/iVK64QXQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-slicers/18.0.3: - resolution: {integrity: sha512-KD3+oRjBZfh3wZvkqez9vfhWtvhie9hXys9sPVPr5qTtTdf8nyJnQrJs+fsKxoG0wdHN2pKHUq4daPvXz2CeRw==} + /@grapecity-software/spread-sheets-slicers/18.0.4: + resolution: {integrity: sha512-isGDzN+fh4hxfarGyxkFn3mbUIELeeGxRhbH5PjA+nWXAEauxCbGXSIEPQ0r3OG+fwi5gG4ri3fCtwLtF9YKKA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-tablesheet/18.0.3: - resolution: {integrity: sha512-MqbVgNIK7fVbvK3NpB7mv2NoysVUA9UugGx3VR1EuWfceTGgtVMvAmZ1yhV53b/KjsDpq+kI5Wp7/EgVgqB31g==} + /@grapecity-software/spread-sheets-tablesheet/18.0.4: + resolution: {integrity: sha512-K+aBUbm1SupFldc5pYKCClCa58ak+Q6ZVkno9i+XO9PSV+SOZ0A03DRQiy7S9HgnsYTewNVfpyO+IxGKqQ5Zfg==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets/18.0.3: - resolution: {integrity: sha512-vfGx7S4jxw7yry7Gi+TXbeoMapR7HQxurNQ0TrtyqkqNW/Eeut+WCl4dBTmn2HM/faT4jfwVFbk0bfBBYGEwlw==} + /@grapecity-software/spread-sheets/18.0.4: + resolution: {integrity: sha512-xGli6qXVwg18sstSJlgkGwd3K4ytTS8xoRiYr43cN2RBLrGUaPvmfKduJkB9IfkBKzScoZODOVfV4QO42eonTg==} dev: false /@humanwhocodes/config-array/0.13.0: diff --git a/src/components.d.ts b/src/components.d.ts index 185943b..a720b59 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -37,6 +38,7 @@ DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default'] + ExcelEdit: typeof import('./components/excelEdit/index.vue')['default'] ExcelOreview: typeof import('./components/filePreview/excelOreview.vue')['default'] FilePreview: typeof import('./components/filePreview/filePreview.vue')['default'] FilePreviewDialog: typeof import('./components/filePreview/filePreviewDialog.vue')['default'] diff --git a/package.json b/package.json index 95301ac..0d23a70 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "version": "2.1.3", "scripts": { - "limit": "cross-env LIMIT=8192 increase-memory-limit", + "limit": "cross-env LIMIT=81920 increase-memory-limit", "dev": "vite", "build:test": "vite build --mode test", "build": "vite build", @@ -20,25 +20,25 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.10", - "@grapecity-software/spread-excelio": "^18.0.3", - "@grapecity-software/spread-sheets": "^18.0.3", - "@grapecity-software/spread-sheets-barcode": "^18.0.3", - "@grapecity-software/spread-sheets-charts": "^18.0.3", - "@grapecity-software/spread-sheets-designer": "^18.0.3", - "@grapecity-software/spread-sheets-designer-resources-cn": "^18.0.3", - "@grapecity-software/spread-sheets-designer-vue": "^18.0.3", - "@grapecity-software/spread-sheets-formula-panel": "^18.0.3", - "@grapecity-software/spread-sheets-ganttsheet": "^18.0.3", - "@grapecity-software/spread-sheets-io": "^18.0.3", - "@grapecity-software/spread-sheets-languagepackages": "^18.0.3", - "@grapecity-software/spread-sheets-pdf": "^18.0.3", - "@grapecity-software/spread-sheets-pivot-addon": "^18.0.3", - "@grapecity-software/spread-sheets-print": "^18.0.3", - "@grapecity-software/spread-sheets-reportsheet-addon": "^18.0.3", - "@grapecity-software/spread-sheets-resources-zh": "^18.0.3", - "@grapecity-software/spread-sheets-shapes": "^18.0.3", - "@grapecity-software/spread-sheets-slicers": "^18.0.3", - "@grapecity-software/spread-sheets-tablesheet": "^18.0.3", + "@grapecity-software/spread-excelio": "18.0.4", + "@grapecity-software/spread-sheets": "18.0.4", + "@grapecity-software/spread-sheets-barcode": "18.0.4", + "@grapecity-software/spread-sheets-charts": "18.0.4", + "@grapecity-software/spread-sheets-designer": "18.0.4", + "@grapecity-software/spread-sheets-designer-resources-cn": "18.0.4", + "@grapecity-software/spread-sheets-designer-vue": "18.0.4", + "@grapecity-software/spread-sheets-formula-panel": "18.0.4", + "@grapecity-software/spread-sheets-ganttsheet": "18.0.4", + "@grapecity-software/spread-sheets-io": "18.0.4", + "@grapecity-software/spread-sheets-languagepackages": "18.0.4", + "@grapecity-software/spread-sheets-pdf": "18.0.4", + "@grapecity-software/spread-sheets-pivot-addon": "18.0.4", + "@grapecity-software/spread-sheets-print": "18.0.4", + "@grapecity-software/spread-sheets-reportsheet-addon": "18.0.4", + "@grapecity-software/spread-sheets-resources-zh": "18.0.4", + "@grapecity-software/spread-sheets-shapes": "18.0.4", + "@grapecity-software/spread-sheets-slicers": "18.0.4", + "@grapecity-software/spread-sheets-tablesheet": "18.0.4", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", @@ -50,7 +50,6 @@ "element-plus": "^2.9.4", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", - "html2canvas": "^1.4.1", "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", @@ -59,15 +58,16 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", - "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", "vue-router": "^4.1.6", + "vue-pdf-embed": "^1.1.5", + "pdfjs-dist": "2.0.943", + "html2canvas": "^1.4.1", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", "xlsx": "^0.18.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 107fd04..c752c80 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,25 +3,25 @@ specifiers: '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 - '@grapecity-software/spread-excelio': ^18.0.3 - '@grapecity-software/spread-sheets': ^18.0.3 - '@grapecity-software/spread-sheets-barcode': ^18.0.3 - '@grapecity-software/spread-sheets-charts': ^18.0.3 - '@grapecity-software/spread-sheets-designer': ^18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': ^18.0.3 - '@grapecity-software/spread-sheets-designer-vue': ^18.0.3 - '@grapecity-software/spread-sheets-formula-panel': ^18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': ^18.0.3 - '@grapecity-software/spread-sheets-io': ^18.0.3 - '@grapecity-software/spread-sheets-languagepackages': ^18.0.3 - '@grapecity-software/spread-sheets-pdf': ^18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': ^18.0.3 - '@grapecity-software/spread-sheets-print': ^18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': ^18.0.3 - '@grapecity-software/spread-sheets-resources-zh': ^18.0.3 - '@grapecity-software/spread-sheets-shapes': ^18.0.3 - '@grapecity-software/spread-sheets-slicers': ^18.0.3 - '@grapecity-software/spread-sheets-tablesheet': ^18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -101,25 +101,25 @@ dependencies: '@element-plus/icons-vue': 2.3.1_vue@3.5.13 - '@grapecity-software/spread-excelio': 18.0.3 - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-barcode': 18.0.3 - '@grapecity-software/spread-sheets-charts': 18.0.3 - '@grapecity-software/spread-sheets-designer': 18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.3 - '@grapecity-software/spread-sheets-designer-vue': 18.0.3 - '@grapecity-software/spread-sheets-formula-panel': 18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': 18.0.3 - '@grapecity-software/spread-sheets-io': 18.0.3 - '@grapecity-software/spread-sheets-languagepackages': 18.0.3 - '@grapecity-software/spread-sheets-pdf': 18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.3 - '@grapecity-software/spread-sheets-resources-zh': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 - '@grapecity-software/spread-sheets-slicers': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@tinymce/tinymce-vue': 5.1.1_vue@3.5.13 '@vueuse/core': 9.13.0_vue@3.5.13 '@vueuse/integrations': 9.13.0_444g5qadeay4jgjlt43bfjlya4 @@ -862,116 +862,116 @@ resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} dev: false - /@grapecity-software/spread-excelio/18.0.3: - resolution: {integrity: sha512-BBGJFNr5vO8dGCJRqYzzEMh1AAulE8lvbHdWC4OSxEi/MxRJ0tInE6iF+VJ6U4QM3JxZiIuDYZikIS/0n9PK+g==} + /@grapecity-software/spread-excelio/18.0.4: + resolution: {integrity: sha512-a1oNrKpNywxgZ+Y3E7EipiD30mFJEyE6dH1BKAxlGKZQk1kVPgX/FF0gQ6/5hpmAcAYXE4Ktq4cQWWQg0R/8VA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-barcode/18.0.3: - resolution: {integrity: sha512-gM9C67cumFp2m5ARNX3wUmB/h3to7RE2+yIztTHbHlTOB6P9DJhFVuPUdIztKdV3QLB5XDLH7t+6bqnK2loWiw==} + /@grapecity-software/spread-sheets-barcode/18.0.4: + resolution: {integrity: sha512-MlIe5g1mSN1DWiaNDvQEALIYVW5Hev8Hyw6MLsowWvTMh3hJpQ9I0+qQwhJmUP9URv7yCqIZ/TWIg0/JGirC6g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-charts/18.0.3: - resolution: {integrity: sha512-hooSPXbacF7CyGSmE1+beQYBQT0vkGN3C71XxGumPkUKIG6iHixrzaGSSnqblniCYwO4NXkOxS9mppVdJLAupA==} + /@grapecity-software/spread-sheets-charts/18.0.4: + resolution: {integrity: sha512-RQlCR9yo6ge3FvEHPCecC6Yv+zVACD3Kl+tYORwMHpu3tyGUAgnGQfX3BydyX/DAITT/c5LLPB+yR63UnOLICQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-designer-resources-cn/18.0.3: - resolution: {integrity: sha512-da5rA68TD3iTNL+2BjRdUrAmva45JB+lGQPJ+Lh4qbF1fZlSZ5GaKi3f7gZE4HhWbiNi/bfwNB+FS6PBuJiqeg==} + /@grapecity-software/spread-sheets-designer-resources-cn/18.0.4: + resolution: {integrity: sha512-jUcNd89sSkiTDK+oqJIki28HKPvPVnhB3aRhxz4nnLwMqL8JFejblTjDJwJKKqQ5itnHstDhzNQ58BzcIXdaRA==} dev: false - /@grapecity-software/spread-sheets-designer-vue/18.0.3: - resolution: {integrity: sha512-AIFilAJADixA26h5PDIWTsi5kugbtbiMkFrHdvO56kIhmmy3nsfhnwkFGOVBWKAV6OkxNkW4EWyLjJs9dXeoWw==} + /@grapecity-software/spread-sheets-designer-vue/18.0.4: + resolution: {integrity: sha512-nVWZOgKcQlaDJ+tf+I+Evp6UB2zyORhis+nEiqE+Ixkhc4UJr0BojnNhA9CA+0eBsPCUtYCPAnz/W45ttrR7rg==} dev: false - /@grapecity-software/spread-sheets-designer/18.0.3: - resolution: {integrity: sha512-21DqwkHRJkSW4nCMalnogobZABBX7Q64GY3w0JfzdiSEOVkt0iOIMVf0BdBCPuGEleHyBWvFAA9CGf0HErE8qQ==} + /@grapecity-software/spread-sheets-designer/18.0.4: + resolution: {integrity: sha512-aexIhr4T99s41SpkVrAhfcl4eiAOpJdSauIjKNPoc3d5dRdS+uJrcQGmGKypvhO3ArejAdiGCHkDZadsvKHgoQ==} dev: false - /@grapecity-software/spread-sheets-formula-panel/18.0.3: - resolution: {integrity: sha512-LEHf+WHu99x2wmV3pQgllZFxQfuCKDUCV2i0jlZaS67lEWJ+Ocf80NSyb2jRenm3LX4fhrA5DBN84my7sI6baA==} + /@grapecity-software/spread-sheets-formula-panel/18.0.4: + resolution: {integrity: sha512-jCqlSe0RYiC8besCUVyXiZe/o1Kc5S40QcQBWrBMHM0FfbKVeF1qf5kKkozAWg0wdZLfpmd/h/emyGCafYxBwA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-ganttsheet/18.0.3: - resolution: {integrity: sha512-hIgUXXMlSFiybtFj/fVIxlaVzf+Q0t3qfshKGkykQZ8w1SMW0pvmSHCLAanZDaf4nz9FrAGELz7w1B8Z0Zic2w==} + /@grapecity-software/spread-sheets-ganttsheet/18.0.4: + resolution: {integrity: sha512-6GYO76CAQPUfqmO0XN2H5yRSRVOmckeLjmuag3nhKvc/nfAIYrVBm9hyYc/UoUt3hsIDF/7oSrJUyQ+Y3kE6Kw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 dev: false - /@grapecity-software/spread-sheets-io/18.0.3: - resolution: {integrity: sha512-waApTWTuLaGT3lyLD1uGrPvbaLj5ft5xzQv206oz1caVUEP8qu/CK93mHXvnD8hxeV/uvssvUo12OndcYGnXtw==} + /@grapecity-software/spread-sheets-io/18.0.4: + resolution: {integrity: sha512-SJyKtZQEjCsqO9Eoq8jXlH/MgW4cB+5E3z7GF68JNSSnJ9vBgYSJ1kimEGFeCWUa9/mbrZWBF0tbwbWpGLqp0g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-languagepackages/18.0.3: - resolution: {integrity: sha512-39N6mJIMuz5kAz2izxscT/vFQvWxDH2rqLZyEcp3SHirNjxXQWAG4pr8cNd39YybIrEH9igsW7w4MizF8CPWKw==} + /@grapecity-software/spread-sheets-languagepackages/18.0.4: + resolution: {integrity: sha512-xMEskSA39LFaMQRuz6Tr2k0muEh1Q1e0O4vFeW0uU5TKSJrDss06sH8NTpoiPSF1AIl1Jh8ElzV+Qh7HM9rk1w==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pdf/18.0.3: - resolution: {integrity: sha512-EB5Pfs/pxR1kYU3pjZiRV+6RnguiSQ0G9ob4yj4ZC0FC+MuHXmdCH3z9cw7mLddZ3H32FFYHDBFgJwFZiQNceA==} + /@grapecity-software/spread-sheets-pdf/18.0.4: + resolution: {integrity: sha512-SpgsrStTvF8jKo1GXjPEIRl12etW1ke0ERptdJjDubmMKXZnZVpEUGGJ/BT9oWGPULHje9h6bA+lEZTBnJHYSw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pivot-addon/18.0.3: - resolution: {integrity: sha512-x4VVHa3GDtSigK2PsXQZ3CdLyW6Y0yqLqXObQIEf2TNhRjIn3t21i648CUWCNs3G6ImnCLLWdd3XabbvM0+Zog==} + /@grapecity-software/spread-sheets-pivot-addon/18.0.4: + resolution: {integrity: sha512-Vkr0x/aZMj86VR5JTfuoT6nj6nI+myUmkhM2cbLSqp7PRIo9Pk/2czMV1yyRUom4h2j7jOA7uzmHxvSQHM5c6A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-print/18.0.3: - resolution: {integrity: sha512-26g1RdXtugaRqWqDQMOxIG+T9/GreZaaFfdkqWt/QSbbmGuiMLozWYKQA+quaZy15yciXSOM975uZLpZtN0/Ww==} + /@grapecity-software/spread-sheets-print/18.0.4: + resolution: {integrity: sha512-PBTgVEsQ1vv0e8noUM2Z9BP9FX4ZCaeGXfiRI8VrmpcaVVhFsoNHyTasaCXKl7LhEk6ek5JHUyvSrcw6fxpU4A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-reportsheet-addon/18.0.3: - resolution: {integrity: sha512-cbxouUnNM6ElwFcyRjkbIT6AobCnnmo9hJtHgP4OpnkLg+pqgrN0nDgCmiaVDc3DfF/mWTpdbo+VxqHDbNFCHw==} + /@grapecity-software/spread-sheets-reportsheet-addon/18.0.4: + resolution: {integrity: sha512-m6REN62ru8t3Z6sv7rltmPdzQ95oPC0k4blBqCm2RD/oEnlp1l2NtlSLYYt2Uilb7T1eB5ARhYbQ4KmbyzkIWw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-resources-zh/18.0.3: - resolution: {integrity: sha512-WH2XwcqvlAOvcGj6emoDl5m6vBvI6n9KQzz3Dq73aI8AUyoEqWS1P4weYGxwXgSHOStfZTly9guGqaBHCSlYUA==} + /@grapecity-software/spread-sheets-resources-zh/18.0.4: + resolution: {integrity: sha512-a67tmT4I1bsk2eLKga3zfDlwMUOt6kyHXJQFnGK6frob3OLoGkhOsa2Xs4fq+rJnKpm0Z6GjBD7npIumllOOlA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-shapes/18.0.3: - resolution: {integrity: sha512-zzlqA4NyKZXFh+SwW8Ljf41ahhlK69QZzqG2a+Qp3/qv9iOsvFIRupyM/BgSuTlmq1X7JiEZDHB53fitRnX4DA==} + /@grapecity-software/spread-sheets-shapes/18.0.4: + resolution: {integrity: sha512-8qH0oXGjJnjQO4AP1daQZyTZEaqSOgPesDuUi1n5RPEYIfEOMEZR2KXBBkqWgDsrMvO+9LApL/Kay/iVK64QXQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-slicers/18.0.3: - resolution: {integrity: sha512-KD3+oRjBZfh3wZvkqez9vfhWtvhie9hXys9sPVPr5qTtTdf8nyJnQrJs+fsKxoG0wdHN2pKHUq4daPvXz2CeRw==} + /@grapecity-software/spread-sheets-slicers/18.0.4: + resolution: {integrity: sha512-isGDzN+fh4hxfarGyxkFn3mbUIELeeGxRhbH5PjA+nWXAEauxCbGXSIEPQ0r3OG+fwi5gG4ri3fCtwLtF9YKKA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-tablesheet/18.0.3: - resolution: {integrity: sha512-MqbVgNIK7fVbvK3NpB7mv2NoysVUA9UugGx3VR1EuWfceTGgtVMvAmZ1yhV53b/KjsDpq+kI5Wp7/EgVgqB31g==} + /@grapecity-software/spread-sheets-tablesheet/18.0.4: + resolution: {integrity: sha512-K+aBUbm1SupFldc5pYKCClCa58ak+Q6ZVkno9i+XO9PSV+SOZ0A03DRQiy7S9HgnsYTewNVfpyO+IxGKqQ5Zfg==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets/18.0.3: - resolution: {integrity: sha512-vfGx7S4jxw7yry7Gi+TXbeoMapR7HQxurNQ0TrtyqkqNW/Eeut+WCl4dBTmn2HM/faT4jfwVFbk0bfBBYGEwlw==} + /@grapecity-software/spread-sheets/18.0.4: + resolution: {integrity: sha512-xGli6qXVwg18sstSJlgkGwd3K4ytTS8xoRiYr43cN2RBLrGUaPvmfKduJkB9IfkBKzScoZODOVfV4QO42eonTg==} dev: false /@humanwhocodes/config-array/0.13.0: diff --git a/src/components.d.ts b/src/components.d.ts index 185943b..a720b59 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -37,6 +38,7 @@ DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default'] + ExcelEdit: typeof import('./components/excelEdit/index.vue')['default'] ExcelOreview: typeof import('./components/filePreview/excelOreview.vue')['default'] FilePreview: typeof import('./components/filePreview/filePreview.vue')['default'] FilePreviewDialog: typeof import('./components/filePreview/filePreviewDialog.vue')['default'] diff --git a/src/components/excelEdit/index.ts b/src/components/excelEdit/index.ts new file mode 100644 index 0000000..192b68e --- /dev/null +++ b/src/components/excelEdit/index.ts @@ -0,0 +1,44 @@ +/** 这里定义一些工作表基础使用方法 */ +import * as GC from '@grapecity-software/spread-sheets' +/** + * 导入 + * @param spread sprad实例 + * @param file 文件 + */ +export function importFile(spread: any, file: File) { + console.log('spread：开始执行文件导入') + console.log('spread', spread) + console.log('file', file) + return new Promise((resolve) => { + spread.import( + file, + () => { + console.log('spread：导入文件成功') + resolve('') + }, + (e: any) => { + console.log('spread：上传文件发生错误', e) + }, + { + fileType: GC.Spread.Sheets.FileType.excel, + }, + ) + }) +} + +/** + * 导入（方法来源于视频）---暂时不用 + * @param spread sprad实例 + * @param file 文件 + */ +export function excelIOimportFile(excelIO: any, file: File) { + excelIO.open( + file, + () => { + console.log('excelIO：导入文件成功') // 错误回调函数 + }, + (e: any) => { + console.log('excelIO：上传文件发生错误', e) // 错误回调函数 + }, + ) +} diff --git a/package.json b/package.json index 95301ac..0d23a70 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "version": "2.1.3", "scripts": { - "limit": "cross-env LIMIT=8192 increase-memory-limit", + "limit": "cross-env LIMIT=81920 increase-memory-limit", "dev": "vite", "build:test": "vite build --mode test", "build": "vite build", @@ -20,25 +20,25 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.10", - "@grapecity-software/spread-excelio": "^18.0.3", - "@grapecity-software/spread-sheets": "^18.0.3", - "@grapecity-software/spread-sheets-barcode": "^18.0.3", - "@grapecity-software/spread-sheets-charts": "^18.0.3", - "@grapecity-software/spread-sheets-designer": "^18.0.3", - "@grapecity-software/spread-sheets-designer-resources-cn": "^18.0.3", - "@grapecity-software/spread-sheets-designer-vue": "^18.0.3", - "@grapecity-software/spread-sheets-formula-panel": "^18.0.3", - "@grapecity-software/spread-sheets-ganttsheet": "^18.0.3", - "@grapecity-software/spread-sheets-io": "^18.0.3", - "@grapecity-software/spread-sheets-languagepackages": "^18.0.3", - "@grapecity-software/spread-sheets-pdf": "^18.0.3", - "@grapecity-software/spread-sheets-pivot-addon": "^18.0.3", - "@grapecity-software/spread-sheets-print": "^18.0.3", - "@grapecity-software/spread-sheets-reportsheet-addon": "^18.0.3", - "@grapecity-software/spread-sheets-resources-zh": "^18.0.3", - "@grapecity-software/spread-sheets-shapes": "^18.0.3", - "@grapecity-software/spread-sheets-slicers": "^18.0.3", - "@grapecity-software/spread-sheets-tablesheet": "^18.0.3", + "@grapecity-software/spread-excelio": "18.0.4", + "@grapecity-software/spread-sheets": "18.0.4", + "@grapecity-software/spread-sheets-barcode": "18.0.4", + "@grapecity-software/spread-sheets-charts": "18.0.4", + "@grapecity-software/spread-sheets-designer": "18.0.4", + "@grapecity-software/spread-sheets-designer-resources-cn": "18.0.4", + "@grapecity-software/spread-sheets-designer-vue": "18.0.4", + "@grapecity-software/spread-sheets-formula-panel": "18.0.4", + "@grapecity-software/spread-sheets-ganttsheet": "18.0.4", + "@grapecity-software/spread-sheets-io": "18.0.4", + "@grapecity-software/spread-sheets-languagepackages": "18.0.4", + "@grapecity-software/spread-sheets-pdf": "18.0.4", + "@grapecity-software/spread-sheets-pivot-addon": "18.0.4", + "@grapecity-software/spread-sheets-print": "18.0.4", + "@grapecity-software/spread-sheets-reportsheet-addon": "18.0.4", + "@grapecity-software/spread-sheets-resources-zh": "18.0.4", + "@grapecity-software/spread-sheets-shapes": "18.0.4", + "@grapecity-software/spread-sheets-slicers": "18.0.4", + "@grapecity-software/spread-sheets-tablesheet": "18.0.4", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", @@ -50,7 +50,6 @@ "element-plus": "^2.9.4", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", - "html2canvas": "^1.4.1", "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", @@ -59,15 +58,16 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", - "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", "vue-router": "^4.1.6", + "vue-pdf-embed": "^1.1.5", + "pdfjs-dist": "2.0.943", + "html2canvas": "^1.4.1", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", "xlsx": "^0.18.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 107fd04..c752c80 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,25 +3,25 @@ specifiers: '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 - '@grapecity-software/spread-excelio': ^18.0.3 - '@grapecity-software/spread-sheets': ^18.0.3 - '@grapecity-software/spread-sheets-barcode': ^18.0.3 - '@grapecity-software/spread-sheets-charts': ^18.0.3 - '@grapecity-software/spread-sheets-designer': ^18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': ^18.0.3 - '@grapecity-software/spread-sheets-designer-vue': ^18.0.3 - '@grapecity-software/spread-sheets-formula-panel': ^18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': ^18.0.3 - '@grapecity-software/spread-sheets-io': ^18.0.3 - '@grapecity-software/spread-sheets-languagepackages': ^18.0.3 - '@grapecity-software/spread-sheets-pdf': ^18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': ^18.0.3 - '@grapecity-software/spread-sheets-print': ^18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': ^18.0.3 - '@grapecity-software/spread-sheets-resources-zh': ^18.0.3 - '@grapecity-software/spread-sheets-shapes': ^18.0.3 - '@grapecity-software/spread-sheets-slicers': ^18.0.3 - '@grapecity-software/spread-sheets-tablesheet': ^18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -101,25 +101,25 @@ dependencies: '@element-plus/icons-vue': 2.3.1_vue@3.5.13 - '@grapecity-software/spread-excelio': 18.0.3 - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-barcode': 18.0.3 - '@grapecity-software/spread-sheets-charts': 18.0.3 - '@grapecity-software/spread-sheets-designer': 18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.3 - '@grapecity-software/spread-sheets-designer-vue': 18.0.3 - '@grapecity-software/spread-sheets-formula-panel': 18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': 18.0.3 - '@grapecity-software/spread-sheets-io': 18.0.3 - '@grapecity-software/spread-sheets-languagepackages': 18.0.3 - '@grapecity-software/spread-sheets-pdf': 18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.3 - '@grapecity-software/spread-sheets-resources-zh': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 - '@grapecity-software/spread-sheets-slicers': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@tinymce/tinymce-vue': 5.1.1_vue@3.5.13 '@vueuse/core': 9.13.0_vue@3.5.13 '@vueuse/integrations': 9.13.0_444g5qadeay4jgjlt43bfjlya4 @@ -862,116 +862,116 @@ resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} dev: false - /@grapecity-software/spread-excelio/18.0.3: - resolution: {integrity: sha512-BBGJFNr5vO8dGCJRqYzzEMh1AAulE8lvbHdWC4OSxEi/MxRJ0tInE6iF+VJ6U4QM3JxZiIuDYZikIS/0n9PK+g==} + /@grapecity-software/spread-excelio/18.0.4: + resolution: {integrity: sha512-a1oNrKpNywxgZ+Y3E7EipiD30mFJEyE6dH1BKAxlGKZQk1kVPgX/FF0gQ6/5hpmAcAYXE4Ktq4cQWWQg0R/8VA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-barcode/18.0.3: - resolution: {integrity: sha512-gM9C67cumFp2m5ARNX3wUmB/h3to7RE2+yIztTHbHlTOB6P9DJhFVuPUdIztKdV3QLB5XDLH7t+6bqnK2loWiw==} + /@grapecity-software/spread-sheets-barcode/18.0.4: + resolution: {integrity: sha512-MlIe5g1mSN1DWiaNDvQEALIYVW5Hev8Hyw6MLsowWvTMh3hJpQ9I0+qQwhJmUP9URv7yCqIZ/TWIg0/JGirC6g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-charts/18.0.3: - resolution: {integrity: sha512-hooSPXbacF7CyGSmE1+beQYBQT0vkGN3C71XxGumPkUKIG6iHixrzaGSSnqblniCYwO4NXkOxS9mppVdJLAupA==} + /@grapecity-software/spread-sheets-charts/18.0.4: + resolution: {integrity: sha512-RQlCR9yo6ge3FvEHPCecC6Yv+zVACD3Kl+tYORwMHpu3tyGUAgnGQfX3BydyX/DAITT/c5LLPB+yR63UnOLICQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-designer-resources-cn/18.0.3: - resolution: {integrity: sha512-da5rA68TD3iTNL+2BjRdUrAmva45JB+lGQPJ+Lh4qbF1fZlSZ5GaKi3f7gZE4HhWbiNi/bfwNB+FS6PBuJiqeg==} + /@grapecity-software/spread-sheets-designer-resources-cn/18.0.4: + resolution: {integrity: sha512-jUcNd89sSkiTDK+oqJIki28HKPvPVnhB3aRhxz4nnLwMqL8JFejblTjDJwJKKqQ5itnHstDhzNQ58BzcIXdaRA==} dev: false - /@grapecity-software/spread-sheets-designer-vue/18.0.3: - resolution: {integrity: sha512-AIFilAJADixA26h5PDIWTsi5kugbtbiMkFrHdvO56kIhmmy3nsfhnwkFGOVBWKAV6OkxNkW4EWyLjJs9dXeoWw==} + /@grapecity-software/spread-sheets-designer-vue/18.0.4: + resolution: {integrity: sha512-nVWZOgKcQlaDJ+tf+I+Evp6UB2zyORhis+nEiqE+Ixkhc4UJr0BojnNhA9CA+0eBsPCUtYCPAnz/W45ttrR7rg==} dev: false - /@grapecity-software/spread-sheets-designer/18.0.3: - resolution: {integrity: sha512-21DqwkHRJkSW4nCMalnogobZABBX7Q64GY3w0JfzdiSEOVkt0iOIMVf0BdBCPuGEleHyBWvFAA9CGf0HErE8qQ==} + /@grapecity-software/spread-sheets-designer/18.0.4: + resolution: {integrity: sha512-aexIhr4T99s41SpkVrAhfcl4eiAOpJdSauIjKNPoc3d5dRdS+uJrcQGmGKypvhO3ArejAdiGCHkDZadsvKHgoQ==} dev: false - /@grapecity-software/spread-sheets-formula-panel/18.0.3: - resolution: {integrity: sha512-LEHf+WHu99x2wmV3pQgllZFxQfuCKDUCV2i0jlZaS67lEWJ+Ocf80NSyb2jRenm3LX4fhrA5DBN84my7sI6baA==} + /@grapecity-software/spread-sheets-formula-panel/18.0.4: + resolution: {integrity: sha512-jCqlSe0RYiC8besCUVyXiZe/o1Kc5S40QcQBWrBMHM0FfbKVeF1qf5kKkozAWg0wdZLfpmd/h/emyGCafYxBwA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-ganttsheet/18.0.3: - resolution: {integrity: sha512-hIgUXXMlSFiybtFj/fVIxlaVzf+Q0t3qfshKGkykQZ8w1SMW0pvmSHCLAanZDaf4nz9FrAGELz7w1B8Z0Zic2w==} + /@grapecity-software/spread-sheets-ganttsheet/18.0.4: + resolution: {integrity: sha512-6GYO76CAQPUfqmO0XN2H5yRSRVOmckeLjmuag3nhKvc/nfAIYrVBm9hyYc/UoUt3hsIDF/7oSrJUyQ+Y3kE6Kw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 dev: false - /@grapecity-software/spread-sheets-io/18.0.3: - resolution: {integrity: sha512-waApTWTuLaGT3lyLD1uGrPvbaLj5ft5xzQv206oz1caVUEP8qu/CK93mHXvnD8hxeV/uvssvUo12OndcYGnXtw==} + /@grapecity-software/spread-sheets-io/18.0.4: + resolution: {integrity: sha512-SJyKtZQEjCsqO9Eoq8jXlH/MgW4cB+5E3z7GF68JNSSnJ9vBgYSJ1kimEGFeCWUa9/mbrZWBF0tbwbWpGLqp0g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-languagepackages/18.0.3: - resolution: {integrity: sha512-39N6mJIMuz5kAz2izxscT/vFQvWxDH2rqLZyEcp3SHirNjxXQWAG4pr8cNd39YybIrEH9igsW7w4MizF8CPWKw==} + /@grapecity-software/spread-sheets-languagepackages/18.0.4: + resolution: {integrity: sha512-xMEskSA39LFaMQRuz6Tr2k0muEh1Q1e0O4vFeW0uU5TKSJrDss06sH8NTpoiPSF1AIl1Jh8ElzV+Qh7HM9rk1w==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pdf/18.0.3: - resolution: {integrity: sha512-EB5Pfs/pxR1kYU3pjZiRV+6RnguiSQ0G9ob4yj4ZC0FC+MuHXmdCH3z9cw7mLddZ3H32FFYHDBFgJwFZiQNceA==} + /@grapecity-software/spread-sheets-pdf/18.0.4: + resolution: {integrity: sha512-SpgsrStTvF8jKo1GXjPEIRl12etW1ke0ERptdJjDubmMKXZnZVpEUGGJ/BT9oWGPULHje9h6bA+lEZTBnJHYSw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pivot-addon/18.0.3: - resolution: {integrity: sha512-x4VVHa3GDtSigK2PsXQZ3CdLyW6Y0yqLqXObQIEf2TNhRjIn3t21i648CUWCNs3G6ImnCLLWdd3XabbvM0+Zog==} + /@grapecity-software/spread-sheets-pivot-addon/18.0.4: + resolution: {integrity: sha512-Vkr0x/aZMj86VR5JTfuoT6nj6nI+myUmkhM2cbLSqp7PRIo9Pk/2czMV1yyRUom4h2j7jOA7uzmHxvSQHM5c6A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-print/18.0.3: - resolution: {integrity: sha512-26g1RdXtugaRqWqDQMOxIG+T9/GreZaaFfdkqWt/QSbbmGuiMLozWYKQA+quaZy15yciXSOM975uZLpZtN0/Ww==} + /@grapecity-software/spread-sheets-print/18.0.4: + resolution: {integrity: sha512-PBTgVEsQ1vv0e8noUM2Z9BP9FX4ZCaeGXfiRI8VrmpcaVVhFsoNHyTasaCXKl7LhEk6ek5JHUyvSrcw6fxpU4A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-reportsheet-addon/18.0.3: - resolution: {integrity: sha512-cbxouUnNM6ElwFcyRjkbIT6AobCnnmo9hJtHgP4OpnkLg+pqgrN0nDgCmiaVDc3DfF/mWTpdbo+VxqHDbNFCHw==} + /@grapecity-software/spread-sheets-reportsheet-addon/18.0.4: + resolution: {integrity: sha512-m6REN62ru8t3Z6sv7rltmPdzQ95oPC0k4blBqCm2RD/oEnlp1l2NtlSLYYt2Uilb7T1eB5ARhYbQ4KmbyzkIWw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-resources-zh/18.0.3: - resolution: {integrity: sha512-WH2XwcqvlAOvcGj6emoDl5m6vBvI6n9KQzz3Dq73aI8AUyoEqWS1P4weYGxwXgSHOStfZTly9guGqaBHCSlYUA==} + /@grapecity-software/spread-sheets-resources-zh/18.0.4: + resolution: {integrity: sha512-a67tmT4I1bsk2eLKga3zfDlwMUOt6kyHXJQFnGK6frob3OLoGkhOsa2Xs4fq+rJnKpm0Z6GjBD7npIumllOOlA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-shapes/18.0.3: - resolution: {integrity: sha512-zzlqA4NyKZXFh+SwW8Ljf41ahhlK69QZzqG2a+Qp3/qv9iOsvFIRupyM/BgSuTlmq1X7JiEZDHB53fitRnX4DA==} + /@grapecity-software/spread-sheets-shapes/18.0.4: + resolution: {integrity: sha512-8qH0oXGjJnjQO4AP1daQZyTZEaqSOgPesDuUi1n5RPEYIfEOMEZR2KXBBkqWgDsrMvO+9LApL/Kay/iVK64QXQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-slicers/18.0.3: - resolution: {integrity: sha512-KD3+oRjBZfh3wZvkqez9vfhWtvhie9hXys9sPVPr5qTtTdf8nyJnQrJs+fsKxoG0wdHN2pKHUq4daPvXz2CeRw==} + /@grapecity-software/spread-sheets-slicers/18.0.4: + resolution: {integrity: sha512-isGDzN+fh4hxfarGyxkFn3mbUIELeeGxRhbH5PjA+nWXAEauxCbGXSIEPQ0r3OG+fwi5gG4ri3fCtwLtF9YKKA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-tablesheet/18.0.3: - resolution: {integrity: sha512-MqbVgNIK7fVbvK3NpB7mv2NoysVUA9UugGx3VR1EuWfceTGgtVMvAmZ1yhV53b/KjsDpq+kI5Wp7/EgVgqB31g==} + /@grapecity-software/spread-sheets-tablesheet/18.0.4: + resolution: {integrity: sha512-K+aBUbm1SupFldc5pYKCClCa58ak+Q6ZVkno9i+XO9PSV+SOZ0A03DRQiy7S9HgnsYTewNVfpyO+IxGKqQ5Zfg==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets/18.0.3: - resolution: {integrity: sha512-vfGx7S4jxw7yry7Gi+TXbeoMapR7HQxurNQ0TrtyqkqNW/Eeut+WCl4dBTmn2HM/faT4jfwVFbk0bfBBYGEwlw==} + /@grapecity-software/spread-sheets/18.0.4: + resolution: {integrity: sha512-xGli6qXVwg18sstSJlgkGwd3K4ytTS8xoRiYr43cN2RBLrGUaPvmfKduJkB9IfkBKzScoZODOVfV4QO42eonTg==} dev: false /@humanwhocodes/config-array/0.13.0: diff --git a/src/components.d.ts b/src/components.d.ts index 185943b..a720b59 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -37,6 +38,7 @@ DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default'] + ExcelEdit: typeof import('./components/excelEdit/index.vue')['default'] ExcelOreview: typeof import('./components/filePreview/excelOreview.vue')['default'] FilePreview: typeof import('./components/filePreview/filePreview.vue')['default'] FilePreviewDialog: typeof import('./components/filePreview/filePreviewDialog.vue')['default'] diff --git a/src/components/excelEdit/index.ts b/src/components/excelEdit/index.ts new file mode 100644 index 0000000..192b68e --- /dev/null +++ b/src/components/excelEdit/index.ts @@ -0,0 +1,44 @@ +/** 这里定义一些工作表基础使用方法 */ +import * as GC from '@grapecity-software/spread-sheets' +/** + * 导入 + * @param spread sprad实例 + * @param file 文件 + */ +export function importFile(spread: any, file: File) { + console.log('spread：开始执行文件导入') + console.log('spread', spread) + console.log('file', file) + return new Promise((resolve) => { + spread.import( + file, + () => { + console.log('spread：导入文件成功') + resolve('') + }, + (e: any) => { + console.log('spread：上传文件发生错误', e) + }, + { + fileType: GC.Spread.Sheets.FileType.excel, + }, + ) + }) +} + +/** + * 导入（方法来源于视频）---暂时不用 + * @param spread sprad实例 + * @param file 文件 + */ +export function excelIOimportFile(excelIO: any, file: File) { + excelIO.open( + file, + () => { + console.log('excelIO：导入文件成功') // 错误回调函数 + }, + (e: any) => { + console.log('excelIO：上传文件发生错误', e) // 错误回调函数 + }, + ) +} diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue new file mode 100644 index 0000000..bdb9ca3 --- /dev/null +++ b/src/components/excelEdit/index.vue @@ -0,0 +1,160 @@ + + + + + + diff --git a/package.json b/package.json index 95301ac..0d23a70 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "version": "2.1.3", "scripts": { - "limit": "cross-env LIMIT=8192 increase-memory-limit", + "limit": "cross-env LIMIT=81920 increase-memory-limit", "dev": "vite", "build:test": "vite build --mode test", "build": "vite build", @@ -20,25 +20,25 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.10", - "@grapecity-software/spread-excelio": "^18.0.3", - "@grapecity-software/spread-sheets": "^18.0.3", - "@grapecity-software/spread-sheets-barcode": "^18.0.3", - "@grapecity-software/spread-sheets-charts": "^18.0.3", - "@grapecity-software/spread-sheets-designer": "^18.0.3", - "@grapecity-software/spread-sheets-designer-resources-cn": "^18.0.3", - "@grapecity-software/spread-sheets-designer-vue": "^18.0.3", - "@grapecity-software/spread-sheets-formula-panel": "^18.0.3", - "@grapecity-software/spread-sheets-ganttsheet": "^18.0.3", - "@grapecity-software/spread-sheets-io": "^18.0.3", - "@grapecity-software/spread-sheets-languagepackages": "^18.0.3", - "@grapecity-software/spread-sheets-pdf": "^18.0.3", - "@grapecity-software/spread-sheets-pivot-addon": "^18.0.3", - "@grapecity-software/spread-sheets-print": "^18.0.3", - "@grapecity-software/spread-sheets-reportsheet-addon": "^18.0.3", - "@grapecity-software/spread-sheets-resources-zh": "^18.0.3", - "@grapecity-software/spread-sheets-shapes": "^18.0.3", - "@grapecity-software/spread-sheets-slicers": "^18.0.3", - "@grapecity-software/spread-sheets-tablesheet": "^18.0.3", + "@grapecity-software/spread-excelio": "18.0.4", + "@grapecity-software/spread-sheets": "18.0.4", + "@grapecity-software/spread-sheets-barcode": "18.0.4", + "@grapecity-software/spread-sheets-charts": "18.0.4", + "@grapecity-software/spread-sheets-designer": "18.0.4", + "@grapecity-software/spread-sheets-designer-resources-cn": "18.0.4", + "@grapecity-software/spread-sheets-designer-vue": "18.0.4", + "@grapecity-software/spread-sheets-formula-panel": "18.0.4", + "@grapecity-software/spread-sheets-ganttsheet": "18.0.4", + "@grapecity-software/spread-sheets-io": "18.0.4", + "@grapecity-software/spread-sheets-languagepackages": "18.0.4", + "@grapecity-software/spread-sheets-pdf": "18.0.4", + "@grapecity-software/spread-sheets-pivot-addon": "18.0.4", + "@grapecity-software/spread-sheets-print": "18.0.4", + "@grapecity-software/spread-sheets-reportsheet-addon": "18.0.4", + "@grapecity-software/spread-sheets-resources-zh": "18.0.4", + "@grapecity-software/spread-sheets-shapes": "18.0.4", + "@grapecity-software/spread-sheets-slicers": "18.0.4", + "@grapecity-software/spread-sheets-tablesheet": "18.0.4", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", @@ -50,7 +50,6 @@ "element-plus": "^2.9.4", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", - "html2canvas": "^1.4.1", "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", @@ -59,15 +58,16 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", - "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", "vue-router": "^4.1.6", + "vue-pdf-embed": "^1.1.5", + "pdfjs-dist": "2.0.943", + "html2canvas": "^1.4.1", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", "xlsx": "^0.18.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 107fd04..c752c80 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,25 +3,25 @@ specifiers: '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 - '@grapecity-software/spread-excelio': ^18.0.3 - '@grapecity-software/spread-sheets': ^18.0.3 - '@grapecity-software/spread-sheets-barcode': ^18.0.3 - '@grapecity-software/spread-sheets-charts': ^18.0.3 - '@grapecity-software/spread-sheets-designer': ^18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': ^18.0.3 - '@grapecity-software/spread-sheets-designer-vue': ^18.0.3 - '@grapecity-software/spread-sheets-formula-panel': ^18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': ^18.0.3 - '@grapecity-software/spread-sheets-io': ^18.0.3 - '@grapecity-software/spread-sheets-languagepackages': ^18.0.3 - '@grapecity-software/spread-sheets-pdf': ^18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': ^18.0.3 - '@grapecity-software/spread-sheets-print': ^18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': ^18.0.3 - '@grapecity-software/spread-sheets-resources-zh': ^18.0.3 - '@grapecity-software/spread-sheets-shapes': ^18.0.3 - '@grapecity-software/spread-sheets-slicers': ^18.0.3 - '@grapecity-software/spread-sheets-tablesheet': ^18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -101,25 +101,25 @@ dependencies: '@element-plus/icons-vue': 2.3.1_vue@3.5.13 - '@grapecity-software/spread-excelio': 18.0.3 - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-barcode': 18.0.3 - '@grapecity-software/spread-sheets-charts': 18.0.3 - '@grapecity-software/spread-sheets-designer': 18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.3 - '@grapecity-software/spread-sheets-designer-vue': 18.0.3 - '@grapecity-software/spread-sheets-formula-panel': 18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': 18.0.3 - '@grapecity-software/spread-sheets-io': 18.0.3 - '@grapecity-software/spread-sheets-languagepackages': 18.0.3 - '@grapecity-software/spread-sheets-pdf': 18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.3 - '@grapecity-software/spread-sheets-resources-zh': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 - '@grapecity-software/spread-sheets-slicers': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@tinymce/tinymce-vue': 5.1.1_vue@3.5.13 '@vueuse/core': 9.13.0_vue@3.5.13 '@vueuse/integrations': 9.13.0_444g5qadeay4jgjlt43bfjlya4 @@ -862,116 +862,116 @@ resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} dev: false - /@grapecity-software/spread-excelio/18.0.3: - resolution: {integrity: sha512-BBGJFNr5vO8dGCJRqYzzEMh1AAulE8lvbHdWC4OSxEi/MxRJ0tInE6iF+VJ6U4QM3JxZiIuDYZikIS/0n9PK+g==} + /@grapecity-software/spread-excelio/18.0.4: + resolution: {integrity: sha512-a1oNrKpNywxgZ+Y3E7EipiD30mFJEyE6dH1BKAxlGKZQk1kVPgX/FF0gQ6/5hpmAcAYXE4Ktq4cQWWQg0R/8VA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-barcode/18.0.3: - resolution: {integrity: sha512-gM9C67cumFp2m5ARNX3wUmB/h3to7RE2+yIztTHbHlTOB6P9DJhFVuPUdIztKdV3QLB5XDLH7t+6bqnK2loWiw==} + /@grapecity-software/spread-sheets-barcode/18.0.4: + resolution: {integrity: sha512-MlIe5g1mSN1DWiaNDvQEALIYVW5Hev8Hyw6MLsowWvTMh3hJpQ9I0+qQwhJmUP9URv7yCqIZ/TWIg0/JGirC6g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-charts/18.0.3: - resolution: {integrity: sha512-hooSPXbacF7CyGSmE1+beQYBQT0vkGN3C71XxGumPkUKIG6iHixrzaGSSnqblniCYwO4NXkOxS9mppVdJLAupA==} + /@grapecity-software/spread-sheets-charts/18.0.4: + resolution: {integrity: sha512-RQlCR9yo6ge3FvEHPCecC6Yv+zVACD3Kl+tYORwMHpu3tyGUAgnGQfX3BydyX/DAITT/c5LLPB+yR63UnOLICQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-designer-resources-cn/18.0.3: - resolution: {integrity: sha512-da5rA68TD3iTNL+2BjRdUrAmva45JB+lGQPJ+Lh4qbF1fZlSZ5GaKi3f7gZE4HhWbiNi/bfwNB+FS6PBuJiqeg==} + /@grapecity-software/spread-sheets-designer-resources-cn/18.0.4: + resolution: {integrity: sha512-jUcNd89sSkiTDK+oqJIki28HKPvPVnhB3aRhxz4nnLwMqL8JFejblTjDJwJKKqQ5itnHstDhzNQ58BzcIXdaRA==} dev: false - /@grapecity-software/spread-sheets-designer-vue/18.0.3: - resolution: {integrity: sha512-AIFilAJADixA26h5PDIWTsi5kugbtbiMkFrHdvO56kIhmmy3nsfhnwkFGOVBWKAV6OkxNkW4EWyLjJs9dXeoWw==} + /@grapecity-software/spread-sheets-designer-vue/18.0.4: + resolution: {integrity: sha512-nVWZOgKcQlaDJ+tf+I+Evp6UB2zyORhis+nEiqE+Ixkhc4UJr0BojnNhA9CA+0eBsPCUtYCPAnz/W45ttrR7rg==} dev: false - /@grapecity-software/spread-sheets-designer/18.0.3: - resolution: {integrity: sha512-21DqwkHRJkSW4nCMalnogobZABBX7Q64GY3w0JfzdiSEOVkt0iOIMVf0BdBCPuGEleHyBWvFAA9CGf0HErE8qQ==} + /@grapecity-software/spread-sheets-designer/18.0.4: + resolution: {integrity: sha512-aexIhr4T99s41SpkVrAhfcl4eiAOpJdSauIjKNPoc3d5dRdS+uJrcQGmGKypvhO3ArejAdiGCHkDZadsvKHgoQ==} dev: false - /@grapecity-software/spread-sheets-formula-panel/18.0.3: - resolution: {integrity: sha512-LEHf+WHu99x2wmV3pQgllZFxQfuCKDUCV2i0jlZaS67lEWJ+Ocf80NSyb2jRenm3LX4fhrA5DBN84my7sI6baA==} + /@grapecity-software/spread-sheets-formula-panel/18.0.4: + resolution: {integrity: sha512-jCqlSe0RYiC8besCUVyXiZe/o1Kc5S40QcQBWrBMHM0FfbKVeF1qf5kKkozAWg0wdZLfpmd/h/emyGCafYxBwA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-ganttsheet/18.0.3: - resolution: {integrity: sha512-hIgUXXMlSFiybtFj/fVIxlaVzf+Q0t3qfshKGkykQZ8w1SMW0pvmSHCLAanZDaf4nz9FrAGELz7w1B8Z0Zic2w==} + /@grapecity-software/spread-sheets-ganttsheet/18.0.4: + resolution: {integrity: sha512-6GYO76CAQPUfqmO0XN2H5yRSRVOmckeLjmuag3nhKvc/nfAIYrVBm9hyYc/UoUt3hsIDF/7oSrJUyQ+Y3kE6Kw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 dev: false - /@grapecity-software/spread-sheets-io/18.0.3: - resolution: {integrity: sha512-waApTWTuLaGT3lyLD1uGrPvbaLj5ft5xzQv206oz1caVUEP8qu/CK93mHXvnD8hxeV/uvssvUo12OndcYGnXtw==} + /@grapecity-software/spread-sheets-io/18.0.4: + resolution: {integrity: sha512-SJyKtZQEjCsqO9Eoq8jXlH/MgW4cB+5E3z7GF68JNSSnJ9vBgYSJ1kimEGFeCWUa9/mbrZWBF0tbwbWpGLqp0g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-languagepackages/18.0.3: - resolution: {integrity: sha512-39N6mJIMuz5kAz2izxscT/vFQvWxDH2rqLZyEcp3SHirNjxXQWAG4pr8cNd39YybIrEH9igsW7w4MizF8CPWKw==} + /@grapecity-software/spread-sheets-languagepackages/18.0.4: + resolution: {integrity: sha512-xMEskSA39LFaMQRuz6Tr2k0muEh1Q1e0O4vFeW0uU5TKSJrDss06sH8NTpoiPSF1AIl1Jh8ElzV+Qh7HM9rk1w==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pdf/18.0.3: - resolution: {integrity: sha512-EB5Pfs/pxR1kYU3pjZiRV+6RnguiSQ0G9ob4yj4ZC0FC+MuHXmdCH3z9cw7mLddZ3H32FFYHDBFgJwFZiQNceA==} + /@grapecity-software/spread-sheets-pdf/18.0.4: + resolution: {integrity: sha512-SpgsrStTvF8jKo1GXjPEIRl12etW1ke0ERptdJjDubmMKXZnZVpEUGGJ/BT9oWGPULHje9h6bA+lEZTBnJHYSw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pivot-addon/18.0.3: - resolution: {integrity: sha512-x4VVHa3GDtSigK2PsXQZ3CdLyW6Y0yqLqXObQIEf2TNhRjIn3t21i648CUWCNs3G6ImnCLLWdd3XabbvM0+Zog==} + /@grapecity-software/spread-sheets-pivot-addon/18.0.4: + resolution: {integrity: sha512-Vkr0x/aZMj86VR5JTfuoT6nj6nI+myUmkhM2cbLSqp7PRIo9Pk/2czMV1yyRUom4h2j7jOA7uzmHxvSQHM5c6A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-print/18.0.3: - resolution: {integrity: sha512-26g1RdXtugaRqWqDQMOxIG+T9/GreZaaFfdkqWt/QSbbmGuiMLozWYKQA+quaZy15yciXSOM975uZLpZtN0/Ww==} + /@grapecity-software/spread-sheets-print/18.0.4: + resolution: {integrity: sha512-PBTgVEsQ1vv0e8noUM2Z9BP9FX4ZCaeGXfiRI8VrmpcaVVhFsoNHyTasaCXKl7LhEk6ek5JHUyvSrcw6fxpU4A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-reportsheet-addon/18.0.3: - resolution: {integrity: sha512-cbxouUnNM6ElwFcyRjkbIT6AobCnnmo9hJtHgP4OpnkLg+pqgrN0nDgCmiaVDc3DfF/mWTpdbo+VxqHDbNFCHw==} + /@grapecity-software/spread-sheets-reportsheet-addon/18.0.4: + resolution: {integrity: sha512-m6REN62ru8t3Z6sv7rltmPdzQ95oPC0k4blBqCm2RD/oEnlp1l2NtlSLYYt2Uilb7T1eB5ARhYbQ4KmbyzkIWw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-resources-zh/18.0.3: - resolution: {integrity: sha512-WH2XwcqvlAOvcGj6emoDl5m6vBvI6n9KQzz3Dq73aI8AUyoEqWS1P4weYGxwXgSHOStfZTly9guGqaBHCSlYUA==} + /@grapecity-software/spread-sheets-resources-zh/18.0.4: + resolution: {integrity: sha512-a67tmT4I1bsk2eLKga3zfDlwMUOt6kyHXJQFnGK6frob3OLoGkhOsa2Xs4fq+rJnKpm0Z6GjBD7npIumllOOlA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-shapes/18.0.3: - resolution: {integrity: sha512-zzlqA4NyKZXFh+SwW8Ljf41ahhlK69QZzqG2a+Qp3/qv9iOsvFIRupyM/BgSuTlmq1X7JiEZDHB53fitRnX4DA==} + /@grapecity-software/spread-sheets-shapes/18.0.4: + resolution: {integrity: sha512-8qH0oXGjJnjQO4AP1daQZyTZEaqSOgPesDuUi1n5RPEYIfEOMEZR2KXBBkqWgDsrMvO+9LApL/Kay/iVK64QXQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-slicers/18.0.3: - resolution: {integrity: sha512-KD3+oRjBZfh3wZvkqez9vfhWtvhie9hXys9sPVPr5qTtTdf8nyJnQrJs+fsKxoG0wdHN2pKHUq4daPvXz2CeRw==} + /@grapecity-software/spread-sheets-slicers/18.0.4: + resolution: {integrity: sha512-isGDzN+fh4hxfarGyxkFn3mbUIELeeGxRhbH5PjA+nWXAEauxCbGXSIEPQ0r3OG+fwi5gG4ri3fCtwLtF9YKKA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-tablesheet/18.0.3: - resolution: {integrity: sha512-MqbVgNIK7fVbvK3NpB7mv2NoysVUA9UugGx3VR1EuWfceTGgtVMvAmZ1yhV53b/KjsDpq+kI5Wp7/EgVgqB31g==} + /@grapecity-software/spread-sheets-tablesheet/18.0.4: + resolution: {integrity: sha512-K+aBUbm1SupFldc5pYKCClCa58ak+Q6ZVkno9i+XO9PSV+SOZ0A03DRQiy7S9HgnsYTewNVfpyO+IxGKqQ5Zfg==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets/18.0.3: - resolution: {integrity: sha512-vfGx7S4jxw7yry7Gi+TXbeoMapR7HQxurNQ0TrtyqkqNW/Eeut+WCl4dBTmn2HM/faT4jfwVFbk0bfBBYGEwlw==} + /@grapecity-software/spread-sheets/18.0.4: + resolution: {integrity: sha512-xGli6qXVwg18sstSJlgkGwd3K4ytTS8xoRiYr43cN2RBLrGUaPvmfKduJkB9IfkBKzScoZODOVfV4QO42eonTg==} dev: false /@humanwhocodes/config-array/0.13.0: diff --git a/src/components.d.ts b/src/components.d.ts index 185943b..a720b59 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -37,6 +38,7 @@ DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default'] + ExcelEdit: typeof import('./components/excelEdit/index.vue')['default'] ExcelOreview: typeof import('./components/filePreview/excelOreview.vue')['default'] FilePreview: typeof import('./components/filePreview/filePreview.vue')['default'] FilePreviewDialog: typeof import('./components/filePreview/filePreviewDialog.vue')['default'] diff --git a/src/components/excelEdit/index.ts b/src/components/excelEdit/index.ts new file mode 100644 index 0000000..192b68e --- /dev/null +++ b/src/components/excelEdit/index.ts @@ -0,0 +1,44 @@ +/** 这里定义一些工作表基础使用方法 */ +import * as GC from '@grapecity-software/spread-sheets' +/** + * 导入 + * @param spread sprad实例 + * @param file 文件 + */ +export function importFile(spread: any, file: File) { + console.log('spread：开始执行文件导入') + console.log('spread', spread) + console.log('file', file) + return new Promise((resolve) => { + spread.import( + file, + () => { + console.log('spread：导入文件成功') + resolve('') + }, + (e: any) => { + console.log('spread：上传文件发生错误', e) + }, + { + fileType: GC.Spread.Sheets.FileType.excel, + }, + ) + }) +} + +/** + * 导入（方法来源于视频）---暂时不用 + * @param spread sprad实例 + * @param file 文件 + */ +export function excelIOimportFile(excelIO: any, file: File) { + excelIO.open( + file, + () => { + console.log('excelIO：导入文件成功') // 错误回调函数 + }, + (e: any) => { + console.log('excelIO：上传文件发生错误', e) // 错误回调函数 + }, + ) +} diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue new file mode 100644 index 0000000..bdb9ca3 --- /dev/null +++ b/src/components/excelEdit/index.vue @@ -0,0 +1,160 @@ + + + + + + diff --git a/src/main.ts b/src/main.ts index c8e6363..95d9410 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,6 +4,7 @@ import print from 'vue3-print-nb' import axios from 'axios' import * as ElementPlusIconsVue from '@element-plus/icons-vue' +import * as GC from '@grapecity-software/spread-sheets' import dayjs from 'dayjs' import App from './App.vue' import pinia from './store' @@ -24,6 +25,7 @@ if (useSettingsStore().app.iconifyOfflineUse) { downloadAndInstall() } +window.GC = GC const app = createApp(App) app.config.globalProperties.hasPerm = hasPermission app.config.globalProperties.buttonPerm = buttonPerm diff --git a/package.json b/package.json index 95301ac..0d23a70 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "version": "2.1.3", "scripts": { - "limit": "cross-env LIMIT=8192 increase-memory-limit", + "limit": "cross-env LIMIT=81920 increase-memory-limit", "dev": "vite", "build:test": "vite build --mode test", "build": "vite build", @@ -20,25 +20,25 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.10", - "@grapecity-software/spread-excelio": "^18.0.3", - "@grapecity-software/spread-sheets": "^18.0.3", - "@grapecity-software/spread-sheets-barcode": "^18.0.3", - "@grapecity-software/spread-sheets-charts": "^18.0.3", - "@grapecity-software/spread-sheets-designer": "^18.0.3", - "@grapecity-software/spread-sheets-designer-resources-cn": "^18.0.3", - "@grapecity-software/spread-sheets-designer-vue": "^18.0.3", - "@grapecity-software/spread-sheets-formula-panel": "^18.0.3", - "@grapecity-software/spread-sheets-ganttsheet": "^18.0.3", - "@grapecity-software/spread-sheets-io": "^18.0.3", - "@grapecity-software/spread-sheets-languagepackages": "^18.0.3", - "@grapecity-software/spread-sheets-pdf": "^18.0.3", - "@grapecity-software/spread-sheets-pivot-addon": "^18.0.3", - "@grapecity-software/spread-sheets-print": "^18.0.3", - "@grapecity-software/spread-sheets-reportsheet-addon": "^18.0.3", - "@grapecity-software/spread-sheets-resources-zh": "^18.0.3", - "@grapecity-software/spread-sheets-shapes": "^18.0.3", - "@grapecity-software/spread-sheets-slicers": "^18.0.3", - "@grapecity-software/spread-sheets-tablesheet": "^18.0.3", + "@grapecity-software/spread-excelio": "18.0.4", + "@grapecity-software/spread-sheets": "18.0.4", + "@grapecity-software/spread-sheets-barcode": "18.0.4", + "@grapecity-software/spread-sheets-charts": "18.0.4", + "@grapecity-software/spread-sheets-designer": "18.0.4", + "@grapecity-software/spread-sheets-designer-resources-cn": "18.0.4", + "@grapecity-software/spread-sheets-designer-vue": "18.0.4", + "@grapecity-software/spread-sheets-formula-panel": "18.0.4", + "@grapecity-software/spread-sheets-ganttsheet": "18.0.4", + "@grapecity-software/spread-sheets-io": "18.0.4", + "@grapecity-software/spread-sheets-languagepackages": "18.0.4", + "@grapecity-software/spread-sheets-pdf": "18.0.4", + "@grapecity-software/spread-sheets-pivot-addon": "18.0.4", + "@grapecity-software/spread-sheets-print": "18.0.4", + "@grapecity-software/spread-sheets-reportsheet-addon": "18.0.4", + "@grapecity-software/spread-sheets-resources-zh": "18.0.4", + "@grapecity-software/spread-sheets-shapes": "18.0.4", + "@grapecity-software/spread-sheets-slicers": "18.0.4", + "@grapecity-software/spread-sheets-tablesheet": "18.0.4", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", @@ -50,7 +50,6 @@ "element-plus": "^2.9.4", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", - "html2canvas": "^1.4.1", "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", @@ -59,15 +58,16 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", - "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", "vue-router": "^4.1.6", + "vue-pdf-embed": "^1.1.5", + "pdfjs-dist": "2.0.943", + "html2canvas": "^1.4.1", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", "xlsx": "^0.18.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 107fd04..c752c80 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,25 +3,25 @@ specifiers: '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 - '@grapecity-software/spread-excelio': ^18.0.3 - '@grapecity-software/spread-sheets': ^18.0.3 - '@grapecity-software/spread-sheets-barcode': ^18.0.3 - '@grapecity-software/spread-sheets-charts': ^18.0.3 - '@grapecity-software/spread-sheets-designer': ^18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': ^18.0.3 - '@grapecity-software/spread-sheets-designer-vue': ^18.0.3 - '@grapecity-software/spread-sheets-formula-panel': ^18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': ^18.0.3 - '@grapecity-software/spread-sheets-io': ^18.0.3 - '@grapecity-software/spread-sheets-languagepackages': ^18.0.3 - '@grapecity-software/spread-sheets-pdf': ^18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': ^18.0.3 - '@grapecity-software/spread-sheets-print': ^18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': ^18.0.3 - '@grapecity-software/spread-sheets-resources-zh': ^18.0.3 - '@grapecity-software/spread-sheets-shapes': ^18.0.3 - '@grapecity-software/spread-sheets-slicers': ^18.0.3 - '@grapecity-software/spread-sheets-tablesheet': ^18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -101,25 +101,25 @@ dependencies: '@element-plus/icons-vue': 2.3.1_vue@3.5.13 - '@grapecity-software/spread-excelio': 18.0.3 - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-barcode': 18.0.3 - '@grapecity-software/spread-sheets-charts': 18.0.3 - '@grapecity-software/spread-sheets-designer': 18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.3 - '@grapecity-software/spread-sheets-designer-vue': 18.0.3 - '@grapecity-software/spread-sheets-formula-panel': 18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': 18.0.3 - '@grapecity-software/spread-sheets-io': 18.0.3 - '@grapecity-software/spread-sheets-languagepackages': 18.0.3 - '@grapecity-software/spread-sheets-pdf': 18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.3 - '@grapecity-software/spread-sheets-resources-zh': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 - '@grapecity-software/spread-sheets-slicers': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@tinymce/tinymce-vue': 5.1.1_vue@3.5.13 '@vueuse/core': 9.13.0_vue@3.5.13 '@vueuse/integrations': 9.13.0_444g5qadeay4jgjlt43bfjlya4 @@ -862,116 +862,116 @@ resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} dev: false - /@grapecity-software/spread-excelio/18.0.3: - resolution: {integrity: sha512-BBGJFNr5vO8dGCJRqYzzEMh1AAulE8lvbHdWC4OSxEi/MxRJ0tInE6iF+VJ6U4QM3JxZiIuDYZikIS/0n9PK+g==} + /@grapecity-software/spread-excelio/18.0.4: + resolution: {integrity: sha512-a1oNrKpNywxgZ+Y3E7EipiD30mFJEyE6dH1BKAxlGKZQk1kVPgX/FF0gQ6/5hpmAcAYXE4Ktq4cQWWQg0R/8VA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-barcode/18.0.3: - resolution: {integrity: sha512-gM9C67cumFp2m5ARNX3wUmB/h3to7RE2+yIztTHbHlTOB6P9DJhFVuPUdIztKdV3QLB5XDLH7t+6bqnK2loWiw==} + /@grapecity-software/spread-sheets-barcode/18.0.4: + resolution: {integrity: sha512-MlIe5g1mSN1DWiaNDvQEALIYVW5Hev8Hyw6MLsowWvTMh3hJpQ9I0+qQwhJmUP9URv7yCqIZ/TWIg0/JGirC6g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-charts/18.0.3: - resolution: {integrity: sha512-hooSPXbacF7CyGSmE1+beQYBQT0vkGN3C71XxGumPkUKIG6iHixrzaGSSnqblniCYwO4NXkOxS9mppVdJLAupA==} + /@grapecity-software/spread-sheets-charts/18.0.4: + resolution: {integrity: sha512-RQlCR9yo6ge3FvEHPCecC6Yv+zVACD3Kl+tYORwMHpu3tyGUAgnGQfX3BydyX/DAITT/c5LLPB+yR63UnOLICQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-designer-resources-cn/18.0.3: - resolution: {integrity: sha512-da5rA68TD3iTNL+2BjRdUrAmva45JB+lGQPJ+Lh4qbF1fZlSZ5GaKi3f7gZE4HhWbiNi/bfwNB+FS6PBuJiqeg==} + /@grapecity-software/spread-sheets-designer-resources-cn/18.0.4: + resolution: {integrity: sha512-jUcNd89sSkiTDK+oqJIki28HKPvPVnhB3aRhxz4nnLwMqL8JFejblTjDJwJKKqQ5itnHstDhzNQ58BzcIXdaRA==} dev: false - /@grapecity-software/spread-sheets-designer-vue/18.0.3: - resolution: {integrity: sha512-AIFilAJADixA26h5PDIWTsi5kugbtbiMkFrHdvO56kIhmmy3nsfhnwkFGOVBWKAV6OkxNkW4EWyLjJs9dXeoWw==} + /@grapecity-software/spread-sheets-designer-vue/18.0.4: + resolution: {integrity: sha512-nVWZOgKcQlaDJ+tf+I+Evp6UB2zyORhis+nEiqE+Ixkhc4UJr0BojnNhA9CA+0eBsPCUtYCPAnz/W45ttrR7rg==} dev: false - /@grapecity-software/spread-sheets-designer/18.0.3: - resolution: {integrity: sha512-21DqwkHRJkSW4nCMalnogobZABBX7Q64GY3w0JfzdiSEOVkt0iOIMVf0BdBCPuGEleHyBWvFAA9CGf0HErE8qQ==} + /@grapecity-software/spread-sheets-designer/18.0.4: + resolution: {integrity: sha512-aexIhr4T99s41SpkVrAhfcl4eiAOpJdSauIjKNPoc3d5dRdS+uJrcQGmGKypvhO3ArejAdiGCHkDZadsvKHgoQ==} dev: false - /@grapecity-software/spread-sheets-formula-panel/18.0.3: - resolution: {integrity: sha512-LEHf+WHu99x2wmV3pQgllZFxQfuCKDUCV2i0jlZaS67lEWJ+Ocf80NSyb2jRenm3LX4fhrA5DBN84my7sI6baA==} + /@grapecity-software/spread-sheets-formula-panel/18.0.4: + resolution: {integrity: sha512-jCqlSe0RYiC8besCUVyXiZe/o1Kc5S40QcQBWrBMHM0FfbKVeF1qf5kKkozAWg0wdZLfpmd/h/emyGCafYxBwA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-ganttsheet/18.0.3: - resolution: {integrity: sha512-hIgUXXMlSFiybtFj/fVIxlaVzf+Q0t3qfshKGkykQZ8w1SMW0pvmSHCLAanZDaf4nz9FrAGELz7w1B8Z0Zic2w==} + /@grapecity-software/spread-sheets-ganttsheet/18.0.4: + resolution: {integrity: sha512-6GYO76CAQPUfqmO0XN2H5yRSRVOmckeLjmuag3nhKvc/nfAIYrVBm9hyYc/UoUt3hsIDF/7oSrJUyQ+Y3kE6Kw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 dev: false - /@grapecity-software/spread-sheets-io/18.0.3: - resolution: {integrity: sha512-waApTWTuLaGT3lyLD1uGrPvbaLj5ft5xzQv206oz1caVUEP8qu/CK93mHXvnD8hxeV/uvssvUo12OndcYGnXtw==} + /@grapecity-software/spread-sheets-io/18.0.4: + resolution: {integrity: sha512-SJyKtZQEjCsqO9Eoq8jXlH/MgW4cB+5E3z7GF68JNSSnJ9vBgYSJ1kimEGFeCWUa9/mbrZWBF0tbwbWpGLqp0g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-languagepackages/18.0.3: - resolution: {integrity: sha512-39N6mJIMuz5kAz2izxscT/vFQvWxDH2rqLZyEcp3SHirNjxXQWAG4pr8cNd39YybIrEH9igsW7w4MizF8CPWKw==} + /@grapecity-software/spread-sheets-languagepackages/18.0.4: + resolution: {integrity: sha512-xMEskSA39LFaMQRuz6Tr2k0muEh1Q1e0O4vFeW0uU5TKSJrDss06sH8NTpoiPSF1AIl1Jh8ElzV+Qh7HM9rk1w==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pdf/18.0.3: - resolution: {integrity: sha512-EB5Pfs/pxR1kYU3pjZiRV+6RnguiSQ0G9ob4yj4ZC0FC+MuHXmdCH3z9cw7mLddZ3H32FFYHDBFgJwFZiQNceA==} + /@grapecity-software/spread-sheets-pdf/18.0.4: + resolution: {integrity: sha512-SpgsrStTvF8jKo1GXjPEIRl12etW1ke0ERptdJjDubmMKXZnZVpEUGGJ/BT9oWGPULHje9h6bA+lEZTBnJHYSw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pivot-addon/18.0.3: - resolution: {integrity: sha512-x4VVHa3GDtSigK2PsXQZ3CdLyW6Y0yqLqXObQIEf2TNhRjIn3t21i648CUWCNs3G6ImnCLLWdd3XabbvM0+Zog==} + /@grapecity-software/spread-sheets-pivot-addon/18.0.4: + resolution: {integrity: sha512-Vkr0x/aZMj86VR5JTfuoT6nj6nI+myUmkhM2cbLSqp7PRIo9Pk/2czMV1yyRUom4h2j7jOA7uzmHxvSQHM5c6A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-print/18.0.3: - resolution: {integrity: sha512-26g1RdXtugaRqWqDQMOxIG+T9/GreZaaFfdkqWt/QSbbmGuiMLozWYKQA+quaZy15yciXSOM975uZLpZtN0/Ww==} + /@grapecity-software/spread-sheets-print/18.0.4: + resolution: {integrity: sha512-PBTgVEsQ1vv0e8noUM2Z9BP9FX4ZCaeGXfiRI8VrmpcaVVhFsoNHyTasaCXKl7LhEk6ek5JHUyvSrcw6fxpU4A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-reportsheet-addon/18.0.3: - resolution: {integrity: sha512-cbxouUnNM6ElwFcyRjkbIT6AobCnnmo9hJtHgP4OpnkLg+pqgrN0nDgCmiaVDc3DfF/mWTpdbo+VxqHDbNFCHw==} + /@grapecity-software/spread-sheets-reportsheet-addon/18.0.4: + resolution: {integrity: sha512-m6REN62ru8t3Z6sv7rltmPdzQ95oPC0k4blBqCm2RD/oEnlp1l2NtlSLYYt2Uilb7T1eB5ARhYbQ4KmbyzkIWw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-resources-zh/18.0.3: - resolution: {integrity: sha512-WH2XwcqvlAOvcGj6emoDl5m6vBvI6n9KQzz3Dq73aI8AUyoEqWS1P4weYGxwXgSHOStfZTly9guGqaBHCSlYUA==} + /@grapecity-software/spread-sheets-resources-zh/18.0.4: + resolution: {integrity: sha512-a67tmT4I1bsk2eLKga3zfDlwMUOt6kyHXJQFnGK6frob3OLoGkhOsa2Xs4fq+rJnKpm0Z6GjBD7npIumllOOlA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-shapes/18.0.3: - resolution: {integrity: sha512-zzlqA4NyKZXFh+SwW8Ljf41ahhlK69QZzqG2a+Qp3/qv9iOsvFIRupyM/BgSuTlmq1X7JiEZDHB53fitRnX4DA==} + /@grapecity-software/spread-sheets-shapes/18.0.4: + resolution: {integrity: sha512-8qH0oXGjJnjQO4AP1daQZyTZEaqSOgPesDuUi1n5RPEYIfEOMEZR2KXBBkqWgDsrMvO+9LApL/Kay/iVK64QXQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-slicers/18.0.3: - resolution: {integrity: sha512-KD3+oRjBZfh3wZvkqez9vfhWtvhie9hXys9sPVPr5qTtTdf8nyJnQrJs+fsKxoG0wdHN2pKHUq4daPvXz2CeRw==} + /@grapecity-software/spread-sheets-slicers/18.0.4: + resolution: {integrity: sha512-isGDzN+fh4hxfarGyxkFn3mbUIELeeGxRhbH5PjA+nWXAEauxCbGXSIEPQ0r3OG+fwi5gG4ri3fCtwLtF9YKKA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-tablesheet/18.0.3: - resolution: {integrity: sha512-MqbVgNIK7fVbvK3NpB7mv2NoysVUA9UugGx3VR1EuWfceTGgtVMvAmZ1yhV53b/KjsDpq+kI5Wp7/EgVgqB31g==} + /@grapecity-software/spread-sheets-tablesheet/18.0.4: + resolution: {integrity: sha512-K+aBUbm1SupFldc5pYKCClCa58ak+Q6ZVkno9i+XO9PSV+SOZ0A03DRQiy7S9HgnsYTewNVfpyO+IxGKqQ5Zfg==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets/18.0.3: - resolution: {integrity: sha512-vfGx7S4jxw7yry7Gi+TXbeoMapR7HQxurNQ0TrtyqkqNW/Eeut+WCl4dBTmn2HM/faT4jfwVFbk0bfBBYGEwlw==} + /@grapecity-software/spread-sheets/18.0.4: + resolution: {integrity: sha512-xGli6qXVwg18sstSJlgkGwd3K4ytTS8xoRiYr43cN2RBLrGUaPvmfKduJkB9IfkBKzScoZODOVfV4QO42eonTg==} dev: false /@humanwhocodes/config-array/0.13.0: diff --git a/src/components.d.ts b/src/components.d.ts index 185943b..a720b59 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -37,6 +38,7 @@ DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default'] + ExcelEdit: typeof import('./components/excelEdit/index.vue')['default'] ExcelOreview: typeof import('./components/filePreview/excelOreview.vue')['default'] FilePreview: typeof import('./components/filePreview/filePreview.vue')['default'] FilePreviewDialog: typeof import('./components/filePreview/filePreviewDialog.vue')['default'] diff --git a/src/components/excelEdit/index.ts b/src/components/excelEdit/index.ts new file mode 100644 index 0000000..192b68e --- /dev/null +++ b/src/components/excelEdit/index.ts @@ -0,0 +1,44 @@ +/** 这里定义一些工作表基础使用方法 */ +import * as GC from '@grapecity-software/spread-sheets' +/** + * 导入 + * @param spread sprad实例 + * @param file 文件 + */ +export function importFile(spread: any, file: File) { + console.log('spread：开始执行文件导入') + console.log('spread', spread) + console.log('file', file) + return new Promise((resolve) => { + spread.import( + file, + () => { + console.log('spread：导入文件成功') + resolve('') + }, + (e: any) => { + console.log('spread：上传文件发生错误', e) + }, + { + fileType: GC.Spread.Sheets.FileType.excel, + }, + ) + }) +} + +/** + * 导入（方法来源于视频）---暂时不用 + * @param spread sprad实例 + * @param file 文件 + */ +export function excelIOimportFile(excelIO: any, file: File) { + excelIO.open( + file, + () => { + console.log('excelIO：导入文件成功') // 错误回调函数 + }, + (e: any) => { + console.log('excelIO：上传文件发生错误', e) // 错误回调函数 + }, + ) +} diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue new file mode 100644 index 0000000..bdb9ca3 --- /dev/null +++ b/src/components/excelEdit/index.vue @@ -0,0 +1,160 @@ + + + + + + diff --git a/src/main.ts b/src/main.ts index c8e6363..95d9410 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,6 +4,7 @@ import print from 'vue3-print-nb' import axios from 'axios' import * as ElementPlusIconsVue from '@element-plus/icons-vue' +import * as GC from '@grapecity-software/spread-sheets' import dayjs from 'dayjs' import App from './App.vue' import pinia from './store' @@ -24,6 +25,7 @@ if (useSettingsStore().app.iconifyOfflineUse) { downloadAndInstall() } +window.GC = GC const app = createApp(App) app.config.globalProperties.hasPerm = hasPermission app.config.globalProperties.buttonPerm = buttonPerm diff --git a/src/views/business/lab/excelEdit/index.vue b/src/views/business/lab/excelEdit/index.vue index cd8e694..6e7e28c 100644 --- a/src/views/business/lab/excelEdit/index.vue +++ b/src/views/business/lab/excelEdit/index.vue @@ -1,20 +1,26 @@ diff --git a/package.json b/package.json index 95301ac..0d23a70 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "version": "2.1.3", "scripts": { - "limit": "cross-env LIMIT=8192 increase-memory-limit", + "limit": "cross-env LIMIT=81920 increase-memory-limit", "dev": "vite", "build:test": "vite build --mode test", "build": "vite build", @@ -20,25 +20,25 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.10", - "@grapecity-software/spread-excelio": "^18.0.3", - "@grapecity-software/spread-sheets": "^18.0.3", - "@grapecity-software/spread-sheets-barcode": "^18.0.3", - "@grapecity-software/spread-sheets-charts": "^18.0.3", - "@grapecity-software/spread-sheets-designer": "^18.0.3", - "@grapecity-software/spread-sheets-designer-resources-cn": "^18.0.3", - "@grapecity-software/spread-sheets-designer-vue": "^18.0.3", - "@grapecity-software/spread-sheets-formula-panel": "^18.0.3", - "@grapecity-software/spread-sheets-ganttsheet": "^18.0.3", - "@grapecity-software/spread-sheets-io": "^18.0.3", - "@grapecity-software/spread-sheets-languagepackages": "^18.0.3", - "@grapecity-software/spread-sheets-pdf": "^18.0.3", - "@grapecity-software/spread-sheets-pivot-addon": "^18.0.3", - "@grapecity-software/spread-sheets-print": "^18.0.3", - "@grapecity-software/spread-sheets-reportsheet-addon": "^18.0.3", - "@grapecity-software/spread-sheets-resources-zh": "^18.0.3", - "@grapecity-software/spread-sheets-shapes": "^18.0.3", - "@grapecity-software/spread-sheets-slicers": "^18.0.3", - "@grapecity-software/spread-sheets-tablesheet": "^18.0.3", + "@grapecity-software/spread-excelio": "18.0.4", + "@grapecity-software/spread-sheets": "18.0.4", + "@grapecity-software/spread-sheets-barcode": "18.0.4", + "@grapecity-software/spread-sheets-charts": "18.0.4", + "@grapecity-software/spread-sheets-designer": "18.0.4", + "@grapecity-software/spread-sheets-designer-resources-cn": "18.0.4", + "@grapecity-software/spread-sheets-designer-vue": "18.0.4", + "@grapecity-software/spread-sheets-formula-panel": "18.0.4", + "@grapecity-software/spread-sheets-ganttsheet": "18.0.4", + "@grapecity-software/spread-sheets-io": "18.0.4", + "@grapecity-software/spread-sheets-languagepackages": "18.0.4", + "@grapecity-software/spread-sheets-pdf": "18.0.4", + "@grapecity-software/spread-sheets-pivot-addon": "18.0.4", + "@grapecity-software/spread-sheets-print": "18.0.4", + "@grapecity-software/spread-sheets-reportsheet-addon": "18.0.4", + "@grapecity-software/spread-sheets-resources-zh": "18.0.4", + "@grapecity-software/spread-sheets-shapes": "18.0.4", + "@grapecity-software/spread-sheets-slicers": "18.0.4", + "@grapecity-software/spread-sheets-tablesheet": "18.0.4", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", @@ -50,7 +50,6 @@ "element-plus": "^2.9.4", "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", - "html2canvas": "^1.4.1", "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", @@ -59,15 +58,16 @@ "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.1", - "pdfjs-dist": "2.0.943", "pinia": "^2.0.23", "print-js": "^1.6.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "tinymce": "^6.2.0", "vue": "^3.2.44", - "vue-pdf-embed": "^1.1.5", "vue-router": "^4.1.6", + "vue-pdf-embed": "^1.1.5", + "pdfjs-dist": "2.0.943", + "html2canvas": "^1.4.1", "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", "xlsx": "^0.18.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 107fd04..c752c80 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,25 +3,25 @@ specifiers: '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 - '@grapecity-software/spread-excelio': ^18.0.3 - '@grapecity-software/spread-sheets': ^18.0.3 - '@grapecity-software/spread-sheets-barcode': ^18.0.3 - '@grapecity-software/spread-sheets-charts': ^18.0.3 - '@grapecity-software/spread-sheets-designer': ^18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': ^18.0.3 - '@grapecity-software/spread-sheets-designer-vue': ^18.0.3 - '@grapecity-software/spread-sheets-formula-panel': ^18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': ^18.0.3 - '@grapecity-software/spread-sheets-io': ^18.0.3 - '@grapecity-software/spread-sheets-languagepackages': ^18.0.3 - '@grapecity-software/spread-sheets-pdf': ^18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': ^18.0.3 - '@grapecity-software/spread-sheets-print': ^18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': ^18.0.3 - '@grapecity-software/spread-sheets-resources-zh': ^18.0.3 - '@grapecity-software/spread-sheets-shapes': ^18.0.3 - '@grapecity-software/spread-sheets-slicers': ^18.0.3 - '@grapecity-software/spread-sheets-tablesheet': ^18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -101,25 +101,25 @@ dependencies: '@element-plus/icons-vue': 2.3.1_vue@3.5.13 - '@grapecity-software/spread-excelio': 18.0.3 - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-barcode': 18.0.3 - '@grapecity-software/spread-sheets-charts': 18.0.3 - '@grapecity-software/spread-sheets-designer': 18.0.3 - '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.3 - '@grapecity-software/spread-sheets-designer-vue': 18.0.3 - '@grapecity-software/spread-sheets-formula-panel': 18.0.3 - '@grapecity-software/spread-sheets-ganttsheet': 18.0.3 - '@grapecity-software/spread-sheets-io': 18.0.3 - '@grapecity-software/spread-sheets-languagepackages': 18.0.3 - '@grapecity-software/spread-sheets-pdf': 18.0.3 - '@grapecity-software/spread-sheets-pivot-addon': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 - '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.3 - '@grapecity-software/spread-sheets-resources-zh': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 - '@grapecity-software/spread-sheets-slicers': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-excelio': 18.0.4 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-barcode': 18.0.4 + '@grapecity-software/spread-sheets-charts': 18.0.4 + '@grapecity-software/spread-sheets-designer': 18.0.4 + '@grapecity-software/spread-sheets-designer-resources-cn': 18.0.4 + '@grapecity-software/spread-sheets-designer-vue': 18.0.4 + '@grapecity-software/spread-sheets-formula-panel': 18.0.4 + '@grapecity-software/spread-sheets-ganttsheet': 18.0.4 + '@grapecity-software/spread-sheets-io': 18.0.4 + '@grapecity-software/spread-sheets-languagepackages': 18.0.4 + '@grapecity-software/spread-sheets-pdf': 18.0.4 + '@grapecity-software/spread-sheets-pivot-addon': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 + '@grapecity-software/spread-sheets-reportsheet-addon': 18.0.4 + '@grapecity-software/spread-sheets-resources-zh': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 + '@grapecity-software/spread-sheets-slicers': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 '@tinymce/tinymce-vue': 5.1.1_vue@3.5.13 '@vueuse/core': 9.13.0_vue@3.5.13 '@vueuse/integrations': 9.13.0_444g5qadeay4jgjlt43bfjlya4 @@ -862,116 +862,116 @@ resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} dev: false - /@grapecity-software/spread-excelio/18.0.3: - resolution: {integrity: sha512-BBGJFNr5vO8dGCJRqYzzEMh1AAulE8lvbHdWC4OSxEi/MxRJ0tInE6iF+VJ6U4QM3JxZiIuDYZikIS/0n9PK+g==} + /@grapecity-software/spread-excelio/18.0.4: + resolution: {integrity: sha512-a1oNrKpNywxgZ+Y3E7EipiD30mFJEyE6dH1BKAxlGKZQk1kVPgX/FF0gQ6/5hpmAcAYXE4Ktq4cQWWQg0R/8VA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-barcode/18.0.3: - resolution: {integrity: sha512-gM9C67cumFp2m5ARNX3wUmB/h3to7RE2+yIztTHbHlTOB6P9DJhFVuPUdIztKdV3QLB5XDLH7t+6bqnK2loWiw==} + /@grapecity-software/spread-sheets-barcode/18.0.4: + resolution: {integrity: sha512-MlIe5g1mSN1DWiaNDvQEALIYVW5Hev8Hyw6MLsowWvTMh3hJpQ9I0+qQwhJmUP9URv7yCqIZ/TWIg0/JGirC6g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-charts/18.0.3: - resolution: {integrity: sha512-hooSPXbacF7CyGSmE1+beQYBQT0vkGN3C71XxGumPkUKIG6iHixrzaGSSnqblniCYwO4NXkOxS9mppVdJLAupA==} + /@grapecity-software/spread-sheets-charts/18.0.4: + resolution: {integrity: sha512-RQlCR9yo6ge3FvEHPCecC6Yv+zVACD3Kl+tYORwMHpu3tyGUAgnGQfX3BydyX/DAITT/c5LLPB+yR63UnOLICQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-designer-resources-cn/18.0.3: - resolution: {integrity: sha512-da5rA68TD3iTNL+2BjRdUrAmva45JB+lGQPJ+Lh4qbF1fZlSZ5GaKi3f7gZE4HhWbiNi/bfwNB+FS6PBuJiqeg==} + /@grapecity-software/spread-sheets-designer-resources-cn/18.0.4: + resolution: {integrity: sha512-jUcNd89sSkiTDK+oqJIki28HKPvPVnhB3aRhxz4nnLwMqL8JFejblTjDJwJKKqQ5itnHstDhzNQ58BzcIXdaRA==} dev: false - /@grapecity-software/spread-sheets-designer-vue/18.0.3: - resolution: {integrity: sha512-AIFilAJADixA26h5PDIWTsi5kugbtbiMkFrHdvO56kIhmmy3nsfhnwkFGOVBWKAV6OkxNkW4EWyLjJs9dXeoWw==} + /@grapecity-software/spread-sheets-designer-vue/18.0.4: + resolution: {integrity: sha512-nVWZOgKcQlaDJ+tf+I+Evp6UB2zyORhis+nEiqE+Ixkhc4UJr0BojnNhA9CA+0eBsPCUtYCPAnz/W45ttrR7rg==} dev: false - /@grapecity-software/spread-sheets-designer/18.0.3: - resolution: {integrity: sha512-21DqwkHRJkSW4nCMalnogobZABBX7Q64GY3w0JfzdiSEOVkt0iOIMVf0BdBCPuGEleHyBWvFAA9CGf0HErE8qQ==} + /@grapecity-software/spread-sheets-designer/18.0.4: + resolution: {integrity: sha512-aexIhr4T99s41SpkVrAhfcl4eiAOpJdSauIjKNPoc3d5dRdS+uJrcQGmGKypvhO3ArejAdiGCHkDZadsvKHgoQ==} dev: false - /@grapecity-software/spread-sheets-formula-panel/18.0.3: - resolution: {integrity: sha512-LEHf+WHu99x2wmV3pQgllZFxQfuCKDUCV2i0jlZaS67lEWJ+Ocf80NSyb2jRenm3LX4fhrA5DBN84my7sI6baA==} + /@grapecity-software/spread-sheets-formula-panel/18.0.4: + resolution: {integrity: sha512-jCqlSe0RYiC8besCUVyXiZe/o1Kc5S40QcQBWrBMHM0FfbKVeF1qf5kKkozAWg0wdZLfpmd/h/emyGCafYxBwA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-ganttsheet/18.0.3: - resolution: {integrity: sha512-hIgUXXMlSFiybtFj/fVIxlaVzf+Q0t3qfshKGkykQZ8w1SMW0pvmSHCLAanZDaf4nz9FrAGELz7w1B8Z0Zic2w==} + /@grapecity-software/spread-sheets-ganttsheet/18.0.4: + resolution: {integrity: sha512-6GYO76CAQPUfqmO0XN2H5yRSRVOmckeLjmuag3nhKvc/nfAIYrVBm9hyYc/UoUt3hsIDF/7oSrJUyQ+Y3kE6Kw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-tablesheet': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-tablesheet': 18.0.4 dev: false - /@grapecity-software/spread-sheets-io/18.0.3: - resolution: {integrity: sha512-waApTWTuLaGT3lyLD1uGrPvbaLj5ft5xzQv206oz1caVUEP8qu/CK93mHXvnD8hxeV/uvssvUo12OndcYGnXtw==} + /@grapecity-software/spread-sheets-io/18.0.4: + resolution: {integrity: sha512-SJyKtZQEjCsqO9Eoq8jXlH/MgW4cB+5E3z7GF68JNSSnJ9vBgYSJ1kimEGFeCWUa9/mbrZWBF0tbwbWpGLqp0g==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-languagepackages/18.0.3: - resolution: {integrity: sha512-39N6mJIMuz5kAz2izxscT/vFQvWxDH2rqLZyEcp3SHirNjxXQWAG4pr8cNd39YybIrEH9igsW7w4MizF8CPWKw==} + /@grapecity-software/spread-sheets-languagepackages/18.0.4: + resolution: {integrity: sha512-xMEskSA39LFaMQRuz6Tr2k0muEh1Q1e0O4vFeW0uU5TKSJrDss06sH8NTpoiPSF1AIl1Jh8ElzV+Qh7HM9rk1w==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pdf/18.0.3: - resolution: {integrity: sha512-EB5Pfs/pxR1kYU3pjZiRV+6RnguiSQ0G9ob4yj4ZC0FC+MuHXmdCH3z9cw7mLddZ3H32FFYHDBFgJwFZiQNceA==} + /@grapecity-software/spread-sheets-pdf/18.0.4: + resolution: {integrity: sha512-SpgsrStTvF8jKo1GXjPEIRl12etW1ke0ERptdJjDubmMKXZnZVpEUGGJ/BT9oWGPULHje9h6bA+lEZTBnJHYSw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-pivot-addon/18.0.3: - resolution: {integrity: sha512-x4VVHa3GDtSigK2PsXQZ3CdLyW6Y0yqLqXObQIEf2TNhRjIn3t21i648CUWCNs3G6ImnCLLWdd3XabbvM0+Zog==} + /@grapecity-software/spread-sheets-pivot-addon/18.0.4: + resolution: {integrity: sha512-Vkr0x/aZMj86VR5JTfuoT6nj6nI+myUmkhM2cbLSqp7PRIo9Pk/2czMV1yyRUom4h2j7jOA7uzmHxvSQHM5c6A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-print/18.0.3: - resolution: {integrity: sha512-26g1RdXtugaRqWqDQMOxIG+T9/GreZaaFfdkqWt/QSbbmGuiMLozWYKQA+quaZy15yciXSOM975uZLpZtN0/Ww==} + /@grapecity-software/spread-sheets-print/18.0.4: + resolution: {integrity: sha512-PBTgVEsQ1vv0e8noUM2Z9BP9FX4ZCaeGXfiRI8VrmpcaVVhFsoNHyTasaCXKl7LhEk6ek5JHUyvSrcw6fxpU4A==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-reportsheet-addon/18.0.3: - resolution: {integrity: sha512-cbxouUnNM6ElwFcyRjkbIT6AobCnnmo9hJtHgP4OpnkLg+pqgrN0nDgCmiaVDc3DfF/mWTpdbo+VxqHDbNFCHw==} + /@grapecity-software/spread-sheets-reportsheet-addon/18.0.4: + resolution: {integrity: sha512-m6REN62ru8t3Z6sv7rltmPdzQ95oPC0k4blBqCm2RD/oEnlp1l2NtlSLYYt2Uilb7T1eB5ARhYbQ4KmbyzkIWw==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-print': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-print': 18.0.4 dev: false - /@grapecity-software/spread-sheets-resources-zh/18.0.3: - resolution: {integrity: sha512-WH2XwcqvlAOvcGj6emoDl5m6vBvI6n9KQzz3Dq73aI8AUyoEqWS1P4weYGxwXgSHOStfZTly9guGqaBHCSlYUA==} + /@grapecity-software/spread-sheets-resources-zh/18.0.4: + resolution: {integrity: sha512-a67tmT4I1bsk2eLKga3zfDlwMUOt6kyHXJQFnGK6frob3OLoGkhOsa2Xs4fq+rJnKpm0Z6GjBD7npIumllOOlA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-shapes/18.0.3: - resolution: {integrity: sha512-zzlqA4NyKZXFh+SwW8Ljf41ahhlK69QZzqG2a+Qp3/qv9iOsvFIRupyM/BgSuTlmq1X7JiEZDHB53fitRnX4DA==} + /@grapecity-software/spread-sheets-shapes/18.0.4: + resolution: {integrity: sha512-8qH0oXGjJnjQO4AP1daQZyTZEaqSOgPesDuUi1n5RPEYIfEOMEZR2KXBBkqWgDsrMvO+9LApL/Kay/iVK64QXQ==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets-slicers/18.0.3: - resolution: {integrity: sha512-KD3+oRjBZfh3wZvkqez9vfhWtvhie9hXys9sPVPr5qTtTdf8nyJnQrJs+fsKxoG0wdHN2pKHUq4daPvXz2CeRw==} + /@grapecity-software/spread-sheets-slicers/18.0.4: + resolution: {integrity: sha512-isGDzN+fh4hxfarGyxkFn3mbUIELeeGxRhbH5PjA+nWXAEauxCbGXSIEPQ0r3OG+fwi5gG4ri3fCtwLtF9YKKA==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 - '@grapecity-software/spread-sheets-shapes': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 + '@grapecity-software/spread-sheets-shapes': 18.0.4 dev: false - /@grapecity-software/spread-sheets-tablesheet/18.0.3: - resolution: {integrity: sha512-MqbVgNIK7fVbvK3NpB7mv2NoysVUA9UugGx3VR1EuWfceTGgtVMvAmZ1yhV53b/KjsDpq+kI5Wp7/EgVgqB31g==} + /@grapecity-software/spread-sheets-tablesheet/18.0.4: + resolution: {integrity: sha512-K+aBUbm1SupFldc5pYKCClCa58ak+Q6ZVkno9i+XO9PSV+SOZ0A03DRQiy7S9HgnsYTewNVfpyO+IxGKqQ5Zfg==} dependencies: - '@grapecity-software/spread-sheets': 18.0.3 + '@grapecity-software/spread-sheets': 18.0.4 dev: false - /@grapecity-software/spread-sheets/18.0.3: - resolution: {integrity: sha512-vfGx7S4jxw7yry7Gi+TXbeoMapR7HQxurNQ0TrtyqkqNW/Eeut+WCl4dBTmn2HM/faT4jfwVFbk0bfBBYGEwlw==} + /@grapecity-software/spread-sheets/18.0.4: + resolution: {integrity: sha512-xGli6qXVwg18sstSJlgkGwd3K4ytTS8xoRiYr43cN2RBLrGUaPvmfKduJkB9IfkBKzScoZODOVfV4QO42eonTg==} dev: false /@humanwhocodes/config-array/0.13.0: diff --git a/src/components.d.ts b/src/components.d.ts index 185943b..a720b59 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default'] CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/Approval/ApprovalDialogCustom copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -37,6 +38,7 @@ DetailPage: typeof import('./components/DetailPage/index.vue')['default'] Editor: typeof import('./components/Editor/index.vue')['default'] ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default'] + ExcelEdit: typeof import('./components/excelEdit/index.vue')['default'] ExcelOreview: typeof import('./components/filePreview/excelOreview.vue')['default'] FilePreview: typeof import('./components/filePreview/filePreview.vue')['default'] FilePreviewDialog: typeof import('./components/filePreview/filePreviewDialog.vue')['default'] diff --git a/src/components/excelEdit/index.ts b/src/components/excelEdit/index.ts new file mode 100644 index 0000000..192b68e --- /dev/null +++ b/src/components/excelEdit/index.ts @@ -0,0 +1,44 @@ +/** 这里定义一些工作表基础使用方法 */ +import * as GC from '@grapecity-software/spread-sheets' +/** + * 导入 + * @param spread sprad实例 + * @param file 文件 + */ +export function importFile(spread: any, file: File) { + console.log('spread：开始执行文件导入') + console.log('spread', spread) + console.log('file', file) + return new Promise((resolve) => { + spread.import( + file, + () => { + console.log('spread：导入文件成功') + resolve('') + }, + (e: any) => { + console.log('spread：上传文件发生错误', e) + }, + { + fileType: GC.Spread.Sheets.FileType.excel, + }, + ) + }) +} + +/** + * 导入（方法来源于视频）---暂时不用 + * @param spread sprad实例 + * @param file 文件 + */ +export function excelIOimportFile(excelIO: any, file: File) { + excelIO.open( + file, + () => { + console.log('excelIO：导入文件成功') // 错误回调函数 + }, + (e: any) => { + console.log('excelIO：上传文件发生错误', e) // 错误回调函数 + }, + ) +} diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue new file mode 100644 index 0000000..bdb9ca3 --- /dev/null +++ b/src/components/excelEdit/index.vue @@ -0,0 +1,160 @@ + + + + + + diff --git a/src/main.ts b/src/main.ts index c8e6363..95d9410 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,6 +4,7 @@ import print from 'vue3-print-nb' import axios from 'axios' import * as ElementPlusIconsVue from '@element-plus/icons-vue' +import * as GC from '@grapecity-software/spread-sheets' import dayjs from 'dayjs' import App from './App.vue' import pinia from './store' @@ -24,6 +25,7 @@ if (useSettingsStore().app.iconifyOfflineUse) { downloadAndInstall() } +window.GC = GC const app = createApp(App) app.config.globalProperties.hasPerm = hasPermission app.config.globalProperties.buttonPerm = buttonPerm diff --git a/src/views/business/lab/excelEdit/index.vue b/src/views/business/lab/excelEdit/index.vue index cd8e694..6e7e28c 100644 --- a/src/views/business/lab/excelEdit/index.vue +++ b/src/views/business/lab/excelEdit/index.vue @@ -1,20 +1,26 @@ diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue index 97949b5..fcb3341 100644 --- a/src/views/business/lab/measureData/measureDataDetail.vue +++ b/src/views/business/lab/measureData/measureDataDetail.vue @@ -21,6 +21,8 @@ import { SCHEDULE } from '@/utils/scheduleDict' import { UploadFile } from '@/api/measure/file' import { updateSample } from '@/api/customer/sampleList' +import ExcelEdit from '@/components/excelEdit/index.vue' +import { importFile } from '@/components/excelEdit/index.ts' import { getStaffList } from '@/api/measure/person' // import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue' import type { TableColumn } from '@/components/NormalTable/table_interface' @@ -652,31 +654,32 @@ } else if (pageType.value === 'edit' || (pageType.value === 'add' && infoId.value)) { // 编辑 - if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回 - const param = { - ...params, - processId: form.value.processId, - // assignees: approverList, - } - failUpdateMeasureData(params).then((res) => { - handleUpdateSample() - ElMessage.success('保存成功') - // showSaveBtn.value = false - pageType.value = 'detail' - loading.close() - }).catch(() => { - loading.close() - }) - } - else { // 草稿箱和已取消 - draftUpdateMeasureData(params).then((res) => { - handleUpdateSample() - ElMessage.success('保存成功') - loading.close() - }).catch(() => { - loading.close() - }) - } + // if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回 + // const param = { + // ...params, + // processId: form.value.processId, + // // assignees: approverList, + // } + // failUpdateMeasureData(params).then((res) => { + // handleUpdateSample() + // ElMessage.success('保存成功') + // // showSaveBtn.value = false + // pageType.value = 'detail' + // loading.close() + // }).catch(() => { + // loading.close() + // }) + // } + // else { // 草稿箱和已取消 + draftUpdateMeasureData(params).then((res) => { + handleUpdateSample() + submitId.value = res.data + ElMessage.success('保存成功') + loading.close() + }).catch(() => { + loading.close() + }) + // } } } }) @@ -692,38 +695,38 @@ console.log('审批人', approverList) console.log('processId', form.value.processId) - if (form.value === null || form.value.processId === undefined || form.value.processId === '') { - // 流程id为空 表示还未进入流程中 直接提交 + // if (form.value === null || form.value.processId === undefined || form.value.processId === '') { + // 流程id为空 表示还未进入流程中 直接提交 - ElMessageBox.confirm(`是否提交计量数据管理 ${form.value.certificateReportCode}-${form.value.certificateReportName}`, '提示', { - confirmButtonText: '确认', - cancelButtonText: '取消', - type: 'warning', - }).then(() => { - if (submitId.value) { - const loading = ElLoading.service({ - lock: true, - background: 'rgba(255, 255, 255, 0.8)', - }) - const params = { - id: submitId.value, - formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, // 表单id - assignees: approverList, - processId: form.value.processId, - } - submit(params).then(() => { - ElMessage.success('提交成功') - loading.close() - close() - }).catch(() => { - loading.close() - }) + ElMessageBox.confirm(`是否提交计量数据管理 ${form.value.certificateReportCode}-${form.value.certificateReportName}`, '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }).then(() => { + if (submitId.value) { + const loading = ElLoading.service({ + lock: true, + background: 'rgba(255, 255, 255, 0.8)', + }) + const params = { + id: submitId.value, + formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS, // 表单id + assignees: approverList, + processId: form.value.processId, } - else { - ElMessage.warning('请先保存！') - } - }) - } + submit(params).then(() => { + ElMessage.success('提交成功') + loading.close() + close() + }).catch(() => { + loading.close() + }) + } + else { + ElMessage.warning('请先保存！') + } + }) + // } } // 提交按钮 const handleSubmit = () => { @@ -860,12 +863,51 @@ form.value.calibrationTime = proxy.dayjs().format('YYYY-MM-DD') // 检校日期 } }) + +// ------------------------------------excel在线编辑-------------------------------------- +const excelEditRef = ref() +// 点击ExcelEdit在线编辑按钮，打开ExcelEdit在线编辑工具 +const handleClickExcelEdit = () => { + excelEditRef.value.initDialog() +} +// excel初始化完成 +const ExcelEditInitComplete = async (spread: any) => { + const params = solveParams() + const loading = ElLoading.service({ + lock: true, + text: '模板自动导入中，请稍后！', + background: 'rgba(255, 255, 255, 0.8)', + }) + console.log('---------------------------------') + console.log(params) + + // downLoadTemplate(params).then((res) => { + // if (res.data) { + // // const fileName = `${form.value.certificateReportName}${form.value.templateName}.xlsx` + // // const file = new File([res.data], fileName) + // loading.close() + // // importFile(spread, file) + // // excelEditRef.value.handleImportFile(res.data) + // } + // else { + // console.log('未获取到模板文件') + // } + // }).catch(() => { + // loading.close() + // }) + // const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx') + // const file = await res.blob() + // importFile(spread, file) +}