gridjs-spreadsheet 25.12.1 → 26.1.0

package/example/.classpath

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

package/example/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Examples.GridJs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

package/example/pom.xml

@@ -17,7 +17,7 @@
 	</repositories>
 	<groupId>com.aspose.gridjs</groupId>
 	<artifactId>gridjsdemo</artifactId>
-	<version>25.12</version>
+	<version>26.1</version>
 	<name>gridjsdemo</name>
 	<description>GridJs Demo project for Spring Boot</description>
 	<properties>
@@ -48,17 +48,17 @@
           <artifactId>gson</artifactId>  
            <version>2.9.0</version> <!-- 使用你需要的Gson版本 -->  
 		 </dependency>  
-		 <dependency>  
+	   <dependency>  
   			<groupId>com.aspose</groupId>  
  			<artifactId>aspose-cells</artifactId>  
- 			<version>25.12</version> 
- 	    </dependency> 
-        <dependency>  
+ 			<version>26.1</version> 
+ 	    </dependency>  
+       <dependency>  
   			<groupId>com.aspose</groupId>  
  			<artifactId>aspose-cells</artifactId>  
- 			<version>25.12</version> 
+ 			<version>26.1</version> 
  			<classifier>gridjs</classifier>  
- 	    </dependency>
+ 	    </dependency>  
 	<!--	<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-docker-compose</artifactId>
@@ -74,7 +74,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-		</dependency>
+    </dependency>
 	</dependencies>
 
 	<build>

package/example/src/main/resources/application.properties

@@ -2,12 +2,16 @@ spring.application.name=gridjsdemo
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
+#for local test
 #testconfig.ListDir=D:\\codebase\\customerissue\\wb\\tempfromdownload\\
-#for linux
+#testconfig.FileName=excelColumnWordBreak.xlsm
+#testconfig.CachePath=F:\\storage\\gridjs_temp
+#testconfig.UploadPath=F:\\storage\\upload
+#testconfig.AsposeLicensePath=F:\\aspose.lic
+#for docker linux
 testconfig.ListDir=/app/wb
-testconfig.FileName=chart.xlsx
+testconfig.FileName=controls.xlsx
 testconfig.CachePath=/app/grid_cache
 testconfig.UploadPath=/app/upload
 testconfig.AsposeLicensePath=/app/license
- 
 

package/example/src/main/resources/templates/fileFromUpload.html

@@ -5,23 +5,24 @@
     <meta name="viewport" content="width=device-width" />
     <title>gridjs-web-demo</title>
 
-    <style>
-        ::-webkit-scrollbar, ::-webkit-scrollbar-button {
-            width: 8px;
-            height: 8px;
-        }
+<style>
+::-webkit-scrollbar, ::-webkit-scrollbar-button {
+	width: 8px;
+	height: 8px;
+}
 
-        ::-webkit-scrollbar-track {
-            -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-            border-radius: 10px;
-            background-color: #FFF;
-        }
+::-webkit-scrollbar-track {
+	-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+	border-radius: 10px;
+	background-color: #FFF;
+}
+
+::-webkit-scrollbar-thumb {
+	border-radius: 10px;
+	-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+	background-color: #AAA;
+}
 
