From a14ea5c724aec7104b70ce76508f11ebce6c0a4b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 9 Jul 2021 11:46:49 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=A1=A5=E5=85=85=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/language/cn.js      | 14 ++++++++-
 .../src/components/common/language/en.js      | 16 ++++++++--
 .../common/project/L5/CanvasContextMenu.vue   | 27 +++++++++-------
 .../common/project/L5/CanvasProps.vue         | 31 +++++++------------
 4 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 5b48789ee..61387fdbb 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -1435,7 +1435,19 @@ const cn = {
       selMod: '请为所有节点绑定module',
       none: '无',
       previewExit: '继续编辑',
-      iconColor: '图标颜色'
+      iconColor: '图标颜色',
+      maxWidth: '最大宽度',
+      nodeWidth: '节点宽度',
+      nodeHeight: '节点高度',
+      spaceWidth: '水平间距',
+      spaceHeight: '垂直间距',
+      onLayout: '开始排版',
+      top: '置顶',
+      bottom: '置底',
+      delete: '删除',
+      cut: '剪切',
+      copy: '复制',
+      paste: '粘贴'
     },
     update: '更新'
   },
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index a9fd68f78..97b93aaf3 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -1440,9 +1440,21 @@ const en = {
       selMod: 'Please bind module for all nodes',
       none: 'None',
       previewExit: 'Continue',
-      iconColor: 'Icon color'
+      iconColor: 'Icon color',
+      maxWidth: 'Max width',
+      nodeWidth: 'Node width',
+      nodeHeight: 'Node height',
+      spaceWidth: 'Space width',
+      spaceHeight: 'Space height',
+      onLayout: 'Layout',
+      top: 'Top',
+      bottom: 'Bottom',
+      delete: 'Delete',
+      cut: 'Cut',
+      copy: 'Copy',
+      paste: 'Paste'
     },
