Merge remote-tracking branch 'origin/dev' into dev

Dockerfile

@@ -2,18 +2,18 @@ FROM registry.cn-qingdao.aliyuncs.com/dataease/fabric8-java-alpine-openjdk8-jre:
 
 RUN echo -e 'http://mirrors.aliyun.com/alpine/edge/main/\nhttp://mirrors.aliyun.com/alpine/edge/community/' > /etc/apk/repositories 
 
-RUN apk add chromium chromium-chromedriver fontconfig --no-cache --allow-untrusted
+#RUN apk add chromium chromium-chromedriver fontconfig --no-cache --allow-untrusted
 
-RUN mkdir -p /usr/local/sbin/ \
-    && cp /usr/bin/chromedriver /usr/local/sbin/ \
-    && chmod a+x /usr/local/sbin/chromedriver
+#RUN mkdir -p /usr/local/sbin/ \
+#    && cp /usr/bin/chromedriver /usr/local/sbin/ \
+#    && chmod a+x /usr/local/sbin/chromedriver
 
 ADD simsun.ttc /usr/share/fonts/
 
-RUN cd /usr/share/fonts/ \
-    && mkfontscale \
-    && mkfontdir \
-    && fc-cache -fv
+#RUN cd /usr/share/fonts/ \
+#    && mkfontscale \
+#    && mkfontdir \
+#    && fc-cache -fv
 
 ARG IMAGE_TAG
 

backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml

@@ -34,9 +34,10 @@
     </delete>
 
     <select id="query" resultMap="treeNodeMap">
-        select distinct s.panel_group_id as id, IFNULL(s.granter,g.create_by) as creator, g.name
+        select distinct s.panel_group_id as id, u.nick_name as creator, g.name
         from panel_share s
         left join panel_group g on g.id = s.panel_group_id
+        left join sys_user u on u.username = IFNULL(s.granter,g.create_by)
         where
         ( s.target_id = #{userId} and s.type = 0 ) or
         ( s.target_id = #{deptId} and s.type = 2 ) or

mobile/src/pages.json

@@ -173,18 +173,18 @@
 		"list": [{
 				"pagePath": "pages/tabBar/home/index",
 				"iconPath": "static/home.png",
-				"selectedIconPath": "static/home.png",
+				"selectedIconPath": "static/home_select.png",
 				"text": "%navigate.menuHome%"
 			},
 			{
 				"pagePath": "pages/tabBar/dir/index",
 				"iconPath": "static/dir.png",
-				"selectedIconPath": "static/dir.png",
+				"selectedIconPath": "static/dir_select.png",
 				"text": "%navigate.menuDir%"
 			}, {
 				"pagePath": "pages/tabBar/me/index",
 				"iconPath": "static/me.png",
-				"selectedIconPath": "static/me.png",
+				"selectedIconPath": "static/me_select.png",
 				"text": "%navigate.menuMe%"
 			}
 		]