[Improve] sync code from 2.1.5 branch

.github/workflows/e2e.yml

@@ -106,7 +106,7 @@ jobs:
     name: ${{ matrix.case.name }}
     needs: build
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 180
     strategy:
       matrix:
         case:

streampark-console/streampark-console-webapp/src/api/system/user.ts

@@ -28,6 +28,7 @@ enum Api {
   UserList = '/user/list',
   NoTokenUsers = '/user/getNoTokenUser',
   UserUpdate = '/user/update',
+  UserDelete = '/user/delete',
   UserAdd = '/user/post',
   ResetPassword = '/user/password/reset',
   Password = '/user/password',
@@ -62,6 +63,10 @@ export function updateUser(data: Recordable) {
   return defHttp.put({ url: Api.UserUpdate, data });
 }
 
+export function deleteUser(data) {
+  return defHttp.delete({ url: Api.UserDelete, data });
+}
+
 export function addUser(data: Recordable) {
   return defHttp.post({ url: Api.UserAdd, data });
 }

streampark-console/streampark-console-webapp/src/components/Application/src/AppLogo.vue

@@ -61,10 +61,10 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    margin-top: 8px;
     padding-left: 7px;
     cursor: pointer;
     transition: all 0.2s ease;
+    border-bottom: 1px solid rgba(192, 192, 192, 0.1);
 
     &.light {
       border-bottom: 1px solid @border-color-base;

streampark-console/streampark-console-webapp/src/components/Button/src/PopConfirmButton.vue

@@ -38,6 +38,7 @@
 
       return () => {
         const bindValues = omit(unref(getBindValues), 'icon');
+        const filterClass = omit(unref(bindValues), 'class');
         const btnBind = omit(bindValues, 'title') as Recordable;
         if (btnBind.disabled) btnBind.color = '';
         const Button = h(BasicButton, btnBind, extendSlots(slots));
@@ -46,7 +47,7 @@
         if (!props.enable) {
           return Button;
         }
-        return h(Popconfirm, bindValues, { default: () => Button });
+        return h(Popconfirm, filterClass, { default: () => Button });
       };
     },
   });

streampark-console/streampark-console-webapp/src/components/Drawer/src/BasicDrawer.vue

@@ -214,7 +214,6 @@
       background-color: @component-background;
 
       .scrollbar__wrap {
-        padding: 16px !important;
         margin-bottom: 0 !important;
       }
 

streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue

@@ -83,7 +83,7 @@
       );
       const getI18nName = computed(() => t(props.item?.name));
       const getMenuItemName = computed(() => {
-       return 'menu-item-' + props.item?.path.substring(1).replaceAll('/','_')
+        return 'menu-item-' + props.item?.path.substring(1).replaceAll('/', '_');
       });
       const getShowSubTitle = computed(() => !props.collapse || !props.parent);
       const getIsCollapseParent = computed(() => !!props.collapse && !!props.parent);

streampark-console/streampark-console-webapp/src/components/Table/src/BasicTable.vue

@@ -397,14 +397,11 @@
     }
 
     &-form-container {
-      padding: 16px;
-
       .ant-form {
-        padding: 12px 10px 6px;
-        margin-bottom: 16px;
+        padding: 20px 10px 0;
+        margin-bottom: 0;
         background-color: @component-background;
         border: none;
-        border-radius: 4px;
       }
     }
 
