gridjs-spreadsheet 26.2.0 → 26.3.0

package/{518518e5b3ddfea43df2735d38d6dc0d.svg → 04b2e68c4fe0eea3f5308869edc690fd.svg}

@@ -27,8 +27,8 @@
    inkscape:pagecheckerboard="0"
    showgrid="false"
    inkscape:zoom="2.4975152"
-   inkscape:cx="48.448154"
-   inkscape:cy="109.10845"
+   inkscape:cx="91.691134"
+   inkscape:cy="92.291731"
    inkscape:window-width="1296"
    inkscape:window-height="732"
    inkscape:window-x="221"
@@ -984,7 +984,15 @@
      fill="currentColor"
      d="m -177.47907,33.116585 -1.44802,-0.836618 a 4.4058613,2.5149 0 0 1 4.09683,-1.592603 c 2.43691,0 4.4147,1.128933 4.4147,2.519941 v 1.007974 h 0.88294 a 1.7658763,1.0079759 0 0 1 1.76587,1.007978 v 3.427118 l -1.76587,-1.007976 v -2.419142 h -4.23811 l -1.76588,-1.007978 h 3.35517 v -1.007974 c 0,-0.836621 -1.18314,-1.511965 -2.64882,-1.511965 -1.40387,0 -2.55168,0.629984 -2.64881,1.421245 m 11.57532,7.882374 -1.12133,0.640064 -1.21845,-0.695504 c -0.31786,0.2016 -0.77699,0.327592 -1.28909,0.327592 h -10.59527 a 1.7658763,1.0079759 0 0 1 -1.76587,-1.007976 v -5.039878 c 0,-0.559429 0.78581,-1.007978 1.76587,-1.007978 h 0.0971 l -4.41469,-2.519939 1.13016,-0.640064 z m -3.62887,-0.791262 -3.6642,-2.091549 c -0.25606,0.383029 -0.89177,0.635024 -1.63344,0.635024 a 1.7658763,1.0079759 0 0 1 -1.76587,-1.007976 c 0,-0.428389 0.44147,-0.786221 1.1125,-0.932379 l -2.78125,-1.58756 h -1.86301 v 5.039878 h 10.59527 z"
      id="path1-7938"
