Merge branch 'v1.8' of github.com:dataease/dataease into v1.8

backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java

@@ -1,6 +1,5 @@
 package io.dataease.auth.entity;
 
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -39,4 +38,7 @@ public class SysUserEntity implements Serializable {
 
     @ApiModelProperty(hidden = true)
     private Boolean isAdmin;
+
+    @ApiModelProperty(hidden = true)
+    private Integer from;
 }

backend/src/main/java/io/dataease/auth/server/AuthServer.java

@@ -141,7 +141,7 @@ public class AuthServer implements AuthApi {
     @Override
     public Boolean useInitPwd() {
         CurrentUserDto user = AuthUtils.getUser();
-        if (null == user) {
+        if (null == user || 0 != user.getFrom()) {
             return false;
         }
         String md5 = CodingUtil.md5(DEFAULT_PWD);

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

@@ -12,6 +12,7 @@
         <result column="phone" jdbcType="VARCHAR" property="phone"/>
         <result column="enabled" property="enabled"/>
         <result column="is_admin" jdbcType="BIT" property="isAdmin"/>
+        <result column="from" property="from"/>
     </resultMap>
 
     <resultMap id="roleMap" type="io.dataease.auth.api.dto.CurrentRoleDto">
@@ -21,19 +22,19 @@
 
 
     <select id="findUser" resultMap="baseMap">
-        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language,is_admin from sys_user where user_id = #{userId}
+        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language,is_admin, `from` from sys_user where user_id = #{userId}
     </select>
 
     <select id="findUserByName" resultMap="baseMap">
-        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin from sys_user where username = #{username}
+        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user where username = #{username}
     </select>
 
     <select id="findLdapUserByName" resultMap="baseMap">
-        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin from sys_user a where username = #{username} and a.from = 1
+        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user a where username = #{username} and a.from = 1
     </select>
 
     <select id="findUserBySub" resultMap="baseMap">
-        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin from sys_user where sub = #{sub}
+        select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user where sub = #{sub}
     </select>
 
     <select id="roleCodes" resultType="String">

frontend/src/components/widget/DeWidget/DeTabs.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="de-tabs-div">
-    <el-tabs v-model="activeTabName" type="card" class="de-tabs">
+    <el-tabs v-model="activeTabName" type="card" class="de-tabs" @tab-click="handleClick">
       <el-tab-pane
         v-for="(item, index) in element.options.tabList"
         :key="item.name+index"
@@ -295,6 +295,15 @@ export default {
     },
     chartResize() {
       // this.$refs[this.activeTabName]
+    },
+    handleClick(tab) {
+      const name = tab.name
+      this.element.options.tabList.forEach(item => {
+        if (item && item.name === name && item.content && item.content.propValue && item.content.propValue.viewId) {
+          this.filterMap[item.content.propValue.viewId] = item.content.filters
+        }
+      })
+      // console.log(tab)
     }
 
   }