diff --git a/src/components/Form/FormFields/CodeEditor.vue b/src/components/Form/FormFields/CodeEditor.vue
index ec80d6927..7baa7e54f 100644
--- a/src/components/Form/FormFields/CodeEditor.vue
+++ b/src/components/Form/FormFields/CodeEditor.vue
@@ -113,7 +113,6 @@
v-if="item.type ==='button'"
:disabled="item.disabled"
size="mini"
- style="background-color: transparent"
type="default"
@click="item.callback()"
>
@@ -256,13 +255,16 @@ export default {
.right-side {
.el-button {
border: none;
- padding: 2px;
+ padding: 5px;
font-size: 14px;
width: 28px;
height: 28px;
- color: #888;
- background-color: transparent;
margin-left: 2px;
+ background: none;
+
+ &:hover {
+ background-color: #e6e6e6;
+ }
}
}
@@ -298,10 +300,6 @@ export default {
}
}
-::v-deep .el-button.el-button--default {
- background-color: #e6e6e6;
-}
-
.filter-label {
font-size: 12px;
font-weight: 700;
diff --git a/src/icons/svg/info.svg b/src/icons/svg/info.svg
new file mode 100644
index 000000000..aa7c03916
--- /dev/null
+++ b/src/icons/svg/info.svg
@@ -0,0 +1,5 @@
+
diff --git a/src/icons/svg/load.svg b/src/icons/svg/load.svg
new file mode 100644
index 000000000..b54ebecd3
--- /dev/null
+++ b/src/icons/svg/load.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/icons/svg/open.svg b/src/icons/svg/open.svg
new file mode 100644
index 000000000..c58cdc2ff
--- /dev/null
+++ b/src/icons/svg/open.svg
@@ -0,0 +1,9 @@
+
diff --git a/src/icons/svg/save.svg b/src/icons/svg/save.svg
index 9833da7fd..1ff6270ab 100644
--- a/src/icons/svg/save.svg
+++ b/src/icons/svg/save.svg
@@ -1,6 +1,5 @@
-
-
diff --git a/src/layout/components/NavHeader/ViewSwitcher.vue b/src/layout/components/NavHeader/ViewSwitcher.vue
index f44927897..af8cbe387 100644
--- a/src/layout/components/NavHeader/ViewSwitcher.vue
+++ b/src/layout/components/NavHeader/ViewSwitcher.vue
@@ -190,7 +190,7 @@ export default {
.icons {
vertical-align: middle !important;
- font-size: 16px;
+ font-size: 14px;
text-align: center;
color: #1F2329;
margin-right: 10px;
@@ -198,7 +198,7 @@ export default {
.icons-title {
display: inline-block;
- font-size: 14px;
+ font-size: 13px;
.menu-main.mobile-view-switch ::v-deep .el-submenu__icon-arrow {
right: 10px;
diff --git a/src/router/workbench/index.js b/src/router/workbench/index.js
index 21d95c12d..ff9ae48c3 100644
--- a/src/router/workbench/index.js
+++ b/src/router/workbench/index.js
@@ -90,8 +90,8 @@ export default {
children: [
{
path: 'adhoc',
- name: 'Adhoc',
- component: () => import('@/views/ops/Job/QuickJob'),
+ name: 'QuickAdhoc',
+ component: () => import('@/views/ops/Adhoc/QuickJob'),
meta: {
title: i18n.t('QuickJob'),
icon: 'adhoc',
@@ -185,7 +185,7 @@ export default {
}
},
{
- path: 'adhoc/:id/update',
+ path: 'command/:id/update',
name: 'AdhocUpdate',
component: () => import('@/views/ops/Template/Adhoc/AdhocUpdateCreate'),
hidden: true,
@@ -196,7 +196,7 @@ export default {
}
},
{
- path: 'adhoc/create',
+ path: 'command/create',
name: 'AdhocCreate',
hidden: true,
component: () => import('@/views/ops/Template/Adhoc/AdhocUpdateCreate'),
@@ -207,7 +207,7 @@ export default {
}
},
{
- path: 'adhoc/:id',
+ path: 'command/:id',
component: () => import('@/views/ops/Template/Adhoc/AdhocDetail'),
name: 'AdhocDetail',
hidden: true,
diff --git a/src/views/assets/const.js b/src/views/assets/const.js
index fb993462c..85fb97a44 100644
--- a/src/views/assets/const.js
+++ b/src/views/assets/const.js
@@ -2,7 +2,7 @@ import i18n from '@/i18n/i18n'
import ProtocolSelector from '@/components/Form/FormFields/ProtocolSelector'
import AssetAccounts from '@/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts'
import rules from '@/components/Form/DataForm/rules'
-import { JSONManyToManySelect, Select2 } from '@/components/Form/FormFields'
+import { JSONManyToManySelect, NestedObjectSelect2, Select2 } from '@/components/Form/FormFields'
import { message } from '@/utils/message'
export const filterSelectValues = (values) => {
@@ -142,13 +142,13 @@ export const assetFieldsMeta = (vm) => {
labels: {
name: 'labels',
type: 'm2m',
- component: Select2,
+ component: NestedObjectSelect2,
el: {
multiple: true,
url: '/api/v1/labels/labels/',
ajax: {
transformOption: (item) => {
- return { label: `${item.name}:${item.value}`, value: `${item.name}:${item.value}` }
+ return { label: `${item.name}:${item.value}`, value: `${item.id}` }
}
}
}
diff --git a/src/views/ops/Job/AdhocOpenDialog.vue b/src/views/ops/Adhoc/AdhocOpenDialog.vue
similarity index 100%
rename from src/views/ops/Job/AdhocOpenDialog.vue
rename to src/views/ops/Adhoc/AdhocOpenDialog.vue
diff --git a/src/views/ops/Job/AdhocSaveDialog.vue b/src/views/ops/Adhoc/AdhocSaveDialog.vue
similarity index 93%
rename from src/views/ops/Job/AdhocSaveDialog.vue
rename to src/views/ops/Adhoc/AdhocSaveDialog.vue
index ce11c92fb..27c97039d 100644
--- a/src/views/ops/Job/AdhocSaveDialog.vue
+++ b/src/views/ops/Adhoc/AdhocSaveDialog.vue
@@ -13,9 +13,9 @@