opensource/orion-ops
3
0
Fork 0
mirror of https://gitee.com/lijiahangmax/orion-ops.git synced 2026-09-24 15:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

disabled drag modal.

Browse Source
This commit is contained in:
lijiahang
2022-05-25 08:51:35 +08:00
parent 9569ab9a95
commit 21da5b2d02
44 changed files with 45 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orion-ops-vue/src/components/app/AddAppEnvModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="500"
:okButtonProps="{props: {disabled: loading}}"
orion-ops-vue/src/components/app/AddAppForm.vue
+6 -6
View File
@@ -4,7 +4,7 @@
<a-form-item label="名称" hasFeedback>
<a-input v-decorator="decorators.name" allowClear/>
</a-form-item>
<a-form-item label="标签" hasFeedback>
<a-form-item label="唯一标识" hasFeedback>
<a-input v-decorator="decorators.tag" allowClear/>
</a-form-item>
<a-form-item label="版本仓库">
@@ -17,7 +17,7 @@
<a-icon type="reload"/>
</a>
</a-form-item>
<a-form-item label="描述">
<a-form-item label="描述" style="margin-bottom: 0;">
<a-textarea v-decorator="decorators.description" allowClear/>
</a-form-item>
</a-form>
@@ -41,10 +41,10 @@ function getDecorators() {
tag: ['tag', {
rules: [{
required: true,
message: '请输入标签'
message: '请输入唯一标识'
}, {
max: 32,
message: '标签长度不能大于32位'
message: '唯一标识长度不能大于32位'
}]
}],
vcsId: ['vcsId'],
@@ -64,8 +64,8 @@ export default {
type: Object,
default: () => {
return {
labelCol: { span: 3 },
wrapperCol: { span: 19 }
labelCol: { span: 4 },
wrapperCol: { span: 17 }
}
}
}
orion-ops-vue/src/components/app/AddAppModal.vue
+1 -2
View File
@@ -1,8 +1,7 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="640"
:width="660"
:okButtonProps="{props: {disabled: loading}}"
:maskClosable="false"
:destroyOnClose="true"
orion-ops-vue/src/components/app/AddAppProfileModal.vue
+3 -4
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="650"
:okButtonProps="{props: {disabled: loading}}"
@@ -13,7 +12,7 @@
<a-form-item label="环境名称" hasFeedback>
<a-input v-decorator="decorators.name" allowClear/>
</a-form-item>
<a-form-item label="标签" hasFeedback>
<a-form-item label="唯一标识" hasFeedback>
<a-input v-decorator="decorators.tag" allowClear/>
</a-form-item>
<a-form-item label="是否需要审核">
@@ -54,10 +53,10 @@ function getDecorators() {
tag: ['tag', {
rules: [{
required: true,
message: '请输入标签'
message: '请输入唯一标识'
}, {
max: 32,
message: '标签长度不能大于32位'
message: '唯一标识长度不能大于32位'
}]
}],
releaseAudit: ['releaseAudit', {
orion-ops-vue/src/components/app/AddAppVcsModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="560"
:okButtonProps="{props: {disabled: loading}}"
orion-ops-vue/src/components/app/AddPipelineModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="578"
:maskStyle="{opacity: 0.8, animation: 'none'}"
orion-ops-vue/src/components/app/AppBuildModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:width="550"
:maskStyle="{opacity: 0.8, animation: 'none'}"
:dialogStyle="{top: '64px', padding: 0}"
orion-ops-vue/src/components/app/AppPipelineExecAuditModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
title="执行审核"
:maskClosable="false"
:destroyOnClose="true"
orion-ops-vue/src/components/app/AppPipelineExecBuildModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="560"
:maskStyle="{opacity: 0.4, animation: 'none'}"
orion-ops-vue/src/components/app/AppPipelineExecModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:width="550"
:maskStyle="{opacity: 0.8, animation: 'none'}"
:dialogStyle="{top: '64px', padding: 0}"
orion-ops-vue/src/components/app/AppPipelineExecReleaseModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="560"
:maskStyle="{opacity: 0.4, animation: 'none'}"
orion-ops-vue/src/components/app/AppPipelineExecTimedModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
title="设置定时执行"
:width="330"
:okButtonProps="{props: {disabled: !valid}}"
orion-ops-vue/src/components/app/AppReleaseAuditModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
title="发布审核"
:maskClosable="false"
:destroyOnClose="true"
orion-ops-vue/src/components/app/AppReleaseConfigForm.vue
+1 -1
View File
@@ -232,7 +232,7 @@ export default {
visible: true
}
if (this.$enum.RELEASE_ACTION_TYPE.TRANSFER.value === type) {
action.command = 'scp @{bundle_path} @{target_username}@@{target_host}:@{transfer_path}'
action.command = 'scp "@{bundle_path}" @{target_username}@@{target_host}:"@{transfer_path}"'
} else {
action.command = ''
}
orion-ops-vue/src/components/app/AppReleaseModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:width="550"
:maskStyle="{opacity: 0.8, animation: 'none'}"
:dialogStyle="{top: '64px', padding: 0}"
orion-ops-vue/src/components/app/AppReleaseTimedModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
title="设置发布定时"
:width="330"
:okButtonProps="{props: {disabled: !valid}}"
orion-ops-vue/src/components/exec/ExecTaskDetailModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
title="详情"
width="700px"
:dialogStyle="{top: '16px'}"
orion-ops-vue/src/components/history/EnvHistoryModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:width="1024"
:dialogStyle="{top: '64px'}"
:bodyStyle="{padding: '8px'}"
orion-ops-vue/src/components/layout/Menu.vue
+5 -3
View File
@@ -7,16 +7,18 @@
<!-- 一级菜单 -->
<a-menu-item v-if="!menuItem.children" @click="toRoute(menuItem.path)" :key="menuItem.id">
<a-icon :type="menuItem.icon"/>
<span>{{ menuItem.name }}</span>
<span class="usn">{{ menuItem.name }}</span>
</a-menu-item>
<!-- 二级菜单 -->
<a-sub-menu v-else :key="menuItem.id">
<template #title>
<a-icon :type="menuItem.icon"/>
<span>{{ menuItem.name }}</span>
<span class="usn">{{ menuItem.name }}</span>
</template>
<a-menu-item v-for="subMenuItem in menuItem.children" :key="subMenuItem.id" @click="toRoute(subMenuItem.path)">
{{ subMenuItem.name }}
<span class="usn">
{{ subMenuItem.name }}
</span>
</a-menu-item>
</a-sub-menu>
</template>
orion-ops-vue/src/components/layout/WebSideMessageDropdown.vue
+1 -1
View File
@@ -180,7 +180,7 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 6px;
margin-bottom: 8px;
color: rgba(0, 0, 0, .65);
font-size: 14px;
line-height: 22px;
orion-ops-vue/src/components/log/AddLogFileModal.vue
+1 -1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="650"
:dialogStyle="{top: '64px', padding: 0}"
@@ -15,6 +14,7 @@
<MachineSelector ref="machineSelector"
placeholder="请选择"
@change="setDefaultConfig"
:query="{status: $enum.ENABLE_STATUS.ENABLE.value}"
v-decorator="decorators.machineId"/>
</a-form-item>
<!-- 追踪模式 -->
orion-ops-vue/src/components/machine/AddMachineEnvModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="500"
:okButtonProps="{props: {disabled: loading}}"
orion-ops-vue/src/components/machine/AddMachineKeyModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="450"
:okButtonProps="{props: {disabled: loading}}"
orion-ops-vue/src/components/machine/AddMachineModal.vue
+4 -5
View File
@@ -2,7 +2,6 @@
<div class="machine-wrapper">
<!-- 机器模态框 -->
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="750"
:zIndex="805"
@@ -18,7 +17,7 @@
<a-form-item label="名称" hasFeedback>
<a-input v-decorator="decorators.name" allowClear/>
</a-form-item>
<a-form-item label="标签" hasFeedback>
<a-form-item label="唯一标识" hasFeedback>
<a-input v-decorator="decorators.tag" allowClear/>
</a-form-item>
<a-form-item label="ssh信息" style="margin-bottom: 0">
@@ -32,7 +31,7 @@
placeholder="主机"
v-decorator="decorators.host"/>
</a-form-item>
<a-form-item hasFeedback style="display: inline-block; width: 25%">
<a-form-item style="display: inline-block; width: 25%">
<a-input addon-before="-p"
placeholder="端口"
v-decorator="decorators.sshPort"/>
@@ -108,10 +107,10 @@ function getDecorators() {
tag: ['tag', {
rules: [{
required: true,
message: '请输入标签'
message: '请输入唯一标识'
}, {
max: 32,
message: '标签长度不能大于32位'
message: '唯一标识长度不能大于32位'
}]
}],
username: ['username', {
orion-ops-vue/src/components/machine/AddMachineProxyModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="450"
:okButtonProps="{props: {disabled: loading}}"
orion-ops-vue/src/components/machine/MachineDetailModal.vue
+3 -4
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
title="详情"
width="700px"
:maskClosable="false"
@@ -20,10 +19,10 @@
<a-descriptions-item label="用户名" :span="3">
{{ detail.username }}
</a-descriptions-item>
<a-descriptions-item label="标签" :span="3">
<a-tag color="#5C7CFA">
<a-descriptions-item label="唯一标识" :span="3">
<span class="span-blue">
{{ detail.tag }}
</a-tag>
</span>
</a-descriptions-item>
<a-descriptions-item label="认证方式" :span="2">
<a-tag v-if="detail.authType">
orion-ops-vue/src/components/machine/MachineSelector.vue
+10 -1
View File
@@ -27,6 +27,12 @@ export default {
value: {
type: Number,
default: undefined
},
query: {
type: Object,
default: () => {
return {}
}
}
},
data() {
@@ -46,7 +52,10 @@ export default {
}
},
async created() {
const machineListRes = await this.$api.getMachineList({ limit: 10000 })
const machineListRes = await this.$api.getMachineList({
limit: 10000,
...this.query
})
if (machineListRes.data && machineListRes.data.rows && machineListRes.data.rows.length) {
for (const row of machineListRes.data.rows) {
this.machineList.push({
orion-ops-vue/src/components/machine/TempMountMachineKeyModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
title="临时挂载"
:width="450"
:okButtonProps="{props: {disabled: loading}}"
orion-ops-vue/src/components/preview/EditorPreview.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:width="650"
:footer="null"
:destroyOnClose="true"
orion-ops-vue/src/components/preview/TextPreview.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:width="450"
:footer="null"
:destroyOnClose="true"
orion-ops-vue/src/components/scheduler/AddSchedulerTask.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="700"
:dialogStyle="{top: '32px'}"
orion-ops-vue/src/components/sftp/SftpChmodModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
title="文件提权"
:width="450"
:okButtonProps="{props: {disabled: loading}}"
orion-ops-vue/src/components/sftp/SftpMoveModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
title="文件移动"
:width="450"
okText="移动"
orion-ops-vue/src/components/sftp/SftpTouchModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
title="创建"
width="450px"
:maskClosable="false"
orion-ops-vue/src/components/system/AddSystemEnvModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="500"
:okButtonProps="{props: {disabled: loading}}"
orion-ops-vue/src/components/template/AddTemplateModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="650"
:dialogStyle="{top: '64px'}"
orion-ops-vue/src/components/template/TemplateSelector.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:width="1000"
:dialogStyle="{top: '16px'}"
:bodyStyle="{padding: '8px'}"
orion-ops-vue/src/components/terminal/TerminalMain.vue
+1 -1
View File
@@ -232,7 +232,7 @@ const terminalOperator = {
disconnect() {
console.log('disconnect')
this.pingThread && clearInterval(this.pingThread)
this.client.send(this.$enum.TERMINAL_OPERATOR.DISCONNECT.value)
this.client && this.client.send(this.$enum.TERMINAL_OPERATOR.DISCONNECT.value)
},
ping() {
console.log('ping')
orion-ops-vue/src/components/terminal/TerminalSettingModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:width="500"
:okButtonProps="{props: {disabled: loading}}"
:maskClosable="false"
orion-ops-vue/src/components/terminal/TerminalXterm.vue
+1 -1
View File
@@ -119,7 +119,7 @@ export default {
this.$refs.terminalMain.init(options, setting)
} catch (e) {
this.loading()
this.$message.error('初始化失败')
this.$message.error(e.msg || '初始化失败')
this.machine.status = this.$enum.TERMINAL_STATUS.ERROR.value
}
}
orion-ops-vue/src/components/user/AddUserModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:title="title"
:width="650"
:okButtonProps="{props: {disabled: loading}}"
orion-ops-vue/src/components/user/ResetPassword.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
title="修改密码"
:okButtonProps="{props: {disabled: loading}}"
:maskClosable="false"
orion-ops-vue/src/components/user/WebSideMessageList.vue
+8 -4
View File
@@ -67,7 +67,10 @@
<!-- 上半部分 标题 -->
<div class="message-item-container-top">
<a-badge class="message-item-dot" :dot="item.status === $enum.READ_STATUS.UNREAD.value">
<span class="message-item-title" v-text="$enum.valueOf($enum.valueOf($enum.MESSAGE_CLASSIFY, item.classify).type, item.type).label"/>
<span class="message-item-title"
title="详情"
@click="openDetail(item)"
v-text="$enum.valueOf($enum.valueOf($enum.MESSAGE_CLASSIFY, item.classify).type, item.type).label"/>
</a-badge>
</div>
<!-- 下半部分 消息 -->
@@ -79,7 +82,7 @@
<div class="message-item-container-right">
<!-- 类型 -->
<span class="message-item-type span-blue" @click="chooseClassify(item.classify)">
{{ $enum.valueOf($enum.MESSAGE_CLASSIFY, item.classify).label }}
{{ $enum.valueOf($enum.MESSAGE_CLASSIFY, item.classify).label }}
</span>
<!-- 时间 -->
<span class="message-item-date">{{ item.createTime | formatDate }} ({{ item.createTimeAgo }})</span>
@@ -261,13 +264,14 @@ export default {
width: 100%;
.message-item-dot /deep/ .ant-badge-dot {
margin: 4px -6px;
margin: 4px -8px;
}
.message-item-title {
color: #181E33;
display: block;
margin-bottom: 6px;
cursor: pointer;
margin-bottom: 8px;
font-size: 15px;
line-height: 24px;
}
orion-ops-vue/src/components/user/WebSideMessageModal.vue
-1
View File
@@ -1,6 +1,5 @@
<template>
<a-modal v-model="visible"
v-drag-modal
:width="500"
:maskClosable="false"
:title="$enum.valueOf($enum.valueOf($enum.MESSAGE_CLASSIFY, data.classify).type, data.type).label"