From ee536f2408b2162a4e02878ed9d73025104fd64f Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 14 Jul 2021 13:50:51 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=8B=93?=
 =?UTF-8?q?=E6=89=91=E5=9B=BE=E6=A1=86=E9=80=89=E7=9A=84=E6=8E=92=E7=89=88?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/language/cn.js      |  1 +
 .../src/components/common/language/en.js      |  1 +
 .../common/project/L5/CanvasProps.vue         | 26 ++++++++++++-------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index ec45f81ed..75390a592 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -1438,6 +1438,7 @@ const cn = {
       previewExit: '继续编辑',
       iconColor: '图标颜色',
       maxWidth: '最大宽度',
+      maxCount: '水平个数',
       nodeWidth: '节点宽度',
       nodeHeight: '节点高度',
       spaceWidth: '水平间距',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 97b93aaf3..016a6f5a2 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -1442,6 +1442,7 @@ const en = {
       previewExit: 'Continue',
       iconColor: 'Icon color',
       maxWidth: 'Max width',
+      maxCount: 'Max count',
       nodeWidth: 'Node width',
       nodeHeight: 'Node height',
       spaceWidth: 'Space width',
diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
index 083266618..15977d2ae 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -729,45 +729,53 @@
         <!--排版-->
         <el-collapse-item title="排版" name="2" v-if="selection.pens">
           <div class="mt10">
+<!--            <div class="flex middle mb10">-->
+<!--              <label>{{$t('project.topology.maxWidth')}}：</label>-->
+<!--              <div class="full pr10">-->
+<!--                <el-input-number :precision="0" controls-position="right" type="number" class="input" size="small"-->
+<!--                                 v-model.number="layout.maxWidth" ></el-input-number>-->
+<!--              </div>-->
+<!--            </div>-->
             <div class="flex middle mb10">
-              <label>{{$t('project.topology.maxWidth')}}：</label>
+              <label>{{$t('project.topology.maxCount')}}：</label>
               <div class="full pr10">
-                <el-input-number :precision="0" controls-position="right" type="number" class="input" size="small"
-                                 v-model.number="layout.maxWidth" title="超出最大宽度换行"></el-input-number>
+                <el-input-number :precision="0" 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>{{$t('project.topology.nodeWidth')}}：</label>
               <div class="full pr10">
                 <el-input-number :precision="0" controls-position="right" type="number" class="input" size="small"
-                                 v-model.number="layout.nodeWidth" title="固定每个节点的宽度"></el-input-number>
+                                 v-model.number="layout.nodeWidth" title=""></el-input-number>
               </div>
             </div>
             <div class="flex middle mb10">
               <label>{{$t('project.topology.nodeHeight')}}：</label>
               <div class="full pr10">
                 <el-input-number :precision="0" controls-position="right" type="number" class="input" size="small"
-                                 v-model.number="layout.nodeHeight" title="固定每个节点的高度"></el-input-number>
+                                 v-model.number="layout.nodeHeight" title=""></el-input-number>
               </div>
             </div>
             <div class="flex middle mb10">
               <label>{{$t('project.topology.spaceWidth')}}：</label>
               <div class="full pr10">
                 <el-input-number :precision="0" controls-position="right" type="number" class="input" size="small"
-                                 v-model.number="layout.spaceWidth" title="节点之间水平间距（px）"></el-input-number>
+                                 v-model.number="layout.spaceWidth" title=""></el-input-number>
               </div>
             </div>
             <div class="flex middle mb10">
               <label>{{$t('project.topology.spaceHeight')}}：</label>
               <div class="full pr10">
                 <el-input-number :precision="0" controls-position="right" type="number" class="input" size="small"
-                                 v-model.number="layout.spaceHeight" title="节点之间垂直间距（px）"></el-input-number>
+                                 v-model.number="layout.spaceHeight" title=""></el-input-number>
               </div>
             </div>
             <div class="flex middle">
               <label></label>
               <div class="full pr10">
-                <button class="button primary" @click="onLayout">{{$t('project.topology.onLayout')}}</button>
+                <button class="button primary nz-btn nz-btn-size-mini-new nz-btn-style-light-new" @click="onLayout">{{$t('project.topology.onLayout')}}</button>
               </div>
             </div>
           </div>
@@ -1163,7 +1171,7 @@ export default {
           desc: '水平居中'
         }],
       layout: { // 显示对应属性
-        maxWidth: 1000,
+        maxWidth: undefined,
         nodeWidth: 0,
         nodeHeight: 0,
         maxCount: 0,