+
+
-
-
-
+ {{ $t(tab.lable) }}
+
+
+
+
+
@@ -532,84 +108,32 @@ export default {
.resource-search {
width: 100%;
height: 100%;
- position: relative;
- &-before {
- width: 100%;
- max-width: 725px;
- height: 100%;
- margin: 0 auto;
- padding-top: 100px;
- display: flex;
- flex-direction: column;
- align-items: center;
-
- & > div {
- position: relative;
- z-index: 1;
- }
-
- &-bg {
- position: absolute;
- left: -24px;
- bottom: -24px;
- width: calc(100% + 48px);
- z-index: 0;
- }
- }
-
- &-title {
+ &-tab {
display: flex;
align-items: center;
- justify-content: center;
- margin-bottom: 25px;
+ margin-bottom: 12px;
- &-icon {
- font-size: 28px;
- }
+ &-item {
+ padding-right: 8px;
+ margin-right: 8px;
+ font-size: 14px;
+ font-weight: 400;
+ color: #86909C;
+ cursor: pointer;
- &-text {
- margin-left: 10px;
- font-size: 20px;
- font-weight: 700;
- color: #1D2129;
- }
- }
+ &:not(:last-child) {
+ border-right: solid 1px #E4E7ED;
+ }
- &-after {
- width: 100%;
- height: 100%;
- display: flex;
- justify-content: space-between;
+ &:hover {
+ color: #2F54EB;
+ }
- &-left {
- width: 100%;
- height: 100%;
- display: flex;
- flex-direction: column;
-
- & > div {
- flex-shrink: 0;
+ &_active {
+ color: #2F54EB;
}
}
-
- &-right {
- margin-left: 20px;
- width: calc(30% - 20px);
- flex-shrink: 0;
- }
- }
-
- &-divider {
- width: 100%;
- height: 1px;
- background-color: #E4E7ED;
- margin: 20px 0;
- }
-
- &-pagination {
- text-align: right;
- margin: 12px 0px;
}
}
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/ciTable.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/ciTable.vue
new file mode 100644
index 0000000..8962b8b
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/ciTable.vue
@@ -0,0 +1,516 @@
+
+
+
+
+
+
+
+ {{ getRowSeq(row) }}
+
+
+
+
+
+
+
+
+
+
+ {{ row.pathCI[path.id] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/filterPopover.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/filterPopover.vue
new file mode 100644
index 0000000..f90f2a2
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/filterPopover.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+ {{ $t('cmdb.relationSearch.conditionFilter') }}:
+
+
+
+
+
+
+ {{ $t('confirm') }}
+
+
+
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/saveConditionModal.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/saveConditionModal.vue
new file mode 100644
index 0000000..ee98520
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/saveConditionModal.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/searchCondition.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/searchCondition.vue
new file mode 100644
index 0000000..4a8636a
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/components/searchCondition.vue
@@ -0,0 +1,728 @@
+
+
+
+
+ {{ $t('cmdb.relationSearch.sourceCIType') }}
+
+
+
+
+
+ {{ node.label }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('cmdb.relationSearch.targetCIType') }}
+
+
+
+
+
+
+ {{ citype.alias || citype.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t('cmdb.relationSearch.pathSelect') }}
+
+
+
+
+ e.preventDefault()"
+ >
+
+
+
+
+
+
+
+
+ {{ path.pathNames }}
+
+
+
+
+
+
+
+
+
{{ $t('cmdb.relationSearch.returnPath') }}
+
+
+
+
+
+
![]()
+
{{ $t('noData') }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.option.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/index.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/index.vue
new file mode 100644
index 0000000..2c97883
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/relationSearch/index.vue
@@ -0,0 +1,693 @@
+
+
+
+
+
+
{{ $t('cmdb.relationSearch.relationSearch') }}
+
+
+
+
+
+
+
+
+ {{ $t('cmdb.relationSearch.expandCondition') }}
+
+
+
+
+
+
+
+ tableTabActive = tab"
+ />
+
+
+
+
+
+
![]()
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/attrDisplay.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/attrDisplay.vue
new file mode 100644
index 0000000..3da08c4
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/attrDisplay.vue
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/filterPopover.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/filterPopover.vue
new file mode 100644
index 0000000..52aac38
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/filterPopover.vue
@@ -0,0 +1,235 @@
+
+
+
+
+
{{ $t('cmdb.ciType.advancedFilter') }}
+
+
+
+
+
+
+
+ {{ node.label }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('cmdb.ciType.saveCondition') }}
+
+
+ {{ $t('confirm') }}
+
+
+
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/historyList.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/historyList.vue
new file mode 100644
index 0000000..0e1ea06
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/historyList.vue
@@ -0,0 +1,310 @@
+
+
+
+
+
+
{{ $t('cmdb.ciType.recentSearch') }}
+
+
+
+
+
+
+
+
+
+
+ {{ getRecentSearchText(item.option) }}
+
+
+
+
+
+
+
+
+
+
{{ $t('cmdb.ciType.myCollection') }}
+
({{ favorList.length }})
+
+
+
+
+
+
+
+ {{ item.option.title }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/instanceDetail.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/instanceDetail.vue
new file mode 100644
index 0000000..214116c
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/instanceDetail.vue
@@ -0,0 +1,438 @@
+
+
+
+
+
+
![]()
+
{{ $t('noData') }}
+
+
+
+
+
+
+
{{ group.name || $t('other') }}
+
+
+
+
+
+
+ {{ attr.alias || attr.name || '' }}
+
+ :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/instanceList.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/instanceList.vue
new file mode 100644
index 0000000..e536bc8
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/instanceList.vue
@@ -0,0 +1,443 @@
+
+
+
+
![]()
+
+
+
+
+
{{ $t('cmdb.ciType.currentPage') }}:
+
+ {{ tab.title }}
+ ({{ tab.count }})
+
+
+
+
+ {{ $t('download') }}
+
+
+
+
+
+
+
+
+
{{ attr.alias || attr.name || '' }}:
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/searchInput.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/searchInput.vue
new file mode 100644
index 0000000..b6cba1e
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/components/searchInput.vue
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/index.vue b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/index.vue
new file mode 100644
index 0000000..e10d239
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/views/resource_search_2/resourceSearch/index.vue
@@ -0,0 +1,625 @@
+
+
+
+
+
+ {{ $t('cmdb.ciType.resourceSearch') }}
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/store/global/app.js b/cmdb-ui/src/store/global/app.js
index e1e3ff1..4216165 100644
--- a/cmdb-ui/src/store/global/app.js
+++ b/cmdb-ui/src/store/global/app.js
@@ -25,7 +25,7 @@ const app = {
color: null,
weak: false,
multiTab: false,
-
+ cmdbSearchValue: '',
},
mutations: {
SET_SIDEBAR_TYPE: (state, type) => {
@@ -76,7 +76,9 @@ const app = {
Vue.ls.set(DEFAULT_MULTI_TAB, bool)
state.multiTab = bool
},
-
+ UPDATE_CMDB_SEARCH_VALUE: (state, value) => {
+ state.cmdbSearchValue = value
+ }
},
actions: {
setSidebar({ commit }, type) {
@@ -118,6 +120,9 @@ const app = {
ToggleMultiTab({ commit }, bool) {
commit('TOGGLE_MULTI_TAB', bool)
},
+ UpdateCMDBSEarchValue({ commit }, value) {
+ commit('UPDATE_CMDB_SEARCH_VALUE', value)
+ }
}
}