Skip to content

feat: 全局配置编辑接入点增加 启用sudo执行安装命令字段(close #2656) #2657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hyunfa wants to merge 1 commit into
base: v2.4.12-dev
Choose a base branch
from
Open

feat: 全局配置编辑接入点增加 启用sudo执行安装命令字段(close #2656) #2657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions frontend/src/i18n/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,8 @@ export default {
Agent信息Windows: 'Agent Information (Windows)',
Proxy信息: 'Proxy Information',
Proxy上的安装包: 'Installation package',
非系统管理员启用sudo执行安装命令: 'Non-admin users can enable sudo to run installation commands',
启用sudo: 'enable sudo',
接入点说明: 'Description',
接入点说明placeholder: 'Describe the New access point information, and precautions',
Zookeeper集群地址: 'Zookeeper cluster address',
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/i18n/zh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,8 @@ export default {
Agent信息Windows: 'Agent 信息（Windows）',
Proxy信息: 'Proxy 信息',
Proxy上的安装包: 'Proxy 上的安装包',
非系统管理员启用sudo执行安装命令: '非系统管理员启用sudo执行安装命令',
启用sudo: '启用sudo',
接入点说明: '接入点说明',
接入点说明placeholder: '描述新增的接入点信息，注意事项等',
Zookeeper集群地址: 'Zookeeper集群地址',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/types/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export interface IConfigAgent {

export interface IApBase {
name: string
is_use_sudo: Boolean
zk_account: string
zk_password?: string // 编辑可不填
zk_hosts: IZk[]
Expand Down
17 changes: 16 additions & 1 deletion frontend/src/views/global-config/gse-config/set-access-point/step-info.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@
@change="hadleFormChange">
</bk-input>
</bk-form-item>
<bk-form-item
v-if="system.type === 'linux'"
:label="$t('启用sudo')"
:property="'is_use_sudo'"
:desc="{ content: $t('非系统管理员启用sudo执行安装命令'), placements: ['top'] }"
:key="`is_use_sudo-${index}`"
>
<bk-checkbox v-model="formData.is_use_sudo"></bk-checkbox>
</bk-form-item>
</template>
<h3 class="block-title">{{ $t('Proxy信息') }}</h3>
<bk-form-item
Expand All @@ -43,7 +52,6 @@
</i>
</div>
</bk-form-item>

<bk-form-item class="mt30 item-button-group">
<bk-button
class="nodeman-primary-btn"
Expand Down Expand Up @@ -88,6 +96,7 @@ export default class StepInfo extends Vue {
private pathSet = apAgentInfo;
private rules = apAgentInfoRules;
private formData: Dictionary = {
is_use_sudo: this.detail.is_use_sudo,
linuxDataipc: '/var/run/ipc.state.report',
linuxHostidPath: '/var/lib/gse/host/hostid',
linuxSetupPath: '/usr/local/gse',
Expand Down Expand Up @@ -163,6 +172,7 @@ export default class StepInfo extends Vue {
// detail里边多余的字段不能传入，否则通不过后端校验
const formatData: IApParams = {
name,
is_use_sudo: this.formData.is_use_sudo,
zk_account,
zk_password,
region_id,
Expand Down Expand Up @@ -252,6 +262,11 @@ export default class StepInfo extends Vue {
>>> form {
width: 740px;
}
.top-line {
border-top: 1px solid #dcdee5;
padding-top: 20px;
margin-bottom: 40px;
}
.block-title {
margin: 30px 0 20px 0;
padding: 0 0 10px 0;
Expand Down
Loading