diff --git a/simple-mind-map/src/constants/defaultOptions.js b/simple-mind-map/src/constants/defaultOptions.js index d144a5a2..f4e9004c 100644 --- a/simple-mind-map/src/constants/defaultOptions.js +++ b/simple-mind-map/src/constants/defaultOptions.js @@ -128,7 +128,8 @@ export const defaultOpt = { // 拖拽元素时,指示元素新位置的块的最大高度 nodeDragPlaceholderMaxSize: 20, // 是否在存在一个激活节点时,当按下中文、英文、数字按键时自动进入文本编辑模式 - enableAutoEnterTextEditWhenKeydown: true, + // 开启该特性后,需要给你的输入框绑定keydown事件,并禁止冒泡 + enableAutoEnterTextEditWhenKeydown: false, // 设置富文本节点编辑框和节点大小一致,形成伪原地编辑的效果 // 需要注意的是,只有当节点内只有文本、且形状是矩形才会有比较好的效果 richTextEditFakeInPlace: false diff --git a/web/src/pages/Edit/components/BaseStyle.vue b/web/src/pages/Edit/components/BaseStyle.vue index b3f99296..d068ca7d 100644 --- a/web/src/pages/Edit/components/BaseStyle.vue +++ b/web/src/pages/Edit/components/BaseStyle.vue @@ -277,7 +277,9 @@
- {{ $t('baseStyle.associativeLineActiveColor') }} + {{ + $t('baseStyle.associativeLineActiveColor') + }}
- {{ $t('baseStyle.associativeLineActiveWidth') }} + {{ + $t('baseStyle.associativeLineActiveWidth') + }} {{ $t('baseStyle.nodeBorderType') }}
- {{ $t('baseStyle.nodeUseLineStyle') }} + " + >{{ $t('baseStyle.nodeUseLineStyle') }}
@@ -520,7 +528,11 @@
- {{ $t('baseStyle.showWatermark') }} + {{ $t('baseStyle.showWatermark') }}
@@ -592,17 +648,25 @@
- {{ $t('baseStyle.enableFreeDrag') }} + " + >{{ $t('baseStyle.enableFreeDrag') }}
- {{ $t('baseStyle.isEnableNodeRichText') }} + {{ $t('baseStyle.isEnableNodeRichText') }}
@@ -620,15 +684,23 @@ } " > - - + +
- {{ $t('baseStyle.mousewheelZoomActionReverse') }} + {{ + $t('baseStyle.mousewheelZoomActionReverse') + }} - - + +
@@ -652,7 +730,16 @@ @@ -958,7 +1057,7 @@ export default { .row { .rowItem { .name { - color: hsla(0,0%,100%,.6); + color: hsla(0, 0%, 100%, 0.6); } } } diff --git a/web/src/pages/Edit/components/Edit.vue b/web/src/pages/Edit/components/Edit.vue index a7ad8040..e77fa748 100644 --- a/web/src/pages/Edit/components/Edit.vue +++ b/web/src/pages/Edit/components/Edit.vue @@ -275,7 +275,8 @@ export default { ...(config || {}), iconList: icon, useLeftKeySelectionRightKeyDrag: this.useLeftKeySelectionRightKeyDrag, - customInnerElsAppendTo: null + customInnerElsAppendTo: null, + enableAutoEnterTextEditWhenKeydown: true, // isUseCustomNodeContent: true, // 示例1:组件里用到了router、store、i18n等实例化vue组件时需要用到的东西 // customCreateNodeContent: (node) => { diff --git a/web/src/pages/Edit/components/Export.vue b/web/src/pages/Edit/components/Export.vue index 60fb8852..35f45957 100644 --- a/web/src/pages/Edit/components/Export.vue +++ b/web/src/pages/Edit/components/Export.vue @@ -16,6 +16,7 @@ style="width: 300px" v-model="fileName" size="mini" + @keydown.native.stop > {{ $t('export.paddingY') @@ -43,6 +45,7 @@ v-model="paddingY" size="mini" @change="onPaddingChange" + @keydown.native.stop >
{{ $t('nodeHyperlink.name') }} - +
{{ $t('dialog.cancel') }} diff --git a/web/src/pages/Edit/components/NodeImage.vue b/web/src/pages/Edit/components/NodeImage.vue index 9e5a597d..cf5655e2 100644 --- a/web/src/pages/Edit/components/NodeImage.vue +++ b/web/src/pages/Edit/components/NodeImage.vue @@ -18,12 +18,13 @@ v-model="imgUrl" size="mini" placeholder="http://xxx.com/xx.jpg" + @keydown.native.stop >
可选
{{ $t('nodeImage.imgTitle') }} - +
{{ $t('dialog.cancel') }} diff --git a/web/src/pages/Edit/components/NodeNote.vue b/web/src/pages/Edit/components/NodeNote.vue index 0f4786cd..6567e139 100644 --- a/web/src/pages/Edit/components/NodeNote.vue +++ b/web/src/pages/Edit/components/NodeNote.vue @@ -12,7 +12,7 @@ v-model="note" > --> -
+
{{ $t('dialog.cancel') }} diff --git a/web/src/pages/Edit/components/NodeTag.vue b/web/src/pages/Edit/components/NodeTag.vue index b12e093b..7b7de7a7 100644 --- a/web/src/pages/Edit/components/NodeTag.vue +++ b/web/src/pages/Edit/components/NodeTag.vue @@ -9,6 +9,7 @@ v-model="tag" @keyup.native.enter="add" @keyup.native.stop + @keydown.native.stop :disabled="tagArr.length >= max" :placeholder="$t('nodeTag.addTip')" > diff --git a/web/src/pages/Edit/components/Search.vue b/web/src/pages/Edit/components/Search.vue index 15fbc512..5d4de10d 100644 --- a/web/src/pages/Edit/components/Search.vue +++ b/web/src/pages/Edit/components/Search.vue @@ -14,6 +14,7 @@ size="small" v-model="searchText" @keyup.native.enter.stop="onSearchNext" + @keydown.native.stop > {{