-    update: '更新'
+    update: 'Update'
   },
   date: {
     week: {
diff --git a/nezha-fronted/src/components/common/project/L5/CanvasContextMenu.vue b/nezha-fronted/src/components/common/project/L5/CanvasContextMenu.vue
index b37d1bd00..92d5dbdec 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasContextMenu.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasContextMenu.vue
@@ -1,37 +1,40 @@
 <template>
   <div class="menus">
     <div>
-      <a :class="{disabled:!props.node && !props.nodes}" @click="onTop()">置顶</a>
+      <a :class="{disabled:!props.node && !props.nodes}" @click="onTop()">{{$t('project.topology.top')}}</a>
     </div>
     <div>
-      <a :class="{disabled:!props.node && !props.nodes}" @click="onBottom()">置底</a>
+      <a :class="{disabled:!props.node && !props.nodes}" @click="onBottom()">{{$t('project.topology.bottom')}}</a>
     </div>
     <div class="line"></div>
     <div>
-      <a :class="{disabled:!props.node && !props.nodes && !props.line}" @click="onDel()">删除</a>
-    </div>
-    <div v-if="props.nodes">
-      <a @click="onCombine()">组合</a>
-    </div>
-    <div v-if="props.node && props.node.name === 'combine'">
-      <a @click="onUncombine()">取消组合</a>
+      <a :class="{disabled:!props.node && !props.nodes && !props.line}" @click="onDel()">{{$t('project.topology.delete')}}</a>
     </div>
+<!--    <div v-if="props.nodes">-->
+<!--      <a @click="onCombine()">组合</a>-->
+<!--      <div>-->
+<!--        <a @click="onCombine(true)">包含</a>-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <div v-if="props.node && props.node.name === 'combine'">-->
+<!--      <a @click="onUncombine()">取消组合/包含</a>-->
+<!--    </div>-->
     <div class="line"></div>
     <div>
       <a @click="canvascut()" class="flex">
-        <span class="full">剪切</span>
+        <span class="full">{{$t('project.topology.cut')}}</span>
         <span class="ml50">Ctrl + X</span>
       </a>
     </div>
     <div>
       <a @click="canvascopy()" class="flex">
-        <span class="full">复制</span>
+        <span class="full">{{$t('project.topology.copy')}}</span>
         <span class="ml50">Ctrl + C</span>
       </a>
     </div>
     <div>
       <a @click="canvaspaste()" class="flex">
-        <span class="full">粘贴</span>
+        <span class="full">{{$t('project.topology.paste')}}</span>
         <span class="ml50">Ctrl + V</span>
       </a>
     </div>
diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
index 1f593423f..083266618 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -730,52 +730,44 @@
         <el-collapse-item title="排版" name="2" v-if="selection.pens">
           <div class="mt10">
             <div class="flex middle mb10">
-              <label>最大宽度：</label>
+              <label>{{$t('project.topology.maxWidth')}}：</label>
               <div class="full pr10">
-                <el-input-number :precision="2" controls-position="right" type="number" class="input" size="small"
+                <el-input-number :precision="0" controls-position="right" type="number" class="input" size="small"
                                  v-model.number="layout.maxWidth" title="超出最大宽度换行"></el-input-number>
               </div>
             </div>
             <div class="flex middle mb10">
-              <label>节点宽度：</label>
+              <label>{{$t('project.topology.nodeWidth')}}：</label>
               <div class="full pr10">
-                <el-input-number :precision="2" controls-position="right" type="number" class="input" size="small"
+                <el-input-number :precision="0" controls-position="right" type="number" class="input" size="small"
                                  v-model.number="layout.nodeWidth" title="固定每个节点的宽度"></el-input-number>
               </div>
             </div>
             <div class="flex middle mb10">
-              <label>节点高度：</label>
+              <label>{{$t('project.topology.nodeHeight')}}：</label>
               <div class="full pr10">
-                <el-input-number :precision="2" controls-position="right" type="number" class="input" size="small"
+                <el-input-number :precision="0" controls-position="right" type="number" class="input" size="small"
                                  v-model.number="layout.nodeHeight" title="固定每个节点的高度"></el-input-number>
               </div>
             </div>
             <div class="flex middle mb10">
-              <label>水平个数：</label>
+              <label>{{$t('project.topology.spaceWidth')}}：</label>
               <div class="full pr10">
-                <el-input-number :precision="2" type="number" controls-position="right" class="input" size="small"
-                                 v-model.number="layout.maxCount"
-                                 title="超出最大个数，将自动计算水平间距（下面水平间距设置将无效）"></el-input-number>
-              </div>
-            </div>
-            <div class="flex middle mb10">
-              <label>水平间距：</label>
-              <div class="full pr10">
-                <el-input-number :precision="2" controls-position="right" type="number" class="input" size="small"
+                <el-input-number :precision="0" controls-position="right" type="number" class="input" size="small"
                                  v-model.number="layout.spaceWidth" title="节点之间水平间距（px）"></el-input-number>
               </div>
             </div>
             <div class="flex middle mb10">
-              <label>垂直间距：</label>
+              <label>{{$t('project.topology.spaceHeight')}}：</label>
               <div class="full pr10">
-                <el-input-number :precision="2" controls-position="right" type="number" class="input" size="small"
+                <el-input-number :precision="0" controls-position="right" type="number" class="input" size="small"
                                  v-model.number="layout.spaceHeight" title="节点之间垂直间距（px）"></el-input-number>
               </div>
             </div>
             <div class="flex middle">
               <label></label>
               <div class="full pr10">
-                <button class="button primary" @click="onLayout">开始排版</button>
+                <button class="button primary" @click="onLayout">{{$t('project.topology.onLayout')}}</button>
               </div>
             </div>
           </div>
@@ -1473,6 +1465,7 @@ export default {
       getTopology(this.index).updateProps()
     },
     onLayout () { // 改变布局
+      console.log(this.layout)
       layout(getTopology(this.index).activeLayer.pens, this.layout)
       getTopology(this.index).updateProps()
     },