From 6c6b7d05043bc96da8d1ff417f49443266f56549 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 29 Sep 2022 13:48:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                       |  3 +-
 frontend/src/lang/tw.js                       |  3 +-
 frontend/src/lang/zh.js                       |  3 +-
 .../src/views/system/datasource/DsForm.vue    | 79 ++++++++++---------
 4 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 178a099f0f..7188f098f6 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1815,7 +1815,8 @@ export default {
     can_be_uploaded: 'Only files in jar format can be uploaded',
     query_timeout: 'query timeout',
     add_data_source: 'add data source',
-    delete_this_driver: 'Are you sure to delete this driver?'
+    delete_this_driver: 'Are you sure to delete this driver?',
+    basic_info: 'Basic Info'
   },
   pblink: {
     key_pwd: 'Please enter the password to open the link',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 9e18c8acca..83bc402e2f 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1815,7 +1815,8 @@ export default {
     can_be_uploaded: '僅支持上傳JAR格式的檔案',
     query_timeout: '査詢超時',
     add_data_source: '添加資料來源',
-    delete_this_driver: '確定删除該驅動嗎？'
+    delete_this_driver: '確定删除該驅動嗎？',
+    basic_info: '基本信息'
   },
   pblink: {
     key_pwd: '請輸入密碼打開鏈接',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 425c1d028d..c68d420719 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1815,7 +1815,8 @@ export default {
     can_be_uploaded: '仅支持上传JAR格式的文件',
     query_timeout: '查询超时',
     add_data_source: '添加数据源',
-    delete_this_driver: '确定删除该驱动吗？'
+    delete_this_driver: '确定删除该驱动吗？',
+    basic_info: '基本信息'
   },
   pblink: {
     key_pwd: '请输入密码打开链接',
diff --git a/frontend/src/views/system/datasource/DsForm.vue b/frontend/src/views/system/datasource/DsForm.vue
index 41a6597add..28b99c32cd 100644
--- a/frontend/src/views/system/datasource/DsForm.vue
+++ b/frontend/src/views/system/datasource/DsForm.vue
@@ -1,42 +1,44 @@
 <template>
-  <div class="de-ds-form" v-loading="formLoading">
+  <div v-loading="formLoading" class="de-ds-form">
     <div class="de-ds-top">
       <span class="name">
-        <i @click="logOutTips" class="el-icon-arrow-left"></i>
+        <i class="el-icon-arrow-left" @click="logOutTips" />
         {{
           params &&
-          params.id &&
-          params.showModel &&
-          params.showModel === 'show' &&
-          !canEdit
+            params.id &&
+            params.showModel &&
+            params.showModel === 'show' &&
+            !canEdit
             ? $t('datasource.show_info')
             : formType == 'add'
-            ? `${$t('commons.create') + typeMap }${ $t('commons.datasource')}`
-            : $t('datasource.modify')
+              ? `${$t('commons.create') + typeMap }${ $t('commons.datasource')}`
+              : $t('datasource.modify')
         }}
       </span>
       <div class="apply">
         <template v-if="canEdit">
-          <deBtn secondary @click="logOutTips"
-            >{{ $t('commons.cancel') }}
-          </deBtn>
           <deBtn
             secondary
-            v-if="
-              formType === 'add' ||
-              hasDataPermission('manage', params.privileges)
-            "
-            @click="validaDatasource"
-            >{{ $t('commons.validate') }}
+            @click="logOutTips"
+          >{{ $t('commons.cancel') }}
           </deBtn>
           <deBtn
             v-if="
               formType === 'add' ||
-              hasDataPermission('manage', params.privileges)
+                hasDataPermission('manage', params.privileges)
+            "
+            secondary
+            @click="validaDatasource"
+          >{{ $t('commons.validate') }}
+          </deBtn>
+          <deBtn
+            v-if="
+              formType === 'add' ||
+                hasDataPermission('manage', params.privileges)
             "
             type="primary"
             @click="save"
-            >{{ $t('commons.save') }}
+          >{{ $t('commons.save') }}
           </deBtn>
         </template>
         <template v-else>
@@ -47,7 +49,7 @@
                 : hasDataPermission('manage', params.privileges)
             "
             @click="validaDatasource"
-            >{{ $t('commons.validate') }}
+          >{{ $t('commons.validate') }}
           </deBtn>
         </template>
       </div>
@@ -62,18 +64,18 @@
             size="small"
             :disabled="
               params &&
-              params.id &&
-              params.showModel &&
-              params.showModel === 'show' &&
-              !canEdit
+                params.id &&
+                params.showModel &&
+                params.showModel === 'show' &&
+                !canEdit
             "
             class="de-form-item"
             label-width="180px"
             label-position="right"
           >
-          <div class="de-row-rules">
-            <span>基本信息</span>
-          </div>
+            <div class="de-row-rules">
+              <span>{{ $t('datasource.basic_info') }}</span>
+            </div>
             <el-form-item :label="$t('datasource.display_name')" prop="name">
               <el-input
                 v-model="form.name"
@@ -83,9 +85,9 @@
             </el-form-item>
             <el-form-item :label="$t('commons.description')" prop="desc">
               <deTextarea
-                class="w100-textarea"
                 v-model="form.desc"
-              ></deTextarea>
+                class="w100-textarea"
+              />
             </el-form-item>
 
             <el-form-item
@@ -116,10 +118,10 @@
               :form="form"
               :disabled="
                 params &&
-                params.id &&
-                params.showModel &&
-                params.showModel === 'show' &&
-                !canEdit
+                  params.id &&
+                  params.showModel &&
+                  params.showModel === 'show' &&
+                  !canEdit
               "
             />
             <plugin-com
@@ -157,7 +159,6 @@ import deTextarea from '@/components/deCustomCm/deTextarea.vue'
 import msgCfm from '@/components/msgCfm'
 export default {
   name: 'DsForm',
-  mixins: [msgCfm],
   components: {
     DsConfiguration,
     LayoutContent,
@@ -165,6 +166,7 @@ export default {
     PluginCom,
     deTextarea
   },
+  mixins: [msgCfm],
   data() {
     return {
       disabled: false,
@@ -190,6 +192,7 @@ export default {
           {
             required: true,
             validator: this.nameRepeat,
+            message: i18n.t('datasource.input_name'),
             trigger: 'blur'
           },
           {
@@ -416,7 +419,7 @@ export default {
     },
     getDatasourceDetail(id, showModel) {
       return getDatasourceDetail(id).then((res) => {
-        this.params = {...res.data, showModel}
+        this.params = { ...res.data, showModel }
       })
     },
     queryTreeDatas() {
@@ -837,9 +840,9 @@ export default {
     logOutTips() {
       const options = {
         title: 'role.tips',
-          confirmButtonText: this.$t('commons.confirm'),
+        confirmButtonText: this.$t('commons.confirm'),
         content: 'system_parameter_setting.sure_to_exit',
-          type: 'primary',
+        type: 'primary',
         cb: () => {
           this.backToList()
         }
@@ -1009,4 +1012,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>