From 4cfa5e9beac6a4d6527e17d7d2d0e3b8f3b73f57 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 24 Jun 2021 11:09:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8C=89=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/datasource/DsTree.vue |  4 ++--
 frontend/src/views/system/datasource/form.vue   | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index c7f55a6ac0..a071f833d6 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -47,7 +47,7 @@
               </span>
               <span class="child">
                 <span v-if="data.type ==='folder'" @click.stop>
-                  <!-- <span class="el-dropdown-link">
+                  <span class="el-dropdown-link">
                     <el-button
                       v-permission="['datasource:add']"
                       icon="el-icon-plus"
@@ -55,7 +55,7 @@
                       size="small"
                       @click="addFolderWithType(data)"
                     />
-                  </span> -->
+                  </span>
 
                 </span>
                 <span v-if="data.type !=='folder'" style="margin-left: 12px;" @click.stop>
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index 36f6577199..b191e1e9fb 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -15,7 +15,7 @@
           <el-input v-model="form.desc" autocomplete="off" type="textarea" />
         </el-form-item>
         <el-form-item :label="$t('datasource.type')" prop="type">
-          <el-select v-model="form.type" :placeholder="$t('datasource.please_choose_type')" class="select-width" :disabled="formType=='modify'" @change="changeType()">
+          <el-select v-model="form.type" :placeholder="$t('datasource.please_choose_type')" class="select-width" :disabled="formType=='modify' || (formType==='add' && params && !!params.type)" @change="changeType()">
             <el-option
               v-for="item in allTypes"
               :key="item.name"
@@ -108,6 +108,9 @@ export default {
       this.edit(row)
     } else {
       this.create()
+      if (this.params && this.params.type) {
+        this.setType()
+      }
     }
   },
   mounted() {
@@ -119,6 +122,12 @@ export default {
     // }
   },
   methods: {
+    setType() {
+      this.form.type = this.params.type
+      this.form.configuration = {}
+      this.changeType()
+      console.log(this.form)
+    },
     changeEdit() {
       this.canEdit = true
       this.formType = 'modify'