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 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=20=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=20asset=20Double=20=E7=B2=BE=E5=BA=A6=E6=9C=AA?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=EF=BC=8C=E6=97=B6=E9=97=B4=E4=B8=8D=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=8C=BA=E9=97=B4=EF=BC=8C=E4=BB=A5=E5=8F=8AcheckBox?=
 =?UTF-8?q?=20value=E5=80=BC=E7=9A=84=E9=A1=BA=E5=BA=8F=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?=E7=9A=84=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)

From 3df236391c5988ae0661572bba752cee40fe8f0c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 26 Aug 2021 18:05:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20copy=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/cabinetTab.vue      |  1 +
 .../rightBox/administration/roleBox.vue       |  7 ++++++-
 .../common/table/asset/assetMetaTable.vue     |  1 +
 .../common/table/settings/agentTable.vue      |  1 +
 .../common/table/settings/cabinetTable.vue    |  1 +
 .../common/table/settings/dcTable.vue         |  1 +
 .../common/table/settings/modelTable.vue      |  1 +
 .../common/table/settings/roleTable.vue       |  1 +
 .../common/table/settings/userTable.vue       |  1 +
 .../src/components/page/config/agent.vue      |  1 +
 .../src/components/page/config/assetMeta.vue  | 10 ++++++++++
 .../src/components/page/config/dc.vue         |  1 +
 .../src/components/page/config/model.vue      |  1 +
 .../src/components/page/config/roles.vue      | 19 +++++++++++++++++--
 .../src/components/page/config/user.vue       | 15 ++++++++++++++-
 15 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index bc99f1390..dea69fbe4 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -20,6 +20,7 @@
           :height="mainTableHeight"
           :table-data="tableData"
           @del="del"
+          @copy="copy"
           @edit="edit"
           @orderBy="tableDataSort"
           @reload="getTableData"
