From 2e6e9a7ef0be32c97b89c8a7b37f4b5835a5f684 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 21 Oct 2020 14:15:58 +0800
Subject: [PATCH] =?UTF-8?q?fix'=EF=BC=9A=E5=8F=96=E6=B6=88assetModel=20=20?=
 =?UTF-8?q?sync=E7=9A=84=E9=80=89=E9=A1=B9=20=E6=9B=B4=E6=8D=A2=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=8C=89=E9=92=AE=E4=B8=BASave&Sync?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss     |  2 +-
 .../src/components/common/language/cn.js      |  3 +-
 .../src/components/common/language/en.js      |  3 +-
 .../components/page/dashboard/chartBox.vue    | 32 +++++++++++--------
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 359c26f73..3c52fac53 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -2188,7 +2188,7 @@ li{
   display: inline-block;
   width: 350px;
 }
-.right-box-form>.el-form-item.half-form-item-other:nth-child(odd){
+.right-box-form>.el-form-item.half-form-item-other-two{
   display: inline-block;
   width: 390px;
   margin-left: 0;
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 218248490..6b4f7800e 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -82,7 +82,8 @@ const cn = {
       back:'区域缩放还原',
       stack: "查看堆叠图",
       stackBack:'返回原始图'
-    }
+    },
+    SyncSave:'保存同时更新 Assets'
   },
   webshell: {
     shellTitle: "本地 Shell",
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index ea9bf86ab..d1e04f87f 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -86,7 +86,8 @@ const en = {
       back:'Area scaling restore',
       stack:'Show stack chart',
       stackBack:'Back to original chart'
-    }
+    },
+    SyncSave:'Save&Sync'
   },
   pageSize: '/page',
   webshell:{
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index dcca1ac1f..312963ec4 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -147,14 +147,6 @@
           <span class="nz-input-append">px</span>
         </el-form-item>
 
-        <el-form-item :label="$t('dashboard.panel.chartForm.last')" v-if="editChart.type == 'table'">
-          <el-switch class="exporter-switch" v-model="editChart.param.last" active-color="#ee9d3f" :active-value="1" :inactive-value="0"></el-switch>
-        </el-form-item>
-
-        <el-form-item :label="$t('dashboard.panel.chartForm.sync')" v-if="showPanel.type && showPanel.type == 'model'">
-          <el-switch class="exporter-switch" v-model="editChart.sync" active-color="#ee9d3f" :active-value="1" :inactive-value="0"></el-switch>
-        </el-form-item>
-
         <el-form-item v-if="isUrl" :label='$t("dashboard.panel.chartForm.url")' prop="param.url" :rules="{ required: true,  message: $t('validate.required'), trigger: 'blur' }">
           <el-input size="small" type="textarea" maxlength="1024" show-word-limit v-model="editChart.param.url"></el-input>
         </el-form-item>
@@ -169,6 +161,14 @@
           <el-input size="mini" type="input" v-model="editChart.param.threshold"></el-input>
         </el-form-item>
 
+        <el-form-item :label="$t('dashboard.panel.chartForm.last')" v-if="editChart.type == 'table'">
+          <el-switch class="exporter-switch" v-model="editChart.param.last" active-color="#ee9d3f" :active-value="1" :inactive-value="0"></el-switch>
+        </el-form-item>
+
+        <!--<el-form-item :label="$t('dashboard.panel.chartForm.sync')" v-if="showPanel.type && showPanel.type == 'model'">-->
+          <!--<el-switch class="exporter-switch" v-model="editChart.sync" active-color="#ee9d3f" :active-value="1" :inactive-value="0"></el-switch>-->
+        <!--</el-form-item>-->
+
         <div v-if="!isUrl&&!isAlert&& editChart.type != 'text'" class="right-box-sub-title" style="margin-bottom: 20px">
           <span>{{$t('alert.config.expr')}}</span>
           <span v-if="!isSingleStat" style="height: 19px;display: inline-block;line-height: 1;" class="float-right" @click="addExpression">
@@ -246,7 +246,7 @@
             <el-form-item :label="$t('dashboard.panel.chartForm.valMapping.value')" prop="span" class="half-form-item-other" >
               <el-input size="mini" type="input" v-model="mapping.value" style="display: inline-block;;"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('dashboard.panel.chartForm.valMapping.text')" prop="span" class="half-form-item-other">
+            <el-form-item :label="$t('dashboard.panel.chartForm.valMapping.text')" prop="span" class="half-form-item-other  half-form-item-other-two">
               <el-input size="mini" type="input" v-model="mapping.text" style="display: inline-block;width:calc(100% - 40px);"></el-input>
               <span  @click="delMapping(index)" class="nz-icon-minus-medium" style="margin-left: 7px;padding: 6px"><i class="nz-icon nz-icon-minus" style="color: #EC7F66"></i></span>
             </el-form-item>
@@ -303,12 +303,12 @@
       <button @click="esc(false)" id="chart-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
         <span>{{$t('overall.cancel')}}</span>
       </button>
-      <button @click="preview" id="chart-box-preview" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new">
+      <button @click="SyncSave" id="chart-box-Sync" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" v-if="showPanel.type && showPanel.type == 'model'">
+        <span>{{$t('overall.SyncSave')}}</span>
+      </button>
+      <button @click="preview" id="chart-box-preview" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" v-else>
         <span>{{$t('overall.preview')}}</span>
       </button>
-      <!--<button @click="SyncSave" id="chart-box-Sync" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new">-->
-        <!--<span>{{$t('overall.SyncSave')}}</span>-->
-      <!--</button>-->
       <button @click="confirmAdd" id="chart-box-save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new">
         <span>{{$t('overall.save')}}</span>
       </button>
@@ -699,7 +699,7 @@
               });
             }
           }
-        })
+        });
 
         panelPromise.then(()=>{
           if (panelId) {
@@ -837,6 +837,10 @@
           }
         })
       },
+      SyncSave(){
+        this.editChart.sync=1;
+        this.confirmAdd();
+      },
       confirmAdd() {
         this.elementTarget = []; // 初始化清空参数
         if(this.editChart.type!=='url'&&this.editChart.type != 'text'){