diff --git a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
index 5c6cc33712..cd1af62e89 100644
--- a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
@@ -1158,11 +1158,11 @@ public class DorisQueryProvider extends QueryProvider {
             case "y":
                 return "%Y";
             case "y_Q":
-                return "CONCAT(%s,'" + split + "',%s)";
+                return "CONCAT(%s,'" + split + "','Q',%s)";
             case "y_M":
                 return "%Y" + split + "%m";
             case "y_W":
-                return "%Y" + split + "%u";
+                return "%Y" + split + "W%u";
             case "y_M_d":
                 return "%Y" + split + "%m" + split + "%d";
             case "H_m_s":
diff --git a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
index 070dc44f76..3caac20d8f 100644
--- a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
@@ -1145,11 +1145,11 @@ public class MysqlQueryProvider extends QueryProvider {
             case "y":
                 return "%Y";
             case "y_Q":
-                return "CONCAT(%s,'" + split + "',%s)";
+                return "CONCAT(%s,'" + split + "','Q',%s)";
             case "y_M":
                 return "%Y" + split + "%m";
             case "y_W":
-                return "%Y" + split + "%u";
+                return "%Y" + split + "W%u";
             case "y_M_d":
                 return "%Y" + split + "%m" + split + "%d";
             case "H_m_s":
diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
index 1d6d357b7e..bad34ddb82 100644
--- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
@@ -1178,11 +1178,11 @@ public class MysqlQueryProvider extends QueryProvider {
             case "y":
                 return "%Y";
             case "y_Q":
-                return "CONCAT(%s,'" + split + "',%s)";
+                return "CONCAT(%s,'" + split + "','Q',%s)";
             case "y_M":
                 return "%Y" + split + "%m";
             case "y_W":
-                return "%Y" + split + "%u";
+                return "%Y" + split + "W%u";
             case "y_M_d":
                 return "%Y" + split + "%m" + split + "%d";
             case "H_m_s":
diff --git a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
index 4d5db44726..f71fb3d4dd 100644
--- a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
@@ -899,7 +899,7 @@ public class SqlserverQueryProvider extends QueryProvider {
             } else if (StringUtils.equalsIgnoreCase(item.getTerm(), "not_empty")) {
                 whereValue = "''";
             } else if (StringUtils.containsIgnoreCase(item.getTerm(), "in") || StringUtils.containsIgnoreCase(item.getTerm(), "not in")) {
-                if(field.getType().equals("NVARCHAR")){
+                if(field.getType().equalsIgnoreCase("NVARCHAR")){
                     whereValue =  Arrays.asList(value.split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
                 }else {
                     whereValue = "('" + String.join("','", value.split(",")) + "')";
@@ -907,7 +907,7 @@ public class SqlserverQueryProvider extends QueryProvider {
             } else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) {
                 whereValue = "'%" + value + "%'";
             } else {
-                if(field.getType().equals("NVARCHAR")){
+                if(field.getType().equalsIgnoreCase("NVARCHAR")){
                     whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value);
                 }else {
                     whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value);
@@ -1034,7 +1034,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                     } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
                         whereValue = "''";
                     } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in") || StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "not in")) {
-                        if(field.getType().equals("NVARCHAR")){
+                        if(field.getType().equalsIgnoreCase("NVARCHAR")){
                             whereValue =  Arrays.asList(value.split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
                         }else {
                             whereValue = "('" + String.join("','", value.split(",")) + "')";
@@ -1042,7 +1042,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                     } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
                         whereValue = "'%" + value + "%'";
                     } else {
-                        if(field.getType().equals("NVARCHAR")){
+                        if(field.getType().equalsIgnoreCase("NVARCHAR")){
                             whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value);
                         }else {
                             whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value);
@@ -1146,7 +1146,7 @@ public class SqlserverQueryProvider extends QueryProvider {
             String whereValue = "";
 
             if (StringUtils.containsIgnoreCase(request.getOperator(), "in")) {
-                if(request.getDatasetTableField().getType().equals("NVARCHAR")){
+                if(request.getDatasetTableField().getType().equalsIgnoreCase("NVARCHAR")){
                     whereValue =  value.stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
                 }else {
                     whereValue = "('" + StringUtils.join(value, "','") + "')";
@@ -1166,7 +1166,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 }
             } else {
 
-                if(request.getDatasetTableField().getType().equals("NVARCHAR")){
+                if(request.getDatasetTableField().getType().equalsIgnoreCase("NVARCHAR")){
                     whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value.get(0));
                 }else {
                     whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value.get(0));
@@ -1328,7 +1328,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_empty")) {
                     whereValue = "''";
                 } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
-                    if(y.getType().equals("NVARCHAR")){
+                    if(y.getType().equalsIgnoreCase("NVARCHAR")){
                         whereValue =  Arrays.asList(f.getValue().split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
                     }else {
                         whereValue = "('" + String.join("','", f.getValue().split(",")) + "')";
@@ -1336,7 +1336,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
                     whereValue = "'%" + f.getValue() + "%'";
                 } else {
-                    if(y.getType().equals("NVARCHAR")){
+                    if(y.getType().equalsIgnoreCase("NVARCHAR")){
                         whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, f.getValue());
                     }else {
                         whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, f.getValue());
diff --git a/frontend/src/api/map/map.js b/frontend/src/api/map/map.js
index 6d79a3cfbb..bbc8a2f83b 100644
--- a/frontend/src/api/map/map.js
+++ b/frontend/src/api/map/map.js
@@ -4,7 +4,7 @@ export const areaMapping = () => {
   return request({
     url: '/api/map/globalEntitys/0',
     method: 'get',
-    loading: true
+    loading: false
   })
 }
 
@@ -12,7 +12,7 @@ export const globalMapping = () => {
   return request({
     url: '/api/map/globalEntitys/0',
     method: 'get',
-    loading: true
+    loading: false
   })
 }
 
@@ -21,7 +21,7 @@ export function geoJson(areaCode) {
   return request({
     url: '/geo/full/' + countryCode + '/' + areaCode + '_full.json',
     method: 'get',
-    loading: true
+    loading: false
   })
 }
 
diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue
index 47b96e2c9c..9b5a2d2d5d 100644
--- a/frontend/src/components/deDrag/index.vue
+++ b/frontend/src/components/deDrag/index.vue
@@ -1544,8 +1544,6 @@ export default {
         } else {
           this.element.style.left = 0
           this.element.style.top = 0
-          this.element.style.width = this.element.style.width * this.curCanvasScaleSelf.matrixStyleWidth / targetCanvasScale.matrixStyleWidth
-          this.element.style.height = this.element.style.height * this.curCanvasScaleSelf.matrixStyleHeight / targetCanvasScale.matrixStyleHeight
         }
         this.element.canvasId = targetCanvasId
       }