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

backend/src/main/resources/db/migration/V6__alter_table.sql

@@ -0,0 +1 @@
+ALTER TABLE `dataease`.`dataset_table` ADD COLUMN `sync_status` VARCHAR(45) NULL AFTER `create_time`;

frontend/src/lang/en.js

@@ -83,8 +83,8 @@ export default {
     thirdpartyTips: 'Can not be simulated on local, so please combine you own business simulation! ! !',
     expires: 'Login token expired, please login again',
     tokenError: 'Token error, please login again',
-    username_error: 'Please enter the correct user name',
-    password_error: 'The password can not be less than 6 digits'
+    username_error: 'Please enter the correct ID',
+    password_error: 'The password can not be less than 8 digits'
   },
   commons: {
     close: 'Close',

frontend/src/lang/tw.js

@@ -83,8 +83,8 @@ export default {
     thirdpartyTips: '本地不能模拟，请结合自己业务进行模拟！！！',
     expires: '登陸信息过期，请重新登陸',
     tokenError: '信息错误，请重新登陸',
-    username_error: '請輸入正確的用戶名',
-    password_error: '密碼不小於6位'
+    username_error: '請輸入正確的ID',
+    password_error: '密碼不小於8位'
   },
   commons: {
     icon: '圖標',

frontend/src/lang/zh.js

@@ -83,8 +83,8 @@ export default {
     thirdpartyTips: '本地不能模拟，请结合自己业务进行模拟！！！',
     expires: '登录token过期，请重新登录',
     tokenError: 'token错误，请重新登录',
-    username_error: '请输入正确的用户名',
-    password_error: '密码不小于6位'
+    username_error: '请输入正确的ID',
+    password_error: '密码不小于8位'
   },
   commons: {
     close: '关闭',

frontend/src/styles/variables.scss

@@ -39,6 +39,7 @@ $menuHover: rgba(158, 158, 158, 0.2);
 $subMenuBg:#1f2d3d;
 // $subMenuHover:#001528;
 $subMenuHover:#0a7be0;
+$colorBg:rgba(10,123,224,.1);
 
 $sideBarWidth: 210px;
 $topBarHeight: 56px;

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

@@ -1,5 +1,5 @@
 <template>
-  <el-col>
+  <el-col ref="container" style="width: 100%;height:100%">
     <span>{{ table.name }}</span>
     <ux-grid
       ref="plxTable"
@@ -36,7 +36,7 @@ export default {
     return {
       fields: [],
       data: [],
-      height: 500
+      height: 'auto'
     }
   },
   watch: {
@@ -45,12 +45,12 @@ export default {
     }
   },
   mounted() {
-    window.onresize = () => {
-      return (() => {
-        this.height = window.innerHeight / 3
-      })()
-    }
-    this.height = window.innerHeight / 3
+    // window.onresize = () => {
+    //   return (() => {
+    //     this.height = window.innerHeight / 3
+    //   })()
+    // }
+    // this.height = window.innerHeight / 3
     this.initData()
   },
   methods: {
@@ -62,11 +62,11 @@ export default {
           this.fields = response.data.fields
           this.data = response.data.data
           const datas = this.data
-          if(response.data.status === 'warnning'){
-            this.$warning(response.data.msg, 3000);
+          if (response.data.status === 'warnning') {
+            this.$warning(response.data.msg, 3000)
           }
-          if(response.data.status === 'error'){
-            this.$error(response.data.msg, 3000);
+          if (response.data.status === 'error') {
+            this.$error(response.data.msg, 3000)
           }
           this.$refs.plxTable.reloadData(datas)
         })

frontend/src/views/login/index.vue

@@ -8,13 +8,12 @@
               <img v-if="!loginLogoUrl" src="@/assets/DataEase-color.png" alt="">
               <img v-else :src="loginLogoUrl" alt="">
             </div>
-            <div class="login-border" />
             <div class="login-welcome">
               {{ $t('login.welcome') + (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || 'DATAEASE') }}
             </div>
             <div class="login-form">
               <el-form-item prop="username">
-                <el-input v-model="loginForm.username" :placeholder="$t('login.username')" autofocus />
+                <el-input v-model="loginForm.username" placeholder="ID" autofocus />
               </el-form-item>
               <el-form-item prop="password">
                 <el-input
@@ -73,7 +72,7 @@ export default {
     //   }
     }
     const validatePassword = (rule, value, callback) => {
-      if (value.length < 6) {
+      if (value.length < 8) {
         callback(this.$t('login.password_error'))
       } else {
         callback()
@@ -180,9 +179,11 @@ export default {
     @media only screen and (max-width: 1280px) {
       margin-top: 20px;
     }
-
-    img {
-      height: 45px;
+    img{
+      width: 240px;
+      @media only screen and (max-width: 1280px) {
+        width: 200px;
+      }
     }
   }
 
@@ -210,9 +211,9 @@ export default {
   }
 
   .login-welcome {
-    margin-top: 50px;
+    margin-top: 20px;
     font-size: 14px;
-    color: #999999;
+    color: $--color-primary;
     letter-spacing: 0;
     line-height: 18px;
     text-align: center;
@@ -222,20 +223,25 @@ export default {
   }
 
   .login-form {
-    margin-top: 40px;
+    margin-top: 80px;
     padding: 0 40px;
 
     @media only screen and (max-width: 1280px) {
-      margin-top: 20px;
+      margin-top: 40px;
     }
 
     & ::v-deep .el-input__inner {
-      border-radius: 0;
+      border-radius: 20px;
+      border: 1px solid transparent;
+      background: $colorBg;
+    }
+    & :focus {
+      border: 1px solid $--color-primary;
     }
   }
 
   .login-btn {
-    margin-top: 40px;
+    margin-top: 22px;
     padding: 0 40px;
     @media only screen and (max-width: 1280px) {
       margin-top: 20px;
@@ -243,7 +249,7 @@ export default {
 
     .submit {
       width: 100%;
-      border-radius: 0;
+      border-radius: 20px;
     }
   }
 

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

@@ -11,7 +11,7 @@
         <template :id="scope.row.storeId" slot-scope="scope">
           <div class="start-item">
             <div class="filter-db-row star-item-content" @click="showPanel(scope.row)">
-              <i class="el-icon-s-data" />
+              <svg-icon icon-class="panel" class="ds-icon-scene" />
               <span> {{ scope.row.name }}</span>
             </div>
             <div class="star-item-close">