-     style="stroke-width:0.667076" /></g>&#10;<g
+     style="stroke-width:0.667076" /><path
+     fill="currentColor"
+     d="m -148.58116,32.667582 a 1.0504391,0.57613469 0 0 1 -1.36631,-0.875302 l 2.44983,-1.151712 a 1.0499309,0.57585595 0 0 1 1.36632,0 l 2.44984,1.151712 a 1.0504423,0.5761365 0 1 1 -1.36632,0.875302 l -1.76667,-0.831536 z m -5.93281,-0.821555 a 1.0499309,0.57585595 0 0 0 -0.97154,0.357799 l -6.29958,8.445887 a 1.0499309,0.57585595 0 0 0 1.94307,0.436115 l 2.02427,-2.713433 h 6.60756 l 2.02426,2.713433 a 1.0499309,0.57585595 0 1 0 1.94309,-0.436115 l -6.2996,-8.445887 a 1.0499309,0.57585595 0 0 0 -0.97153,-0.357799 m 0,2.096116 2.44424,3.27854 h -4.88708 z"
+     id="path1-79380"
+     style="stroke-width:1.03676" /><path
+     fill="currentColor"
+     d="m -127.19031,30.60002 a 1.0926776,0.60820839 0 1 0 -1.36584,0.948805 l 2.73169,1.216417 a 1.0926776,0.60820839 0 0 0 1.36585,0 l 2.73169,-1.216417 a 1.0926776,0.60820839 0 0 0 -1.36585,-0.948805 l -2.04877,0.912312 z m -5.05362,1.082611 a 1.0926776,0.60820839 0 0 1 1.00525,0.368575 l 6.55497,8.514917 a 1.0926776,0.60820839 0 0 1 -2.00833,0.479268 l -2.05752,-2.672468 h -6.98875 l -2.05643,2.672468 a 1.0926776,0.60820839 0 0 1 -2.00834,-0.479268 l 6.55607,-8.514917 a 1.0926776,0.60820839 0 0 1 1.00308,-0.368575 m 0,2.15245 -2.55687,3.320817 h 5.11372 z"
+     id="path1-52"
+     style="stroke-width:0.815216" /></g>&#10;<g
    id="gchecksyntax"
    transform="matrix(0.0135 ,0,0,0.0135 ,18.5,108)">&#10;	  <path
    d="M189.44 5.632c-37.888 6.144-96.256 35.328-122.368 61.44-26.624 27.136-55.296 84.992-61.44 126.464-10.24 64.512 10.24 127.488 58.88 179.712 49.152 53.248 108.544 76.8 176.64 70.144 107.008-9.728 185.344-83.968 200.704-189.44C462.848 108.544 334.848-17.408 189.44 5.632z m-5.12 115.712l40.96 38.912 40.448-38.912c34.304-33.792 43.008-39.424 57.856-39.424 31.232 0 51.712 35.84 35.84 64-3.072 5.632-20.48 25.088-38.912 43.008l-33.28 33.28 37.888 39.424c20.48 21.504 38.4 45.056 39.424 51.712 5.12 31.232-20.48 56.832-51.2 51.2-7.168-1.536-30.72-19.456-52.224-39.936l-38.912-37.376-33.28 33.28c-17.92 18.432-37.376 35.84-43.008 38.912-28.16 15.872-64-4.608-64-35.84 0-14.848 5.632-23.552 39.424-57.856l38.912-40.448-38.912-40.96C87.04 148.992 81.92 140.8 81.92 125.44c0-24.064 19.968-43.52 44.544-43.52 14.336 0 23.552 6.144 57.856 39.424zM512 119.808v53.248l119.296 2.048c118.784 1.536 118.784 1.536 148.48 15.872C838.656 220.16 849.92 254.976 849.92 405.504V512h107.52V372.736c0-157.184-3.072-176.64-34.816-224.256-11.264-16.896-30.208-35.84-47.104-47.104-47.616-31.744-67.072-34.816-224.256-34.816H512v53.248zM66.56 651.264c0 157.184 3.072 176.64 34.816 224.256 11.264 16.896 30.208 35.84 47.104 47.104 47.616 31.744 67.072 34.816 224.256 34.816H512v-107.52H406.016c-151.04 0-185.856-11.264-215.04-70.144-14.336-29.696-14.336-29.696-15.872-148.992l-2.048-118.784H66.56v139.264zM752.64 584.192c-29.184 5.632-79.872 31.232-100.864 51.2-40.448 37.376-66.048 90.112-71.168 147.456-6.144 65.536 18.432 128 70.144 177.152 68.608 65.536 160.256 78.848 248.32 35.84 46.08-22.528 74.24-50.688 96.768-96.768 82.432-168.96-57.856-350.72-243.2-314.88z m193.024 118.272c14.336 16.384 17.408 27.648 11.264 44.032-7.168 18.944-156.672 168.96-177.152 178.176-25.088 10.752-42.496 1.024-94.72-52.736-50.176-51.712-53.76-61.952-31.744-88.064 10.24-12.288 17.408-15.872 31.232-15.872 14.336 0 23.04 5.12 48.128 29.184l30.72 29.184 68.096-67.584c60.928-60.928 69.632-67.584 86.016-67.584 11.776 0 20.992 3.584 28.16 11.264z"
@@ -1058,4 +1066,14 @@
    font-family="sans-serif"
    font-size="5px"
    fill="#FFFFFF"