-        ::-webkit-scrollbar-thumb {
-            border-radius: 10px;
-            -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
-            background-color: #AAA;
-        }
 html, body {
 	margin: 0;
 	padding: 0;
@@ -42,8 +43,8 @@ html, body {
 	height: 100%;
 	object-fit: contain; /* 对于图像或视频很有用 */
 }
-    </style>
-    <!--<link rel="stylesheet" href="./quantumui.min.22.5.5.2.css?v=20220312" />-->
+</style>
+<!--<link rel="stylesheet" href="./quantumui.min.22.5.5.2.css?v=20220312" />-->
     <link rel="stylesheet" href="/xspread/bootstrap.min.22.5.5.2.css?v=20220315" />
     <script src="/xspread/jquery-2.1.1.js"></script>
     <link rel="stylesheet" href="/xspread/jquery-ui.min.css" />

package/example/src/main/resources/templates/index.html

@@ -52,7 +52,7 @@ html, body {
     <!--    <script src="vconsole.min.js"></script> -->
     <!--for local reference-->
     <!--
-     <link rel="stylesheet" href="/xspread/xspreadsheet.css?v=20230525" />
+  <link rel="stylesheet" href="/xspread/xspreadsheet.css?v=20230525" />
      <script src="/xspread/xspreadsheet.js?v=20230525"></script>
      -->
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gridjs-spreadsheet",
-  "version": "25.12.1",
+  "version": "26.1.0",
   "description": "this is the client side script for GridJs which is a lightweight, scalable, and customizable toolkit that provides cross-platform web applications, enables convenient development for editing or viewing Excel/Spreadsheet files, offers simple deployment, and provides easy-to-use APIs based on JSON format.",
   "types": "index.d.ts",
   "main": "xspreadsheet.js",

package/readme.md

@@ -127,7 +127,6 @@ const s = new Spreadsheet("#gridjs-demo")
   showToolbar: true,
   showGrid: true,
   showContextmenu: true,
-  local: 'en',
   view: {
     height: () => document.documentElement.clientHeight,
     width: () => document.documentElement.clientWidth,
@@ -164,11 +163,11 @@ const s = new Spreadsheet("#gridjs-demo")
 
 ## Bind events
 ```javascript
-// single selection
+//single selection
 xs.on('cell-selected', (cell, ri, ci) => {});
-// range selection
+//range selection
 xs.on('cells-selected', (cell, { sri, sci, eri, eci }) => {});
-// shape/image selection
+//shape/image selection
 xs.on('object-selected', (obj) => {  console.log('obj id:', obj.id, ', type: ', obj.type); })
 // edited on cell
 xs.on('cell-edited', (text, ri, ci) => {});
@@ -353,7 +352,7 @@ v25.8:
 
 v25.9: 
 
-- Support to render pattern style for cell 
+- Support to render pattern style for cell
 
 v25.10: 
 
@@ -370,6 +369,11 @@ v25.12:
 - Support sort by cell color/font color
 - Support add multiple selection validation list
 
+v26.1: 
+
+- Support highlight text with rotation 
+- Support more charts rendering in client 
+
 ## License
 
 MIT

package/xspreadsheet.css

@@ -291,6 +291,19 @@ body {
 .x-spreadsheet-dropdown .x-spreadsheet-dropdown-header .x-spreadsheet-icon.arrow-right .arrow-down {
   left: -130px;
 }
+.x-spreadsheet-dropdown.x-spreadsheet-dropdown-insert-image .x-spreadsheet-dropdown-content {
+  padding: 6px 0;
+}
+.x-spreadsheet-dropdown.x-spreadsheet-dropdown-insert-image .x-spreadsheet-item label {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  cursor: pointer;
+  font-weight: inherit;
+  font-size: inherit;
+  color: inherit;
+}
 .x-spreadsheet-autofill-option-group {
   background-color: white;
   position: absolute;
@@ -1440,6 +1453,25 @@ body {
     margin: 0 -16px -8px;
   }
 }
+.x-spreadsheet-modal-insert-url .x-spreadsheet-form-fields {
+  flex-direction: column;
+  align-items: stretch;
+  width: 100%;
+}
+.x-spreadsheet-modal-insert-url .x-spreadsheet-form-field {
+  width: 100%;
+  margin-left: 0;
+}
+.x-spreadsheet-modal-insert-url .x-spreadsheet-form-input {
+  width: 100%;
+  display: flex;
+}
+.x-spreadsheet-modal-insert-url .x-spreadsheet-form-input input {
+  width: 100%;
+}
+.x-spreadsheet-modal-insert-url .x-spreadsheet-buttons {
+  margin-top: 8px;
+}
 .x-spreadsheet-dimmer {
   display: none;
   position: absolute;