diff --git a/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java b/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java index 53b4bf5135..fd1ddc516c 100644 --- a/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java +++ b/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java @@ -23,7 +23,7 @@ public class VAuthModelDTO extends VAuthModelWithBLOBs implements ITreeBase viewOriginal = extVAuthModelMapper.queryAuthViewsOriginal(viewRequest); if(CollectionUtils.isNotEmpty(viewOriginal) && viewOriginal.size()>1){ diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql index a5615ccf45..bbe4ecdcf8 100644 --- a/backend/src/main/resources/db/migration/V32__1.8.sql +++ b/backend/src/main/resources/db/migration/V32__1.8.sql @@ -197,3 +197,115 @@ SELECT `plugin_sys_menu`.`i_frame` <> 1 ) OR isnull( `plugin_sys_menu`.`i_frame` )); + + + +delete from panel_view where id in ( +'5dafcf9b-8e0a-11ec-8e4b-0242ac130002', +'5dafd1d1-8e0a-11ec-8e4b-0242ac130002', +'5dafd224-8e0a-11ec-8e4b-0242ac130002', +'5dafd26e-8e0a-11ec-8e4b-0242ac130002', +'5dafd2ac-8e0a-11ec-8e4b-0242ac130002', +'5dafd2f1-8e0a-11ec-8e4b-0242ac130002', +'5dafd32e-8e0a-11ec-8e4b-0242ac130002', +'5dafd363-8e0a-11ec-8e4b-0242ac130002', +'6c200051-8e0a-11ec-8e4b-0242ac130002', +'6c2002c2-8e0a-11ec-8e4b-0242ac130002', +'6c20030f-8e0a-11ec-8e4b-0242ac130002', +'6c2003ca-8e0a-11ec-8e4b-0242ac130002', +'6c20040d-8e0a-11ec-8e4b-0242ac130002', +'6c200442-8e0a-11ec-8e4b-0242ac130002', +'6c200478-8e0a-11ec-8e4b-0242ac130002', +'6c2004a9-8e0a-11ec-8e4b-0242ac130002', +'6c2004e4-8e0a-11ec-8e4b-0242ac130002', +'6c200530-8e0a-11ec-8e4b-0242ac130002', +'6c200568-8e0a-11ec-8e4b-0242ac130002', +'6c200598-8e0a-11ec-8e4b-0242ac130002', +'7611e439-8e0a-11ec-8e4b-0242ac130002', +'7611e678-8e0a-11ec-8e4b-0242ac130002', +'7611e6c4-8e0a-11ec-8e4b-0242ac130002', +'7611e700-8e0a-11ec-8e4b-0242ac130002', +'7611e7d0-8e0a-11ec-8e4b-0242ac130002', +'7611e80a-8e0a-11ec-8e4b-0242ac130002', +'7611e844-8e0a-11ec-8e4b-0242ac130002', +'7611e87d-8e0a-11ec-8e4b-0242ac130002', +'7611e8b5-8e0a-11ec-8e4b-0242ac130002', +'7611e8ed-8e0a-11ec-8e4b-0242ac130002', +'7611e923-8e0a-11ec-8e4b-0242ac130002', +'7611e957-8e0a-11ec-8e4b-0242ac130002', +'7611e98f-8e0a-11ec-8e4b-0242ac130002', +'7611e9c9-8e0a-11ec-8e4b-0242ac130002', +'7611ea05-8e0a-11ec-8e4b-0242ac130002', +'7611ea46-8e0a-11ec-8e4b-0242ac130002', +'805b082d-8e0a-11ec-8e4b-0242ac130002', +'805b0a85-8e0a-11ec-8e4b-0242ac130002', +'805b0abb-8e0a-11ec-8e4b-0242ac130002', +'805b0ae0-8e0a-11ec-8e4b-0242ac130002', +'805b0b0f-8e0a-11ec-8e4b-0242ac130002', +'805b0b2d-8e0a-11ec-8e4b-0242ac130002', +'805b0bdb-8e0a-11ec-8e4b-0242ac130002', +'805b0cc1-8e0a-11ec-8e4b-0242ac130002', +'805b0cf8-8e0a-11ec-8e4b-0242ac130002', +'805b0d31-8e0a-11ec-8e4b-0242ac130002' +); + +INSERT INTO `panel_view` VALUES ('5dafcf9b-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', '84b444e1-0088-44f9-acdc-cc39018413bc', NULL, NULL, NULL, NULL, NULL), ('5dafd1d1-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'c68db172-2df2-4aa2-aad6-077cf1684e14', NULL, NULL, NULL, NULL, NULL), ('5dafd224-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'f8d62b2b-b99a-4b6c-8378-d7c2ec4ea766', NULL, NULL, NULL, NULL, NULL), ('5dafd26e-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'c4943403-4960-4ad8-a9c5-12c46c538c34', NULL, NULL, NULL, NULL, NULL), ('5dafd2ac-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'f257452d-6fc1-4499-bdce-bd10b3e1c520', NULL, NULL, NULL, NULL, NULL), ('5dafd2f1-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', '8271c4e4-43ab-48c6-b7b4-67ccaba3f80b', NULL, NULL, NULL, NULL, NULL), ('5dafd32e-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'a0058881-b29f-4b5c-911f-7f1480b07eb0', NULL, NULL, NULL, NULL, NULL), ('5dafd363-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'c36cd358-0501-4f83-a323-f754485d00b1', NULL, NULL, NULL, NULL, NULL), ('6c200051-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '95f8e3a2-62a5-48a7-a719-fcf53746da8d', NULL, NULL, NULL, NULL, NULL), ('6c2002c2-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '8a26a936-89bf-45a8-b1ce-d5ef1719465d', NULL, NULL, NULL, NULL, NULL), ('6c20030f-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '8d1c3f30-0639-452e-9883-164f37353324', NULL, NULL, NULL, NULL, NULL), ('6c2003ca-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '175b25df-1939-4582-a9c5-d9e8ed3ea2b1', NULL, NULL, NULL, NULL, NULL), ('6c20040d-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', 'c3da496f-073c-413a-bebd-e7f1a4a00ba7', NULL, NULL, NULL, NULL, NULL), ('6c200442-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', 'da18eecd-feff-4140-a291-cce4abf1afaa', NULL, NULL, NULL, NULL, NULL), ('6c200478-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '3f201733-bbb3-485e-a1d6-0fe4f00b5304', NULL, NULL, NULL, NULL, NULL), ('6c2004a9-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '692d5bdc-aa70-4fce-b830-b8d6620539c6', NULL, NULL, NULL, NULL, NULL), ('6c2004e4-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', 'aff5be0c-f195-4fce-bd2b-b8d0e63764de', NULL, NULL, NULL, NULL, NULL), ('6c200530-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', 'cb66836d-a34c-40c6-87e7-0db0375ec19e', NULL, NULL, NULL, NULL, NULL), ('6c200568-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '1d06e2a0-d936-4192-b523-2eb1e8cebd51', NULL, NULL, NULL, NULL, NULL), ('6c200598-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '0de1d446-8300-4ab3-a4ef-4e8f8579cb2e', NULL, NULL, NULL, NULL, NULL), ('7611e439-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', 'ebac2821-d1a0-4f26-b5d9-cd5c60ac75ab', NULL, NULL, NULL, NULL, NULL), ('7611e678-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '5ad64afc-132c-40ea-8f69-2f8bfe6b31d4', NULL, NULL, NULL, NULL, NULL), ('7611e6c4-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '4242cbb0-fca4-4b27-b2a7-ca576a18815e', NULL, NULL, NULL, NULL, NULL), ('7611e700-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', 'c52b6d95-b404-4130-8635-5903cb8d0e84', NULL, NULL, NULL, NULL, NULL), ('7611e7d0-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '2e6f8b45-116d-46c4-a287-f3054e798556', NULL, NULL, NULL, NULL, NULL), ('7611e80a-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '504c0abd-7d31-4771-8ef9-a3494c7bb33c', NULL, NULL, NULL, NULL, NULL), ('7611e844-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '02136575-effb-4a0c-b5be-9886d20259b3', NULL, NULL, NULL, NULL, NULL), ('7611e87d-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '8412d80d-1830-4128-bc6a-019cf32afc7f', NULL, NULL, NULL, NULL, NULL), ('7611e8b5-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '0f9cd623-f319-4bb5-9751-7478abee3bd2', NULL, NULL, NULL, NULL, NULL), ('7611e8ed-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', 'a1d7bfef-f20c-4739-bfe4-cc55ed0b3fc8', NULL, NULL, NULL, NULL, NULL), ('7611e923-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '68fc74f2-1790-427a-ac22-49fb20edbe9a', NULL, NULL, NULL, NULL, NULL), ('7611e957-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '97400660-27a5-4502-a7cd-274190953a6c', NULL, NULL, NULL, NULL, NULL), ('7611e98f-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '07ece816-f983-493e-b25d-7bfb467d787d', NULL, NULL, NULL, NULL, NULL), ('7611e9c9-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', 'c124c0f3-3f1f-4635-bac7-f3e1f5503099', NULL, NULL, NULL, NULL, NULL), ('7611ea05-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '984059ca-3f9d-4ee4-9616-e409dd11991e', NULL, NULL, NULL, NULL, NULL), ('7611ea46-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '2de7c3d3-e642-4509-aff1-b2520ebfe85e', NULL, NULL, NULL, NULL, NULL), ('805b082d-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '3a5e4081-4cd5-427f-bd3a-ff7815efaf25', NULL, NULL, NULL, NULL, NULL), ('805b0a85-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '57760693-15db-4de9-9170-55ee7d1eb0eb', NULL, NULL, NULL, NULL, NULL), ('805b0abb-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '0d8bc9d7-b76b-4ec5-96e7-0df1c3426205', NULL, NULL, NULL, NULL, NULL), ('805b0ae0-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '03410ec1-1bd0-4afd-ac37-9306e00e328c', NULL, NULL, NULL, NULL, NULL), ('805b0b0f-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', 'eaa8947b-d9e7-4ca4-ba65-08965dfa620c', NULL, NULL, NULL, NULL, NULL), ('805b0b2d-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '93a58625-3730-4a07-99bd-75f174ff428d', NULL, NULL, NULL, NULL, NULL), ('805b0bdb-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '2f9bf4d5-b1d3-4cac-9df2-2c8827d65bbf', NULL, NULL, NULL, NULL, NULL), ('805b0cc1-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '1aad98e5-3f99-4c0a-aa75-ca9236de0f09', NULL, NULL, NULL, NULL, NULL), ('805b0cf8-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '5f694f25-b0fd-45f6-acbd-9dd338e196ce', NULL, NULL, NULL, NULL, NULL), ('805b0d31-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '9ecb6827-f47f-4b19-b788-81a6b55940af', NULL, NULL, NULL, NULL, NULL); + +update chart_view set chart_type ='private' +where id in ( +'84b444e1-0088-44f9-acdc-cc39018413bc', +'c68db172-2df2-4aa2-aad6-077cf1684e14', +'f8d62b2b-b99a-4b6c-8378-d7c2ec4ea766', +'c4943403-4960-4ad8-a9c5-12c46c538c34', +'f257452d-6fc1-4499-bdce-bd10b3e1c520', +'8271c4e4-43ab-48c6-b7b4-67ccaba3f80b', +'a0058881-b29f-4b5c-911f-7f1480b07eb0', +'c36cd358-0501-4f83-a323-f754485d00b1', +'95f8e3a2-62a5-48a7-a719-fcf53746da8d', +'8a26a936-89bf-45a8-b1ce-d5ef1719465d', +'8d1c3f30-0639-452e-9883-164f37353324', +'175b25df-1939-4582-a9c5-d9e8ed3ea2b1', +'c3da496f-073c-413a-bebd-e7f1a4a00ba7', +'da18eecd-feff-4140-a291-cce4abf1afaa', +'3f201733-bbb3-485e-a1d6-0fe4f00b5304', +'692d5bdc-aa70-4fce-b830-b8d6620539c6', +'aff5be0c-f195-4fce-bd2b-b8d0e63764de', +'cb66836d-a34c-40c6-87e7-0db0375ec19e', +'1d06e2a0-d936-4192-b523-2eb1e8cebd51', +'0de1d446-8300-4ab3-a4ef-4e8f8579cb2e', +'ebac2821-d1a0-4f26-b5d9-cd5c60ac75ab', +'5ad64afc-132c-40ea-8f69-2f8bfe6b31d4', +'4242cbb0-fca4-4b27-b2a7-ca576a18815e', +'c52b6d95-b404-4130-8635-5903cb8d0e84', +'2e6f8b45-116d-46c4-a287-f3054e798556', +'504c0abd-7d31-4771-8ef9-a3494c7bb33c', +'02136575-effb-4a0c-b5be-9886d20259b3', +'8412d80d-1830-4128-bc6a-019cf32afc7f', +'0f9cd623-f319-4bb5-9751-7478abee3bd2', +'a1d7bfef-f20c-4739-bfe4-cc55ed0b3fc8', +'68fc74f2-1790-427a-ac22-49fb20edbe9a', +'97400660-27a5-4502-a7cd-274190953a6c', +'07ece816-f983-493e-b25d-7bfb467d787d', +'c124c0f3-3f1f-4635-bac7-f3e1f5503099', +'984059ca-3f9d-4ee4-9616-e409dd11991e', +'2de7c3d3-e642-4509-aff1-b2520ebfe85e', +'3a5e4081-4cd5-427f-bd3a-ff7815efaf25', +'57760693-15db-4de9-9170-55ee7d1eb0eb', +'0d8bc9d7-b76b-4ec5-96e7-0df1c3426205', +'03410ec1-1bd0-4afd-ac37-9306e00e328c', +'eaa8947b-d9e7-4ca4-ba65-08965dfa620c', +'93a58625-3730-4a07-99bd-75f174ff428d', +'2f9bf4d5-b1d3-4cac-9df2-2c8827d65bbf', +'1aad98e5-3f99-4c0a-aa75-ca9236de0f09', +'5f694f25-b0fd-45f6-acbd-9dd338e196ce', +'9ecb6827-f47f-4b19-b788-81a6b55940af' +); + +delete from chart_group where id in ( +'2c200620-f2f3-4224-a41d-381fa061591b', +'3f551269-d985-4633-884d-d118704da2db', +'4de97755-5d5a-4fe0-9af0-27601f967787', +'5a8e8b0a-2f64-4d1b-aac1-d284b2b8436f', +'bc7542d8-2b7e-4909-81ff-3627b0227501', +'bfa7d87f-c76f-4406-9f19-0adccb7c568d' +) diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 02915a79c1..db35d7a38e 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -119,4 +119,4 @@ i18n_cp_exist=Column permission of the same type already exists connection_failed=Connection Failed theme_name_repeat=name of theme has been existed theme_name_empty=name can not be empty -i18n_public_chart= Public Chart +i18n_public_chart=【Public Chart】 diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index c8702d818b..a44472bba1 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -118,4 +118,4 @@ i18n_cp_exist=已有同类型的列权限存在 connection_failed=连接失败 theme_name_repeat=名称已存在 theme_name_empty=名称不能为空 -i18n_public_chart= 存量视图 +i18n_public_chart=【存量视图】 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 1f8e756ea5..11914ecbda 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -119,4 +119,4 @@ i18n_cp_exist=已有同類型的列權限存在 connection_failed=連接失敗 theme_name_repeat=名稱已存在 theme_name_empty=名稱不能為空 -i18n_public_chart= 存量视图 +i18n_public_chart=【存量视图】 diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index 6438a0b6c8..6207b3e8a0 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -188,20 +188,6 @@ - - - - - diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 7d25ec253f..bba738616c 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -801,12 +801,9 @@ export default { } }, newChart() { - this.adviceGroupId = null + this.adviceGroupId = this.panelInfo.id this.show = false - searchAdviceSceneId(this.panelInfo.id).then(res => { - this.adviceGroupId = res.data - this.$refs['chartGroup'].selectTable() - }) + this.$refs['chartGroup'].selectTable() }, newViewInfo(newViewInfo) { let component