Skip to content

Commit 92f7e1b

Browse files
graphierosgraphieros
authored
Merge pull request #19 from graphieros/Remove-XLSX-dependency
Removed XLSX dependency
2 parents 5b6f6b6 + 0da6819 commit 92f7e1b

35 files changed

+198
-301
lines changed

‎package-lock.json

Lines changed: 5 additions & 116 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vue-data-ui",
33
"private": false,
4-
"version": "1.9.51",
4+
"version": "1.9.52",
55
"type": "module",
66
"description": "A user-empowering data visualization Vue components library",
77
"keywords": [
@@ -77,7 +77,6 @@
7777
"vite": "^4.4.5",
7878
"vitest": "^0.34.1",
7979
"vue": "^3.3.4",
80-
"vue-data-ui": "file:../vue-data-ui",
81-
"xlsx": "^0.18.5"
80+
"vue-data-ui": "file:../vue-data-ui"
8281
}
8382
}

‎src/App.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3130,31 +3130,31 @@ function printXy() {
31303130
xytest.value.generatePdf();
31313131
}
31323132
function xlsXy() {
3133-
xytest.value.generateXls();
3133+
xytest.value.generateCsv();
31343134
}
31353135
function printDonut(){
31363136
donuttest.value.generatePdf();
31373137
}
31383138
function xlsDonut() {
3139-
donuttest.value.generateXls();
3139+
donuttest.value.generateCsv();
31403140
}
31413141
function printWaffle(){
31423142
waffletest.value.generatePdf();
31433143
}
31443144
function xlsWaffle() {
3145-
waffletest.value.generateXls();
3145+
waffletest.value.generateCsv();
31463146
}
31473147
function printRadar(){
31483148
radartest.value.generatePdf();
31493149
}
31503150
function xlsRadar() {
3151-
radartest.value.generateXls();
3151+
radartest.value.generateCsv();
31523152
}
31533153
function printQuadrant(){
31543154
quadranttest.value.generatePdf();
31553155
}
31563156
function xlsQuadrant() {
3157-
quadranttest.value.generateXls();
3157+
quadranttest.value.generateCsv();
31583158
}
31593159
const gaugetest = ref(null);
31603160
function printGauge(){
@@ -3166,54 +3166,54 @@ function printChestnut(){
31663166
chestnuttest.value.generatePdf();
31673167
}
31683168
function xlsChestnut() {
3169-
chestnuttest.value.generateXls();
3169+
chestnuttest.value.generateCsv();
31703170
}
31713171
31723172
const oniontest = ref(null);
31733173
function printOnion(){
31743174
oniontest.value.generatePdf();
31753175
}
31763176
function xlsOnion() {
3177-
oniontest.value.generateXls();
3177+
oniontest.value.generateCsv();
31783178
}
31793179
31803180
const verticaltest = ref(null);
31813181
function printVB(){
31823182
verticaltest.value.generatePdf();
31833183
}
31843184
function xlsVB() {
3185-
verticaltest.value.generateXls();
3185+
verticaltest.value.generateCsv();
31863186
}
31873187
31883188
const heatmaptest = ref(null);
31893189
function printHeatmap(){
31903190
heatmaptest.value.generatePdf();
31913191
}
31923192
function xlsHeatmap() {
3193-
heatmaptest.value.generateXls();
3193+
heatmaptest.value.generateCsv();
31943194
}
31953195
31963196
function printScatter(){
31973197
scatter.value.generatePdf();
31983198
}
31993199
function xlsScatter() {
3200-
scatter.value.generateXls();
3200+
scatter.value.generateCsv();
32013201
}
32023202
32033203
const candlestick = ref(null);
32043204
function printCandle(){
32053205
candlestick.value.generatePdf();
32063206
}
32073207
function xlsCandle() {
3208-
candlestick.value.generateXls();
3208+
candlestick.value.generateCsv();
32093209
}
32103210
32113211
const pyramid = ref(null);
32123212
function printPyramid(){
32133213
pyramid.value.generatePdf();
32143214
}
32153215
function xlsPyramid() {
3216-
pyramid.value.generateXls();
3216+
pyramid.value.generateCsv();
32173217
}
32183218
32193219
const relation = ref(null);

‎src/atoms/UserOptions.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ const props = defineProps({
5454
}
5555
});
5656
57-
const emit = defineEmits(['generatePdf', 'generateXls', 'generateImage', 'toggleTable', 'toggleLabels', 'toggleSort']);
57+
const emit = defineEmits(['generatePdf', 'generateCsv', 'generateImage', 'toggleTable', 'toggleLabels', 'toggleSort']);
5858
5959
function generatePdf() {
6060
emit('generatePdf');
6161
}
6262
63-
function generateXls() {
64-
emit('generateXls');
63+
function generateCsv() {
64+
emit('generateCsv');
6565
}
6666
6767
function generateImage() {
@@ -120,7 +120,7 @@ function toggleSort() {
120120
<BaseIcon v-else name="pdf" :stroke="color" />
121121
</button>
122122

123-
<button tabindex="0" v-if="hasXls" data-cy="user-options-xls" class="vue-ui-user-options-button" @click="generateXls">
123+
<button tabindex="0" v-if="hasXls" data-cy="user-options-xls" class="vue-ui-user-options-button" @click="generateCsv">
124124
<BaseIcon name="excel" :stroke="color" />
125125
</button>
126126

‎src/components/vue-ui-age-pyramid.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup>
22
import { ref, computed, nextTick } from "vue";
3-
import { opacity, makeXls, shiftHue, createUid } from '../lib';
3+
import { opacity, shiftHue, createUid, createCsvContent, downloadCsv } from '../lib';
44
import pdf from "../pdf";
55
import img from "../img";
66
import mainConfig from "../default_configs.json";
@@ -234,7 +234,7 @@ function generateImage() {
234234
}, 100)
235235
}
236236
237-
function generateXls() {
237+
function generateCsv() {
238238
nextTick(() => {
239239
const labels = [agePyramidConfig.value.translations.year, agePyramidConfig.value.translations.age, agePyramidConfig.value.translations.female, agePyramidConfig.value.translations.male, agePyramidConfig.value.translations.total];
240240
@@ -249,14 +249,14 @@ function generateXls() {
249249
});
250250
251251
const tableXls = [[agePyramidConfig.value.style.title.text],[agePyramidConfig.value.style.title.subtitle.text],[[""],[""],[""]]].concat([labels]).concat(values)
252-
253-
makeXls(tableXls, agePyramidConfig.value.style.title.text || "vue-ui-heatmap");
252+
const csvContent = createCsvContent(tableXls);
253+
downloadCsv({ csvContent, title: agePyramidConfig.value.style.title.text || "vue-ui-heatmap"});
254254
});
255255
}
256256
257257
defineExpose({
258258
generatePdf,
259-
generateXls,
259+
generateCsv,
260260
generateImage
261261
});
262262
@@ -299,7 +299,7 @@ defineExpose({
299299
:hasImg="true"
300300
hasTable
301301
@generatePdf="generatePdf"
302-
@generateXls="generateXls"
302+
@generateCsv="generateCsv"
303303
@generateImage="generateImage"
304304
@toggleTable="mutableConfig.showTable = !mutableConfig.showTable"
305305
/>

0 commit comments

Comments
 (0)