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

backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java

@@ -59,8 +59,13 @@ public class AuthUserServiceImpl implements AuthUserService {
     @Cacheable(value = AuthConstants.USER_PERMISSION_CACHE_NAME,  key = "'user' + #userId" )
     @Override
     public List<String> permissions(Long userId){
+        try {
             // 用户登录获取菜单权限时同时更新插件菜单表
             dynamicMenuService.syncPluginMenu();
+        }catch (Exception e){
+            LogUtil.error(e);
+            //ignore
+        }
         List<String> permissions;
         SysUser sysUser = sysUserMapper.selectByPrimaryKey(userId);
         if(sysUser.getIsAdmin()!=null&&sysUser.getIsAdmin()){

backend/src/main/java/io/dataease/service/panel/PanelGroupService.java

@@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -69,6 +70,7 @@ public class PanelGroupService {
         return result;
     }
 
+    @Transactional
     public PanelGroup saveOrUpdate(PanelGroupRequest request) {
         String panelId = request.getId();
         if (StringUtils.isEmpty(panelId)) {
@@ -90,6 +92,7 @@ public class PanelGroupService {
             newDefaultPanel.setPid(PanelConstants.PANEL_GATHER_DEFAULT_PANEL);
             newDefaultPanel.setLevel(0);
             newDefaultPanel.setSource(request.getId());
+            newDefaultPanel.setCreateBy(AuthUtils.getUser().getUsername());
             checkPanelName(newDefaultPanel.getName(), newDefaultPanel.getPid(), PanelConstants.OPT_TYPE_INSERT, newDefaultPanel.getId());
             panelGroupMapper.insertSelective(newDefaultPanel);
         } else {
@@ -105,6 +108,9 @@ public class PanelGroupService {
         authRequest.setId(panelId);
         authRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
         List<PanelGroupDTO> panelGroupDTOList = extPanelGroupMapper.panelGroupList(authRequest);
+        if(CollectionUtils.isNotEmpty(panelGroupDTOList)){
+            DataEaseException.throwException("未查询到用户对应的资源权限，请尝试刷新重新保存");
+        }
 
         return panelGroupDTOList.get(0);
     }

frontend/.eslintrc.js

@@ -195,6 +195,9 @@ module.exports = {
     'object-curly-spacing': [2, 'always', {
       objectsInObjects: false
     }],
-    'array-bracket-spacing': [2, 'never']
+    'array-bracket-spacing': [2, 'never'],
+    "vue/no-use-v-if-with-v-for": ["error", {
+      "allowUsingIterationVar": true
+    }]
   }
 }

frontend/src/components/DeDrag/index.vue

@@ -20,14 +20,14 @@
     @mouseleave="leave"
   >
     <div
-      v-for="(handle, index) in actualHandles"
-      :key="index"
-      :class="[classNameHandle, classNameHandle + '-' + handle]"
-      :style="handleStyle(handle, index)"
-      @mousedown.stop.prevent="handleDown(handle, $event)"
-      @touchstart.stop.prevent="handleTouchDown(handle, $event)"
+      v-for="(handlei, indexi) in actualHandles"
+      :key="indexi"
+      :class="[classNameHandle, classNameHandle + '-' + handlei]"
+      :style="handleStyle(handlei, indexi)"
+      @mousedown.stop.prevent="handleDown(handlei, $event)"
+      @touchstart.stop.prevent="handleTouchDown(handlei, $event)"
     >
-      <slot :name="handle" />
+      <slot :name="handlei" />
     </div>
     <slot />
   </div>
@@ -282,14 +282,17 @@ export default {
       type: String,
       default: 'mouseOn'
     },
+    // eslint-disable-next-line vue/require-default-prop
     element: {
       require: true,
       type: Object
     },
+    // eslint-disable-next-line vue/require-default-prop
     defaultStyle: {
       require: true,
       type: Object
     },
+    // eslint-disable-next-line vue/require-default-prop
     index: {
       require: true,
       type: [Number, String]
@@ -299,6 +302,7 @@ export default {
       type: Boolean,
       default: true
     },
+    // eslint-disable-next-line vue/require-default-prop
     changeStyle: {
       require: true,
       type: Object
@@ -911,6 +915,7 @@ export default {
     },
     // 外部传参改动x
     moveHorizontally(val) {
+      // eslint-disable-next-line no-unused-vars
       const [deltaX, _] = snapToGrid(this.grid, val, this.top, this.scale)
       const left = restrictToBounds(deltaX, this.bounds.minLeft, this.bounds.maxLeft)
       this.left = left
@@ -918,6 +923,7 @@ export default {
     },
     // 外部传参改动y
     moveVertically(val) {
+      // eslint-disable-next-line no-unused-vars
       const [_, deltaY] = snapToGrid(this.grid, this.left, val, this.scale)
       const top = restrictToBounds(deltaY, this.bounds.minTop, this.bounds.maxTop)
       this.top = top
@@ -926,6 +932,7 @@ export default {
     // 控制柄移动
     handleResize(e) {
       const handle = this.handle
+      // eslint-disable-next-line no-unused-vars
       const scaleRatio = this.scaleRatio
       const { TL, TR, BL, BR } = this
       let { x: mouseX, y: mouseY } = this.getMouseCoordinate(e)
@@ -1085,6 +1092,7 @@ export default {
     changeWidth(val) {
       // console.log('parentWidth', this.parentWidth)
       // console.log('parentHeight', this.parentHeight)
+      // eslint-disable-next-line no-unused-vars
       const [newWidth, _] = snapToGrid(this.grid, val, 0, this.scale)
       // const right = restrictToBounds(this.parentWidth - newWidth - this.left, this.bounds.minRight, this.bounds.maxRight)
       // private 将 this.bounds.minRight 设置为0
@@ -1102,6 +1110,7 @@ export default {
       this.height = height
     },
     changeHeight(val) {
+      // eslint-disable-next-line no-unused-vars
       const [_, newHeight] = snapToGrid(this.grid, 0, val, this.scale)
       // const bottom = restrictToBounds(this.parentHeight - newHeight - this.top, this.bounds.minBottom, this.bounds.maxBottom)
       // private 将 this.bounds.minBottom 设置为0
@@ -1418,6 +1427,7 @@ export default {
     },
     // 修复 正则获取left与top
     formatTransformVal(string) {
+      // eslint-disable-next-line prefer-const
       let [left, top, rotate = 0] = string.match(/[\d|\.]+/g)
       if (top === undefined) top = 0
       return [Number(left), Number(top), rotate]

frontend/src/components/business/condition-table/DeComplexInput.vue

@@ -14,7 +14,9 @@ export default {
   components: { DeComplexOperator },
   //   mixins: [mixins],
   props: {
+    // eslint-disable-next-line vue/require-default-prop
     field: String,
+    // eslint-disable-next-line vue/require-default-prop
     label: String,
     defaultOperator: {
       type: String,

frontend/src/components/business/condition-table/DeComplexOperator.vue

@@ -30,8 +30,11 @@ export default {
     event: 'change'
   },
   props: {
+    // eslint-disable-next-line vue/require-default-prop
     label: String,
+    // eslint-disable-next-line vue/require-default-prop
     operator: String,
+    // eslint-disable-next-line vue/require-default-prop
     operators: Array
   },
   data() {

frontend/src/components/canvas/components/Editor/Area.vue

@@ -14,13 +14,16 @@
 export default {
   props: {
     start: {
-      type: Object
+      type: Object,
+      default: null
     },
     width: {
-      type: Number
+      type: Number,
+      default: null
     },
     height: {
-      type: Number
+      type: Number,
+      default: null
     }
   }
 }

frontend/src/components/canvas/components/Editor/Grid.vue

@@ -27,6 +27,7 @@
 
 export default {
   props: {
+    // eslint-disable-next-line vue/require-default-prop
     matrixStyle: {
       type: Object
     }

frontend/src/components/canvas/custom-component/Group.vue

@@ -25,6 +25,7 @@ export default {
       type: Array,
       default: () => []
     },
+    // eslint-disable-next-line vue/require-default-prop
     element: {
       type: Object
     }

frontend/src/components/canvas/custom-component/Picture.vue

@@ -7,6 +7,7 @@
 <script>
 export default {
   props: {
+    // eslint-disable-next-line vue/require-default-prop
     propValue: {
       type: String,
       require: true

frontend/src/components/canvas/custom-component/RectShape.vue

@@ -7,6 +7,7 @@
 <script>
 export default {
   props: {
+    // eslint-disable-next-line vue/require-default-prop
     element: {
       type: Object
     }

frontend/src/components/canvas/custom-component/VText.vue

@@ -25,10 +25,12 @@ import { keycodes } from '@/components/canvas/utils/shortcutKey.js'
 
 export default {
   props: {
+    // eslint-disable-next-line vue/require-default-prop
     propValue: {
       type: String,
       require: true
     },
+    // eslint-disable-next-line vue/require-default-prop
     element: {
       type: Object
     },
@@ -68,17 +70,17 @@ export default {
     },
 
     handleKeydown(e) {
-      if (e.keyCode == this.ctrlKey) {
+      if (e.keyCode === this.ctrlKey) {
         this.isCtrlDown = true
       } else if (this.isCtrlDown && this.canEdit && keycodes.includes(e.keyCode)) {
         e.stopPropagation()
-      } else if (e.keyCode == 46) { // deleteKey
+      } else if (e.keyCode === 46) { // deleteKey
         e.stopPropagation()
       }
     },
 
     handleKeyup(e) {
-      if (e.keyCode == this.ctrlKey) {
+      if (e.keyCode === this.ctrlKey) {
         this.isCtrlDown = false
       }
     },

frontend/src/components/canvas/index.vue

@@ -38,6 +38,7 @@ import generateID from '@/utils/generateID'
 import { listenGlobalKeyDown } from '@/utils/shortcutKey'
 
 export default {
+  // eslint-disable-next-line vue/no-unused-components
   components: { Editor, ComponentList, AttrList, AnimationList, EventList, Toolbar },
   data() {
     return {
@@ -71,6 +72,7 @@ export default {
     resetID(data) {
       if (data) {
         data.forEach(item => {
+          // eslint-disable-next-line no-undef
           item.type !== 'custom' && (item.id = uuid.v1())
         })
       }
@@ -85,7 +87,7 @@ export default {
       let component
       const id = e.dataTransfer.getData('componentId')
       componentList.forEach(componentTemp => {
-        if (id == componentTemp.id) {
+        if (id === componentTemp.id) {
           component = deepCopy(componentTemp)
         }
       })
@@ -112,7 +114,7 @@ export default {
       }
 
       // 0 左击 1 滚轮 2 右击
-      if (e.button != 2) {
+      if (e.button !== 2) {
         this.$store.commit('hideContextMenu')
       }
     }

frontend/src/components/canvas/store/compose.js

@@ -77,7 +77,7 @@ export default {
     batchDeleteComponent({ componentData }, deleteData) {
       deleteData.forEach(component => {
         for (let i = 0, len = componentData.length; i < len; i++) {
-          if (component.id == componentData[i].id) {
+          if (component.id === componentData[i].id) {
             componentData.splice(i, 1)
             break
           }

frontend/src/components/canvas/utils/shortcutKey.js

@@ -56,9 +56,9 @@ let isCtrlDown = false
 export function listenGlobalKeyDown() {
   window.onkeydown = (e) => {
     const { curComponent } = store.state
-    if (e.keyCode == ctrlKey) {
+    if (e.keyCode === ctrlKey) {
       isCtrlDown = true
-    } else if (e.keyCode == deleteKey && curComponent) {
+    } else if (e.keyCode === deleteKey && curComponent) {
       store.commit('deleteComponent')
       store.commit('recordSnapshot')
     } else if (isCtrlDown) {
@@ -73,7 +73,7 @@ export function listenGlobalKeyDown() {
   }
 
   window.onkeyup = (e) => {
-    if (e.keyCode == ctrlKey) {
+    if (e.keyCode === ctrlKey) {
       isCtrlDown = false
     }
   }
@@ -109,7 +109,7 @@ function compose() {
 
 function decompose() {
   const curComponent = store.state.curComponent
-  if (curComponent && !curComponent.isLock && curComponent.component == 'Group') {
+  if (curComponent && !curComponent.isLock && curComponent.component === 'Group') {
     store.commit('decompose')
     store.commit('recordSnapshot')
   }

frontend/src/components/canvas/utils/style.js

@@ -33,7 +33,7 @@ export function getStyle(style, filter = []) {
 // 获取一个组件旋转 rotate 后的样式
 export function getComponentRotatedStyle(style) {
   style = { ...style }
-  if (style.rotate != 0) {
+  if (style.rotate !== 0) {
     const newWidth = style.width * cos(style.rotate) + style.height * sin(style.rotate)
     const diffX = (style.width - newWidth) / 2 // 旋转后范围变小是正值，变大是负值
     style.left += diffX

frontend/src/components/widget/DeWidget/DeInputSearch.vue

@@ -46,7 +46,7 @@ export default {
     setCondition() {
       const param = {
         component: this.element,
-        value: [this.options.value],
+        value: !this.options.value ? [] : Array.isArray(this.options.value) ? this.options.value : [this.options.value],
         operator: this.operator
       }
       this.inDraw && this.$store.commit('addViewFilter', param)

frontend/src/directive/DataPermission/index.js

 function checkDataPermission(el, binding, vnode) {
+  // eslint-disable-next-line no-unused-vars
   const dataPermission = vnode.privileges
+  // eslint-disable-next-line no-unused-vars
   const { value } = binding
   // // 数据授权采用并集的方式 部门 角色 用户 有一个有权限即可
   // if (value && value instanceof Array) {

frontend/src/link/link-router.js

@@ -8,8 +8,7 @@ export default new Router({
     {
       path: '/',
       name: 'home',
-      component: () =>
-              import('../views/link/index.vue'),
+      component: () => import('../views/link/index.vue'),
       meta: {
         title: '首页'
       }

frontend/src/styles/common/mixins.scss

@@ -6,11 +6,10 @@
   @if $align != stretch {
     align-items: $align;
   }
-  }
+}
 
-  @mixin variant($color, $background-color, $border-color) {
+@mixin variant($color, $background-color, $border-color) {
   color: $color;
   background-color: $background-color;
   border-color: $border-color;
-  }
-  
+}
\ No newline at end of file

frontend/src/styles/index.scss

@@ -81,7 +81,6 @@ div:focus {
   }
   .el-dialog__body{
     padding: 1px 20px !important;
-
   }
 }
 
@@ -99,7 +98,6 @@ div:focus {
   }
   .el-dialog__body{
     padding: 1px 15px !important;
-
   }
 }
 
@@ -117,7 +115,6 @@ div:focus {
   }
   .el-dialog__body{
     padding: 1px 15px !important;
-
   }
 }
 
@@ -129,7 +126,6 @@ div:focus {
 
   .el-dialog__header{
     display:none!important;
-
   }
   .el-dialog__body{
     padding: 0px!important;
@@ -151,7 +147,6 @@ div:focus {
       line-height: 30px !important;
       height: 30px !important;
       border-right: none;
-
     }
   }
   .el-input__inner:focus{
@@ -160,7 +155,6 @@ div:focus {
   .el-input-group__append {
     background-color: #ffffff;
   }
-
 }
 
 .filter-card-class {
@@ -176,7 +170,6 @@ div:focus {
 }
 
 .real-input {
-
   .el-input__inner {
     height: 25px !important;
     border: none !important;
@@ -194,9 +187,7 @@ div:focus {
           border: none !important;
         }
       }
-
     }
-
   }
 }
 .de-filter-data-table::before {

frontend/src/styles/mixin.scss

@@ -41,5 +41,5 @@
   color: $color;
   background-color: $background-color;
   border-color: $border-color;
-  }
+}
 

frontend/src/styles/topbar.scss

@@ -85,11 +85,9 @@
 
     .avatar-container {
       margin-right: 30px;
-
       .avatar-wrapper {
         margin-top: 5px;
         position: relative;
-
         .user-avatar {
           cursor: pointer;
           width: 40px;
@@ -115,4 +113,4 @@
       }
     }
   }
-  }
+}

frontend/src/utils/index.js

@@ -213,6 +213,7 @@ export function formatCondition(param) {
     return null
   }
   const result = { conditions: [] }
+  // eslint-disable-next-line no-unused-vars
   for (const [key, value] of Object.entries(param)) {
     result.conditions.push(value)
   }

frontend/src/views/chart/chart/line/line.js

@@ -58,7 +58,7 @@ export function stackLineOption(chart_option, chart) {
   baseLineOption(chart_option, chart)
 
   // ext
-  chart_option.tooltip.trigger = 'axis'
+  // chart_option.tooltip.trigger = 'axis'
   chart_option.series.forEach(function(s) {
     s.stack = 'stack'
   })

frontend/src/views/chart/chart/util.js

@@ -9,6 +9,7 @@ export function hexColorToRGBA(hex, alpha) {
   }
   if (/^#[0-9A-F]{6}$/i.test(hex)) { // 判断传入是否为#六位十六进制数
     hex.replace(/[0-9A-F]{2}/ig, function(kw) {
+      // eslint-disable-next-line no-eval
       rgb.push(eval('0x' + kw)) // 十六进制转化为十进制并存如数组
     })
     return `rgba(${rgb.join(',')},${alpha / 100})` // 输出RGB格式颜色

frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentGap.vue

@@ -17,6 +17,7 @@
 </template>
 
 <script>
+// eslint-disable-next-line no-unused-vars
 import { DEFAULT_PANEL_STYLE } from '@/views/panel/panel'
 import { mapState } from 'vuex'
 import { deepCopy } from '@/components/canvas/utils/utils'

frontend/src/views/panel/panel.js

+
+// eslint-disable-next-line no-unused-vars
 import { BASE_CHART, BASE_CHART_STRING } from '@/views/chart/chart/chart'
 import { deepCopy } from '@/components/canvas/utils/utils'
 
@@ -48,6 +50,7 @@ export function chartTransStr2Object(targetIn, copy) {
 }
 
 export function chartTransObject2Str(targetIn, deepCopy) {
+  // eslint-disable-next-line no-undef
   const target = copy === 'Y' ? deepCopy(targetIn) : targetIn
   if (target.chart) {
     if (target.chart.xaxis && typeof target.chart.xaxis !== 'string') {

frontend/src/views/panel/template/component/TemplateItem.vue

@@ -11,6 +11,7 @@
 </template>
 
 <script>
+// eslint-disable-next-line no-unused-vars
 import { get, post } from '@/api/panel/panel'
 export default {
   name: 'TemplateItem',

frontend/src/views/system/authority/authQuickConfig.vue

@@ -52,6 +52,7 @@ import LazyTree from './components/LazyTree'
 
 export default {
   name: 'Authority',
+  // eslint-disable-next-line vue/no-unused-components
   components: { LazyTree, DeMainContainer, DeAsideContainer, DeContainer },
   props: {
     resourceId: {

frontend/src/views/system/authority/index.vue

@@ -20,6 +20,7 @@ import AuthQuickConfig from './authQuickConfig'
 
 export default {
   name: 'Authority',
+  // eslint-disable-next-line vue/no-unused-components
   components: { DeContainer, DeMainContainer, AuthConfig, AuthQuickConfig },
   data() {
     return {