From 1dd27e5e2f98486abe82dd53fcded15cdc3c88e1 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 1 Mar 2022 11:59:44 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E4=B8=8B=E6=96=B9=E5=AD=98=E5=9C=A8=E9=81=AE?=
 =?UTF-8?q?=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/src/pages/tabBar/home/detail.nvue | 83 +-----------------------
 1 file changed, 3 insertions(+), 80 deletions(-)

diff --git a/mobile/src/pages/tabBar/home/detail.nvue b/mobile/src/pages/tabBar/home/detail.nvue
index f99e72806c..0f15cac181 100644
--- a/mobile/src/pages/tabBar/home/detail.nvue
+++ b/mobile/src/pages/tabBar/home/detail.nvue
@@ -1,7 +1,7 @@
 <template>
-	<view class="page dataease-main">
+	<view>
        
-		<uni-nav-bar :fixed="false" left-icon="arrowleft"  @clickLeft="back" :title="banner.title" >
+		<uni-nav-bar :fixed="true" left-icon="arrowleft"  @clickLeft="back" :title="banner.title" >
 			<block slot="right">
 				<uni-row class="demo-uni-row" >
 					<uni-col :span="12">
@@ -21,15 +21,13 @@
 			</block>
 			
 		</uni-nav-bar>
-		<view class="article-content" style="height: 100% !important;">
-            <view v-if="url">
+		 <view v-if="url">
                 <web-view
                 :webview-styles="webViewStyles"
                 style="height: 100vh;"
                 >
                 </web-view>
             </view>
-		</view>
 		
 
        
@@ -253,81 +251,6 @@
 </script>
 
 <style>
-.dataease-main {
-    
-    position: fixed;
-    left: var(--window-left);
-    right: var(--window-right);
-    padding: 5px;
-    height: calc(100vh - 10px);
-    
-}
-
-.person-title {
-    font-weight: 700;
-    font-size: 15px;
-    text-align: center;
-    overflow: hidden;
-    white-space: nowrap;
-    
-    text-overflow: ellipsis;
-    
-}
-.article-content {
-    
-    margin: 5px 0;
-    background: #ffffff;
-}
-.card-actions {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    align-items: center;
-    height: 45px;
-    border-top: 1px #eee solid;
-    background: #ffffff;
-}
-.card-actions-item {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-}
-.card-actions-item-text {
-    font-size: 12px;
-    color: #666;
-    margin-left: 5px;
-}
-
-.input-view {
-		/* #ifndef APP-PLUS-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		// width: 500rpx;
-		flex: 1;
-		background-color: #f8f8f8;
-		height: $nav-height;
-		border-radius: 15px;
-		padding: 0 15px;
-		flex-wrap: nowrap;
-		margin: 7px 0;
-		line-height: $nav-height;
-	}
-
-	.input-uni-icon {
-		line-height: $nav-height;
-	}
-
-	.nav-bar-input {
-		height: $nav-height;
-		line-height: $nav-height;
-		/* #ifdef APP-PLUS-NVUE */
-		width: 370rpx;
-		/* #endif */
-		padding: 0 5px;
-		font-size: 14px;
-		background-color: #f8f8f8;
-	}
 
 
 </style>

From 4c7f6ed329376b1066068338c2ed74100777eaff Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 1 Mar 2022 12:02:29 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E5=85=A8=E5=B1=80=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/auth/aop/DePermissionAnnotationHandler.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java b/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
index 616c9d14e9..9d8e8f3345 100644
--- a/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
+++ b/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
@@ -90,7 +90,7 @@ public class DePermissionAnnotationHandler {
 
         } catch (Throwable throwable) {
             LogUtil.error(throwable.getMessage(), throwable);
-            throw new RuntimeException(throwable);
+            throw new RuntimeException(throwable.getMessage());
         }
     }
 

From f7a6051841bb6ca91f5d7e3d79f367ab9b6f081c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 1 Mar 2022 12:04:03 +0800
Subject: [PATCH 3/7] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E8=B7=B3=E8=BD=AC=E8=AE=BE=E7=BD=AE=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/Editor/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 9dd167f33b..cd97d64708 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -160,7 +160,7 @@
 
     <el-dialog
       :visible.sync="linkJumpSetVisible"
-      width="60%"
+      width="900px"
       class="dialog-css"
       :show-close="true"
       :destroy-on-close="true"

