diff --git a/orion-ops-ui/package.json b/orion-ops-ui/package.json index fe1fe5e8..d09ba304 100644 --- a/orion-ops-ui/package.json +++ b/orion-ops-ui/package.json @@ -29,7 +29,7 @@ ] }, "dependencies": { - "@arco-design/web-vue": "^2.44.7", + "@arco-design/web-vue": "^2.53.0", "@dangojs/a-query-header": "^0.0.31", "@sanqi377/arco-vue-icon-picker": "^1.0.7", "@vueuse/core": "^9.3.0", diff --git a/orion-ops-ui/pnpm-lock.yaml b/orion-ops-ui/pnpm-lock.yaml index 94eede73..be8dcf9f 100644 --- a/orion-ops-ui/pnpm-lock.yaml +++ b/orion-ops-ui/pnpm-lock.yaml @@ -11,11 +11,11 @@ overrides: dependencies: '@arco-design/web-vue': - specifier: ^2.44.7 - version: 2.51.1(vue@3.3.4) + specifier: ^2.53.0 + version: 2.53.0(vue@3.3.4) '@dangojs/a-query-header': specifier: ^0.0.31 - version: 0.0.31(@arco-design/web-vue@2.51.1)(@dangojs/digitforce-ui-utils@0.0.9)(lodash@4.17.21)(vue@3.3.4) + version: 0.0.31(@arco-design/web-vue@2.53.0)(@dangojs/digitforce-ui-utils@0.0.9)(lodash@4.17.21)(vue@3.3.4) '@sanqi377/arco-vue-icon-picker': specifier: ^1.0.7 version: 1.0.7(vue@3.3.4) @@ -224,8 +224,8 @@ packages: color: 3.2.1 dev: false - /@arco-design/web-vue@2.51.1(vue@3.3.4): - resolution: {integrity: sha512-YsNF1hrl700rshZPrJ7haNEN6pc3dQwpLbYzpE49jrLdF0mALGU9aP2A8q0FNPH2Rt4rxvxkw1o0gsL7my8H+Q==} + /@arco-design/web-vue@2.53.0(vue@3.3.4): + resolution: {integrity: sha512-IQtxtIJNmH038EdMecAdeLVayr4r+Txnk51RIVAz28PpdEdjf4J0wnLyirDb41YB0fV7eubZOFNodq5uTYqPTA==} peerDependencies: vue: ^3.1.0 dependencies: @@ -720,7 +720,7 @@ packages: postcss-selector-parser: 6.0.13 dev: true - /@dangojs/a-query-header@0.0.31(@arco-design/web-vue@2.51.1)(@dangojs/digitforce-ui-utils@0.0.9)(lodash@4.17.21)(vue@3.3.4): + /@dangojs/a-query-header@0.0.31(@arco-design/web-vue@2.53.0)(@dangojs/digitforce-ui-utils@0.0.9)(lodash@4.17.21)(vue@3.3.4): resolution: {integrity: sha512-hXLAU8oIQ1ULDY+qXKoKstqo3/m4HTjXcxNaFbPatTVMHwox4tBAIc5Nox1crvlWkNagUyk7PpnQuzLH73j9AQ==} peerDependencies: '@arco-design/web-vue': ^2.47.1 @@ -728,7 +728,7 @@ packages: lodash: ^4.17.21 vue: ^3.3.2 dependencies: - '@arco-design/web-vue': 2.51.1(vue@3.3.4) + '@arco-design/web-vue': 2.53.0(vue@3.3.4) '@dangojs/digitforce-ui-utils': 0.0.9 lodash: 4.17.21 vue: 3.3.4 diff --git a/orion-ops-ui/src/assets/style/global.less b/orion-ops-ui/src/assets/style/global.less index 1f8f304b..b09a8482 100644 --- a/orion-ops-ui/src/assets/style/global.less +++ b/orion-ops-ui/src/assets/style/global.less @@ -90,6 +90,10 @@ body { } } +.arco-trigger-menu { + user-select: none; +} + .arco-dropdown-option-content { user-select: none; } diff --git a/orion-ops-ui/src/components/app/navbar/index.vue b/orion-ops-ui/src/components/app/navbar/index.vue index e0a3f645..f5c491f3 100644 --- a/orion-ops-ui/src/components/app/navbar/index.vue +++ b/orion-ops-ui/src/components/app/navbar/index.vue @@ -6,6 +6,7 @@ - + {{ nickname }} @@ -316,6 +318,7 @@ } .left-side { + user-select: none; display: flex; align-items: center; padding-left: 20px; @@ -374,5 +377,4 @@ display: flex; justify-content: flex-end; } - diff --git a/orion-ops-ui/src/layout/default-layout.vue b/orion-ops-ui/src/layout/default-layout.vue index 3639f72f..3cda5c40 100644 --- a/orion-ops-ui/src/layout/default-layout.vue +++ b/orion-ops-ui/src/layout/default-layout.vue @@ -37,7 +37,14 @@ - + + + + @@ -49,7 +56,7 @@ diff --git a/orion-ops-ui/src/views/asset/host-group/components/host-group-view-user-grant.vue b/orion-ops-ui/src/views/asset/host-group/components/host-group-view-user-grant.vue index ed1c4ec4..449121da 100644 --- a/orion-ops-ui/src/views/asset/host-group/components/host-group-view-user-grant.vue +++ b/orion-ops-ui/src/views/asset/host-group/components/host-group-view-user-grant.vue @@ -1,7 +1,55 @@ - - host-group-view-user-grant - + + + + + + + + + 暂无用户数据 + + + + + + + + + + + 当前选择的用户为 {{ currentUser?.text }} + 若当前选择的用户角色包含管理员则无需配置 (管理员拥有全部权限) + + + + + 保存 + + + + + + + selectedGroup = e" + @update:checked-keys="updateCheckedGroups" /> + + + + + + diff --git a/orion-ops-ui/src/views/asset/host-group/components/host-list.vue b/orion-ops-ui/src/views/asset/host-group/components/host-list.vue new file mode 100644 index 00000000..2a4ac386 --- /dev/null +++ b/orion-ops-ui/src/views/asset/host-group/components/host-list.vue @@ -0,0 +1,113 @@ + + + + + 组内数据 + {{ props.group?.title }} + + + + 当前分组未配置主机 + + + + + + {{ `${item.name}(${item.code}) - ` }} + {{ item.address }} + + + + + + + + + + diff --git a/orion-ops-ui/src/views/asset/host-group/components/host-transfer.vue b/orion-ops-ui/src/views/asset/host-group/components/host-transfer.vue index 553ed706..245daa21 100644 --- a/orion-ops-ui/src/views/asset/host-group/components/host-transfer.vue +++ b/orion-ops-ui/src/views/asset/host-group/components/host-transfer.vue @@ -161,7 +161,7 @@ align-items: center; .alert-wrapper { - height: 32px; + padding: 4px 16px; } .save-button { diff --git a/orion-ops-ui/src/views/asset/host-group/index.vue b/orion-ops-ui/src/views/asset/host-group/index.vue index 5d396139..ca84a19c 100644 --- a/orion-ops-ui/src/views/asset/host-group/index.vue +++ b/orion-ops-ui/src/views/asset/host-group/index.vue @@ -129,6 +129,10 @@ background: #FFF; } + :deep(.arco-tabs-tab-title){ + user-select: none; + } + :deep(.arco-tabs-content) { padding-top: 0; }