Merge branch 'dev' of github.com:dataease/dataease into dev

backend/src/main/java/io/dataease/base/mapper/ext/ExtPluginSysMenuMapper.xml

@@ -7,9 +7,9 @@
     </delete>
 
     <insert id="savePluginMenu">
-        INSERT INTO `plugin_sys_menu` ( menu_id, title, pid, sub_count, permission, hidden ) VALUES
+        INSERT INTO `plugin_sys_menu` ( menu_id, title, pid, sub_count, permission, hidden,i_frame ) VALUES
         <foreach collection="menuList" item="menu" index="index" separator=",">
-            (#{menu.menuId},#{menu.title},#{menu.pid},#{menu.subCount},#{menu.permission},#{menu.hidden})
+            (#{menu.menuId},#{menu.title},#{menu.pid},#{menu.subCount},#{menu.permission},#{menu.hidden},ifnull(#{menu.hidden},0))
         </foreach>
     </insert>
 

backend/src/main/resources/db/migration/V18__area_mapping.sql

@@ -1,3 +1,6 @@
+ALTER TABLE `chart_view` ADD COLUMN `ext_stack` LONGTEXT COMMENT '堆叠项' AFTER `y_axis`;
+UPDATE `chart_view` SET `ext_stack` = '[]';
+
 /*
  Navicat Premium Data Transfer
 

frontend/src/components/DeDrag/index.vue

@@ -1463,7 +1463,7 @@ export default {
 
     // 记录当前样式 矩阵处理
     recordMatrixCurStyle() {
-      debugger
+      // debugger
       const left = Math.round(this.left / this.curCanvasScale.matrixStyleWidth) * this.curCanvasScale.matrixStyleWidth
       const top = Math.round(this.top / this.curCanvasScale.matrixStyleHeight) * this.curCanvasScale.matrixStyleHeight
       const width = Math.round(this.width / this.curCanvasScale.matrixStyleWidth) * this.curCanvasScale.matrixStyleWidth

frontend/src/components/dataease/DeOutWidget.vue

@@ -151,8 +151,7 @@ export default {
   }
   .first-element-contaner {
       width: calc(100% - 10px);
-      background: #fff;
-      border: 1px solid #d7dae2;
+      background: initial;
       position:absolute;
       bottom: 5px;
       margin: 0 4px;
@@ -161,6 +160,8 @@ export default {
       }
   }
   .first-element-grid-contaner {
+      background: #fff;
+      border: 1px solid #d7dae2;
       top: 5px;
   }
   .condition-main-line {

frontend/src/views/panel/filter/index.vue

@@ -232,7 +232,7 @@ export default {
       height: 24px;
       position: relative;
       flex-shrink: 0;
-      font-size: 24px;
+      font-size: 24px !important;
       margin: auto;
       font-family: fineui;
       font-style: normal;