From ff6b477586eabdd0d730f9c01c02778917b71c4a Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Mon, 30 Jan 2023 14:57:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20APi=E6=95=B0=E6=8D=AE=E6=BA=90=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=AE=8C=E6=88=90=E5=90=8E=E7=8A=B6=E6=80=81=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=88=B7=E6=96=B0=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E5=8F=AA=E8=AF=BB=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E9=A1=B9?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/gridTable/index.vue   |  1 +
 frontend/src/views/dataset/add/AddSQL.vue     |  2 +-
 .../views/system/datasource/DsFormContent.vue | 22 +++++++++++++++++++
 frontend/src/views/system/user/index.vue      | 12 ++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/gridTable/index.vue b/frontend/src/components/gridTable/index.vue
index 9754c48897..22c40b389e 100644
--- a/frontend/src/components/gridTable/index.vue
+++ b/frontend/src/components/gridTable/index.vue
@@ -108,6 +108,7 @@ export default {
       handler() {
         this.$nextTick(() => {
           this.$refs.table.doLayout()
+          this.$emit('columnsChange')
         })
       },
       deep: true
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index ad99840b4f..d3cef63e5c 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -138,7 +138,7 @@
               <svg-icon
                 :icon-class="showTable ? 'reference-table' : 'reference-field'"
               />
-              {{ (showTable && fieldData.length) || tableData.length }}
+              {{ (showTable && fieldDataCopy.length) || tableDataCopy.length }}
             </span>
           </p>
         </div>
diff --git a/frontend/src/views/system/datasource/DsFormContent.vue b/frontend/src/views/system/datasource/DsFormContent.vue
index 7af186cf52..bd2744b18f 100644
--- a/frontend/src/views/system/datasource/DsFormContent.vue
+++ b/frontend/src/views/system/datasource/DsFormContent.vue
@@ -1114,6 +1114,25 @@ export default {
         }
       })
     },
+    reloadStatus(apiConfiguration = []) {
+      let arr = []
+      let arrError = []
+      let arrSuccess = []
+      if (!Array.isArray(apiConfiguration)) {
+        arr = JSON.parse(apiConfiguration)
+        if (!Array.isArray(arr)) return
+      }
+      arrError = arr.filter(ele => ele.status === 'Error').map(ele => ele.name)
+      arrSuccess = arr.filter(ele => ele.status === 'Success').map(ele => ele.name)
+      this.form.apiConfiguration.forEach(ele => {
+        if (arrError.includes(ele.name)) {
+          ele.status = 'Error'
+        }
+        if (arrSuccess.includes(ele.name)) {
+          ele.status = 'Success'
+        }
+      })
+    },
     validaDatasource() {
       if (!this.form.configuration.schema && this.form.type === 'oracle') {
         this.openMessageSuccess('datasource.please_choose_schema', 'error')
@@ -1167,6 +1186,9 @@ export default {
               if (res.success) {
                 this.openMessageSuccess('datasource.validate_success')
               } else {
+                if (data.type === 'api') {
+                  this.reloadStatus(res.data?.configuration)
+                }
                 if (res.message.length < 2500) {
                   this.openMessageSuccess(res.message, 'error')
                 } else {
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index be0894105c..a45d78fb37 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -118,13 +118,16 @@
         v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
         :table-data="data"
         :columns="checkedColumnNames"
+        current-row-key="email"
         :pagination="paginationConfig"
+        @columnsChange="columnsChange"
         @sort-change="sortChange"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
       >
         <el-table-column
           prop="username"
+          key="username"
           label="ID"
         />
         <el-table-column
@@ -137,6 +140,7 @@
         <!-- <el-table-column prop="gender" :label="$t('commons.gender')" width="60" /> -->
         <el-table-column
           prop="from"
+          key="from"
           :label="$t('user.source')"
           width="80"
         >
@@ -237,6 +241,7 @@
         </el-table-column>
 
         <el-table-column
+          key="__operation"
           slot="__operation"
           :label="$t('commons.operating')"
           fixed="right"
@@ -554,6 +559,13 @@ export default {
         this.showScroll = dom && dom.scrollWidth > dom.offsetWidth
       })
     },
+    columnsChange() {
+      const arr = this.data
+      this.data = []
+      this.$nextTick(() => {
+        this.data = arr
+      })
+    },
     search() {
       const param = {
         orders: formatOrders(this.orderConditions),