diff --git a/web/src/assets/img/foramt/1.png b/web/src/assets/img/foramt/1.png
new file mode 100644
index 00000000..e160ea5c
Binary files /dev/null and b/web/src/assets/img/foramt/1.png differ
diff --git a/web/src/assets/img/foramt/10.png b/web/src/assets/img/foramt/10.png
new file mode 100644
index 00000000..f1e7762f
Binary files /dev/null and b/web/src/assets/img/foramt/10.png differ
diff --git a/web/src/assets/img/foramt/2.png b/web/src/assets/img/foramt/2.png
new file mode 100644
index 00000000..a25a4bf1
Binary files /dev/null and b/web/src/assets/img/foramt/2.png differ
diff --git a/web/src/assets/img/foramt/3.png b/web/src/assets/img/foramt/3.png
new file mode 100644
index 00000000..4781185d
Binary files /dev/null and b/web/src/assets/img/foramt/3.png differ
diff --git a/web/src/assets/img/foramt/4.png b/web/src/assets/img/foramt/4.png
new file mode 100644
index 00000000..86e7f914
Binary files /dev/null and b/web/src/assets/img/foramt/4.png differ
diff --git a/web/src/assets/img/foramt/5.png b/web/src/assets/img/foramt/5.png
new file mode 100644
index 00000000..da0a58b1
Binary files /dev/null and b/web/src/assets/img/foramt/5.png differ
diff --git a/web/src/assets/img/foramt/6.png b/web/src/assets/img/foramt/6.png
new file mode 100644
index 00000000..e607da86
Binary files /dev/null and b/web/src/assets/img/foramt/6.png differ
diff --git a/web/src/assets/img/foramt/7.png b/web/src/assets/img/foramt/7.png
new file mode 100644
index 00000000..f6d1b786
Binary files /dev/null and b/web/src/assets/img/foramt/7.png differ
diff --git a/web/src/assets/img/foramt/8.png b/web/src/assets/img/foramt/8.png
new file mode 100644
index 00000000..8de0a046
Binary files /dev/null and b/web/src/assets/img/foramt/8.png differ
diff --git a/web/src/assets/img/foramt/9.png b/web/src/assets/img/foramt/9.png
new file mode 100644
index 00000000..a904f8ab
Binary files /dev/null and b/web/src/assets/img/foramt/9.png differ
diff --git a/web/src/config/en.js b/web/src/config/en.js
index 69500e3a..9490f65e 100644
--- a/web/src/config/en.js
+++ b/web/src/config/en.js
@@ -465,12 +465,6 @@ export const downTypeList = [
desc:
'SimpleMindMap private format, can be used for re import, and the client can directly edit it'
},
- {
- name: 'JSON',
- type: 'json',
- icon: 'iconjson',
- desc: 'Popular data exchange format that can be used for re importing'
- },
{
name: 'Image',
type: 'png',
@@ -507,6 +501,12 @@ export const downTypeList = [
icon: 'iconTXT',
desc: 'Plain text file'
},
+ {
+ name: 'Excel',
+ type: 'xlsx',
+ icon: 'iconfile-excel',
+ desc: 'Table text format, editable with Excel software'
+ },
{
name: 'FreeMind',
type: 'mm',
@@ -514,11 +514,11 @@ export const downTypeList = [
desc: 'FreeMind software format'
},
{
- name: 'Excel',
- type: 'xlsx',
- icon: 'iconfile-excel',
- desc: 'Table text format, editable with Excel software'
- }
+ name: 'JSON',
+ type: 'json',
+ icon: 'iconjson',
+ desc: 'Popular data exchange format that can be used for re importing'
+ },
]
// 编号类型列表
diff --git a/web/src/config/zh.js b/web/src/config/zh.js
index ce86b946..9d7cbe3e 100644
--- a/web/src/config/zh.js
+++ b/web/src/config/zh.js
@@ -562,12 +562,6 @@ export const downTypeList = [
icon: 'iconwenjian',
desc: 'SimpleMindMap私有格式,可用于再次导入,客户端可直接编辑'
},
- {
- name: 'JSON',
- type: 'json',
- icon: 'iconjson',
- desc: '流行的数据交换格式,可用于再次导入'
- },
{
name: '图片',
type: 'png',
@@ -604,6 +598,12 @@ export const downTypeList = [
icon: 'iconTXT',
desc: '纯文本文件'
},
+ {
+ name: 'Excel',
+ type: 'xlsx',
+ icon: 'iconfile-excel',
+ desc: '表格文本形式,可用Excel软件编辑'
+ },
{
name: 'FreeMind',
type: 'mm',
@@ -611,11 +611,11 @@ export const downTypeList = [
desc: 'FreeMind软件格式'
},
{
- name: 'Excel',
- type: 'xlsx',
- icon: 'iconfile-excel',
- desc: '表格文本形式,可用Excel软件编辑'
- }
+ name: 'JSON',
+ type: 'json',
+ icon: 'iconjson',
+ desc: '流行的数据交换格式,可用于再次导入'
+ },
]
// 编号类型列表
diff --git a/web/src/config/zhtw.js b/web/src/config/zhtw.js
index b8d184a1..1fe657ef 100644
--- a/web/src/config/zhtw.js
+++ b/web/src/config/zhtw.js
@@ -464,12 +464,6 @@ export const downTypeList = [
icon: 'iconwenjian',
desc: 'SimpleMindMap私有格式,可用于再次導入,客戶端可直接編輯'
},
- {
- name: 'JSON',
- type: 'json',
- icon: 'iconjson',
- desc: '流行的數據交換格式,可用于再次導入'
- },
{
name: '圖片',
type: 'png',
@@ -506,6 +500,12 @@ export const downTypeList = [
icon: 'iconTXT',
desc: '純文本文件'
},
+ {
+ name: 'Excel',
+ type: 'xlsx',
+ icon: 'iconfile-excel',
+ desc: '表格文本形式,可用Excel軟件編輯'
+ },
{
name: 'FreeMind',
type: 'mm',
@@ -513,11 +513,11 @@ export const downTypeList = [
desc: 'FreeMind軟件格式'
},
{
- name: 'Excel',
- type: 'xlsx',
- icon: 'iconfile-excel',
- desc: '表格文本形式,可用Excel軟件編輯'
- }
+ name: 'JSON',
+ type: 'json',
+ icon: 'iconjson',
+ desc: '流行的數據交換格式,可用于再次導入'
+ },
]
// 編號類型列表
diff --git a/web/src/lang/zh_cn.js b/web/src/lang/zh_cn.js
index a1bf48a4..161c99e7 100644
--- a/web/src/lang/zh_cn.js
+++ b/web/src/lang/zh_cn.js
@@ -146,8 +146,8 @@ export default {
nodes: '节点'
},
dialog: {
- cancel: '取 消',
- confirm: '确 定'
+ cancel: '取消',
+ confirm: '确定'
},
export: {
title: '导出',
diff --git a/web/src/pages/Edit/components/Export.vue b/web/src/pages/Edit/components/Export.vue
index af2251d3..7d1a5f1a 100644
--- a/web/src/pages/Edit/components/Export.vue
+++ b/web/src/pages/Edit/components/Export.vue
@@ -12,16 +12,6 @@
:top="isMobile ? '20px' : '15vh'"
>
-
-
- {{ $t('export.filename') }}
-
-
@@ -33,97 +23,123 @@
:class="{ active: exportType === item.type }"
@click="exportType = item.type"
>
-
+
{{ item.name }}
-
-
-
{{ $t('export.desc') }}
-
- {{ currentTypeData ? currentTypeData.desc : '' }}
+
+
+
-
-
{{ $t('export.options') }}
-
-
-
{{
- $t('export.include')
- }}
+
+
+
+
{{ $t('export.format') }}
+
+ {{ currentTypeData ? '.' + currentTypeData.type : '' }}
-
-
- {{ $t('export.format') }}
-
- PNG
- JPG
-
-
-
- {{ $t('export.paddingX') }}
-
-
-
- {{ $t('export.paddingY') }}
-
-
-
- {{
- this.$t('export.addFooterText')
- }}
-
-
-
- {{ $t('export.isTransparent') }}
-
-
- {{
- $t('export.isFitBg')
+
+
+
{{ $t('export.desc') }}
+
+ {{ currentTypeData ? currentTypeData.desc : '' }}
+
+
+
+
{{ $t('export.options') }}
+
无
+
+
+ {{
+ $t('export.include')
}}
+
+
+ {{ $t('export.format') }}
+
+ PNG
+ JPG
+
+
+
+ {{ $t('export.paddingX') }}
+
+
+
+ {{ $t('export.paddingY') }}
+
+
+
+ {{
+ this.$t('export.addFooterText')
+ }}
+
+
+
+ {{ $t('export.isTransparent') }}
+
+
+ {{
+ $t('export.isFitBg')
+ }}
+
+
+
+
+ {{
+ $t('dialog.cancel')
+ }}
+ {{
+ $t('export.confirm')
+ }}
+
-
@@ -184,6 +200,10 @@ export default {
showFitBgOption() {
return ['png', 'pdf'].includes(this.exportType) && !this.isTransparent
+ },
+
+ noOptions() {
+ return ['md', 'xmind', 'txt', 'xlsx', 'mm'].includes(this.exportType)
}
},
created() {
@@ -284,14 +304,10 @@ export default {
.nodeExportDialog {
.exportContainer {
&.isDark {
- .nameInputBox {
- .name {
- color: hsla(0, 0%, 100%, 0.6);
- }
- }
-
.downloadTypeSelectBox {
.downloadTypeList {
+ background-color: #363b3f;
+
.downloadTypeItem {
background-color: #363b3f;
@@ -306,15 +322,39 @@ export default {
}
.downloadTypeContent {
- .contentRow {
- .contentName {
- color: hsla(0, 0%, 100%, 0.6);
+ .nameInputBox {
+ border-bottom: 1px solid hsla(0, 0%, 100%, 0.6);
+
+ .nameInput {
+ .name {
+ color: hsla(0, 0%, 100%, 0.6);
+ }
}
- .contentValue {
+ .closeBtn {
color: hsla(0, 0%, 100%, 0.6);
}
}
+
+ .contentBox {
+ .contentRow {
+ .contentName {
+ color: hsla(0, 0%, 100%, 0.6);
+ }
+
+ .contentValue {
+ color: hsla(0, 0%, 100%, 0.6);
+
+ &.info {
+ background-color: transparent;
+ }
+ }
+ }
+ }
+
+ .btnList {
+ border-top: 1px solid hsla(0, 0%, 100%, 0.6);
+ }
}
}
}
@@ -332,10 +372,17 @@ export default {
}
}
+ /deep/ .el-dialog {
+ border-radius: 10px;
+ overflow: hidden;
+
+ .el-dialog__header {
+ display: none;
+ }
+ }
+
/deep/ .el-dialog__body {
padding: 0;
- border-top: 1px solid #f2f4f7;
- border-bottom: 1px solid #f2f4f7;
.el-checkbox__input.is-checked + .el-checkbox__label {
color: #409eff !important;
@@ -359,11 +406,13 @@ export default {
align-items: center;
overflow-x: auto;
height: 60px;
+ overflow-y: hidden;
.downloadTypeItem {
width: 100px;
flex-shrink: 0;
- padding-left: 10px;
+ padding-left: 5px;
+ padding-right: 5px;
.icon {
margin-right: 5px;
@@ -376,21 +425,33 @@ export default {
}
.downloadTypeContent {
- .contentRow {
- flex-direction: column;
+ .nameInputBox {
+ height: 70px;
- .contentName {
- margin-bottom: 10px;
+ .nameInput {
+ .name {
+ margin-bottom: 5px;
+ }
}
+ }
- .contentValue {
- .valueItem {
- .valueSubItem {
- display: flex;
- flex-direction: column;
+ .contentBox {
+ .contentRow {
+ flex-direction: column;
- .name {
- margin-bottom: 5px;
+ .contentName {
+ margin-bottom: 10px;
+ }
+
+ .contentValue {
+ .valueItem {
+ .valueSubItem {
+ display: flex;
+ flex-direction: column;
+
+ .name {
+ margin-bottom: 5px;
+ }
}
}
}
@@ -403,25 +464,11 @@ export default {
.exportContainer {
width: 100%;
- height: 450px;
+ height: 552px;
overflow: hidden;
display: flex;
flex-direction: column;
- .nameInputBox {
- display: flex;
- align-items: center;
- justify-content: center;
- flex-wrap: wrap;
- height: 50px;
- flex-shrink: 0;
- border-bottom: 1px solid #f2f4f7;
-
- .name {
- margin-right: 10px;
- }
- }
-
.downloadTypeSelectBox {
width: 100%;
height: 100%;
@@ -429,17 +476,18 @@ export default {
display: flex;
.downloadTypeList {
- width: 210px;
+ width: 208px;
height: 100%;
overflow-y: auto;
overflow-x: hidden;
background-color: #f2f4f7;
flex-shrink: 0;
+ padding: 16px 0;
.downloadTypeItem {
width: 100%;
- height: 60px;
- padding-left: 28px;
+ height: 52px;
+ padding: 0 30px;
overflow: hidden;
display: flex;
align-items: center;
@@ -457,40 +505,7 @@ export default {
.icon {
font-size: 25px;
- margin-right: 15px;
- flex-shrink: 0;
-
- &.png {
- color: #ffc038;
- }
-
- &.pdf {
- color: #ff6c4d;
- }
-
- &.md {
- color: #2b2b2b;
- }
-
- &.json {
- color: #12c87e;
- }
-
- &.svg {
- color: #4380ff;
- }
-
- &.smm {
- color: #409eff;
- }
-
- &.xmind {
- color: #f55e5e;
- }
-
- &.txt {
- color: #70798e;
- }
+ font-weight: 700;
&.checked {
color: #409eff;
@@ -500,53 +515,182 @@ export default {
}
}
+ .typeIcon {
+ margin-right: 18px;
+ flex-shrink: 0;
+ width: 23px;
+ height: 26px;
+ background-size: cover;
+
+ &.png {
+ background-image: url('../../../assets/img/foramt/2.png');
+ }
+
+ &.pdf {
+ background-image: url('../../../assets/img/foramt/4.png');
+ }
+
+ &.md {
+ background-image: url('../../../assets/img/foramt/5.png');
+ }
+
+ &.json {
+ background-image: url('../../../assets/img/foramt/10.png');
+ }
+
+ &.svg {
+ background-image: url('../../../assets/img/foramt/3.png');
+ }
+
+ &.smm {
+ background-image: url('../../../assets/img/foramt/1.png');
+ }
+
+ &.xmind {
+ background-image: url('../../../assets/img/foramt/6.png');
+ }
+
+ &.txt {
+ background-image: url('../../../assets/img/foramt/7.png');
+ }
+
+ &.mm {
+ background-image: url('../../../assets/img/foramt/8.png');
+ }
+
+ &.xlsx {
+ background-image: url('../../../assets/img/foramt/9.png');
+ }
+ }
+
.name {
- color: #1a1a1a;
+ color: #333;
font-size: 15px;
- margin-bottom: 5px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+ font-weight: bold;
}
}
}
.downloadTypeContent {
- padding: 30px;
+ width: 100%;
height: 100%;
- overflow-y: auto;
- overflow-x: hidden;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
- .contentRow {
+ .nameInputBox {
display: flex;
- font-size: 14px;
- margin-bottom: 20px;
+ align-items: center;
+ justify-content: space-between;
+ height: 67px;
+ flex-shrink: 0;
+ border-bottom: 1px solid #f2f4f7;
+ padding-left: 40px;
+ padding-right: 20px;
+ padding-top: 16px;
- .contentName {
- width: 80px;
- color: #666;
+ .nameInput {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ width: 100%;
+ font-weight: bold;
+
+ .name {
+ margin-right: 10px;
+ font-size: 15px;
+ color: #333;
+ font-weight: bold;
+ }
}
- .contentValue {
- color: #1a1a1a;
+ .closeBtn {
+ font-size: 20px;
+ cursor: pointer;
+ }
+ }
- .valueItem {
- .valueSubItem {
- margin-bottom: 12px;
- display: flex;
+ .contentBox {
+ height: 100%;
+ overflow-y: auto;
+ overflow-x: hidden;
+ padding: 15px 40px;
- &:last-of-type {
- margin-right: 0;
- }
+ .contentRow {
+ display: flex;
+ font-size: 14px;
+ margin-bottom: 20px;
- .name {
- margin-right: 12px;
- width: 100px;
+ &:last-of-type {
+ margin-bottom: 0;
+ }
+
+ .contentName {
+ width: 45px;
+ color: #808080;
+ flex-shrink: 0;
+ font-size: 13px;
+ font-weight: 500;
+ line-height: 25px;
+ }
+
+ .contentValue {
+ color: #808080;
+ line-height: 23px;
+ font-weight: 500;
+ border: 1px solid transparent;
+ font-size: 14px;
+
+ &.info {
+ color: rgb(90, 158, 247);
+ background-color: rgb(245, 248, 249);
+ border: 1px solid rgb(90, 158, 247);
+ border-radius: 5px;
+ padding: 0 16px;
+ }
+
+ .valueItem {
+ .valueSubItem {
+ margin-bottom: 12px;
+ display: flex;
+ align-items: center;
+
+ &:last-of-type {
+ margin-right: 0;
+ }
+
+ &.alignCenter {
+ align-items: center;
+ }
+
+ .name {
+ margin-right: 12px;
+ width: 85px;
+ }
}
}
}
}
}
+
+ .btnList {
+ padding: 0 40px;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ height: 69px;
+ flex-shrink: 0;
+ border-top: 1px solid #f2f4f7;
+
+ /deep/ .el-button--small {
+ height: 25px;
+ padding: 0 30px;
+ border-radius: 5px;
+ }
+ }
}
}
}