From 66ffc20172beb93e4b6df34b358a9bd482b91360 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 1 Mar 2022 12:05:38 +0800
Subject: [PATCH 4/7] =?UTF-8?q?refactor:=20=E6=8B=BC=E5=86=99=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../es/{Requst.java => Request.java}          |  2 +-
 ...WithCursor.java => RequestWithCursor.java} |  2 +-
 .../provider/datasource/EsProvider.java       | 24 +++++++++----------
 3 files changed, 13 insertions(+), 15 deletions(-)
 rename backend/src/main/java/io/dataease/controller/request/datasource/es/{Requst.java => Request.java} (89%)
 rename backend/src/main/java/io/dataease/controller/request/datasource/es/{RequstWithCursor.java => RequestWithCursor.java} (69%)

diff --git a/backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java b/backend/src/main/java/io/dataease/controller/request/datasource/es/Request.java
similarity index 89%
rename from backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java
rename to backend/src/main/java/io/dataease/controller/request/datasource/es/Request.java
index f69c4290cc..b66102e581 100644
--- a/backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java
+++ b/backend/src/main/java/io/dataease/controller/request/datasource/es/Request.java
@@ -3,7 +3,7 @@ package io.dataease.controller.request.datasource.es;
 import lombok.Data;
 
 @Data
-public class Requst {
+public class Request {
     private String query;
     private Integer fetch_size = 10000;
     private boolean field_multi_value_leniency = true;
diff --git a/backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java b/backend/src/main/java/io/dataease/controller/request/datasource/es/RequestWithCursor.java
similarity index 69%
rename from backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java
rename to backend/src/main/java/io/dataease/controller/request/datasource/es/RequestWithCursor.java
index eebd503d5d..9da1be5145 100644
--- a/backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java
+++ b/backend/src/main/java/io/dataease/controller/request/datasource/es/RequestWithCursor.java
@@ -3,6 +3,6 @@ package io.dataease.controller.request.datasource.es;
 import lombok.Data;
 
 @Data
-public class RequstWithCursor extends Requst{
+public class RequestWithCursor extends Request {
     private String cursor;
 }
diff --git a/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java b/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java
index eb055a45b4..7b88b14edf 100644
--- a/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java
+++ b/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java
@@ -5,16 +5,14 @@ import com.google.gson.Gson;
 import io.dataease.commons.utils.HttpClientConfig;
 import io.dataease.commons.utils.HttpClientUtil;
 import io.dataease.controller.request.datasource.es.EsReponse;
-import io.dataease.controller.request.datasource.es.Requst;
-import io.dataease.controller.request.datasource.es.RequstWithCursor;
+import io.dataease.controller.request.datasource.es.Request;
+import io.dataease.controller.request.datasource.es.RequestWithCursor;
 import io.dataease.controller.request.datasource.DatasourceRequest;
 import io.dataease.dto.datasource.EsConfiguration;
 import io.dataease.dto.datasource.TableDesc;
 import io.dataease.dto.datasource.TableField;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
-import io.dataease.provider.ProviderFactory;
-import io.dataease.provider.query.QueryProvider;
 import io.dataease.provider.query.es.EsQueryProvider;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
@@ -55,11 +53,11 @@ public class EsProvider extends DatasourceProvider {
                 byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8));
                 httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth));
             }
-            Requst requst = new Requst();
-            requst.setQuery(dsr.getQuery());
-            requst.setFetch_size(dsr.getFetchSize());
+            Request request = new Request();
+            request.setQuery(dsr.getQuery());
+            request.setFetch_size(dsr.getFetchSize());
             String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + esConfiguration.getUri() + "?format=json" : esConfiguration.getUrl() + "/" + esConfiguration.getUri() + "?format=json";
-            String response = HttpClientUtil.post(url, new Gson().toJson(requst), httpClientConfig);
+            String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig);
             EsReponse esReponse = new Gson().fromJson(response, EsReponse.class);
 
             list.addAll(fetchResult(esReponse));
@@ -69,7 +67,7 @@ public class EsProvider extends DatasourceProvider {
             }
             if (!dsr.isPreviewData()) {
                 while (StringUtils.isNotEmpty(esReponse.getCursor())) {
-                    RequstWithCursor requstWithCursor = new RequstWithCursor();
+                    RequestWithCursor requstWithCursor = new RequestWithCursor();
                     requstWithCursor.setQuery(dsr.getQuery());
                     requstWithCursor.setFetch_size(dsr.getFetchSize());
                     requstWithCursor.setCursor(esReponse.getCursor());
@@ -286,11 +284,11 @@ public class EsProvider extends DatasourceProvider {
             httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth));
         }
 
