diff --git a/backend/src/main/java/io/dataease/commons/utils/HttpClientUtil.java b/backend/src/main/java/io/dataease/commons/utils/HttpClientUtil.java
index fb71455a64..70565fed75 100755
--- a/backend/src/main/java/io/dataease/commons/utils/HttpClientUtil.java
+++ b/backend/src/main/java/io/dataease/commons/utils/HttpClientUtil.java
@@ -86,9 +86,6 @@ public class HttpClientUtil {
             for (String key : header.keySet()) {
                 httpGet.addHeader(key, header.get(key));
             }
-
-            httpGet.addHeader(HTTP.CONTENT_ENCODING, config.getCharset());
-
             HttpResponse response = httpClient.execute(httpGet);
             return getResponseStr(response, config);
         } catch (Exception e) {
@@ -124,9 +121,6 @@ public class HttpClientUtil {
             for (String key : header.keySet()) {
                 httpPost.addHeader(key, header.get(key));
             }
-            httpPost.addHeader(HTTP.CONTENT_TYPE, "application/json");
-            httpPost.addHeader(HTTP.CONTENT_ENCODING, config.getCharset());
-
             EntityBuilder entityBuilder = EntityBuilder.create();
             entityBuilder.setText(json);
             entityBuilder.setContentType(ContentType.APPLICATION_JSON);
@@ -180,8 +174,6 @@ public class HttpClientUtil {
             for (String key : header.keySet()) {
                 httpPost.addHeader(key, header.get(key));
             }
-            httpPost.addHeader(HTTP.CONTENT_ENCODING, config.getCharset());
-
             if (body != null && body.size() > 0) {
                 List<NameValuePair> nvps = new ArrayList<>();
                 for (String key : body.keySet()) {
diff --git a/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java b/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
index f613541175..bae7ae9fba 100644
--- a/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
+++ b/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
@@ -62,11 +62,11 @@ public class DorisDDLProvider extends DDLProviderImpl {
             }
             switch (datasetTableField.getDeExtractType()) {
                 case 0:
-                    Column_Fields.append("varchar(length)".replace("length", String.valueOf(size))).append(",`");
+                    Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
                     break;
                 case 1:
                     size  = size < 50? 50 : size;
-                    Column_Fields.append("varchar(length)".replace("length", String.valueOf(size))).append(",`");
+                    Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
                     break;
                 case 2:
                     Column_Fields.append("bigint").append(",`");
@@ -78,7 +78,7 @@ public class DorisDDLProvider extends DDLProviderImpl {
                     Column_Fields.append("TINYINT(length)".replace("length", String.valueOf(size))).append(",`");
                     break;
                 default:
-                    Column_Fields.append("varchar(length)".replace("length", String.valueOf(size))).append(",`");
+                    Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
                     break;
             }
         }
diff --git a/frontend/src/components/ElVisualSelect/index.vue b/frontend/src/components/ElVisualSelect/index.vue
index e97ac20409..87b6183616 100644
--- a/frontend/src/components/ElVisualSelect/index.vue
+++ b/frontend/src/components/ElVisualSelect/index.vue
@@ -3,7 +3,7 @@
     ref="visualSelect"
     v-model="selectValue"
     :class="classId"
-    popper-class="VisualSelects"
+    popper-class="VisualSelects coustom-de-select"
     no-match-text=" "
     v-bind="$attrs"
     v-on="$listeners"
diff --git a/frontend/src/components/canvas/components/Editor/EditBarView.vue b/frontend/src/components/canvas/components/Editor/EditBarView.vue
index 4131ff84cd..3a7aab4566 100644
--- a/frontend/src/components/canvas/components/Editor/EditBarView.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBarView.vue
@@ -7,6 +7,9 @@
       <span :title="$t('panel.details')">
         <i class="icon iconfont icon-chakan" @click.stop="showViewDetails('details')" />
       </span>
+      <span :title="$t('panel.enlarge')">
+        <i class="icon iconfont icon-fangda" @click.stop="showViewDetails('enlarge')" />
+      </span>
     </div>
     <div v-if="positionCheck('multiplexing')" style="margin-right: -1px;width: 18px;z-index: 5">
       <el-checkbox v-model="multiplexingCheckModel" size="medium" @change="multiplexingCheck" />
@@ -88,7 +91,7 @@ export default {
       this.$emit('amRemoveItem')
     },
     showViewDetails(params) {
-      this.$emit('showViewDetails', params)
+      this.$emit('showViewDetails', { openType: params })
     },
     positionCheck(position) {
       return this.showPosition.includes(position)
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 65f1bda35c..3c33311250 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -185,8 +185,9 @@ export default {
       return this.$store.state.panel.mainActiveName
     },
     showUnpublishedArea() {
-      // return this.panelInfo.status === 'unpublished'
-      if (this.panelInfo && this.panelInfo.showType === 'view') {
+      if (this.showPosition === 'edit') {
+        return false
+      } else if (this.panelInfo && this.panelInfo.showType === 'view') {
         return false
       } else if ((this.mainActiveName === 'PanelMain' && this.activeTab === 'PanelList') || this.showPosition.includes('multiplexing')) {
         return this.panelInfo.status === 'unpublished' && !hasDataPermission('manage', this.panelInfo.privileges)
diff --git a/frontend/src/components/canvas/custom-component/UserViewDialog.vue b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
index ec0c4557d6..ce8a4e8a09 100644
--- a/frontend/src/components/canvas/custom-component/UserViewDialog.vue
+++ b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
@@ -12,9 +12,10 @@
           />
           <chart-component v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'" class="chart-class" :chart="mapChart || chart" />
           <chart-component-g2 v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'antv'" class="chart-class" :chart="chart" />
-          <chart-component-s2 v-else-if="chart.type === 'table-pivot' && renderComponent() === 'antv'" class="chart-class" :chart="chart" />
+          <chart-component-s2 v-else-if="chart.type.includes('table') && renderComponent() === 'antv'" class="chart-class" :chart="chart" />
           <label-normal v-else-if="chart.type.includes('text')" :chart="chart" class="table-class" />
           <label-normal-text v-else-if="chart.type === 'label'" :chart="chart" class="table-class" />
+          <table-normal v-else-if="chart.type.includes('table') && renderComponent() === 'echarts'" :chart="chart" class="table-class" />
         </div>
       </div>
     </de-main-container>
@@ -67,7 +68,7 @@ export default {
   },
   computed: {
     isAbsoluteContainer() {
-      return this.chart.type === 'symbol-map'
+      return this.showChartCanvas && this.chart.type === 'symbol-map'
     },
     showChartCanvas() {
       return this.openType === 'enlarge'
diff --git a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
index e2e64eacb3..6707f530c7 100644
--- a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
@@ -14,6 +14,7 @@ const dialogPanel = {
       placeholder: 'denumberselect.placeholder',
       datas: [],
       viewIds: [],
+      parameters: [],
       key: 'id',
       label: 'text',
       value: 'id',
diff --git a/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue b/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
index 5804cfc1f5..975c7aefe9 100644
--- a/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
@@ -46,7 +46,7 @@
                 <el-input v-model="axisForm.axisValue.min" @blur="changeXAxisStyle('axisValue')" />
               </el-form-item>
               <el-form-item :label="$t('chart.axis_value_max')" class="form-item">
-                <el-input @blur="changeXAxisStyle('axisValue')" />
+                <el-input v-model="axisForm.axisValue.max" @blur="changeXAxisStyle('axisValue')" />
               </el-form-item>
               <el-form-item :label="$t('chart.axis_value_split_count')" class="form-item">
                 <el-input v-model="axisForm.axisValue.splitCount" @blur="changeXAxisStyle('axisValue')" />
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index d3c277b08b..753e823ac7 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -49,10 +49,11 @@
           </el-form>
         </el-col>
         <el-col :span="8">
-            <el-button   type="text" size="mini" style="float: right;" @click="variableMgm">
+          <el-row style="float: right">
+            <el-button   type="text" size="mini" @click="variableMgm">
               {{ $t('sql_variable.variable_mgm') }}
             </el-button>
-          </el-tooltip>
+          </el-row>
         </el-col>
       </el-row>
       <el-row>
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 1995bdfe1b..2cc9423b81 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -269,6 +269,7 @@
         :show-type="canvasStyleData.selfAdaption?'full':'width'"
         :canvas-style-data="canvasStyleData"
         :component-data="componentData"
+        show-position="edit"
       />
     </fullscreen>
     <input
diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index 4ea8917ac7..cadbe34d96 100644
--- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -75,7 +75,6 @@
                   class="de-checkbox"
                 >
                   <div class="span-div">
-                    <svg-icon :icon-class="item.type" class="chart-icon" />
                     <span v-if="item.variableName && item.variableName.length <= 7" style="margin-left: 6px">{{ item.variableName }}</span>
                     <el-tooltip v-else class="item" effect="dark" :content="item.variableName" placement="left">
                       <span style="margin-left: 6px">{{ item.variableName }}</span>