From b64d2424582377bf05e656e33ac1721a453151fe Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 4 Aug 2021 10:32:53 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-875=20fix:=20=E4=BF=AE=E5=A4=8DAsset/Asset?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/js/validate.js      | 20 +++++++++++++++++++
 .../common/rightBox/asset/assetBox.vue        | 10 +++++++---
 .../common/rightBox/exprTmplBox.vue           |  4 +++-
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js
index 5f4c2f755..f75f6cc8f 100644
--- a/nezha-fronted/src/components/common/js/validate.js
+++ b/nezha-fronted/src/components/common/js/validate.js
@@ -140,6 +140,26 @@ export function uSize (rule, value, callback) {
   }, 100)
 }
 
+export function checkAssetAge (rule, value, callback) {
+  setTimeout(() => {
+    if (value.length > 128) {
+      return callback(vm.$t('overall.checkAssetAge'))
+    } else {
+      callback()
+    }
+  }, 100)
+}
+
+export function checkExpressionAge (rule, value, callback) {
+  setTimeout(() => {
+    if (value.length > 64) {
+      return callback(vm.$t('overall.checkAssetAge'))
+    } else {
+      callback()
+    }
+  }, 100)
+}
+
 export function longAndLat (rule, value, callback) { // 校验经纬度
 
 }
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index ef970635a..9b812bd89 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -271,7 +271,7 @@
 </template>
 
 <script>
-import { host, port } from '@/components/common/js/validate'
+import { host, port, checkAssetAge } from '@/components/common/js/validate'
 import { asset as assetConstants } from '@/components/common/js/constants'
 import selectAssetType from '@/components/common/popBox/selectAssetType'
 import locationCascader from '@/components/common/rightBox/locationCascader'
@@ -317,7 +317,8 @@ export default {
       labelCascShow: true, // 用来控制label的cascader的重新渲染
       rules: {
         name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+          { validator: checkAssetAge, trigger: 'blur' }
         ],
         pid: [
           { required: true, message: this.$t('validate.required'), trigger: 'change' }
@@ -430,6 +431,9 @@ export default {
       deep: true,
       immediate: true,
       handler (n) {
+        if (this.editAsset.pid === -1) {
+          this.editAsset.pid = ''
+        }
         if (n && n !== -1) {
           if (this.vmLock) {
             if (this.options.parentAssetOptions.length === 0) {
@@ -609,7 +613,7 @@ export default {
           const params = JSON.parse(JSON.stringify(this.editAsset))
           if (params.type.vm !== 1) {
             params.parent = {}
-            params.pid = ''
+            params.pid = '-1'
           }
           if (params.id) {
             this.$put(this.url, params).then(res => {
diff --git a/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue b/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
index 60bc97135..7c2d0c7da 100644
--- a/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
@@ -73,6 +73,7 @@
 <script>
 import promqlInput from '../../page/dashboard/explore/promqlInput'
 import editRigthBox from '../mixin/editRigthBox'
+import { checkExpressionAge } from '@/components/common/js/validate'
 
 export default {
   name: 'exprTempBox',
@@ -107,7 +108,8 @@ export default {
       gnameList: [],
       rules: {
         name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'change' }
+          { required: true, message: this.$t('validate.required'), trigger: 'change' },
+          { validator: checkExpressionAge, trigger: true }
         ],
         gname: [
           { required: true, message: this.$t('validate.required'), trigger: 'change' }