-        Requst requst = new Requst();
-        requst.setQuery(sql);
-        requst.setFetch_size(datasourceRequest.getFetchSize());
+        Request request = new Request();
+        request.setQuery(sql);
+        request.setFetch_size(datasourceRequest.getFetchSize());
         String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + uri : esConfiguration.getUrl() + "/" + uri;
-        String response = HttpClientUtil.post(url, new Gson().toJson(requst), httpClientConfig);
+        String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig);
         return response;
     }
 

From aa32c5dfc1bbaf89083ecabc58111fd66c708b8c Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 1 Mar 2022 12:15:19 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/src/pages/tabBar/dir/search.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/src/pages/tabBar/dir/search.vue b/mobile/src/pages/tabBar/dir/search.vue
index cc4cabc957..aad3bb30a2 100644
--- a/mobile/src/pages/tabBar/dir/search.vue
+++ b/mobile/src/pages/tabBar/dir/search.vue
@@ -136,7 +136,7 @@ export default {
 	 * 点击软键盘搜索按键触发
 	 */
 	onNavigationBarSearchInputConfirmed(e) {
-		let text = e.text;
+		/* let text = e.text;
 		if (!text) {
 			this.isHistory = true;
 			this.historyList = [];
@@ -161,7 +161,7 @@ export default {
 					}
 				}
 			});
-		}
+		} */
 	},
 	/**
 	 *  点击导航栏 buttons 时触发

From a72f2622268164904a9a88e1be49c704555a8d70 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 1 Mar 2022 12:42:47 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E8=A1=8C=E5=88=97=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=B9=B6=E8=A1=8C=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/chart/ChartViewService.java     | 2 +-
 .../io/dataease/service/dataset/DataSetTableService.java     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 828c206dc3..354758577e 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -264,7 +264,7 @@ public class ChartViewService {
 
 
         //行权限
-        List<ChartFieldCustomFilterDTO> rowPermissionFields = permissionService.getCustomFilters(columnPermissionFields, table, requestList.getUser());
+        List<ChartFieldCustomFilterDTO> rowPermissionFields = permissionService.getCustomFilters(fields, table, requestList.getUser());
         fieldCustomFilter.addAll(rowPermissionFields);
 
         for (ChartFieldCustomFilterDTO ele : fieldCustomFilter) {
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 4d95d8f4bf..2bb39fd550 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -479,6 +479,8 @@ public class DataSetTableService {
             return map;
         }
         DatasetTable datasetTable = datasetTableMapper.selectByPrimaryKey(dataSetTableRequest.getId());
+        // 行权限
+        List<ChartFieldCustomFilterDTO> customFilter = permissionService.getCustomFilters(fields, datasetTable, null);
         // 列权限
         List<String> desensitizationList = new ArrayList<>();
         fields = permissionService.filterColumnPermissons(fields, desensitizationList, datasetTable.getId(), null);
@@ -488,8 +490,7 @@ public class DataSetTableService {
             map.put("page", new DataSetPreviewPage());
             return map;
         }
-        // 行权限
-        List<ChartFieldCustomFilterDTO> customFilter = permissionService.getCustomFilters(fields, datasetTable, null);
+
         String[] fieldArray = fields.stream().map(DatasetTableField::getDataeaseName).toArray(String[]::new);
 
         DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class);

From 780536c2f2c2dfefdcc0fbddb6ff231ae919f52b Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 1 Mar 2022 12:43:07 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/UpdateInfo.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index 59c50484c9..acb05bd56b 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -334,7 +334,7 @@ import 'codemirror/addon/hint/sql-hint'
 import 'codemirror/addon/hint/show-hint'
 // vue-cron
 import cron from '@/components/cron/cron'
-
+import {hasDataPermission} from '@/utils/permission'
 export default {
   name: 'UpdateInfo',
   components: { codemirror, cron },
@@ -422,7 +422,10 @@ export default {
   watch: {
     table: {
       handler() {
-        this.listTask()
+        if(hasDataPermission('manage',this.param.privileges)){
+          this.listTask()
+        }
+
         this.listTaskLog()
       },
       immediate: true
@@ -447,7 +450,9 @@ export default {
       } else {
         this.taskLastRequestComplete = false
       }
-      this.listTask(false)
+      if(hasDataPermission('manage',this.param.privileges)){
+        this.listTask(false)
+      }
     }, 10000)
   },
   beforeDestroy() {