From 17060f00f3f42425f49e1824783bf00cbb91c3e4 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Mon, 12 Dec 2022 18:13:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=A2=84?=
=?UTF-8?q?=E8=A7=88=E9=A1=B5=E4=BA=A4=E4=BA=92=E8=AE=BE=E8=AE=A1=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/icons/svg/cancel_release.svg | 1 +
.../icons/svg/icon_bottom-align_outlined.svg | 4 +
.../src/icons/svg/icon_pc_outlined_copy.svg | 3 +
.../icons/svg/icon_share-label_outlined.svg | 3 +
frontend/src/icons/svg/icon_yes_outlined.svg | 3 +
frontend/src/icons/svg/release.svg | 1 +
frontend/src/lang/en.js | 1 +
frontend/src/lang/tw.js | 1 +
frontend/src/lang/zh.js | 1 +
frontend/src/styles/index.scss | 31 +-
.../src/views/panel/list/PanelViewShow.vue | 298 ++++++++++--------
11 files changed, 215 insertions(+), 132 deletions(-)
create mode 100644 frontend/src/icons/svg/cancel_release.svg
create mode 100644 frontend/src/icons/svg/icon_bottom-align_outlined.svg
create mode 100644 frontend/src/icons/svg/icon_pc_outlined_copy.svg
create mode 100644 frontend/src/icons/svg/icon_share-label_outlined.svg
create mode 100644 frontend/src/icons/svg/icon_yes_outlined.svg
create mode 100644 frontend/src/icons/svg/release.svg
diff --git a/frontend/src/icons/svg/cancel_release.svg b/frontend/src/icons/svg/cancel_release.svg
new file mode 100644
index 0000000000..30c5911586
--- /dev/null
+++ b/frontend/src/icons/svg/cancel_release.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/src/icons/svg/icon_bottom-align_outlined.svg b/frontend/src/icons/svg/icon_bottom-align_outlined.svg
new file mode 100644
index 0000000000..8b4ff267e6
--- /dev/null
+++ b/frontend/src/icons/svg/icon_bottom-align_outlined.svg
@@ -0,0 +1,4 @@
+
diff --git a/frontend/src/icons/svg/icon_pc_outlined_copy.svg b/frontend/src/icons/svg/icon_pc_outlined_copy.svg
new file mode 100644
index 0000000000..b5ce9a288d
--- /dev/null
+++ b/frontend/src/icons/svg/icon_pc_outlined_copy.svg
@@ -0,0 +1,3 @@
+
diff --git a/frontend/src/icons/svg/icon_share-label_outlined.svg b/frontend/src/icons/svg/icon_share-label_outlined.svg
new file mode 100644
index 0000000000..9538478a01
--- /dev/null
+++ b/frontend/src/icons/svg/icon_share-label_outlined.svg
@@ -0,0 +1,3 @@
+
diff --git a/frontend/src/icons/svg/icon_yes_outlined.svg b/frontend/src/icons/svg/icon_yes_outlined.svg
new file mode 100644
index 0000000000..6de4ef4c4d
--- /dev/null
+++ b/frontend/src/icons/svg/icon_yes_outlined.svg
@@ -0,0 +1,3 @@
+
diff --git a/frontend/src/icons/svg/release.svg b/frontend/src/icons/svg/release.svg
new file mode 100644
index 0000000000..2cc2ff928d
--- /dev/null
+++ b/frontend/src/icons/svg/release.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 0e60657ed2..d7f22e6962 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -2060,6 +2060,7 @@ export default {
who_share: 'Who share',
when_share: 'When share',
share_to: 'Share to',
+ share_to_some: 'Share [{some}] to',
org: 'Orgnization',
role: 'Role',
user: 'User',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 7f1ea13338..1a173d03b4 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -2054,6 +2054,7 @@ export default {
who_share: '分享人',
when_share: '分享時間',
share_to: '分享對象',
+ share_to_some: '把[{some}]分享給',
org: '組織',
role: '角色',
user: '用戶',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 8e63fcc65d..16a158bedd 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -2054,6 +2054,7 @@ export default {
who_share: '分享人',
when_share: '分享时间',
share_to: '分享对象',
+ share_to_some: '把[{some}]分享给',
org: '组织',
role: '角色',
user: '用户',
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 527e90bca6..1734757d90 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -1407,6 +1407,10 @@ div:focus {
}
}
+.de-card-dropdown-right {
+ margin: 0px !important;
+}
+
.de-search-table {
.top-operate {
margin-bottom: 16px;
@@ -1458,13 +1462,7 @@ div:focus {
}
}
- .el-tree-node__content {
- height: 40px;
- border-radius: 4px;
-
- &:hover {
- background: rgba(31, 35, 41, 0.1);
- }
+ .el-tree-node__content, .de-el-tree-node__content {
.el-icon-more,
.el-icon-plus {
@@ -1489,6 +1487,25 @@ div:focus {
border-radius: 4px;
}
}
+ .el-tree-node__content {
+ height: 40px;
+ border-radius: 4px;
+
+ &:hover {
+ background: rgba(31, 35, 41, 0.1);
+ }
+ }
+
+ .de-el-tree-node__content {
+ .el-button--text {
+ padding: 0 !important;
+ }
+ .el-icon-more {
+ width: 32px;
+ height: 32px;
+ line-height: 32px;
+ }
+ }
}
.de-text-btn {
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index 48118c3784..5f4dcd59be 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -59,139 +59,155 @@
v-if="hasDataPermission('manage',panelInfo.privileges)&&activeTab==='PanelList'&&!panelInfo.sourcePanelName"
style="float: right;margin-right: 10px"
>
-
{{ $t('commons.edit') }}
-
-
-
-
-
- {{ $t('commons.unpublished') }}
- {{ $t('commons.publish') }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('panel.export_to_panel') }}
- {{ $t('panel.export_to_pdf') }}
- {{ $t('panel.export_to_img') }}
- {{ $t('panel.export_to_app') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+ {{ $t('panel.share') }}
+
+
+
+ {{ $t('panel.fullscreen_preview') }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('panel.new_tab_preview') }}
+
+
+
+ {{ $t('panel.store') }}
+
+
+
+ {{ $t('commons.cancel') + $t('panel.store') }}
+
+
+
+ {{ $t('commons.refresh') + $t('chart.chart_data') }}
+
+
+
+
+ {{ $t('panel.save_to_panel') }}
+
+
+
+
+ {{ $t(`commons.${ panelInfo.status==='publish' ? 'unpublished' : 'publish'}`) }}
+
+
+
+
+
+ 导出为
+
+
+
+ {{ $t('panel.export_to_panel') }}
+ {{ $t('panel.export_to_pdf') }}
+ {{ $t('panel.export_to_img') }}
+ {{ $t('panel.export_to_app') }}
+
+
+
+
+
@@ -314,6 +330,20 @@
/>
+
+
+
+