Skip to content

Commit b4d9253

Browse files
peterzhou-asposepeterzhou-aspose
committed
update to v24.11
1 parent f78f976 commit b4d9253

File tree

7 files changed

+106
-18
lines changed

7 files changed

+106
-18
lines changed

‎Examples.GridJs/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ testconfig.CachePath=/app/grid_cache
1515

1616
2.run src\main\java\com\aspose\gridjs\demo\GridjsdemoApplication.java
1717

18-
open browser and navigate to http://localhost:8080/gridjsdemo/index
18+
open browser and navigate to view the default spreadsheet file at http://localhost:8080/gridjsdemo/index or view all the files in the directory at http://localhost:8080/gridjsdemo/list
1919

2020
## Step to run in docker
2121

2222
docker build -t gridjs-demo-java .
2323

2424
docker run -d -p 8080:8080 gridjs-demo-java
2525

26-
open browser and enter the url:http://localhost:8080/gridjsdemo/index
26+
open browser and enter the url:http://localhost:8080/gridjsdemo/index or http://localhost:8080/gridjsdemo/list
2727

2828
## Resources
2929

‎Examples.GridJs/src/main/java/com/aspose/gridjs/demo/controller/DataController.java‎

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.aspose.gridjs.demo.controller;
22

3+
import java.io.File;
4+
import java.util.ArrayList;
5+
import java.util.List;
6+
37
import org.springframework.beans.factory.annotation.Value;
48
import org.springframework.web.bind.annotation.GetMapping;
59
import org.springframework.web.bind.annotation.RequestMapping;
10+
import org.springframework.web.bind.annotation.RequestParam;
611
import org.springframework.web.bind.annotation.RestController;
712
import org.springframework.web.servlet.ModelAndView;
813

@@ -12,16 +17,62 @@
1217
@RequestMapping({"/gridjsdemo"})
1318
public class DataController {
1419
@Value("${testconfig.FileName}")
15-
private String fileName;//="chart.xlsx";
20+
private String testFileName;//="chart.xlsx";
21+
22+
@Value("${testconfig.ListDir}")
23+
private String listDir;
1624

1725
@GetMapping({"/index"})
1826
public ModelAndView getIndexPage()
1927
{
20-
String uid = GridJsWorkbook.getUidForFile(fileName);
28+
String uid = GridJsWorkbook.getUidForFile(testFileName);
29+
30+
ModelAndView mv = new ModelAndView();
31+
mv.addObject("uid", uid);
32+
mv.addObject("file", testFileName);
33+
mv.setViewName("index");
34+
return mv;
35+
}
36+
37+
@GetMapping("/list")
38+
public ModelAndView listFiles() {
39+
40+
List<String[]> filelist = new ArrayList<>();
41+
42+
43+
File dir = new File(listDir);
44+
if (dir.exists() && dir.isDirectory()) {
45+
File[] files = dir.listFiles();
46+
if (files != null) {
47+
for (File file : files) {
48+
49+
50+
String filename=file.getName();
51+
52+
//get a unique id for the file
53+
String uid = GridJsWorkbook.getUidForFile(filename);
54+
String[] ff={filename,uid};
55+
filelist.add(ff);
56+
}
57+
}
58+
}
59+
60+
ModelAndView mv = new ModelAndView();
61+
62+
mv.addObject("filelist", filelist);
63+
64+
mv.setViewName("list");
65+
return mv;
66+
}
67+
68+
@GetMapping("/Uidtml")
69+
public ModelAndView uidtml(@RequestParam String filename,@RequestParam String uid) {
70+
71+
2172

2273
ModelAndView mv = new ModelAndView();
2374
mv.addObject("uid", uid);
24-
mv.addObject("file", fileName);
75+
mv.addObject("file", filename);
2576
mv.setViewName("index");
2677
return mv;
2778
}

‎Examples.GridJs/src/main/java/com/aspose/gridjs/demo/controller/GridJs2Controller.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,36 @@
22

33
import java.io.ByteArrayInputStream;
44
import java.io.ByteArrayOutputStream;
5-
import java.io.FileInputStream;
5+
import java.io.File;
66
import java.io.IOException;
77
import java.io.InputStream;
88
import java.net.URL;
99
import java.net.URLConnection;
1010
import java.nio.file.Files;
1111
import java.nio.file.Path;
1212
import java.nio.file.Paths;
13+
import java.util.ArrayList;
14+
import java.util.List;
1315
import java.util.concurrent.ExecutorService;
1416
import java.util.concurrent.Executors;
1517
import java.util.zip.GZIPOutputStream;
1618

19+
import javax.servlet.http.HttpServletRequest;
20+
import javax.servlet.http.HttpServletResponse;
21+
import javax.servlet.http.Part;
22+
1723
import org.springframework.beans.factory.annotation.Value;
1824
import org.springframework.core.io.InputStreamResource;
1925
import org.springframework.http.HttpHeaders;
2026
import org.springframework.http.HttpStatus;
2127
import org.springframework.http.MediaType;
2228
import org.springframework.http.ResponseEntity;
2329
import org.springframework.web.bind.annotation.GetMapping;
24-
import org.springframework.web.bind.annotation.PathVariable;
2530
import org.springframework.web.bind.annotation.PostMapping;
2631
import org.springframework.web.bind.annotation.RequestMapping;
2732
import org.springframework.web.bind.annotation.RequestParam;
2833
import org.springframework.web.bind.annotation.RestController;
2934
import org.springframework.web.multipart.MultipartFile;
30-
import org.springframework.web.servlet.ModelAndView;
3135
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
3236

3337
import com.aspose.cells.Workbook;
@@ -36,10 +40,6 @@
3640
import com.aspose.gridjs.GridInterruptMonitor;
3741
import com.aspose.gridjs.GridJsWorkbook;
3842

39-
import javax.servlet.http.HttpServletRequest;
40-
import javax.servlet.http.HttpServletResponse;
41-
import javax.servlet.http.Part;
42-
4343
@RestController
4444
@RequestMapping({"/GridJs2"})
4545
public class GridJs2Controller {
@@ -498,4 +498,4 @@ public ResponseEntity<String> download(HttpServletRequest request) {
498498
}
499499

500500

501-
}
501+
}

