Merge pull request #2589 from hLinx/hotfix_master

Hotfix master
TencentBlueKing · Nov 6, 2023 · a451d4a · a451d4a
2 parents 507a43f + 9b532a4
commit a451d4a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/...rontend/src/views/ticket-manage/list/components/opertion/components/app-id-secret-key.vue b/...rontend/src/views/ticket-manage/list/components/opertion/components/app-id-secret-key.vue
@@ -35,17 +35,17 @@
       :label="$t('ticket.AppId')"
       property="value1"
       required>
-      <bk-input v-model="formData.value1" />
+      <bk-input v-model.trim="formData.value1" />
     </jb-form-item>
     <jb-form-item
       :label="$t('ticket.SecretKey')"
       property="value2"
       required>
-      <bk-input v-model="formData.value2" />
+      <bk-input v-model.trim="formData.value2" />
     </jb-form-item>
     <jb-form-item :label="$t('ticket.描述')">
       <bk-input
-        v-model="formData.description"
+        v-model.trim="formData.description"
         maxlength="100"
         type="textarea" />
     </jb-form-item>

diff --git a/src/frontend/src/views/ticket-manage/list/components/opertion/components/password.vue b/src/frontend/src/views/ticket-manage/list/components/opertion/components/password.vue
@@ -36,12 +36,12 @@
       property="value1"
       required>
       <bk-input
-        v-model="formData.value1"
+        v-model.trim="formData.value1"
         type="password" />
     </jb-form-item>
     <jb-form-item :label="$t('ticket.描述')">
       <bk-input
-        v-model="formData.description"
+        v-model.trim="formData.description"
         maxlength="100"
         type="textarea" />
     </jb-form-item>

diff --git a/src/frontend/src/views/ticket-manage/list/components/opertion/components/secret-key.vue b/src/frontend/src/views/ticket-manage/list/components/opertion/components/secret-key.vue
@@ -35,11 +35,11 @@
       :label="$t('ticket.SecretKey')"
       property="value1"
       required>
-      <bk-input v-model="formData.value1" />
+      <bk-input v-model.trim="formData.value1" />
     </jb-form-item>
     <jb-form-item :label="$t('ticket.描述')">
       <bk-input
-        v-model="formData.description"
+        v-model.trim="formData.description"
         maxlength="100"
         type="textarea" />
     </jb-form-item>

diff --git a/...rontend/src/views/ticket-manage/list/components/opertion/components/username-password.vue b/...rontend/src/views/ticket-manage/list/components/opertion/components/username-password.vue
@@ -35,19 +35,19 @@
       :label="$t('ticket.用户名')"
       property="value1"
       required>
-      <bk-input v-model="formData.value1" />
+      <bk-input v-model.trim="formData.value1" />
     </jb-form-item>
     <jb-form-item
       :label="$t('ticket.密码')"
       property="value2"
       required>
       <bk-input
-        v-model="formData.value2"
+        v-model.trim="formData.value2"
         type="password" />
     </jb-form-item>
     <jb-form-item :label="$t('ticket.描述')">
       <bk-input
-        v-model="formData.description"
+        v-model.trim="formData.description"
         maxlength="100"
         type="textarea" />
     </jb-form-item>
@@ -87,14 +87,14 @@
         value1: [
           {
             required: true,
-            message: I18n.t('ticket.密码必填'),
+            message: I18n.t('ticket.用户名必填'),
             trigger: 'blur',
           },
         ],
         value2: [
           {
             required: true,
-            message: I18n.t('ticket.用户名必填'),
+            message: I18n.t('ticket.密码必填'),
             trigger: 'blur',
           },
         ],

diff --git a/src/frontend/src/views/ticket-manage/list/components/opertion/index.vue b/src/frontend/src/views/ticket-manage/list/components/opertion/index.vue
@@ -36,7 +36,7 @@
         :label="$t('ticket.名称')"
         property="name"
         required>
-        <bk-input v-model="formData.name" />
+        <bk-input v-model.trim="formData.name" />
       </jb-form-item>
       <jb-form-item :label="$t('ticket.类型.label')">
         <div class="ticket-type-wraper">