Merge branch 'main' of github.com:dataease/dataease into main

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

@@ -91,11 +91,7 @@ public class DatasourceService {
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
         DatasourceRequest datasourceRequest = new DatasourceRequest();
         datasourceRequest.setDatasource(datasource);
-        try {
         datasourceProvider.test(datasourceRequest);
-        } catch (Exception e) {
-            throw new RuntimeException(Translator.get("i18n_datasource_check_fail"));
-        }
     }
 
     public List<DBTableDTO> getTables(Datasource datasource) throws Exception {

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

@@ -102,10 +102,6 @@ public class DataSetTableService {
             datasetTable.setCreateBy(AuthUtils.getUser().getUsername());
             datasetTable.setCreateTime(System.currentTimeMillis());
             DataTableInfoDTO dataTableInfoDTO = new DataTableInfoDTO();
-            if (StringUtils.equalsIgnoreCase("db", datasetTable.getType())) {
-                dataTableInfoDTO.setTable(datasetTable.getName());
-                datasetTable.setInfo(new Gson().toJson(dataTableInfoDTO));
-            }
             int insert = datasetTableMapper.insert(datasetTable);
             // 添加表成功后，获取当前表字段和类型，抽象到dataease数据库
             if (insert == 1) {

backend/src/main/java/io/dataease/service/panel/PanelLinkService.java

@@ -119,7 +119,7 @@ public class PanelLinkService {
     public Boolean validateHeads(PanelLink panelLink) throws Exception{
         HttpServletRequest request = ServletUtils.request();
         String token = request.getHeader("LINK-PWD-TOKEN");
-        if (StringUtils.isEmpty(token)) return false;
+        if (StringUtils.isEmpty(token) || StringUtils.equals("undefined", token) || StringUtils.equals("null", token)) return false;
         boolean verify = JWTUtils.verifyLink(token, panelLink.getResourceId(), decryptParam(panelLink.getPwd()));
         return verify;
     }

frontend/src/lang/en.js

@@ -989,7 +989,8 @@ export default {
     loginLogo: 'Login page header logo',
     loginImage: 'Picture on the right side of the login page',
     loginTitle: 'Login page title',
-    title: 'System name'
+    title: 'System name',
+    advice_size: 'Advice picture size'
   },
   auth: {
     authConfig: 'Auth Config',

frontend/src/lang/tw.js

@@ -989,7 +989,8 @@ export default {
     loginLogo: '登陸頁面頭部 Logo',
     loginImage: '登陸頁面右側圖片',
     loginTitle: '登陸頁面標題',
-    title: '系統名稱'
+    title: '系統名稱',
+    advice_size: '建議圖片大小'
   },
   auth: {
     authConfig: '權限配置',

frontend/src/lang/zh.js

@@ -989,7 +989,8 @@ export default {
     loginLogo: '登录页面头部logo',
     loginImage: '登录页面右侧图片',
     loginTitle: '登录页面标题',
-    title: '系统名称'
+    title: '系统名称',
+    advice_size: '建议图片大小'
   },
   auth: {
     authConfig: '权限配置',

frontend/src/styles/topbar.scss

@@ -19,6 +19,10 @@
       // color: rgb(191, 203, 217);
       color: rgba(255,255,255,0.87);
       float: left;
+      img{
+        width: auto;
+        max-height: 45px;
+      }
     }
     .el-menu {
       float: left;

frontend/src/views/dataset/add/AddDB.vue

@@ -120,17 +120,24 @@ export default {
     save() {
       // console.log(this.checkTableList);
       // console.log(this.scene);
+      let ds = {}
+      this.options.forEach(ele => {
+        if (ele.id === this.dataSource) {
+          ds = ele
+        }
+      })
       const sceneId = this.param.id
       const dataSourceId = this.dataSource
       const tables = []
       const mode = this.mode
       this.checkTableList.forEach(function(name) {
         tables.push({
-          name: name,
+          name: ds.name + '_' + name,
           sceneId: sceneId,
           dataSourceId: dataSourceId,
           type: 'db',
-          mode: parseInt(mode)
+          mode: parseInt(mode),
+          info: JSON.stringify({ table: name })
         })
       })
       post('/dataset/table/batchAdd', tables).then(response => {

frontend/src/views/login/index.vue

@@ -180,9 +180,13 @@ export default {
       margin-top: 20px;
     }
     img{
-      width: 240px;
+      /*width: 240px;*/
+      width: auto;
+      max-height: 60px;
       @media only screen and (max-width: 1280px) {
-        width: 200px;
+        /*width: 200px;*/
+        width: auto;
+        max-height: 50px;
       }
     }
   }

frontend/src/views/panel/list/PanelList.vue

@@ -115,7 +115,7 @@
                       <el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-paperclip" :command="beforeClickMore('link',data,node)">
                         {{ $t('panel.create_public_links') }}
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-paperclip" :command="beforeClickMore('toDefaultPanel',data,node)">
+                      <el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-copy-document" :command="beforeClickMore('toDefaultPanel',data,node)">
                         {{ $t('panel.to_default_panel') }}
                       </el-dropdown-item>
                       <el-dropdown-item icon="el-icon-edit-outline" :command="beforeClickMore('rename',data,node)">