‎Examples.GridJs/src/main/resources/templates/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<script src="/xspread/xspreadsheet.js?v=20230525"></script> -->
3636

3737
<!--for release reference-->
38-
<link rel="stylesheet" href="https://unpkg.com/gridjs-spreadsheet@24.8.0/xspreadsheet.css">
39-
<script src="https://unpkg.com/gridjs-spreadsheet@24.8.0/xspreadsheet.js"></script>
38+
<link rel="stylesheet" href="https://unpkg.com/gridjs-spreadsheet@24.11.1/xspreadsheet.css">
39+
<script src="https://unpkg.com/gridjs-spreadsheet@24.11.1/xspreadsheet.js"></script>
4040

4141

4242

‎Examples.GridJs/src/main/resources/templates/list.html‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width" />
6+
<title>gridjs-web-demo file list</title>
7+
8+
<style>
9+
10+
</style>
11+
12+
13+
</head>
14+
15+
<body>
16+
<script>
17+
18+
function openfile(element) {
19+
const filename = element.getAttribute('data-filename');
20+
21+
const uid = element.getAttribute('data-uid');
22+
const url = '/gridjsdemo/Uidtml?filename=' + filename+'&uid='+uid;
23+
window.open(url, "_blank");
24+
}
25+
</script>
26+
<div th:each="item : ${filelist}">
27+
<a href="javascript:void(0)" target="_blank" th:data-filename="${item[0]}" th:data-uid="${item[1]}" onclick="openfile(this)">
28+
<em th:text="${item[0]}"></em>
29+
</a><br />
30+
</div>
31+
<footer class="border-top footer text-muted">
32+
<div class="container">
33+
© 2024 - Aspose
34+
</div>
35+
</footer>
36+
</body>
37+
</html>

‎Examples.GridWeb/springboot3.3demo/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.aspose</groupId>
4141
<artifactId>aspose-cells</artifactId>
42-
<version>24.10</version>
42+
<version>24.11</version>
4343
<classifier>gridweb-jakarta</classifier>
4444
</dependency>
4545
</dependencies>

‎Examples.GridWeb/springdemo/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.aspose.gridweb</groupId>
77
<artifactId>gridwebspringdemo</artifactId>
8-
<version>24.10</version>
8+
<version>24.11</version>
99
<name>gridweb-spring-demo</name>
1010
<description>gridweb spring demo</description>
1111
<packaging>jar</packaging>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>com.aspose</groupId>
6161
<artifactId>aspose-cells</artifactId>
62-
<version>24.10</version>
62+
<version>24.11</version>
6363
<classifier>gridweb</classifier>
6464
</dependency>
6565
<!-- <dependency>

0 commit comments

Comments
 (0)