@@ -415,8 +412,6 @@
     .ant-table-wrapper {
       padding: 10px;
       background-color: @component-background;
-      border-radius: 4px !important;
-
       .ant-table-title {
         min-height: 40px;
         padding: 0 0 8px !important;

streampark-console/streampark-console-webapp/src/design/index.less

@@ -102,13 +102,28 @@ span {
 .ant-modal-content,
 .ant-tree-checkbox-inner,
 .ant-table,
+.ant-card,
 .ant-alert,
 .bold-tag,
 .bold-tag > .ant-tag,
 .ant-tabs-tab,
 .ant-btn-group,
 textarea.ant-input,
 .ant-select-selector,
+.streampark-page-wrapper,
+.streampark-page-wrapper-content,
 .ant-upload.ant-upload-drag {
-  border-radius: 0 !important;
+  border-radius: 1px !important;
+}
+
+.pop-tip {
+  display: inline-block;
+  margin-top: 5px;
+  color: darkgrey;
+}
+
+[data-theme='dark'] {
+  .pop-tip {
+    color: #666;
+  }
 }

streampark-console/streampark-console-webapp/src/design/var/index.less

@@ -8,10 +8,10 @@
 @multiple-height: 30px;
 
 // headers
-@header-height: 50px;
+@header-height: 64px;
 
 // logo width
-@logo-width: 48px;
+@logo-width: 64px;
 
 //
 @side-drag-z-index: 200;

streampark-console/streampark-console-webapp/src/layouts/default/header/MultipleHeader.vue

@@ -19,7 +19,7 @@
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useLayoutHeight } from '../content/useContentViewHeight';
 
-  const HEADER_HEIGHT = 48;
+  const HEADER_HEIGHT = 64;
 
   const TABS_HEIGHT = 32;
   export default defineComponent({

streampark-console/streampark-console-webapp/src/layouts/default/sider/LayoutSider.vue

@@ -24,7 +24,7 @@
     <LayoutMenu :theme="getMenuTheme" :menuMode="getMode" :splitType="getSplitType" />
     <DragBar ref="dragBarRef" />
     <div
-      class="flex justify-between items-center border-t-1 border-[#c0c0c01a] h-50px px-4"
+      class="flex justify-between items-center border-t-1 border-[#c0c0c01a] h-35px px-4"
       v-if="!getCollapsed"
     >
       <a @click="openWindow(SITE_URL)" class="text-gray-400 hover:text-white">

streampark-console/streampark-console-webapp/src/locales/lang/en/flink/resource.ts

@@ -27,6 +27,7 @@ export default {
   resourceGroup: 'Resource Group',
   groupName: 'Group Name',
   resourceNamePlaceholder: 'Please input resource name',
+  searchByResourceName: 'Search by resource name',
   engineTypePlaceholder: 'Please select compute engine type',
   resourceGroupPlaceholder: 'Please choose resource',
   groupNamePlaceholder: 'Please input the group name',
@@ -46,6 +47,7 @@ export default {
     title: 'Resource List',
     resourceName: 'Resource Name',
     resourceNamePlaceholder: 'Please enter the resource name',
+    searchByResourceName: 'Search by resource name',
     descriptionPlaceholder: 'Please enter description',
     createUser: 'Create User',
     createTime: 'Create Time',

streampark-console/streampark-console-webapp/src/locales/lang/en/system/member.ts

@@ -22,13 +22,15 @@ export default {
   add: 'Add',
   success: 'successful',
   fail: 'failed',
+  searchByUser: 'Search by username',
+  searchByRole: 'Search by role',
   table: {
     title: 'Member List',
-    userName: 'User Name',
-    roleName: 'Role',
+    userName: 'Username',
+    roleName: 'Role name',
     createTime: 'Create Time',
     modifyTime: 'Modify Time',
   },
-  userNameRequire: 'Please select a user name',
-  roleRequire: 'Please select a role',
+  userNameRequire: 'please select a user name',
+  roleRequire: 'please select role',
 };

streampark-console/streampark-console-webapp/src/locales/lang/en/system/role.ts

@@ -18,7 +18,7 @@ export default {
   deleteTip: 'Are you sure delete this Role',
   assignment: 'menu assignment',
   form: {
-    roleName: 'Role Name',
+    roleName: 'Role name',
     menuId: 'permission',
     menuIdRequired: 'Please select the permission.',
     create: 'Add Role',
@@ -30,6 +30,7 @@ export default {
     exist: 'Sorry, the role name already exists',
     empty: 'Role name cannot be empty',
   },
+  searchByRole: 'Search by role name',
   roleInfo: 'Role Info',
   tableTitle: 'Role List',
   modifyTime: 'Not yet modified',

streampark-console/streampark-console-webapp/src/locales/lang/en/system/team.ts

@@ -23,12 +23,13 @@ export default {
   add: 'Add',
   success: 'successful',
   fail: 'failed',
+  searchByTeam: 'Search by team name',
   table: {
     title: 'Team List',
-    teamName: 'Team Name',
-    teamNamePlaceholder: 'Please enter team name',
+    teamName: 'Team name',
+    teamNamePlaceholder: 'please enter Team Name',
     description: 'Description',
-    descriptionMessage: 'Exceeds maximum length limit of 100 characters',
-    teamMessage: 'Team name must be at least 4 characters',
+    descriptionMessage: 'exceeds maximum length limit of 100 characters',
+    teamMessage: 'teamName must be at least 4 characters',
   },
 };

streampark-console/streampark-console-webapp/src/locales/lang/en/system/token.ts

@@ -22,7 +22,7 @@ export default {
   selectUserAlertMessage: 'Please select a user',
   table: {
     title: 'Token List',
-    userName: 'User Name',
+    userName: 'Username',
     token: 'Token',
     status: 'Status',
   },

streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts

@@ -21,10 +21,13 @@ export default {
     modify: 'modify user',
     reset: 'reset password',
     resetTip: 'reset password, are you sure',
+    delete: 'delete user',
+    deleteTip: 'delete user, are you sure',
+    deleteSuccess: 'delete successful',
     resetSuccess: 'reset password successful, user [ {0} ] new password is streampark666',
   },
   form: {
-    userName: 'User Name',
+    userName: 'Username',
     required: 'username is required',
     min: 'username length cannot be less than 2 characters',
     max: 'exceeds maximum length limit of 20 characters',
@@ -47,6 +50,7 @@ export default {
     transferResource:
       'Please transfer the resources of the user who needs to be disabled to a new user',
   },
+  searchByName: 'Search by username',
   roleInfo: 'Role Info',
   modifyTime: 'Not yet modified',
   male: 'male',

streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/resource.ts

@@ -28,6 +28,7 @@ export default {
   groupName: '资源组名称',
   resourceGroupPlaceholder: '请选择组资源',
   resourceNamePlaceholder: '请输入资源名称',
+  searchByResourceName: '根据资源名搜索',
   groupNamePlaceholder: '请输入资源组名称',
   groupNameIsRequiredMessage: '资源组名称必填',
   engineTypePlaceholder: '请选择引擎类型',
@@ -46,6 +47,7 @@ export default {
     title: '资源列表',
     resourceName: '资源名称',
     resourceNamePlaceholder: '输入资源名查询',
+    searchByResourceName: '根据资源名搜索',
     descriptionPlaceholder: '输入描述',
     createUser: '创建者',
     createTime: '创建时间',

streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/member.ts

@@ -22,10 +22,12 @@ export default {
   add: '添加',
   success: '成功',
   fail: '失败',
+  searchByUser: '根据用户名搜索',
+  searchByRole: '根据角色名称搜索',
   table: {
     title: '成员列表',
     userName: '用户名',
-    roleName: '角色',
+    roleName: '角色名称',
     createTime: '创建时间',
     modifyTime: '修改时间',
   },

streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/role.ts

@@ -30,6 +30,7 @@ export default {
     exist: '角色名已存在',
     empty: '角色名不能为空',
   },
+  searchByRole: '根据角色名称搜索',
   roleInfo: '角色信息',
   tableTitle: '角色列表',
   modifyTime: '尚未修改',

streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/team.ts

@@ -23,9 +23,9 @@ export default {
   add: '创建',
   success: '成功',
   fail: '失败',
+  searchByTeam: '根据团队名称搜索',
   table: {
-    title: 'Team列表',
-    teamName: 'Team名称',
+    teamName: '团队',
     description: '描述',
     descriptionMessage: '超过了100个字符的最大长度限制',
     teamNamePlaceholder: '请输入team名称',

streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/token.ts

@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 export default {
-  addToken: '新增Token',
-  modifyToken: '编辑Token',
-  copyToken: '复制Token',
-  deleteToken: '删除Token',
+  addToken: '新增令牌',
+  modifyToken: '编辑令牌',
+  copyToken: '复制令牌',
+  deleteToken: '删除令牌',
   selectUserAlertMessage: '请选择一个用户',
   table: {
-    title: 'Token 列表',
+    title: '令牌列表',
     userName: '用户名',
-    token: 'Token',
+    token: '令牌',
     status: '状态',
   },
   operation: {
     copySuccess: '复制成功',
-    deleteTokenConfirm: '您确定删除该token ?',
+    deleteTokenConfirm: '您确定删除该令牌 ?',
     deleteSuccess: '删除成功',
     deleteFailed: '删除失败',
     updateSuccess: '更新成功',

streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts

@@ -21,6 +21,9 @@ export default {
     modify: '修改用户',
     reset: '重置密码',
     resetTip: '你确定要重置密码吗?',
+    delete: '删除用户',
+    deleteTip: '你确定要删除用户吗',
+    deleteSuccess: '用户删除成功',
     resetSuccess: '重置密码成功，用户 [ {0} ] 新密码为 streampark666',
   },
   form: {
@@ -46,6 +49,7 @@ export default {
     notice: '提示',
     transferResource: '请将需要被禁用的用户资源转移到新的用户上',
   },
+  searchByName: '根据用户名搜索',
   roleInfo: '角色信息',
   modifyTime: '尚未修改',
   male: '男',

streampark-console/streampark-console-webapp/src/views/base/login/teamModal.vue

@@ -48,7 +48,6 @@
         component: 'Select',
         componentProps: {
           options: userStore.getTeamList,
-          // getPopupContainer: (triggerNode) => triggerNode.parentNode,
           placeholder: t('sys.login.selectTeam'),
           popupClassName: 'team-select-popup',
         },