From d73a60f122db36919c5dc6064e635a51dd24df5e Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Fri, 2 Sep 2022 15:41:29 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix=20:=20promqlInput=20=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=97=B6=E5=85=89=E6=A0=87=E9=A2=9C=E8=89=B2=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/page/dashboard/explore/promqlInput.scss    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
index f48884261..6e836012c 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
@@ -163,7 +163,9 @@
   }
   .cm-line{
     color: $--color-text-regular,
-
+  }
+  .ͼ2 .cm-content{
+    caret-color:$--color-text-regular;
   }
   .el-col .el-col-24 .metric-selector-input-box{
 

From c6c0d943f6664aabf60586af91b2cb9de4350558 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Fri, 2 Sep 2022 15:42:29 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix=20:=20issueBox=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E5=8F=96=E6=B6=88=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/rightBox/issueBox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/rightBox/issueBox.vue b/nezha-fronted/src/components/common/rightBox/issueBox.vue
index cbe838074..a4b669ed9 100644
--- a/nezha-fronted/src/components/common/rightBox/issueBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/issueBox.vue
@@ -52,7 +52,7 @@
           </el-form-item>
           <!--state-->
           <el-form-item :label="$t('overall.state')" prop="state">
-          <el-select v-model="editIssue.state" placeholder='' clearable size="small" value-key="state" class="type-select">
+          <el-select v-model="editIssue.state" placeholder='' size="small" value-key="state" class="type-select">
             <el-option v-for="item in stateData" :key="item.id" :label="item.value" :value="item.id">
               {{item.value}}
             </el-option>

From c747408c11e86f7491f8810ccbeef3c6d30fd7c3 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Fri, 2 Sep 2022 15:43:07 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=20:=20recordRuleBox=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BF=85=E5=A1=AB=E9=A1=B9=E5=8F=96=E6=B6=88=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/recordRuleBox.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue b/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue
index 04a7c00db..447ad08b4 100644
--- a/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue
@@ -25,7 +25,7 @@
           </el-form-item>
            <!--type-->
           <el-form-item :label="$t('overall.type')" prop="type" >
-            <el-select v-model="editRecordRule.type" class="right-box__select" clearable placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
+            <el-select v-model="editRecordRule.type" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
               <el-option :label="$t('overall.metrics')" value="1">{{$t('overall.metrics')}}</el-option>
               <el-option :label="$t('overall.logs')" value="2">{{$t('overall.logs')}}</el-option>
             </el-select>
@@ -73,7 +73,7 @@
           </el-form-item>
           <!--state-->
           <el-form-item :label="$t('overall.state')" prop="state" >
-            <el-select v-model="editRecordRule.state" class="right-box__select" clearable placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
+            <el-select v-model="editRecordRule.state" class="right-box__select"  placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
               <el-option :label="$t('overall.disabled')" value="0">{{$t('overall.disabled')}}</el-option>
               <el-option :label="$t('overall.enabled')" value="1">{{$t('overall.enabled')}}</el-option>
             </el-select>

From 43cd10f23bcf0f747006ef427ef701213dd42391 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 2 Sep 2022 15:47:45 +0800
Subject: [PATCH 4/4] =?UTF-8?q?stye=EF=BC=9A=E4=BF=AE=E5=A4=8DassetMetaBox?=
 =?UTF-8?q?=E9=BB=91=E8=89=B2=E4=B8=BB=E9=A2=98=E6=A0=B7=E5=BC=8F=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/rightBox/assetMetaBox.scss     | 9 +++++++++
 nezha-fronted/src/assets/css/components/index.scss       | 1 +
 .../src/components/common/rightBox/assetMetaBox.vue      | 6 ------
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss

diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss
new file mode 100644
index 000000000..00dac6207
--- /dev/null
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss
@@ -0,0 +1,9 @@
+.right-box-asset-meta{
+  .datetime-header{
+    display: inline-block;
+    width: 80px;
+    margin-right: 10px;
+    text-align: right;
+    color: $--color-text-regular;
+  }
+}
diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss
index 1a5a41667..cae2cdda0 100644
--- a/nezha-fronted/src/assets/css/components/index.scss
+++ b/nezha-fronted/src/assets/css/components/index.scss
@@ -48,6 +48,7 @@
 @import './common/rightBox/batchModifyEndpoint.scss';
 @import './common/rightBox/editEndpointBoxNew.scss';
 @import './common/rightBox/locationCascader.scss';
+@import './common/rightBox/assetMetaBox.scss';
 @import './common/rightBox/menuBox.scss';
 @import './common/rightBox/moduleBox.scss';
 @import './common/rightBox/ipam.scss';
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
index f3535bf26..9dbca0e5d 100644
--- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
@@ -490,10 +490,4 @@ export default {
   .meta-option-box{
 
   }
-  .datetime-header{
-    display: inline-block;
-    width: 80px;
-    margin-right: 10px;
-    text-align: right;
-  }
 </style>