-   id="text54">A?Ω</text>&#10;</g>&#10;&#10;&#10;   </svg>
+   id="text54">A?Ω</text>&#10;</g>&#10;
+   <g id="addRedaction" transform="matrix(0.3933,0,0,0.3933,72,124)">
+    <rect x="9" y="9" width="36" height="36" fill="#E53935" rx="4" ry="4"/>
+    <line x1="9" y1="9" x2="45" y2="45" stroke="#FFFFFF" stroke-width="4" stroke-linecap="round"/>
+    <rect x="17" y="24" width="20" height="6" fill="#FFFFFF"/>
+    <rect x="24" y="17" width="6" height="20" fill="#FFFFFF"/>
+  </g>
+&#10;
+<g  id="redactionViewSwitch" transform="matrix(0.3833,0,0,0.3833,90,126)"><rect x="8" y="8" width="36" height="36" fill="none" stroke="#4A90E2" stroke-width="2" stroke-dasharray="4 2"/><path d="M18,27 C18,21 36,21 36,27 C36,33 18,33 18,27 Z" fill="none" stroke="#4A90E2" stroke-width="2" stroke-linecap="round"/><circle cx="27" cy="27" r="5" fill="#4A90E2"/></g>
+&#10;
+   &#10;&#10;   </svg>

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>26.2</version>
+	<version>26.3</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>26.2</version> 
- 	    </dependency> 
-        <dependency>  
+ 			<version>26.3</version> 
+ 	    </dependency>  
+       <dependency>  
   			<groupId>com.aspose</groupId>  
  			<artifactId>aspose-cells</artifactId>  
- 			<version>26.2</version> 
+ 			<version>26.3</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

@@ -14,5 +14,4 @@ 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": "26.2.0",
+  "version": "26.3.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

@@ -163,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) => {});
@@ -352,7 +352,7 @@ v25.8:
 
 v25.9: 
 
-- Support to render pattern style for cell 
+- Support to render pattern style for cell
 
 v25.10: 
 
@@ -378,6 +378,10 @@ v26.2:
 
 - Improve client performance for large rows
 
+v26.2: 
+
+- Improve filter/validations/charts
+
 
 ## License
 

package/xspreadsheet.css

@@ -1352,13 +1352,13 @@ body {
 }
 .x-spreadsheet-form-fields .x-spreadsheet-form-field .label {
   display: inline-block;
-  margin: 0 10px 0 0;
+  margin: 0 5px 0 0;
   color: rgba(0, 0, 0, 0.87);
 }
 .x-spreadsheet-form-field {
   display: block;
-  margin-left: 10px;
-  margin-bottom: 10px;
+  margin-left: 6px;
+  margin-bottom: 6px;
 }
 .x-spreadsheet-form-field:first-child {
   margin-left: 0;
@@ -1671,7 +1671,7 @@ form fieldset select {
   display: inline-block;
 }
 .x-spreadsheet-icon .x-spreadsheet-icon-img {
-  background-image: url(518518e5b3ddfea43df2735d38d6dc0d.svg);
+  background-image: url(04b2e68c4fe0eea3f5308869edc690fd.svg);
   position: absolute;
   width: 262px;
   height: 444px;
@@ -1765,6 +1765,14 @@ form fieldset select {
   left: -36px;
   top: -108px;
 }
+.x-spreadsheet-icon .x-spreadsheet-icon-img.redactionAdd {
+  left: -72px;
+  top: -126px;
+}
+.x-spreadsheet-icon .x-spreadsheet-icon-img.redactionViewSwitch {
+  left: -90px;
+  top: -126px;
+}
 .x-spreadsheet-icon .x-spreadsheet-icon-img.autofilter {
   left: -90px;
   top: -18px;
@@ -2065,6 +2073,14 @@ form fieldset select {
   left: -18px;
   top: -126px;
 }
+.x-spreadsheet-icon .x-spreadsheet-icon-img.increase-font-size {
+  left: -36px;
+  top: -126px;
+}
+.x-spreadsheet-icon .x-spreadsheet-icon-img.decrease-font-size {
+  left: -54px;
+  top: -126px;
+}
 .x-spreadsheet-formula-bar {
   height: 25px;
   line-height: 25px;