From 1e0d699afda36cd3de2ce72d07cd9ce415ab655e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 28 Dec 2021 16:52:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A1=8C=E6=9D=83=E9=99=90=E6=9C=AA?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E4=B9=8B=E5=89=8D=E7=9A=84=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/Editor/index.vue  |  1 -
 frontend/src/components/canvas/utils/utils.js          |  2 --
 frontend/src/views/dataset/data/ViewTable.vue          | 10 ++--------
 frontend/src/views/panel/GrantAuth/user/index.vue      |  1 -
 frontend/src/views/panel/index.vue                     |  2 --
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 70d0ec478e..46ebd36679 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -1232,7 +1232,6 @@ export default {
       this.timeMachine = setTimeout(() => {
         if (index === this.changeIndex) {
           this.changeScale()
-          console.log('changeScale')
         }
         this.destroyTimeMachine()
       }, 1500)
diff --git a/frontend/src/components/canvas/utils/utils.js b/frontend/src/components/canvas/utils/utils.js
index 827671c69f..d5d4fa84fa 100644
--- a/frontend/src/components/canvas/utils/utils.js
+++ b/frontend/src/components/canvas/utils/utils.js
@@ -21,11 +21,9 @@ export function deepCopy(target) {
 }
 
 export function swap(arr, i, j) {
-  console.log('before:' + i + '-->' + j + JSON.stringify(arr))
   const temp = arr[i]
   arr[i] = arr[j]
   arr[j] = temp
-  console.log('after:' + JSON.stringify(arr))
 }
 
 export function moveUp(arr, i) {
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 145a0872ce..c6541c19a2 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -39,12 +39,6 @@
         <el-button v-if="table.type ==='union'" size="mini" @click="editUnion">
           {{ $t('dataset.edit_union') }}
         </el-button>
-        <!--        <el-button size="mini" @click="edit">-->
-        <!--          {{ $t('dataset.edit_field') }}-->
-        <!--        </el-button>-->
-        <!--        <el-button size="mini" type="primary" @click="createChart">-->
-        <!--          {{$t('dataset.create_view')}}-->
-        <!--        </el-button>-->
       </el-row>
     </el-row>
     <el-divider />
@@ -62,8 +56,8 @@
       <el-tab-pane v-if="table.mode === 1 && (table.type === 'excel' || table.type === 'db' || table.type === 'sql')" :label="$t('dataset.update_info')" name="updateInfo">
         <update-info v-if="tabActive=='updateInfo'" :param="param" :table="table" />
       </el-tab-pane>
-      <el-tab-pane v-if="isPluginLoaded" :lazy="true" :label="$t('dataset.row_permissions')" name="second">
-        <plugin-com v-if="isPluginLoaded" ref="RowPermissions" component-name="RowPermissions" :obj="table"/>
+      <el-tab-pane v-if="isPluginLoaded" :lazy="true" :label="$t('dataset.row_permissions')" name="rowPermissions">
+        <plugin-com v-if="isPluginLoaded && tabActive=='rowPermissions'" ref="RowPermissions" component-name="RowPermissions" :obj="table"/>
       </el-tab-pane>
     </el-tabs>
   </el-row>
diff --git a/frontend/src/views/panel/GrantAuth/user/index.vue b/frontend/src/views/panel/GrantAuth/user/index.vue
index 1c8eaed21b..452ea0437d 100644
--- a/frontend/src/views/panel/GrantAuth/user/index.vue
+++ b/frontend/src/views/panel/GrantAuth/user/index.vue
@@ -88,7 +88,6 @@ export default {
     },
 
     cancel() {
-      console.log('user cancel')
     },
     buildRequest(rows) {
       const targetIds = rows.map(row => row.userId)
diff --git a/frontend/src/views/panel/index.vue b/frontend/src/views/panel/index.vue
index c3813c655b..c7df8bfb77 100644
--- a/frontend/src/views/panel/index.vue
+++ b/frontend/src/views/panel/index.vue
@@ -33,8 +33,6 @@ export default {
   },
   watch: {
     $route(to, from) {
-      console.log(to)
-      console.log(from)
       // 对路由变化作出响应...
     }
   },

From 7ebb9b3be4aad9cf3c6f3da0005395dc057b9313 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 28 Dec 2021 17:00:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E6=A1=86=E4=B8=8D=E8=83=BD=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/DeWidget/DeSelectGrid.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
index 6d7b520c7b..b2d842e3b7 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
@@ -23,7 +23,9 @@
 
       <div v-else class="radio-group-container">
         <el-radio-group v-model="value" @change="changeRadioBox">
-          <el-radio v-for="(item, index) in datas" :key="index" :label="item.id">{{ item.id }}</el-radio>
+          <el-radio v-for="(item, index) in datas" :key="index" :label="item.id" @click.native.prevent="testChange(item)">
+            <span>{{ item.id }}</span>
+          </el-radio>
         </el-radio-group>
       </div>
 
@@ -209,6 +211,10 @@ export default {
       this.checkAll = checkedCount === this.datas.length
       this.isIndeterminate = checkedCount > 0 && checkedCount < this.datas.length
       this.changeValue(values)
+    },
+    testChange(item) {
+      this.value = this.value === item.id ? null : item.id
+      this.changeRadioBox(this.value)
     }
 
   }