diff --git a/web/src/assets/.DS_Store b/web/src/assets/.DS_Store index de1d8023..52e7ee6a 100644 Binary files a/web/src/assets/.DS_Store and b/web/src/assets/.DS_Store differ diff --git a/web/src/assets/img/structures/catalogOrganization.jpg b/web/src/assets/img/structures/catalogOrganization.jpg new file mode 100644 index 00000000..3a6bf3c1 Binary files /dev/null and b/web/src/assets/img/structures/catalogOrganization.jpg differ diff --git a/web/src/assets/img/structures/catalogOrganization.png b/web/src/assets/img/structures/catalogOrganization.png deleted file mode 100644 index 191dc8f5..00000000 Binary files a/web/src/assets/img/structures/catalogOrganization.png and /dev/null differ diff --git a/web/src/assets/img/structures/fishbone.jpg b/web/src/assets/img/structures/fishbone.jpg new file mode 100644 index 00000000..68515ad2 Binary files /dev/null and b/web/src/assets/img/structures/fishbone.jpg differ diff --git a/web/src/assets/img/structures/fishbone.png b/web/src/assets/img/structures/fishbone.png deleted file mode 100644 index 56b83410..00000000 Binary files a/web/src/assets/img/structures/fishbone.png and /dev/null differ diff --git a/web/src/assets/img/structures/fishbone2.jpg b/web/src/assets/img/structures/fishbone2.jpg new file mode 100644 index 00000000..c08f727c Binary files /dev/null and b/web/src/assets/img/structures/fishbone2.jpg differ diff --git a/web/src/assets/img/structures/logicalStructure.jpg b/web/src/assets/img/structures/logicalStructure.jpg new file mode 100644 index 00000000..8badf2cd Binary files /dev/null and b/web/src/assets/img/structures/logicalStructure.jpg differ diff --git a/web/src/assets/img/structures/logicalStructure.png b/web/src/assets/img/structures/logicalStructure.png deleted file mode 100644 index 14efad95..00000000 Binary files a/web/src/assets/img/structures/logicalStructure.png and /dev/null differ diff --git a/web/src/assets/img/structures/logicalStructureLeft.jpg b/web/src/assets/img/structures/logicalStructureLeft.jpg index bd3997f1..3b15fabe 100644 Binary files a/web/src/assets/img/structures/logicalStructureLeft.jpg and b/web/src/assets/img/structures/logicalStructureLeft.jpg differ diff --git a/web/src/assets/img/structures/mindMap.jpg b/web/src/assets/img/structures/mindMap.jpg new file mode 100644 index 00000000..05b19faa Binary files /dev/null and b/web/src/assets/img/structures/mindMap.jpg differ diff --git a/web/src/assets/img/structures/mindMap.png b/web/src/assets/img/structures/mindMap.png deleted file mode 100644 index de8ac320..00000000 Binary files a/web/src/assets/img/structures/mindMap.png and /dev/null differ diff --git a/web/src/assets/img/structures/organizationStructure.jpg b/web/src/assets/img/structures/organizationStructure.jpg new file mode 100644 index 00000000..f6d1e8c6 Binary files /dev/null and b/web/src/assets/img/structures/organizationStructure.jpg differ diff --git a/web/src/assets/img/structures/organizationStructure.png b/web/src/assets/img/structures/organizationStructure.png deleted file mode 100644 index 9a677151..00000000 Binary files a/web/src/assets/img/structures/organizationStructure.png and /dev/null differ diff --git a/web/src/assets/img/structures/rightFishbone.jpg b/web/src/assets/img/structures/rightFishbone.jpg new file mode 100644 index 00000000..9c65273f Binary files /dev/null and b/web/src/assets/img/structures/rightFishbone.jpg differ diff --git a/web/src/assets/img/structures/rightFishbone2.jpg b/web/src/assets/img/structures/rightFishbone2.jpg new file mode 100644 index 00000000..aa6eec58 Binary files /dev/null and b/web/src/assets/img/structures/rightFishbone2.jpg differ diff --git a/web/src/assets/img/structures/timeline.jpg b/web/src/assets/img/structures/timeline.jpg new file mode 100644 index 00000000..3cd7b9d4 Binary files /dev/null and b/web/src/assets/img/structures/timeline.jpg differ diff --git a/web/src/assets/img/structures/timeline.png b/web/src/assets/img/structures/timeline.png deleted file mode 100644 index df746cc0..00000000 Binary files a/web/src/assets/img/structures/timeline.png and /dev/null differ diff --git a/web/src/assets/img/structures/timeline2.jpg b/web/src/assets/img/structures/timeline2.jpg new file mode 100644 index 00000000..28797f6f Binary files /dev/null and b/web/src/assets/img/structures/timeline2.jpg differ diff --git a/web/src/assets/img/structures/timeline2.png b/web/src/assets/img/structures/timeline2.png deleted file mode 100644 index 9f3e8642..00000000 Binary files a/web/src/assets/img/structures/timeline2.png and /dev/null differ diff --git a/web/src/assets/img/structures/verticalTimeline.jpg b/web/src/assets/img/structures/verticalTimeline.jpg new file mode 100644 index 00000000..c4c4249c Binary files /dev/null and b/web/src/assets/img/structures/verticalTimeline.jpg differ diff --git a/web/src/assets/img/structures/verticalTimeline.png b/web/src/assets/img/structures/verticalTimeline.png deleted file mode 100644 index febe8b7e..00000000 Binary files a/web/src/assets/img/structures/verticalTimeline.png and /dev/null differ diff --git a/web/src/assets/img/structures/verticalTimeline2.jpg b/web/src/assets/img/structures/verticalTimeline2.jpg new file mode 100644 index 00000000..a52856e7 Binary files /dev/null and b/web/src/assets/img/structures/verticalTimeline2.jpg differ diff --git a/web/src/assets/img/structures/verticalTimeline3.jpg b/web/src/assets/img/structures/verticalTimeline3.jpg new file mode 100644 index 00000000..106dd38b Binary files /dev/null and b/web/src/assets/img/structures/verticalTimeline3.jpg differ diff --git a/web/src/config/constant.js b/web/src/config/constant.js index d8b3ecd7..3351d900 100644 --- a/web/src/config/constant.js +++ b/web/src/config/constant.js @@ -1,14 +1,19 @@ // 布局结构图片映射 export const layoutImgMap = { - logicalStructure: require('../assets/img/structures/logicalStructure.png'), + logicalStructure: require('../assets/img/structures/logicalStructure.jpg'), logicalStructureLeft: require('../assets/img/structures/logicalStructureLeft.jpg'), - mindMap: require('../assets/img/structures/mindMap.png'), - organizationStructure: require('../assets/img/structures/organizationStructure.png'), - catalogOrganization: require('../assets/img/structures/catalogOrganization.png'), - timeline: require('../assets/img/structures/timeline.png'), - timeline2: require('../assets/img/structures/timeline2.png'), - fishbone: require('../assets/img/structures/fishbone.png'), - verticalTimeline: require('../assets/img/structures/verticalTimeline.png') + mindMap: require('../assets/img/structures/mindMap.jpg'), + organizationStructure: require('../assets/img/structures/organizationStructure.jpg'), + catalogOrganization: require('../assets/img/structures/catalogOrganization.jpg'), + timeline: require('../assets/img/structures/timeline.jpg'), + timeline2: require('../assets/img/structures/timeline2.jpg'), + fishbone: require('../assets/img/structures/fishbone.jpg'), + fishbone2: require('../assets/img/structures/fishbone2.jpg'), + rightFishbone: require('../assets/img/structures/rightFishbone.jpg'), + rightFishbone2: require('../assets/img/structures/rightFishbone2.jpg'), + verticalTimeline: require('../assets/img/structures/verticalTimeline.jpg'), + verticalTimeline2: require('../assets/img/structures/verticalTimeline2.jpg'), + verticalTimeline3: require('../assets/img/structures/verticalTimeline3.jpg') } // 公式列表 diff --git a/web/src/config/en.js b/web/src/config/en.js index 679bcd8f..0f9f98e3 100644 --- a/web/src/config/en.js +++ b/web/src/config/en.js @@ -648,3 +648,37 @@ export const alignList = [ value: 'right' } ] + +// 结构列表 +export const layoutGroupList = [ + { + name: 'Logical structure', + list: ['logicalStructure', 'logicalStructureLeft'] + }, + { + name: 'Mind map', + list: ['mindMap'] + }, + { + name: 'Organization structure', + list: ['organizationStructure'] + }, + { + name: 'Catalog organization', + list: ['catalogOrganization'] + }, + { + name: 'Timeline', + list: [ + 'timeline', + 'timeline2', + 'verticalTimeline2', + 'verticalTimeline3', + 'verticalTimeline' + ] + }, + { + name: 'Fishbone', + list: ['fishbone', 'fishbone2', 'rightFishbone', 'rightFishbone2'] + } +] diff --git a/web/src/config/index.js b/web/src/config/index.js index b0457ded..c2760433 100644 --- a/web/src/config/index.js +++ b/web/src/config/index.js @@ -23,7 +23,8 @@ import { numberTypeList as numberTypeListZh, numberLevelList as numberLevelListZh, linearGradientDirList as linearGradientDirListZh, - alignList as alignListZh + alignList as alignListZh, + layoutGroupList as layoutGroupListZh } from './zh' import { fontFamilyList as fontFamilyListEn, @@ -40,7 +41,8 @@ import { numberTypeList as numberTypeListEn, numberLevelList as numberLevelListEn, linearGradientDirList as linearGradientDirListEn, - alignList as alignListEn + alignList as alignListEn, + layoutGroupList as layoutGroupListEn } from './en' import { fontFamilyList as fontFamilyListZhtw, @@ -57,7 +59,8 @@ import { numberTypeList as numberTypeListZhtw, numberLevelList as numberLevelListZhtw, linearGradientDirList as linearGradientDirListZhtw, - alignList as alignListZhtw + alignList as alignListZhtw, + layoutGroupList as layoutGroupListZhtw } from './zhtw' const fontFamilyList = { @@ -162,6 +165,12 @@ const alignList = { zhtw: alignListZhtw } +const layoutGroupList = { + zh: layoutGroupListZh, + en: layoutGroupListEn, + zhtw: layoutGroupListZhtw +} + export { fontSizeList, borderWidthList, @@ -187,5 +196,6 @@ export { numberTypeList, numberLevelList, linearGradientDirList, - alignList + alignList, + layoutGroupList } diff --git a/web/src/config/zh.js b/web/src/config/zh.js index 0bd8443f..af014563 100644 --- a/web/src/config/zh.js +++ b/web/src/config/zh.js @@ -745,3 +745,37 @@ export const alignList = [ value: 'right' } ] + +// 结构列表 +export const layoutGroupList = [ + { + name: '逻辑结构图', + list: ['logicalStructure', 'logicalStructureLeft'] + }, + { + name: '思维导图', + list: ['mindMap'] + }, + { + name: '组织结构图', + list: ['organizationStructure'] + }, + { + name: '目录组织图', + list: ['catalogOrganization'] + }, + { + name: '时间轴', + list: [ + 'timeline', + 'timeline2', + 'verticalTimeline2', + 'verticalTimeline3', + 'verticalTimeline' + ] + }, + { + name: '鱼骨图', + list: ['fishbone', 'fishbone2', 'rightFishbone', 'rightFishbone2'] + } +] diff --git a/web/src/config/zhtw.js b/web/src/config/zhtw.js index 3ffba8c0..12c8d93f 100644 --- a/web/src/config/zhtw.js +++ b/web/src/config/zhtw.js @@ -646,4 +646,38 @@ export const alignList = [ name: '右對齊', value: 'right' } -] \ No newline at end of file +] + +// 结构列表 +export const layoutGroupList = [ + { + name: '邏輯結構圖', + list: ['logicalStructure', 'logicalStructureLeft'] + }, + { + name: '思維導圖', + list: ['mindMap'] + }, + { + name: '組織結構圖', + list: ['organizationStructure'] + }, + { + name: '目錄組織圖', + list: ['catalogOrganization'] + }, + { + name: '時間軸', + list: [ + 'timeline', + 'timeline2', + 'verticalTimeline2', + 'verticalTimeline3', + 'verticalTimeline' + ] + }, + { + name: '魚骨圖', + list: ['fishbone', 'fishbone2', 'rightFishbone', 'rightFishbone2'] + } +] diff --git a/web/src/pages/Edit/components/NodeOuterFrame.vue b/web/src/pages/Edit/components/NodeOuterFrame.vue index e218d011..51f15284 100644 --- a/web/src/pages/Edit/components/NodeOuterFrame.vue +++ b/web/src/pages/Edit/components/NodeOuterFrame.vue @@ -475,7 +475,7 @@ export default { this.styleConfig[key] = val this.mindMap.outerFrame.updateActiveOuterFrame({ [key]: val - }) + }) }, // 切换加粗样式 @@ -528,24 +528,25 @@ export default { padding: 20px; &.isDark { - .panel { - background-color: #262a2e; - border-left-color: hsla(0, 0%, 100%, 0.1); - - .panelHeader { - .name { - color: #fff; - } + .panelHeader { + .name { + color: #fff; } + } - .panelBody { - .row { - .rowItem { - .name { - color: hsla(0, 0%, 100%, 0.6); - } + .panelBody { + .row { + .rowItem { + .name { + color: hsla(0, 0%, 100%, 0.6); } } + + .styleBtn { + background-color: #363b3f; + color: hsla(0, 0%, 100%, 0.6); + border-color: hsla(0, 0%, 100%, 0.1); + } } } } diff --git a/web/src/pages/Edit/components/Structure.vue b/web/src/pages/Edit/components/Structure.vue index f1b8a967..24c9e36f 100644 --- a/web/src/pages/Edit/components/Structure.vue +++ b/web/src/pages/Edit/components/Structure.vue @@ -1,17 +1,23 @@