Merge branch 'lowcoder-org:dev' into dev

Author: MenamAfzal

client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx

@@ -277,15 +277,15 @@ const TEXT = {
 const STATIC_TEXT = {
   name: "staticText",
   label: trans("style.staticText"),
-  depTheme: "canvas",
+  depTheme: "primarySurface",
   depType: DEP_TYPE.CONTRAST_TEXT,
   transformer: contrastText,
 } as const;
 
 const LABEL = {
   name: "label",
   label: trans("label"),
-  depTheme: "canvas",
+  depTheme: "primarySurface",
   depType: DEP_TYPE.CONTRAST_TEXT,
   transformer: contrastText,
 } as const;
@@ -562,7 +562,7 @@ function replaceAndMergeMultipleStyles(originalArray: any[], styleToReplace: str
 }
 
 export const ButtonStyle = [
-  getBackground('primary'),
+  getBackground(),
   ...STYLING_FIELDS_SEQUENCE
 ] as const;
 
@@ -1304,14 +1304,7 @@ function handleToHoverLink(color: string) {
 }
 
 export const LinkStyle = [
-
-  {
-    name: "background",
-    label: trans("style.background"),
-    depTheme: "canvas",
-    depType: DEP_TYPE.SELF,
-    transformer: toSelf,
-  },
+  getBackground(),
   ...replaceAndMergeMultipleStyles(STYLING_FIELDS_SEQUENCE, 'text', [...LinkTextStyle])
 ] as const;
 

server/api-service/lowcoder-server/pom.xml

@@ -270,6 +270,26 @@
 						<configuration>
 							<outputDirectory>${assembly.lib.directory}</outputDirectory>
 							<includeScope>runtime</includeScope>
+							<excludeArtifactIds>rjson</excludeArtifactIds>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-rjson-snapshot</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>tv.twelvetone.rjson</groupId>
+									<artifactId>rjson</artifactId>
+									<version>LATEST</version>
+									<overWrite>true</overWrite>
+									<outputDirectory>${assembly.lib.directory}</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+							<useBaseVersion>false</useBaseVersion>
 						</configuration>
 					</execution>
 				</executions>