feat:非直连数据集做校验；前端登陆样式fix 测试；不同用户创建db类型数据集可以选择相同表

backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java

@@ -34,7 +34,7 @@ public class DataSetTableController {
     }
 
     @PostMapping("delete/{id}")
-    public void delete(@PathVariable String id)throws Exception {
+    public void delete(@PathVariable String id) throws Exception {
         dataSetTableService.delete(id);
     }
 
@@ -92,4 +92,9 @@ public class DataSetTableController {
     public Map<String, Object> excelUpload(@RequestParam("file") MultipartFile file) throws Exception {
         return dataSetTableService.excelSaveAndParse(file);
     }
+
+    @PostMapping("checkDorisTableIsExists/{id}")
+    public Boolean checkDorisTableIsExists(@PathVariable String id) throws Exception {
+        return dataSetTableService.checkDorisTableIsExists(id);
+    }
 }

backend/src/main/java/io/dataease/datasource/service/DatasourceService.java

@@ -6,6 +6,7 @@ import io.dataease.base.mapper.*;
 import io.dataease.base.mapper.ext.ExtDataSourceMapper;
 import io.dataease.base.mapper.ext.query.GridExample;
 import io.dataease.commons.exception.DEException;
+import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.CommonThreadPool;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.datasource.dto.DBTableDTO;
@@ -108,7 +109,7 @@ public class DatasourceService {
             dbTableDTO.setDatasetPath(null);
             for (DatasetTable datasetTable : datasetTables) {
                 DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class);
-                if (StringUtils.equals(name, dataTableInfoDTO.getTable())) {
+                if (StringUtils.equals(name, dataTableInfoDTO.getTable()) && StringUtils.equals(datasetTable.getCreateBy(), AuthUtils.getUser().getUsername())) {
                     dbTableDTO.setEnableCheck(false);
 
                     List<DatasetGroup> parents = dataSetGroupService.getParents(datasetTable.getSceneId());

backend/src/main/java/io/dataease/provider/QueryProvider.java

@@ -11,7 +11,7 @@ import java.util.List;
  * @Date 2021/5/17 2:42 下午
  */
 public abstract class QueryProvider {
-    public abstract Integer transFieldType( String field);
+    public abstract Integer transFieldType(String field);
 
     public abstract String createQueryCountSQL(String table);
 
@@ -30,4 +30,6 @@ public abstract class QueryProvider {
     public abstract String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartExtFilterRequest> extFilterRequestList);
 
     public abstract String getSQLAsTmp(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartExtFilterRequest> extFilterRequestList);
+
+    public abstract String searchTable(String table);
 }

backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java

@@ -224,6 +224,11 @@ public class DorisQueryProvider extends QueryProvider {
         return getSQL(" (" + sql + ") AS tmp ", xAxis, yAxis, extFilterRequestList);
     }
 
+    @Override
+    public String searchTable(String table) {
+        return "SELECT table_name FROM information_schema.TABLES WHERE table_name ='" + table + "'";
+    }
+
     public String transMysqlFilterTerm(String term) {
         switch (term) {
             case "eq":

backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java

@@ -231,6 +231,11 @@ public class MysqlQueryProvider extends QueryProvider {
         return getSQL(" (" + sql + ") AS tmp ", xAxis, yAxis, extFilterRequestList);
     }
 
+    @Override
+    public String searchTable(String table) {
+        return "SELECT table_name FROM information_schema.TABLES WHERE table_name ='" + table + "'";
+    }
+
     public String transMysqlFilterTerm(String term) {
         switch (term) {
             case "eq":

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -788,4 +788,15 @@ public class DataSetTableService {
         fileOutputStream.close();
         return filePath;
     }
+
+    public Boolean checkDorisTableIsExists(String id) throws Exception {
+        Datasource dorisDatasource = (Datasource) CommonBeanFactory.getBean("DorisDatasource");
+        JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
+        DatasourceRequest datasourceRequest = new DatasourceRequest();
+        datasourceRequest.setDatasource(dorisDatasource);
+        QueryProvider qp = ProviderFactory.getQueryProvider(dorisDatasource.getType());
+        datasourceRequest.setQuery(qp.searchTable(DorisTableUtils.dorisName(id)));
+        List<String[]> data = jdbcProvider.getData(datasourceRequest);
+        return CollectionUtils.isNotEmpty(data);
+    }
 }

frontend/src/lang/en.js

@@ -769,7 +769,8 @@ export default {
     float: 'Decimal',
     edit_custom_table: 'Edit self help dataset',
     edit_field: 'Edit Field',
-    preview_100_data: 'Show 100 lines data'
+    preview_100_data: 'Show 100 lines data',
+    invalid_table_check: 'Please sync data first.'
   },
   datasource: {
     datasource: 'Data Source',

frontend/src/lang/tw.js

@@ -769,7 +769,8 @@ export default {
     float: '小數',
     edit_custom_table: '編輯自助數據集',
     edit_field: '編輯自斷',
-    preview_100_data: '顯示前100行數據'
+    preview_100_data: '顯示前100行數據',
+    invalid_table_check: '非直連數據集請先完成數據同步'
   },
   datasource: {
     datasource: '數據源',

frontend/src/lang/zh.js

@@ -769,7 +769,8 @@ export default {
     float: '小数',
     edit_custom_table: '编辑自助数据集',
     edit_field: '编辑字段',
-    preview_100_data: '显示前100行数据'
+    preview_100_data: '显示前100行数据',
+    invalid_table_check: '非直连数据集请先完成数据同步'
   },
   datasource: {
     datasource: '数据源',

frontend/src/views/dataset/common/DatasetGroupSelector.vue

@@ -269,7 +269,24 @@ export default {
         })
         return
       }
-      this.$emit('getTable', data)
+      // check mode=1的数据集是否创建doris表
+      if (data.mode === 1) {
+        post('/dataset/table/checkDorisTableIsExists/' + data.id, {}).then(response => {
+          if (response.data) {
+            this.$nextTick(function() {
+              this.$emit('getTable', data)
+            })
+          } else {
+            this.$message({
+              type: 'error',
+              message: this.$t('dataset.invalid_table_check'),
+              showClose: true
+            })
+          }
+        })
+      } else {
+        this.$emit('getTable', data)
+      }
     },
 
     unionDataChange() {

frontend/src/views/login/index2.vue

@@ -1,236 +0,0 @@
-<template>
-  <div class="login-container">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
-
-      <div class="title-container">
-        <h3 class="title">Login Form</h3>
-      </div>
-
-      <el-form-item prop="username">
-        <span class="svg-container">
-          <svg-icon icon-class="user" />
-        </span>
-        <el-input
-          ref="username"
-          v-model="loginForm.username"
-          placeholder="Username"
-          name="username"
-          type="text"
-          tabindex="1"
-          auto-complete="on"
-        />
-      </el-form-item>
-
-      <el-form-item prop="password">
-        <span class="svg-container">
-          <svg-icon icon-class="password" />
-        </span>
-        <el-input
-          :key="passwordType"
-          ref="password"
-          v-model="loginForm.password"
-          :type="passwordType"
-          placeholder="Password"
-          name="password"
-          tabindex="2"
-          auto-complete="on"
-          @keyup.enter.native="handleLogin"
-        />
-        <span class="show-pwd" @click="showPwd">
-          <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
-        </span>
-      </el-form-item>
-
-      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">Login</el-button>
-
-      <div class="tips">
-        <span style="margin-right:20px;">username: admin</span>
-        <span> password: any</span>
-      </div>
-
-    </el-form>
-  </div>
-</template>
-
-<script>
-import { validUsername } from '@/utils/validate'
-
-export default {
-  name: 'Login',
-  data() {
-    const validateUsername = (rule, value, callback) => {
-      if (!validUsername(value)) {
-        callback(new Error('Please enter the correct user name'))
-      } else {
-        callback()
-      }
-    }
-    const validatePassword = (rule, value, callback) => {
-      if (value.length < 6) {
-        callback(new Error('The password can not be less than 6 digits'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      loginForm: {
-        username: 'admin',
-        password: '111111'
-      },
-      loginRules: {
-        username: [{ required: true, trigger: 'blur', validator: validateUsername }],
-        password: [{ required: true, trigger: 'blur', validator: validatePassword }]
-      },
-      loading: false,
-      passwordType: 'password',
-      redirect: undefined
-    }
-  },
-  watch: {
-    $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect
-      },
-      immediate: true
-    }
-  },
-  methods: {
-    showPwd() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
-      } else {
-        this.passwordType = 'password'
-      }
-      this.$nextTick(() => {
-        this.$refs.password.focus()
-      })
-    },
-    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true
-          this.$store.dispatch('user/login', this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || '/' })
-            this.loading = false
-          }).catch(() => {
-            this.loading = false
-          })
-        } else {
-          return false
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-/* 修复input 背景不协调 和光标变色 */
-/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
-
-$bg:#283443;
-$light_gray:#fff;
-$cursor: #fff;
-
-@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
-  .login-container .el-input input {
-    color: $cursor;
-  }
-}
-
-/* reset element-ui css */
-.login-container {
-  .el-input {
-    display: inline-block;
-    height: 47px;
-    width: 85%;
-
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 12px 5px 12px 15px;
-      color: $light_gray;
-      height: 47px;
-      caret-color: $cursor;
-
-      &:-webkit-autofill {
-        box-shadow: 0 0 0px 1000px $bg inset !important;
-        -webkit-text-fill-color: $cursor !important;
-      }
-    }
-  }
-
-  .el-form-item {
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    background: rgba(0, 0, 0, 0.1);
-    border-radius: 5px;
-    color: #454545;
-  }
-}
-</style>
-
-<style lang="scss" scoped>
-$bg:#2d3a4b;
-$dark_gray:#889aa4;
-$light_gray:#eee;
-
-.login-container {
-  min-height: 100%;
-  width: 100%;
-  background-color: $bg;
-  overflow: hidden;
-
-  .login-form {
-    position: relative;
-    width: 520px;
-    max-width: 100%;
-    padding: 160px 35px 0;
-    margin: 0 auto;
-    overflow: hidden;
-  }
-
-  .tips {
-    font-size: 14px;
-    color: #fff;
-    margin-bottom: 10px;
-
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-
-  .svg-container {
-    padding: 6px 5px 6px 15px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-
-  .title-container {
-    position: relative;
-
-    .title {
-      font-size: 26px;
-      color: $light_gray;
-      margin: 0px auto 40px auto;
-      text-align: center;
-      font-weight: bold;
-    }
-  }
-
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
-  }
-}
-</style>

frontend/src/views/panel/edit/index.vue

@@ -115,7 +115,7 @@ import { get } from '@/api/panel/panel'
 // 引入样式
 import '@/components/canvas/assets/iconfont/iconfont.css'
 import '@/components/canvas/styles/animate.css'
-// import '@/components/canvas/styles/reset.css'
+import '@/components/canvas/styles/reset.css'
 
 import { ApplicationContext } from '@/utils/ApplicationContext'
 import FilterDialog from '../filter/filterDialog'