diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 098939bdf5..d16a7b9660 100644 --- a/.github/workflows/e2e.yml +++ b/.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: diff --git a/streampark-console/streampark-console-webapp/src/api/system/user.ts b/streampark-console/streampark-console-webapp/src/api/system/user.ts index 015c94f492..4c47db9c89 100644 --- a/streampark-console/streampark-console-webapp/src/api/system/user.ts +++ b/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 }); } diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/spark.svg b/streampark-console/streampark-console-webapp/src/assets/icons/spark.svg index b186ed2fdc..a0e5b94438 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/spark.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/spark.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/streampark-console/streampark-console-webapp/src/components/Application/src/AppLogo.vue b/streampark-console/streampark-console-webapp/src/components/Application/src/AppLogo.vue index 059adc7580..cf595b84ce 100644 --- a/streampark-console/streampark-console-webapp/src/components/Application/src/AppLogo.vue +++ b/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; diff --git a/streampark-console/streampark-console-webapp/src/components/Button/src/PopConfirmButton.vue b/streampark-console/streampark-console-webapp/src/components/Button/src/PopConfirmButton.vue index e22d851a9d..7a0742bb67 100644 --- a/streampark-console/streampark-console-webapp/src/components/Button/src/PopConfirmButton.vue +++ b/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 }); }; }, }); diff --git a/streampark-console/streampark-console-webapp/src/components/Drawer/src/BasicDrawer.vue b/streampark-console/streampark-console-webapp/src/components/Drawer/src/BasicDrawer.vue index 640639b1f0..e98493e3b8 100644 --- a/streampark-console/streampark-console-webapp/src/components/Drawer/src/BasicDrawer.vue +++ b/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; } diff --git a/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue b/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue index b69ed6bc15..389fb6db11 100644 --- a/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue +++ b/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); diff --git a/streampark-console/streampark-console-webapp/src/components/Table/src/BasicTable.vue b/streampark-console/streampark-console-webapp/src/components/Table/src/BasicTable.vue index 1d4722c9ba..cfded6e12f 100644 --- a/streampark-console/streampark-console-webapp/src/components/Table/src/BasicTable.vue +++ b/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; diff --git a/streampark-console/streampark-console-webapp/src/design/index.less b/streampark-console/streampark-console-webapp/src/design/index.less index ac3e23a64b..6cfb2301b2 100644 --- a/streampark-console/streampark-console-webapp/src/design/index.less +++ b/streampark-console/streampark-console-webapp/src/design/index.less @@ -102,6 +102,7 @@ span { .ant-modal-content, .ant-tree-checkbox-inner, .ant-table, +.ant-card, .ant-alert, .bold-tag, .bold-tag > .ant-tag, @@ -109,6 +110,20 @@ span { .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; + } } diff --git a/streampark-console/streampark-console-webapp/src/design/var/index.less b/streampark-console/streampark-console-webapp/src/design/var/index.less index 4dbb4af320..35608c2b61 100644 --- a/streampark-console/streampark-console-webapp/src/design/var/index.less +++ b/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; diff --git a/streampark-console/streampark-console-webapp/src/layouts/default/header/MultipleHeader.vue b/streampark-console/streampark-console-webapp/src/layouts/default/header/MultipleHeader.vue index c852b7ee74..dbbc333bac 100644 --- a/streampark-console/streampark-console-webapp/src/layouts/default/header/MultipleHeader.vue +++ b/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({ diff --git a/streampark-console/streampark-console-webapp/src/layouts/default/sider/LayoutSider.vue b/streampark-console/streampark-console-webapp/src/layouts/default/sider/LayoutSider.vue index 266db614be..65b33f42a1 100644 --- a/streampark-console/streampark-console-webapp/src/layouts/default/sider/LayoutSider.vue +++ b/streampark-console/streampark-console-webapp/src/layouts/default/sider/LayoutSider.vue @@ -24,7 +24,7 @@
diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/resource.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/resource.ts index 86c78ab71d..9d8c9182fb 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/resource.ts +++ b/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', diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/member.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/member.ts index b0775fa93e..a3a45cde76 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/member.ts +++ b/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', }; diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/role.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/role.ts index 3cbac9a5a8..db0bc8f6f1 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/role.ts +++ b/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', diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/team.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/team.ts index 55b2d45d4d..4fb425f52c 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/team.ts +++ b/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', }, }; diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/token.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/token.ts index 9cff6b27f8..fa16253bc0 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/token.ts +++ b/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', }, diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts index c942039730..e7b7bc607e 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts +++ b/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', diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/resource.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/resource.ts index 498e80f56e..eca21be911 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/resource.ts +++ b/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: '创建时间', diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/member.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/member.ts index 52bd81cf63..aad04483ab 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/member.ts +++ b/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: '修改时间', }, diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/role.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/role.ts index 0b8bd92dc0..eea69760ec 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/role.ts +++ b/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: '尚未修改', diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/team.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/team.ts index 465761fd31..d5de5cad45 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/team.ts +++ b/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名称', diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/token.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/token.ts index 8e332a64df..2a5db3021c 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/token.ts +++ b/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: '更新成功', diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts index d012e5493f..d81d76ae60 100644 --- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts +++ b/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: '男', diff --git a/streampark-console/streampark-console-webapp/src/views/base/login/teamModal.vue b/streampark-console/streampark-console-webapp/src/views/base/login/teamModal.vue index 6e1e169502..1f6d6aa18d 100644 --- a/streampark-console/streampark-console-webapp/src/views/base/login/teamModal.vue +++ b/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', }, diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue index f5e8a67cbe..3e3ee51de7 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue +++ b/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue @@ -15,7 +15,7 @@ limitations under the License. --> diff --git a/streampark-console/streampark-console-webapp/src/views/setting/alarm/components/AlertModal.vue b/streampark-console/streampark-console-webapp/src/views/setting/alarm/components/AlertModal.vue index 27dcf80615..1765d81422 100644 --- a/streampark-console/streampark-console-webapp/src/views/setting/alarm/components/AlertModal.vue +++ b/streampark-console/streampark-console-webapp/src/views/setting/alarm/components/AlertModal.vue @@ -43,12 +43,10 @@ const { Swal } = useMessage(); const userStore = useUserStore(); const [registerForm, { validateFields, resetFields, setFieldsValue }] = useForm({ - labelWidth: 160, colon: true, showActionButtonGroup: false, - baseColProps: { span: 24 }, - labelCol: { lg: 5, sm: 7 }, - wrapperCol: { lg: 16, sm: 4 }, + layout: 'vertical', + baseColProps: { span: 22, offset: 1 }, schemas: [ { field: 'alertName', @@ -58,7 +56,7 @@ allowClear: true, placeholder: t('setting.alarm.alertNamePlaceHolder'), }, - afterItem: () => h('span', { class: 'tip-info' }, t('setting.alarm.alertNameTips')), + afterItem: () => h('span', { class: 'pop-tip' }, t('setting.alarm.alertNameTips')), dynamicRules: () => { return [ { @@ -193,6 +191,9 @@ - - diff --git a/streampark-console/streampark-console-webapp/src/views/setting/extlink/View.vue b/streampark-console/streampark-console-webapp/src/views/setting/extlink/View.vue index 73338bbb6c..cae28f22d0 100644 --- a/streampark-console/streampark-console-webapp/src/views/setting/extlink/View.vue +++ b/streampark-console/streampark-console-webapp/src/views/setting/extlink/View.vue @@ -14,30 +14,24 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - +
+ diff --git a/streampark-console/streampark-console-webapp/src/views/setting/extlink/components/Modal.vue b/streampark-console/streampark-console-webapp/src/views/setting/extlink/components/Modal.vue index b8c4381aa7..88d5c0ebf6 100644 --- a/streampark-console/streampark-console-webapp/src/views/setting/extlink/components/Modal.vue +++ b/streampark-console/streampark-console-webapp/src/views/setting/extlink/components/Modal.vue @@ -41,7 +41,6 @@ const externalLinkId = ref(null); const { Swal } = useMessage(); const [registerForm, { validate, resetFields, setFieldsValue }] = useForm({ - labelWidth: 120, schemas: [ { field: 'badgeLabel', @@ -67,25 +66,6 @@ }, ], }, - { - field: 'badgeColor', - label: t('setting.externalLink.form.badgeColor'), - component: 'Input', - defaultValue: DEFAULT_BADGE_COLOR, - render: ({ model, field }) => renderColorField(model, field), - rules: [ - { - required: true, - message: t('setting.externalLink.form.badgeColorIsRequired'), - }, - ], - }, - { - field: 'preview', - label: t('setting.externalLink.form.badgePreview'), - component: 'Input', - render: ({ model }) => renderPreview(model), - }, { field: 'linkUrl', label: t('setting.externalLink.form.linkUrl'), @@ -97,8 +77,8 @@ afterItem: () => h( 'span', - { class: 'tip-info' }, - 'Supported variables: {id}, {job_id}, {yarn_id}, {job_name},Example: https://grafana/flink-monitoring?var-JobId=var-JobId={job_id}', + { class: 'pop-tip' }, + 'Supported variables: {job_id}, {yarn_id}, {job_name}, Example: https://grafana/flink-monitoring?var-JobId=var-JobId={job_id}', ), rules: [ { @@ -107,12 +87,30 @@ }, ], }, + { + field: 'badgeColor', + label: t('setting.externalLink.form.badgeColor'), + component: 'Input', + defaultValue: DEFAULT_BADGE_COLOR, + render: ({ model, field }) => renderColorField(model, field), + rules: [ + { + required: true, + message: t('setting.externalLink.form.badgeColorIsRequired'), + }, + ], + }, + { + field: 'preview', + label: t('setting.externalLink.form.badgePreview'), + component: 'Input', + render: ({ model }) => renderPreview(model), + }, ], colon: true, showActionButtonGroup: false, - labelCol: { lg: { span: 6, offset: 0 }, sm: { span: 6, offset: 0 } }, - wrapperCol: { lg: { span: 16, offset: 0 }, sm: { span: 4, offset: 0 } }, - baseColProps: { span: 24 }, + layout: 'vertical', + baseColProps: { span: 22, offset: 1 }, }); const [registerModal, { closeModal, changeOkLoading }] = useModalInner((data: ExternalLink) => { @@ -179,15 +177,20 @@ diff --git a/streampark-console/streampark-console-webapp/src/views/setting/system/View.vue b/streampark-console/streampark-console-webapp/src/views/setting/system/View.vue index d509f963fd..aedb69515e 100644 --- a/streampark-console/streampark-console-webapp/src/views/setting/system/View.vue +++ b/streampark-console/streampark-console-webapp/src/views/setting/system/View.vue @@ -14,12 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - diff --git a/streampark-console/streampark-console-webapp/src/views/setting/yarn-queue/index.data.ts b/streampark-console/streampark-console-webapp/src/views/setting/yarn-queue/index.data.ts index cd30ece433..cd0cfd7528 100644 --- a/streampark-console/streampark-console-webapp/src/views/setting/yarn-queue/index.data.ts +++ b/streampark-console/streampark-console-webapp/src/views/setting/yarn-queue/index.data.ts @@ -49,14 +49,12 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { field: 'queueLabel', - label: t('setting.yarnQueue.yarnQueueLabelExpression'), + label: '', component: 'Input', - colProps: { span: 8 }, - }, - { - field: 'createTime', - label: t('common.createTime'), - component: 'RangePicker', - colProps: { span: 8 }, + componentProps: { + placeholder: t('setting.yarnQueue.yarnQueueLabelExpression'), + allowClear: true, + }, + colProps: { span: 6 }, }, ]; diff --git a/streampark-console/streampark-console-webapp/src/views/system/member/MemberDrawer.vue b/streampark-console/streampark-console-webapp/src/views/system/member/MemberModal.vue similarity index 73% rename from streampark-console/streampark-console-webapp/src/views/system/member/MemberDrawer.vue rename to streampark-console/streampark-console-webapp/src/views/system/member/MemberModal.vue index b46beb1f1e..eff22bf5a9 100644 --- a/streampark-console/streampark-console-webapp/src/views/system/member/MemberDrawer.vue +++ b/streampark-console/streampark-console-webapp/src/views/system/member/MemberModal.vue @@ -15,27 +15,31 @@ limitations under the License. --> - - diff --git a/streampark-console/streampark-console-webapp/src/views/system/member/View.vue b/streampark-console/streampark-console-webapp/src/views/system/member/View.vue index 436c049825..8acd65ee0c 100644 --- a/streampark-console/streampark-console-webapp/src/views/system/member/View.vue +++ b/streampark-console/streampark-console-webapp/src/views/system/member/View.vue @@ -16,13 +16,20 @@ -->