From 83e57eec1f2757bfce70abb937eae7c499d8a2e9 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 26 Aug 2021 17:10:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=20=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=20asset=20Double=20=E7=B2=BE=E5=BA=A6=E6=9C=AA=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E6=97=B6=E9=97=B4=E4=B8=8D=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=8C=BA=E9=97=B4=EF=BC=8C=E4=BB=A5=E5=8F=8AcheckBox=20value?=
 =?UTF-8?q?=E5=80=BC=E7=9A=84=E9=A1=BA=E5=BA=8F=E4=B8=8D=E5=AF=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/asset/assetBox.vue        | 23 +++++++++++++++----
 .../common/rightBox/assetMetaBox.vue          |  4 ++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index 2734e8376..33094af64 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -115,11 +115,11 @@
                   <el-input v-model="label.value[0]" oninput="value=value.replace(/[^\d]/g,'')" size="small"></el-input>
                 </template>
                 <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.DOUBLE">
-                  <el-input v-model="label.value[0]" oninput="value=value.replace(/[^0-9.]/g,'')" size="small"></el-input>
+                  <el-input-number v-model="label.value[0]" :controls="false" size="small" :precision="JSON.parse(label.param).decimals" style="width: 100%;text-align: left" :max="10000000000000000000" :min="-10000000000000000000"></el-input-number>
                 </template>
                 <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.DATETIME">
                   <template v-if="JSON.parse(label.param).subType === assetConstants.labelSubTypeData.time">
-                    <div v-if="label.interval" style="display: flex; justify-content: space-between">
+                    <div v-if="JSON.parse(label.param).interval" style="display: flex; justify-content: space-between">
                       <el-time-select v-model="label.value[0]" size="small"></el-time-select>
                       <el-time-select v-model="label.value[1]" size="small"></el-time-select>
                     </div>
@@ -128,7 +128,7 @@
                     </template>
                   </template>
                   <template v-else>
-                    <template v-if="label.interval">
+                    <template v-if="JSON.parse(label.param).interval">
                       <my-date-picker
                         id="asset-box-input-purchase-date"
                         v-model="label.value[0]"
@@ -152,7 +152,7 @@
                   </template>
                 </template>
                 <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.EMAIL">
-                  <input v-model="label.value[0]" size="small" />
+                  <el-input v-model="label.value[0]" size="small"/>
                 </template>
               </template>
             </el-form-item>
@@ -645,6 +645,21 @@ export default {
             params.parent = {}
             params.pid = '-1'
           }
+          if (params.fields) {
+            params.fields.forEach(field => {
+              if (field.type.toUpperCase() === assetConstants.labelTypeData.CHECKBOX) { // 控制 check 选择中的顺序 跟 创建的一致
+                const arr = []
+                const items = JSON.parse(field.param).items
+                items.forEach(item => {
+                  const findItem = field.value.find(fieldValue => fieldValue == item.name)
+                  if (findItem) {
+                    arr.push(item.name)
+                  }
+                })
+                field.value = arr
+              }
+            })
+          }
           if (params.id) {
             this.$put(this.url, params).then(res => {
               this.prevent_opt.save = false
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
index 668dae499..9dc9764c9 100644
--- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
@@ -50,7 +50,7 @@
             </el-form-item>
             <div class="right-box-sub-title" style="margin-bottom: 20px" v-if="showParam">
               <span>{{$t('config.assetLabel.params')}}</span>
-              <span v-if="editAssetMeta.type.toUpperCase()!=='DATETIME'" class="float-right" style="height: 19px;display: inline-block;line-height: 1;" @click="addParam">
+              <span v-if="editAssetMeta.type.toUpperCase()!=='DATETIME'&&editAssetMeta.type.toUpperCase()!=='DOUBLE'" class="float-right" style="height: 19px;display: inline-block;line-height: 1;" @click="addParam">
               <span class="create-square-box">
                 <i style="font-size: 17px; cursor: pointer;" class="nz-icon nz-icon-create-square"></i>
               </span>
@@ -313,7 +313,7 @@ export default {
               }
             }
           }
-          if (param.type !== 'RADIO' && param.type !== 'CHECKBOX' && param.type !== 'SELECT' && param.type !== 'DATETIME') {
+          if (param.type !== 'RADIO' && param.type !== 'CHECKBOX' && param.type !== 'SELECT' && param.type !== 'DATETIME' && param.type !== 'DOUBLE') {
             delete param.param
           } else {
             param.param = JSON.stringify(param.param)