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

2022-03-29 16:00:07 +08:00 · 2022-03-29 16:00:07 +08:00 · 38905dcec8
commit 38905dcec8
parent e67e6d0441 1104d33bf9
25 changed files with 90 additions and 52 deletions
--- a/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
+++ b/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
@ -41,6 +41,7 @@ public class DePermissionAnnotationHandler {
            DePermission[] dePermissions = annotation.value();
            Object[] args = point.getArgs();
            if (logical == Logical.AND) {
+                access = true;
                for (int i = 0; i < dePermissions.length; i++) {
                    DePermission permission = dePermissions[i];
                    boolean currentAccess = access(args[permission.paramIndex()], permission, 0);
--- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
+++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
@ -55,6 +55,10 @@ public class ShiroServiceImpl implements ShiroService {
        filterChainDefinitionMap.put("/linkJump/queryPanelJumpInfo/**", ANON);
        filterChainDefinitionMap.put("/linkJump/queryTargetPanelJumpInfo", ANON);

+        //外部跳转参数
+        filterChainDefinitionMap.put("/outerParams/**", ANON);
+
+
        filterChainDefinitionMap.put("/tempMobileLink/**", ANON);
        filterChainDefinitionMap.put("/de-app/**", ANON);
        filterChainDefinitionMap.put("/app.html", ANON);
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml
@ -92,7 +92,8 @@
            LEFT JOIN panel_outer_params_info popi ON pop.params_id = popi.params_id
            LEFT JOIN panel_outer_params_target_view_info poptvi ON popi.params_info_id = poptvi.params_info_id
        WHERE
-            pop.panel_id = #{panelId}
+            pop.panel_id = #{panelId} and pop.checked=1
+            and popi.checked=1
    </select>


--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@ -803,7 +803,7 @@ public class ChartViewService {
        pluginViewParam.setPluginChartFieldCustomFilters(fieldFilters);
        pluginViewParam.setPluginChartExtFilters(panelFilters);
        pluginViewParam.setPluginViewLimit(pluginViewLimit);
-        pluginViewParam.setUserId(AuthUtils.getUser().getUserId());
+        // pluginViewParam.setUserId(AuthUtils.getUser().getUserId());
        return pluginViewParam;
    }

--- a/frontend/public/link.html
+++ b/frontend/public/link.html
@ -41,7 +41,9 @@
    url += '&user=' + encodeURIComponent(user)
  }
  if (attachParams) {
-    url += '&attachParams=' + attachParams
+    console.log('attachParams-bf:'+attachParams+';-af:'+encodeURIComponent(attachParams))
+    url += '&attachParams=' + encodeURIComponent(attachParams)
+
  }
  window.location.href = url
 </script>
--- a/frontend/src/components/canvas/components/Editor/ContextMenu.vue
+++ b/frontend/src/components/canvas/components/Editor/ContextMenu.vue
@ -50,7 +50,7 @@ export default {
      if (this.curComponent.type === 'view') {
        this.$store.dispatch('chart/setViewId', null)
        this.$store.dispatch('chart/setViewId', this.curComponent.propValue.viewId)
-        bus.$emit('PanelSwitchComponent', { name: 'ChartEdit', param: { 'id': this.curComponent.propValue.viewId, 'optType': 'edit' }})
+        bus.$emit('change_panel_right_draw', true)
      }
      if (this.curComponent.type === 'custom') {
        bus.$emit('component-dialog-edit')
--- a/frontend/src/components/canvas/components/Editor/EditBarView.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBarView.vue
@ -1,6 +1,6 @@
 <template>
  <div class="bar-main">
-    <div v-if="!linkageSettingStatus">
+    <div>
      <span v-if="isEdit" :title="$t('panel.edit')">
        <i class="icon iconfont icon-edit" @click.stop="edit" />
      </span>
@ -51,12 +51,9 @@ export default {
  },
  methods: {
    edit() {
-      // 编辑时临时保存 当前修改的画布
-      this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
-      this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData))
      this.$store.dispatch('chart/setViewId', null)
      this.$store.dispatch('chart/setViewId', this.viewId)
-      bus.$emit('PanelSwitchComponent', { name: 'ChartEdit', param: { 'id': this.viewId, 'optType': 'edit' }})
+      bus.$emit('change_panel_right_draw', true)
    },
    linkageEdit() {

--- a/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue
+++ b/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue
@ -46,9 +46,6 @@ export default {
      this.$refs.trackButton.$el.click()
    },
    edit() {
-      // 编辑时临时保存 当前修改的画布
-      this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
-      this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData))
      if (this.curComponent.type === 'view') {
        this.$store.dispatch('chart/setViewId', null)
        this.$store.dispatch('chart/setViewId', this.curComponent.propValue.viewId)
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@ -372,7 +372,7 @@ export default {
        this.destroyTimeMachine()
        this.changeIndex++
        this.chartResize(this.changeIndex)
-      } else {
+      } else if (this.$refs[this.element.propValue.id]) {
        this.chart.isPlugin
          ? this.$refs[this.element.propValue.id].callPluginInner({ methodName: 'chartResize' })
          : this.$refs[this.element.propValue.id].chartResize()
--- a/frontend/src/components/dataease/DeAsideContainer.vue
+++ b/frontend/src/components/dataease/DeAsideContainer.vue
@ -1,16 +1,17 @@
 <template>
  <el-aside
-    :width="width"
+    :width="currentWidth"
    class="ms-aside-container"
-    :style="{'margin-left': !asideHidden ? 0 : '-' + width}"
+    :style="{'margin-left': !asideHidden ? 0 : '-' + currentWidth}"
  >
    <slot />
-    <de-horizontal-drag-bar v-if="showDragBar" />
+    <de-horizontal-drag-bar v-if="showDragBar" :type="type" />
  </el-aside>
 </template>

 <script>
 import DeHorizontalDragBar from './dragbar/DeLeft2RightDragBar'
+import { getLayout } from '@/utils/LayoutUtil'
 export default {
  name: 'DeAsideContainer',
  components: { DeHorizontalDragBar },
@ -26,12 +27,21 @@ export default {
    showDragBar: {
      type: Boolean,
      default: true
+    },
+    type: {
+      type: String,
+      default: null
    }
  },
  data() {
    return {
      asideHidden: false
    }
+  },
+  computed: {
+    currentWidth() {
+      return this.type && getLayout(this.type) || this.width
+    }
  }
 }
 </script>
--- a/frontend/src/components/dataease/dragbar/DeLeft2RightDragBar.vue
+++ b/frontend/src/components/dataease/dragbar/DeLeft2RightDragBar.vue
@ -1,10 +1,16 @@
 <template>
-  <div v-left-to-right-drag class="drag-bar" />
+  <div v-left-to-right-drag="type" class="drag-bar" />
 </template>

 <script>
 export default {
-  name: 'DeLeft2RightDragBar'
+  name: 'DeLeft2RightDragBar',
+  props: {
+    type: {
+      type: String,
+      default: null
+    }
+  }
 }
 </script>

--- a/frontend/src/directive/index.js
+++ b/frontend/src/directive/index.js
@ -1,8 +1,9 @@
 import permission from '@/directive/Permission'
-// import dataPermission from '@/directive/DataPermission'
+import { setLayout } from '@/utils/LayoutUtil'

 export const left2RightDrag = {
  inserted(el, binding) {
+    const value = binding.value
    el.onmousedown = function(e) {
      const init = e.clientX
      const parent = el.parentNode
@ -15,6 +16,8 @@ export const left2RightDrag = {
        }
      }
      document.onmouseup = function() {
+        value && setLayout(value, parent.style.width)
+
        document.onmousemove = document.onmouseup = null
      }
    }
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@ -1390,6 +1390,7 @@ export default {
    sure_bt: 'Confirm'
  },
  panel: {
+    json_params_error: 'Third Party Parameters Parsing Failed. Please Check Whether The Parameters Format Is Correct',
    inner_padding: 'Inner Padding',
    board_radio: 'Board Radio',
    background: 'Background',
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@ -1391,6 +1391,7 @@ export default {
    sure_bt: '確定'
  },
  panel: {
+    json_params_error: '第三方参数解析失败，请检查参数格式是否正确',
    inner_padding: '内边距',
    board_radio: '边框半径',
    background: '背景',
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@ -1399,6 +1399,7 @@ export default {
    sure_bt: '确定'
  },
  panel: {
+    json_params_error: '第三方参数解析失败，请检查参数格式是否正确',
    inner_padding: '内边距',
    board_radio: '边框半径',
    background: '背景',
--- a/frontend/src/layout/index.vue
+++ b/frontend/src/layout/index.vue
@ -4,7 +4,7 @@
    <topbar v-if="!fullHeightFlag && finishLoad" :show-tips="showTips" />

    <de-container :style="mainStyle">
-      <de-aside-container v-if="!sidebar.hide" class="le-aside-container">
+      <de-aside-container v-if="!sidebar.hide" type="system" class="le-aside-container">
        <sidebar class="sidebar-container" />
      </de-aside-container>

--- a/frontend/src/utils/LayoutUtil.js
+++ b/frontend/src/utils/LayoutUtil.js
@ -0,0 +1,17 @@
+const defaultLayout = {
+  panel: '260px',
+  dataset: '260px',
+  datasource: '260px',
+  system: '260px'
+}
+const STORAGE_KEY = 'global_layout'
+
+export const getLayout = (type) => {
+  const key = STORAGE_KEY + '_' + type
+  return localStorage.getItem(key) || defaultLayout[type]
+}
+
+export const setLayout = (type, val) => {
+  const key = STORAGE_KEY + '_' + type
+  localStorage.setItem(key, val || defaultLayout[type])
+}
--- a/frontend/src/views/dataset/index.vue
+++ b/frontend/src/views/dataset/index.vue
@ -1,7 +1,7 @@
 <template>
  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">

-    <de-aside-container>
+    <de-aside-container type="dataset">
      <group :save-status="saveStatus" @switchComponent="switchComponent" />
    </de-aside-container>

@ -30,7 +30,7 @@ import { removeClass } from '@/utils'
 import { checkCustomDs } from '@/api/dataset/dataset'
 export default {
  name: 'DataSet',
-  components: { DeMainContainer, DeContainer, DeAsideContainer, Group, DataHome, ViewTable, AddDB, AddSQL, AddExcel, AddCustom, AddApi},
+  components: { DeMainContainer, DeContainer, DeAsideContainer, Group, DataHome, ViewTable, AddDB, AddSQL, AddExcel, AddCustom, AddApi },
  data() {
    return {
      component: DataHome,
--- a/frontend/src/views/link/view/index.vue
+++ b/frontend/src/views/link/view/index.vue
@ -69,7 +69,7 @@ export default {
        if (attachParamsEncode) {
          try {
            const Base64 = require('js-base64').Base64
-            const attachParam = JSON.parse(Base64.decode(attachParamsEncode))
+            const attachParam = JSON.parse(decodeURIComponent(Base64.decode(attachParamsEncode)))
            getOuterParamsInfo(this.resourceId).then(rsp => {
              if (--loadingCount === 0) {
                this.show = true
@ -81,6 +81,12 @@ export default {
            if (--loadingCount === 0) {
              this.show = true
            }
+
+            this.$message({
+              message: this.$t('panel.json_params_error'),
+              type: 'error',
+              showClose: true
+            })
            console.log('outerParams Decode error：', e)
          }
        }
--- a/frontend/src/views/panel/OuterParamsSet/index.vue
+++ b/frontend/src/views/panel/OuterParamsSet/index.vue
@ -259,7 +259,7 @@ export default {
      this.$emit('outerParamsSetVisibleChange', false)
    },
    save() {
-      if (checkRepeat(this.outerParams.outerParamsInfoArray, 'name')) {
+      if (checkRepeat(this.outerParams.outerParamsInfoArray, 'paramName')) {
        this.$message({
          message: this.$t('panel.repeat_params'),
          type: 'warn',
@ -389,7 +389,7 @@ export default {
  }

  .bottom {
-    margin-top: 20px;
+    margin-top: 15px;
    text-align: center;
  }

@ -482,7 +482,7 @@ export default {
  }

  .tree-bottom {
-    margin-top: 12px;
+    margin-top: 7px;
    text-align: center;
  }

--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@ -634,15 +634,7 @@ export default {
    init(panelId) {
      const _this = this
      _this.initHasStar()
-      // 如果临时画布有数据 则使用临时画布数据（视图编辑的时候 会保存临时画布数据）
-      const componentDataTemp = this.$store.state.panel.componentDataTemp
-      const canvasStyleDataTemp = this.$store.state.panel.canvasStyleDataTemp
-      if (componentDataTemp && canvasStyleDataTemp) {
-        panelInit(JSON.parse(componentDataTemp), JSON.parse(canvasStyleDataTemp))
-        // 清空临时画布数据
-        _this.$store.dispatch('panel/setComponentDataTemp', null)
-        _this.$store.dispatch('panel/setCanvasStyleDataTemp', null)
-      } else if (panelId) {
+      if (panelId) {
        initPanelData(panelId, function() {
          // 初始化视图缓存
          initViewCache(panelId)
@ -650,10 +642,6 @@ export default {
          setTimeout(() => {
            _this.$store.commit('refreshSaveStatus')
          }, 500)
-          // initPanelComponentsData(panelId, function(rsp) {
-          //   _this.$store.commit('initPanelComponents', rsp)// 初始化仪表板组件视图数据
-          //   _this.$store.commit('recordSnapshot', 'init')// 记录快照
-          // })
        })
      }
    },
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@ -690,9 +690,6 @@ export default {
      this.$store.commit('refreshSnapshot')
      this.$store.commit('setComponentData', [])
      this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
-      // 清空临时画布数据
-      this.$store.dispatch('panel/setComponentDataTemp', null)
-      this.$store.dispatch('panel/setCanvasStyleDataTemp', null)
      this.$store.dispatch('panel/setPanelInfo', data)
      bus.$emit('PanelSwitchComponent', { name: 'PanelEdit' })
    },
--- a/frontend/src/views/panel/list/PanelMain.vue
+++ b/frontend/src/views/panel/list/PanelMain.vue
@ -1,6 +1,6 @@
 <template>
  <de-container>
-    <de-aside-container>
+    <de-aside-container type="panel">
      <el-tabs v-model="activeName" class="tab-panel" :stretch="true" @tab-click="handleClick">
        <el-tab-pane name="PanelList">
          <span slot="label"><i class="el-icon-document tablepanel-i" />{{ $t('panel.panel_list') }}</span>
--- a/frontend/src/views/system/datasource/DsMain.vue
+++ b/frontend/src/views/system/datasource/DsMain.vue
@ -1,11 +1,17 @@
 <template>
  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
-    <de-aside-container style="padding: 0 0;">
-      <ds-tree ref="dsTree" :datasource="datasource" @switch-main="switchMain"/>
+    <de-aside-container style="padding: 0 0;" type="datasource">
+      <ds-tree ref="dsTree" :datasource="datasource" @switch-main="switchMain" />
    </de-aside-container>
    <de-main-container>
-      <component :is="component" v-if="!!component" :params="param" :tData="tData" @refresh-type="refreshType"
-                 @switch-component="switchMain"/>
+      <component
+        :is="component"
+        v-if="!!component"
+        :params="param"
+        :t-data="tData"
+        @refresh-type="refreshType"
+        @switch-component="switchMain"
+      />
    </de-main-container>
  </de-container>
 </template>
@ -20,7 +26,7 @@ import DataHome from './DataHome'

 export default {
  name: 'DsMain',
-  components: {DeMainContainer, DeContainer, DeAsideContainer, DsTree, DataHome},
+  components: { DeMainContainer, DeContainer, DeAsideContainer, DsTree, DataHome },
  data() {
    return {
      component: DataHome,
@ -37,7 +43,7 @@ export default {
  methods: {
    // 切换main区内容
    switchMain(param) {
-      const {component, componentParam, tData} = param
+      const { component, componentParam, tData } = param
      this.component = DataHome
      this.param = null
      this.$nextTick(() => {
@ -55,7 +61,7 @@ export default {
      })
    },
    refreshType(datasource) {
-      this.datasource = datasource;
+      this.datasource = datasource
      this.$refs.dsTree && this.$refs.dsTree.refreshType(datasource)
    },
    msg2Current(sourceParam) {
--- a/frontend/src/views/system/datasource/index.vue
+++ b/frontend/src/views/system/datasource/index.vue
@ -1,7 +1,7 @@
 <template>
  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
    <de-main-container>
-      <ds-main ref="dsMain"/>
+      <ds-main ref="dsMain" />
    </de-main-container>
  </de-container>
 </template>
@ -14,7 +14,7 @@ import bus from '@/utils/bus'

 export default {
  name: 'Panel',
-  components: {DeMainContainer, DeContainer, DsMain},
+  components: { DeMainContainer, DeContainer, DsMain },
  data() {
    return {
      component: DsMain,