diff --git a/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue b/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
index e29ac3ee1..07a9991e2 100644
--- a/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
@@ -57,7 +57,8 @@ export default {
     obj: {
       type: Object
     },
-    detail: Boolean
+    detail: Boolean,
+    copyFlag: Boolean
   },
   mixins: [editRigthBox],
   data () {
@@ -94,6 +95,10 @@ export default {
   },
   mounted () {
     this.getMenus().then(() => {
+      console.log(this.copyFlag)
+      if (this.copyFlag) {
+        this.editRole.id = ''
+      }
       if (this.$refs.menuTree && this.selectedIds && this.selectedIds.length > 0) {
         this.$refs.menuTree.setCheckedKeys(this.selectedIds, true)
       }
diff --git a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
index 999ad9ec8..649d1c2a4 100644
--- a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
@@ -75,6 +75,7 @@
           </div>
           <el-dropdown-menu slot="dropdown">
 <!--            <el-dropdown-item v-has="'asset_label_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>-->
+            <el-dropdown-item v-has="'asset_label_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'asset_label_delete'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue
index e61effb1d..bcb1ac18a 100644
--- a/nezha-fronted/src/components/common/table/settings/agentTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue
@@ -63,6 +63,7 @@
             <i class="nz-icon nz-icon-more3"></i>
           </div>
           <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item v-has="'agent_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'agent_delete'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
diff --git a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
index b5f6e5b06..6991d925e 100644
--- a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
@@ -44,6 +44,7 @@
             <i class="nz-icon nz-icon-more3"></i>
           </div>
           <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item v-has="'dc_add'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <el-dropdown-item :command="['delete', scope.row]" v-has="'dc_delete'"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue
index a7064f92c..010c7bb97 100644
--- a/nezha-fronted/src/components/common/table/settings/dcTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue
@@ -91,6 +91,7 @@
             <i class="nz-icon nz-icon-more3"></i>
           </div>
           <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item v-has="'dc_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'dc_delete'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
diff --git a/nezha-fronted/src/components/common/table/settings/modelTable.vue b/nezha-fronted/src/components/common/table/settings/modelTable.vue
index 7fbcf1c05..5a3a8a9c0 100644
--- a/nezha-fronted/src/components/common/table/settings/modelTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/modelTable.vue
@@ -69,6 +69,7 @@
           </div>
           <el-dropdown-menu slot="dropdown">
 <!--            <el-dropdown-item :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>-->
+            <el-dropdown-item v-has="'model_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'model_delete'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'panel_chart_edit'" :command="['sync', scope.row]"><i class="nz-icon nz-icon-sync"></i><span class="operation-dropdown-text">{{$t('overall.syncChart')}}</span></el-dropdown-item>
           </el-dropdown-menu>
diff --git a/nezha-fronted/src/components/common/table/settings/roleTable.vue b/nezha-fronted/src/components/common/table/settings/roleTable.vue
index d812b67e9..3c6b1d4d8 100644
--- a/nezha-fronted/src/components/common/table/settings/roleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/roleTable.vue
@@ -58,6 +58,7 @@
             <i class="nz-icon nz-icon-more3"></i>
           </div>
           <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item v-has="'role_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'role_delete'" :command="['delete', scope.row]" :disabled="isBuiltIn(scope.row)"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue
index 0db454373..c0b730780 100644
--- a/nezha-fronted/src/components/common/table/settings/userTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/userTable.vue
@@ -82,6 +82,7 @@
           </div>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item v-has="'user_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
+            <el-dropdown-item v-has="'user_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'user_delete'" :command="['delete', scope.row]" :disabled="scope.row.id === 1"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'user_edit'" :command="['reset_mfa', scope.row]"><i class="nz-icon nz-icon-zhongzhi2FA"></i><span class="operation-dropdown-text">{{$t('config.user.resetMfa')}}</span></el-dropdown-item>
           </el-dropdown-menu>
diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue
index cb1f4a89d..8062daea5 100644
--- a/nezha-fronted/src/components/page/config/agent.vue
+++ b/nezha-fronted/src/components/page/config/agent.vue
@@ -29,6 +29,7 @@
           :table-data="tableData"
           @del="del"
           @edit="edit"
+          @copy="copy"
           @orderBy="tableDataSort"
           @reload="getTableData"
           @selectionChange="selectionChange"
diff --git a/nezha-fronted/src/components/page/config/assetMeta.vue b/nezha-fronted/src/components/page/config/assetMeta.vue
index 807f664f5..84c295e2c 100644
--- a/nezha-fronted/src/components/page/config/assetMeta.vue
+++ b/nezha-fronted/src/components/page/config/assetMeta.vue
@@ -41,6 +41,7 @@
           :table-data="tableData"
           @del="del"
           @edit="edit"
+          @copy="copy"
           @orderBy="tableDataSort"
           @reload="getTableData"
           @selectionChange="selectionChange"
@@ -246,6 +247,15 @@ export default {
         }
       })
     },
+    copy (u) {
+      this.object = { ...u, name: u.name + '-copy', id: '' }
+      if (this.object.name.length > 64) {
+        const length = this.object.name.length - 64
+        console.log(length, this.object.name.length, u.name.length)
+        this.object.name = u.name.substring(0, u.name.length - length) + '-copy'
+      }
+      this.rightBox.metaShow = true
+    },
     closeRightBox (refresh) {
       this.rightBox.metaShow = false
       this.rightBox.groupShow = false
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index bc29bc04e..f3e6d3793 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -47,6 +47,7 @@
           :table-data="tableData"
           @del="del"
           @edit="edit"
+          @copy="copy"
           @orderBy="tableDataSort"
           @reload="getTableData"
           @selectionChange="selectionChange"
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index c202183f2..377b3c5db 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -47,6 +47,7 @@
           :table-data="tableData"
           @del="del"
           @edit="edit"
+          @copy="copy"
           @orderBy="tableDataSort"
           @reload="getTableData"
           @sync="chartBySync"
diff --git a/nezha-fronted/src/components/page/config/roles.vue b/nezha-fronted/src/components/page/config/roles.vue
index 5a235dcae..602ef6c1b 100644
--- a/nezha-fronted/src/components/page/config/roles.vue
+++ b/nezha-fronted/src/components/page/config/roles.vue
@@ -25,6 +25,7 @@
           :height="mainTableHeight"
           :table-data="tableData"
           @del="del"
+          @copy="copy"
           @edit="edit"
           @orderBy="tableDataSort"
           @reload="getTableData"
@@ -37,7 +38,7 @@
       </template>
     </nz-data-list>
     <transition name="right-box">
-      <role-box v-if="rightBox.show" :obj="object" @close="closeRightBox"></role-box>
+      <role-box v-if="rightBox.show" :copyFlag="copyFlag" :obj="object" @close="closeRightBox"></role-box>
     </transition>
   </div>
 </template>
@@ -64,6 +65,7 @@ export default {
       blankObject: { // 空白对象
         name: ''
       },
+      copyFlag: false,
       searchMsg: { // 给搜索框子组件传递的信息
         zheze_none: true,
         searchLabelList: [{
@@ -77,9 +79,22 @@ export default {
     }
   },
   methods: {
-    edit (row) {
+    edit (row, copyFlag) {
       this.object = { ...row }
+      if (copyFlag) {
+        this.object.name = this.object.name + '-copy'
+        if (this.object.name.length > 64) {
+          const length = this.object.name.length - 64
+          console.log(length, this.object.name.length, row.name.length)
+          this.object.name = row.name.substring(0, row.name.length - length) + '-copy'
+        }
+      }
       this.rightBox.show = true
+    },
+    copy (u) {
+      this.edit(u, true)
+      this.copyFlag = true
+      console.log(this.copyFlag)
     }
   }
 }
diff --git a/nezha-fronted/src/components/page/config/user.vue b/nezha-fronted/src/components/page/config/user.vue
index 202604867..b71a2e80d 100644
--- a/nezha-fronted/src/components/page/config/user.vue
+++ b/nezha-fronted/src/components/page/config/user.vue
@@ -25,6 +25,7 @@
           :height="mainTableHeight"
           :table-data="tableData"
           @del="del"
+          @copy="copy"
           @reset_mfa="resetMfa"
           @edit="edit"
           @orderBy="tableDataSort"
@@ -105,7 +106,7 @@ export default {
         this.getTableData()
       })
     },
-    edit (u) {
+    edit (u, copyFlag) {
       this.$get(`${this.url}/${u.id}`).then(response => {
         const user = response.user
         if (response.code === 200) {
@@ -119,10 +120,22 @@ export default {
           if (!this.object.mfaLevel) {
             this.object.mfaLevel = 0
           }
+          if (copyFlag) {
+            this.object.id = ''
+            this.object.name = this.object.name + '-copy'
+            if (this.object.name.length > 64) {
+              const length = this.object.name.length - 64
+              console.log(length, this.object.name.length, u.name.length)
+              this.object.name = u.name.substring(0, u.name.length - length) + '-copy'
+            }
+          }
           this.rightBox.show = true
         }
       })
     },
+    copy (u) {
+      this.edit(u, true)
+    },
     resetMfa (row) {
       MessageBox.confirm(i18n.t('tip.resetMfa'), {
         confirmButtonText: i18n.t('tip.yes'),