Merge pull request #2181 from dataease/dev

Dev
2022-04-25 19:52:29 +08:00 · 2022-04-25 19:52:29 +08:00 · 3fa7f4cbc5
commit 3fa7f4cbc5
parent 5e5f4973fb 15b06f4d92
7 changed files with 187 additions and 12 deletions
--- a/backend/src/main/resources/db/migration/V34__1.10.sql
+++ b/backend/src/main/resources/db/migration/V34__1.10.sql
@ -16,3 +16,148 @@ INSERT INTO `system_parameter`(`param_key`, `param_value`, `type`, `sort`) VALUE
 ALTER TABLE `my_plugin` ADD COLUMN `ds_type` VARCHAR(45) NULL COMMENT '数据源类型' AFTER `icon`;

 INSERT INTO `my_plugin` (`plugin_id`, `name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `creator`, `load_mybatis`, `install_time`, `module_name`, `ds_type`) VALUES ('5', 'Maxcompute 数据源插件', 'default', '0', '0', 'datasource', 'Maxcompute 插件', '1.0-SNAPSHOT', 'DATAEASE', '0', '1650765903630', 'maxcompute-backend', 'maxcompute');
+
+
+DROP FUNCTION IF EXISTS `copy_auth`;
+delimiter ;;
+CREATE FUNCTION `copy_auth`(authSource varchar(255),authSourceType varchar(255),authUser varchar(255))
+ RETURNS varchar(255) CHARSET utf8mb4
+  READS SQL DATA
+BEGIN
+
+DECLARE authId varchar(255);
+
+DECLARE userId  varchar(255);
+
+DECLARE copyId  varchar(255);
+
+DECLARE selectPid  varchar(255);
+
+select uuid() into authId;
+
+select uuid() into copyId;
+
+select max(sys_user.user_id) into userId from sys_user where username= authUser;
+
+SELECT  pid  into selectPid FROM v_auth_model WHERE id = authSource  AND model_type = authSourceType;
+
+delete from sys_auth_detail where auth_id in (
+select id from  sys_auth where sys_auth.auth_source=authSource and sys_auth.auth_source_type=authSourceType
+);
+
+delete from sys_auth where sys_auth.auth_source=authSource and sys_auth.auth_source_type=authSourceType;
+
+INSERT INTO sys_auth (
+ id,
+ auth_source,
+ auth_source_type,
+ auth_target,
+ auth_target_type,
+ auth_time,
+ auth_user
+)
+VALUES
+ (
+  authId,
+  authSource,
+  authSourceType,
+  userId,
+  'user',
+ unix_timestamp(
+ now())* 1000,'auto');
+
+ INSERT INTO  sys_auth_detail (
+            id,
+            auth_id,
+            privilege_name,
+            privilege_type,
+            privilege_value,
+            privilege_extend,
+            remark,
+            create_user,
+            create_time
+        ) SELECT
+        uuid() AS id,
+        authId AS auth_id,
+        sys_auth_detail.privilege_name,
+        sys_auth_detail.privilege_type,
+        1,
+        sys_auth_detail.privilege_extend,
+        sys_auth_detail.remark,
+        'auto' AS create_user,
+        unix_timestamp(now())* 1000 AS create_time
+        FROM
+            sys_auth_detail where auth_id =authSourceType;
+
+/**继承第一父级权限**/
+
+insert into sys_auth(
+id,
+ auth_source,
+ auth_source_type,
+ auth_target,
+ auth_target_type,
+ auth_time,
+ auth_user,
+ copy_from,
+ copy_id
+)
+SELECT
+ uuid() as id,
+ authSource as auth_source,
+ authSourceType as auth_source_type,
+ auth_target,
+ auth_target_type,
+ NOW()* 1000 as auth_time,
+ 'auto' as auth_user,
+ id as copy_from,
+ copyId as copy_id
+FROM
+ sys_auth
+WHERE
+ auth_source =selectPid
+ AND auth_source_type = authSourceType
+ and  concat(auth_target,'-',auth_target_type) !=CONCAT(userId,'-','user');
+
+INSERT INTO sys_auth_detail (
+ id,
+ auth_id,
+ privilege_name,
+ privilege_type,
+ privilege_value,
+ privilege_extend,
+ remark,
+ create_user,
+ create_time,
+ copy_from,
+ copy_id
+) SELECT
+uuid() AS id,
+sa_copy.t_id AS auth_id,
+sys_auth_detail.privilege_name,
+sys_auth_detail.privilege_type,
+sys_auth_detail.privilege_value,
+sys_auth_detail.privilege_extend,
+sys_auth_detail.remark,
+'auto' AS create_user,
+unix_timestamp(
+now())* 1000 AS create_time,
+id AS copy_from,
+copyId AS copy_id
+FROM
+ sys_auth_detail
+ INNER JOIN (
+ SELECT
+  id AS t_id,
+  copy_from AS s_id
+ FROM
+  sys_auth
+ WHERE
+  copy_id = copyId
+ ) sa_copy ON sys_auth_detail.auth_id = sa_copy.s_id;
+
+RETURN 'success';
+
+END
+;;
+delimiter ;
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@ -37,7 +37,7 @@
                {{ $t('chart.export') }}<i class="el-icon-download" />
              </el-button>
              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="exportExcel"><svg-icon icon-class="ds-excel" class="ds-icon-excel" />Excle</el-dropdown-item>
+                <el-dropdown-item @click.native="exportExcel"><svg-icon icon-class="ds-excel" class="ds-icon-excel" />Excel</el-dropdown-item>
                <el-dropdown-item v-if="showExportImgButton" icon="el-icon-picture-outline" @click.native="exportViewImg">{{ $t('chart.image') }}</el-dropdown-item>
              </el-dropdown-menu>
            </el-dropdown>
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@ -159,7 +159,7 @@
            {{ $t('chart.export') }}<i class="el-icon-download" />
          </el-button>
          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item @click.native="exportExcel"><svg-icon icon-class="ds-excel" class="ds-icon-excel" />Excle</el-dropdown-item>
+            <el-dropdown-item @click.native="exportExcel"><svg-icon icon-class="ds-excel" class="ds-icon-excel" />Excel</el-dropdown-item>
            <el-dropdown-item v-if="showExportImgButton" icon="el-icon-picture-outline" @click.native="exportViewImg">{{ $t('chart.image') }}</el-dropdown-item>
          </el-dropdown-menu>
        </el-dropdown>
--- a/frontend/src/components/canvas/custom-component/DeFrame.vue
+++ b/frontend/src/components/canvas/custom-component/DeFrame.vue
@ -2,11 +2,15 @@
  <el-row class="main-frame">
    <div v-if="element.frameLinks.src" class="main-frame">
      <iframe v-if="frameShow" id="iframe" :src="element.frameLinks.src" scrolling="auto" frameborder="0" class="main-frame" @load="loaded" @error="onError" />
-      <div v-if="editMode==='edit'" class="frame-mask">
+      <div v-if="editMode==='edit'" class="frame-mask edit-mask">
        <span style="opacity: 1;">
          <span style="font-weight: bold;color: lawngreen;">{{ $t('panel.edit_web_tips') }}</span>
        </span>
      </div>
+      <!--Here are three 15px wide masks(left top right) for easy clicking on the display jump button-->
+      <div v-if="editMode!=='edit'" class="frame-mask preview-top-mask" />
+      <div v-if="editMode!=='edit'" class="frame-mask preview-right-mask" />
+      <div v-if="editMode!=='edit'" class="frame-mask preview-left-mask" />
      <div v-if="screenShot" class="frame-mask" />
    </div>
    <div v-else class="info-class">
@ -100,17 +104,34 @@ export default {
  }
  .frame-mask {
    display: flex;
-    height: 100%!important;
-    width: 100% !important;
-    background-color: #5c5e61;
    opacity: 0.5;
    position:absolute;
    top:0px;
-    left: 0px;
-    z-index: 2;
+    z-index: 1;
    display: flex;
    align-items: center;
    justify-content: center;
  }
+  .edit-mask{
+    left: 0px;
+    background-color: #5c5e61;
+    height: 100%!important;
+    width: 100% !important;
+  }
+  .preview-top-mask{
+    left: 0px;
+    height: 15px!important;
+    width: 100% !important;
+  }
+  .preview-right-mask{
+    right: 0px;
+    height: 100%!important;
+    width: 15px !important;
+  }
+  .preview-left-mask{
+    left: 0px;
+    height: 100%!important;
+    width: 15px !important;
+  }
 </style>

--- a/frontend/src/components/canvas/custom-component/UserViewDialog.vue
+++ b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
@ -65,7 +65,7 @@ export default {
  computed: {

    showChartCanvas() {
-      return !this.chart.type.includes('table')
+      return this.chart.type !== 'table-normal' && this.chart.type !== 'table-info'
    },
    customStyle() {
      let style = {
--- a/frontend/src/components/canvas/custom-component/component-list.js
+++ b/frontend/src/components/canvas/custom-component/component-list.js
@ -227,6 +227,7 @@ const list = [
    icon: 'wenben',
    type: 'v-text',
    mobileStyle: BASE_MOBILE_STYLE,
+    hyperlinks: HYPERLINKS,
    style: {
      width: 400,
      height: 100,
@ -238,7 +239,6 @@ const list = [
      color: '#000000',
      verticalAlign: 'middle'
    },
-    hyperlinks: HYPERLINKS,
    x: 1,
    y: 1,
    sizex: 10,
@ -279,6 +279,7 @@ const list = [
    type: 'Picture',
    propValue: require('@/components/canvas/assets/title.jpg'),
    mobileStyle: BASE_MOBILE_STYLE,
+    hyperlinks: HYPERLINKS,
    style: {
      width: 300,
      height: 200
@ -298,6 +299,7 @@ const list = [
    type: 'Picture',
    propValue: require('@/components/canvas/assets/bg-kj-1.jpg'),
    mobileStyle: BASE_MOBILE_STYLE,
+    hyperlinks: HYPERLINKS,
    style: {
      borderStyle: 'solid',
      borderWidth: 0,
@ -316,6 +318,7 @@ const list = [
    icon: 'juxing',
    type: 'rect-shape',
    mobileStyle: BASE_MOBILE_STYLE,
+    hyperlinks: HYPERLINKS,
    style: {
      width: 300,
      height: 200,
@ -338,6 +341,7 @@ const list = [
    icon: 'juxing',
    type: 'view',
    mobileStyle: BASE_MOBILE_STYLE,
+    hyperlinks: HYPERLINKS,
    style: {
      width: 300,
      height: 200
@ -358,6 +362,7 @@ const list = [
    icon: 'tabs',
    type: 'de-tabs',
    mobileStyle: BASE_MOBILE_STYLE,
+    hyperlinks: HYPERLINKS,
    style: {
      width: 200,
      height: 200,
@ -387,6 +392,7 @@ const list = [
    icon: 'shijian',
    type: 'de-show-date',
    mobileStyle: BASE_MOBILE_STYLE,
+    hyperlinks: HYPERLINKS,
    style: {
      width: 250,
      height: 100,
@ -424,6 +430,7 @@ const list = [
    icon: 'iconfont icon-iframe',
    defaultClass: 'text-filter',
    mobileStyle: BASE_MOBILE_STYLE,
+    hyperlinks: HYPERLINKS,
    style: {
      width: 400,
      height: 200
@ -464,6 +471,7 @@ const list = [
    icon: 'iconfont icon-picture',
    defaultClass: 'text-filter',
    mobileStyle: BASE_MOBILE_STYLE,
+    hyperlinks: HYPERLINKS,
    style: {
      width: 400,
      height: 200
@ -484,6 +492,7 @@ const list = [
    icon: 'iconfont icon-picture',
    defaultClass: 'text-filter',
    mobileStyle: BASE_MOBILE_STYLE,
+    hyperlinks: HYPERLINKS,
    style: {
      width: 400,
      height: 200
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@ -307,8 +307,8 @@ export default {
              this.dataLoading = false
            }, 300)
          })
-        }, 500)
-      }, 0)
+        }, 1500)
+      }, 500)
    },

    downloadAsPDF() {