feat(api): my preference support grouping

.env

@@ -1,6 +0,0 @@
- MYSQL_ROOT_PASSWORD='123456'
- MYSQL_HOST='mysql'
- MYSQL_PORT=3306
- MYSQL_USER='cmdb'
- MYSQL_DATABASE='cmdb'
- MYSQL_PASSWORD='123456'

.github/workflows/docker-build-and-release.yaml

@@ -1,65 +0,0 @@
-name: api-docker-images-build-and-release
-
-on:
-  push:
-    branches:
-      - master
-    tags: ["v*"]
-  pull_request:
-    branches:
-      - master
-
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY_SERVER_ADDRESS: ghcr.io/veops
-
-jobs:
-  setup-environment:
-    timeout-minutes: 30
-    runs-on: ubuntu-latest
-    if: ${{ github.actor != 'dependabot[bot]' }}
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-  release-images:
-    runs-on: ubuntu-latest
-    needs: [setup-environment]
-    permissions:
-      contents: read
-      packages: write
-    timeout-minutes: 90
-    env:
-      TAG: ${{ github.sha }}
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: "1.21.8"
-          cache: false
-      - name: Login to GitHub Package Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build and push CMDB-API Docker image
-        uses: docker/build-push-action@v6
-        with:
-          file: docker/Dockerfile-API
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ env.REGISTRY_SERVER_ADDRESS }}/cmdb-api:${{ env.TAG }}
-      - name: Build and push CMDB-UI Docker image
-        uses: docker/build-push-action@v6
-        with:
-          file: docker/Dockerfile-UI
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ env.REGISTRY_SERVER_ADDRESS }}/cmdb-ui:${{ env.TAG }}

Makefile

@@ -1,4 +1,6 @@
-include ./Makefile.variable
+MYSQL_ROOT_PASSWORD ?= root
+MYSQL_PORT ?= 3306
+REDIS_PORT ?= 6379
 
 default: help
 help:  ## display this help
@@ -48,25 +50,3 @@ clean: ## remove unwanted files like .pyc's
 lint: ## check style with flake8
 	flake8 --exclude=env .
 .PHONY: lint
-
-api-docker-build:
-	export DOCKER_CLI_EXPERIMENTAL=enabled ;\
-	! ( docker buildx ls | grep multi-platform-builder ) && docker buildx create --use --platform=$(BUILD_ARCH) --name multi-platform-builder ;\
-	docker buildx build \
-    			--builder multi-platform-builder \
-    			--platform=$(BUILD_ARCH) \
-    			--tag $(REGISTRY)/cmdb-api:$(CMDB_DOCKER_VERSION)  \
-    			--tag $(REGISTRY)/cmdb-api:latest  \
-    			-f docker/Dockerfile-API \
-    			.
-
-ui-docker-build:
-	export DOCKER_CLI_EXPERIMENTAL=enabled ;\
-	! ( docker buildx ls | grep multi-platform-builder ) && docker buildx create --use --platform=$(BUILD_ARCH) --name multi-platform-builder ;\
-	docker buildx build \
-    			--builder multi-platform-builder \
-    			--platform=$(BUILD_ARCH) \
-    			--tag $(REGISTRY)/cmdb-ui:$(CMDB_DOCKER_VERSION)  \
-    			--tag $(REGISTRY)/cmdb-ui:latest  \
-    			-f docker/Dockerfile-UI \
-    			.

Makefile.variable

@@ -1,21 +0,0 @@
-SHELL := /bin/bash -o pipefail
-
-MYSQL_ROOT_PASSWORD ?= root
-MYSQL_PORT ?= 3306
-REDIS_PORT ?= 6379
-
-LATEST_TAG_DIFF:=$(shell git describe --tags --abbrev=8)
-LATEST_COMMIT:=$(VERSION)-dev-$(shell git rev-parse --short=8 HEAD)
-BUILD_ARCH ?= linux/amd64,linux/arm64
-
-# Set your version by env or using latest tags from git
-CMDB_VERSION?=$(LATEST_TAG_DIFF)
-ifeq ($(CMDB_VERSION),)
- 	#fall back to last commit
-	CMDB_VERSION=$(LATEST_COMMIT)
-endif
-COMMIT_VERSION:=$(LATEST_COMMIT)
-CMDB_DOCKER_VERSION:=${CMDB_VERSION}
-CMDB_CHART_VERSION:=$(shell echo ${CMDB_VERSION} | sed  's/^v//g' )
-
-REGISTRY ?= local

cmdb-api/Pipfile

@@ -36,7 +36,7 @@ Flask-Caching = ">=1.0.0"
 environs = "==4.2.0"
 marshmallow = "==2.20.2"
 # async tasks
-celery = "==5.3.1"
+celery = ">=5.3.1"
 celery_once = "==3.0.1"
 more-itertools = "==5.0.0"
 kombu = ">=5.3.1"

cmdb-api/api/commands/click_cmdb.py

@@ -128,7 +128,7 @@ def cmdb_init_acl():
                 perms = [PermEnum.READ]
             elif resource_type == ResourceTypeEnum.CI_TYPE_RELATION:
                 perms = [PermEnum.ADD, PermEnum.DELETE, PermEnum.GRANT]
-            elif resource_type in (ResourceTypeEnum.RELATION_VIEW, ResourceTypeEnum.TOPOLOGY_VIEW):
+            elif resource_type == ResourceTypeEnum.RELATION_VIEW:
                 perms = [PermEnum.READ, PermEnum.UPDATE, PermEnum.DELETE, PermEnum.GRANT]
 
             ResourceTypeCRUD.add(app_id, resource_type, '', perms)
@@ -190,7 +190,6 @@ def cmdb_counter():
     login_user(UserCache.get('worker'))
 
     i = 0
-    today = datetime.date.today()
     while True:
         try:
             db.session.remove()
@@ -201,10 +200,6 @@ def cmdb_counter():
                 CMDBCounterCache.flush_adc_counter()
                 i = 0
 
-            if datetime.date.today() != today:
-                CMDBCounterCache.clear_ad_exec_history()
-                today = datetime.date.today()
-
             CMDBCounterCache.flush_sub_counter()
 
             i += 1
@@ -331,7 +326,7 @@ def cmdb_inner_secrets_init(address):
     """
     init inner secrets for password feature
     """
-    res, ok = KeyManage(backend=InnerKVManger()).init()
+    res, ok = KeyManage(backend=InnerKVManger).init()
     if not ok:
         if res.get("status") == "failed":
             KeyManage.print_response(res)
@@ -498,48 +493,3 @@ def cmdb_agent_init():
 
     click.echo("Key   : {}".format(click.style(user.key, bg='red')))
     click.echo("Secret: {}".format(click.style(user.secret, bg='red')))
-
-
-@click.command()
-@click.option(
-    '-v',
-    '--version',
-    help='input cmdb version, e.g. 2.4.6',
-    required=True,
-)
-@with_appcontext
-def cmdb_patch(version):
-    """
-    CMDB upgrade patch
-    """
-
-    version = version[1:] if version.lower().startswith("v") else version
-
-    if version >= '2.4.6':
-
-        from api.models.cmdb import CITypeRelation
-        for cr in CITypeRelation.get_by(to_dict=False):
-            if hasattr(cr, 'parent_attr_id') and cr.parent_attr_id and not cr.parent_attr_ids:
-                parent_attr_ids, child_attr_ids = [cr.parent_attr_id], [cr.child_attr_id]
-                cr.update(parent_attr_ids=parent_attr_ids, child_attr_ids=child_attr_ids, commit=False)
-        db.session.commit()
-
-        from api.models.cmdb import AutoDiscoveryCIType, AutoDiscoveryCITypeRelation
-        from api.lib.cmdb.cache import CITypeCache, AttributeCache
-        for adt in AutoDiscoveryCIType.get_by(to_dict=False):
-            if adt.relation:
-                if not AutoDiscoveryCITypeRelation.get_by(ad_type_id=adt.type_id):
-                    peer_type = CITypeCache.get(list(adt.relation.values())[0]['type_name'])
-                    peer_type_id = peer_type and peer_type.id
-                    peer_attr = AttributeCache.get(list(adt.relation.values())[0]['attr_name'])
-                    peer_attr_id = peer_attr and peer_attr.id
-                    if peer_type_id and peer_attr_id:
-                        AutoDiscoveryCITypeRelation.create(ad_type_id=adt.type_id,
-                                                           ad_key=list(adt.relation.keys())[0],
-                                                           peer_type_id=peer_type_id,
-                                                           peer_attr_id=peer_attr_id,
-                                                           commit=False)
-            if hasattr(adt, 'interval') and adt.interval and not adt.cron:
-                adt.cron = "*/{} * * * *".format(adt.interval // 60)
-
-        db.session.commit()

cmdb-api/api/lib/cmdb/auto_discovery/auto_discovery.py

@@ -1,47 +1,34 @@
 # -*- coding:utf-8 -*-
-import copy
 import datetime
 import json
 import os
 
-from flask import abort
-from flask import current_app
-from flask_login import current_user
-from sqlalchemy import func
-
 from api.extensions import db
 from api.lib.cmdb.auto_discovery.const import ClOUD_MAP
-from api.lib.cmdb.auto_discovery.const import DEFAULT_HTTP
-from api.lib.cmdb.cache import AttributeCache
 from api.lib.cmdb.cache import CITypeAttributeCache
 from api.lib.cmdb.cache import CITypeCache
 from api.lib.cmdb.ci import CIManager
 from api.lib.cmdb.ci import CIRelationManager
 from api.lib.cmdb.ci_type import CITypeGroupManager
 from api.lib.cmdb.const import AutoDiscoveryType
-from api.lib.cmdb.const import CMDB_QUEUE
 from api.lib.cmdb.const import PermEnum
 from api.lib.cmdb.const import ResourceTypeEnum
 from api.lib.cmdb.resp_format import ErrFormat
 from api.lib.cmdb.search import SearchError
-from api.lib.cmdb.search.ci import search as ci_search
-from api.lib.common_setting.role_perm_base import CMDBApp
+from api.lib.cmdb.search.ci import search
 from api.lib.mixin import DBMixin
-from api.lib.perm.acl.acl import ACLManager
 from api.lib.perm.acl.acl import is_app_admin
 from api.lib.perm.acl.acl import validate_permission
 from api.lib.utils import AESCrypto
 from api.models.cmdb import AutoDiscoveryCI
 from api.models.cmdb import AutoDiscoveryCIType
-from api.models.cmdb import AutoDiscoveryCITypeRelation
-from api.models.cmdb import AutoDiscoveryCounter
-from api.models.cmdb import AutoDiscoveryExecHistory
 from api.models.cmdb import AutoDiscoveryRule
-from api.models.cmdb import AutoDiscoveryRuleSyncHistory
-from api.tasks.cmdb import write_ad_rule_sync_history
+from flask import abort
+from flask import current_app
+from flask_login import current_user
+from sqlalchemy import func
 
 PWD = os.path.abspath(os.path.dirname(__file__))
-app_cli = CMDBApp()
 
 
 def parse_plugin_script(script):
@@ -113,22 +100,6 @@ class AutoDiscoveryRuleCRUD(DBMixin):
         self.cls.get_by(name=kwargs['name']) and abort(400, ErrFormat.adr_duplicate.format(kwargs['name']))
         if kwargs.get('is_plugin') and kwargs.get('plugin_script'):
             kwargs = check_plugin_script(**kwargs)
-            acl = ACLManager(app_cli.app_name)
-            has_perm = True
-            try:
-                if not acl.has_permission(app_cli.op.Auto_Discovery,
-                                          app_cli.resource_type_name,
-                                          app_cli.op.create_plugin) and not is_app_admin(app_cli.app_name):
-                    has_perm = False
-            except Exception:
-                if not is_app_admin(app_cli.app_name):
-                    return abort(403, ErrFormat.role_required.format(app_cli.admin_name))
-
-            if not has_perm:
-                return abort(403, ErrFormat.no_permission.format(
-                    app_cli.op.Auto_Discovery, app_cli.op.create_plugin))
-
-        kwargs['owner'] = current_user.uid
 
         return kwargs
 
@@ -144,22 +115,6 @@ class AutoDiscoveryRuleCRUD(DBMixin):
             if other and other.id != existed.id:
                 return abort(400, ErrFormat.adr_duplicate.format(kwargs['name']))
 
-        if existed.is_plugin:
-            acl = ACLManager(app_cli.app_name)
-            has_perm = True
-            try:
-                if not acl.has_permission(app_cli.op.Auto_Discovery,
-                                          app_cli.resource_type_name,
-                                          app_cli.op.update_plugin) and not is_app_admin(app_cli.app_name):
-                    has_perm = False
-            except Exception:
-                if not is_app_admin(app_cli.app_name):
-                    return abort(403, ErrFormat.role_required.format(app_cli.admin_name))
-
-            if not has_perm:
-                return abort(403, ErrFormat.no_permission.format(
-                    app_cli.op.Auto_Discovery, app_cli.op.update_plugin))
-
         return existed
 
     def update(self, _id, **kwargs):
@@ -167,35 +122,13 @@ class AutoDiscoveryRuleCRUD(DBMixin):
         if kwargs.get('is_plugin') and kwargs.get('plugin_script'):
             kwargs = check_plugin_script(**kwargs)
 
-            for item in AutoDiscoveryCIType.get_by(adr_id=_id, to_dict=False):
-                item.update(updated_at=datetime.datetime.now())
-
         return super(AutoDiscoveryRuleCRUD, self).update(_id, filter_none=False, **kwargs)
 
     def _can_delete(self, **kwargs):
         if AutoDiscoveryCIType.get_by(adr_id=kwargs['_id'], first=True):
             return abort(400, ErrFormat.adr_referenced)
 
-        existed = self.cls.get_by_id(kwargs['_id']) or abort(
-            404, ErrFormat.adr_not_found.format("id={}".format(kwargs['_id'])))
-
-        if existed.is_plugin:
-            acl = ACLManager(app_cli.app_name)
-            has_perm = True
-            try:
-                if not acl.has_permission(app_cli.op.Auto_Discovery,
-                                          app_cli.resource_type_name,
-                                          app_cli.op.delete_plugin) and not is_app_admin(app_cli.app_name):
-                    has_perm = False
-            except Exception:
-                if not is_app_admin(app_cli.app_name):
-                    return abort(403, ErrFormat.role_required.format(app_cli.admin_name))
-
-            if not has_perm:
-                return abort(403, ErrFormat.no_permission.format(
-                    app_cli.op.Auto_Discovery, app_cli.op.delete_plugin))
-
-        return existed
+        return self._can_update(**kwargs)
 
 
 class AutoDiscoveryCITypeCRUD(DBMixin):
@@ -214,34 +147,14 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
         return cls.cls.get_by(type_id=type_id, to_dict=False)
 
     @classmethod
-    def get_ad_attributes(cls, type_id):
-        result = []
-        adts = cls.get_by_type_id(type_id)
-        for adt in adts:
-            adr = AutoDiscoveryRuleCRUD.get_by_id(adt.adr_id)
-            if not adr:
-                continue
-            if adr.type == "http":
-                for i in DEFAULT_HTTP:
-                    if adr.name == i['name']:
-                        attrs = AutoDiscoveryHTTPManager.get_attributes(
-                            i['en'], (adt.extra_option or {}).get('category')) or []
-                        result.extend([i.get('name') for i in attrs])
-                        break
-            elif adr.type == "snmp":
-                attributes = AutoDiscoverySNMPManager.get_attributes()
-                result.extend([i.get('name') for i in (attributes or [])])
-            else:
-                result.extend([i.get('name') for i in (adr.attributes or [])])
-
-        return sorted(list(set(result)))
-
-    @classmethod
-    def get(cls, ci_id, oneagent_id, oneagent_name, last_update_at=None):
+    def get(cls, ci_id, oneagent_id, last_update_at=None):
         result = []
         rules = cls.cls.get_by(to_dict=True)
 
         for rule in rules:
+            if rule.get('relation'):
+                continue
+
             if isinstance(rule.get("extra_option"), dict) and rule['extra_option'].get('secret'):
                 if not (current_user.username == "cmdb_agent" or current_user.uid == rule['uid']):
                     rule['extra_option'].pop('secret', None)
@@ -252,7 +165,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
                 result.append(rule)
             elif rule['query_expr']:
                 query = rule['query_expr'].lstrip('q').lstrip('=')
-                s = ci_search(query, fl=['_id'], count=1000000)
+                s = search(query, fl=['_id'], count=1000000)
                 try:
                     response, _, _, _, _, _ = s.search()
                 except SearchError as e:
@@ -269,6 +182,9 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
                 if adr.type in (AutoDiscoveryType.SNMP, AutoDiscoveryType.HTTP):
                     continue
 
+                if not rule['updated_at']:
+                    continue
+
                 result.append(rule)
 
         new_last_update_at = ""
@@ -279,9 +195,6 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
             if new_last_update_at < __last_update_at:
                 new_last_update_at = __last_update_at
 
-        write_ad_rule_sync_history.apply_async(args=(result, oneagent_id, oneagent_name, datetime.datetime.now()),
-                                               queue=CMDB_QUEUE)
-
         if not last_update_at or new_last_update_at > last_update_at:
             return result, new_last_update_at
         else:
@@ -300,7 +213,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
             agent_id = agent_id.strip()
             q = "op_duty:{0},-rd_duty:{0},oneagent_id:{1}"
 
-            s = ci_search(q.format(current_user.username, agent_id.strip()))
+            s = search(q.format(current_user.username, agent_id.strip()))
             try:
                 response, _, _, _, _, _ = s.search()
                 if response:
@@ -309,7 +222,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
                 current_app.logger.warning(e)
                 return abort(400, str(e))
 
-            s = ci_search(q.format(current_user.nickname, agent_id.strip()))
+            s = search(q.format(current_user.nickname, agent_id.strip()))
             try:
                 response, _, _, _, _, _ = s.search()
                 if response:
@@ -323,7 +236,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
             if query_expr.startswith('q='):
                 query_expr = query_expr[2:]
 
-            s = ci_search(query_expr, count=1000000)
+            s = search(query_expr, count=1000000)
             try:
                 response, _, _, _, _, _ = s.search()
                 for i in response:
@@ -341,21 +254,13 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
     def _can_add(**kwargs):
 
         if kwargs.get('adr_id'):
-            adr = AutoDiscoveryRule.get_by_id(kwargs['adr_id']) or abort(
+            AutoDiscoveryRule.get_by_id(kwargs['adr_id']) or abort(
                 404, ErrFormat.adr_not_found.format("id={}".format(kwargs['adr_id'])))
-            if adr.type == "http":
-                kwargs.setdefault('extra_option', dict)
-                en_name = None
-                for i in DEFAULT_HTTP:
-                    if i['name'] == adr.name:
-                        en_name = i['en']
-                        break
-                if en_name and kwargs['extra_option'].get('category'):
-                    for item in ClOUD_MAP[en_name]:
-                        if item["collect_key_map"].get(kwargs['extra_option']['category']):
-                            kwargs["extra_option"]["collect_key"] = item["collect_key_map"][
-                                kwargs['extra_option']['category']]
-                            break
+            # if not adr.is_plugin:
+            #     other = self.cls.get_by(adr_id=adr.id, first=True, to_dict=False)
+            #     if other:
+            #         ci_type = CITypeCache.get(other.type_id)
+            #         return abort(400, ErrFormat.adr_default_ref_once.format(ci_type.alias))
 
         if kwargs.get('is_plugin') and kwargs.get('plugin_script'):
             kwargs = check_plugin_script(**kwargs)
@@ -363,11 +268,6 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
         if isinstance(kwargs.get('extra_option'), dict) and kwargs['extra_option'].get('secret'):
             kwargs['extra_option']['secret'] = AESCrypto.encrypt(kwargs['extra_option']['secret'])
 
-        ci_type = CITypeCache.get(kwargs['type_id'])
-        unique = AttributeCache.get(ci_type.unique_id)
-        if unique and unique.name not in (kwargs.get('attributes') or {}).values():
-            return abort(400, ErrFormat.ad_not_unique_key.format(unique.name))
-
         kwargs['uid'] = current_user.uid
 
         return kwargs
@@ -376,29 +276,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
         existed = self.cls.get_by_id(kwargs['_id']) or abort(
             404, ErrFormat.ad_not_found.format("id={}".format(kwargs['_id'])))
 
-        adr = AutoDiscoveryRule.get_by_id(existed.adr_id) or abort(
-            404, ErrFormat.adr_not_found.format("id={}".format(existed.adr_id)))
-        if adr.type == "http":
-            kwargs.setdefault('extra_option', dict)
-            en_name = None
-            for i in DEFAULT_HTTP:
-                if i['name'] == adr.name:
-                    en_name = i['en']
-                    break
-            if en_name and kwargs['extra_option'].get('category'):
-                for item in ClOUD_MAP[en_name]:
-                    if item["collect_key_map"].get(kwargs['extra_option']['category']):
-                        kwargs["extra_option"]["collect_key"] = item["collect_key_map"][
-                            kwargs['extra_option']['category']]
-                        break
-
-        if 'attributes' in kwargs:
-            self.__valid_exec_target(kwargs.get('agent_id'), kwargs.get('query_expr'))
-
-            ci_type = CITypeCache.get(existed.type_id)
-            unique = AttributeCache.get(ci_type.unique_id)
-            if unique and unique.name not in (kwargs.get('attributes') or {}).values():
-                return abort(400, ErrFormat.ad_not_unique_key.format(unique.name))
+        self.__valid_exec_target(kwargs.get('agent_id'), kwargs.get('query_expr'))
 
         if isinstance(kwargs.get('extra_option'), dict) and kwargs['extra_option'].get('secret'):
             if current_user.uid != existed.uid:
@@ -414,15 +292,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
         if isinstance(kwargs.get('extra_option'), dict) and kwargs['extra_option'].get('secret'):
             kwargs['extra_option']['secret'] = AESCrypto.encrypt(kwargs['extra_option']['secret'])
 
-        inst = self._can_update(_id=_id, **kwargs)
-        if inst.agent_id != kwargs.get('agent_id') or inst.query_expr != kwargs.get('query_expr'):
-            for item in AutoDiscoveryRuleSyncHistory.get_by(adt_id=inst.id, to_dict=False):
-                item.delete(commit=False)
-            db.session.commit()
-
-        obj = inst.update(_id=_id, filter_none=False, **kwargs)
-
-        return obj
+        return super(AutoDiscoveryCITypeCRUD, self).update(_id, filter_none=False, **kwargs)
 
     def _can_delete(self, **kwargs):
         if AutoDiscoveryCICRUD.get_by_adt_id(kwargs['_id']):
@@ -433,56 +303,6 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
 
         return existed
 
-    def delete(self, _id):
-        inst = self._can_delete(_id=_id)
-
-        inst.soft_delete()
-
-        for item in AutoDiscoveryRuleSyncHistory.get_by(adt_id=inst.id, to_dict=False):
-            item.delete(commit=False)
-        db.session.commit()
-
-        attributes = self.get_ad_attributes(inst.type_id)
-        for item in AutoDiscoveryCITypeRelationCRUD.get_by_type_id(inst.type_id):
-            if item.ad_key not in attributes:
-                item.soft_delete()
-
-        return inst
-
-
-class AutoDiscoveryCITypeRelationCRUD(DBMixin):
-    cls = AutoDiscoveryCITypeRelation
-
-    @classmethod
-    def get_by_type_id(cls, type_id, to_dict=False):
-        return cls.cls.get_by(ad_type_id=type_id, to_dict=to_dict)
-
-    def upsert(self, ad_type_id, relations):
-        existed = self.cls.get_by(ad_type_id=ad_type_id, to_dict=False)
-        existed = {(i.ad_key, i.peer_type_id, i.peer_attr_id): i for i in existed}
-
-        new = []
-        for r in relations:
-            k = (r.get('ad_key'), r.get('peer_type_id'), r.get('peer_attr_id'))
-            if len(list(filter(lambda x: x, k))) == 3 and k not in existed:
-                self.cls.create(ad_type_id=ad_type_id, **r)
-
-            new.append(k)
-
-        for deleted in set(existed.keys()) - set(new):
-            existed[deleted].soft_delete()
-
-        return self.get_by_type_id(ad_type_id, to_dict=True)
-
-    def _can_add(self, **kwargs):
-        pass
-
-    def _can_update(self, **kwargs):
-        pass
-
-    def _can_delete(self, **kwargs):
-        pass
-
 
 class AutoDiscoveryCICRUD(DBMixin):
     cls = AutoDiscoveryCI
@@ -571,24 +391,16 @@ class AutoDiscoveryCICRUD(DBMixin):
         changed = False
         if existed is not None:
             if existed.instance != kwargs['instance']:
-                instance = copy.deepcopy(existed.instance) or {}
-                instance.update(kwargs['instance'])
-                kwargs['instance'] = instance
                 existed.update(filter_none=False, **kwargs)
-                AutoDiscoveryExecHistoryCRUD().add(type_id=adt.type_id,
-                                                   stdout="update resource: {}".format(kwargs.get('unique_value')))
                 changed = True
         else:
             existed = self.cls.create(**kwargs)
-            AutoDiscoveryExecHistoryCRUD().add(type_id=adt.type_id,
-                                               stdout="add resource: {}".format(kwargs.get('unique_value')))
             changed = True
 
         if adt.auto_accept and changed:
             try:
                 self.accept(existed)
             except Exception as e:
-                current_app.logger.error(e)
                 return abort(400, str(e))
         elif changed:
             existed.update(is_accept=False, accept_time=None, accept_by=None, filter_none=False)
@@ -608,13 +420,6 @@ class AutoDiscoveryCICRUD(DBMixin):
 
         inst.delete()
 
-        adt = AutoDiscoveryCIType.get_by_id(inst.adt_id)
-        if adt:
-            adt.update(updated_at=datetime.datetime.now())
-
-        AutoDiscoveryExecHistoryCRUD().add(type_id=inst.type_id,
-                                           stdout="delete resource: {}".format(inst.unique_value))
-
         self._after_delete(inst)
 
         return inst
@@ -630,13 +435,6 @@ class AutoDiscoveryCICRUD(DBMixin):
             not is_app_admin("cmdb") and validate_permission(ci_type.name, ResourceTypeEnum.CI, PermEnum.DELETE, "cmdb")
 
         existed.delete()
-
-        adt = AutoDiscoveryCIType.get_by_id(existed.adt_id)
-        if adt:
-            adt.update(updated_at=datetime.datetime.now())
-
-        AutoDiscoveryExecHistoryCRUD().add(type_id=type_id,
-                                           stdout="delete resource: {}".format(unique_value))
         # TODO: delete ci
 
     @classmethod
@@ -649,34 +447,32 @@ class AutoDiscoveryCICRUD(DBMixin):
         ci_id = None
         if adt.attributes:
             ci_dict = {adt.attributes[k]: v for k, v in adc.instance.items() if k in adt.attributes}
-            ci_id = CIManager.add(adc.type_id, is_auto_discovery=True, _is_admin=True, **ci_dict)
-            AutoDiscoveryExecHistoryCRUD().add(type_id=adt.type_id,
-                                               stdout="accept resource: {}".format(adc.unique_value))
+            ci_id = CIManager.add(adc.type_id, is_auto_discovery=True, **ci_dict)
 
-        relation_ads = AutoDiscoveryCITypeRelation.get_by(ad_type_id=adt.type_id, to_dict=False)
-        for r_adt in relation_ads:
-            ad_key = r_adt.ad_key
-            if not adc.instance.get(ad_key):
+        relation_adts = AutoDiscoveryCIType.get_by(type_id=adt.type_id, adr_id=None, to_dict=False)
+        for r_adt in relation_adts:
+            if not r_adt.relation or ci_id is None:
                 continue
-
-            ad_key_values = [adc.instance.get(ad_key)] if not isinstance(
-                adc.instance.get(ad_key), list) else adc.instance.get(ad_key)
-            for ad_key_value in ad_key_values:
-                query = "_type:{},{}:{}".format(r_adt.peer_type_id, r_adt.peer_attr_id, ad_key_value)
-                s = ci_search(query, use_ci_filter=False, count=1000000)
+            for ad_key in r_adt.relation:
+                if not adc.instance.get(ad_key):
+                    continue
+                cmdb_key = r_adt.relation[ad_key]
+                query = "_type:{},{}:{}".format(cmdb_key.get('type_name'), cmdb_key.get('attr_name'),
+                                                adc.instance.get(ad_key))
+                s = search(query)
                 try:
                     response, _, _, _, _, _ = s.search()
                 except SearchError as e:
                     current_app.logger.warning(e)
                     return abort(400, str(e))
 
-                for relation_ci in response:
-                    relation_ci_id = relation_ci['_id']
+                relation_ci_id = response and response[0]['_id']
+                if relation_ci_id:
                     try:
-                        CIRelationManager.add(ci_id, relation_ci_id, valid=False)
+                        CIRelationManager.add(ci_id, relation_ci_id)
                     except:
                         try:
-                            CIRelationManager.add(relation_ci_id, ci_id, valid=False)
+                            CIRelationManager.add(relation_ci_id, ci_id)
                         except:
                             pass
 
@@ -689,35 +485,14 @@ class AutoDiscoveryCICRUD(DBMixin):
 class AutoDiscoveryHTTPManager(object):
     @staticmethod
     def get_categories(name):
-        categories = (ClOUD_MAP.get(name) or {}) or []
-        for item in copy.deepcopy(categories):
-            item.pop('map', None)
-
-        return categories
-
-    def get_resources(self, name):
-        en_name = None
-        for i in DEFAULT_HTTP:
-            if i['name'] == name:
-                en_name = i['en']
-                break
-
-        if en_name:
-            categories = self.get_categories(en_name)
-
-            return [j for i in categories for j in i['items']]
-
-        return []
+        return (ClOUD_MAP.get(name) or {}).get('categories') or []
 
     @staticmethod
-    def get_attributes(provider, resource):
-        for item in (ClOUD_MAP.get(provider) or {}):
-            for _resource in (item.get('map') or {}):
-                if _resource == resource:
-                    tpt = item['map'][_resource]
-                    if tpt and os.path.exists(os.path.join(PWD, tpt)):
-                        with open(os.path.join(PWD, tpt)) as f:
-                            return json.loads(f.read())
+    def get_attributes(name, category):
+        tpt = ((ClOUD_MAP.get(name) or {}).get('map') or {}).get(category)
+        if tpt and os.path.exists(os.path.join(PWD, tpt)):
+            with open(os.path.join(PWD, tpt)) as f:
+                return json.loads(f.read())
 
         return []
 
@@ -731,62 +506,3 @@ class AutoDiscoverySNMPManager(object):
                 return json.loads(f.read())
 
         return []
-
-
-class AutoDiscoveryRuleSyncHistoryCRUD(DBMixin):
-    cls = AutoDiscoveryRuleSyncHistory
-
-    def _can_add(self, **kwargs):
-        pass
-
-    def _can_update(self, **kwargs):
-        pass
-
-    def _can_delete(self, **kwargs):
-        pass
-
-    def upsert(self, **kwargs):
-        existed = self.cls.get_by(adt_id=kwargs.get('adt_id'),
-                                  oneagent_id=kwargs.get('oneagent_id'),
-                                  oneagent_name=kwargs.get('oneagent_name'),
-                                  first=True,
-                                  to_dict=False)
-
-        if existed is not None:
-            existed.update(**kwargs)
-        else:
-            self.cls.create(**kwargs)
-
-
-class AutoDiscoveryExecHistoryCRUD(DBMixin):
-    cls = AutoDiscoveryExecHistory
-
-    def _can_add(self, **kwargs):
-        pass
-
-    def _can_update(self, **kwargs):
-        pass
-
-    def _can_delete(self, **kwargs):
-        pass
-
-
-class AutoDiscoveryCounterCRUD(DBMixin):
-    cls = AutoDiscoveryCounter
-
-    def get(self, type_id):
-        res = self.cls.get_by(type_id=type_id, first=True, to_dict=True)
-        if res is None:
-            return dict(rule_count=0, exec_target_count=0, instance_count=0, accept_count=0,
-                        this_month_count=0, this_week_count=0, last_month_count=0, last_week_count=0)
-
-        return res
-
-    def _can_add(self, **kwargs):
-        pass
-
-    def _can_update(self, **kwargs):
-        pass
-
-    def _can_delete(self, **kwargs):
-        pass

cmdb-api/api/lib/cmdb/auto_discovery/const.py

@@ -3,13 +3,13 @@
 from api.lib.cmdb.const import AutoDiscoveryType
 
 DEFAULT_HTTP = [
-    dict(name="阿里云", en="aliyun", type=AutoDiscoveryType.HTTP, is_inner=True, is_plugin=False,
+    dict(name="阿里云", type=AutoDiscoveryType.HTTP, is_inner=True, is_plugin=False,
          option={'icon': {'name': 'caise-aliyun'}}),
-    dict(name="腾讯云", en="tencentcloud", type=AutoDiscoveryType.HTTP, is_inner=True, is_plugin=False,
+    dict(name="腾讯云", type=AutoDiscoveryType.HTTP, is_inner=True, is_plugin=False,
          option={'icon': {'name': 'caise-tengxunyun'}}),
-    dict(name="华为云", en="huaweicloud", type=AutoDiscoveryType.HTTP, is_inner=True, is_plugin=False,
+    dict(name="华为云", type=AutoDiscoveryType.HTTP, is_inner=True, is_plugin=False,
          option={'icon': {'name': 'caise-huaweiyun'}}),
-    dict(name="AWS", en="aws", type=AutoDiscoveryType.HTTP, is_inner=True, is_plugin=False,
+    dict(name="AWS", type=AutoDiscoveryType.HTTP, is_inner=True, is_plugin=False,
          option={'icon': {'name': 'caise-aws'}}),
 
     dict(name="交换机", type=AutoDiscoveryType.SNMP, is_inner=True, is_plugin=False,
@@ -23,47 +23,31 @@ DEFAULT_HTTP = [
 ]
 
 ClOUD_MAP = {
-    "aliyun": [{
-        "category": "计算",
-        "items": ["云服务器 ECS"],
+    "aliyun": {
+        "categories": ["云服务器 ECS"],
         "map": {
             "云服务器 ECS": "templates/aliyun_ecs.json",
-        },
-        "collect_key_map": {
-            "云服务器 ECS": "ali.ecs",
         }
-    }],
+    },
 
-    "tencentcloud": [{
-        "category": "计算",
-        "items": ["云服务器 CVM"],
+    "tencentcloud": {
+        "categories": ["云服务器 CVM"],
         "map": {
             "云服务器 CVM": "templates/tencent_cvm.json",
-        },
-        "collect_key_map": {
-            "云服务器 CVM": "tencent.cvm",
         }
-    }],
+    },
 
-    "huaweicloud": [{
-        "category": "计算",
-        "items": ["云服务器 ECS"],
+    "huaweicloud": {
+        "categories": ["云服务器 ECS"],
         "map": {
             "云服务器 ECS": "templates/huaweicloud_ecs.json",
-        },
-        "collect_key_map": {
-            "云服务器 ECS": "huawei.ecs",
         }
-    }],
+    },
 
-    "aws": [{
-        "category": "计算",
-        "items": ["云服务器 EC2"],
+    "aws": {
+        "categories": ["云服务器 EC2"],
         "map": {
             "云服务器 EC2": "templates/aws_ec2.json",
-        },
-        "collect_key_map": {
-            "云服务器 EC2": "aws.ec2",
         }
-    }],
+    },
 }

cmdb-api/api/lib/cmdb/cache.py

@@ -2,19 +2,12 @@
 
 from __future__ import unicode_literals
 
-import datetime
-
 from flask import current_app
 
 from api.extensions import cache
 from api.extensions import db
 from api.lib.cmdb.custom_dashboard import CustomDashboardManager
-from api.models.cmdb import Attribute, AutoDiscoveryExecHistory
-from api.models.cmdb import AutoDiscoveryCI
-from api.models.cmdb import AutoDiscoveryCIType
-from api.models.cmdb import AutoDiscoveryCITypeRelation
-from api.models.cmdb import AutoDiscoveryCounter
-from api.models.cmdb import AutoDiscoveryRuleSyncHistory
+from api.models.cmdb import Attribute
 from api.models.cmdb import CI
 from api.models.cmdb import CIType
 from api.models.cmdb import CITypeAttribute
@@ -455,67 +448,7 @@ class CMDBCounterCache(object):
 
         cache.set(cls.KEY2, result, timeout=0)
 
-        res = db.session.query(AutoDiscoveryCI.created_at,
-                               AutoDiscoveryCI.updated_at,
-                               AutoDiscoveryCI.adt_id,
-                               AutoDiscoveryCI.type_id,
-                               AutoDiscoveryCI.is_accept).filter(AutoDiscoveryCI.deleted.is_(False))
-
-        today = datetime.datetime.today()
-        this_month = datetime.datetime(today.year, today.month, 1)
-        last_month = this_month - datetime.timedelta(days=1)
-        last_month = datetime.datetime(last_month.year, last_month.month, 1)
-        this_week = today - datetime.timedelta(days=datetime.date.weekday(today))
-        this_week = datetime.datetime(this_week.year, this_week.month, this_week.day)
-        last_week = this_week - datetime.timedelta(days=7)
-        last_week = datetime.datetime(last_week.year, last_week.month, last_week.day)
-        result = dict()
-        for i in res:
-            if i.type_id not in result:
-                result[i.type_id] = dict(instance_count=0, accept_count=0,
-                                         this_month_count=0, this_week_count=0, last_month_count=0, last_week_count=0)
-
-                adts = AutoDiscoveryCIType.get_by(type_id=i.type_id, to_dict=False)
-                result[i.type_id]['rule_count'] = len(adts) + AutoDiscoveryCITypeRelation.get_by(
-                    ad_type_id=i.type_id, only_query=True).count()
-                result[i.type_id]['exec_target_count'] = len(
-                    set([i.oneagent_id for adt in adts for i in db.session.query(
-                        AutoDiscoveryRuleSyncHistory.oneagent_id).filter(
-                        AutoDiscoveryRuleSyncHistory.adt_id == adt.id)]))
-
-            result[i.type_id]['instance_count'] += 1
-            if i.is_accept:
-                result[i.type_id]['accept_count'] += 1
-
-            if last_month <= i.created_at < this_month:
-                result[i.type_id]['last_month_count'] += 1
-            elif i.created_at >= this_month:
-                result[i.type_id]['this_month_count'] += 1
-
-            if last_week <= i.created_at < this_week:
-                result[i.type_id]['last_week_count'] += 1
-            elif i.created_at >= this_week:
-                result[i.type_id]['this_week_count'] += 1
-
-        for type_id in result:
-            existed = AutoDiscoveryCounter.get_by(type_id=type_id, first=True, to_dict=False)
-            if existed is None:
-                AutoDiscoveryCounter.create(type_id=type_id, **result[type_id])
-            else:
-                existed.update(**result[type_id])
-
-        for i in AutoDiscoveryCounter.get_by(to_dict=False):
-            if i.type_id not in result:
-                i.delete()
-
-    @classmethod
-    def clear_ad_exec_history(cls):
-        ci_types = CIType.get_by(to_dict=False)
-        for ci_type in ci_types:
-            for i in AutoDiscoveryExecHistory.get_by(type_id=ci_type.id, only_query=True).order_by(
-                    AutoDiscoveryExecHistory.id.desc()).offset(50000):
-                i.delete(commit=False)
-            db.session.commit()
+        return result
 
     @classmethod
     def get_adc_counter(cls):

cmdb-api/api/lib/cmdb/ci.py

@@ -223,7 +223,7 @@ class CIManager(object):
     def ci_is_exist(unique_key, unique_value, type_id):
         """
 
-        :param unique_key: is an attribute
+        :param unique_key: is a attribute
         :param unique_value:
         :param type_id:
         :return:
@@ -383,12 +383,12 @@ class CIManager(object):
                     computed_attrs.append(attr.to_dict())
                 elif attr.is_password:
                     if attr.name in ci_dict:
-                        password_dict[attr.id] = (ci_dict.pop(attr.name), attr.is_dynamic)
+                        password_dict[attr.id] = ci_dict.pop(attr.name)
                     elif attr.alias in ci_dict:
-                        password_dict[attr.id] = (ci_dict.pop(attr.alias), attr.is_dynamic)
+                        password_dict[attr.id] = ci_dict.pop(attr.alias)
 
                     if attr.re_check and password_dict.get(attr.id):
-                        value_manager.check_re(attr.re_check, password_dict[attr.id][0])
+                        value_manager.check_re(attr.re_check, password_dict[attr.id])
 
             if computed_attrs:
                 value_manager.handle_ci_compute_attributes(ci_dict, computed_attrs, ci)
@@ -421,8 +421,7 @@ class CIManager(object):
             operate_type = OperateType.UPDATE if ci is not None else OperateType.ADD
             try:
                 ci = ci or CI.create(type_id=ci_type.id, is_auto_discovery=is_auto_discovery)
-                record_id, has_dynamic = value_manager.create_or_update_attr_value(
-                    ci, ci_dict, key2attr, ticket_id=ticket_id)
+                record_id = value_manager.create_or_update_attr_value(ci, ci_dict, key2attr, ticket_id=ticket_id)
             except BadRequest as e:
                 if existed is None:
                     cls.delete(ci.id)
@@ -432,7 +431,7 @@ class CIManager(object):
             for attr_id in password_dict:
                 record_id = cls.save_password(ci.id, attr_id, password_dict[attr_id], record_id, ci_type.id)
 
-        if record_id or has_dynamic:  # has changed
+        if record_id:  # has change
             ci_cache.apply_async(args=(ci.id, operate_type, record_id), queue=CMDB_QUEUE)
 
         if ref_ci_dict:  # add relations
@@ -441,6 +440,7 @@ class CIManager(object):
         return ci.id
 
     def update(self, ci_id, _is_admin=False, ticket_id=None, __sync=False, **ci_dict):
+        current_app.logger.info((ci_id, ci_dict, __sync))
         now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         ci = self.confirm_ci_existed(ci_id)
 
@@ -465,12 +465,12 @@ class CIManager(object):
                 computed_attrs.append(attr.to_dict())
             elif attr.is_password:
                 if attr.name in ci_dict:
-                    password_dict[attr.id] = (ci_dict.pop(attr.name), attr.is_dynamic)
+                    password_dict[attr.id] = ci_dict.pop(attr.name)
                 elif attr.alias in ci_dict:
-                    password_dict[attr.id] = (ci_dict.pop(attr.alias), attr.is_dynamic)
+                    password_dict[attr.id] = ci_dict.pop(attr.alias)
 
                 if attr.re_check and password_dict.get(attr.id):
-                    value_manager.check_re(attr.re_check, password_dict[attr.id][0])
+                    value_manager.check_re(attr.re_check, password_dict[attr.id])
 
         if computed_attrs:
             value_manager.handle_ci_compute_attributes(ci_dict, computed_attrs, ci)
@@ -495,8 +495,7 @@ class CIManager(object):
                             ci_dict.pop(k)
 
             try:
-                record_id, has_dynamic = value_manager.create_or_update_attr_value(
-                    ci, ci_dict, key2attr, ticket_id=ticket_id)
+                record_id = value_manager.create_or_update_attr_value(ci, ci_dict, key2attr, ticket_id=ticket_id)
             except BadRequest as e:
                 raise e
 
@@ -504,25 +503,25 @@ class CIManager(object):
             for attr_id in password_dict:
                 record_id = self.save_password(ci.id, attr_id, password_dict[attr_id], record_id, ci.type_id)
 
-        if record_id or has_dynamic:  # has changed
+        if record_id:  # has change
             if not __sync:
                 ci_cache.apply_async(args=(ci_id, OperateType.UPDATE, record_id), queue=CMDB_QUEUE)
             else:
-                ci_cache(ci_id, OperateType.UPDATE, record_id)
+                ci_cache((ci_id, OperateType.UPDATE, record_id))
 
         ref_ci_dict = {k: v for k, v in ci_dict.items() if k.startswith("$") and "." in k}
         if ref_ci_dict:
             if not __sync:
                 ci_relation_add.apply_async(args=(ref_ci_dict, ci.id), queue=CMDB_QUEUE)
             else:
-                ci_relation_add(ref_ci_dict, ci.id)
+                ci_relation_add((ref_ci_dict, ci.id))
 
     @staticmethod
     def update_unique_value(ci_id, unique_name, unique_value):
         ci = CI.get_by_id(ci_id) or abort(404, ErrFormat.ci_not_found.format("id={}".format(ci_id)))
 
         key2attr = {unique_name: AttributeCache.get(unique_name)}
-        record_id, _ = AttributeValueManager().create_or_update_attr_value(ci, {unique_name: unique_value}, key2attr)
+        record_id = AttributeValueManager().create_or_update_attr_value(ci, {unique_name: unique_value}, key2attr)
 
         ci_cache.apply_async(args=(ci_id, OperateType.UPDATE, record_id), queue=CMDB_QUEUE)
 
@@ -737,7 +736,7 @@ class CIManager(object):
                        fields=None, value_tables=None, unique_required=False, excludes=None):
         """
 
-        :param ci_ids: list of CI instance ID, e.g. ['1', '2']
+        :param ci_ids: list of CI instance ID, eg. ['1', '2']
         :param ret_key: name, id or alias
         :param fields:
         :param value_tables:
@@ -762,7 +761,6 @@ class CIManager(object):
 
     @classmethod
     def save_password(cls, ci_id, attr_id, value, record_id, type_id):
-        value, is_dynamic = value
         changed = None
         encrypt_value = None
         value_table = ValueTypeMap.table[ValueTypeEnum.PASSWORD]
@@ -779,18 +777,14 @@ class CIManager(object):
         if existed is None:
             if value:
                 value_table.create(ci_id=ci_id, attr_id=attr_id, value=encrypt_value)
-                if not is_dynamic:
-                    changed = [(ci_id, attr_id, OperateType.ADD, '', PASSWORD_DEFAULT_SHOW, type_id)]
+                changed = [(ci_id, attr_id, OperateType.ADD, '', PASSWORD_DEFAULT_SHOW, type_id)]
         elif existed.value != encrypt_value:
             if value:
                 existed.update(ci_id=ci_id, attr_id=attr_id, value=encrypt_value)
-                if not is_dynamic:
-                    changed = [(ci_id, attr_id, OperateType.UPDATE, PASSWORD_DEFAULT_SHOW,
-                                PASSWORD_DEFAULT_SHOW, type_id)]
+                changed = [(ci_id, attr_id, OperateType.UPDATE, PASSWORD_DEFAULT_SHOW, PASSWORD_DEFAULT_SHOW, type_id)]
             else:
                 existed.delete()
-                if not is_dynamic:
-                    changed = [(ci_id, attr_id, OperateType.DELETE, PASSWORD_DEFAULT_SHOW, '', type_id)]
+                changed = [(ci_id, attr_id, OperateType.DELETE, PASSWORD_DEFAULT_SHOW, '', type_id)]
 
         if current_app.config.get('SECRETS_ENGINE') == 'vault':
             vault = VaultClient(current_app.config.get('VAULT_URL'), current_app.config.get('VAULT_TOKEN'))
@@ -1096,18 +1090,6 @@ class CIRelationManager(object):
 
         return ci_ids, level2ids
 
-    @classmethod
-    def get_parent_ids(cls, ci_ids):
-        cis = db.session.query(CIRelation.first_ci_id, CIRelation.second_ci_id, CI.type_id).join(
-            CI, CI.id == CIRelation.first_ci_id).filter(
-            CIRelation.second_ci_id.in_(ci_ids)).filter(CIRelation.deleted.is_(False))
-
-        result = {}
-        for ci in cis:
-            result.setdefault(ci.second_ci_id, []).append((ci.first_ci_id, ci.type_id))
-
-        return result
-
     @staticmethod
     def _check_constraint(first_ci_id, first_type_id, second_ci_id, second_type_id, type_relation):
         db.session.commit()
@@ -1280,83 +1262,52 @@ class CIRelationManager(object):
     def build_by_attribute(cls, ci_dict):
         type_id = ci_dict['_type']
         child_items = CITypeRelation.get_by(parent_id=type_id, only_query=True).filter(
-            CITypeRelation.parent_attr_ids.isnot(None))
+            CITypeRelation.parent_attr_id.isnot(None))
         for item in child_items:
-            relations = None
-            for parent_attr_id, child_attr_id in zip(item.parent_attr_ids, item.child_attr_ids):
-                _relations = set()
-                parent_attr = AttributeCache.get(parent_attr_id)
-                child_attr = AttributeCache.get(child_attr_id)
-                attr_value = ci_dict.get(parent_attr.name)
-                value_table = TableMap(attr=child_attr).table
-                for child in value_table.get_by(attr_id=child_attr.id, value=attr_value, only_query=True).join(
-                        CI, CI.id == value_table.ci_id).filter(CI.type_id == item.child_id):
-                    _relations.add((ci_dict['_id'], child.ci_id))
-                if relations is None:
-                    relations = _relations
-                else:
-                    relations &= _relations
-            for parent_ci_id, child_ci_id in (relations or []):
-                CIRelationManager.add(parent_ci_id, child_ci_id, valid=False)
+            parent_attr = AttributeCache.get(item.parent_attr_id)
+            child_attr = AttributeCache.get(item.child_attr_id)
+            attr_value = ci_dict.get(parent_attr.name)
+            value_table = TableMap(attr=child_attr).table
+            for child in value_table.get_by(attr_id=child_attr.id, value=attr_value, only_query=True).join(
+                    CI, CI.id == value_table.ci_id).filter(CI.type_id == item.child_id):
+                CIRelationManager.add(ci_dict['_id'], child.ci_id, valid=False)
 
         parent_items = CITypeRelation.get_by(child_id=type_id, only_query=True).filter(
-            CITypeRelation.child_attr_ids.isnot(None))
+            CITypeRelation.child_attr_id.isnot(None))
         for item in parent_items:
-            relations = None
-            for parent_attr_id, child_attr_id in zip(item.parent_attr_ids, item.child_attr_ids):
-                _relations = set()
-                parent_attr = AttributeCache.get(parent_attr_id)
-                child_attr = AttributeCache.get(child_attr_id)
-                attr_value = ci_dict.get(child_attr.name)
-                value_table = TableMap(attr=parent_attr).table
-                for parent in value_table.get_by(attr_id=parent_attr.id, value=attr_value, only_query=True).join(
-                        CI, CI.id == value_table.ci_id).filter(CI.type_id == item.parent_id):
-                    _relations.add((parent.ci_id, ci_dict['_id']))
-                if relations is None:
-                    relations = _relations
-                else:
-                    relations &= _relations
-            for parent_ci_id, child_ci_id in (relations or []):
-                CIRelationManager.add(parent_ci_id, child_ci_id, valid=False)
+            parent_attr = AttributeCache.get(item.parent_attr_id)
+            child_attr = AttributeCache.get(item.child_attr_id)
+            attr_value = ci_dict.get(child_attr.name)
+            value_table = TableMap(attr=parent_attr).table
+            for parent in value_table.get_by(attr_id=parent_attr.id, value=attr_value, only_query=True).join(
+                    CI, CI.id == value_table.ci_id).filter(CI.type_id == item.parent_id):
+                CIRelationManager.add(parent.ci_id, ci_dict['_id'], valid=False)
 
     @classmethod
     def rebuild_all_by_attribute(cls, ci_type_relation):
-        relations = None
-        for parent_attr_id, child_attr_id in zip(ci_type_relation['parent_attr_ids'] or [],
-                                                 ci_type_relation['child_attr_ids'] or []):
+        parent_attr = AttributeCache.get(ci_type_relation['parent_attr_id'])
+        child_attr = AttributeCache.get(ci_type_relation['child_attr_id'])
+        if not parent_attr or not child_attr:
+            return
 
-            _relations = set()
-            parent_attr = AttributeCache.get(parent_attr_id)
-            child_attr = AttributeCache.get(child_attr_id)
-            if not parent_attr or not child_attr:
-                continue
+        parent_value_table = TableMap(attr=parent_attr).table
+        child_value_table = TableMap(attr=child_attr).table
 
-            parent_value_table = TableMap(attr=parent_attr).table
-            child_value_table = TableMap(attr=child_attr).table
+        parent_values = parent_value_table.get_by(attr_id=parent_attr.id, only_query=True).join(
+            CI, CI.id == parent_value_table.ci_id).filter(CI.type_id == ci_type_relation['parent_id'])
+        child_values = child_value_table.get_by(attr_id=child_attr.id, only_query=True).join(
+            CI, CI.id == child_value_table.ci_id).filter(CI.type_id == ci_type_relation['child_id'])
 
-            parent_values = parent_value_table.get_by(attr_id=parent_attr.id, only_query=True).join(
-                CI, CI.id == parent_value_table.ci_id).filter(CI.type_id == ci_type_relation['parent_id'])
-            child_values = child_value_table.get_by(attr_id=child_attr.id, only_query=True).join(
-                CI, CI.id == child_value_table.ci_id).filter(CI.type_id == ci_type_relation['child_id'])
+        child_value2ci_ids = {}
+        for child in child_values:
+            child_value2ci_ids.setdefault(child.value, []).append(child.ci_id)
 
-            child_value2ci_ids = {}
-            for child in child_values:
-                child_value2ci_ids.setdefault(child.value, []).append(child.ci_id)
-
-            for parent in parent_values:
-                for child_ci_id in child_value2ci_ids.get(parent.value, []):
-                    _relations.add((parent.ci_id, child_ci_id))
-
-            if relations is None:
-                relations = _relations
-            else:
-                relations &= _relations
-
-        for parent_ci_id, child_ci_id in (relations or []):
-            try:
-                cls.add(parent_ci_id, child_ci_id, valid=False)
-            except:
-                pass
+        for parent in parent_values:
+            for child_ci_id in child_value2ci_ids.get(parent.value, []):
+                try:
+                    cls.add(parent.ci_id, child_ci_id, valid=False)
+                except:
+                    pass
 
 
 class CITriggerManager(object):

cmdb-api/api/lib/cmdb/ci_type.py

@@ -35,7 +35,6 @@ from api.lib.perm.acl.acl import validate_permission
 from api.models.cmdb import Attribute
 from api.models.cmdb import AutoDiscoveryCI
 from api.models.cmdb import AutoDiscoveryCIType
-from api.models.cmdb import AutoDiscoveryCITypeRelation
 from api.models.cmdb import CI
 from api.models.cmdb import CIFilterPerms
 from api.models.cmdb import CIType
@@ -55,7 +54,6 @@ from api.models.cmdb import PreferenceSearchOption
 from api.models.cmdb import PreferenceShowAttributes
 from api.models.cmdb import PreferenceTreeView
 from api.models.cmdb import RelationType
-from api.models.cmdb import TopologyView
 
 
 class CITypeManager(object):
@@ -229,9 +227,6 @@ class CITypeManager(object):
         if CI.get_by(type_id=type_id, first=True, to_dict=False) is not None:
             return abort(400, ErrFormat.ci_exists_and_cannot_delete_type)
 
-        if CITypeInheritance.get_by(parent_id=type_id, first=True):
-            return abort(400, ErrFormat.ci_type_inheritance_cannot_delete)
-
         relation_views = PreferenceRelationView.get_by(to_dict=False)
         for rv in relation_views:
             for item in (rv.cr_ids or []):
@@ -255,28 +250,19 @@ class CITypeManager(object):
         for item in AutoDiscoveryCI.get_by(type_id=type_id, to_dict=False):
             item.delete(commit=False)
 
-        for item in AutoDiscoveryCITypeRelation.get_by(ad_type_id=type_id, to_dict=False):
-            item.soft_delete(commit=False)
-
-        for item in AutoDiscoveryCITypeRelation.get_by(peer_type_id=type_id, to_dict=False):
-            item.soft_delete(commit=False)
-
         for item in CITypeInheritance.get_by(parent_id=type_id, to_dict=False):
-            item.soft_delete(commit=False)
+            item.delete(commit=False)
 
         for item in CITypeInheritance.get_by(child_id=type_id, to_dict=False):
-            item.soft_delete(commit=False)
+            item.delete(commit=False)
 
         try:
             from api.models.cmdb import CITypeReconciliation
             for item in CITypeReconciliation.get_by(type_id=type_id, to_dict=False):
-                item.soft_delete(commit=False)
+                item.delete(commit=False)
         except Exception:
             pass
 
-        for item in TopologyView.get_by(central_node_type=type_id, to_dict=False):
-            item.delete(commit=False)
-
         db.session.commit()
 
         ci_type.soft_delete()
@@ -696,19 +682,9 @@ class CITypeAttributeManager(object):
                     item = CITypeTrigger.get_by(type_id=_type_id, attr_id=attr_id, to_dict=False, first=True)
                     item and item.soft_delete(commit=False)
 
-                for item in (CITypeRelation.get_by(parent_id=type_id, to_dict=False) +
-                             CITypeRelation.get_by(child_id=type_id, to_dict=False)):
-                    if item.parent_id == type_id and attr_id in (item.parent_attr_ids or []):
-                        item_dict = item.to_dict()
-                        pop_idx = item.parent_attr_ids.index(attr_id)
-                    elif item.child_id == type_id and attr_id in (item.child_attr_ids or []):
-                        item_dict = item.to_dict()
-                        pop_idx = item.child_attr_ids.index(attr_id)
-                    else:
-                        continue
-                    item.update(parent_attr_ids=item_dict['parent_attr_ids'].pop(pop_idx),
-                                child_attr_ids=item_dict['child_attr_ids'].pop(pop_idx),
-                                commit=False)
+                for item in (CITypeRelation.get_by(parent_id=type_id, parent_attr_id=attr_id, to_dict=False) +
+                             CITypeRelation.get_by(child_id=type_id, child_attr_id=attr_id, to_dict=False)):
+                    item.soft_delete(commit=False)
 
                 db.session.commit()
 
@@ -777,12 +753,10 @@ class CITypeRelationManager(object):
             res[idx] = _item
             res[idx]['parent'] = item.parent.to_dict()
             if item.parent_id not in type2attributes:
-                type2attributes[item.parent_id] = [i[1].to_dict() for i in
-                                                   CITypeAttributeManager.get_all_attributes(item.parent_id)]
+                type2attributes[item.parent_id] = [i[1].to_dict() for i in CITypeAttributesCache.get2(item.parent_id)]
             res[idx]['child'] = item.child.to_dict()
             if item.child_id not in type2attributes:
-                type2attributes[item.child_id] = [i[1].to_dict() for i in
-                                                  CITypeAttributeManager.get_all_attributes(item.child_id)]
+                type2attributes[item.child_id] = [i[1].to_dict() for i in CITypeAttributesCache.get2(item.child_id)]
             res[idx]['relation_type'] = item.relation_type.to_dict()
 
         return res, type2attributes
@@ -817,8 +791,8 @@ class CITypeRelationManager(object):
 
         ci_type_dict["relation_type"] = relation_inst.relation_type.name
         ci_type_dict["constraint"] = relation_inst.constraint
-        ci_type_dict["parent_attr_ids"] = relation_inst.parent_attr_ids
-        ci_type_dict["child_attr_ids"] = relation_inst.child_attr_ids
+        ci_type_dict["parent_attr_id"] = relation_inst.parent_attr_id
+        ci_type_dict["child_attr_id"] = relation_inst.child_attr_id
 
         return ci_type_dict
 
@@ -851,72 +825,6 @@ class CITypeRelationManager(object):
 
         return [cls._wrap_relation_type_dict(parent.parent_id, parent) for parent in parents]
 
-    @staticmethod
-    def get_relations_by_type_id(type_id):
-        nodes, edges = [], []
-        node_ids, edge_tuples = set(), set()
-        ci_type = CITypeCache.get(type_id)
-        if ci_type is None:
-            return nodes, edges
-
-        ci_type_dict = ci_type.to_dict()
-        ci_type_dict.setdefault('level', [0])
-        nodes.append(ci_type_dict)
-        node_ids.add(ci_type.id)
-
-        def _find(_id, lv):
-            lv += 1
-            for i in CITypeRelation.get_by(parent_id=_id, to_dict=False):
-                if i.child_id not in node_ids:
-                    node_ids.add(i.child_id)
-                    node = i.child.to_dict()
-                    node.setdefault('level', []).append(lv)
-                    nodes.append(node)
-
-                    edges.append(dict(from_id=i.parent_id, to_id=i.child_id, text=i.relation_type.name, reverse=False))
-                    edge_tuples.add((i.parent_id, i.child_id))
-
-                    _find(i.child_id, lv)
-                    continue
-                elif (i.parent_id, i.child_id) not in edge_tuples:
-                    edges.append(dict(from_id=i.parent_id, to_id=i.child_id, text=i.relation_type.name, reverse=False))
-                    edge_tuples.add((i.parent_id, i.child_id))
-                    _find(i.child_id, lv)
-
-                for _node in nodes:
-                    if _node['id'] == i.child_id and lv not in _node['level']:
-                        _node['level'].append(lv)
-
-        def _reverse_find(_id, lv):
-            lv -= 1
-            for i in CITypeRelation.get_by(child_id=_id, to_dict=False):
-                if i.parent_id not in node_ids:
-                    node_ids.add(i.parent_id)
-                    node = i.parent.to_dict()
-                    node.setdefault('level', []).append(lv)
-                    nodes.append(node)
-
-                    edges.append(dict(from_id=i.parent_id, to_id=i.child_id, text=i.relation_type.name, reverse=True))
-                    edge_tuples.add((i.parent_id, i.child_id))
-
-                    _reverse_find(i.parent_id, lv)
-                    continue
-                elif (i.parent_id, i.child_id) not in edge_tuples:
-                    edges.append(dict(from_id=i.parent_id, to_id=i.child_id, text=i.relation_type.name, reverse=True))
-                    edge_tuples.add((i.parent_id, i.child_id))
-                    _reverse_find(i.parent_id, lv)
-
-                for _node in nodes:
-                    if _node['id'] == i.child_id and lv not in _node['level']:
-                        _node['level'].append(lv)
-
-        level = 0
-        _reverse_find(ci_type.id, level)
-        level = 0
-        _find(ci_type.id, level)
-
-        return nodes, edges
-
     @staticmethod
     def _get(parent_id, child_id):
         return CITypeRelation.get_by(parent_id=parent_id,
@@ -930,7 +838,7 @@ class CITypeRelationManager(object):
 
     @classmethod
     def add(cls, parent, child, relation_type_id, constraint=ConstraintEnum.One2Many,
-            parent_attr_ids=None, child_attr_ids=None):
+            parent_attr_id=None, child_attr_id=None):
         p = CITypeManager.check_is_existed(parent)
         c = CITypeManager.check_is_existed(child)
 
@@ -945,22 +853,21 @@ class CITypeRelationManager(object):
             current_app.logger.warning(str(e))
             return abort(400, ErrFormat.circular_dependency_error)
 
-        old_parent_attr_ids, old_child_attr_ids = None, None
+        old_parent_attr_id = None
         existed = cls._get(p.id, c.id)
         if existed is not None:
-            old_parent_attr_ids = copy.deepcopy(existed.parent_attr_ids)
-            old_child_attr_ids = copy.deepcopy(existed.child_attr_ids)
+            old_parent_attr_id = existed.parent_attr_id
             existed = existed.update(relation_type_id=relation_type_id,
                                      constraint=constraint,
-                                     parent_attr_ids=parent_attr_ids,
-                                     child_attr_ids=child_attr_ids,
+                                     parent_attr_id=parent_attr_id,
+                                     child_attr_id=child_attr_id,
                                      filter_none=False)
         else:
             existed = CITypeRelation.create(parent_id=p.id,
                                             child_id=c.id,
                                             relation_type_id=relation_type_id,
-                                            parent_attr_ids=parent_attr_ids,
-                                            child_attr_ids=child_attr_ids,
+                                            parent_attr_id=parent_attr_id,
+                                            child_attr_id=child_attr_id,
                                             constraint=constraint)
 
             if current_app.config.get("USE_ACL"):
@@ -974,10 +881,10 @@ class CITypeRelationManager(object):
                                                     current_user.username,
                                                     ResourceTypeEnum.CI_TYPE_RELATION)
 
-        if ((parent_attr_ids and parent_attr_ids != old_parent_attr_ids) or
-                (child_attr_ids and child_attr_ids != old_child_attr_ids)):
-            from api.tasks.cmdb import rebuild_relation_for_attribute_changed
-            rebuild_relation_for_attribute_changed.apply_async(args=(existed.to_dict(),))
+        if parent_attr_id and parent_attr_id != old_parent_attr_id:
+            if parent_attr_id and parent_attr_id != existed.parent_attr_id:
+                from api.tasks.cmdb import rebuild_relation_for_attribute_changed
+                rebuild_relation_for_attribute_changed.apply_async(args=(existed.to_dict()))
 
         CITypeHistoryManager.add(CITypeOperateType.ADD_RELATION, p.id,
                                  change=dict(parent=p.to_dict(), child=c.to_dict(), relation_type_id=relation_type_id))
@@ -1271,8 +1178,8 @@ class CITypeTemplateManager(object):
                                                  id2obj_dicts[added_id].get('child_id'),
                                                  id2obj_dicts[added_id].get('relation_type_id'),
                                                  id2obj_dicts[added_id].get('constraint'),
-                                                 id2obj_dicts[added_id].get('parent_attr_ids'),
-                                                 id2obj_dicts[added_id].get('child_attr_ids'),
+                                                 id2obj_dicts[added_id].get('parent_attr_id'),
+                                                 id2obj_dicts[added_id].get('child_attr_id'),
                                                  )
             else:
                 obj = cls.create(flush=True, **id2obj_dicts[added_id])

cmdb-api/api/lib/cmdb/const.py

@@ -55,9 +55,9 @@ class CITypeOperateType(BaseEnum):
     DELETE_UNIQUE_CONSTRAINT = "11"  # 删除联合唯一
     ADD_RELATION = "12"  # 新增关系
     DELETE_RELATION = "13"  # 删除关系
-    ADD_RECONCILIATION = "14"  # 新增数据合规
-    UPDATE_RECONCILIATION = "15"  # 修改数据合规
-    DELETE_RECONCILIATION = "16"  # 删除数据合规
+    ADD_RECONCILIATION = "14"  # 删除关系
+    UPDATE_RECONCILIATION = "15"  # 删除关系
+    DELETE_RECONCILIATION = "16"  # 删除关系
 
 
 class RetKey(BaseEnum):
@@ -73,7 +73,6 @@ class ResourceTypeEnum(BaseEnum):
     RELATION_VIEW = "RelationView"  # read/update/delete/grant
     CI_FILTER = "CIFilter"  # read
     PAGE = "page"  # read
-    TOPOLOGY_VIEW = "TopologyView"  # read/update/delete/grant
 
 
 class PermEnum(BaseEnum):

cmdb-api/api/lib/cmdb/history.py

@@ -13,7 +13,6 @@ from api.lib.cmdb.const import OperateType
 from api.lib.cmdb.perms import CIFilterPermsCRUD
 from api.lib.cmdb.resp_format import ErrFormat
 from api.lib.perm.acl.cache import UserCache
-from api.models.cmdb import CI
 from api.models.cmdb import Attribute
 from api.models.cmdb import AttributeHistory
 from api.models.cmdb import CIRelationHistory
@@ -307,7 +306,7 @@ class CITriggerHistoryManager(object):
     def get(page, page_size, type_id=None, trigger_id=None, operate_type=None):
         query = CITriggerHistory.get_by(only_query=True)
         if type_id:
-            query = query.join(CI, CI.id == CITriggerHistory.ci_id).filter(CI.type_id == type_id)
+            query = query.filter(CITriggerHistory.type_id == type_id)
 
         if trigger_id:
             query = query.filter(CITriggerHistory.trigger_id == trigger_id)

cmdb-api/api/lib/cmdb/preference.py

@@ -25,15 +25,14 @@ from api.lib.cmdb.resp_format import ErrFormat
 from api.lib.exception import AbortException
 from api.lib.perm.acl.acl import ACLManager
 from api.models.cmdb import CITypeAttribute
-from api.models.cmdb import CITypeGroup
-from api.models.cmdb import CITypeGroupItem
 from api.models.cmdb import CITypeRelation
 from api.models.cmdb import PreferenceCITypeOrder
 from api.models.cmdb import PreferenceRelationView
 from api.models.cmdb import PreferenceSearchOption
 from api.models.cmdb import PreferenceShowAttributes
 from api.models.cmdb import PreferenceTreeView
-
+from api.models.cmdb import CITypeGroup
+from api.models.cmdb import CITypeGroupItem
 
 class PreferenceManager(object):
     pref_attr_cls = PreferenceShowAttributes
@@ -86,6 +85,7 @@ class PreferenceManager(object):
 
         return dict(group_types=group_types, tree_types=tree_types, type_ids=list(type_ids))
 
+
     @staticmethod
     def get_types2(instance=False, tree=False):
         """

cmdb-api/api/lib/cmdb/resp_format.py

@@ -62,7 +62,6 @@ class ErrFormat(CommonErrFormat):
         "The model cannot be deleted because the CI already exists")  # 因为CI已经存在，不能删除模型
     ci_exists_and_cannot_delete_inheritance = _l(
         "The inheritance cannot be deleted because the CI already exists")  # 因为CI已经存在，不能删除继承关系
-    ci_type_inheritance_cannot_delete = _l("The model is inherited and cannot be deleted")  # 该模型被继承, 不能删除
 
     # 因为关系视图 {} 引用了该模型，不能删除模型
     ci_relation_view_exists_and_cannot_delete_type = _l(
@@ -145,8 +144,3 @@ class ErrFormat(CommonErrFormat):
     cron_time_format_invalid = _l("Scheduling time format error")  # 调度时间格式错误
     reconciliation_title = _l("CMDB data reconciliation results")  # CMDB数据合规检查结果
     reconciliation_body = _l("Number of {} illegal: {}")  # "{} 不合规数: {}"
-
-    topology_exists = _l("Topology view {} already exists")  # 拓扑视图 {} 已经存在
-    topology_group_exists = _l("Topology group {} already exists")  # 拓扑视图分组 {} 已经存在
-    # 因为该分组下定义了拓扑视图，不能删除
-    topo_view_exists_cannot_delete_group = _l("The group cannot be deleted because the topology view already exists")

cmdb-api/api/lib/cmdb/search/ci/__init__.py

@@ -17,12 +17,10 @@ def search(query=None,
            count=1,
            sort=None,
            excludes=None,
-           use_id_filter=False,
-           use_ci_filter=True):
+           use_id_filter=False):
     if current_app.config.get("USE_ES"):
         s = SearchFromES(query, fl, facet, page, ret_key, count, sort)
     else:
-        s = SearchFromDB(query, fl, facet, page, ret_key, count, sort, excludes=excludes,
-                         use_id_filter=use_id_filter, use_ci_filter=use_ci_filter)
+        s = SearchFromDB(query, fl, facet, page, ret_key, count, sort, excludes=excludes, use_id_filter=use_id_filter)
 
     return s

cmdb-api/api/lib/cmdb/search/ci/db/search.py

@@ -70,7 +70,6 @@ class Search(object):
         self.valid_type_names = []
         self.type2filter_perms = dict()
         self.is_app_admin = is_app_admin('cmdb') or current_user.username == "worker"
-        self.is_app_admin = self.is_app_admin or (not self.use_ci_filter and not self.use_id_filter)
 
     @staticmethod
     def _operator_proc(key):

cmdb-api/api/lib/cmdb/topology.py

@@ -1,251 +0,0 @@
-# -*- coding:utf-8 -*-
-
-import json
-
-from flask import abort
-from flask import current_app
-from flask_login import current_user
-from werkzeug.exceptions import BadRequest
-
-from api.extensions import rd
-from api.lib.cmdb.cache import AttributeCache
-from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.ci import CIRelationManager
-from api.lib.cmdb.ci_type import CITypeRelationManager
-from api.lib.cmdb.const import REDIS_PREFIX_CI_RELATION
-from api.lib.cmdb.const import ResourceTypeEnum
-from api.lib.cmdb.resp_format import ErrFormat
-from api.lib.cmdb.search import SearchError
-from api.lib.cmdb.search.ci import search as ci_search
-from api.lib.perm.acl.acl import ACLManager
-from api.lib.perm.acl.acl import is_app_admin
-from api.models.cmdb import TopologyView
-from api.models.cmdb import TopologyViewGroup
-
-
-class TopologyViewManager(object):
-    group_cls = TopologyViewGroup
-    cls = TopologyView
-
-    @classmethod
-    def get_name_by_id(cls, _id):
-        res = cls.cls.get_by_id(_id)
-        return res and res.name
-
-    def get_view_by_id(self, _id):
-        res = self.cls.get_by_id(_id)
-
-        return res and res.to_dict() or {}
-
-    @classmethod
-    def add_group(cls, name, order):
-        if order is None:
-            cur_max_order = cls.group_cls.get_by(only_query=True).order_by(cls.group_cls.order.desc()).first()
-            cur_max_order = cur_max_order and cur_max_order.order or 0
-            order = cur_max_order + 1
-
-        cls.group_cls.get_by(name=name, first=True, to_dict=False) and abort(
-            400, ErrFormat.topology_group_exists.format(name))
-
-        return cls.group_cls.create(name=name, order=order)
-
-    def update_group(self, group_id, name, view_ids):
-        existed = self.group_cls.get_by_id(group_id) or abort(404, ErrFormat.not_found)
-        if name is not None and name != existed.name:
-            existed.update(name=name)
-
-        for idx, view_id in enumerate(view_ids):
-            view = self.cls.get_by_id(view_id)
-            if view is not None:
-                view.update(group_id=group_id, order=idx)
-
-        return existed.to_dict()
-
-    @classmethod
-    def delete_group(cls, _id):
-        existed = cls.group_cls.get_by_id(_id) or abort(404, ErrFormat.not_found)
-
-        if cls.cls.get_by(group_id=_id, first=True):
-            return abort(400, ErrFormat.topo_view_exists_cannot_delete_group)
-
-        existed.soft_delete()
-
-    @classmethod
-    def group_order(cls, group_ids):
-        for idx, group_id in enumerate(group_ids):
-            group = cls.group_cls.get_by_id(group_id)
-            group.update(order=idx + 1)
-
-    @classmethod
-    def add(cls, name, group_id, option, order=None, **kwargs):
-        cls.cls.get_by(name=name, first=True) and abort(400, ErrFormat.topology_exists.format(name))
-        if order is None:
-            cur_max_order = cls.cls.get_by(group_id=group_id, only_query=True).order_by(
-                cls.cls.order.desc()).first()
-            cur_max_order = cur_max_order and cur_max_order.order or 0
-            order = cur_max_order + 1
-
-        inst = cls.cls.create(name=name, group_id=group_id, option=option, order=order, **kwargs).to_dict()
-        if current_app.config.get('USE_ACL'):
-            try:
-                ACLManager().add_resource(name, ResourceTypeEnum.TOPOLOGY_VIEW)
-            except BadRequest:
-                pass
-
-            ACLManager().grant_resource_to_role(name,
-                                                current_user.username,
-                                                ResourceTypeEnum.TOPOLOGY_VIEW)
-
-        return inst
-
-    @classmethod
-    def update(cls, _id, **kwargs):
-        existed = cls.cls.get_by_id(_id) or abort(404, ErrFormat.not_found)
-        existed_name = existed.name
-
-        inst = existed.update(filter_none=False, **kwargs).to_dict()
-        if current_app.config.get('USE_ACL') and existed_name != kwargs.get('name') and kwargs.get('name'):
-            try:
-                ACLManager().update_resource(existed_name, kwargs['name'], ResourceTypeEnum.TOPOLOGY_VIEW)
-            except BadRequest:
-                pass
-
-        return inst
-
-    @classmethod
-    def delete(cls, _id):
-        existed = cls.cls.get_by_id(_id) or abort(404, ErrFormat.not_found)
-
-        existed.soft_delete()
-        if current_app.config.get("USE_ACL"):
-            ACLManager().del_resource(existed.name, ResourceTypeEnum.TOPOLOGY_VIEW)
-
-    @classmethod
-    def group_inner_order(cls, _ids):
-        for idx, _id in enumerate(_ids):
-            topology = cls.cls.get_by_id(_id)
-            topology.update(order=idx + 1)
-
-    @classmethod
-    def get_all(cls):
-        resources = None
-        if current_app.config.get('USE_ACL') and not is_app_admin('cmdb'):
-            resources = set([i.get('name') for i in ACLManager().get_resources(ResourceTypeEnum.TOPOLOGY_VIEW)])
-
-        groups = cls.group_cls.get_by(to_dict=True)
-        groups = sorted(groups, key=lambda x: x['order'])
-        group2pos = {group['id']: idx for idx, group in enumerate(groups)}
-
-        topo_views = sorted(cls.cls.get_by(to_dict=True), key=lambda x: x['order'])
-        other_group = dict(views=[])
-        for view in topo_views:
-            if resources is not None and view['name'] not in resources:
-                continue
-
-            if view['group_id']:
-                groups[group2pos[view['group_id']]].setdefault('views', []).append(view)
-            else:
-                other_group['views'].append(view)
-
-        if other_group['views']:
-            groups.append(other_group)
-
-        return groups
-
-    @staticmethod
-    def relation_from_ci_type(type_id):
-        nodes, edges = CITypeRelationManager.get_relations_by_type_id(type_id)
-
-        return dict(nodes=nodes, edges=edges)
-
-    def topology_view(self, view_id=None, preview=None):
-        if view_id is not None:
-            view = self.cls.get_by_id(view_id) or abort(404, ErrFormat.not_found)
-            central_node_type, central_node_instances, path = (view.central_node_type,
-                                                               view.central_node_instances, view.path)
-        else:
-            central_node_type = preview.get('central_node_type')
-            central_node_instances = preview.get('central_node_instances')
-            path = preview.get('path')
-
-        nodes, links = [], []
-        _type = CITypeCache.get(central_node_type)
-        if not _type:
-            return dict(nodes=nodes, links=links)
-        type2meta = {_type.id: _type.icon}
-        root_ids = []
-        show_key = AttributeCache.get(_type.show_id or _type.unique_id)
-
-        q = (central_node_instances[2:] if central_node_instances.startswith('q=') else
-             central_node_instances)
-        s = ci_search(q, fl=['_id', show_key.name], use_id_filter=False, use_ci_filter=False, count=1000000)
-        try:
-            response, _, _, _, _, _ = s.search()
-        except SearchError as e:
-            current_app.logger.info(e)
-            return dict(nodes=nodes, links=links)
-        for i in response:
-            root_ids.append(i['_id'])
-            nodes.append(dict(id=str(i['_id']), name=i[show_key.name], type_id=central_node_type))
-        if not root_ids:
-            return dict(nodes=nodes, links=links)
-
-        prefix = REDIS_PREFIX_CI_RELATION
-        key = list(map(str, root_ids))
-        id2node = {}
-        for level in sorted([i for i in path.keys() if int(i) > 0]):
-            type_ids = {int(i) for i in path[level]}
-
-            res = [json.loads(x).items() for x in [i or '{}' for i in rd.get(key, prefix) or []]]
-            new_key = []
-            for idx, from_id in enumerate(key):
-                for to_id, type_id in res[idx]:
-                    if type_id in type_ids:
-                        links.append({'from': from_id, 'to': to_id})
-                        id2node[to_id] = {'id': to_id, 'type_id': type_id}
-                        new_key.append(to_id)
-                        if type_id not in type2meta:
-                            type2meta[type_id] = CITypeCache.get(type_id).icon
-
-            key = new_key
-
-        ci_ids = list(map(int, root_ids))
-        for level in sorted([i for i in path.keys() if int(i) < 0]):
-            type_ids = {int(i) for i in path[level]}
-            res = CIRelationManager.get_parent_ids(ci_ids)
-            _ci_ids = []
-            for to_id in res:
-                for from_id, type_id in res[to_id]:
-                    if type_id in type_ids:
-                        from_id, to_id = str(from_id), str(to_id)
-                        links.append({'from': from_id, 'to': to_id})
-                        id2node[from_id] = {'id': str(from_id), 'type_id': type_id}
-                        _ci_ids.append(from_id)
-                        if type_id not in type2meta:
-                            type2meta[type_id] = CITypeCache.get(type_id).icon
-
-            ci_ids = _ci_ids
-
-        fl = set()
-        type_ids = {t for lv in path if lv != '0' for t in path[lv]}
-        type2show = {}
-        for type_id in type_ids:
-            ci_type = CITypeCache.get(type_id)
-            if ci_type:
-                attr = AttributeCache.get(ci_type.show_id or ci_type.unique_id)
-                if attr:
-                    fl.add(attr.name)
-                    type2show[type_id] = attr.name
-
-        if id2node:
-            s = ci_search("_id:({})".format(';'.join(id2node.keys())), fl=list(fl),
-                       use_id_filter=False, use_ci_filter=False, count=1000000)
-            try:
-                response, _, _, _, _, _ = s.search()
-            except SearchError:
-                return dict(nodes=nodes, links=links)
-            for i in response:
-                id2node[str(i['_id'])]['name'] = i[type2show[str(i['_type'])]]
-            nodes.extend(id2node.values())
-
-        return dict(nodes=nodes, links=links, type2meta=type2meta)

cmdb-api/api/lib/cmdb/value.py

@@ -266,7 +266,6 @@ class AttributeValueManager(object):
         :return:
         """
         changed = []
-        has_dynamic = False
         for key, value in ci_dict.items():
             attr = key2attr.get(key)
             if not attr:
@@ -290,16 +289,10 @@ class AttributeValueManager(object):
                 for idx in range(index, len(existed_attrs)):
                     existed_attr = existed_attrs[idx]
                     existed_attr.delete(flush=False, commit=False)
-                    if not attr.is_dynamic:
-                        changed.append((ci.id, attr.id, OperateType.DELETE, existed_values[idx], None, ci.type_id))
-                    else:
-                        has_dynamic = True
+                    changed.append((ci.id, attr.id, OperateType.DELETE, existed_values[idx], None, ci.type_id))
                 for idx in range(index, len(value)):
                     value_table.create(ci_id=ci.id, attr_id=attr.id, value=value[idx], flush=False, commit=False)
-                    if not attr.is_dynamic:
-                        changed.append((ci.id, attr.id, OperateType.ADD, None, value[idx], ci.type_id))
-                    else:
-                        has_dynamic = True
+                    changed.append((ci.id, attr.id, OperateType.ADD, None, value[idx], ci.type_id))
             else:
                 existed_attr = value_table.get_by(attr_id=attr.id, ci_id=ci.id, first=True, to_dict=False)
                 existed_value = existed_attr and existed_attr.value
@@ -308,10 +301,7 @@ class AttributeValueManager(object):
                 if existed_value is None and value is not None:
                     value_table.create(ci_id=ci.id, attr_id=attr.id, value=value, flush=False, commit=False)
 
-                    if not attr.is_dynamic:
-                        changed.append((ci.id, attr.id, OperateType.ADD, None, value, ci.type_id))
-                    else:
-                        has_dynamic = True
+                    changed.append((ci.id, attr.id, OperateType.ADD, None, value, ci.type_id))
                 else:
                     if existed_value != value and existed_attr:
                         if value is None:
@@ -319,22 +309,16 @@ class AttributeValueManager(object):
                         else:
                             existed_attr.update(value=value, flush=False, commit=False)
 
-                        if not attr.is_dynamic:
-                            changed.append((ci.id, attr.id, OperateType.UPDATE, existed_value, value, ci.type_id))
-                        else:
-                            has_dynamic = True
+                        changed.append((ci.id, attr.id, OperateType.UPDATE, existed_value, value, ci.type_id))
 
-        if changed or has_dynamic:
-            try:
-                db.session.commit()
-            except Exception as e:
-                db.session.rollback()
-                current_app.logger.warning(str(e))
-                return abort(400, ErrFormat.attribute_value_unknown_error.format(e.args[0]))
+        try:
+            db.session.commit()
+        except Exception as e:
+            db.session.rollback()
+            current_app.logger.warning(str(e))
+            return abort(400, ErrFormat.attribute_value_unknown_error.format(e.args[0]))
 
-            return self.write_change2(changed, ticket_id=ticket_id), has_dynamic
-        else:
-            return None, has_dynamic
+        return self.write_change2(changed, ticket_id=ticket_id)
 
     @staticmethod
     def delete_attr_value(attr_id, ci_id, commit=True):

cmdb-api/api/lib/common_setting/decorator.py

@@ -3,7 +3,6 @@ import functools
 from flask import abort, session
 from api.lib.common_setting.acl import ACLManager
 from api.lib.common_setting.resp_format import ErrFormat
-from api.lib.perm.acl.acl import is_app_admin
 
 
 def perms_role_required(app_name, resource_type_name, resource_name, perm, role_name=None):
@@ -17,7 +16,7 @@ def perms_role_required(app_name, resource_type_name, resource_name, perm, role_
             except Exception as e:
                 # resource_type not exist, continue check role
                 if role_name:
-                    if role_name not in session.get("acl", {}).get("parentRoles", []) and not is_app_admin(app_name):
+                    if role_name not in session.get("acl", {}).get("parentRoles", []):
                         abort(403, ErrFormat.role_required.format(role_name))
 
                     return func(*args, **kwargs)
@@ -26,7 +25,7 @@ def perms_role_required(app_name, resource_type_name, resource_name, perm, role_
 
             if not has_perms:
                 if role_name:
-                    if role_name not in session.get("acl", {}).get("parentRoles", []) and not is_app_admin(app_name):
+                    if role_name not in session.get("acl", {}).get("parentRoles", []):
                         abort(403, ErrFormat.role_required.format(role_name))
                 else:
                     abort(403, ErrFormat.resource_no_permission.format(resource_name, perm))

cmdb-api/api/lib/common_setting/role_perm_base.py

@@ -48,12 +48,7 @@ class CMDBApp(BaseApp):
         {"page": "Model_Relationships", "page_cn": "模型关系", "perms": ["read"]},
         {"page": "Operation_Audit", "page_cn": "操作审计", "perms": ["read"]},
         {"page": "Relationship_Types", "page_cn": "关系类型", "perms": ["read"]},
-        {"page": "Auto_Discovery", "page_cn": "自动发现", "perms": ["read", "create_plugin", "update_plugin", "delete_plugin"]},
-        {"page": "TopologyView", "page_cn": "拓扑视图",
-         "perms": ["read", "create_topology_group", "update_topology_group", "delete_topology_group",
-                   "create_topology_view"],
-         },
-    ]
+        {"page": "Auto_Discovery", "page_cn": "自动发现", "perms": ["read"]}]
 
     def __init__(self):
         super().__init__()

cmdb-api/api/lib/mixin.py

@@ -8,8 +8,6 @@ from api.extensions import db
 from api.lib.utils import get_page
 from api.lib.utils import get_page_size
 
-__author__ = 'pycook'
-
 
 class DBMixin(object):
     cls = None
@@ -19,18 +17,13 @@ class DBMixin(object):
         page = get_page(page)
         page_size = get_page_size(page_size)
         if fl is None:
-            query = db.session.query(cls.cls)
+            query = db.session.query(cls.cls).filter(cls.cls.deleted.is_(False))
         else:
-            query = db.session.query(*[getattr(cls.cls, i) for i in fl])
+            query = db.session.query(*[getattr(cls.cls, i) for i in fl]).filter(cls.cls.deleted.is_(False))
 
         _query = None
         if count_query:
-            _query = db.session.query(func.count(cls.cls.id))
-
-        if hasattr(cls.cls, 'deleted'):
-            query = query.filter(cls.cls.deleted.is_(False))
-            if _query:
-                _query = _query.filter(cls.cls.deleted.is_(False))
+            _query = db.session.query(func.count(cls.cls.id)).filter(cls.cls.deleted.is_(False))
 
         for k in kwargs:
             if hasattr(cls.cls, k):

cmdb-api/api/lib/perm/acl/cache.py

@@ -3,9 +3,9 @@
 
 import msgpack
 import redis_lock
+from flask import current_app
 
 from api.extensions import cache
-from api.extensions import db
 from api.extensions import rd
 from api.lib.decorator import flush_db
 from api.models.acl import App
@@ -161,7 +161,6 @@ class RoleRelationCache(object):
     def get_parent_ids(cls, rid, app_id, force=False):
         parent_ids = cache.get(cls.PREFIX_PARENT.format(rid, app_id))
         if not parent_ids or force:
-            db.session.commit()
             from api.lib.perm.acl.role import RoleRelationCRUD
             parent_ids = RoleRelationCRUD.get_parent_ids(rid, app_id)
             cache.set(cls.PREFIX_PARENT.format(rid, app_id), parent_ids, timeout=0)
@@ -172,7 +171,6 @@ class RoleRelationCache(object):
     def get_child_ids(cls, rid, app_id, force=False):
         child_ids = cache.get(cls.PREFIX_CHILDREN.format(rid, app_id))
         if not child_ids or force:
-            db.session.commit()
             from api.lib.perm.acl.role import RoleRelationCRUD
             child_ids = RoleRelationCRUD.get_child_ids(rid, app_id)
             cache.set(cls.PREFIX_CHILDREN.format(rid, app_id), child_ids, timeout=0)
@@ -189,7 +187,6 @@ class RoleRelationCache(object):
         """
         resources = cache.get(cls.PREFIX_RESOURCES.format(rid, app_id))
         if not resources or force:
-            db.session.commit()
             from api.lib.perm.acl.role import RoleCRUD
             resources = RoleCRUD.get_resources(rid, app_id)
             if resources['id2perms'] or resources['group2perms']:
@@ -201,7 +198,6 @@ class RoleRelationCache(object):
     def get_resources2(cls, rid, app_id, force=False):
         r_g = cache.get(cls.PREFIX_RESOURCES2.format(rid, app_id))
         if not r_g or force:
-            db.session.commit()
             res = cls.get_resources(rid, app_id)
             id2perms = res['id2perms']
             group2perms = res['group2perms']

cmdb-api/api/lib/perm/acl/permission.py

@@ -79,8 +79,7 @@ class PermissionCRUD(object):
         return r and cls.get_all(r.id)
 
     @staticmethod
-    def grant(rid, perms, resource_id=None, group_id=None, rebuild=True,
-              source=AuditOperateSource.acl, force_update=False):
+    def grant(rid, perms, resource_id=None, group_id=None, rebuild=True, source=AuditOperateSource.acl):
         app_id = None
         rt_id = None
 
@@ -107,23 +106,8 @@ class PermissionCRUD(object):
             if not perms:
                 perms = [i.get('name') for i in ResourceTypeCRUD.get_perms(group.resource_type_id)]
 
-        if force_update:
-            revoke_role_permissions = []
-            existed_perms = RolePermission.get_by(rid=rid,
-                                                  app_id=app_id,
-                                                  group_id=group_id,
-                                                  resource_id=resource_id,
-                                                  to_dict=False)
-            for role_perm in existed_perms:
-                perm = PermissionCache.get(role_perm.perm_id, rt_id)
-                if perm and perm.name not in perms:
-                    role_perm.soft_delete()
-                    revoke_role_permissions.append(role_perm)
-
-            AuditCRUD.add_permission_log(app_id, AuditOperateType.revoke, rid, rt_id,
-                                         revoke_role_permissions, source=source)
-
         _role_permissions = []
+
         for _perm in set(perms):
             perm = PermissionCache.get(_perm, rt_id)
             if not perm:

cmdb-api/api/lib/perm/acl/resource.py

@@ -315,12 +315,9 @@ class ResourceCRUD(object):
         return resource
 
     @staticmethod
-    def delete(_id, rebuild=True, app_id=None):
+    def delete(_id, rebuild=True):
         resource = Resource.get_by_id(_id) or abort(404, ErrFormat.resource_not_found.format("id={}".format(_id)))
 
-        if app_id is not None and resource.app_id != app_id:
-            return abort(404, ErrFormat.resource_not_found.format("id={}".format(_id)))
-
         origin = resource.to_dict()
         resource.soft_delete()
 

cmdb-api/api/lib/perm/acl/role.py

@@ -154,19 +154,19 @@ class RoleRelationCRUD(object):
                 if existed:
                     continue
 
-                if parent_id in cls.recursive_child_ids(child_id, app_id):
-                    return abort(400, ErrFormat.inheritance_dead_loop)
-
-                result.append(RoleRelation.create(parent_id=parent_id, child_id=child_id, app_id=app_id).to_dict())
-
                 RoleRelationCache.clean(parent_id, app_id)
                 RoleRelationCache.clean(child_id, app_id)
 
+                if parent_id in cls.recursive_child_ids(child_id, app_id):
+                    return abort(400, ErrFormat.inheritance_dead_loop)
+
                 if app_id is None:
                     for app in AppCRUD.get_all():
                         if app.name != "acl":
                             RoleRelationCache.clean(child_id, app.id)
 
+                result.append(RoleRelation.create(parent_id=parent_id, child_id=child_id, app_id=app_id).to_dict())
+
         AuditCRUD.add_role_log(app_id, AuditOperateType.role_relation_add,
                                AuditScope.role_relation, role.id, {}, {},
                                {'child_ids': list(child_ids), 'parent_ids': [parent_id], }

cmdb-api/api/lib/perm/auth.py

@@ -51,12 +51,12 @@ def _auth_with_key():
     user, authenticated = User.query.authenticate_with_key(key, secret, req_args, path)
     if user and authenticated:
         login_user(user)
-        # reset_session(user)
+        reset_session(user)
         return True
 
     role, authenticated = Role.query.authenticate_with_key(key, secret, req_args, path)
     if role and authenticated:
-        # reset_session(None, role=role.name)
+        reset_session(None, role=role.name)
         return True
 
     return False

cmdb-api/api/lib/resp_format.py

@@ -29,6 +29,6 @@ class CommonErrFormat(object):
 
     role_required = _l("Role {} can only operate!")  # 角色 {} 才能操作!
     user_not_found = _l("User {} does not exist")  # 用户 {} 不存在
-    no_permission = _l("For resource: {}, you do not have {} permission!")  # 您没有资源: {} 的{}权限!
+    no_permission = _l("You do not have {} permission for resource: {}!")  # 您没有资源: {} 的{}权限!
     no_permission2 = _l("You do not have permission to operate!")  # 您没有操作权限!
     no_permission_only_owner = _l("Only the creator or administrator has permission!")  # 只有创建人或者管理员才有权限!

cmdb-api/api/lib/secrets/inner.py

@@ -3,8 +3,8 @@ import os
 import secrets
 import sys
 import threading
-from base64 import b64decode, b64encode
 
+from base64 import b64decode, b64encode
 from Cryptodome.Protocol.SecretSharing import Shamir
 from colorama import Back, Fore, Style, init as colorama_init
 from cryptography.hazmat.backends import default_backend
@@ -30,7 +30,6 @@ seal_status = True
 secrets_encrypt_key = ""
 secrets_root_key = ""
 
-
 def string_to_bytes(value):
     if not value:
         return ""
@@ -79,7 +78,7 @@ class KeyManage:
                 (len(sys.argv) > 1 and sys.argv[1] in ("run", "cmdb-password-data-migrate"))):
 
             self.backend = backend
-            threading.Thread(target=self.watch_root_key, args=(app,), daemon=True).start()
+            threading.Thread(target=self.watch_root_key, args=(app,)).start()
 
             self.trigger = app.config.get("INNER_TRIGGER_TOKEN")
             if not self.trigger:
@@ -413,7 +412,7 @@ class KeyManage:
 class InnerCrypt:
     def __init__(self):
         self.encrypt_key = b64decode(secrets_encrypt_key)
-        # self.encrypt_key = b64decode(secrets_encrypt_key, "".encode("utf-8"))
+        #self.encrypt_key = b64decode(secrets_encrypt_key, "".encode("utf-8"))
 
     def encrypt(self, plaintext):
         """
@@ -491,4 +490,4 @@ if __name__ == "__main__":
     t_ciphertext, status1 = c.encrypt(t_plaintext)
     print("Ciphertext:", t_ciphertext)
     decrypted_plaintext, status2 = c.decrypt(t_ciphertext)
-    print("Decrypted plaintext:", decrypted_plaintext)
+    print("Decrypted plaintext:", decrypted_plaintext)

cmdb-api/api/lib/webhook.py

@@ -88,11 +88,11 @@ def webhook_request(webhook, payload):
 
     params = webhook.get('parameters') or None
     if isinstance(params, dict):
-        params = json.loads(Template(json.dumps(params)).render(payload).encode('utf-8'))
+        params = json.loads(Template(json.dumps(params)).render(payload))
 
     headers = json.loads(Template(json.dumps(webhook.get('headers') or {})).render(payload))
 
-    data = Template(json.dumps(webhook.get('body', ''))).render(payload).encode('utf-8')
+    data = Template(json.dumps(webhook.get('body', ''))).render(payload)
     auth = _wrap_auth(**webhook.get('authorization', {}))
 
     if (webhook.get('authorization', {}).get("type") or '').lower() == 'oauth2.0':

cmdb-api/api/models/cmdb.py

@@ -79,11 +79,8 @@ class CITypeRelation(Model):
     relation_type_id = db.Column(db.Integer, db.ForeignKey("c_relation_types.id"), nullable=False)
     constraint = db.Column(db.Enum(*ConstraintEnum.all()), default=ConstraintEnum.One2Many)
 
-    parent_attr_id = db.Column(db.Integer, db.ForeignKey("c_attributes.id"))  # CMDB > 2.4.5: deprecated
-    child_attr_id = db.Column(db.Integer, db.ForeignKey("c_attributes.id"))  # CMDB > 2.4.5: deprecated
-
-    parent_attr_ids = db.Column(db.JSON)  # [parent_attr_id, ]
-    child_attr_ids = db.Column(db.JSON)  # [child_attr_id, ]
+    parent_attr_id = db.Column(db.Integer, db.ForeignKey("c_attributes.id"))
+    child_attr_id = db.Column(db.Integer, db.ForeignKey("c_attributes.id"))
 
     parent = db.relationship("CIType", primaryjoin="CIType.id==CITypeRelation.parent_id")
     child = db.relationship("CIType", primaryjoin="CIType.id==CITypeRelation.child_id")
@@ -104,7 +101,6 @@ class Attribute(Model):
     is_link = db.Column(db.Boolean, default=False)
     is_password = db.Column(db.Boolean, default=False)
     is_sortable = db.Column(db.Boolean, default=False)
-    is_dynamic = db.Column(db.Boolean, default=False)
 
     default = db.Column(db.JSON)  # {"default": None}
 
@@ -213,26 +209,6 @@ class CITriggerHistory(Model):
     webhook = db.Column(db.Text)
 
 
-class TopologyViewGroup(Model):
-    __tablename__ = 'c_topology_view_groups'
-
-    name = db.Column(db.String(64), index=True)
-    order = db.Column(db.Integer, default=0)
-
-
-class TopologyView(Model):
-    __tablename__ = 'c_topology_views'
-
-    name = db.Column(db.String(64), index=True)
-    group_id = db.Column(db.Integer, db.ForeignKey('c_topology_view_groups.id'))
-    category = db.Column(db.String(32))
-    central_node_type = db.Column(db.Integer)
-    central_node_instances = db.Column(db.Text)
-    path = db.Column(db.JSON)
-    order = db.Column(db.Integer, default=0)
-    option = db.Column(db.JSON)
-
-
 class CITypeUniqueConstraint(Model):
     __tablename__ = "c_c_t_u_c"
 
@@ -566,29 +542,20 @@ class AutoDiscoveryCIType(Model):
 
     attributes = db.Column(db.JSON)  # {ad_key: cmdb_key}
 
-    relation = db.Column(db.JSON)  # [{ad_key: {type_id: x, attr_id: x}}], CMDB > 2.4.5: deprecated
+    relation = db.Column(db.JSON)  # [{ad_key: {type_id: x, attr_id: x}}]
 
     auto_accept = db.Column(db.Boolean, default=False)
 
     agent_id = db.Column(db.String(8), index=True)
     query_expr = db.Column(db.Text)
 
-    interval = db.Column(db.Integer)  # seconds, > 2.4.5: deprecated
+    interval = db.Column(db.Integer)  # seconds
     cron = db.Column(db.String(128))
 
     extra_option = db.Column(db.JSON)
     uid = db.Column(db.Integer, index=True)
 
 
-class AutoDiscoveryCITypeRelation(Model):
-    __tablename__ = "c_ad_ci_type_relations"
-
-    ad_type_id = db.Column(db.Integer, db.ForeignKey('c_ci_types.id'), nullable=False)
-    ad_key = db.Column(db.String(128))
-    peer_type_id = db.Column(db.Integer, db.ForeignKey('c_ci_types.id'), nullable=False)
-    peer_attr_id = db.Column(db.Integer, db.ForeignKey('c_attributes.id'), nullable=False)
-
-
 class AutoDiscoveryCI(Model):
     __tablename__ = "c_ad_ci"
 
@@ -604,36 +571,6 @@ class AutoDiscoveryCI(Model):
     accept_time = db.Column(db.DateTime)
 
 
-class AutoDiscoveryRuleSyncHistory(Model2):
-    __tablename__ = "c_ad_rule_sync_histories"
-
-    adt_id = db.Column(db.Integer, db.ForeignKey('c_ad_ci_types.id'))
-    oneagent_id = db.Column(db.String(8))
-    oneagent_name = db.Column(db.String(64))
-    sync_at = db.Column(db.DateTime, default=datetime.datetime.now())
-
-
-class AutoDiscoveryExecHistory(Model2):
-    __tablename__ = "c_ad_exec_histories"
-
-    type_id = db.Column(db.Integer, index=True)
-    stdout = db.Column(db.Text)
-
-
-class AutoDiscoveryCounter(Model2):
-    __tablename__ = "c_ad_counter"
-
-    type_id = db.Column(db.Integer, index=True)
-    rule_count = db.Column(db.Integer, default=0)
-    exec_target_count = db.Column(db.Integer, default=0)
-    instance_count = db.Column(db.Integer, default=0)
-    accept_count = db.Column(db.Integer, default=0)
-    this_month_count = db.Column(db.Integer, default=0)
-    this_week_count = db.Column(db.Integer, default=0)
-    last_month_count = db.Column(db.Integer, default=0)
-    last_week_count = db.Column(db.Integer, default=0)
-
-
 class CIFilterPerms(Model):
     __tablename__ = "c_ci_filter_perms"
 

cmdb-api/api/tasks/cmdb.py

@@ -2,7 +2,6 @@
 
 
 import json
-import datetime
 
 import redis_lock
 from flask import current_app
@@ -26,8 +25,6 @@ from api.lib.utils import handle_arg_list
 from api.models.cmdb import CI
 from api.models.cmdb import CIRelation
 from api.models.cmdb import CITypeAttribute
-from api.models.cmdb import AutoDiscoveryCI
-from api.models.cmdb import AutoDiscoveryCIType
 
 
 @celery.task(name="cmdb.ci_cache", queue=CMDB_QUEUE)
@@ -90,13 +87,6 @@ def ci_delete(ci_id):
     else:
         rd.delete(ci_id, REDIS_PREFIX_CI)
 
-    instance = AutoDiscoveryCI.get_by(ci_id=ci_id, to_dict=False, first=True)
-    if instance is not None:
-        adt = AutoDiscoveryCIType.get_by_id(instance.adt_id)
-        if adt:
-            adt.update(updated_at=datetime.datetime.now())
-        instance.delete()
-
     current_app.logger.info("{0} delete..........".format(ci_id))
 
 
@@ -123,17 +113,18 @@ def ci_delete_trigger(trigger, operate_type, ci_dict):
 @reconnect_db
 def ci_relation_cache(parent_id, child_id, ancestor_ids):
     with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id)):
-        children = rd.get([parent_id], REDIS_PREFIX_CI_RELATION)[0]
-        children = json.loads(children) if children is not None else {}
+        if ancestor_ids is None:
+            children = rd.get([parent_id], REDIS_PREFIX_CI_RELATION)[0]
+            children = json.loads(children) if children is not None else {}
 
-        cr = CIRelation.get_by(first_ci_id=parent_id, second_ci_id=child_id, ancestor_ids=ancestor_ids,
-                               first=True, to_dict=False)
-        if str(child_id) not in children:
-            children[str(child_id)] = cr.second_ci.type_id
+            cr = CIRelation.get_by(first_ci_id=parent_id, second_ci_id=child_id, ancestor_ids=ancestor_ids,
+                                   first=True, to_dict=False)
+            if str(child_id) not in children:
+                children[str(child_id)] = cr.second_ci.type_id
 
-        rd.create_or_update({parent_id: json.dumps(children)}, REDIS_PREFIX_CI_RELATION)
+            rd.create_or_update({parent_id: json.dumps(children)}, REDIS_PREFIX_CI_RELATION)
 
-        if ancestor_ids is not None:
+        else:
             key = "{},{}".format(ancestor_ids, parent_id)
             grandson = rd.get([key], REDIS_PREFIX_CI_RELATION2)[0]
             grandson = json.loads(grandson) if grandson is not None else {}
@@ -200,15 +191,16 @@ def ci_relation_add(parent_dict, child_id, uid):
 @reconnect_db
 def ci_relation_delete(parent_id, child_id, ancestor_ids):
     with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id)):
-        children = rd.get([parent_id], REDIS_PREFIX_CI_RELATION)[0]
-        children = json.loads(children) if children is not None else {}
+        if ancestor_ids is None:
+            children = rd.get([parent_id], REDIS_PREFIX_CI_RELATION)[0]
+            children = json.loads(children) if children is not None else {}
 
-        if str(child_id) in children:
-            children.pop(str(child_id))
+            if str(child_id) in children:
+                children.pop(str(child_id))
 
-        rd.create_or_update({parent_id: json.dumps(children)}, REDIS_PREFIX_CI_RELATION)
+            rd.create_or_update({parent_id: json.dumps(children)}, REDIS_PREFIX_CI_RELATION)
 
-        if ancestor_ids is not None:
+        else:
             key = "{},{}".format(ancestor_ids, parent_id)
             grandson = rd.get([key], REDIS_PREFIX_CI_RELATION2)[0]
             grandson = json.loads(grandson) if grandson is not None else {}
@@ -259,21 +251,3 @@ def calc_computed_attribute(attr_id, uid):
         cis = CI.get_by(type_id=i.type_id, to_dict=False)
         for ci in cis:
             cim.update(ci.id, {})
-
-
-@celery.task(name="cmdb.write_ad_rule_sync_history", queue=CMDB_QUEUE)
-@reconnect_db
-def write_ad_rule_sync_history(rules, oneagent_id, oneagent_name, sync_at):
-    from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryRuleSyncHistoryCRUD
-
-    for rule in rules:
-        AutoDiscoveryRuleSyncHistoryCRUD().upsert(adt_id=rule['id'],
-                                                  oneagent_id=oneagent_id,
-                                                  oneagent_name=oneagent_name,
-                                                  sync_at=sync_at,
-                                                  commit=False)
-    try:
-        db.session.commit()
-    except Exception as e:
-        current_app.logger.error("write auto discovery rule sync history failed: {}".format(e))
-        db.session.rollback()

cmdb-api/api/translations/zh/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-06-20 19:12+0800\n"
+"POT-Creation-Date: 2024-03-29 10:42+0800\n"
 "PO-Revision-Date: 2023-12-25 20:21+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: zh\n"
@@ -81,7 +81,7 @@ msgid "User {} does not exist"
 msgstr "用户 {} 不存在"
 
 #: api/lib/resp_format.py:32
-msgid "For resource: {}, you do not have {} permission!"
+msgid "You do not have {} permission for resource: {}!"
 msgstr "您没有资源: {} 的{}权限!"
 
 #: api/lib/resp_format.py:33
@@ -238,248 +238,212 @@ msgstr "因为CI已经存在，不能删除模型"
 msgid "The inheritance cannot be deleted because the CI already exists"
 msgstr "因为CI已经存在，不能删除继承关系"
 
-#: api/lib/cmdb/resp_format.py:65
-msgid "The model is inherited and cannot be deleted"
-msgstr "该模型被继承, 不能删除"
-
-#: api/lib/cmdb/resp_format.py:68
+#: api/lib/cmdb/resp_format.py:67
 msgid ""
 "The model cannot be deleted because the model is referenced by the "
 "relational view {}"
 msgstr "因为关系视图 {} 引用了该模型，不能删除模型"
 
-#: api/lib/cmdb/resp_format.py:70
+#: api/lib/cmdb/resp_format.py:69
 msgid "Model group {} does not exist"
 msgstr "模型分组 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:71
+#: api/lib/cmdb/resp_format.py:70
 msgid "Model group {} already exists"
 msgstr "模型分组 {} 已经存在"
 
-#: api/lib/cmdb/resp_format.py:72
+#: api/lib/cmdb/resp_format.py:71
 msgid "Model relationship {} does not exist"
 msgstr "模型关系 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:73
+#: api/lib/cmdb/resp_format.py:72
 msgid "Attribute group {} already exists"
 msgstr "属性分组 {} 已存在"
 
-#: api/lib/cmdb/resp_format.py:74
+#: api/lib/cmdb/resp_format.py:73
 msgid "Attribute group {} does not exist"
 msgstr "属性分组 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:76
+#: api/lib/cmdb/resp_format.py:75
 msgid "Attribute group <{0}> - attribute <{1}> does not exist"
 msgstr "属性组<{0}> - 属性<{1}> 不存在"
 
-#: api/lib/cmdb/resp_format.py:77
+#: api/lib/cmdb/resp_format.py:76
 msgid "The unique constraint already exists!"
 msgstr "唯一约束已经存在!"
 
-#: api/lib/cmdb/resp_format.py:79
+#: api/lib/cmdb/resp_format.py:78
 msgid "Uniquely constrained attributes cannot be JSON and multi-valued"
 msgstr "唯一约束的属性不能是 JSON 和 多值"
 
-#: api/lib/cmdb/resp_format.py:80
+#: api/lib/cmdb/resp_format.py:79
 msgid "Duplicated trigger"
 msgstr "重复的触发器"
 
-#: api/lib/cmdb/resp_format.py:81
+#: api/lib/cmdb/resp_format.py:80
 msgid "Trigger {} does not exist"
 msgstr "触发器 {} 不存在"
 
 #: api/lib/cmdb/resp_format.py:82
-msgid "Duplicated reconciliation rule"
-msgstr ""
-
-#: api/lib/cmdb/resp_format.py:83
-msgid "Reconciliation rule {} does not exist"
-msgstr "关系类型 {} 不存在"
-
-#: api/lib/cmdb/resp_format.py:85
 msgid "Operation record {} does not exist"
 msgstr "操作记录 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:86
+#: api/lib/cmdb/resp_format.py:83
 msgid "Unique identifier cannot be deleted"
 msgstr "不能删除唯一标识"
 
-#: api/lib/cmdb/resp_format.py:87
+#: api/lib/cmdb/resp_format.py:84
 msgid "Cannot delete default sorted attributes"
 msgstr "不能删除默认排序的属性"
 
-#: api/lib/cmdb/resp_format.py:89
+#: api/lib/cmdb/resp_format.py:86
 msgid "No node selected"
 msgstr "没有选择节点"
 
-#: api/lib/cmdb/resp_format.py:90
+#: api/lib/cmdb/resp_format.py:87
 msgid "This search option does not exist!"
 msgstr "该搜索选项不存在!"
 
-#: api/lib/cmdb/resp_format.py:91
+#: api/lib/cmdb/resp_format.py:88
 msgid "This search option has a duplicate name!"
 msgstr "该搜索选项命名重复!"
 
-#: api/lib/cmdb/resp_format.py:93
+#: api/lib/cmdb/resp_format.py:90
 msgid "Relationship type {} already exists"
 msgstr "关系类型 {} 已经存在"
 
-#: api/lib/cmdb/resp_format.py:94
+#: api/lib/cmdb/resp_format.py:91
 msgid "Relationship type {} does not exist"
 msgstr "关系类型 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:96
+#: api/lib/cmdb/resp_format.py:93
 msgid "Invalid attribute value: {}"
 msgstr "无效的属性值: {}"
 
-#: api/lib/cmdb/resp_format.py:97
+#: api/lib/cmdb/resp_format.py:94
 msgid "{} Invalid value: {}"
 msgstr "{} 无效的值: {}"
 
-#: api/lib/cmdb/resp_format.py:98
+#: api/lib/cmdb/resp_format.py:95
 msgid "{} is not in the predefined values"
 msgstr "{} 不在预定义值里"
 
-#: api/lib/cmdb/resp_format.py:100
+#: api/lib/cmdb/resp_format.py:97
 msgid "The value of attribute {} must be unique, {} already exists"
 msgstr "属性 {} 的值必须是唯一的, 当前值 {} 已存在"
 
-#: api/lib/cmdb/resp_format.py:101
+#: api/lib/cmdb/resp_format.py:98
 msgid "Attribute {} value must exist"
 msgstr "属性 {} 值必须存在"
 
-#: api/lib/cmdb/resp_format.py:102
+#: api/lib/cmdb/resp_format.py:99
 msgid "Out of range value, the maximum value is 2147483647"
 msgstr "超过最大值限制, 最大值是2147483647"
 
-#: api/lib/cmdb/resp_format.py:104
+#: api/lib/cmdb/resp_format.py:101
 msgid "Unknown error when adding or modifying attribute value: {}"
 msgstr "新增或者修改属性值未知错误: {}"
 
-#: api/lib/cmdb/resp_format.py:106
+#: api/lib/cmdb/resp_format.py:103
 msgid "Duplicate custom name"
 msgstr "订制名重复"
 
-#: api/lib/cmdb/resp_format.py:108
+#: api/lib/cmdb/resp_format.py:105
 msgid "Number of models exceeds limit: {}"
 msgstr "模型数超过限制: {}"
 
-#: api/lib/cmdb/resp_format.py:109
+#: api/lib/cmdb/resp_format.py:106
 msgid "The number of CIs exceeds the limit: {}"
 msgstr "CI数超过限制: {}"
 
-#: api/lib/cmdb/resp_format.py:111
+#: api/lib/cmdb/resp_format.py:108
 msgid "Auto-discovery rule: {} already exists!"
 msgstr "自动发现规则: {} 已经存在!"
 
-#: api/lib/cmdb/resp_format.py:112
+#: api/lib/cmdb/resp_format.py:109
 msgid "Auto-discovery rule: {} does not exist!"
 msgstr "自动发现规则: {} 不存在!"
 
-#: api/lib/cmdb/resp_format.py:114
+#: api/lib/cmdb/resp_format.py:111
 msgid "This auto-discovery rule is referenced by the model and cannot be deleted!"
 msgstr "该自动发现规则被模型引用, 不能删除!"
 
-#: api/lib/cmdb/resp_format.py:116
+#: api/lib/cmdb/resp_format.py:113
 msgid "The application of auto-discovery rules cannot be defined repeatedly!"
 msgstr "自动发现规则的应用不能重复定义!"
 
-#: api/lib/cmdb/resp_format.py:117
+#: api/lib/cmdb/resp_format.py:114
 msgid "The auto-discovery you want to modify: {} does not exist!"
 msgstr "您要修改的自动发现: {} 不存在!"
 
-#: api/lib/cmdb/resp_format.py:118
+#: api/lib/cmdb/resp_format.py:115
 msgid "Attribute does not include unique identifier: {}"
 msgstr "属性字段没有包括唯一标识: {}"
 
-#: api/lib/cmdb/resp_format.py:119
+#: api/lib/cmdb/resp_format.py:116
 msgid "The auto-discovery instance does not exist!"
 msgstr "自动发现的实例不存在!"
 
-#: api/lib/cmdb/resp_format.py:120
+#: api/lib/cmdb/resp_format.py:117
 msgid "The model is not associated with this auto-discovery!"
 msgstr "模型并未关联该自动发现!"
 
-#: api/lib/cmdb/resp_format.py:121
+#: api/lib/cmdb/resp_format.py:118
 msgid "Only the creator can modify the Secret!"
 msgstr "只有创建人才能修改Secret!"
 
-#: api/lib/cmdb/resp_format.py:123
+#: api/lib/cmdb/resp_format.py:120
 msgid "This rule already has auto-discovery instances and cannot be deleted!"
 msgstr "该规则已经有自动发现的实例, 不能被删除!"
 
-#: api/lib/cmdb/resp_format.py:125
+#: api/lib/cmdb/resp_format.py:122
 msgid "The default auto-discovery rule is already referenced by model {}!"
 msgstr "该默认的自动发现规则 已经被模型 {} 引用!"
 
-#: api/lib/cmdb/resp_format.py:127
+#: api/lib/cmdb/resp_format.py:124
 msgid "The unique_key method must return a non-empty string!"
 msgstr "unique_key方法必须返回非空字符串!"
 
-#: api/lib/cmdb/resp_format.py:128
+#: api/lib/cmdb/resp_format.py:125
 msgid "The attributes method must return a list"
 msgstr "attributes方法必须返回的是list"
 
-#: api/lib/cmdb/resp_format.py:130
+#: api/lib/cmdb/resp_format.py:127
 msgid "The list returned by the attributes method cannot be empty!"
 msgstr "attributes方法返回的list不能为空!"
 
-#: api/lib/cmdb/resp_format.py:132
+#: api/lib/cmdb/resp_format.py:129
 msgid "Only administrators can define execution targets as: all nodes!"
 msgstr "只有管理员才可以定义执行机器为: 所有节点!"
 
-#: api/lib/cmdb/resp_format.py:133
+#: api/lib/cmdb/resp_format.py:130
 msgid "Execute targets permission check failed: {}"
 msgstr "执行机器权限检查不通过: {}"
 
-#: api/lib/cmdb/resp_format.py:135
+#: api/lib/cmdb/resp_format.py:132
 msgid "CI filter authorization must be named!"
 msgstr "CI过滤授权 必须命名!"
 
-#: api/lib/cmdb/resp_format.py:136
+#: api/lib/cmdb/resp_format.py:133
 msgid "CI filter authorization is currently not supported or query"
 msgstr "CI过滤授权 暂时不支持 或 查询"
 
-#: api/lib/cmdb/resp_format.py:139
+#: api/lib/cmdb/resp_format.py:136
 msgid "You do not have permission to operate attribute {}!"
 msgstr "您没有属性 {} 的操作权限!"
 
-#: api/lib/cmdb/resp_format.py:140
+#: api/lib/cmdb/resp_format.py:137
 msgid "You do not have permission to operate this CI!"
 msgstr "您没有该CI的操作权限!"
 
-#: api/lib/cmdb/resp_format.py:142
+#: api/lib/cmdb/resp_format.py:139
 msgid "Failed to save password: {}"
 msgstr "保存密码失败: {}"
 
-#: api/lib/cmdb/resp_format.py:143
+#: api/lib/cmdb/resp_format.py:140
 msgid "Failed to get password: {}"
 msgstr "获取密码失败: {}"
 
-#: api/lib/cmdb/resp_format.py:145
-msgid "Scheduling time format error"
-msgstr "{}格式错误，应该为：%Y-%m-%d %H:%M:%S"
-
-#: api/lib/cmdb/resp_format.py:146
-msgid "CMDB data reconciliation results"
-msgstr ""
-
-#: api/lib/cmdb/resp_format.py:147
-msgid "Number of {} illegal: {}"
-msgstr ""
-
-#: api/lib/cmdb/resp_format.py:149
-msgid "Topology view {} already exists"
-msgstr "拓扑视图 {} 已经存在"
-
-#: api/lib/cmdb/resp_format.py:150
-msgid "Topology group {} already exists"
-msgstr "拓扑视图分组 {} 已经存在"
-
-#: api/lib/cmdb/resp_format.py:152
-msgid "The group cannot be deleted because the topology view already exists"
-msgstr "因为该分组下定义了拓扑视图，不能删除"
-
 #: api/lib/common_setting/resp_format.py:8
 msgid "Company info already existed"
 msgstr "公司信息已存在,无法创建!"
@@ -736,10 +700,6 @@ msgstr "LDAP测试用户名必填"
 msgid "Company wide"
 msgstr "全公司"
 
-#: api/lib/common_setting/resp_format.py:84
-msgid "No permission to access resource {}, perm {} "
-msgstr "您没有资源: {} 的 {} 权限"
-
 #: api/lib/perm/acl/resp_format.py:9
 msgid "login successful"
 msgstr "登录成功"

cmdb-api/api/views/cmdb/auto_discovery.py

@@ -1,7 +1,6 @@
 # -*- coding:utf-8 -*-
-import copy
+
 import json
-import uuid
 from io import BytesIO
 
 from flask import abort
@@ -11,19 +10,15 @@ from flask_login import current_user
 
 from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryCICRUD
 from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryCITypeCRUD
-from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryCITypeRelationCRUD
-from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryCounterCRUD
-from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryExecHistoryCRUD
 from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryHTTPManager
 from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryRuleCRUD
-from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryRuleSyncHistoryCRUD
 from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoverySNMPManager
 from api.lib.cmdb.auto_discovery.const import DEFAULT_HTTP
 from api.lib.cmdb.const import PermEnum
 from api.lib.cmdb.const import ResourceTypeEnum
 from api.lib.cmdb.resp_format import ErrFormat
 from api.lib.cmdb.search import SearchError
-from api.lib.cmdb.search.ci import search as ci_search
+from api.lib.cmdb.search.ci import search
 from api.lib.decorator import args_required
 from api.lib.decorator import args_validate
 from api.lib.perm.acl.acl import has_perm_from_args
@@ -42,19 +37,14 @@ class AutoDiscoveryRuleView(APIView):
 
         rebuild = False
         exists = {i['name'] for i in res}
-        for i in copy.deepcopy(DEFAULT_HTTP):
+        for i in DEFAULT_HTTP:
             if i['name'] not in exists:
-                i.pop('en', None)
                 AutoDiscoveryRuleCRUD().add(**i)
                 rebuild = True
 
         if rebuild:
             _, res = AutoDiscoveryRuleCRUD.search(page=1, page_size=100000, **request.values)
 
-        for i in res:
-            if i['type'] == 'http':
-                i['resources'] = AutoDiscoveryHTTPManager().get_resources(i['name'])
-
         return self.jsonify(res)
 
     @args_required("name", value_required=True)
@@ -108,8 +98,7 @@ class AutoDiscoveryRuleTemplateFileView(APIView):
 
 
 class AutoDiscoveryRuleHTTPView(APIView):
-    url_prefix = ("/adr/http/<string:name>/categories",
-                  "/adr/http/<string:name>/attributes",
+    url_prefix = ("/adr/http/<string:name>/categories", "/adr/http/<string:name>/attributes",
                   "/adr/snmp/<string:name>/attributes")
 
     def get(self, name):
@@ -117,21 +106,16 @@ class AutoDiscoveryRuleHTTPView(APIView):
             return self.jsonify(AutoDiscoverySNMPManager.get_attributes())
 
         if "attributes" in request.url:
-            resource = request.values.get('resource')
-            return self.jsonify(AutoDiscoveryHTTPManager.get_attributes(name, resource))
+            category = request.values.get('category')
+            return self.jsonify(AutoDiscoveryHTTPManager.get_attributes(name, category))
 
         return self.jsonify(AutoDiscoveryHTTPManager.get_categories(name))
 
 
 class AutoDiscoveryCITypeView(APIView):
-    url_prefix = ("/adt/ci_types/<int:type_id>",
-                  "/adt/ci_types/<int:type_id>/attributes",
-                  "/adt/<int:adt_id>")
+    url_prefix = ("/adt/ci_types/<int:type_id>", "/adt/<int:adt_id>")
 
     def get(self, type_id):
-        if "attributes" in request.url:
-            return self.jsonify(AutoDiscoveryCITypeCRUD.get_ad_attributes(type_id))
-
         _, res = AutoDiscoveryCITypeCRUD.search(page=1, page_size=100000, type_id=type_id, **request.values)
         for i in res:
             if isinstance(i.get("extra_option"), dict) and i['extra_option'].get('secret'):
@@ -162,27 +146,6 @@ class AutoDiscoveryCITypeView(APIView):
         return self.jsonify(adt_id=adt_id)
 
 
-class AutoDiscoveryCITypeRelationView(APIView):
-    url_prefix = ("/adt/ci_types/<int:type_id>/relations", "/adt/relations/<int:_id>")
-
-    def get(self, type_id):
-        _, res = AutoDiscoveryCITypeRelationCRUD.search(page=1, page_size=100000, ad_type_id=type_id, **request.values)
-
-        return self.jsonify(res)
-
-    @args_required("relations")
-    def post(self, type_id):
-        return self.jsonify(AutoDiscoveryCITypeRelationCRUD().upsert(type_id, request.values['relations']))
-
-    def put(self):
-        return self.post()
-
-    def delete(self, _id):
-        AutoDiscoveryCITypeRelationCRUD().delete(_id)
-
-        return self.jsonify(id=_id)
-
-
 class AutoDiscoveryCIView(APIView):
     url_prefix = ("/adc", "/adc/<int:adc_id>", "/adc/ci_types/<int:type_id>/attributes", "/adc/ci_types")
 
@@ -257,8 +220,9 @@ class AutoDiscoveryRuleSyncView(APIView):
         oneagent_id = request.values.get('oneagent_id')
         last_update_at = request.values.get('last_update_at')
 
-        query = "oneagent_id:{}".format(oneagent_id)
-        s = ci_search(query)
+        query = "{},oneagent_id:{}".format(oneagent_name, oneagent_id)
+        current_app.logger.info(query)
+        s = search(query)
         try:
             response, _, _, _, _, _ = s.search()
         except SearchError as e:
@@ -266,77 +230,7 @@ class AutoDiscoveryRuleSyncView(APIView):
             current_app.logger.error(traceback.format_exc())
             return abort(400, str(e))
 
-        for res in response:
-            if res.get('{}_name'.format(res['ci_type'])) == oneagent_name or oneagent_name == res.get('oneagent_name'):
-                ci_id = res["_id"]
-                rules, last_update_at = AutoDiscoveryCITypeCRUD.get(ci_id, oneagent_id, oneagent_name, last_update_at)
-
-                return self.jsonify(rules=rules, last_update_at=last_update_at)
-
-        rules, last_update_at = AutoDiscoveryCITypeCRUD.get(None, oneagent_id, oneagent_name, last_update_at)
+        ci_id = response and response[0]["_id"]
+        rules, last_update_at = AutoDiscoveryCITypeCRUD.get(ci_id, oneagent_id, last_update_at)
 
         return self.jsonify(rules=rules, last_update_at=last_update_at)
-
-
-class AutoDiscoveryRuleSyncHistoryView(APIView):
-    url_prefix = ("/adt/<int:adt_id>/sync/histories",)
-
-    def get(self, adt_id):
-        page = get_page(request.values.pop('page', 1))
-        page_size = get_page_size(request.values.pop('page_size', None))
-        numfound, res = AutoDiscoveryRuleSyncHistoryCRUD.search(page=page,
-                                                                page_size=page_size,
-                                                                adt_id=adt_id,
-                                                                **request.values)
-
-        return self.jsonify(page=page,
-                            page_size=page_size,
-                            numfound=numfound,
-                            total=len(res),
-                            result=res)
-
-
-class AutoDiscoveryTestView(APIView):
-    url_prefix = ("/adt/<int:adt_id>/test", "/adt/test/<string:exec_id>/result")
-
-    def get(self, exec_id):
-        return self.jsonify(stdout="1\n2\n3", exec_id=exec_id)
-
-    def post(self, adt_id):
-        return self.jsonify(exec_id=uuid.uuid4().hex)
-
-
-class AutoDiscoveryExecHistoryView(APIView):
-    url_prefix = ("/adc/exec/histories",)
-
-    @args_required('type_id')
-    def get(self):
-        page = get_page(request.values.pop('page', 1))
-        page_size = get_page_size(request.values.pop('page_size', None))
-        numfound, res = AutoDiscoveryExecHistoryCRUD.search(page=page,
-                                                            page_size=page_size,
-                                                            **request.values)
-
-        return self.jsonify(page=page,
-                            page_size=page_size,
-                            numfound=numfound,
-                            total=len(res),
-                            result=res)
-
-    @args_required('type_id')
-    @args_required('stdout')
-    def post(self):
-        AutoDiscoveryExecHistoryCRUD().add(type_id=request.values.get('type_id'),
-                                           stdout=request.values.get('stdout'))
-
-        return self.jsonify(code=200)
-
-
-class AutoDiscoveryCounterView(APIView):
-    url_prefix = ("/adc/counter",)
-
-    @args_required('type_id')
-    def get(self):
-        type_id = request.values.get('type_id')
-
-        return self.jsonify(AutoDiscoveryCounterCRUD().get(type_id))

cmdb-api/api/views/cmdb/ci_type_relation.py

@@ -57,10 +57,10 @@ class CITypeRelationView(APIView):
     def post(self, parent_id, child_id):
         relation_type_id = request.values.get("relation_type_id")
         constraint = request.values.get("constraint")
-        parent_attr_ids = request.values.get("parent_attr_ids")
-        child_attr_ids = request.values.get("child_attr_ids")
+        parent_attr_id = request.values.get("parent_attr_id")
+        child_attr_id = request.values.get("child_attr_id")
         ctr_id = CITypeRelationManager.add(parent_id, child_id, relation_type_id, constraint,
-                                           parent_attr_ids, child_attr_ids)
+                                           parent_attr_id, child_attr_id)
 
         return self.jsonify(ctr_id=ctr_id)
 

cmdb-api/api/views/cmdb/topology.py

@@ -1,178 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from flask import abort
-from flask import request
-
-from api.lib.cmdb.const import PermEnum, ResourceTypeEnum
-from api.lib.cmdb.resp_format import ErrFormat
-from api.lib.cmdb.topology import TopologyViewManager
-from api.lib.common_setting.decorator import perms_role_required
-from api.lib.common_setting.role_perm_base import CMDBApp
-from api.lib.decorator import args_required
-from api.lib.decorator import args_validate
-from api.lib.perm.acl.acl import ACLManager
-from api.lib.perm.acl.acl import has_perm_from_args
-from api.lib.perm.acl.acl import is_app_admin
-from api.resource import APIView
-
-app_cli = CMDBApp()
-
-
-class TopologyGroupView(APIView):
-    url_prefix = ('/topology_views/groups', '/topology_views/groups/<int:group_id>')
-
-    @args_required('name')
-    @args_validate(TopologyViewManager.group_cls)
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.TopologyView,
-                         app_cli.op.create_topology_group, app_cli.admin_name)
-    def post(self):
-        name = request.values.get('name')
-        order = request.values.get('order')
-
-        group = TopologyViewManager.add_group(name, order)
-
-        return self.jsonify(group.to_dict())
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.TopologyView,
-                         app_cli.op.update_topology_group, app_cli.admin_name)
-    def put(self, group_id):
-        name = request.values.get('name')
-        view_ids = request.values.get('view_ids')
-        group = TopologyViewManager().update_group(group_id, name, view_ids)
-
-        return self.jsonify(**group)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.TopologyView,
-                         app_cli.op.delete_topology_group, app_cli.admin_name)
-    def delete(self, group_id):
-        TopologyViewManager.delete_group(group_id)
-
-        return self.jsonify(group_id=group_id)
-
-
-class TopologyGroupOrderView(APIView):
-    url_prefix = ('/topology_views/groups/order',)
-
-    @args_required('group_ids')
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.TopologyView,
-                         app_cli.op.update_topology_group, app_cli.admin_name)
-    def post(self):
-        group_ids = request.values.get('group_ids')
-
-        TopologyViewManager.group_order(group_ids)
-
-        return self.jsonify(group_ids=group_ids)
-
-    def put(self):
-        return self.post()
-
-
-class TopologyView(APIView):
-    url_prefix = ('/topology_views', '/topology_views/relations/ci_types/<int:type_id>', '/topology_views/<int:_id>')
-
-    def get(self, type_id=None, _id=None):
-        if type_id is not None:
-            return self.jsonify(TopologyViewManager.relation_from_ci_type(type_id))
-
-        if _id is not None:
-            return self.jsonify(TopologyViewManager().get_view_by_id(_id))
-
-        return self.jsonify(TopologyViewManager.get_all())
-
-    @args_required('name', 'central_node_type', 'central_node_instances', 'path', 'group_id')
-    @args_validate(TopologyViewManager.cls)
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.TopologyView,
-                         app_cli.op.create_topology_view, app_cli.admin_name)
-    def post(self):
-        name = request.values.pop('name')
-        group_id = request.values.pop('group_id', None)
-        option = request.values.pop('option', None)
-        order = request.values.pop('order', None)
-
-        topo_view = TopologyViewManager.add(name, group_id, option, order, **request.values)
-
-        return self.jsonify(topo_view)
-
-    @args_validate(TopologyViewManager.cls)
-    @has_perm_from_args("_id", ResourceTypeEnum.TOPOLOGY_VIEW, PermEnum.UPDATE, TopologyViewManager.get_name_by_id)
-    def put(self, _id):
-        topo_view = TopologyViewManager.update(_id, **request.values)
-
-        return self.jsonify(topo_view)
-
-    @has_perm_from_args("_id", ResourceTypeEnum.TOPOLOGY_VIEW, PermEnum.DELETE, TopologyViewManager.get_name_by_id)
-    def delete(self, _id):
-        TopologyViewManager.delete(_id)
-
-        return self.jsonify(code=200)
-
-
-class TopologyOrderView(APIView):
-    url_prefix = ('/topology_views/order',)
-
-    @args_required('view_ids')
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.TopologyView,
-                         app_cli.op.create_topology_view, app_cli.admin_name)
-    def post(self):
-        view_ids = request.values.get('view_ids')
-
-        TopologyViewManager.group_inner_order(view_ids)
-
-        return self.jsonify(view_ids=view_ids)
-
-    def put(self):
-        return self.post()
-
-
-class TopologyViewPreview(APIView):
-    url_prefix = ('/topology_views/preview', '/topology_views/<int:_id>/view')
-
-    def get(self, _id=None):
-        if _id is not None:
-            acl = ACLManager('cmdb')
-            resource_name = TopologyViewManager.get_name_by_id(_id)
-            if (not acl.has_permission(resource_name, ResourceTypeEnum.TOPOLOGY_VIEW, PermEnum.READ) and
-                    not is_app_admin('cmdb')):
-                return abort(403, ErrFormat.no_permission.format(resource_name, PermEnum.READ))
-
-            return self.jsonify(TopologyViewManager().topology_view(view_id=_id))
-        else:
-            return self.jsonify(TopologyViewManager().topology_view(preview=request.values))
-
-    def post(self, _id=None):
-        return self.get(_id)
-
-
-class TopologyViewGrantView(APIView):
-    url_prefix = "/topology_views/<int:view_id>/roles/<int:rid>/grant"
-
-    def post(self, view_id, rid):
-        perms = request.values.pop('perms', None)
-
-        view_name = TopologyViewManager.get_name_by_id(view_id) or abort(404, ErrFormat.not_found)
-        acl = ACLManager('cmdb')
-        if not acl.has_permission(view_name, ResourceTypeEnum.TOPOLOGY_VIEW,
-                                  PermEnum.GRANT) and not is_app_admin('cmdb'):
-            return abort(403, ErrFormat.no_permission.format(view_name, PermEnum.GRANT))
-
-        acl.grant_resource_to_role_by_rid(view_name, rid, ResourceTypeEnum.TOPOLOGY_VIEW, perms, rebuild=True)
-
-        return self.jsonify(code=200)
-
-
-class TopologyViewRevokeView(APIView):
-    url_prefix = "/topology_views/<int:view_id>/roles/<int:rid>/revoke"
-
-    @args_required('perms')
-    def post(self, view_id, rid):
-        perms = request.values.pop('perms', None)
-
-        view_name = TopologyViewManager.get_name_by_id(view_id) or abort(404, ErrFormat.not_found)
-        acl = ACLManager('cmdb')
-        if not acl.has_permission(view_name, ResourceTypeEnum.TOPOLOGY_VIEW,
-                                  PermEnum.GRANT) and not is_app_admin('cmdb'):
-            return abort(403, ErrFormat.no_permission.format(view_name, PermEnum.GRANT))
-
-        acl.revoke_resource_from_role_by_rid(view_name, rid, ResourceTypeEnum.TOPOLOGY_VIEW, perms, rebuild=True)
-
-        return self.jsonify(code=200)

cmdb-api/requirements.txt

@@ -1,7 +1,7 @@
 -i https://mirrors.aliyun.com/pypi/simple
 alembic==1.7.7
 bs4==0.0.1
-celery==5.3.1
+celery>=5.3.1
 celery-once==3.0.1
 click==8.1.3
 elasticsearch==7.17.9
@@ -31,7 +31,6 @@ marshmallow==2.20.2
 more-itertools==5.0.0
 msgpack-python==0.5.6
 Pillow>=10.0.1
-pycryptodome==3.12.0
 cryptography>=41.0.2
 PyJWT==2.4.0
 PyMySQL==1.1.0
@@ -54,4 +53,4 @@ shamir~=17.12.0
 pycryptodomex>=3.19.0
 colorama>=0.4.6
 lz4>=4.3.2
-python-magic==0.4.27
+python-magic==0.4.27

cmdb-api/settings.example.py

@@ -20,16 +20,10 @@ DEBUG_TB_INTERCEPT_REDIRECTS = False
 
 ERROR_CODES = [400, 401, 403, 404, 405, 500, 502]
 
-MYSQL_USER = env.str('MYSQL_USER', default='cmdb')
-MYSQL_PASSWORD = env.str('MYSQL_PASSWORD', default='123456')
-MYSQL_HOST = env.str('MYSQL_HOST', default='127.0.0.1')
-MYSQL_PORT = env.int('MYSQL_PORT', default=3306)
-MYSQL_DATABASE = env.str('MYSQL_DATABASE', default='cmdb')
 # # database
-SQLALCHEMY_DATABASE_URI = f'mysql+pymysql://{MYSQL_USER}:{MYSQL_PASSWORD}@' \
-                          f'{MYSQL_HOST}:{MYSQL_PORT}/{MYSQL_DATABASE}?charset=utf8'
+SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://{user}:{password}@127.0.0.1:3306/{db}?charset=utf8'
 SQLALCHEMY_BINDS = {
-    'user': SQLALCHEMY_DATABASE_URI
+    'user': 'mysql+pymysql://{user}:{password}@127.0.0.1:3306/{db}?charset=utf8'
 }
 SQLALCHEMY_ECHO = False
 SQLALCHEMY_TRACK_MODIFICATIONS = False

cmdb-ui/package.json

@@ -39,7 +39,7 @@
     "md5": "^2.2.1",
     "moment": "^2.24.0",
     "nprogress": "^0.2.0",
-    "relation-graph": "^2.1.42",
+    "relation-graph": "^1.1.0",
     "snabbdom": "^3.5.1",
     "sortablejs": "1.9.0",
     "style-resources-loader": "^1.5.0",
@@ -59,7 +59,7 @@
     "vue-template-compiler": "2.6.11",
     "vuedraggable": "^2.23.0",
     "vuex": "^3.1.1",
-    "vxe-table": "3.7.10",
+    "vxe-table": "3.6.9",
     "vxe-table-plugin-export-xlsx": "2.0.0",
     "xe-utils": "3",
     "xlsx": "0.15.0",

cmdb-ui/public/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3857903 */
-  src: url('iconfont.woff2?t=1718872392430') format('woff2'),
-       url('iconfont.woff?t=1718872392430') format('woff'),
-       url('iconfont.ttf?t=1718872392430') format('truetype');
+  src: url('iconfont.woff2?t=1713840593232') format('woff2'),
+       url('iconfont.woff?t=1713840593232') format('woff'),
+       url('iconfont.ttf?t=1713840593232') format('truetype');
 }
 
 .iconfont {
@@ -13,378 +13,6 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.cmdb-manual_warehousing:before {
-  content: "\e95f";
-}
-
-.cmdb-not_warehousing:before {
-  content: "\e95d";
-}
-
-.cmdb-warehousing:before {
-  content: "\e95e";
-}
-
-.cmdb-prompt:before {
-  content: "\e95c";
-}
-
-.cmdb-arrow:before {
-  content: "\e95b";
-}
-
-.cmdb-automatic_inventory:before {
-  content: "\e95a";
-}
-
-.cmdb-week_additions:before {
-  content: "\e959";
-}
-
-.cmdb-month_additions:before {
-  content: "\e958";
-}
-
-.cmdb-rule:before {
-  content: "\e955";
-}
-
-.cmdb-executing_machine:before {
-  content: "\e956";
-}
-
-.cmdb-resource:before {
-  content: "\e957";
-}
-
-.cmdb-discovery_resources:before {
-  content: "\e954";
-}
-
-.cmdb-association:before {
-  content: "\e953";
-}
-
-.ops-is_dynamic-disabled:before {
-  content: "\e952";
-}
-
-.itsm-pdf:before {
-  content: "\e951";
-}
-
-.monitor-sqlserver:before {
-  content: "\e950";
-}
-
-.monitor-dig2:before {
-  content: "\e94d";
-}
-
-.monitor-base2:before {
-  content: "\e94e";
-}
-
-.monitor-foreground1:before {
-  content: "\e94f";
-}
-
-.monitor-log2:before {
-  content: "\e945";
-}
-
-.monitor-backgroud1:before {
-  content: "\e946";
-}
-
-.monitor-port1:before {
-  content: "\e947";
-}
-
-.monitor-ipmi2:before {
-  content: "\e948";
-}
-
-.monitor-process2:before {
-  content: "\e949";
-}
-
-.monitor-snmp2:before {
-  content: "\e94a";
-}
-
-.monitor-performance1:before {
-  content: "\e94b";
-}
-
-.monitor-testing1:before {
-  content: "\e94c";
-}
-
-.monitor-ping2:before {
-  content: "\e941";
-}
-
-.monitor-prometheus:before {
-  content: "\e942";
-}
-
-.monitor-websocket2:before {
-  content: "\e943";
-}
-
-.monitor-traceroute2:before {
-  content: "\e944";
-}
-
-.monitor-port:before {
-  content: "\e93c";
-}
-
-.monitor-base1:before {
-  content: "\e93d";
-}
-
-.monitor-backgroud:before {
-  content: "\e93e";
-}
-
-.monitor-dig1:before {
-  content: "\e93f";
-}
-
-.monitor-foreground:before {
-  content: "\e940";
-}
-
-.monitor-log1:before {
-  content: "\e934";
-}
-
-.monitor-process1:before {
-  content: "\e935";
-}
-
-.monitor-testing:before {
-  content: "\e936";
-}
-
-.monitor-snmp1:before {
-  content: "\e937";
-}
-
-.monitor-performance:before {
-  content: "\e938";
-}
-
-.monitor-traceroute1:before {
-  content: "\e939";
-}
-
-.monitor-ping1:before {
-  content: "\e93a";
-}
-
-.monitor-ipmi1:before {
-  content: "\e93b";
-}
-
-.a-monitor-prometheus1:before {
-  content: "\e932";
-}
-
-.monitor-websocket1:before {
-  content: "\e933";
-}
-
-.monitor-group_expansion1:before {
-  content: "\e930";
-}
-
-.monitor-group_collapse1:before {
-  content: "\e931";
-}
-
-.monitor-group_expansion:before {
-  content: "\e92e";
-}
-
-.monitor-group_collapse:before {
-  content: "\e92f";
-}
-
-.monitor-list_view:before {
-  content: "\e92d";
-}
-
-.monitor-group_view:before {
-  content: "\e92c";
-}
-
-.ops-topology_view:before {
-  content: "\e92b";
-}
-
-.monitor-host_analysis:before {
-  content: "\e92a";
-}
-
-.a-Group427319324:before {
-  content: "\e929";
-}
-
-.monitor-native:before {
-  content: "\e928";
-}
-
-.veops-filter2:before {
-  content: "\e927";
-}
-
-.ops-cmdb-data_companies-selected:before {
-  content: "\e601";
-}
-
-.ops-cmdb-data_companies:before {
-  content: "\e926";
-}
-
-.monitor-threshold_value:before {
-  content: "\e921";
-}
-
-.monitor-disposition:before {
-  content: "\e922";
-}
-
-.monitor-automatic_discovery:before {
-  content: "\e923";
-}
-
-.monitor-grouping_list:before {
-  content: "\e924";
-}
-
-.monitor-node_list:before {
-  content: "\e925";
-}
-
-.monitor-general_view:before {
-  content: "\e920";
-}
-
-.monitor-network_topology:before {
-  content: "\e91b";
-}
-
-.monitor-node_management:before {
-  content: "\e91c";
-}
-
-.monitor-alarm_policy:before {
-  content: "\e91d";
-}
-
-.monitor-alarm:before {
-  content: "\e91e";
-}
-
-.monitor-healing:before {
-  content: "\e91f";
-}
-
-.monitor-data_acquisition:before {
-  content: "\e8d4";
-}
-
-.monitor-analysis:before {
-  content: "\e91a";
-}
-
-.monitor-index:before {
-  content: "\e89b";
-}
-
-.monitor-user_defined:before {
-  content: "\e867";
-}
-
-.monitor-database:before {
-  content: "\e861";
-}
-
-.monitor-common:before {
-  content: "\e865";
-}
-
-.veops-edit:before {
-  content: "\e866";
-}
-
-.veops-empower:before {
-  content: "\e863";
-}
-
-.veops-share:before {
-  content: "\e864";
-}
-
-.veops-export:before {
-  content: "\e862";
-}
-
-.a-veops-import1:before {
-  content: "\e860";
-}
-
-.monitor-ip:before {
-  content: "\e807";
-}
-
-.monitor-director:before {
-  content: "\e803";
-}
-
-.monitor-host:before {
-  content: "\e804";
-}
-
-.a-cmdb-log1:before {
-  content: "\e802";
-}
-
-.monitor-add:before {
-  content: "\e7ff";
-}
-
-.monitor-down:before {
-  content: "\e7fc";
-}
-
-.monitor-up:before {
-  content: "\e7fd";
-}
-
-.itsm-unfold:before {
-  content: "\e7f9";
-}
-
-.itsm-stretch:before {
-  content: "\e7f8";
-}
-
-.monitor-data_comaparison2:before {
-  content: "\e7a1";
-}
-
-.monitor-data_comaparison1:before {
-  content: "\e7f7";
-}
-
-.a-monitor-online1:before {
-  content: "\e7a0";
-}
-
 .ops-setting-application-selected:before {
   content: "\e919";
 }

cmdb-ui/public/iconfont/iconfont.json

@@ -5,657 +5,6 @@
   "css_prefix_text": "",
   "description": "",
   "glyphs": [
-    {
-      "icon_id": "40795271",
-      "name": "cmdb-manual_warehousing",
-      "font_class": "cmdb-manual_warehousing",
-      "unicode": "e95f",
-      "unicode_decimal": 59743
-    },
-    {
-      "icon_id": "40791408",
-      "name": "cmdb-not_warehousing",
-      "font_class": "cmdb-not_warehousing",
-      "unicode": "e95d",
-      "unicode_decimal": 59741
-    },
-    {
-      "icon_id": "40791401",
-      "name": "cmdb-warehousing",
-      "font_class": "cmdb-warehousing",
-      "unicode": "e95e",
-      "unicode_decimal": 59742
-    },
-    {
-      "icon_id": "40731588",
-      "name": "cmdb-prompt",
-      "font_class": "cmdb-prompt",
-      "unicode": "e95c",
-      "unicode_decimal": 59740
-    },
-    {
-      "icon_id": "40722326",
-      "name": "cmdb-arrow",
-      "font_class": "cmdb-arrow",
-      "unicode": "e95b",
-      "unicode_decimal": 59739
-    },
-    {
-      "icon_id": "40711364",
-      "name": "cmdb-automatic_inventory",
-      "font_class": "cmdb-automatic_inventory",
-      "unicode": "e95a",
-      "unicode_decimal": 59738
-    },
-    {
-      "icon_id": "40711409",
-      "name": "cmdb-week_additions",
-      "font_class": "cmdb-week_additions",
-      "unicode": "e959",
-      "unicode_decimal": 59737
-    },
-    {
-      "icon_id": "40711428",
-      "name": "cmdb-month_additions",
-      "font_class": "cmdb-month_additions",
-      "unicode": "e958",
-      "unicode_decimal": 59736
-    },
-    {
-      "icon_id": "40711344",
-      "name": "cmdb-rule",
-      "font_class": "cmdb-rule",
-      "unicode": "e955",
-      "unicode_decimal": 59733
-    },
-    {
-      "icon_id": "40711349",
-      "name": "cmdb-executing_machine",
-      "font_class": "cmdb-executing_machine",
-      "unicode": "e956",
-      "unicode_decimal": 59734
-    },
-    {
-      "icon_id": "40711356",
-      "name": "cmdb-resource",
-      "font_class": "cmdb-resource",
-      "unicode": "e957",
-      "unicode_decimal": 59735
-    },
-    {
-      "icon_id": "40705423",
-      "name": "cmdb-discovery_resources",
-      "font_class": "cmdb-discovery_resources",
-      "unicode": "e954",
-      "unicode_decimal": 59732
-    },
-    {
-      "icon_id": "40701723",
-      "name": "cmdb-association",
-      "font_class": "cmdb-association",
-      "unicode": "e953",
-      "unicode_decimal": 59731
-    },
-    {
-      "icon_id": "40645466",
-      "name": "ops-is_dynamic-disabled",
-      "font_class": "ops-is_dynamic-disabled",
-      "unicode": "e952",
-      "unicode_decimal": 59730
-    },
-    {
-      "icon_id": "40590472",
-      "name": "itsm-pdf",
-      "font_class": "itsm-pdf",
-      "unicode": "e951",
-      "unicode_decimal": 59729
-    },
-    {
-      "icon_id": "40552176",
-      "name": "monitor-sqlserver",
-      "font_class": "monitor-sqlserver",
-      "unicode": "e950",
-      "unicode_decimal": 59728
-    },
-    {
-      "icon_id": "40548499",
-      "name": "monitor-dig",
-      "font_class": "monitor-dig2",
-      "unicode": "e94d",
-      "unicode_decimal": 59725
-    },
-    {
-      "icon_id": "40548507",
-      "name": "monitor-base",
-      "font_class": "monitor-base2",
-      "unicode": "e94e",
-      "unicode_decimal": 59726
-    },
-    {
-      "icon_id": "40548498",
-      "name": "monitor-foreground",
-      "font_class": "monitor-foreground1",
-      "unicode": "e94f",
-      "unicode_decimal": 59727
-    },
-    {
-      "icon_id": "40548504",
-      "name": "monitor-log",
-      "font_class": "monitor-log2",
-      "unicode": "e945",
-      "unicode_decimal": 59717
-    },
-    {
-      "icon_id": "40548508",
-      "name": "monitor-backgroud",
-      "font_class": "monitor-backgroud1",
-      "unicode": "e946",
-      "unicode_decimal": 59718
-    },
-    {
-      "icon_id": "40548502",
-      "name": "monitor-port",
-      "font_class": "monitor-port1",
-      "unicode": "e947",
-      "unicode_decimal": 59719
-    },
-    {
-      "icon_id": "40548501",
-      "name": "monitor-ipmi",
-      "font_class": "monitor-ipmi2",
-      "unicode": "e948",
-      "unicode_decimal": 59720
-    },
-    {
-      "icon_id": "40548511",
-      "name": "monitor-process",
-      "font_class": "monitor-process2",
-      "unicode": "e949",
-      "unicode_decimal": 59721
-    },
-    {
-      "icon_id": "40548506",
-      "name": "monitor-snmp",
-      "font_class": "monitor-snmp2",
-      "unicode": "e94a",
-      "unicode_decimal": 59722
-    },
-    {
-      "icon_id": "40548500",
-      "name": "monitor-performance",
-      "font_class": "monitor-performance1",
-      "unicode": "e94b",
-      "unicode_decimal": 59723
-    },
-    {
-      "icon_id": "40548510",
-      "name": "monitor-testing",
-      "font_class": "monitor-testing1",
-      "unicode": "e94c",
-      "unicode_decimal": 59724
-    },
-    {
-      "icon_id": "40548503",
-      "name": "monitor-ping",
-      "font_class": "monitor-ping2",
-      "unicode": "e941",
-      "unicode_decimal": 59713
-    },
-    {
-      "icon_id": "40548509",
-      "name": "monitor-prometheus",
-      "font_class": "monitor-prometheus",
-      "unicode": "e942",
-      "unicode_decimal": 59714
-    },
-    {
-      "icon_id": "40548505",
-      "name": "monitor-websocket",
-      "font_class": "monitor-websocket2",
-      "unicode": "e943",
-      "unicode_decimal": 59715
-    },
-    {
-      "icon_id": "40548512",
-      "name": "monitor-traceroute",
-      "font_class": "monitor-traceroute2",
-      "unicode": "e944",
-      "unicode_decimal": 59716
-    },
-    {
-      "icon_id": "40548205",
-      "name": "monitor-port",
-      "font_class": "monitor-port",
-      "unicode": "e93c",
-      "unicode_decimal": 59708
-    },
-    {
-      "icon_id": "40548204",
-      "name": "monitor-base",
-      "font_class": "monitor-base1",
-      "unicode": "e93d",
-      "unicode_decimal": 59709
-    },
-    {
-      "icon_id": "40548203",
-      "name": "monitor-backgroud",
-      "font_class": "monitor-backgroud",
-      "unicode": "e93e",
-      "unicode_decimal": 59710
-    },
-    {
-      "icon_id": "40548202",
-      "name": "monitor-dig",
-      "font_class": "monitor-dig1",
-      "unicode": "e93f",
-      "unicode_decimal": 59711
-    },
-    {
-      "icon_id": "40548201",
-      "name": "monitor-foreground",
-      "font_class": "monitor-foreground",
-      "unicode": "e940",
-      "unicode_decimal": 59712
-    },
-    {
-      "icon_id": "40548213",
-      "name": "monitor-log",
-      "font_class": "monitor-log1",
-      "unicode": "e934",
-      "unicode_decimal": 59700
-    },
-    {
-      "icon_id": "40548212",
-      "name": "monitor-process",
-      "font_class": "monitor-process1",
-      "unicode": "e935",
-      "unicode_decimal": 59701
-    },
-    {
-      "icon_id": "40548211",
-      "name": "monitor-testing",
-      "font_class": "monitor-testing",
-      "unicode": "e936",
-      "unicode_decimal": 59702
-    },
-    {
-      "icon_id": "40548210",
-      "name": "monitor-snmp",
-      "font_class": "monitor-snmp1",
-      "unicode": "e937",
-      "unicode_decimal": 59703
-    },
-    {
-      "icon_id": "40548209",
-      "name": "monitor-performance",
-      "font_class": "monitor-performance",
-      "unicode": "e938",
-      "unicode_decimal": 59704
-    },
-    {
-      "icon_id": "40548208",
-      "name": "monitor-traceroute",
-      "font_class": "monitor-traceroute1",
-      "unicode": "e939",
-      "unicode_decimal": 59705
-    },
-    {
-      "icon_id": "40548207",
-      "name": "monitor-ping",
-      "font_class": "monitor-ping1",
-      "unicode": "e93a",
-      "unicode_decimal": 59706
-    },
-    {
-      "icon_id": "40548206",
-      "name": "monitor-ipmi",
-      "font_class": "monitor-ipmi1",
-      "unicode": "e93b",
-      "unicode_decimal": 59707
-    },
-    {
-      "icon_id": "40548217",
-      "name": "monitor-prometheus (1)",
-      "font_class": "a-monitor-prometheus1",
-      "unicode": "e932",
-      "unicode_decimal": 59698
-    },
-    {
-      "icon_id": "40548214",
-      "name": "monitor-websocket",
-      "font_class": "monitor-websocket1",
-      "unicode": "e933",
-      "unicode_decimal": 59699
-    },
-    {
-      "icon_id": "40521692",
-      "name": "monitor-group_expansion",
-      "font_class": "monitor-group_expansion1",
-      "unicode": "e930",
-      "unicode_decimal": 59696
-    },
-    {
-      "icon_id": "40521691",
-      "name": "monitor-group_collapse",
-      "font_class": "monitor-group_collapse1",
-      "unicode": "e931",
-      "unicode_decimal": 59697
-    },
-    {
-      "icon_id": "40520774",
-      "name": "monitor-group_expansion",
-      "font_class": "monitor-group_expansion",
-      "unicode": "e92e",
-      "unicode_decimal": 59694
-    },
-    {
-      "icon_id": "40520787",
-      "name": "monitor-group_collapse",
-      "font_class": "monitor-group_collapse",
-      "unicode": "e92f",
-      "unicode_decimal": 59695
-    },
-    {
-      "icon_id": "40519707",
-      "name": "monitor-list_view",
-      "font_class": "monitor-list_view",
-      "unicode": "e92d",
-      "unicode_decimal": 59693
-    },
-    {
-      "icon_id": "40519711",
-      "name": "monitor-group_view",
-      "font_class": "monitor-group_view",
-      "unicode": "e92c",
-      "unicode_decimal": 59692
-    },
-    {
-      "icon_id": "40499246",
-      "name": "ops-topology_view",
-      "font_class": "ops-topology_view",
-      "unicode": "e92b",
-      "unicode_decimal": 59691
-    },
-    {
-      "icon_id": "40411336",
-      "name": "monitor-host_analysis",
-      "font_class": "monitor-host_analysis",
-      "unicode": "e92a",
-      "unicode_decimal": 59690
-    },
-    {
-      "icon_id": "40372105",
-      "name": "monitor-add2",
-      "font_class": "a-Group427319324",
-      "unicode": "e929",
-      "unicode_decimal": 59689
-    },
-    {
-      "icon_id": "40368097",
-      "name": "monitor-native",
-      "font_class": "monitor-native",
-      "unicode": "e928",
-      "unicode_decimal": 59688
-    },
-    {
-      "icon_id": "40357355",
-      "name": "veops-filter2",
-      "font_class": "veops-filter2",
-      "unicode": "e927",
-      "unicode_decimal": 59687
-    },
-    {
-      "icon_id": "40356229",
-      "name": "ops-cmdb-data_companies-selected",
-      "font_class": "ops-cmdb-data_companies-selected",
-      "unicode": "e601",
-      "unicode_decimal": 58881
-    },
-    {
-      "icon_id": "40343814",
-      "name": "ops-cmdb-data_companies",
-      "font_class": "ops-cmdb-data_companies",
-      "unicode": "e926",
-      "unicode_decimal": 59686
-    },
-    {
-      "icon_id": "40326916",
-      "name": "monitor-threshold_value",
-      "font_class": "monitor-threshold_value",
-      "unicode": "e921",
-      "unicode_decimal": 59681
-    },
-    {
-      "icon_id": "40326913",
-      "name": "monitor-disposition",
-      "font_class": "monitor-disposition",
-      "unicode": "e922",
-      "unicode_decimal": 59682
-    },
-    {
-      "icon_id": "40326911",
-      "name": "monitor-automatic_discovery",
-      "font_class": "monitor-automatic_discovery",
-      "unicode": "e923",
-      "unicode_decimal": 59683
-    },
-    {
-      "icon_id": "40326907",
-      "name": "monitor-grouping_list",
-      "font_class": "monitor-grouping_list",
-      "unicode": "e924",
-      "unicode_decimal": 59684
-    },
-    {
-      "icon_id": "40326906",
-      "name": "monitor-node_list",
-      "font_class": "monitor-node_list",
-      "unicode": "e925",
-      "unicode_decimal": 59685
-    },
-    {
-      "icon_id": "40326667",
-      "name": "monitor-general_view",
-      "font_class": "monitor-general_view",
-      "unicode": "e920",
-      "unicode_decimal": 59680
-    },
-    {
-      "icon_id": "40326683",
-      "name": "monitor-network_topology",
-      "font_class": "monitor-network_topology",
-      "unicode": "e91b",
-      "unicode_decimal": 59675
-    },
-    {
-      "icon_id": "40326682",
-      "name": "monitor-node_management",
-      "font_class": "monitor-node_management",
-      "unicode": "e91c",
-      "unicode_decimal": 59676
-    },
-    {
-      "icon_id": "40326681",
-      "name": "monitor-alarm_policy",
-      "font_class": "monitor-alarm_policy",
-      "unicode": "e91d",
-      "unicode_decimal": 59677
-    },
-    {
-      "icon_id": "40326680",
-      "name": "monitor-alarm",
-      "font_class": "monitor-alarm",
-      "unicode": "e91e",
-      "unicode_decimal": 59678
-    },
-    {
-      "icon_id": "40326679",
-      "name": "monitor-healing",
-      "font_class": "monitor-healing",
-      "unicode": "e91f",
-      "unicode_decimal": 59679
-    },
-    {
-      "icon_id": "40326685",
-      "name": "monitor-data_acquisition",
-      "font_class": "monitor-data_acquisition",
-      "unicode": "e8d4",
-      "unicode_decimal": 59604
-    },
-    {
-      "icon_id": "40326684",
-      "name": "monitor-analysis",
-      "font_class": "monitor-analysis",
-      "unicode": "e91a",
-      "unicode_decimal": 59674
-    },
-    {
-      "icon_id": "40308359",
-      "name": "monitor-index",
-      "font_class": "monitor-index",
-      "unicode": "e89b",
-      "unicode_decimal": 59547
-    },
-    {
-      "icon_id": "40307829",
-      "name": "monitor-user_defined",
-      "font_class": "monitor-user_defined",
-      "unicode": "e867",
-      "unicode_decimal": 59495
-    },
-    {
-      "icon_id": "40307835",
-      "name": "monitor-database",
-      "font_class": "monitor-database",
-      "unicode": "e861",
-      "unicode_decimal": 59489
-    },
-    {
-      "icon_id": "40307833",
-      "name": "monitor-common",
-      "font_class": "monitor-common",
-      "unicode": "e865",
-      "unicode_decimal": 59493
-    },
-    {
-      "icon_id": "40307035",
-      "name": "veops-edit",
-      "font_class": "veops-edit",
-      "unicode": "e866",
-      "unicode_decimal": 59494
-    },
-    {
-      "icon_id": "40307027",
-      "name": "veops-empower",
-      "font_class": "veops-empower",
-      "unicode": "e863",
-      "unicode_decimal": 59491
-    },
-    {
-      "icon_id": "40307026",
-      "name": "veops-share",
-      "font_class": "veops-share",
-      "unicode": "e864",
-      "unicode_decimal": 59492
-    },
-    {
-      "icon_id": "40306997",
-      "name": "veops-export",
-      "font_class": "veops-export",
-      "unicode": "e862",
-      "unicode_decimal": 59490
-    },
-    {
-      "icon_id": "40306881",
-      "name": "veops-import",
-      "font_class": "a-veops-import1",
-      "unicode": "e860",
-      "unicode_decimal": 59488
-    },
-    {
-      "icon_id": "40262335",
-      "name": "monitor-ip (1)",
-      "font_class": "monitor-ip",
-      "unicode": "e807",
-      "unicode_decimal": 59399
-    },
-    {
-      "icon_id": "40262337",
-      "name": "monitor-director",
-      "font_class": "monitor-director",
-      "unicode": "e803",
-      "unicode_decimal": 59395
-    },
-    {
-      "icon_id": "40262336",
-      "name": "monitor-host",
-      "font_class": "monitor-host",
-      "unicode": "e804",
-      "unicode_decimal": 59396
-    },
-    {
-      "icon_id": "40262216",
-      "name": "cmdb-log",
-      "font_class": "a-cmdb-log1",
-      "unicode": "e802",
-      "unicode_decimal": 59394
-    },
-    {
-      "icon_id": "40261712",
-      "name": "monitor-add",
-      "font_class": "monitor-add",
-      "unicode": "e7ff",
-      "unicode_decimal": 59391
-    },
-    {
-      "icon_id": "40248186",
-      "name": "monitor-down",
-      "font_class": "monitor-down",
-      "unicode": "e7fc",
-      "unicode_decimal": 59388
-    },
-    {
-      "icon_id": "40248184",
-      "name": "monitor-up",
-      "font_class": "monitor-up",
-      "unicode": "e7fd",
-      "unicode_decimal": 59389
-    },
-    {
-      "icon_id": "40235502",
-      "name": "itsm-unfold",
-      "font_class": "itsm-unfold",
-      "unicode": "e7f9",
-      "unicode_decimal": 59385
-    },
-    {
-      "icon_id": "40235453",
-      "name": "itsm-shrink",
-      "font_class": "itsm-stretch",
-      "unicode": "e7f8",
-      "unicode_decimal": 59384
-    },
-    {
-      "icon_id": "40217123",
-      "name": "monitor-data_comaparison2",
-      "font_class": "monitor-data_comaparison2",
-      "unicode": "e7a1",
-      "unicode_decimal": 59297
-    },
-    {
-      "icon_id": "40217122",
-      "name": "monitor-data_comaparison1",
-      "font_class": "monitor-data_comaparison1",
-      "unicode": "e7f7",
-      "unicode_decimal": 59383
-    },
-    {
-      "icon_id": "40176936",
-      "name": "monitor-online",
-      "font_class": "a-monitor-online1",
-      "unicode": "e7a0",
-      "unicode_decimal": 59296
-    },
     {
       "icon_id": "40043662",
       "name": "ops-setting-application-selected",

cmdb-ui/src/components/CMDBExprDrawer/index.vue

@@ -9,7 +9,7 @@
     :bodyStyle="{ padding: '24px 12px' }"
     :placement="placement"
   >
-    <ResourceSearch ref="resourceSearch" :fromCronJob="true" :type="type" :typeId="typeId" @copySuccess="copySuccess" />
+    <ResourceSearch :fromCronJob="true" @copySuccess="copySuccess" />
   </CustomDrawer>
 </template>
 
@@ -23,14 +23,6 @@ export default {
       type: String,
       default: 'right',
     },
-    type: {
-      type: String,
-      default: 'resourceSearch'
-    },
-    typeId: {
-      type: Number,
-      default: null
-    }
   },
   data() {
     return {

cmdb-ui/src/components/Menu/menu.js

@@ -182,8 +182,8 @@ export default {
           <tag {...{ props, attrs }}>
             {this.renderIcon({ icon: menu.meta.icon, customIcon: menu.meta.customIcon, name: menu.meta.name, typeId: menu.meta.typeId, routeName: menu.name, selectedIcon: menu.meta.selectedIcon, })}
             <span>
-              <span style={menu.meta.style} class={this.renderI18n(menu.meta.title).length > 10 ? 'scroll' : ''}>{this.renderI18n(menu.meta.title)}</span>
-              {isShowDot && !menu.meta.disabled &&
+              <span class={this.renderI18n(menu.meta.title).length > 10 ? 'scroll' : ''}>{this.renderI18n(menu.meta.title)}</span>
+              {isShowDot &&
                 <a-popover
                   overlayClassName="custom-menu-extra-submenu"
                   placement="rightTop"

cmdb-ui/src/components/RegexSelect/constants.js

@@ -10,10 +10,10 @@ export const regList = () => {
         { id: 'landline', label: i18n.t('regexSelect.landline'), value: '^(?:(?:\\d{3}-)?\\d{8}|^(?:\\d{4}-)?\\d{7,8})(?:-\\d+)?$', message: '请输入正确座机' },
         { id: 'zipCode', label: i18n.t('regexSelect.zipCode'), value: '^(0[1-7]|1[0-356]|2[0-7]|3[0-6]|4[0-7]|5[1-7]|6[1-7]|7[0-5]|8[013-6])\\d{4}$', message: '请输入正确邮政编码' },
         { id: 'IDCard', label: i18n.t('regexSelect.IDCard'), value: '(^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$)|(^[1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}$)', message: '请输入正确身份证号' },
-        { id: 'ip', label: i18n.t('regexSelect.ip'), value: '^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$', message: '请输入正确IP地址' },
-        { id: 'email', label: i18n.t('regexSelect.email'), value: '^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$', message: '请输入正确邮箱' },
-        { id: 'link', label: i18n.t('regexSelect.link'), value: '^(https:\/\/www\\.|http:\/\/www\\.|https:\/\/|http:\/\/)?[a-zA-Z0-9]{2,}(\\.[a-zA-Z0-9]{2,})(\\.[a-zA-Z0-9]{2,})?$', message: '请输入链接' },
-        { id: 'monetaryAmount', label: i18n.t('regexSelect.monetaryAmount'), value: '^-?\\d+(,\\d{3})*(\\.\\d{1,2})?$', message: '请输入货币金额' },
+        { id: 'ip', label: i18n.t('regexSelect.ip'), value: '^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$', message: '请输入正确IP地址' },
+        { id: 'email', label: i18n.t('regexSelect.email'), value: '^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\.\\w+([-.]\\w+)*$', message: '请输入正确邮箱' },
+        { id: 'link', label: i18n.t('regexSelect.link'), value: '^(https:\/\/www\.|http:\/\/www\.|https:\/\/|http:\/\/)?[a-zA-Z0-9]{2,}(\.[a-zA-Z0-9]{2,})(\.[a-zA-Z0-9]{2,})?$', message: '请输入链接' },
+        { id: 'monetaryAmount', label: i18n.t('regexSelect.monetaryAmount'), value: '^-?\\d+(,\\d{3})*(\.\\d{1,2})?$', message: '请输入货币金额' },
         { id: 'custom', label: i18n.t('regexSelect.custom'), value: '', message: '' }
     ]
 }

cmdb-ui/src/components/tools/TopMenu.vue

@@ -81,7 +81,7 @@ export default {
         if (route.name === 'cmdb') {
           const preference = await getPreference()
           const lastTypeId = window.localStorage.getItem('ops_ci_typeid') || undefined
-          if (lastTypeId && preference.type_ids.some((item) => item === Number(lastTypeId))) {
+          if (lastTypeId && preference.some((item) => item.id === Number(lastTypeId))) {
             this.$router.push(`/cmdb/instances/types/${lastTypeId}`)
           } else {
             this.$router.push('/cmdb/dashboard')

cmdb-ui/src/lang/en.js

@@ -160,7 +160,7 @@ export default {
         landline: 'landline',
         zipCode: 'zip code',
         IDCard: 'ID card',
-        ip: 'IPv4',
+        ip: 'IP',
         email: 'email',
         link: 'link',
         monetaryAmount: 'monetary amount',

cmdb-ui/src/lang/zh.js

@@ -160,7 +160,7 @@ export default {
         landline: '座机',
         zipCode: '邮政编码',
         IDCard: '身份证号',
-        ip: 'IPv4地址',
+        ip: 'IP地址',
         email: '邮箱',
         link: '链接',
         monetaryAmount: '货币金额',

cmdb-ui/src/modules/cmdb/api/ci.js

@@ -2,12 +2,11 @@ import { axios } from '@/utils/request'
 
 const urlPrefix = '/v0.1'
 
-export function searchCI(params, isShowMessage = true) {
+export function searchCI(params) {
   return axios({
     url: urlPrefix + `/ci/s`,
     method: 'GET',
-    params: params,
-    isShowMessage
+    params: params
   })
 }
 

cmdb-ui/src/modules/cmdb/api/discovery.js

@@ -46,10 +46,10 @@ export function getHttpAttributes(name, params) {
 }
 
 export function getSnmpAttributes(name) {
-  return axios({
-    url: `/v0.1/adr/snmp/${name}/attributes`,
-    method: 'GET',
-  })
+    return axios({
+        url: `/v0.1/adr/snmp/${name}/attributes`,
+        method: 'GET',
+    })
 }
 
 export function getCITypeDiscovery(type_id) {
@@ -118,65 +118,3 @@ export function deleteAdc(adc_id) {
         method: 'DELETE',
     })
 }
-
-export function getAdcCounter(params) {
-  return axios({
-    url: `v0.1/adc/counter`,
-    method: 'GET',
-    params
-  })
-}
-
-export function getAdcExecHistories(params) {
-  return axios({
-    url: `v0.1/adc/exec/histories`,
-    method: 'GET',
-    params
-  })
-}
-
-export function getAdtSyncHistories(adt_id) {
-  return axios({
-    url: `/v0.1/adt/${adt_id}/sync/histories`,
-    method: 'GET',
-    params: {
-      page_size: 9999
-    }
-  })
-}
-
-export function postAdtTest(adt_id) {
-  return axios({
-    url: `/v0.1/adt/${adt_id}/test`,
-    method: 'POST',
-  })
-}
-
-export function getAdtTestResult(exec_id) {
-  return axios({
-    url: `/v0.1/adt/test/${exec_id}/result`,
-    method: 'GET'
-  })
-}
-
-export function getCITypeAttributes(type_id) {
-  return axios({
-    url: `/v0.1/adt/ci_types/${type_id}/attributes`,
-    method: 'GET',
-  })
-}
-
-export function getCITypeRelations(type_id) {
-  return axios({
-    url: `/v0.1/adt/ci_types/${type_id}/relations`,
-    method: 'GET',
-  })
-}
-
-export function postCITypeRelations(type_id, data) {
-  return axios({
-    url: `/v0.1/adt/ci_types/${type_id}/relations`,
-    method: 'POST',
-    data
-  })
-}

cmdb-ui/src/modules/cmdb/api/topology.js

@@ -1,110 +0,0 @@
-import { axios } from '@/utils/request'
-
-const urlPrefix = '/v0.1'
-
-export function getTopoGroups() {
-  return axios({
-    url: `${urlPrefix}/topology_views`,
-    method: 'GET',
-  })
-}
-
-export function getTopoView(_id) {
-  return axios({
-    url: `${urlPrefix}/topology_views/${_id}`,
-    method: 'GET',
-  })
-}
-
-export function postTopoGroup(data) {
-  return axios({
-      url: `${urlPrefix}/topology_views/groups`,
-      method: 'POST',
-      data: data
-  })
-}
-
-export function putTopoGroupByGId(gid, data) {
-  return axios({
-      url: `${urlPrefix}/topology_views/groups/${gid}`,
-      method: 'PUT',
-      data: data
-  })
-}
-
-export function putTopoGroupsOrder(data) {
-  return axios({
-      url: `${urlPrefix}/topology_views/groups/order`,
-      method: 'PUT',
-      data: data
-  })
-}
-
-export function deleteTopoGroup(gid, data) {
-  return axios({
-      url: `${urlPrefix}/topology_views/groups/${gid}`,
-      method: 'DELETE',
-      data: data
-  })
-}
-
-export function addTopoView(data) {
-  return axios({
-      url: `${urlPrefix}/topology_views`,
-      method: 'POST',
-      data: data
-  })
-}
-
-export function updateTopoView(_id, data) {
-  return axios({
-      url: `${urlPrefix}/topology_views/${_id}`,
-      method: 'PUT',
-      data: data
-  })
-}
-
-export function deleteTopoView(_id) {
-  return axios({
-      url: `${urlPrefix}/topology_views/${_id}`,
-      method: 'DELETE',
-  })
-}
-
-export function getRelationsByTypeId(_id) {
-  return axios({
-    url: `${urlPrefix}/topology_views/relations/ci_types/${_id}`,
-    method: 'GET',
-  })
-}
-
-export function previewTopoView(params) {
-  return axios({
-    url: `${urlPrefix}/topology_views/preview`,
-    method: 'POST',
-    data: params,
-  })
-}
-
-export function showTopoView(_id) {
-  return axios({
-    url: `${urlPrefix}/topology_views/${_id}/view`,
-    method: 'GET',
-  })
-}
-
-export function grantTopologyView(viewId, rid, data) {
-  return axios({
-    url: `/v0.1/topology_views/${viewId}/roles/${rid}/grant`,
-    method: 'POST',
-    data: data
-  })
-}
-
-export function revokeTopologyView(viewId, rid, data) {
-  return axios({
-    url: `/v0.1/topology_views/${viewId}/roles/${rid}/revoke`,
-    method: 'POST',
-    data: data
-  })
-}

cmdb-ui/src/modules/cmdb/components/attrMapTable/index.vue

@@ -1,196 +0,0 @@
-<template>
-  <div class="attr-map-table">
-    <div class="attr-map-table-left">
-      <div class="attr-map-table-title">{{ $t('cmdb.ciType.attributes') }}</div>
-      <vxe-table
-        ref="attr-xTable-left"
-        size="mini"
-        :data="tableData"
-        :scroll-y="{ enabled: true }"
-        :min-height="78"
-      >
-        <vxe-column field="attr" :title="$t('name')">
-          <template #default="{ row }">
-            <div class="attr-select">
-              <span
-                v-if="uniqueKey"
-                :style="{
-                  opacity: uniqueKey === row.name ? 1 : 0
-                }"
-                class="attr-select-unique"
-              >
-                *
-              </span>
-              <vxe-select
-                filterable
-                clearable
-                v-model="row.attr"
-                type="text"
-                :options="ciTypeAttributes"
-                transfer
-                :placeholder="$t('cmdb.ciType.attrMapTableAttrPlaceholder')"
-              ></vxe-select>
-            </div>
-          </template>
-        </vxe-column>
-      </vxe-table>
-    </div>
-    <div class="attr-map-table-right">
-      <div class="attr-map-table-title">{{ $t('cmdb.ciType.autoDiscovery') }}</div>
-      <vxe-table
-        ref="attr-xTable-right"
-        size="mini"
-        show-overflow
-        show-header-overflow
-        :data="tableData"
-        :scroll-y="{ enabled: true }"
-        :row-config="{ height: 42 }"
-        :min-height="78"
-      >
-        <vxe-column field="name" :title="$t('name')"></vxe-column>
-        <vxe-column field="type" :title="$t('type')"></vxe-column>
-        <vxe-column v-if="ruleType !== 'agent'" field="example" :title="$t('cmdb.components.example')">
-          <template #default="{row}">
-            <span v-if="row.type === 'json'">{{ JSON.stringify(row.example) }}</span>
-            <span v-else>{{ row.example }}</span>
-          </template>
-        </vxe-column>
-        <vxe-column field="desc" :title="$t('desc')"></vxe-column>
-      </vxe-table>
-    </div>
-    <div class="attr-map-table-link">
-      <div
-        v-for="item in tableData"
-        :key="item._X_ROW_KEY"
-        class="attr-map-table-link-item"
-      >
-        <div class="attr-map-table-link-left"></div>
-        <div class="attr-map-table-link-right"></div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AttrMapTable',
-  props: {
-    tableData: {
-      type: Array,
-      default: () => [],
-    },
-    ciTypeAttributes: {
-      type: Array,
-      default: () => [],
-    },
-    ruleType: {
-      type: String,
-      default: '',
-    },
-    uniqueKey: {
-      type: String,
-      default: '',
-    }
-  },
-  data() {
-    return {}
-  },
-  methods: {
-    getTableData() {
-      const leftTable = this.$refs?.['attr-xTable-left']
-      const rightTable = this.$refs?.['attr-xTable-right']
-      const { fullData: leftFullData } = leftTable.getTableData()
-      const { fullData: rightFullData } = rightTable.getTableData()
-      const fullData = leftFullData.map((item, index) => {
-        return {
-          ...(rightFullData?.[index] || {}),
-          ...(item || {})
-        }
-      })
-      return {
-        fullData
-      }
-    },
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.attr-map-table {
-  display: flex;
-  justify-content: space-between;
-  position: relative;
-
-  &-left {
-    width: 30%;
-  }
-
-  &-right {
-    width: calc(70% - 60px);
-  }
-
-  &-title {
-    font-size: 14px;
-    font-weight: 700;
-    line-height: 22px;
-    margin-bottom: 12px;
-  }
-
-  &-link {
-    position: absolute;
-    z-index: 10;
-    bottom: 0;
-    left: calc(30% - 6px);
-    width: 66px;
-
-    &-item {
-      position: relative;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: calc(42px - 12px);
-      width: 100%;
-
-      &:last-child {
-        margin-bottom: calc(21px - 6px);
-      }
-
-      &::after {
-        content: '';
-        position: absolute;
-        top: 50%;
-        left: 0;
-        width: 100%;
-        height: 1px;
-        background-color: @border-color-base;
-        z-index: -1;
-      }
-    }
-
-    &-left {
-      width: 12px;
-      height: 12px;
-      background-color: @primary-color;
-      border: solid 3px #E2E7FC;
-      border-radius: 50%;
-    }
-
-    &-right {
-      width: 2px;
-      height: 10px;
-      border-radius: 1px 0px 0px 1px;
-      background-color: @primary-color;
-    }
-  }
-
-  .attr-select {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-
-    &-unique {
-      color: #FD4C6A;
-    }
-  }
-}
-</style>

cmdb-ui/src/modules/cmdb/components/cmdbGrant/grantComp.vue

@@ -57,20 +57,6 @@
         :addedRids="addedRids"
       />
     </template>
-    <template v-if="cmdbGrantType.includes('TopologyView')">
-      <div class="cmdb-grant-title">{{ resourceTypeName }}{{ $t('cmdb.components.perm') }}</div>
-      <TopologyViewGrant
-        :resourceTypeName="resourceTypeName"
-        :tableData="tableData"
-        :viewId="CITypeId"
-        grantType="TopologyView"
-        @grantDepart="grantDepart"
-        @grantRole="grantRole"
-        @getTableData="getTableData"
-        ref="grantTopologyView"
-        :addedRids="addedRids"
-      />
-    </template>
 
     <GrantModal ref="grantModal" @handleOk="handleOk" />
     <ReadGrantModal ref="readGrantModal" :CITypeId="CITypeId" @updateTableDataRead="updateTableDataRead" />
@@ -86,12 +72,11 @@ import { getResourcePerms } from '@/modules/acl/api/permission'
 import GrantModal from './grantModal.vue'
 import ReadGrantModal from './readGrantModal'
 import RelationViewGrant from './relationViewGrant.vue'
-import TopologyViewGrant from './topologyViewGrant.vue'
 import { getCITypeGroupById, ciTypeFilterPermissions } from '../../api/CIType'
 
 export default {
   name: 'GrantComp',
-  components: { CiTypeGrant, TypeRelationGrant, RelationViewGrant, TopologyViewGrant, GrantModal, ReadGrantModal },
+  components: { CiTypeGrant, TypeRelationGrant, RelationViewGrant, GrantModal, ReadGrantModal },
   props: {
     CITypeId: {
       type: Number,
@@ -306,20 +291,6 @@ export default {
           })
         )
       }
-      if (grantType === 'TopologyView') {
-        this.tableData.unshift(
-          ...rids.map(({ rid, name }) => {
-            return {
-              rid,
-              name,
-              read: false,
-              update: false,
-              delete: false,
-              grant: false,
-            }
-          })
-        )
-      }
       this.addedRids = rids
       this.$nextTick(() => {
         setTimeout(() => {

cmdb-ui/src/modules/cmdb/components/cmdbGrant/topologyViewGrant.vue

@@ -1,102 +0,0 @@
-<template>
-  <div class="topology-view-grant">
-    <vxe-table
-      ref="xTable"
-      size="mini"
-      stripe
-      class="ops-stripe-table"
-      :data="tableData"
-      :max-height="`${tableHeight}px`"
-      :scroll-y="{enabled: true}"
-      :row-style="(params) => getCurrentRowStyle(params, addedRids)"
-    >
-      <vxe-column field="name"></vxe-column>
-      <vxe-column v-for="col in columns" :key="col" :field="col" :title="permMap[col]">
-        <template #default="{row}">
-          <a-checkbox @change="(e) => handleChange(e, col, row)" v-model="row[col]"></a-checkbox>
-        </template>
-      </vxe-column>
-    </vxe-table>
-    <a-space>
-      <span class="grant-button" @click="grantDepart">{{ $t('cmdb.components.grantUser') }}</span>
-      <span class="grant-button" @click="grantRole">{{ $t('cmdb.components.grantRole') }}</span>
-    </a-space>
-  </div>
-</template>
-
-<script>
-import { permMap } from './constants.js'
-import { grantTopologyView, revokeTopologyView } from '@/modules/cmdb/api/topology.js'
-import { getCurrentRowStyle } from './utils'
-export default {
-  name: 'TopologyViewGrant',
-  inject: ['loading', 'isModal'],
-  props: {
-    viewId: {
-      type: Number,
-      default: null,
-    },
-    resourceTypeName: {
-      type: String,
-      default: '',
-    },
-    tableData: {
-      type: Array,
-      default: () => [],
-    },
-    grantType: {
-      type: String,
-      default: 'relation_view',
-    },
-    addedRids: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      columns: ['read', 'update', 'delete', 'grant'],
-    }
-  },
-  computed: {
-    windowHeight() {
-      return this.$store.state.windowHeight
-    },
-    tableHeight() {
-      if (this.isModal) {
-        return (this.windowHeight - 104) / 2
-      }
-      return (this.windowHeight - 104) / 2 - 116
-    },
-    permMap() {
-      return permMap()
-    }
-  },
-  methods: {
-    getCurrentRowStyle,
-    grantDepart() {
-      this.$emit('grantDepart', this.grantType)
-    },
-    grantRole() {
-      this.$emit('grantRole', this.grantType)
-    },
-    handleChange(e, col, row) {
-      if (e.target.checked) {
-        grantTopologyView(this.viewId, row.rid, { perms: [col], name: this.resourceTypeName }).catch(() => {
-          this.$emit('getTableData')
-        })
-      } else {
-        revokeTopologyView(this.viewId, row.rid, { perms: [col], name: this.resourceTypeName }).catch(() => {
-          this.$emit('getTableData')
-        })
-      }
-    },
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.topology-view-grant {
-  padding: 10px 0;
-}
-</style>

cmdb-ui/src/modules/cmdb/components/httpSnmpAD/adPreviewTable.vue

@@ -1,39 +0,0 @@
-<template>
-  <vxe-table
-    size="mini"
-    stripe
-    class="ops-stripe-table"
-    show-overflow
-    keep-source
-    ref="xTable"
-    resizable
-    height="100%"
-    :data="tableData"
-    :scroll-y="{enabled: true}"
-  >
-    <vxe-column field="name" :title="$t('name')" width="100"> </vxe-column>
-    <vxe-column field="type" :title="$t('type')" width="80"> </vxe-column>
-    <vxe-column field="example" :title="$t('cmdb.components.example')">
-      <template #default="{row}">
-        <span v-if="row.type === 'object'">{{ row.example ? JSON.stringify(row.example) : '' }}</span>
-        <span v-else>{{ row.example }}</span>
-      </template>
-    </vxe-column>
-    <vxe-column field="desc" :title="$t('desc')"> </vxe-column>
-  </vxe-table>
-</template>
-
-<script>
-export default {
-  name: 'ADPreviewTable',
-  props: {
-    tableData: {
-      type: Array,
-      default: () => [],
-    },
-  }
-}
-</script>
-
-<style lang="less" scoped>
-</style>

cmdb-ui/src/modules/cmdb/components/httpSnmpAD/httpADCategory.vue

@@ -1,223 +0,0 @@
-<template>
-  <div class="http-ad-category">
-    <div class="http-ad-category-preview" v-if="currentCate">
-      <div class="category-side">
-        <div
-          v-for="category in categories"
-          :key="category.category"
-          class="category-side-item"
-        >
-          <div class="category-side-title">{{ category.category }}</div>
-          <div class="category-side-children">
-            <div
-              v-for="item in category.items"
-              :key="item"
-              :class="['category-side-children-item', item === currentCate ? 'category-side-children-item_active' : '']"
-              @click="clickCategory(item)"
-            >
-              {{ item }}
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="category-table">
-        <ADPreviewTable
-          :tableData="tableData"
-        />
-      </div>
-    </div>
-
-    <template v-else>
-      <a-input-search
-        class="category-search"
-        :placeholder="$t('cmdb.ad.httpSearchPlaceHolder')"
-        @search="onSearchHttp"
-      />
-      <div class="category-main">
-        <div
-          v-for="category in filterCategories"
-          :key="category.category"
-          class="category-item"
-        >
-          <div class="category-title">{{ category.category }}</div>
-          <div class="category-children">
-            <div
-              v-for="item in category.items"
-              :key="item"
-              :class="['category-children-item', item === currentCate ? 'category-children-item_active' : '']"
-              @click="clickCategory(item)"
-            >
-              {{ item }}
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="corporate-tip">
-        {{ $t('cmdb.ad.corporateTip') }} <a href="mailto:bd@veops.cn">bd@veops.cn</a>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-import _ from 'lodash'
-import ADPreviewTable from './adPreviewTable.vue'
-
-export default {
-  name: 'HttpADCategory',
-  components: {
-    ADPreviewTable
-  },
-  props: {
-    categories: {
-      type: Array,
-      default: () => {},
-    },
-    currentCate: {
-      type: String,
-      default: ''
-    },
-    tableData: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      searchValue: ''
-    }
-  },
-  computed: {
-    filterCategories() {
-      const categories = _.cloneDeep(this.categories)
-      const filterCategories = categories.filter((category) => {
-        category.items = category.items.filter((item) => {
-          return item?.indexOf(this.searchValue) !== -1
-        })
-        return category?.items?.length > 0
-      })
-      return filterCategories
-    }
-  },
-  methods: {
-    onSearchHttp(v) {
-      this.searchValue = v
-    },
-    clickCategory(item) {
-      this.$emit('clickCategory', item)
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.http-ad-category {
-  &-preview {
-    display: flex;
-    width: 100%;
-    height: calc(100vh - 156px);
-    justify-content: space-between;
-  }
-
-  .category-side {
-    flex-shrink: 0;
-    width: 150px;
-    height: 100%;
-    border-right: solid 1px @border-color-base;
-    padding-right: 10px;
-
-    &-item {
-      &:not(:first-child) {
-        margin-top: 24px;
-      }
-
-      .category-side-title {
-        font-size: 12px;
-        font-weight: 400;
-        color: @text-color_4;
-      }
-
-      .category-side-children {
-        margin-top: 5px;
-
-        &-item {
-          padding: 7px 10px;
-          background-color: @layout-content-background;
-          border-radius: @border-radius-base;
-
-          color: @text-color_2;
-          font-size: 12px;
-          font-weight: 400;
-
-          cursor: pointer;
-
-          &:hover {
-            background-color: @layout-sidebar-selected-color;
-            color: @layout-header-font-selected-color;
-          }
-
-          &_active {
-            background-color: @layout-sidebar-selected-color;
-            color: @layout-header-font-selected-color;
-          }
-        }
-      }
-    }
-  }
-
-  .category-table {
-    width: calc(100% - 150px - 10px - 16px);
-    flex-shrink: 0;
-    height: 100%;
-  }
-
-  .category-search {
-    width: 254px;
-  }
-
-  .category-main {
-    .category-item {
-      margin-top: 24px;
-
-      .category-title {
-        font-size: 14px;
-        font-weight: 700;
-      }
-
-      .category-children {
-        margin-top: 8px;
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        gap: 19px;
-
-        &-item {
-          padding: 18px 19px;
-          background-color: @layout-content-background;
-          border-radius: @border-radius-base;
-
-          color: @text-color_2;
-          font-size: 14px;
-          font-weight: 400;
-
-          cursor: pointer;
-
-          &:hover {
-            background-color: @layout-sidebar-selected-color;
-            color: @layout-header-font-selected-color;
-          }
-
-          &_active {
-            background-color: @layout-sidebar-selected-color;
-            color: @layout-header-font-selected-color;
-          }
-        }
-      }
-    }
-  }
-
-  .corporate-tip {
-    margin-top: 20px;
-  }
-}
-</style>

cmdb-ui/src/modules/cmdb/components/httpSnmpAD/index.vue

@@ -1,45 +1,68 @@
 <template>
-  <div class="http-snmp-ad">
-    <HttpADCategory
-      v-if="!isEdit && ruleType === 'http'"
-      :categories="categories"
-      :currentCate="currentCate"
-      :tableData="tableData"
-      @clickCategory="setCurrentCate"
-    />
-    <template v-else>
-      <a-select v-if="ruleType === 'http'" :style="{ marginBottom: '10px' }" v-model="currentCate">
-        <a-select-option v-for="cate in categoriesSelect" :key="cate" :value="cate">{{ cate }}</a-select-option>
-      </a-select>
-      <AttrMapTable
-        v-if="isEdit"
-        ref="attrMapTable"
-        :ruleType="ruleType"
-        :tableData="tableData"
-        :ciTypeAttributes="ciTypeAttributes"
-        :uniqueKey="uniqueKey"
-      />
-      <ADPreviewTable
-        v-else
-        :tableData="tableData"
-      />
-    </template>
+  <div>
+    <a-select v-if="ruleType === 'http'" :style="{ marginBottom: '10px' }" v-model="currentCate">
+      <a-select-option v-for="cate in categories" :key="cate" :value="cate">{{ cate }}</a-select-option>
+    </a-select>
+    <vxe-table
+      size="mini"
+      stripe
+      class="ops-stripe-table"
+      show-overflow
+      keep-source
+      ref="xTable"
+      resizable
+      :data="tableData"
+      :edit-config="isEdit ? { trigger: 'click', mode: 'cell' } : {}"
+    >
+      <template v-if="isEdit">
+        <vxe-colgroup :title="$t('cmdb.ciType.autoDiscovery')">
+          <vxe-column field="name" :title="$t('name')" width="100"> </vxe-column>
+          <vxe-column field="type" :title="$t('type')" width="80"> </vxe-column>
+          <vxe-column field="example" :title="$t('cmdb.components.example')">
+            <template #default="{row}">
+              <span v-if="row.type === 'json'">{{ JSON.stringify(row.example) }}</span>
+              <span v-else>{{ row.example }}</span>
+            </template>
+          </vxe-column>
+          <vxe-column field="desc" :title="$t('desc')"> </vxe-column>
+        </vxe-colgroup>
+        <vxe-colgroup :title="$t('cmdb.ciType.attributes')">
+          <vxe-column field="attr" :title="$t('name')" :edit-render="{}">
+            <template #default="{row}">
+              {{ row.attr }}
+            </template>
+            <template #edit="{ row }">
+              <vxe-select
+                filterable
+                clearable
+                v-model="row.attr"
+                type="text"
+                :options="ciTypeAttributes"
+                transfer
+              ></vxe-select>
+            </template>
+          </vxe-column>
+        </vxe-colgroup>
+      </template>
+      <template v-else>
+        <vxe-column field="name" :title="$t('name')" width="100"> </vxe-column>
+        <vxe-column field="type" :title="$t('type')" width="80"> </vxe-column>
+        <vxe-column field="example" :title="$t('cmdb.components.example')">
+          <template #default="{row}">
+            <span v-if="row.type === 'object'">{{ JSON.stringify(row.example) }}</span>
+            <span v-else>{{ row.example }}</span>
+          </template>
+        </vxe-column>
+        <vxe-column field="desc" :title="$t('desc')"> </vxe-column>
+      </template>
+    </vxe-table>
   </div>
 </template>
 
 <script>
 import { getHttpCategories, getHttpAttributes, getSnmpAttributes } from '../../api/discovery'
-import AttrMapTable from '@/modules/cmdb/components/attrMapTable/index.vue'
-import ADPreviewTable from './adPreviewTable.vue'
-import HttpADCategory from './httpADCategory.vue'
-
 export default {
   name: 'HttpSnmpAD',
-  components: {
-    AttrMapTable,
-    ADPreviewTable,
-    HttpADCategory
-  },
   props: {
     ruleName: {
       type: String,
@@ -65,15 +88,10 @@ export default {
       type: Number,
       default: 0,
     },
-    uniqueKey: {
-      type: String,
-      default: '',
-    }
   },
   data() {
     return {
       categories: [],
-      categoriesSelect: [],
       currentCate: '',
       tableData: [],
     }
@@ -97,7 +115,7 @@ export default {
       immediate: true,
       handler(newVal) {
         if (newVal) {
-          getHttpAttributes(this.httpMap[`${this.ruleName}`].name, { resource: newVal }).then((res) => {
+          getHttpAttributes(this.httpMap[`${this.ruleName}`].name, { category: newVal }).then((res) => {
             if (this.isEdit) {
               this.formatTableData(res)
             } else {
@@ -113,7 +131,7 @@ export default {
         this.currentCate = ''
         this.$nextTick(() => {
           const { ruleType, ruleName } = newVal
-          if (['snmp'].includes(ruleType) && ruleName) {
+          if (ruleType === 'snmp' && ruleName) {
             getSnmpAttributes(ruleName).then((res) => {
               if (this.isEdit) {
                 this.formatTableData(res)
@@ -125,15 +143,8 @@ export default {
           if (ruleType === 'http' && ruleName) {
             getHttpCategories(this.httpMap[`${this.ruleName}`].name).then((res) => {
               this.categories = res
-              const categoriesSelect = []
-              res.forEach((category) => {
-                if (category?.items?.length) {
-                  categoriesSelect.push(...category.items)
-                }
-              })
-              this.categoriesSelect = categoriesSelect
-              if (this.isEdit && categoriesSelect?.length) {
-                this.currentCate = categoriesSelect[0]
+              if (res && res.length) {
+                this.currentCate = res[0]
               }
             })
           }
@@ -170,16 +181,12 @@ export default {
       })
     },
     getTableData() {
-      const $table = this.$refs.attrMapTable
+      const $table = this.$refs.xTable
       const { fullData } = $table.getTableData()
       return fullData || []
-    }
+    },
   },
 }
 </script>
 
-<style>
-.http-snmp-ad {
-  height: 100%;
-}
-</style>
+<style></style>

cmdb-ui/src/modules/cmdb/components/nodeSetting/index.vue

@@ -1,207 +0,0 @@
-<template>
-  <div class="node-setting-wrap">
-    <a-row v-for="(node) in nodes" :key="node.id">
-      <a-col :span="6">
-        <a-form-item :label="$t('cmdb.ciType.nodeSettingIp')">
-          <a-input
-            allowClear
-            v-decorator="[
-              `node_ip_${node.id}`,
-              {
-                rules: [
-                  { required: false, message: $t('cmdb.ciType.nodeSettingIpTip') },
-                  {
-                    pattern:
-                      '^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$',
-                    message: $t('cmdb.ciType.nodeSettingIpTip1'),
-                    trigger: 'blur',
-                  },
-                ],
-              },
-            ]"
-            :placeholder="$t('cmdb.ciType.nodeSettingIpTip')"
-          />
-        </a-form-item>
-      </a-col>
-
-      <a-col :span="6">
-        <a-form-item :label="$t('cmdb.ciType.nodeSettingCommunity')">
-          <a-input
-            allowClear
-            v-decorator="[
-              `node_community_${node.id}`,
-              {
-                rules: [{ required: false, message: $t('cmdb.ciType.nodeSettingCommunityTip') }],
-              },
-            ]"
-            :placeholder="$t('cmdb.ciType.nodeSettingCommunityTip')"
-          />
-        </a-form-item>
-      </a-col>
-
-      <a-col :span="5">
-        <a-form-item :label="$t('cmdb.ciType.nodeSettingVersion')">
-          <a-select
-            v-decorator="[
-              `node_version_${node.id}`,
-              {
-                rules: [{ required: false, message: $t('cmdb.ciType.nodeSettingVersionTip') }],
-              },
-            ]"
-            :placeholder="$t('cmdb.ciType.nodeSettingVersionTip')"
-            allowClear
-            class="node-setting-select"
-          >
-            <a-select-option value="1">
-              v1
-            </a-select-option>
-            <a-select-option value="2c">
-              v2c
-            </a-select-option>
-            <a-select-option value="3">
-              v3
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-      <a-col :span="3">
-        <div class="action">
-          <a @click="() => copyNode(node.id)">
-            <a-icon type="copy" />
-          </a>
-          <a @click="() => removeNode(node.id, 1)">
-            <a-icon type="minus-circle" />
-          </a>
-          <a @click="addNode">
-            <a-icon type="plus-circle" />
-          </a>
-        </div>
-      </a-col>
-    </a-row>
-  </div>
-</template>
-
-<script>
-import _ from 'lodash'
-import { v4 as uuidv4 } from 'uuid'
-
-export default {
-  name: 'MonitorNodeSetting',
-  props: {
-    initNodes: {
-      type: Array,
-      default: () => [],
-    },
-    form: {
-      type: Object,
-      default: null,
-    },
-  },
-  data() {
-    return {
-      nodes: [],
-    }
-  },
-  methods: {
-    initNodesFunc() {
-      this.nodes = _.cloneDeep(this.initNodes)
-    },
-    addNode() {
-      const newNode = {
-        id: uuidv4(),
-        ip: '',
-        community: '',
-        version: '',
-      }
-      this.nodes.push(newNode)
-      this.$nextTick(() => {
-        this.form.setFieldsValue({
-          [`node_ip_${newNode.id}`]: newNode.ip,
-          [`node_community_${newNode.id}`]: newNode.community,
-          [`node_version_${newNode.id}`]: newNode.version,
-        })
-      })
-    },
-    removeNode(removeId, minLength) {
-      if (this.nodes.length <= minLength) {
-        this.$message.error('不可再删除！')
-        return
-      }
-      const _idx = this.nodes.findIndex((item) => item.id === removeId)
-      if (_idx > -1) {
-        this.nodes.splice(_idx, 1)
-      }
-    },
-    copyNode(id) {
-      const newNode = {
-        id: uuidv4(),
-        ip: this.form.getFieldValue(`node_ip_${id}`),
-        community: this.form.getFieldValue(`node_community_${id}`),
-        version: this.form.getFieldValue(`node_version_${id}`),
-      }
-      this.nodes.push(newNode)
-      this.$nextTick(() => {
-        this.form.setFieldsValue({
-          [`node_ip_${newNode.id}`]: newNode.ip,
-          [`node_community_${newNode.id}`]: newNode.community,
-          [`node_version_${newNode.id}`]: newNode.version,
-        })
-      })
-    },
-    getInfoValuesFromForm(values) {
-      return this.nodes.map((item) => {
-        return {
-          id: item.id,
-          ip: values[`node_ip_${item.id}`],
-          community: values[`node_community_${item.id}`],
-          version: values[`node_version_${item.id}`],
-        }
-      })
-    },
-    setNodeField() {
-      if (this.nodes && this.nodes.length) {
-        this.nodes.forEach((item) => {
-          this.form.setFieldsValue({
-            [`node_ip_${item.id}`]: item.ip,
-            [`node_community_${item.id}`]: item.community,
-            [`node_version_${item.id}`]: item.version,
-          })
-        })
-      }
-    },
-    getNodeValue() {
-      const values = this.form.getFieldsValue()
-      return this.getInfoValuesFromForm(values)
-    },
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.node-setting-wrap {
-  margin-left: 17px;
-
-  .ant-row {
-    // display: flex;
-
-    /deep/ .ant-input-clear-icon {
-      color: rgba(0,0,0,.25);
-
-      &:hover {
-        color: rgba(0, 0, 0, 0.45);
-      }
-    }
-  }
-
-  .node-setting-select {
-    width: 150px;
-  }
-}
-
-.action {
-  height: 36px;
-  display: flex;
-  align-items: center;
-  gap: 12px;
-}
-</style>

cmdb-ui/src/modules/cmdb/components/searchForm/SearchForm.vue

@@ -1,319 +1,317 @@
-<template>
-  <div>
-    <div id="search-form-bar" class="search-form-bar">
-      <div :style="{ display: 'inline-flex', alignItems: 'center' }">
-        <a-space>
-          <treeselect
-            v-if="type === 'resourceSearch'"
-            class="custom-treeselect custom-treeselect-bgcAndBorder"
-            :style="{
-              width: '200px',
-              marginRight: '10px',
-              '--custom-height': '32px',
-              '--custom-bg-color': '#fff',
-              '--custom-border': '1px solid #d9d9d9',
-              '--custom-multiple-lineHeight': '16px',
-            }"
-            v-model="currenCiType"
-            :multiple="true"
-            :clearable="true"
-            searchable
-            :options="ciTypeGroup"
-            :limit="1"
-            :limitText="(count) => `+ ${count}`"
-            value-consists-of="LEAF_PRIORITY"
-            :placeholder="$t('cmdb.ciType.ciType')"
-            @close="closeCiTypeGroup"
-            @open="openCiTypeGroup"
-            @input="inputCiTypeGroup"
-            :normalizer="
-              (node) => {
-                return {
-                  id: node.id || -1,
-                  label: node.alias || node.name || $t('other'),
-                  title: node.alias || node.name || $t('other'),
-                  children: node.ci_types,
-                }
-              }
-            "
-          >
-            <div
-              :title="node.label"
-              slot="option-label"
-              slot-scope="{ node }"
-              :style="{ width: '100%', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' }"
-            >
-              {{ node.label }}
-            </div>
-          </treeselect>
-          <a-input
-            v-model="fuzzySearch"
-            :style="{ display: 'inline-block', width: '200px' }"
-            :placeholder="$t('cmdb.components.pleaseSearch')"
-            @pressEnter="emitRefresh"
-          >
-            <a-icon
-              type="search"
-              slot="suffix"
-              :style="{ color: fuzzySearch ? '#2f54eb' : '#d9d9d9', cursor: 'pointer' }"
-              @click="emitRefresh"
-            />
-            <a-tooltip slot="prefix" placement="bottom" :overlayStyle="{ maxWidth: '550px', whiteSpace: 'pre-line' }">
-              <template slot="title">
-                {{ $t('cmdb.components.ciSearchTips') }}
-              </template>
-              <a><a-icon type="question-circle"/></a>
-            </a-tooltip>
-          </a-input>
-          <a-tooltip :title="$t('reset')">
-            <a-button @click="reset">{{ $t('reset') }}</a-button>
-          </a-tooltip>
-          <FilterComp
-            ref="filterComp"
-            :canSearchPreferenceAttrList="canSearchPreferenceAttrList"
-            @setExpFromFilter="setExpFromFilter"
-            :expression="expression"
-            placement="bottomLeft"
-          >
-            <div slot="popover_item" class="search-form-bar-filter">
-              <a-icon class="search-form-bar-filter-icon" type="filter" />
-              {{ $t('cmdb.components.conditionFilter') }}
-              <a-icon class="search-form-bar-filter-icon" type="down" :style="{ color: '#d9d9d9' }" />
-            </div>
-          </FilterComp>
-          <a-input
-            v-if="isShowExpression"
-            v-model="expression"
-            v-show="!selectedRowKeys.length"
-            @focus="
-              () => {
-                isFocusExpression = true
-              }
-            "
-            @blur="
-              () => {
-                isFocusExpression = false
-              }
-            "
-            :class="{ 'ci-searchform-expression': true, 'ci-searchform-expression-has-value': expression }"
-            :style="{ width }"
-            :placeholder="placeholder"
-            @keyup.enter="emitRefresh"
-          >
-            <a-icon slot="suffix" type="check-circle" @click="handleCopyExpression" />
-          </a-input>
-          <slot></slot>
-        </a-space>
-      </div>
-      <a-space>
-        <slot name="extraContent"></slot>
-        <a-tooltip :title="$t('cmdb.components.attributeDesc')" v-if="type === 'relationView'">
-          <a
-            @click="
-              () => {
-                $refs.metadataDrawer.open(typeId)
-              }
-            "
-          ><a-icon
-            v-if="type === 'relationView'"
-            type="question-circle"
-          /></a>
-        </a-tooltip>
-      </a-space>
-    </div>
-    <MetadataDrawer ref="metadataDrawer" />
-  </div>
-</template>
-
-<script>
-import _ from 'lodash'
-import Treeselect from '@riophae/vue-treeselect'
-import MetadataDrawer from '../../views/ci/modules/MetadataDrawer.vue'
-import FilterComp from '@/components/CMDBFilterComp'
-import { getCITypeGroups } from '../../api/ciTypeGroup'
-export default {
-  name: 'SearchForm',
-  components: { MetadataDrawer, FilterComp, Treeselect },
-  props: {
-    preferenceAttrList: {
-      type: Array,
-      required: true,
-    },
-    isShowExpression: {
-      type: Boolean,
-      default: true,
-    },
-    typeId: {
-      type: Number,
-      default: null,
-    },
-    type: {
-      type: String,
-      default: '',
-    },
-    selectedRowKeys: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      // Advanced Search Expand/Close
-      advanced: false,
-      queryParam: {},
-      isFocusExpression: false,
-      expression: '',
-      fuzzySearch: '',
-      currenCiType: [],
-      ciTypeGroup: [],
-      lastCiType: [],
-    }
-  },
-
-  computed: {
-    placeholder() {
-      return this.isFocusExpression ? this.$t('cmdb.components.ciSearchTips2') : this.$t('cmdb.ciType.expr')
-    },
-    width() {
-      return '200px'
-    },
-    canSearchPreferenceAttrList() {
-      return this.preferenceAttrList.filter((item) => item.value_type !== '6')
-    },
-  },
-  watch: {
-    '$route.path': function(newValue, oldValue) {
-      this.queryParam = {}
-      this.expression = ''
-      this.fuzzySearch = ''
-    },
-  },
-  inject: {
-    setPreferenceSearchCurrent: {
-      from: 'setPreferenceSearchCurrent',
-      default: null,
-    },
-  },
-  mounted() {
-    if (this.type === 'resourceSearch') {
-      this.getCITypeGroups()
-    }
-    if (this.typeId) {
-      this.currenCiType = [this.typeId]
-    }
-  },
-  methods: {
-    // toggleAdvanced() {
-    //   this.advanced = !this.advanced
-    // },
-    getCITypeGroups() {
-      getCITypeGroups({ need_other: true }).then((res) => {
-        this.ciTypeGroup = res
-          .filter((item) => item.ci_types && item.ci_types.length)
-          .map((item) => {
-            item.id = `parent_${item.id || -1}`
-            return { ..._.cloneDeep(item) }
-          })
-      })
-    },
-    reset() {
-      this.queryParam = {}
-      this.expression = ''
-      this.fuzzySearch = ''
-      if (this.type !== 'resourceView') {
-        this.currenCiType = []
-      }
-      this.emitRefresh()
-    },
-    setExpFromFilter(filterExp) {
-      const regSort = /(?<=sort=).+/g
-      const expSort = this.expression.match(regSort) ? this.expression.match(regSort)[0] : undefined
-      let expression = ''
-      if (filterExp) {
-        expression = `q=${filterExp}`
-      }
-      if (expSort) {
-        expression += `&sort=${expSort}`
-      }
-      this.expression = expression
-      this.emitRefresh()
-    },
-    handleSubmit() {
-      this.$refs.filterComp.handleSubmit()
-    },
-    openCiTypeGroup() {
-      this.lastCiType = _.cloneDeep(this.currenCiType)
-    },
-    closeCiTypeGroup(value) {
-      if (!_.isEqual(value, this.lastCiType)) {
-        this.$emit('updateAllAttributesList', value)
-      }
-    },
-    inputCiTypeGroup(value) {
-      if (!value || !value.length) {
-        this.$emit('updateAllAttributesList', value)
-      }
-    },
-    emitRefresh() {
-      if (this.setPreferenceSearchCurrent) {
-        this.setPreferenceSearchCurrent(null)
-      }
-      this.$nextTick(() => {
-        this.$emit('refresh', true)
-      })
-    },
-    handleCopyExpression() {
-      this.$emit('copyExpression')
-    },
-  },
-}
-</script>
-<style lang="less">
-@import '../../views/index.less';
-.ci-searchform-expression {
-  > input {
-    border-bottom: 2px solid #d9d9d9;
-    border-top: none;
-    border-left: none;
-    border-right: none;
-    &:hover,
-    &:focus {
-      border-bottom: 2px solid @primary-color;
-    }
-    &:focus {
-      box-shadow: 0 2px 2px -2px #1f78d133;
-    }
-  }
-  .ant-input-suffix {
-    color: #d9d9d9;
-    cursor: pointer;
-  }
-}
-.ci-searchform-expression-has-value .ant-input-suffix {
-  color: @func-color_3;
-}
-.cmdb-search-form {
-  .ant-form-item-label {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-</style>
-
-<style lang="less" scoped>
-.search-form-bar {
-  margin-bottom: 20px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  height: 32px;
-  .search-form-bar-filter {
-    .ops_display_wrapper(transparent);
-    .search-form-bar-filter-icon {
-      color: @primary-color;
-      font-size: 12px;
-    }
-  }
-}
-</style>
+<template>
+  <div>
+    <div id="search-form-bar" class="search-form-bar">
+      <div :style="{ display: 'inline-flex', alignItems: 'center' }">
+        <a-space>
+          <treeselect
+            v-if="type === 'resourceSearch'"
+            class="custom-treeselect custom-treeselect-bgcAndBorder"
+            :style="{
+              width: '200px',
+              marginRight: '10px',
+              '--custom-height': '32px',
+              '--custom-bg-color': '#fff',
+              '--custom-border': '1px solid #d9d9d9',
+              '--custom-multiple-lineHeight': '16px',
+            }"
+            v-model="currenCiType"
+            :multiple="true"
+            :clearable="true"
+            searchable
+            :options="ciTypeGroup"
+            :limit="1"
+            :limitText="(count) => `+ ${count}`"
+            value-consists-of="LEAF_PRIORITY"
+            :placeholder="$t('cmdb.ciType.ciType')"
+            @close="closeCiTypeGroup"
+            @open="openCiTypeGroup"
+            @input="inputCiTypeGroup"
+            :normalizer="
+              (node) => {
+                return {
+                  id: node.id || -1,
+                  label: node.alias || node.name || $t('other'),
+                  title: node.alias || node.name || $t('other'),
+                  children: node.ci_types,
+                }
+              }
+            "
+          >
+            <div
+              :title="node.label"
+              slot="option-label"
+              slot-scope="{ node }"
+              :style="{ width: '100%', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' }"
+            >
+              {{ node.label }}
+            </div>
+          </treeselect>
+          <a-input
+            v-model="fuzzySearch"
+            :style="{ display: 'inline-block', width: '200px' }"
+            :placeholder="$t('cmdb.components.pleaseSearch')"
+            @pressEnter="emitRefresh"
+          >
+            <a-icon
+              type="search"
+              slot="suffix"
+              :style="{ color: fuzzySearch ? '#2f54eb' : '#d9d9d9', cursor: 'pointer' }"
+              @click="emitRefresh"
+            />
+            <a-tooltip slot="prefix" placement="bottom" :overlayStyle="{ maxWidth: '550px', whiteSpace: 'pre-line' }">
+              <template slot="title">
+                {{ $t('cmdb.components.ciSearchTips') }}
+              </template>
+              <a><a-icon type="question-circle"/></a>
+            </a-tooltip>
+          </a-input>
+          <a-tooltip :title="$t('reset')">
+            <a-button @click="reset">{{ $t('reset') }}</a-button>
+          </a-tooltip>
+          <FilterComp
+            ref="filterComp"
+            :canSearchPreferenceAttrList="canSearchPreferenceAttrList"
+            @setExpFromFilter="setExpFromFilter"
+            :expression="expression"
+            placement="bottomLeft"
+          >
+            <div slot="popover_item" class="search-form-bar-filter">
+              <a-icon class="search-form-bar-filter-icon" type="filter" />
+              {{ $t('cmdb.components.conditionFilter') }}
+              <a-icon class="search-form-bar-filter-icon" type="down" :style="{ color: '#d9d9d9' }" />
+            </div>
+          </FilterComp>
+          <a-input
+            v-if="isShowExpression"
+            v-model="expression"
+            v-show="!selectedRowKeys.length"
+            @focus="
+              () => {
+                isFocusExpression = true
+              }
+            "
+            @blur="
+              () => {
+                isFocusExpression = false
+              }
+            "
+            :class="{ 'ci-searchform-expression': true, 'ci-searchform-expression-has-value': expression }"
+            :style="{ width }"
+            :placeholder="placeholder"
+            @keyup.enter="emitRefresh"
+          >
+            <a-icon slot="suffix" type="check-circle" @click="handleCopyExpression" />
+          </a-input>
+          <slot></slot>
+        </a-space>
+      </div>
+      <a-space>
+        <slot name="extraContent"></slot>
+        <a-tooltip :title="$t('cmdb.components.attributeDesc')" v-if="type === 'relationView'">
+          <a
+            @click="
+              () => {
+                $refs.metadataDrawer.open(typeId)
+              }
+            "
+          ><a-icon
+            v-if="type === 'relationView'"
+            type="question-circle"
+          /></a>
+        </a-tooltip>
+      </a-space>
+    </div>
+    <MetadataDrawer ref="metadataDrawer" />
+  </div>
+</template>
+
+<script>
+import _ from 'lodash'
+import Treeselect from '@riophae/vue-treeselect'
+import MetadataDrawer from '../../views/ci/modules/MetadataDrawer.vue'
+import FilterComp from '@/components/CMDBFilterComp'
+import { getCITypeGroups } from '../../api/ciTypeGroup'
+export default {
+  name: 'SearchForm',
+  components: { MetadataDrawer, FilterComp, Treeselect },
+  props: {
+    preferenceAttrList: {
+      type: Array,
+      required: true,
+    },
+    isShowExpression: {
+      type: Boolean,
+      default: true,
+    },
+    typeId: {
+      type: Number,
+      default: null,
+    },
+    type: {
+      type: String,
+      default: '',
+    },
+    selectedRowKeys: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      // Advanced Search Expand/Close
+      advanced: false,
+      queryParam: {},
+      isFocusExpression: false,
+      expression: '',
+      fuzzySearch: '',
+      currenCiType: [],
+      ciTypeGroup: [],
+      lastCiType: [],
+    }
+  },
+
+  computed: {
+    placeholder() {
+      return this.isFocusExpression ? this.$t('cmdb.components.ciSearchTips2') : this.$t('cmdb.ciType.expr')
+    },
+    width() {
+      return '200px'
+    },
+    canSearchPreferenceAttrList() {
+      return this.preferenceAttrList.filter((item) => item.value_type !== '6')
+    },
+  },
+  watch: {
+    '$route.path': function(newValue, oldValue) {
+      this.queryParam = {}
+      this.expression = ''
+      this.fuzzySearch = ''
+    },
+  },
+  inject: {
+    setPreferenceSearchCurrent: {
+      from: 'setPreferenceSearchCurrent',
+      default: null,
+    },
+  },
+  mounted() {
+    if (this.type === 'resourceSearch') {
+      this.getCITypeGroups()
+    }
+    if (this.typeId) {
+      this.currenCiType = [this.typeId]
+    }
+  },
+  methods: {
+    // toggleAdvanced() {
+    //   this.advanced = !this.advanced
+    // },
+    getCITypeGroups() {
+      getCITypeGroups({ need_other: true }).then((res) => {
+        this.ciTypeGroup = res
+          .filter((item) => item.ci_types && item.ci_types.length)
+          .map((item) => {
+            item.id = `parent_${item.id || -1}`
+            return { ..._.cloneDeep(item) }
+          })
+      })
+    },
+    reset() {
+      this.queryParam = {}
+      this.expression = ''
+      this.fuzzySearch = ''
+      this.currenCiType = []
+      this.emitRefresh()
+    },
+    setExpFromFilter(filterExp) {
+      const regSort = /(?<=sort=).+/g
+      const expSort = this.expression.match(regSort) ? this.expression.match(regSort)[0] : undefined
+      let expression = ''
+      if (filterExp) {
+        expression = `q=${filterExp}`
+      }
+      if (expSort) {
+        expression += `&sort=${expSort}`
+      }
+      this.expression = expression
+      this.emitRefresh()
+    },
+    handleSubmit() {
+      this.$refs.filterComp.handleSubmit()
+    },
+    openCiTypeGroup() {
+      this.lastCiType = _.cloneDeep(this.currenCiType)
+    },
+    closeCiTypeGroup(value) {
+      if (!_.isEqual(value, this.lastCiType)) {
+        this.$emit('updateAllAttributesList', value)
+      }
+    },
+    inputCiTypeGroup(value) {
+      if (!value || !value.length) {
+        this.$emit('updateAllAttributesList', value)
+      }
+    },
+    emitRefresh() {
+      if (this.setPreferenceSearchCurrent) {
+        this.setPreferenceSearchCurrent(null)
+      }
+      this.$nextTick(() => {
+        this.$emit('refresh', true)
+      })
+    },
+    handleCopyExpression() {
+      this.$emit('copyExpression')
+    },
+  },
+}
+</script>
+<style lang="less">
+@import '../../views/index.less';
+.ci-searchform-expression {
+  > input {
+    border-bottom: 2px solid #d9d9d9;
+    border-top: none;
+    border-left: none;
+    border-right: none;
+    &:hover,
+    &:focus {
+      border-bottom: 2px solid @primary-color;
+    }
+    &:focus {
+      box-shadow: 0 2px 2px -2px #1f78d133;
+    }
+  }
+  .ant-input-suffix {
+    color: #d9d9d9;
+    cursor: pointer;
+  }
+}
+.ci-searchform-expression-has-value .ant-input-suffix {
+  color: @func-color_3;
+}
+.cmdb-search-form {
+  .ant-form-item-label {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+</style>
+
+<style lang="less" scoped>
+.search-form-bar {
+  margin-bottom: 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 32px;
+  .search-form-bar-filter {
+    .ops_display_wrapper(transparent);
+    .search-form-bar-filter-icon {
+      color: @primary-color;
+      font-size: 12px;
+    }
+  }
+}
+</style>

cmdb-ui/src/modules/cmdb/router/index.js

@@ -16,12 +16,6 @@ const genCmdbRoutes = async () => {
         meta: { title: 'dashboard', icon: 'ops-cmdb-dashboard', selectedIcon: 'ops-cmdb-dashboard', keepAlive: false },
         component: () => import('../views/dashboard/index_v2.vue')
       },
-      {
-        path: '/cmdb/topoviews',
-        name: 'cmdb_topology_views',
-        meta: { title: 'cmdb.menu.topologyView', appName: 'cmdb', icon: 'ops-topology_view', selectedIcon: 'ops-topology_view', keepAlive: false },
-        component: () => import('../views/topology_view/index.vue')
-      },
       {
         path: '/cmdb/disabled1',
         name: 'cmdb_disabled1',
@@ -149,30 +143,21 @@ const genCmdbRoutes = async () => {
   }
   // Dynamically add subscription items and business relationships
   const [preference, relation] = await Promise.all([getPreference(), getRelationView()])
-  const resourceViewsIndex = routes.children.findIndex(item => item.name === 'cmdb_resource_views')
-  preference.group_types.forEach(group => {
-    if (preference.group_types.length > 1) {
-      routes.children[resourceViewsIndex].children.push({
-        path: `/cmdb/instances/types/group${group.id}`,
-        name: `cmdb_instances_group_${group.id}`,
-        meta: { title: group.name || 'other', disabled: true, style: 'margin-left: 12px' },
-      })
-    }
-    group.ci_types.forEach(item => {
-      routes.children[resourceViewsIndex].children.push({
-        path: `/cmdb/instances/types/${item.id}`,
-        component: () => import(`../views/ci/index`),
-        name: `cmdb_${item.id}`,
-        meta: { title: item.alias, keepAlive: false, typeId: item.id, name: item.name, customIcon: item.icon },
-        // hideChildrenInMenu: true // Force display of MenuItem instead of SubMenu
-      })
+
+  preference.forEach(item => {
+    routes.children[2].children.push({
+      path: `/cmdb/instances/types/${item.id}`,
+      component: () => import(`../views/ci/index`),
+      name: `cmdb_${item.id}`,
+      meta: { title: item.alias, keepAlive: false, typeId: item.id, name: item.name, customIcon: item.icon },
+      // hideChildrenInMenu: true // Force display of MenuItem instead of SubMenu
     })
   })
   const lastTypeId = window.localStorage.getItem('ops_ci_typeid') || undefined
-  if (lastTypeId && preference.type_ids.some(item => item === Number(lastTypeId))) {
+  if (lastTypeId && preference.some(item => item.id === Number(lastTypeId))) {
     routes.redirect = `/cmdb/instances/types/${lastTypeId}`
-  } else if (routes.children[resourceViewsIndex]?.children?.length > 0) {
-    routes.redirect = routes.children[resourceViewsIndex].children.find(item => !item.hidden && !item.meta.disabled)?.path
+  } else if (routes.children[2]?.children?.length > 0) {
+    routes.redirect = routes.children[2].children.find(item => !item.hidden)?.path
   } else {
     routes.redirect = '/cmdb/dashboard'
   }
@@ -184,7 +169,7 @@ const genCmdbRoutes = async () => {
       meta: { title: item[0], icon: 'ops-cmdb-relation', selectedIcon: 'ops-cmdb-relation', keepAlive: false, name: item[0] },
     }
   })
-  routes.children.splice(resourceViewsIndex, 0, ...relationViews)
+  routes.children.splice(2, 0, ...relationViews)
   return routes
 }
 

cmdb-ui/src/modules/cmdb/views/ci/index.vue

@@ -167,20 +167,16 @@
               #default="{ row }"
             >
               <span v-if="col.value_type === '6' && row[col.field]">{{ row[col.field] }}</span>
-              <template v-else-if="col.is_link && row[col.field]">
-                <a
-                  v-for="(item, linkIndex) in (col.is_list ? row[col.field] : [row[col.field]])"
-                  :key="linkIndex"
-                  :href="
-                    item.startsWith('http') || item.startsWith('https')
-                      ? `${item}`
-                      : `http://${item}`
-                  "
-                  target="_blank"
-                >
-                  {{ item }}
-                </a>
-              </template>
+              <a
+                v-else-if="col.is_link && row[col.field]"
+                :href="
+                  row[col.field].startsWith('http') || row[col.field].startsWith('https')
+                    ? `${row[col.field]}`
+                    : `http://${row[col.field]}`
+                "
+                target="_blank"
+              >{{ row[col.field] }}</a
+              >
               <PasswordField
                 v-else-if="col.is_password && row[col.field]"
                 :ci_id="row._id"

cmdb-ui/src/modules/cmdb/views/ci/modules/MetadataDrawer.vue

@@ -163,12 +163,6 @@ export default {
           width: 110,
           help: this.$t('cmdb.ci.tips10'),
         },
-        {
-          field: 'is_dynamic',
-          title: this.$t('cmdb.ciType.isDynamic'),
-          width: 110,
-          help: this.$t('cmdb.ciType.dynamicTips'),
-        },
       ]
     },
   },

cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailRelation.vue

@@ -269,7 +269,7 @@ export default {
       return { nodes, edges }
     },
     exsited_ci() {
-      const _exsited_ci = [this.ciId]
+      const _exsited_ci = [this.typeId]
       this.parentCITypes.forEach((parent) => {
         if (this.firstCIs[parent.name]) {
           this.firstCIs[parent.name].forEach((parentCi) => {

cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailRelationTopo/index.vue

@@ -100,37 +100,35 @@ export default {
         const r = res.result[i]
         if (!this.exsited_ci.includes(r._id)) {
           const _findCiType = ci_types_list.find((item) => item.id === r._type)
-          if (_findCiType) {
-            const { attributes } = await getCITypeAttributesById(_findCiType.id)
-            const unique_id = _findCiType.show_id || _findCiType.unique_id
-            const _findUnique = attributes.find((attr) => attr.id === unique_id)
-            const unique_name = _findUnique?.name
-            const unique_alias = _findUnique?.alias || _findUnique?.name || ''
-            newNodes.push({
-              id: `${r._id}`,
-              Class: Node,
-              title: r.ci_type_alias || r.ci_type,
-              name: r.ci_type,
-              side: side,
-              unique_alias,
-              unique_name,
-              unique_value: r[unique_name],
-              children: [],
-              icon: _findCiType?.icon || '',
-              endpoints: [
-                {
-                  id: 'left',
-                  orientation: [-1, 0],
-                  pos: [0, 0.5],
-                },
-                {
-                  id: 'right',
-                  orientation: [1, 0],
-                  pos: [0, 0.5],
-                },
-              ],
-            })
-          }
+          const { attributes } = await getCITypeAttributesById(_findCiType.id)
+          const unique_id = _findCiType.show_id || _findCiType.unique_id
+          const _findUnique = attributes.find((attr) => attr.id === unique_id)
+          const unique_name = _findUnique?.name
+          const unique_alias = _findUnique?.alias || _findUnique?.name || ''
+          newNodes.push({
+            id: `${r._id}`,
+            Class: Node,
+            title: r.ci_type_alias || r.ci_type,
+            name: r.ci_type,
+            side: side,
+            unique_alias,
+            unique_name,
+            unique_value: r[unique_name],
+            children: [],
+            icon: _findCiType?.icon || '',
+            endpoints: [
+              {
+                id: 'left',
+                orientation: [-1, 0],
+                pos: [0, 0.5],
+              },
+              {
+                id: 'right',
+                orientation: [1, 0],
+                pos: [0, 0.5],
+              },
+            ],
+          })
         }
         newEdges.push({
           id: `${r._id}`,

cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue

@@ -29,7 +29,7 @@
                         ? attr.default.default
                         : attr.default.default.split(',')
                       : attr.default.default
-                    : attr.is_list ? [] : null,
+                    : null,
               },
             ]"
             :placeholder="$t('placeholder2')"

cmdb-ui/src/modules/cmdb/views/ci_types/adModal.vue

@@ -1,10 +1,6 @@
 <template>
   <a-modal width="800px" :visible="visible" @ok="handleOK" @cancel="handleCancel" :closable="false">
-    <Discovery
-      :isSelected="true"
-      :style="{ maxHeight: '75vh', overflow: 'auto' }"
-      v-if="visible"
-    />
+    <Discovery :isSelected="true" :style="{ maxHeight: '75vh', overflow: 'auto' }" />
     <template #footer>
       <a-space>
         <a-button @click="handleCancel">{{ $t('cancel') }}</a-button>
@@ -18,7 +14,7 @@
 <script>
 import _ from 'lodash'
 import Discovery from '../discovery'
-
+import { postCITypeDiscovery } from '../../api/discovery'
 export default {
   name: 'ADModal',
   components: { Discovery },
@@ -53,17 +49,20 @@ export default {
     },
     async handleOK() {
       if (this.selectedIds && this.selectedIds.length) {
-        const adCITypeList = this.selectedIds.map((item, index) => {
-          return {
-            adr_id: item.id,
-            id: new Date().getTime() + index,
-            extra_option: {
-              alias: ''
-            },
-            isClient: true,
-          }
+        const promises = this.selectedIds.map(({ id, type }) => {
+          return postCITypeDiscovery(this.CITypeId, { adr_id: id, interval: type === 'agent' ? 300 : 3600 })
         })
-        this.$emit('pushCITypeList', adCITypeList)
+        await Promise.all(promises)
+          .then((res) => {
+            this.getCITypeDiscovery(res[0].id)
+            this.$message.success(this.$t('addSuccess'))
+          })
+          .catch(() => {
+            this.getCITypeDiscovery()
+          })
+          .finally(() => {
+            this.handleCancel()
+          })
       }
       this.handleCancel()
     },

cmdb-ui/src/modules/cmdb/views/ci_types/adTab.vue

@@ -1,105 +0,0 @@
-<template>
-  <div class="ad-container" :style="{ height: `${windowHeight - 130}px` }">
-    <div class="ad-btns">
-      <div
-        :class="['ad-btns-item', activeKey === item.key ? 'ad-btns-item_active' : '']"
-        v-for="item in tabs"
-        :key="item.key"
-        @click="changeTab(item.key)"
-      >
-        {{ $t(item.label) }}
-      </div>
-    </div>
-    <AttrAD
-      v-if="activeKey === AD_TAB_KEY.ATTR"
-      :CITypeId="CITypeId"
-    ></AttrAD>
-    <RelationAD
-      v-else-if="activeKey === AD_TAB_KEY.RELATION"
-      :CITypeId="CITypeId"
-    ></RelationAD>
-  </div>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import AttrAD from './attrAD.vue'
-import RelationAD from './relationAD.vue'
-
-const AD_TAB_KEY = {
-  ATTR: '1',
-  RELATION: '2'
-}
-
-export default {
-  name: 'ADTab',
-  components: {
-    AttrAD,
-    RelationAD,
-  },
-  props: {
-    CITypeId: {
-      type: Number,
-      default: null,
-    },
-  },
-  data() {
-    return {
-      AD_TAB_KEY,
-      activeKey: AD_TAB_KEY.ATTR,
-      tabs: [
-        {
-          key: AD_TAB_KEY.ATTR,
-          label: 'cmdb.ciType.attributeAD'
-        },
-        {
-          key: AD_TAB_KEY.RELATION,
-          label: 'cmdb.ciType.relationAD'
-        }
-      ]
-    }
-  },
-  computed: {
-    ...mapState({
-      windowHeight: (state) => state.windowHeight,
-    }),
-  },
-  methods: {
-    changeTab(activeKey) {
-      this.activeKey = activeKey
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.ad-btns {
-  display: inline-flex;
-  align-items: center;
-  border: solid 1px @border-color-base;
-  margin-left: 17px;
-  margin-bottom: 15px;
-
-  &-item {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 6px 20px;
-    background-color: #FFFFFF;
-    cursor: pointer;
-
-    color: @text-color_2;
-    font-size: 14px;
-    font-weight: 400;
-
-    &:not(:first-child) {
-      border-left: solid 1px @border-color-base;
-    }
-
-    &_active {
-      background-color: @primary-color;
-      color: #FFFFFF;
-    }
-  }
-}
-</style>

cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue

@@ -1,28 +1,37 @@
 <template>
   <div class="attr-ad" :style="{ height: `${windowHeight - 130}px` }">
     <div v-if="adCITypeList && adCITypeList.length">
-      <AttrADTabs
-        :adCITypeList="adCITypeList"
-        :currentTab="currentTab"
-        :getADCITypeParam="getADCITypeParam"
-        @changeTab="changeTab"
-        @changeAlias="changeAlias"
-        @deleteADT="deleteADT"
-        @clickAdd="() => $refs.adModal.open()"
-      />
-      <AttrADTabpane
-        :key="`attrAdTabpane_${currentTab}`"
-        :ref="`attrAdTabpaneRef`"
-        :adr_id="currentADData.adr_id"
-        :CITypeId="CITypeId"
-        :adrList="adrList"
-        :adCITypeList="adCITypeList"
-        :currentAdt="currentADData"
-        :ciTypeAttributes="ciTypeAttributes"
-        :currentAdr="getADCITypeParam(currentADData.adr_id, undefined, true)"
-        @openEditDrawer="(data, type, adType) => openEditDrawer(data, type, adType)"
-        @handleSave="saveTabpane"
-      />
+      <a-tabs size="small" v-model="currentTab">
+        <a-tab-pane v-for="item in adCITypeList" :key="item.id">
+          <a-space slot="tab">
+            <span v-if="item.extra_option && item.extra_option.alias">{{ item.extra_option.alias }}</span>
+            <span v-else>{{ getADCITypeParam(item.adr_id) }}</span>
+            <a-icon type="close-circle" @click="(e) => deleteADT(e, item)" />
+          </a-space>
+          <AttrADTabpane
+            :ref="`attrAdTabpane_${item.id}`"
+            :adr_id="item.adr_id"
+            :adrList="adrList"
+            :adCITypeList="adCITypeList"
+            :currentAdt="item"
+            :ciTypeAttributes="ciTypeAttributes"
+            :currentAdr="getADCITypeParam(item.adr_id, undefined, true)"
+            @openEditDrawer="(data, type, adType) => openEditDrawer(data, type, adType)"
+            @handleSave="getCITypeDiscovery"
+          />
+        </a-tab-pane>
+        <a-space
+          @click="
+            () => {
+              $refs.adModal.open()
+            }
+          "
+          slot="tabBarExtraContent"
+          :style="{ cursor: 'pointer' }"
+        >
+          <ops-icon type="icon-xianxing-tianjia" :style="{ color: '#2F54EB' }" /><a>{{ $t('add') }}</a>
+        </a-space>
+      </a-tabs>
     </div>
     <a-empty
       v-else
@@ -45,41 +54,28 @@
         {{ $t('add') }}
       </a-button>
     </a-empty>
-    <ADModal
-      ref="adModal"
-      :CITypeId="CITypeId"
-      @pushCITypeList="pushCITypeList"
-      @addPlugin="openEditDrawer(null, 'add', 'plugin')"
-    />
+    <ADModal ref="adModal" :CITypeId="CITypeId" @addPlugin="openEditDrawer(null, 'add', 'agent')" />
     <EditDrawer ref="editDrawer" :is_inner="false" @updateNotInner="updateNotInner" />
   </div>
 </template>
 
 <script>
-import _ from 'lodash'
 import { mapState } from 'vuex'
+import ADModal from './adModal.vue'
 import {
   getDiscovery,
   getCITypeDiscovery,
   deleteCITypeDiscovery,
+  postCITypeDiscovery,
   deleteDiscovery,
-  putCITypeDiscovery
 } from '../../api/discovery'
 import { getCITypeAttributesById } from '../../api/CITypeAttr'
-
-import ADModal from './adModal.vue'
 import AttrADTabpane from './attrADTabpane.vue'
 import EditDrawer from '../discovery/editDrawer.vue'
-import AttrADTabs from './attrADTabs.vue'
 
 export default {
   name: 'AttrAutoDiscovery',
-  components: {
-    ADModal,
-    AttrADTabpane,
-    EditDrawer,
-    AttrADTabs
-  },
+  components: { ADModal, AttrADTabpane, EditDrawer },
   props: {
     CITypeId: {
       type: Number,
@@ -90,8 +86,7 @@ export default {
     return {
       ciTypeAttributes: [],
       adrList: [],
-      serviceCITYpeList: [],
-      clientCITypeList: [],
+      adCITypeList: [],
       currentTab: '',
       deletePlugin: false,
     }
@@ -100,13 +95,6 @@ export default {
     ...mapState({
       windowHeight: (state) => state.windowHeight,
     }),
-    currentADData() {
-      return this?.adCITypeList?.find((item) => item?.id === this?.currentTab) ?? {}
-    },
-    adCITypeList() {
-      const uniqueArray = _.differenceBy(this.clientCITypeList, this.serviceCITYpeList, 'id')
-      return [...this.serviceCITYpeList, ...uniqueArray]
-    }
   },
   provide() {
     return {
@@ -118,7 +106,7 @@ export default {
       handler() {
         if (this.currentTab) {
           this.$nextTick(() => {
-            this.$refs[`attrAdTabpaneRef`].init()
+            this.$refs[`attrAdTabpane_${this.currentTab}`][0].init()
           })
         }
       },
@@ -133,7 +121,7 @@ export default {
       })
       if (this.currentTab) {
         this.$nextTick(() => {
-          this.$refs[`attrAdTabpaneRef`].init()
+          this.$refs[`attrAdTabpane_${this.currentTab}`][0].init()
         })
       }
     })
@@ -146,34 +134,15 @@ export default {
     },
     async getCITypeDiscovery(currentTab) {
       await getCITypeDiscovery(this.CITypeId).then((res) => {
-        const serviceCITYpeList = res.filter((item) => item.adr_id)
-        serviceCITYpeList.forEach((item) => {
-          const _find = this.adrList.find((adr) => adr.id === item.adr_id)
-          item.icon = _find?.option?.icon || {}
-        })
-
-        this.serviceCITYpeList = serviceCITYpeList
-        this.$nextTick(() => {
-          if (this.adCITypeList && this.adCITypeList.length && !this.currentTab) {
-            this.currentTab = this.adCITypeList[0].id
-          }
-          if (currentTab) {
-            this.currentTab = currentTab
-          }
-        })
+        this.adCITypeList = res.filter((item) => item.adr_id)
+        if (this.adCITypeList && this.adCITypeList.length && !this.currentTab) {
+          this.currentTab = this.adCITypeList[0].id
+        }
+        if (currentTab) {
+          this.currentTab = currentTab
+        }
       })
     },
-    pushCITypeList(list) {
-      list.forEach((item) => {
-        const _find = this.adrList.find((adr) => adr.id === item.adr_id)
-        item.icon = _find?.option?.icon || {}
-      })
-      this.$set(this, 'clientCITypeList', [
-        ...this.clientCITypeList,
-        ...list
-      ])
-      this.currentTab = list[0].id
-    },
     getADCITypeParam(adr_id, params = 'name', isAll = false) {
       const _find = this.adrList.find((item) => item.id === adr_id)
       if (_find) {
@@ -183,115 +152,52 @@ export default {
         return _find[`${params}`]
       }
     },
-    async deleteADT(item) {
+    async deleteADT(e, item) {
+      e.preventDefault()
+      e.stopPropagation()
       const that = this
-      const is_plugin = this.getADCITypeParam(item.adr_id, 'is_plugin')
-
       this.$confirm({
         title: that.$t('cmdb.ciType.confirmDeleteADT', { pluginName: `${item?.extra_option?.alias || this.getADCITypeParam(item.adr_id)}` }),
-        content: (h) => {
-          if (!is_plugin) {
-            return ''
-          }
-          return (
-            <div>
-              <a-checkbox
-                v-model={that.deletePlugin}
-              >
-                {that.$t('cmdb.ciType.deletePlugin')}
-              </a-checkbox>
-            </div>
-          )
-        },
-        onOk () {
-          if (item.isClient) {
-            const adtIndex = that.clientCITypeList.findIndex((listItem) => listItem.id === item.id)
-            if (adtIndex !== -1) {
-              that.clientCITypeList.splice(adtIndex, 1)
-              that.currentTab = that?.adCITypeList?.[0]?.id ?? ''
-
-              if (is_plugin && that.deletePlugin) {
-                that.deleteDiscovery(item.adr_id)
-              }
+        content: (h) => (
+          <div>
+            <a-checkbox v-model={that.deletePlugin}>{that.$t('cmdb.ciType.deletePlugin')}</a-checkbox>
+          </div>
+        ),
+        onOk() {
+          deleteCITypeDiscovery(item.id).then(async () => {
+            if (that.currentTab === item.id) {
+              that.currentTab = ''
             }
-          } else {
-            deleteCITypeDiscovery(item.id).then(async () => {
-              if (that.currentTab === item.id) {
-                that.currentTab = ''
-              }
-              that.$message.success(that.$t('deleteSuccess'))
-              that.getCITypeDiscovery()
-              if (is_plugin && that.deletePlugin) {
-                that.deleteDiscovery(item.adr_id)
-              }
-              that.deletePlugin = false
-            })
-          }
+            that.$message.success(that.$t('deleteSuccess'))
+            that.getCITypeDiscovery()
+            if (that.deletePlugin) {
+              await deleteDiscovery(item.adr_id).finally(() => {
+                that.deletePlugin = false
+              })
+            }
+            that.deletePlugin = false
+          })
         },
         onCancel() {
           that.deletePlugin = false
         },
       })
     },
-
-    deleteDiscovery(id) {
-      deleteDiscovery(id).finally(async () => {
-        this.deletePlugin = false
-        await this.getDiscovery()
-      })
-    },
-
     openEditDrawer(data, type, adType) {
       this.$refs.editDrawer.open(data, type, adType)
     },
     async updateNotInner(adr) {
       const _idx = this.adCITypeList.findIndex((item) => item.adr_id === adr.id)
-      await this.getDiscovery()
+      let res
       if (_idx < 0) {
-        const ciType = {
-          adr_id: adr.id,
-          id: new Date().getTime(),
-          extra_option: {
-            alias: ''
-          },
-          isClient: true,
-        }
-        this.pushCITypeList([ciType])
+        res = await postCITypeDiscovery(this.CITypeId, { adr_id: adr.id, interval: 300 })
       }
+      await this.getDiscovery()
+      await this.getCITypeDiscovery(res?.id ?? undefined)
       this.$nextTick(() => {
-        this.$refs[`attrAdTabpaneRef`].init()
+        this.$refs[`attrAdTabpane_${this.currentTab}`][0].init()
       })
     },
-
-    changeTab(id) {
-      console.log('changeTab', id)
-      this.currentTab = id
-    },
-
-    changeAlias({ id, value, isClient }) {
-      if (isClient) {
-        const adtIndex = this.clientCITypeList.findIndex((item) => item.id === id)
-        this.clientCITypeList[adtIndex].extra_option.alias = value
-      } else {
-        const params = {
-          extra_option: {
-            alias: value
-          }
-        }
-        putCITypeDiscovery(id, params).then(async () => {
-          this.$message.success(this.$t('saveSuccess'))
-          await this.getCITypeDiscovery()
-        })
-      }
-    },
-
-    saveTabpane(id) {
-      const adtIndex = this.clientCITypeList.findIndex((listItem) => listItem.id === this.currentTab)
-      if (adtIndex !== -1) {
-        this.clientCITypeList.splice(adtIndex, 1)
-      }
-      this.getCITypeDiscovery(id)
-    }
   },
 }
 </script>
@@ -300,7 +206,6 @@ export default {
 .attr-ad {
   position: relative;
   padding: 0 20px;
-
   .attr-ad-header {
     width: 100%;
     display: inline-flex;
@@ -311,13 +216,7 @@ export default {
     border-left: 4px solid @primary-color;
     font-size: 16px;
     color: rgba(0, 0, 0, 0.75);
-    margin-top: 30px;
   }
-
-  .attr-ad-header-margin {
-    margin-bottom: 0px;
-  }
-
   .attr-ad-footer {
     width: 60%;
     text-align: right;

cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="attr-ad-tab-pane" :style="{ height: `${windowHeight - 254}px` }">
+  <div :style="{ height: `${windowHeight - 187}px`, overflow: 'auto', position: 'relative' }">
     <a
       v-if="!adrIsInner"
       :style="{ position: 'absolute', right: 0, top: 0 }"
       @click="
         () => {
-          $emit('openEditDrawer', currentAdr, 'edit', 'plugin')
+          $emit('openEditDrawer', currentAdr, 'edit', 'agent')
         }
       "
     >
@@ -14,43 +14,75 @@
         <span>{{ $t('edit') }}</span>
       </a-space>
     </a>
+    <div>{{ $t('alias') }}：<a-input v-model="alias" style="width:200px;" /></div>
     <div class="attr-ad-header">{{ $t('cmdb.ciType.attributeMap') }}</div>
-    <div class="attr-ad-attributemap-main">
-      <AttrMapTable
-        v-if="adrType === 'agent'"
-        ref="attrMapTable"
-        :ruleType="adrType"
-        :tableData="tableData"
-        :ciTypeAttributes="ciTypeAttributes"
-        :uniqueKey="uniqueKey"
-      />
-      <HttpSnmpAD
-        v-else
-        :isEdit="true"
-        ref="httpSnmpAd"
-        :ruleType="adrType"
-        :ruleName="adrName"
-        :ciTypeAttributes="ciTypeAttributes"
-        :adCITypeList="adCITypeList"
-        :currentTab="adr_id"
-        :uniqueKey="uniqueKey"
-        :style="{ marginBottom: '20px' }"
-      />
-    </div>
-    <template v-if="adrType === 'snmp'">
-      <div class="attr-ad-header">{{ $t('cmdb.ciType.nodeConfig') }}</div>
-      <a-form :form="form3" layout="inline" class="attr-ad-snmp-form">
-        <NodeSetting ref="nodeSetting" :initNodes="nodes" :form="form3" />
-      </a-form>
-    </template>
-    <div class="attr-ad-header">{{ $t('cmdb.ciType.adExecConfig') }}</div>
-    <a-form-model
-      :model="form"
-      :labelCol="labelCol"
-      labelAlign="left"
-      :wrapperCol="{ span: 14 }"
-      class="attr-ad-form"
+    <vxe-table
+      v-if="adrType === 'agent'"
+      ref="xTable"
+      :edit-config="{ trigger: 'click', mode: 'cell' }"
+      size="mini"
+      stripe
+      class="ops-stripe-table"
+      :data="tableData"
+      :style="{ width: '700px', marginBottom: '20px' }"
     >
+      <vxe-colgroup :title="$t('cmdb.ciType.autoDiscovery')">
+        <vxe-column field="name" :title="$t('name')"> </vxe-column>
+        <vxe-column field="type" :title="$t('type')"> </vxe-column>
+        <vxe-column field="desc" :title="$t('desc')"> </vxe-column>
+      </vxe-colgroup>
+      <vxe-colgroup :title="$t('cmdb.ciType.attributes')">
+        <vxe-column field="attr" :title="$t('name')" :edit-render="{}">
+          <template #default="{row}">
+            {{ row.attr }}
+          </template>
+          <template #edit="{ row }">
+            <vxe-select
+              filterable
+              clearable
+              v-model="row.attr"
+              type="text"
+              :options="ciTypeAttributes"
+              transfer
+            ></vxe-select>
+          </template>
+        </vxe-column>
+      </vxe-colgroup>
+    </vxe-table>
+    <HttpSnmpAD
+      v-else
+      :isEdit="true"
+      ref="httpSnmpAd"
+      :ruleType="adrType"
+      :ruleName="adrName"
+      :ciTypeAttributes="ciTypeAttributes"
+      :adCITypeList="adCITypeList"
+      :currentTab="adr_id"
+      :style="{ marginBottom: '20px' }"
+    />
+    <a-form-model
+      v-if="adrType === 'http'"
+      :model="form2"
+      :labelCol="{ span: 2 }"
+      :wrapperCol="{ span: 8 }"
+      :style="{ margin: '20px 0' }"
+    >
+      <a-form-model-item label="key">
+        <a-input-password v-model="form2.key" />
+      </a-form-model-item>
+      <a-form-model-item label="secret">
+        <a-input-password v-model="form2.secret" />
+      </a-form-model-item>
+    </a-form-model>
+    <a-form :form="form3" v-if="adrType === 'snmp'" class="attr-ad-snmp-form">
+      <a-col :span="24">
+        <a-form-item :label="$t('cmdb.ciType.node')" :labelCol="{ span: 2 }" :wrapperCol="{ span: 20 }">
+          <MonitorNodeSetting ref="monitorNodeSetting" :initNodes="nodes" :form="form3" />
+        </a-form-item>
+      </a-col>
+    </a-form>
+    <div class="attr-ad-header">{{ $t('cmdb.ciType.adExecConfig') }}</div>
+    <a-form-model :model="form" :labelCol="{ span: 2 }" :wrapperCol="{ span: 20 }">
       <a-form-model-item :label="$t('cmdb.ciType.adExecTarget')">
         <CustomRadio v-model="agent_type" :radioList="agentTypeRadioList">
           <a-input
@@ -71,60 +103,16 @@
           </a-input>
         </CustomRadio>
       </a-form-model-item>
-      <a-form-model-item
-        :labelCol="labelCol"
-        :label="$t('cmdb.ciType.adAutoInLib')"
-        :extra="$t('cmdb.ciType.adAutoInLibTip')"
-      >
+      <a-form-model-item :label="$t('cmdb.ciType.adAutoInLib')">
         <a-switch v-model="form.auto_accept" />
       </a-form-model-item>
-      <a-form-model-item
-        :labelCol="labelCol"
-        :wrapperCol="{ span: 6 }"
-        :label="$t('cmdb.ciType.adInterval')"
-      >
-        <el-popover v-model="cronVisible" trigger="click">
-          <template slot>
-            <Vcrontab
-              v-if="adrType"
-              ref="cronTab"
-              :hideComponent="['second', 'year']"
-              :expression="cron"
-              :hasFooter="true"
-              @fill="crontabFill"
-              @hide="hideCron"
-            ></Vcrontab>
-          </template>
-          <a-input
-            v-model="cron"
-            slot="reference"
-            :placeholder="$t('cmdb.ciType.cronTips')"
-          />
-        </el-popover>
-      </a-form-model-item>
     </a-form-model>
-    <template v-if="adrType === 'http'">
-      <div class="attr-ad-header attr-ad-header-margin">{{ $t('cmdb.ciType.cloudAccessKey') }}</div>
-      <div class="public-cloud-info">{{ $t('cmdb.ciType.cloudAccessKeyTip') }}</div>
-      <a-form-model
-        :model="form2"
-        labelAlign="left"
-        :labelCol="labelCol"
-        :wrapperCol="{ span: 6 }"
-        class="attr-ad-form"
-      >
-        <a-form-model-item label="key">
-          <a-input-password v-model="form2.key" />
-        </a-form-model-item>
-        <a-form-model-item label="secret">
-          <a-input-password v-model="form2.secret" />
-        </a-form-model-item>
-      </a-form-model>
-    </template>
-
-    <AttrADTest
-      :adtId="currentAdt.id"
-    />
+    <div class="attr-ad-header">{{ $t('cmdb.ciType.adInterval') }}</div>
+    <CustomRadio :radioList="radioList" v-model="interval">
+      <span v-show="interval === 'interval'" slot="extra_interval">
+        <a-input-number v-model="intervalValue" :min="1" /> {{ $t('seconds') }}
+      </span>
+    </CustomRadio>
 
     <div class="attr-ad-footer">
       <a-button type="primary" @click="handleSave">{{ $t('save') }}</a-button>
@@ -137,26 +125,14 @@
 import { v4 as uuidv4 } from 'uuid'
 import { mapState } from 'vuex'
 import Vcrontab from '@/components/Crontab'
-import { putCITypeDiscovery, postCITypeDiscovery } from '../../api/discovery'
-
+import { putCITypeDiscovery } from '../../api/discovery'
 import HttpSnmpAD from '../../components/httpSnmpAD'
-import AttrMapTable from '@/modules/cmdb/components/attrMapTable/index.vue'
 import CMDBExprDrawer from '@/components/CMDBExprDrawer'
-import NodeSetting from '@/modules/cmdb/components/nodeSetting/index.vue'
-import AttrADTest from './attrADTest.vue'
-import { Popover } from 'element-ui'
+import MonitorNodeSetting from '@/components/MonitorNodeSetting'
 
 export default {
   name: 'AttrADTabpane',
-  components: {
-    Vcrontab,
-    HttpSnmpAD,
-    CMDBExprDrawer,
-    NodeSetting,
-    AttrMapTable,
-    AttrADTest,
-    ElPopover: Popover
-  },
+  components: { Vcrontab, HttpSnmpAD, CMDBExprDrawer, MonitorNodeSetting },
   props: {
     adr_id: {
       type: Number,
@@ -182,10 +158,6 @@ export default {
       type: Array,
       default: () => [],
     },
-    CITypeId: {
-      type: Number,
-      default: null,
-    },
   },
   data() {
     return {
@@ -199,7 +171,7 @@ export default {
         key: '',
         secret: '',
       },
-      interval: 'cron', // interval  cron
+      interval: 'interval', // interval  cron
       cron: '',
       intervalValue: 3,
       agent_type: 'agent_id',
@@ -212,57 +184,50 @@ export default {
         },
       ],
       form3: this.$form.createForm(this, { name: 'snmp_form' }),
-      cronVisible: false,
-      uniqueKey: '',
+      alias: '',
     }
   },
   computed: {
     ...mapState({
       windowHeight: (state) => state.windowHeight,
-      user: (state) => state.user,
+      userRoles: (state) => state.user.roles,
     }),
     adrType() {
-      return this.currentAdr?.type || ''
+      return this.currentAdr.type
     },
     adrName() {
-      return this.currentAdr?.name || ''
+      return this.currentAdr.name
     },
     adrIsInner() {
-      return this.currentAdr?.is_inner || ''
+      return this.currentAdr.is_inner
     },
     agentTypeRadioList() {
-      const radios = [
+      const { permissions = [] } = this.userRoles
+      if ((permissions.includes('cmdb_admin') || permissions.includes('admin')) && this.adrType !== 'http') {
+        return [
+          { value: 'all', label: this.$t('cmdb.ciType.allNodes') },
+          { value: 'agent_id', label: this.$t('cmdb.ciType.specifyNodes') },
+          { value: 'query_expr', label: this.$t('cmdb.ciType.selectFromCMDBTips') },
+        ]
+      }
+      return [
         { value: 'agent_id', label: this.$t('cmdb.ciType.specifyNodes') },
         { value: 'query_expr', label: this.$t('cmdb.ciType.selectFromCMDBTips') },
       ]
-
-      const permissions = this?.user?.roles?.permissions
-      if ((permissions.includes('cmdb_admin') || permissions.includes('admin')) && this.adrType === 'agent') {
-        radios.unshift({ value: 'all', label: this.$t('cmdb.ciType.allNodes') })
-      }
-
-      return radios
     },
     radioList() {
       return [
         { value: 'interval', label: this.$t('cmdb.ciType.byInterval') },
-        { value: 'cron', label: '按cron', layout: 'vertical' },
+        // { value: 'cron', label: '按cron', layout: 'vertical' },
       ]
     },
-    labelCol() {
-      const span = this.$i18n.locale === 'en' ? 4 : 2
-      return {
-        span
-      }
-    }
   },
   mounted() {},
   methods: {
     init() {
       const _find = this.adrList.find((item) => Number(item.id) === Number(this.adr_id))
       const _findADT = this.adCITypeList.find((item) => Number(item.id) === Number(this.currentAdt.id))
-      this.uniqueKey = _find?.unique_key ?? ''
-
+      this.alias = _findADT?.extra_option?.alias ?? ''
       if (this.adrType === 'http') {
         const { category = undefined, key = '', secret = '' } = _findADT?.extra_option ?? {}
         this.form2 = {
@@ -272,7 +237,7 @@ export default {
         this.$refs.httpSnmpAd.setCurrentCate(category)
       }
       if (this.adrType === 'snmp') {
-        this.nodes = _findADT?.extra_option?.nodes?.length ? _findADT?.extra_option?.nodes : [
+        this.nodes = _findADT?.extra_option?.nodes ?? [
           {
             id: uuidv4(),
             ip: '',
@@ -281,9 +246,9 @@ export default {
           },
         ]
         this.$nextTick(() => {
-          this.$refs.nodeSetting.initNodesFunc()
+          this.$refs.monitorNodeSetting.initNodesFunc()
           this.$nextTick(() => {
-            this.$refs.nodeSetting.setNodeField()
+            this.$refs.monitorNodeSetting.setNodeField()
           })
         })
       }
@@ -318,16 +283,23 @@ export default {
       } else {
         this.agent_type = this.agentTypeRadioList[0].value
       }
-
-      this.interval = 'cron'
-      this.cron = _findADT?.cron || ''
+      if (_findADT.interval || (!_findADT.interval && !_findADT.cron)) {
+        this.interval = 'interval'
+        this.intervalValue = _findADT.interval || ''
+      } else {
+        this.interval = 'cron'
+        this.cron = `0 ${_findADT.cron}`
+      }
+    },
+    getAttrNameByAttrName(attrName) {
+      const _find = this.ciTypeAttributes.find((item) => item.name === attrName)
+      return _find?.alias || _find?.name || ''
     },
-
     crontabFill(cron) {
       this.cron = cron
     },
     handleSave() {
-      const { currentAdt } = this
+      const { currentAdt, alias } = this
       let params
       if (this.adrType === 'http') {
         params = {
@@ -339,11 +311,11 @@ export default {
       }
       if (this.adrType === 'snmp') {
         params = {
-          extra_option: { nodes: this.$refs.nodeSetting?.getNodeValue() ?? [] },
+          extra_option: { nodes: this.$refs.monitorNodeSetting?.getNodeValue() ?? [] },
         }
       }
       if (this.adrType === 'agent') {
-        const $table = this.$refs.attrMapTable
+        const $table = this.$refs.xTable
         const { fullData: _tableData } = $table.getTableData()
         const attributes = {}
         _tableData.forEach((td) => {
@@ -368,14 +340,17 @@ export default {
           attributes,
         }
       }
-
+      if (this.interval === 'cron') {
+        this.$refs.cronTab.submitFill()
+      }
       params = {
         ...params,
         ...this.form,
+        type_id: this.CITypeId,
         adr_id: currentAdt.adr_id,
+        interval: this.interval === 'interval' ? this.intervalValue : null,
         cron: this.interval === 'cron' ? this.cron : null,
       }
-
       if (this.agent_type === 'agent_id' || this.agent_type === 'all') {
         params.query_expr = ''
         if (this.agent_type === 'agent_id' && !params.agent_id) {
@@ -383,7 +358,6 @@ export default {
           return
         }
       }
-
       if (this.agent_type === 'query_expr' || this.agent_type === 'all') {
         params.agent_id = ''
         if (this.agent_type === 'query_expr' && !params.query_expr) {
@@ -391,29 +365,16 @@ export default {
           return
         }
       }
-
-      if (!this.cron) {
-        this.$message.error(this.$t('cmdb.ciType.cronRequiredTip'))
-        return
-      }
-
-      if (currentAdt?.isClient) {
-        if (currentAdt?.extra_option) {
-          params.extra_option = {
-            ...(params?.extra_option || {}),
-            ...(currentAdt?.extra_option || {})
-          }
-        }
-        postCITypeDiscovery(this.CITypeId, params).then((res) => {
-          this.$message.success(this.$t('saveSuccess'))
-          this.$emit('handleSave', res.id)
-        })
+      if (params.extra_option) {
+        params.extra_option.alias = alias
       } else {
-        putCITypeDiscovery(currentAdt.id, params).then((res) => {
-          this.$message.success(this.$t('saveSuccess'))
-          this.$emit('handleSave', res.id)
-        })
+        params.extra_option = {}
+        params.extra_option.alias = alias
       }
+      putCITypeDiscovery(currentAdt.id, params).then((res) => {
+        this.$message.success(this.$t('saveSuccess'))
+        this.$emit('handleSave')
+      })
     },
     handleOpenCmdb() {
       this.$refs.cmdbDrawer.open()
@@ -424,41 +385,11 @@ export default {
         query_expr: `${text}`,
       }
     },
-    hideCron() {
-      this.cronVisible = false
-    },
   },
 }
 </script>
 
-<style lang="less" scoped>
-.attr-ad-tab-pane {
-  overflow-y: auto;
-  overflow-x: hidden;
-  position: relative;
-
-  .attr-ad-attributemap-main {
-    margin-left: 17px;
-  }
-
-  .attr-ad-form {
-    /deep/ .ant-form-item-label {
-      margin-left: 17px;
-    }
-
-    /deep/ .ant-form-item-control-wrapper {
-      // margin-left: -40px;
-    }
-  }
-
-  .public-cloud-info {
-    color: @text-color_3;
-    font-size: 12px;
-    font-weight: 400;
-    margin-left: 17px;
-    margin-bottom: 20px;
-  }
-}
+<style lang="less">
 .attr-ad-snmp-form {
   .ant-form-item {
     margin-bottom: 0;

cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabs.vue

@@ -1,183 +0,0 @@
-<template>
-  <div class="attr-ad-tabs">
-    <div
-      v-for="item in adCITypeList"
-      :key="item.id"
-      :class="['attr-ad-tab', currentTab === item.id ? 'attr-ad-tab_active' : '']"
-      @click="changeTab(item.id)"
-    >
-      <img
-        v-if="item.icon.id && item.icon.url"
-        :src="`/api/common-setting/v1/file/${item.icon.url}`"
-        class="attr-ad-tab-icon"
-      />
-      <ops-icon
-        v-else-if="item.icon.name"
-        :type="item.icon.name || 'caise-chajian'"
-        :style="{ color: item.icon.color }"
-        class="attr-ad-tab-icon"
-      />
-      <a-input
-        v-if="nameEditId === item.id"
-        v-model="nameEditValue"
-        :ref="`name-edit-${item.id}`"
-        size="small"
-        :autofocus="true"
-        @blur="changeAlias(item.isClient || false)"
-      />
-      <span v-else class="attr-ad-tab-name">
-        {{ item.extra_option && item.extra_option.alias ? item.extra_option.alias : getADCITypeParam(item.adr_id) }}
-      </span>
-      <a-icon
-        type="edit"
-        class="attr-ad-tab-edit"
-        @click="(e) => openNameEdit(e, item)"
-      />
-      <a-icon
-        type="delete"
-        class="attr-ad-tab-delete"
-        @click="(e) => deleteADT(e, item)"
-      />
-    </div>
-    <a-icon
-      type="plus-circle"
-      class="attr-ad-tabs-add"
-      @click="clickAdd"
-    ></a-icon>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AttrADTabs',
-  props: {
-    currentTab: {
-      type: [String, Number],
-      default: ''
-    },
-    adCITypeList: {
-      type: Array,
-      default: () => [],
-    },
-    getADCITypeParam: {
-      type: Function,
-      default: () => ''
-    }
-  },
-  data() {
-    return {
-      nameEditId: '',
-      nameEditValue: '',
-    }
-  },
-  methods: {
-    changeTab(id) {
-      this.$emit('changeTab', id)
-    },
-    openNameEdit(e, item) {
-      e.preventDefault()
-      e.stopPropagation()
-      this.nameEditId = item.id
-      if (item?.extra_option?.alias) {
-        this.nameEditValue = item.extra_option.alias
-      }
-      this.$nextTick(() => {
-        if (this.$refs?.[`name-edit-${item.id}`]?.[0]) {
-          this.$refs[`name-edit-${item.id}`][0].focus()
-        }
-      })
-    },
-    changeAlias(isClient) {
-      this.$emit('changeAlias', {
-        id: this.nameEditId,
-        value: this.nameEditValue,
-        isClient
-      })
-      this.$nextTick(() => {
-        this.nameEditId = ''
-        this.nameEditValue = ''
-      })
-    },
-    deleteADT(e, item) {
-      e.preventDefault()
-      e.stopPropagation()
-      this.$emit('deleteADT', item)
-    },
-    clickAdd() {
-      this.$emit('clickAdd')
-    }
-  }
-}
-</script>
-
-<style lang="less" scoepd>
-.attr-ad-tabs {
-  display: flex;
-  align-items: center;
-  width: 100%;
-  overflow-x: auto;
-  padding-bottom: 10px;
-
-  .attr-ad-tab {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 8px 24px;
-    margin-right: 12px;
-    background-color: @primary-color_7;
-    cursor: pointer;
-    flex-shrink: 0;
-
-    &-name {
-      font-weight: 400;
-      font-size: 12px;
-    }
-
-    &-icon {
-      font-size: 12px;
-      width: 12px;
-      height: 12px;
-      margin-right: 4px;
-    }
-
-    &-edit {
-      display: none;
-      font-size: 10px;
-      color: @text-color_4;
-      margin-left: 4px;
-    }
-
-    &-delete {
-      display: none;
-      font-size: 10px;
-      color: @func-color_1;
-      margin-left: 6px;
-    }
-
-    &_active {
-      border: solid 1px @primary-color_8;
-      background-color: @primary-color_6;
-
-      .attr-ad-tab-name {
-        color: @primary-color;
-      }
-    }
-
-    &:hover {
-      .attr-ad-tab-edit {
-        display: inline-block;
-      }
-      .attr-ad-tab-delete {
-        display: inline-block;
-      }
-    }
-  }
-
-  &-add {
-    padding: 11px;
-    background-color: @primary-color_7;
-    font-size: 12px;
-    color: @text-color_4;
-  }
-}
-</style>

cmdb-ui/src/modules/cmdb/views/ci_types/attrADTest.vue

@@ -1,205 +0,0 @@
-<template>
-  <div>
-    <div class="attr-ad-header attr-ad-header-margin">{{ $t('cmdb.ciType.configCheckTitle') }}</div>
-    <div class="attr-ad-content">
-      <div class="ad-test-title-info">{{ $t('cmdb.ciType.checkTestTip') }}</div>
-      <div
-        class="ad-test-btn"
-        @click="showCheckModal"
-      >
-        {{ $t('cmdb.ciType.checkTestBtn') }}
-      </div>
-      <div class="ad-test-btn-info">{{ $t('cmdb.ciType.checkTestTip2') }}</div>
-      <!-- <div
-        class="ad-test-btn"
-        @click="showTestModal"
-      >
-        {{ $t('cmdb.ciType.checkTestBtn1') }}
-      </div>
-      <div class="ad-test-btn-info">{{ $t('cmdb.ciType.checkTestTip3') }}</div> -->
-    </div>
-
-    <a-modal
-      v-model="checkModalVisible"
-      :footer="null"
-      :width="900"
-    >
-      <div class="check-modal-title">{{ $t('cmdb.ciType.checkModalTitle') }}</div>
-      <div class="check-modal-info">{{ $t('cmdb.ciType.checkModalTip') }}</div>
-      <div class="check-modal-info">{{ $t('cmdb.ciType.checkModalTip1') }}</div>
-      <div class="check-modal-info">{{ $t('cmdb.ciType.checkModalTip2') }}</div>
-      <ops-table
-        size="mini"
-        :data="checkTableData"
-        :scroll-y="{ enabled: true }"
-        height="400"
-        class="check-modal-table"
-      >
-        <vxe-column field="oneagent_name" :title="$t('cmdb.ciType.checkModalColumn1')"></vxe-column>
-        <vxe-column field="oneagent_id" :title="$t('cmdb.ciType.checkModalColumn2')"></vxe-column>
-        <vxe-column
-          field="status"
-          :min-width="70"
-          :title="$t('cmdb.ciType.checkModalColumn3')"
-        >
-          <template #default="{ row }">
-            <div
-              :class="['check-modal-status', row.status ? 'check-modal-status-online' : 'check-modal-status-offline']"
-            >
-              {{ $t(`cmdb.ciType.${row.status ? 'checkModalColumnStatus1' : 'checkModalColumnStatus2'}`) }}
-            </div>
-          </template>
-        </vxe-column>
-        <vxe-column field="sync_at" :title="$t('cmdb.ciType.checkModalColumn4')"></vxe-column>
-      </ops-table>
-    </a-modal>
-
-    <a-modal
-      v-model="testModalVisible"
-      :footer="null"
-      :width="596"
-    >
-      <div class="check-modal-title">{{ $t('cmdb.ciType.testModalTitle') }}</div>
-      <p class="test-modal-text">{{ testResultText }}</p>
-    </a-modal>
-  </div>
-</template>
-
-<script>
-import {
-  getAdtSyncHistories,
-  postAdtTest,
-  getAdtTestResult
-} from '@/modules/cmdb/api/discovery.js'
-import moment from 'moment'
-
-export default {
-  name: 'AttrADTest',
-  props: {
-    adtId: {
-      type: Number,
-      default: 0,
-    }
-  },
-  data() {
-    return {
-      checkModalVisible: false,
-      checkTableData: [],
-      testModalVisible: false,
-      testResultText: '',
-    }
-  },
-  methods: {
-    async showCheckModal() {
-      await this.queryCheckTableData()
-      this.checkModalVisible = true
-    },
-    async queryCheckTableData() {
-      const res = await getAdtSyncHistories(this.adtId)
-      if (res?.result?.length) {
-        const newTableData = res.result
-        newTableData.forEach((item) => {
-          const syncTime = moment(item.sync_at).valueOf()
-          const nowTime = new Date().getTime()
-          item.status = nowTime - syncTime <= 10 * 60 * 1000
-        })
-        this.checkTableData = newTableData
-      } else {
-        this.checkTableData = []
-      }
-    },
-    async showTestModal() {
-      await this.queryTestResult()
-      this.testModalVisible = true
-    },
-    async queryTestResult() {
-      const res = await postAdtTest(this.adtId)
-      const exec_id = res?.exec_id
-      if (exec_id) {
-        const res = await getAdtTestResult(exec_id)
-
-        if (res?.stdout) {
-          this.testResultText = res.stdout
-        }
-      }
-    }
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.attr-ad-content {
-  margin-left: 17px;
-  margin-bottom: 20px;
-
-  .ad-test-title-info {
-    color: @text-color_3;
-    font-size: 12px;
-    font-weight: 400;
-  }
-
-  .ad-test-btn {
-    margin-top: 30px;
-    padding: 5px 12px;
-    background-color: #F4F9FF;
-    border: solid 1px @primary-color_8;
-    display: inline-block;
-    cursor: pointer;
-
-    color: @link-color;
-    font-size: 12px;
-    font-weight: 400;
-  }
-
-  .ad-test-btn-info {
-    margin-top: 4px;
-    color: @text-color_3;
-    font-size: 12px;
-    font-weight: 400;
-  }
-}
-
-.check-modal-table {
-  margin-top: 14px;
-}
-
-.check-modal-title {
-  font-size: 14px;
-  font-weight: 500;
-  margin-bottom: 5px;
-}
-
-.check-modal-info {
-  color: @text-color_3;
-  font-size: 12px;
-  font-weight: 400;
-}
-
-.check-modal-status {
-  display: inline-block;
-  padding: 2px 11px;
-  font-size: 12px;
-  font-weight: 400;
-
-  &-online {
-    background-color: #E5F6DF;
-    color: #30AD2D;
-  }
-
-  &-offline {
-    background-color: #FFDADA;
-    color: #F14E4E;
-  }
-}
-
-.test-modal-text {
-  margin-top: 14px;
-  padding: 12px;
-  width: 100%;
-  height: 312px;
-  overflow: auto;
-  white-space: pre-wrap;
-  word-break: break-all;
-  border: solid 1px @border-color-base;
-}
-</style>

cmdb-ui/src/modules/cmdb/views/ci_types/attributeCard.vue

@@ -180,10 +180,6 @@ export default {
           label: this.$t('cmdb.ciType.isIndex'),
           property: 'is_index',
         },
-        {
-          label: this.$t('cmdb.ciType.isDynamic'),
-          property: 'is_dynamic',
-        },
       ]
     },
     inherited() {

cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue

@@ -157,6 +157,33 @@
         </a-form-item>
       </a-col>
 
+      <a-col :span="6">
+        <a-form-item
+          :label-col="horizontalFormItemLayout.labelCol"
+          :wrapper-col="horizontalFormItemLayout.wrapperCol"
+          :label="$t('required')"
+        >
+          <a-switch
+            @change="(checked) => onChange(checked, 'is_required')"
+            name="is_required"
+            v-decorator="['is_required', { rules: [], valuePropName: 'checked' }]"
+          />
+        </a-form-item>
+      </a-col>
+      <a-col :span="6" v-if="currentValueType !== '6' && currentValueType !== '7'">
+        <a-form-item
+          :label-col="{ span: 8 }"
+          :wrapper-col="horizontalFormItemLayout.wrapperCol"
+          :label="$t('cmdb.ciType.unique')"
+        >
+          <a-switch
+            :disabled="isShowComputedArea"
+            @change="onChange"
+            name="is_unique"
+            v-decorator="['is_unique', { rules: [], valuePropName: 'checked' }]"
+          />
+        </a-form-item>
+      </a-col>
       <a-col :span="currentValueType === '2' ? 6 : 0" v-if="currentValueType !== '6'">
         <a-form-item
           :hidden="currentValueType === '2' ? false : true"
@@ -169,7 +196,7 @@
             >{{ $t('cmdb.ciType.index') }}
               <a-tooltip :title="$t('cmdb.ciType.indexTips')">
                 <a-icon
-                  style="position:absolute;top:2px;left:-17px;color:#2f54eb;"
+                  style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
                   type="question-circle"
                   theme="filled"
                   @click="
@@ -190,37 +217,10 @@
           />
         </a-form-item>
       </a-col>
-      <a-col :span="6" v-if="currentValueType !== '6' && currentValueType !== '7'">
+      <a-col :span="6">
         <a-form-item
           :label-col="currentValueType === '2' ? { span: 8 } : horizontalFormItemLayout.labelCol"
           :wrapper-col="horizontalFormItemLayout.wrapperCol"
-          :label="$t('cmdb.ciType.unique')"
-        >
-          <a-switch
-            :disabled="isShowComputedArea"
-            @change="onChange"
-            name="is_unique"
-            v-decorator="['is_unique', { rules: [], valuePropName: 'checked' }]"
-          />
-        </a-form-item>
-      </a-col>
-      <a-col :span="6">
-        <a-form-item
-          :label-col="['2', '6', '7'].findIndex(i => currentValueType === i) === -1 ? { span: 8 } : horizontalFormItemLayout.labelCol"
-          :wrapper-col="horizontalFormItemLayout.wrapperCol"
-          :label="$t('required')"
-        >
-          <a-switch
-            @change="(checked) => onChange(checked, 'is_required')"
-            name="is_required"
-            v-decorator="['is_required', { rules: [], valuePropName: 'checked' }]"
-          />
-        </a-form-item>
-      </a-col>
-      <a-col :span="6">
-        <a-form-item
-          :label-col="currentValueType === '2' ? { span: 12 } : horizontalFormItemLayout.labelCol"
-          :wrapper-col="horizontalFormItemLayout.wrapperCol"
         >
           <template slot="label">
             <span
@@ -228,7 +228,7 @@
             >{{ $t('cmdb.ciType.defaultShow') }}
               <a-tooltip :title="$t('cmdb.ciType.defaultShowTips')">
                 <a-icon
-                  style="position:absolute;top:2px;left:-17px;color:#2f54eb;"
+                  style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
                   type="question-circle"
                   theme="filled"
                   @click="
@@ -295,37 +295,6 @@
           />
         </a-form-item>
       </a-col>
-      <a-col span="6">
-        <a-form-item
-          :label-col="['2', '6', '7'].findIndex(i => currentValueType === i) === -1 ? { span: 12 } : horizontalFormItemLayout.labelCol"
-          :wrapper-col="horizontalFormItemLayout.wrapperCol"
-        >
-          <template slot="label">
-            <span
-              style="position:relative;white-space:pre;"
-            >{{ $t('cmdb.ciType.isDynamic') }}
-              <a-tooltip :title="$t('cmdb.ciType.dynamicTips')">
-                <a-icon
-                  style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
-                  type="question-circle"
-                  theme="filled"
-                  @click="
-                    (e) => {
-                      e.stopPropagation()
-                      e.preventDefault()
-                    }
-                  "
-                />
-              </a-tooltip>
-            </span>
-          </template>
-          <a-switch
-            @change="(checked) => onChange(checked, 'is_dynamic')"
-            name="is_dynamic"
-            v-decorator="['is_dynamic', { rules: [], valuePropName: 'checked' }]"
-          />
-        </a-form-item>
-      </a-col>
       <a-divider style="font-size:14px;margin-top:6px;">{{ $t('cmdb.ciType.advancedSettings') }}</a-divider>
       <a-row>
         <a-col :span="24" v-if="!['6'].includes(currentValueType)">
@@ -565,7 +534,6 @@ export default {
             is_index: _record.is_index,
             is_sortable: _record.is_sortable,
             is_computed: _record.is_computed,
-            is_dynamic: _record.is_dynamic,
           })
         }
         console.log(_record)

cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue

@@ -150,19 +150,42 @@
       </a-col>
     </a-row>
 
-    <a-col :span="currentValueType === '2' ? 6 : 0" v-if="currentValueType !== '6'">
+    <a-col :span="6">
       <a-form-item
-        :hidden="currentValueType === '2' ? false : true"
         :label-col="horizontalFormItemLayout.labelCol"
         :wrapper-col="horizontalFormItemLayout.wrapperCol"
+        :label="$t('required')"
       >
+        <a-switch
+          @change="(checked) => onChange(checked, 'is_required')"
+          name="is_required"
+          v-decorator="['is_required', { rules: [], valuePropName: 'checked' }]"
+        />
+      </a-form-item>
+    </a-col>
+    <a-col :span="6" v-if="currentValueType !== '6' && currentValueType !== '7'">
+      <a-form-item
+        :label-col="{ span: 8 }"
+        :wrapper-col="horizontalFormItemLayout.wrapperCol"
+        :label="$t('cmdb.ciType.unique')"
+      >
+        <a-switch
+          :disabled="isShowComputedArea"
+          @change="onChange"
+          name="is_unique"
+          v-decorator="['is_unique', { rules: [], valuePropName: 'checked' }]"
+        />
+      </a-form-item>
+    </a-col>
+    <a-col :span="6" v-if="currentValueType === '2'">
+      <a-form-item :label-col="horizontalFormItemLayout.labelCol" :wrapper-col="horizontalFormItemLayout.wrapperCol">
         <template slot="label">
           <span
             style="position:relative;white-space:pre;"
           >{{ $t('cmdb.ciType.index') }}
             <a-tooltip :title="$t('cmdb.ciType.indexTips')">
               <a-icon
-                style="position:absolute;top:2px;left:-17px;color:#2f54eb;"
+                style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
                 type="question-circle"
                 theme="filled"
                 @click="
@@ -183,37 +206,10 @@
         />
       </a-form-item>
     </a-col>
-    <a-col :span="6" v-if="currentValueType !== '6' && currentValueType !== '7'">
+    <a-col :span="6">
       <a-form-item
         :label-col="currentValueType === '2' ? { span: 8 } : horizontalFormItemLayout.labelCol"
         :wrapper-col="horizontalFormItemLayout.wrapperCol"
-        :label="$t('cmdb.ciType.unique')"
-      >
-        <a-switch
-          :disabled="isShowComputedArea"
-          @change="onChange"
-          name="is_unique"
-          v-decorator="['is_unique', { rules: [], valuePropName: 'checked' }]"
-        />
-      </a-form-item>
-    </a-col>
-    <a-col :span="6">
-      <a-form-item
-        :label-col="['2', '6', '7'].findIndex(i => currentValueType === i) === -1 ? { span: 8 } : horizontalFormItemLayout.labelCol"
-        :wrapper-col="horizontalFormItemLayout.wrapperCol"
-        :label="$t('required')"
-      >
-        <a-switch
-          @change="(checked) => onChange(checked, 'is_required')"
-          name="is_required"
-          v-decorator="['is_required', { rules: [], valuePropName: 'checked' }]"
-        />
-      </a-form-item>
-    </a-col>
-    <a-col :span="6">
-      <a-form-item
-        :label-col="currentValueType === '2' ? { span: 12 } : horizontalFormItemLayout.labelCol"
-        :wrapper-col="horizontalFormItemLayout.wrapperCol"
       >
         <template slot="label">
           <span
@@ -221,7 +217,7 @@
           >{{ $t('cmdb.ciType.defaultShow') }}
             <a-tooltip :title="$t('cmdb.ciType.defaultShowTips')">
               <a-icon
-                style="position:absolute;top:2px;left:-17px;color:#2f54eb;"
+                style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
                 type="question-circle"
                 theme="filled"
                 @click="
@@ -288,37 +284,6 @@
         />
       </a-form-item>
     </a-col>
-    <a-col span="6">
-      <a-form-item
-        :label-col="['2', '6', '7'].findIndex(i => currentValueType === i) === -1 ? { span: 12 } : horizontalFormItemLayout.labelCol"
-        :wrapper-col="horizontalFormItemLayout.wrapperCol"
-      >
-        <template slot="label">
-          <span
-            style="position:relative;white-space:pre;"
-          >{{ $t('cmdb.ciType.isDynamic') }}
-            <a-tooltip :title="$t('cmdb.ciType.dynamicTips')">
-              <a-icon
-                style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
-                type="question-circle"
-                theme="filled"
-                @click="
-                  (e) => {
-                    e.stopPropagation()
-                    e.preventDefault()
-                  }
-                "
-              />
-            </a-tooltip>
-          </span>
-        </template>
-        <a-switch
-          @change="(checked) => onChange(checked, 'is_dynamic')"
-          name="is_dynamic"
-          v-decorator="['is_dynamic', { rules: [], valuePropName: 'checked', initialValue: currentValueType === '6' ? true: false }]"
-        />
-      </a-form-item>
-    </a-col>
     <a-divider style="font-size:14px;margin-top:6px;">{{ $t('cmdb.ciType.advancedSettings') }}</a-divider>
     <a-row>
       <a-col :span="24" v-if="!['6'].includes(currentValueType)">
@@ -439,8 +404,8 @@ export default {
           }
 
           console.log(values)
-          const { is_required, default_show, default_value, is_dynamic } = values
-          const data = { is_required, default_show, is_dynamic }
+          const { is_required, default_show, default_value } = values
+          const data = { is_required, default_show }
           delete values.is_required
           delete values.default_show
           if (values.value_type === '0' && default_value) {

cmdb-ui/src/modules/cmdb/views/ci_types/ciTypedetail.vue

@@ -5,20 +5,21 @@
         <AttributesTable ref="attributesTable" :CITypeId="CITypeId" :CITypeName="CITypeName"></AttributesTable>
       </a-tab-pane>
       <a-tab-pane key="2" :tab="$t('cmdb.ciType.relation')">
-        <RelationTable v-if="activeKey === '2'" :CITypeId="CITypeId" :CITypeName="CITypeName"></RelationTable>
+        <RelationTable :CITypeId="CITypeId" :CITypeName="CITypeName"></RelationTable>
       </a-tab-pane>
-      <a-tab-pane key="3" :tab="$t('cmdb.ciType.autoDiscoveryTab')">
-        <ADTab v-if="activeKey === '3'" :CITypeId="CITypeId"></ADTab>
-      </a-tab-pane>
-      <a-tab-pane key="5" :tab="$t('cmdb.ciType.trigger')">
+      <a-tab-pane key="3" :tab="$t('cmdb.ciType.trigger')">
         <TriggerTable ref="triggerTable" :CITypeId="CITypeId"></TriggerTable>
       </a-tab-pane>
+      <a-tab-pane key="4" :tab="$t('cmdb.ciType.attributeAD')">
+        <AttrAD :CITypeId="CITypeId"></AttrAD>
+      </a-tab-pane>
+      <a-tab-pane key="5" :tab="$t('cmdb.ciType.relationAD')">
+        <RelationAD :CITypeId="CITypeId"></RelationAD>
+      </a-tab-pane>
       <a-tab-pane key="6" :tab="$t('cmdb.ciType.grant')">
-        <template v-if="activeKey === '6'">
-          <GrantComp :CITypeId="CITypeId" resourceType="CIType" :resourceTypeName="CITypeName"></GrantComp>
-          <div class="citype-detail-title">{{ $t('cmdb.components.relationGrant') }}</div>
-          <RelationTable isInGrantComp :CITypeId="CITypeId" :CITypeName="CITypeName"></RelationTable>
-        </template>
+        <GrantComp :CITypeId="CITypeId" resourceType="CIType" :resourceTypeName="CITypeName"></GrantComp>
+        <div class="citype-detail-title">{{ $t('cmdb.components.relationGrant') }}</div>
+        <RelationTable isInGrantComp :CITypeId="CITypeId" :CITypeName="CITypeName"></RelationTable>
       </a-tab-pane>
     </a-tabs>
   </a-card>
@@ -28,7 +29,8 @@
 import AttributesTable from './attributesTable'
 import RelationTable from './relationTable'
 import TriggerTable from './triggerTable.vue'
-import ADTab from './adTab.vue'
+import AttrAD from './attrAD.vue'
+import RelationAD from './relationAD.vue'
 import GrantComp from '../../components/cmdbGrant/grantComp.vue'
 
 export default {
@@ -37,7 +39,8 @@ export default {
     AttributesTable,
     RelationTable,
     TriggerTable,
-    ADTab,
+    AttrAD,
+    RelationAD,
     GrantComp,
   },
   props: {
@@ -64,7 +67,7 @@ export default {
         if (activeKey === '1') {
           this.$refs.attributesTable.getCITypeGroupData()
         }
-        if (activeKey === '5') {
+        if (activeKey === '3') {
           this.$refs.triggerTable.getTableData()
         }
       })

cmdb-ui/src/modules/cmdb/views/ci_types/computedArea.vue

@@ -6,12 +6,7 @@
     </a-tab-pane>
     <a-tab-pane key="script" :disabled="!canDefineComputed">
       <span style="font-size:12px;" slot="tab">{{ $t('cmdb.ciType.code') }}</span>
-      <codemirror
-        style="z-index: 9999"
-        :options="cmOptions"
-        v-model="compute_script"
-        @input="onCodeChange"
-      ></codemirror>
+      <codemirror style="z-index: 9999" :options="cmOptions" v-model="compute_script"></codemirror>
     </a-tab-pane>
     <template slot="tabBarExtraContent" v-if="showCalcComputed">
       <a-button type="primary" size="small" @click="handleCalcComputed">
@@ -54,26 +49,8 @@ export default {
         height: '200px',
         theme: 'monokai',
         tabSize: 4,
-        indentUnit: 4,
-        lineWrapping: false,
+        lineWrapping: true,
         readOnly: !this.canDefineComputed,
-        extraKeys: {
-          Tab: (cm) => {
-            if (cm.somethingSelected()) {
-              cm.indentSelection('add')
-            } else {
-              cm.replaceSelection(Array(cm.getOption('indentUnit') + 1).join(' '), 'end', '+input')
-            }
-          },
-          'Shift-Tab': (cm) => {
-            if (cm.somethingSelected()) {
-              cm.indentSelection('subtract')
-            } else {
-              const cursor = cm.getCursor()
-              cm.setCursor({ line: cursor.line, ch: cursor.ch - 4 })
-            }
-          },
-        },
       },
     }
   },
@@ -106,9 +83,6 @@ export default {
         },
       })
     },
-    onCodeChange(v) {
-      this.compute_script = v.replace('\t', '    ')
-    }
   },
 }
 </script>

cmdb-ui/src/modules/cmdb/views/ci_types/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ci-types-wrap" :style="{ height: `${windowHeight - 96}px` }">
+  <div class="ci-types-wrap" :style="{ height: `${windowHeight - 66}px` }">
     <div v-if="!CITypeGroups.length" class="ci-types-empty">
       <a-empty :image="emptyImage" description=""></a-empty>
       <a-button icon="plus" size="small" type="primary" @click="handleClickAddGroup">{{
@@ -15,13 +15,6 @@
       :triggerLength="18"
     >
       <template #one>
-        <a-input
-          :placeholder="$t('cmdb.preference.searchPlaceholder')"
-          class="cmdb-ci-types-left-input"
-          @pressEnter="handleSearch"
-        >
-          <a-icon slot="prefix" type="search" />
-        </a-input>
         <div class="ci-types-left">
           <div class="ci-types-left-title">
             <a-button
@@ -69,8 +62,8 @@
               </a-dropdown>
             </a-space>
           </div>
-          <draggable class="ci-types-left-content" :list="computedCITypeGroups" @end="handleChangeGroups" filter=".undraggable">
-            <div v-for="g in computedCITypeGroups" :key="g.id || g.name">
+          <draggable class="ci-types-left-content" :list="CITypeGroups" @end="handleChangeGroups" filter=".undraggable">
+            <div v-for="g in CITypeGroups" :key="g.id || g.name">
               <div
                 :class="
                   `${currentGId === g.id && !currentCId ? 'selected' : ''} ci-types-left-group ${
@@ -81,7 +74,6 @@
               >
                 <div>
                   <OpsMoveIcon
-                    v-if="g.id !== -1"
                     style="width: 17px; height: 17px; display: none; position: absolute; left: -3px; top: 10px"
                   />
                   <span style="font-weight: 700">{{ g.name || $t('other') }}</span>
@@ -111,7 +103,6 @@
                 @start="start(g)"
                 @end="end(g)"
                 @add="add(g)"
-                filter=".undraggable"
               >
                 <div
                   v-for="ci in g.ci_types"
@@ -119,9 +110,8 @@
                   :class="`${currentCId === ci.id ? 'selected' : ''} ci-types-left-detail`"
                   @click="handleClickCIType(g.id, ci.id, ci.name)"
                 >
-                  <div :class="`${ g.id === -1 ? 'undraggable' : '' }`">
+                  <div>
                     <OpsMoveIcon
-                      v-if="g.id !== -1"
                       style="width: 17px; height: 17px; display: none; position: absolute; left: -1px; top: 8px"
                     />
                     <span class="ci-types-left-detail-icon">
@@ -474,8 +464,6 @@ export default {
       isInherit: false,
 
       unique_id: null,
-
-      searchValue: '',
     }
   },
   computed: {
@@ -548,16 +536,6 @@ export default {
       }
       return _showIdSelectOptions
     },
-    computedCITypeGroups() {
-      if (this.searchValue) {
-        const ciTypes = _.cloneDeep(this.CITypeGroups)
-        ciTypes.forEach((item) => {
-          item.ci_types = item.ci_types.filter((_item) => _item.alias.toLowerCase().includes(this.searchValue.toLowerCase()))
-        })
-        return ciTypes
-      }
-      return this.CITypeGroups
-    },
   },
   provide() {
     return {
@@ -587,9 +565,6 @@ export default {
         this.allTreeDepAndEmp = res
       })
     },
-    handleSearch(e) {
-      this.searchValue = e.target.value
-    },
     async loadCITypes(isResetCurrentId = false) {
       const groups = await getCITypeGroupsConfig({ need_other: true })
       let alreadyReset = false
@@ -689,7 +664,7 @@ export default {
         content: that.$t('cmdb.ciType.confirmDeleteGroup', { groupName: `${g.name}` }),
         onOk() {
           deleteCITypeGroup(g.id).then((res) => {
-            that.$message.success(that.$t('deleteSuccess'))
+            that.$message.info(that.$t('deleteSuccess'))
             that.loadCITypes(true)
           })
         },
@@ -1046,14 +1021,6 @@ export default {
     top: 40%;
     transform: translate(-50%, -50%);
   }
-  /deep/.cmdb-ci-types-left-input {
-    input {
-      background-color: transparent;
-    }
-    .ant-input:focus {
-      box-shadow: none;
-    }
-  }
   .ci-types-left {
     width: 100%;
     overflow: auto;

cmdb-ui/src/modules/cmdb/views/ci_types/relationAD.vue

@@ -1,124 +1,95 @@
 <template>
-  <div class="relation-ad" :style="{ height: `${windowHeight - 200}px` }">
-    <div class="relation-ad-table-tip">
-      <ops-icon class="relation-ad-table-tip-icon" type="cmdb-prompt" />
-      <span class="relation-ad-table-tip-text">1. {{ $t('cmdb.ciType.relationADTip') }}</span>
-      <span class="relation-ad-table-tip-text">2. {{ $t('cmdb.ciType.relationADTip2') }}</span>
-      <span class="relation-ad-table-tip-text">3. {{ $t('cmdb.ciType.relationADTip3') }}</span>
-    </div>
-    <!-- <div class="relation-ad-tip">{{ $t('cmdb.ciType.relationADTip') }}</div> -->
-    <div class="relation-ad-header">
-      <div class="relation-ad-header-left">{{ $t('cmdb.ciType.relationADHeader1') }}</div>
-      <div class="relation-ad-header-left">{{ $t('cmdb.ciType.relationADHeader2') }}</div>
-    </div>
-    <div class="relation-ad-main">
-      <div class="relation-ad-item" v-for="item in relationList" :key="item.id">
-        <treeselect
-          class="custom-treeselect"
-          :style="{ width: '230px', '--custom-height': '32px' }"
-          v-model="item.ad_key"
-          :multiple="false"
-          :clearable="true"
-          searchable
-          :options="ciTypeADTAttributes"
-          value-consists-of="LEAF_PRIORITY"
-          :placeholder="$t('cmdb.ciType.relationADSelectAttr')"
-          :normalizer="
-            (node) => {
-              return {
-                id: node.value,
-                label: node.label,
-              }
+  <div class="relation-ad" :style="{ height: `${windowHeight - 130}px` }">
+    <div class="relation-ad-item" v-for="item in relationList" :key="item.id">
+      <treeselect
+        class="custom-treeselect"
+        :style="{ width: '200px', marginRight: '10px', '--custom-height': '32px' }"
+        v-model="item.attrName"
+        :multiple="false"
+        :clearable="true"
+        searchable
+        :options="ciTypeADTAttributes"
+        value-consists-of="LEAF_PRIORITY"
+        :placeholder="$t('cmdb.ciType.selectAttributes')"
+        :normalizer="
+          (node) => {
+            return {
+              id: node.name,
+              label: node.name,
             }
-          "
-        >
-          <div :title="node.label" slot="option-label" slot-scope="{ node }">
-            <div>{{ node.label }}</div>
-            <!-- <div :style="{ fontSize: '12px', color: '#cbcbcb', lineHeight: '12px' }">{{ node.raw.desc }}</div> -->
-          </div>
-        </treeselect>
+          }
+        "
+      >
+        <div :title="node.label" slot="option-label" slot-scope="{ node }">
+          <div>{{ node.label }}</div>
+          <div :style="{ fontSize: '12px', color: '#cbcbcb', lineHeight: '12px' }">{{ node.raw.desc }}</div>
+        </div>
+      </treeselect>
+      <a><a-icon type="swap"/></a>
+      <treeselect
+        class="custom-treeselect"
+        :style="{ width: '200px', margin: '0 10px', '--custom-height': '32px' }"
+        v-model="item.type_name"
+        :multiple="false"
+        :clearable="true"
+        searchable
+        :options="ciTypeGroup"
+        value-consists-of="LEAF_PRIORITY"
+        :placeholder="$t('cmdb.ciType.selectCIType')"
+        :disableBranchNodes="true"
+        @select="changeType(item)"
+        :normalizer="
+          (node) => {
+            return {
+              id: node.name || $t('other'),
+              label: node.alias || node.name || $t('other'),
+              title: node.alias || node.name || $t('other'),
+              children: node.ci_types,
+            }
+          }
+        "
+      >
         <div
-          class="relation-ad-item-link"
+          :title="node.label"
+          slot="option-label"
+          slot-scope="{ node }"
+          :style="{ width: '100%', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' }"
         >
-          <div class="relation-ad-item-link-left"></div>
-          <div class="relation-ad-item-link-right"></div>
+          {{ node.label }}
         </div>
-        <treeselect
-          class="custom-treeselect"
-          :style="{ width: '230px', marginRight: '10px', '--custom-height': '32px' }"
-          v-model="item.peer_type_id"
-          :multiple="false"
-          :clearable="true"
-          searchable
-          :options="relationOptions"
-          value-consists-of="LEAF_PRIORITY"
-          :placeholder="$t('cmdb.ciType.relationADSelectCIType')"
-          :disableBranchNodes="true"
-          @select="changeType(item)"
-          :normalizer="
-            (node) => {
-              return {
-                id: node.value || $t('other'),
-                label: node.alias || node.name || $t('other'),
-                title: node.alias || node.name || $t('other'),
-                children: node.ci_types,
-              }
+      </treeselect>
+      <treeselect
+        class="custom-treeselect"
+        :style="{ width: '200px', marginRight: '10px', '--custom-height': '32px' }"
+        v-model="item.attr_name"
+        :multiple="false"
+        :clearable="true"
+        searchable
+        :options="item.attributes"
+        value-consists-of="LEAF_PRIORITY"
+        :placeholder="$t('cmdb.ciType.selectAttributes')"
+        :normalizer="
+          (node) => {
+            return {
+              id: node.name,
+              label: node.alias || node.name,
+              title: node.alias || node.name,
             }
-          "
+          }
+        "
+      >
+        <div
+          :title="node.label"
+          slot="option-label"
+          slot-scope="{ node }"
+          :style="{ width: '100%', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' }"
         >
-          <div
-            :title="node.label"
-            slot="option-label"
-            slot-scope="{ node }"
-            :style="{ width: '100%', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' }"
-          >
-            {{ node.label }}
-          </div>
-        </treeselect>
-        <treeselect
-          class="custom-treeselect"
-          :style="{ width: '230px', marginRight: '18px', '--custom-height': '32px' }"
-          v-model="item.peer_attr_id"
-          :multiple="false"
-          :clearable="true"
-          searchable
-          :options="item.attributes"
-          value-consists-of="LEAF_PRIORITY"
-          :placeholder="$t('cmdb.ciType.relationADSelectModelAttr')"
-          :normalizer="
-            (node) => {
-              return {
-                id: node.value,
-                label: node.alias || node.name,
-                title: node.alias || node.name,
-              }
-            }
-          "
-        >
-          <div
-            :title="node.label"
-            slot="option-label"
-            slot-scope="{ node }"
-            :style="{ width: '100%', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' }"
-          >
-            {{ node.label }}
-          </div>
-        </treeselect>
-        <div class="relation-ad-item-action">
-          <a @click="copyRelation(item)">
-            <a-icon type="copy" />
-          </a>
-          <a @click="deleteRelation(item)">
-            <a-icon type="minus-circle" />
-          </a>
-          <a @click="addRelation">
-            <a-icon type="plus-circle" />
-          </a>
+          {{ node.label }}
         </div>
-      </div>
-      <div class="relation-ad-footer">
-        <a-button type="primary" @click="handleSave">{{ $t('save') }}</a-button>
-      </div>
+      </treeselect>
+    </div>
+    <div class="relation-ad-footer">
+      <a-button type="primary" @click="handleSave">{{ $t('save') }}</a-button>
     </div>
   </div>
 </template>
@@ -128,15 +99,9 @@ import _ from 'lodash'
 import { mapState } from 'vuex'
 import { v4 as uuidv4 } from 'uuid'
 import Treeselect from '@riophae/vue-treeselect'
-import {
-  getCITypeAttributes,
-  getCITypeRelations,
-  postCITypeRelations
-} from '../../api/discovery'
-import {
-  getCITypeChildren,
-  getCITypeParent
-} from '../../api/CITypeRelation.js'
+import { getCITypeAttributesById } from '../../api/CITypeAttr'
+import { getCITypeGroups } from '../../api/ciTypeGroup'
+import { getDiscovery, getCITypeDiscovery, postCITypeDiscovery, putCITypeDiscovery } from '../../api/discovery'
 
 export default {
   name: 'RelationAutoDiscovery',
@@ -149,11 +114,11 @@ export default {
   },
   data() {
     return {
-      relationList: [], // 关系自动发现数据
-      ciTypeADTAttributes: [], // 自动发现 options
+      relationList: [],
+      ciTypeADTAttributes: [],
+      ciTypeGroup: [],
       adt_id: null,
       adrList: [],
-      relationOptions: [],
     }
   },
   computed: {
@@ -161,62 +126,64 @@ export default {
       windowHeight: (state) => state.windowHeight,
     }),
   },
+  created() {
+    getCITypeGroups({ need_other: true }).then((res) => {
+      this.ciTypeGroup = res
+        .filter((item) => item.ci_types && item.ci_types.length)
+        .map((item) => {
+          item.id = `parent_${item.id || -1}`
+          return { ..._.cloneDeep(item) }
+        })
+    })
+  },
   async mounted() {
-    await this.getCITypeAttributes()
-    await this.getCITypeRelationOptions()
-    this.getCITypeRelations()
+    await this.getDiscovery()
+    this.getCITypeDiscovery()
   },
   methods: {
-    async getCITypeAttributes() {
-      const res = await getCITypeAttributes(this.CITypeId)
-      this.ciTypeADTAttributes = res.map((item) => {
-        return {
-          id: item,
-          value: item,
-          label: item
-        }
+    async getDiscovery() {
+      await getDiscovery().then((res) => {
+        this.adrList = res
       })
     },
-    async getCITypeRelationOptions() {
-      const childRes = await getCITypeChildren(this.CITypeId)
-      const parentRes = await getCITypeParent(this.CITypeId)
-      const options = [...childRes.children, ...parentRes.parents]
-
-      options.forEach((item) => {
-        item.value = item.id
-        item.label = item.alias || item.name
-        const attributes = item?.attributes?.filter((attr) => !attr.is_password && !attr.is_list && attr.value_type !== '6')
-        attributes.forEach((attr) => {
-          attr.value = attr.id
-          attr.label = attr.alias || attr.name
-        })
-        item.attributes = attributes
-      })
-      this.relationOptions = options
-    },
-    async getCITypeRelations() {
-      getCITypeRelations(this.CITypeId).then(async (res) => {
-        if (res?.length) {
-          // this.adt_id = _find.id
+    getCITypeDiscovery() {
+      getCITypeDiscovery(this.CITypeId).then(async (res) => {
+        // Options for the first drop-down box
+        const _ciTypeADTAttributes = []
+        res
+          .filter((adt) => adt.adr_id)
+          .forEach((adt) => {
+            const _find = this.adrList.find((adr) => adr.id === adt.adr_id)
+            if (_find && _find.attributes) {
+              _ciTypeADTAttributes.push(..._find.attributes)
+            }
+          })
+        console.log(_ciTypeADTAttributes)
+        this.ciTypeADTAttributes = _.uniqBy(_ciTypeADTAttributes, 'name')
+        // Options for the first drop-down box
+        const _find = res.find((adt) => !adt.adr_id)
+        if (_find) {
+          this.adt_id = _find.id
           const _relationList = []
-          res.forEach((item) => {
-            const attributes = this?.relationOptions?.find((option) => option?.value === item.peer_type_id)?.attributes || []
+          const keys = Object.keys(_find.relation)
+          for (let i = 0; i < keys.length; i++) {
+            const { attributes } = await getCITypeAttributesById(_find.relation[`${keys[i]}`].type_name)
             _relationList.push({
               id: uuidv4(),
-              ad_key: item.ad_key,
-              peer_type_id: item.peer_type_id,
-              peer_attr_id: item.peer_attr_id,
+              attrName: keys[i],
+              type_name: _find.relation[`${keys[i]}`].type_name,
+              attr_name: _find.relation[`${keys[i]}`].attr_name,
               attributes,
             })
-          })
+          }
           this.relationList = _relationList.length
             ? _relationList
             : [
                 {
                   id: uuidv4(),
-                  ad_key: undefined,
-                  peer_type_id: undefined,
-                  peer_attr_id: undefined,
+                  attrName: undefined,
+                  type_name: undefined,
+                  attr_name: undefined,
                   attributes: [],
                 },
               ]
@@ -225,9 +192,9 @@ export default {
           this.relationList = [
             {
               id: uuidv4(),
-              ad_key: undefined,
-              peer_type_id: undefined,
-              peer_attr_id: undefined,
+              attrName: undefined,
+              type_name: undefined,
+              attr_name: undefined,
               attributes: [],
             },
           ]
@@ -235,57 +202,48 @@ export default {
       })
     },
     changeType(item) {
+      console.log(item)
       this.$nextTick(() => {
-        const peer_type_id = item.peer_type_id
-        const attributes = this?.relationOptions?.find((option) => option?.value === peer_type_id)?.attributes
-
-        item.attributes = attributes
-        item.peer_attr_id = undefined
+        getCITypeAttributesById(item.type_name).then((res) => {
+          item.attr_name = undefined
+          item.attributes = res.attributes.map((item) => {
+            return { ...item, value: item.id, label: item.alias || item.name }
+          })
+        })
       })
     },
     addRelation() {
       const _relationList = _.cloneDeep(this.relationList)
       _relationList.push({
         id: uuidv4(),
-        ad_key: undefined,
-        peer_type_id: undefined,
-        peer_attr_id: undefined,
+        attrName: undefined,
+        type_name: undefined,
+        attr_name: undefined,
         attributes: [],
       })
       this.relationList = _relationList
     },
-    copyRelation(item) {
-      const _relationList = _.cloneDeep(this.relationList)
-      _relationList.push({
-        ...item,
-        id: uuidv4()
-      })
-      this.relationList = _relationList
-    },
-
     deleteRelation(item) {
-      if (this.relationList.length <= 1) {
-        this.$message.error(this.$t('cmdb.ciType.deleteRelationAdTip'))
-        return
-      }
       const _idx = this.relationList.findIndex(({ id }) => item.id === id)
       if (_idx > -1) {
         this.relationList.splice(_idx, 1)
       }
     },
-
     async handleSave() {
-      const _relation = this.relationList.map(({ ad_key, peer_attr_id, peer_type_id }) => {
-        return {
-          ad_key,
-          peer_attr_id,
-          peer_type_id
+      const _relation = {}
+      this.relationList.forEach(({ attrName, type_name, attr_name }) => {
+        if (attrName) {
+          _relation[`${attrName}`] = { type_name, attr_name }
         }
       })
-      if (_relation.length) {
-        await postCITypeRelations(this.CITypeId, { relations: _relation })
+      if (_relation) {
+        if (this.adt_id) {
+          await putCITypeDiscovery(this.adt_id, { relation: _relation })
+        } else {
+          await postCITypeDiscovery(this.CITypeId, { relation: _relation })
+        }
         this.$message.success(this.$t('saveSuccess'))
-        this.getCITypeRelations()
+        this.getCITypeDiscovery()
       }
     },
   },
@@ -296,103 +254,14 @@ export default {
 .relation-ad {
   overflow: auto;
   padding: 0 20px;
-
-  &-tip {
-    color: @text-color_4;
-    font-size: 12px;
-    font-weight: 400;
-    line-height: 22px;
-  }
-
-  &-header {
-    margin-top: 20px;
-    display: flex;
-    align-items: center;
-    font-size: 14px;
-    font-weight: 700;
-    line-height: 22px;
-
-    &-left {
-      width: 230px;
-      margin-right: 63px;
-    }
-  }
-
-  &-main {
-    display: inline-block;
-  }
-
   .relation-ad-item {
-    display: flex;
+    display: inline-flex;
     justify-content: flex-start;
     align-items: center;
-    margin-top: 10px;
-
-    &-link {
-      position: relative;
-      height: 1px;
-      width: 63px;
-      background-color: @border-color-base;
-
-      &-left {
-        position: absolute;
-        top: -6px;
-        left: -6px;
-        z-index: 10;
-        width: 12px;
-        height: 12px;
-        background-color: @primary-color;
-        border: solid 3px #E2E7FC;
-        border-radius: 50%
-      }
-
-      &-right {
-        position: absolute;
-        z-index: 10;
-        top: -5px;
-        right: 0px;
-        width: 2px;
-        height: 10px;
-        border-radius: 1px 0px 0px 1px;
-        background-color: @primary-color;
-      }
-    }
-
-    &-action {
-      display: flex;
-      align-items: center;
-      gap: 12px;
-    }
+    margin: 10px 0;
   }
-
-  &-table-tip {
-    display: inline-flex;
-    align-items: center;
-    padding: 3px 16px;
-    color: @text-color_2;
-    font-size: 14px;
-    font-weight: 400;
-    border: solid 1px @primary-color_8;
-    background-color: @primary-color_5;
-    border-radius: 2px;
-
-    &-icon {
-      font-size: 16px;
-      color: @primary-color;
-      margin-right: 8px;
-    }
-
-    &-text {
-      &:not(:last-child) {
-        padding-right: 10px;
-        margin-right: 10px;
-        border-right: solid 1px @primary-color_8;
-      }
-    }
-  }
-
-  &-footer {
-    // width: 690px;
+  .relation-ad-footer {
+    width: 690px;
     text-align: right;
     margin: 10px 0;
   }

cmdb-ui/src/modules/cmdb/views/ci_types/relationTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="relation-table" :style="{ padding: '0 20px 20px' }">
+  <div :style="{ padding: '0 20px 20px' }">
     <a-button
       v-if="!isInGrantComp"
       style="margin-bottom: 10px"
@@ -10,7 +10,6 @@
     >{{ $t('cmdb.ciType.addRelation') }}</a-button
     >
     <vxe-table
-      ref="xTable"
       stripe
       :data="tableData"
       size="small"
@@ -19,7 +18,6 @@
       highlight-hover-row
       keep-source
       class="ops-stripe-table"
-      min-height="500"
       :row-class-name="rowClass"
       :edit-config="{ trigger: 'dblclick', mode: 'cell', showIcon: false }"
       resizable
@@ -45,7 +43,7 @@
           <span v-else>{{ constraintMap[row.constraint] }}</span>
         </template>
       </vxe-column>
-      <vxe-column :width="300" field="attributeAssociation" :edit-render="{}">
+      <vxe-column :width="250" field="attributeAssociation" :edit-render="{}">
         <template #header>
           <span>
             <a-tooltip :title="$t('cmdb.ciType.attributeAssociationTip1')">
@@ -58,73 +56,43 @@
           </span>
         </template>
         <template #default="{row}">
-          <template
-            v-for="item in row.parentAndChildAttrList"
+          <span
+            v-if="row.parent_attr_id && row.child_attr_id"
+          >{{ getAttrNameById(row.isParent ? row.attributes : attributes, row.parent_attr_id) }}=>
+            {{ getAttrNameById(row.isParent ? attributes : row.attributes, row.child_attr_id) }}</span
           >
-            <div
-              :key="item.id"
-              v-if="item.parentAttrId && item.childAttrId"
-            >
-              {{ getAttrNameById(row.isParent ? row.attributes : attributes, item.parentAttrId) }}=>
-              {{ getAttrNameById(row.isParent ? attributes : row.attributes, item.childAttrId) }}
-            </div>
-          </template>
         </template>
         <template #edit="{ row }">
-          <div
-            v-for="item in tableAttrList"
-            :key="item.id"
-            class="table-attribute-row"
-          >
+          <div style="display:inline-flex;align-items:center;">
             <a-select
               allowClear
               size="small"
-              v-model="item.parentAttrId"
+              v-model="parent_attr_id"
               :getPopupContainer="(trigger) => trigger.parentNode"
               :style="{ width: '100px' }"
-              show-search
-              optionFilterProp="title"
             >
               <a-select-option
                 v-for="attr in filterAttributes(row.isParent ? row.attributes : attributes)"
                 :key="attr.id"
-                :value="attr.id"
-                :title="attr.alias || attr.name"
               >
                 {{ attr.alias || attr.name }}
               </a-select-option>
             </a-select>
-            <span class="table-attribute-row-link">=></span>
+            =>
             <a-select
               allowClear
               size="small"
-              v-model="item.childAttrId"
+              v-model="child_attr_id"
               :getPopupContainer="(trigger) => trigger.parentNode"
               :style="{ width: '100px' }"
-              show-search
-              optionFilterProp="title"
             >
               <a-select-option
                 v-for="attr in filterAttributes(row.isParent ? attributes : row.attributes)"
                 :key="attr.id"
-                :value="attr.id"
-                :title="attr.alias || attr.name"
               >
                 {{ attr.alias || attr.name }}
               </a-select-option>
             </a-select>
-            <a
-              class="table-attribute-row-action"
-              @click="removeTableAttr(item.id)"
-            >
-              <a-icon type="minus-circle" />
-            </a>
-            <a
-              class="table-attribute-row-action"
-              @click="addTableAttr"
-            >
-              <a-icon type="plus-circle" />
-            </a>
           </div>
         </template>
       </vxe-column>
@@ -211,16 +179,13 @@
           </a-select>
         </a-form-item>
         <a-form-item :label="$t('cmdb.ciType.attributeAssociation')">
-          <a-row
-            v-for="item in modalAttrList"
-            :key="item.id"
-          >
-            <a-col :span="10">
+          <a-row>
+            <a-col :span="11">
               <a-form-item>
                 <a-select
                   :placeholder="$t('cmdb.ciType.attributeAssociationTip4')"
                   allowClear
-                  v-model="item.parentAttrId"
+                  v-decorator="['parent_attr_id', { rules: [{ required: false }] }]"
                 >
                   <a-select-option v-for="attr in filterAttributes(attributes)" :key="attr.id">
                     {{ attr.alias || attr.name }}
@@ -231,12 +196,12 @@
             <a-col :span="2" :style="{ textAlign: 'center' }">
               =>
             </a-col>
-            <a-col :span="9">
+            <a-col :span="11">
               <a-form-item>
                 <a-select
                   :placeholder="$t('cmdb.ciType.attributeAssociationTip5')"
                   allowClear
-                  v-model="item.childAttrId"
+                  v-decorator="['child_attr_id', { rules: [{ required: false }] }]"
                 >
                   <a-select-option v-for="attr in filterAttributes(modalChildAttributes)" :key="attr.id">
                     {{ attr.alias || attr.name }}
@@ -244,20 +209,6 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :span="3">
-              <a
-                class="modal-attribute-action"
-                @click="removeModalAttr(item.id)"
-              >
-                <a-icon type="minus-circle" />
-              </a>
-              <a
-                class="modal-attribute-action"
-                @click="addModalAttr"
-              >
-                <a-icon type="plus-circle" />
-              </a>
-            </a-col>
           </a-row>
         </a-form-item>
       </a-form>
@@ -276,7 +227,6 @@ import {
 } from '@/modules/cmdb/api/CITypeRelation'
 import { getCITypes } from '@/modules/cmdb/api/CIType'
 import { getCITypeAttributesById } from '@/modules/cmdb/api/CITypeAttr'
-import { v4 as uuidv4 } from 'uuid'
 
 import CMDBGrant from '../../components/cmdbGrant'
 
@@ -309,11 +259,9 @@ export default {
       tableData: [],
       parentTableData: [],
       attributes: [],
-      tableAttrList: [],
-      modalAttrList: [],
+      parent_attr_id: undefined,
+      child_attr_id: undefined,
       modalChildAttributes: [],
-      currentEditData: null,
-      isContinueCloseEdit: false,
     }
   },
   computed: {
@@ -344,16 +292,13 @@ export default {
       if (!this.isInGrantComp) {
         await this.getCITypeParent()
       }
-      await this.getCITypeChildren()
+      this.getCITypeChildren()
     },
     async getCITypeParent() {
       await getCITypeParent(this.CITypeId).then((res) => {
         this.parentTableData = res.parents.map((item) => {
-          const parentAndChildAttrList = this.handleAttrList(item)
-
           return {
             ...item,
-            parentAndChildAttrList,
             source_ci_type_name: this.CITypeName,
             source_ci_type_id: this.CITypeId,
             isParent: true,
@@ -361,14 +306,11 @@ export default {
         })
       })
     },
-    async getCITypeChildren() {
-      await getCITypeChildren(this.CITypeId).then((res) => {
+    getCITypeChildren() {
+      getCITypeChildren(this.CITypeId).then((res) => {
         const data = res.children.map((obj) => {
-          const parentAndChildAttrList = this.handleAttrList(obj)
-
           return {
             ...obj,
-            parentAndChildAttrList,
             source_ci_type_name: this.CITypeName,
             source_ci_type_id: this.CITypeId,
           }
@@ -380,20 +322,6 @@ export default {
         }
       })
     },
-
-    handleAttrList(data) {
-      const length = Math.min(data?.parent_attr_ids?.length || 0, data.child_attr_ids?.length || 0)
-      const parentAndChildAttrList = []
-      for (let i = 0; i < length; i++) {
-        parentAndChildAttrList.push({
-          id: uuidv4(),
-          parentAttrId: data?.parent_attr_ids?.[i] ?? '',
-          childAttrId: data?.child_attr_ids?.[i] ?? ''
-        })
-      }
-      return parentAndChildAttrList
-    },
-
     getCITypes() {
       getCITypes().then((res) => {
         this.CITypes = res.ci_types
@@ -414,13 +342,6 @@ export default {
     handleCreate() {
       this.drawerTitle = this.$t('cmdb.ciType.addRelation')
       this.visible = true
-      this.$set(this, 'modalAttrList', [
-        {
-          id: uuidv4(),
-          parentAttrId: undefined,
-          childAttrId: undefined
-        }
-      ])
       this.$nextTick(() => {
         this.form.setFieldsValue({
           source_ci_type_id: this.CITypeId,
@@ -444,22 +365,19 @@ export default {
             ci_type_id,
             relation_type_id,
             constraint,
+            parent_attr_id = undefined,
+            child_attr_id = undefined,
           } = values
 
-          const {
-            parent_attr_ids,
-            child_attr_ids,
-            validate
-          } = this.handleValidateAttrList(this.modalAttrList)
-          if (!validate) {
+          if ((!parent_attr_id && child_attr_id) || (parent_attr_id && !child_attr_id)) {
+            this.$message.warning(this.$t('cmdb.ciType.attributeAssociationTip3'))
             return
           }
-
           createRelation(source_ci_type_id, ci_type_id, {
             relation_type_id,
             constraint,
-            parent_attr_ids,
-            child_attr_ids,
+            parent_attr_id,
+            child_attr_id,
           }).then((res) => {
             this.$message.success(this.$t('addSuccess'))
             this.onClose()
@@ -468,37 +386,6 @@ export default {
         }
       })
     },
-
-    /**
-     * 校验属性列表
-     * @param {*} attrList
-     */
-     handleValidateAttrList(attrList) {
-      const parent_attr_ids = []
-      const child_attr_ids = []
-      attrList.map((attr) => {
-        if (attr.parentAttrId) {
-          parent_attr_ids.push(attr.parentAttrId)
-        }
-        if (attr.childAttrId) {
-          child_attr_ids.push(attr.childAttrId)
-        }
-      })
-
-      if (parent_attr_ids.length !== child_attr_ids.length) {
-        this.$message.warning(this.$t('cmdb.ciType.attributeAssociationTip3'))
-        return {
-          validate: false
-        }
-      }
-
-      return {
-        validate: true,
-        parent_attr_ids,
-        child_attr_ids
-      }
-    },
-
     handleOpenGrant(record) {
       this.$refs.cmdbGrant.open({
         name: `${record.source_ci_type_name} -> ${record.name}`,
@@ -514,75 +401,25 @@ export default {
       if (row.isParent) return 'relation-table-parent'
     },
     handleEditActived({ row }) {
-      this.$nextTick(async () => {
-        if (this.isContinueCloseEdit) {
-          const editRecord = this.$refs.xTable.getEditRecord()
-          const { row: editRow, column } = editRecord
-          this.currentEditData = {
-            row: editRow,
-            column
-          }
-          return
-        }
-        const tableAttrList = []
-
-        const length = Math.min(row?.parent_attr_ids?.length || 0, row.child_attr_ids?.length || 0)
-        if (length) {
-          for (let i = 0; i < length; i++) {
-            tableAttrList.push({
-              id: uuidv4(),
-              parentAttrId: row?.parent_attr_ids?.[i] ?? undefined,
-              childAttrId: row?.child_attr_ids?.[i] ?? undefined
-            })
-          }
-        } else {
-          tableAttrList.push({
-            id: uuidv4(),
-            parentAttrId: undefined,
-            childAttrId: undefined
-          })
-        }
-        this.$set(this, 'tableAttrList', tableAttrList)
-      })
+      this.parent_attr_id = row?.parent_attr_id ?? undefined
+      this.child_attr_id = row?.child_attr_id ?? undefined
     },
     async handleEditClose({ row }) {
-      if (this.currentEditData) {
-        this.currentEditData = null
-        return
-      }
-
-      this.isContinueCloseEdit = true
-
       const { source_ci_type_id: parentId, id: childrenId, constraint, relation_type } = row
+      const { parent_attr_id, child_attr_id } = this
       const _find = this.relationTypes.find((item) => item.name === relation_type)
       const relation_type_id = _find?.id
-
-      const {
-        parent_attr_ids,
-        child_attr_ids,
-        validate
-      } = this.handleValidateAttrList(this.tableAttrList)
-      if (!validate) {
-        this.isContinueCloseEdit = false
+      if ((!parent_attr_id && child_attr_id) || (parent_attr_id && !child_attr_id)) {
+        this.$message.warning(this.$t('cmdb.ciType.attributeAssociationTip3'))
         return
       }
-
       await createRelation(row.isParent ? childrenId : parentId, row.isParent ? parentId : childrenId, {
         relation_type_id,
         constraint,
-        parent_attr_ids,
-        child_attr_ids,
-      }).finally(async () => {
-        await this.getData()
-        this.isContinueCloseEdit = false
-
-        if (this.currentEditData) {
-          setTimeout(async () => {
-            const { fullData } = this.$refs.xTable.getTableData()
-            const findEdit = fullData.find((item) => item.id === this?.currentEditData?.row?.id)
-            await this.$refs.xTable.setEditRow(findEdit, 'attributeAssociation')
-          })
-        }
+        parent_attr_id,
+        child_attr_id,
+      }).finally(() => {
+        this.getData()
       })
     },
     getAttrNameById(attributes, id) {
@@ -590,9 +427,7 @@ export default {
       return _find?.alias ?? _find?.name ?? id
     },
     changeChild(value) {
-      this.modalAttrList.forEach((item) => {
-        item.childAttrId = undefined
-      })
+      this.form.setFieldsValue({ child_attr_id: undefined })
       getCITypeAttributesById(value).then((res) => {
         this.modalChildAttributes = res?.attributes ?? []
       })
@@ -601,75 +436,10 @@ export default {
       // filter password/json/is_list
       return attributes.filter((attr) => !attr.is_password && !attr.is_list && attr.value_type !== '6')
     },
-    addTableAttr() {
-      this.tableAttrList.push({
-        id: uuidv4(),
-        parentAttrId: undefined,
-        childAttrId: undefined
-      })
-    },
-    removeTableAttr(id) {
-      if (this.tableAttrList.length <= 1) {
-        this.$message.error(this.$t('cmdb.ciType.attributeAssociationTip6'))
-        return
-      }
-      const index = this.tableAttrList.findIndex((item) => item.id === id)
-      if (index !== -1) {
-        this.tableAttrList.splice(index, 1)
-      }
-    },
-
-    addModalAttr() {
-      this.modalAttrList.push({
-        id: uuidv4(),
-        parentAttrId: undefined,
-        childAttrId: undefined
-      })
-    },
-
-    removeModalAttr(id) {
-      if (this.modalAttrList.length <= 1) {
-        this.$message.error(this.$t('cmdb.ciType.attributeAssociationTip6'))
-        return
-      }
-      const index = this.modalAttrList.findIndex((item) => item.id === id)
-      if (index !== -1) {
-        this.modalAttrList.splice(index, 1)
-      }
-    }
   },
 }
 </script>
 
-<style lang="less" scoped>
-.relation-table {
-  /deep/ .vxe-cell {
-    max-height: max-content !important;
-  }
-}
-.table-attribute-row {
-  display: inline-flex;
-  align-items: center;
-  margin-top: 5px;
-
-  &:last-child {
-    margin-bottom: 5px;
-  }
-
-  &-link {
-    margin: 0 5px;
-  }
-
-  &-action {
-    margin-left: 5px;
-  }
-}
-
-.modal-attribute-action {
-  margin-left: 5px;
-}
-</style>
-
 <style lang="less">
 .ops-stripe-table .vxe-body--row.row--stripe.relation-table-divider {
   background-color: #b1b8d3 !important;

cmdb-ui/src/modules/cmdb/views/custom_dashboard/chartForm.vue

@@ -91,7 +91,7 @@
               show-search
             >
               <a-select-option
-                v-for="attr in commonAttributes.filter((attr) => !attr.is_password && attr.value_type !== '6')"
+                v-for="attr in commonAttributes.filter((attr) => !attr.is_password)"
                 :key="attr.id"
                 :value="attr.id"
               >{{ attr.alias || attr.name }}</a-select-option

cmdb-ui/src/modules/cmdb/views/discovery/agentTable.vue

@@ -1,36 +0,0 @@
-<template>
-  <vxe-table
-    size="mini"
-    stripe
-    class="ops-stripe-table"
-    show-overflow
-    keep-source
-    ref="xTable"
-    max-height="100%"
-    :data="tableData"
-    :scroll-y="{enabled: true}"
-  >
-    <vxe-column field="name" :title="$t('name')">
-      <template #edit="{ row }">
-        <vxe-input v-model="row.name" type="text"></vxe-input>
-      </template>
-    </vxe-column>
-    <vxe-column field="type" :title="$t('type')"></vxe-column>
-    <vxe-column field="desc" :title="$t('desc')"></vxe-column>
-  </vxe-table>
-</template>
-
-<script>
-export default {
-  name: 'AgentTable',
-  props: {
-    tableData: {
-      type: Array,
-      default: () => [],
-    },
-  }
-}
-</script>
-
-<style lang="less" scoped>
-</style>

cmdb-ui/src/modules/cmdb/views/discovery/constants.js

@@ -1,6 +0,0 @@
-export const DISCOVERY_CATEGORY_TYPE = {
-  AGENT: 'agent',
-  SNMP: 'snmp',
-  HTTP: 'http',
-  PLUGIN: 'plugin'
-}

cmdb-ui/src/modules/cmdb/views/discovery/discoveryCard.vue

@@ -2,81 +2,34 @@
   <div
     :class="{
       'discovery-card': true,
-      'discovery-card-http': rule.type === DISCOVERY_CATEGORY_TYPE.HTTP,
       'discovery-card-small': isSelected,
       'discovery-card-small-selected': isSelected && selectedIds().findIndex((item) => item.id === rule.id) > -1,
     }"
     @click="clickCard"
   >
-    <div
-      class="discovery-card-inner"
-      v-if="rule.is_inner"
-    >
-      <span class="discovery-card-inner-text">{{ $t('cmdb.ad.innerFlag') }}</span>
-    </div>
-    <div
-      class="discovery-background-top"
-      :style="{ background: borderTopColorMap[rule.name] || '' }"
-    ></div>
+    <div class="discovery-bottom"></div>
     <div class="discovery-top">
       <div class="discovery-header">
         <img
           v-if="icon.id && icon.url"
-          class="discovery-header-icon"
           :src="`/api/common-setting/v1/file/${icon.url}`"
+          :style="{ maxHeight: '30px', maxWidth: '30px' }"
         />
-        <ops-icon
-          v-else
-          :type="icon.name || 'caise-chajian'"
-          :style="{ color: icon.color }"
-          class="discovery-header-icon"
-        />
+        <ops-icon v-else :type="icon.name || 'caise-chajian'" :style="{ fontSize: '30px', color: icon.color }" />
         <span :title="rule.name">{{ rule.name }}</span>
       </div>
       <template v-if="!isSelected">
-        <div
-          class="discovery-resources"
-          v-if="rule.type === DISCOVERY_CATEGORY_TYPE.HTTP && rule.resources.length"
-        >
-          <a-tooltip>
-            <template slot="title">
-              {{ $t('cmdb.ad.discoveryCardResoureTip') }}
-            </template>
-            <div class="discovery-resources-left">
-              <ops-icon class="discovery-resources-icon" type="cmdb-discovery_resources" />
-              <span class="discovery-resources-count">{{ rule.resources.length }}{{ $i18n.locale === 'zh' ? '个' : '' }}</span>
-            </div>
-          </a-tooltip>
-          <div class="discovery-resources-right">
-            <template v-for="(item, index) in rule.resources">
-              <span
-                :key="index"
-                v-if="index < 2"
-                class="discovery-resources-item"
-              >
-                {{ item }}
-              </span>
-            </template>
-            <span v-if="rule.resources.length >= 2" class="discovery-resources-item">
-              <ops-icon type="veops-more" />
-            </span>
-          </div>
-        </div>
-        <a-divider
-          :style="{ margin: rule.type === DISCOVERY_CATEGORY_TYPE.HTTP ? '10px 0' : '7px 0' }"
-        />
+        <a-divider :style="{ margin: '5px 0' }" />
         <div class="discovery-footer">
-          <a-space v-if="rule.type === 'agent' && rule.is_plugin">
-            <a @click="handleEdit">
-              <a-icon type="edit" />
-            </a>
+          <a-space v-if="rule.type === 'agent'">
+            <a @click="handleEdit"><ops-icon type="icon-xianxing-edit"/></a>
             <a
               v-if="isDeletable"
               @click="handleDelete"
               :style="{ color: 'red' }"
-            >
-              <a-icon type="delete" />
-            </a>
+            ><ops-icon
+              type="icon-xianxing-delete"
+            /></a>
           </a-space>
           <a v-else @click="handleEdit"><a-icon type="eye"/></a>
           <span>{{ rule.is_plugin ? 'Plugin' : $t('cmdb.custom_dashboard.default') }}</span>
@@ -87,8 +40,6 @@
 </template>
 
 <script>
-import { DISCOVERY_CATEGORY_TYPE } from './constants.js'
-
 export default {
   name: 'DiscoveryCard',
   props: {
@@ -101,17 +52,6 @@ export default {
       default: false,
     },
   },
-  data() {
-    return {
-      DISCOVERY_CATEGORY_TYPE,
-      borderTopColorMap: {
-        '阿里云': '#FFB287',
-        '腾讯云': '#87BEFF',
-        '华为云': '#FFB8B8',
-        'AWS': '#FFC187',
-      }
-    }
-  },
   computed: {
     icon() {
       return this.rule?.option?.icon ?? { color: '', name: 'caise-wuliji' }
@@ -155,32 +95,7 @@ export default {
   position: relative;
   margin-bottom: 40px;
   margin-right: 40px;
-
-  &-inner {
-    position: absolute;
-    top: 0;
-    right: 0;
-    z-index: 4;
-
-    width: 50px;
-    height: 30px;
-    border-left: 50px solid transparent;
-    border-top: 30px solid @primary-color_4;
-
-    &-text {
-      width: 30px;
-      position: absolute;
-      top: -28px;
-      right: 3px;
-      text-align: right;
-
-      color: @primary-color;
-      font-size: 10px;
-      font-weight: 400;
-    }
-  }
-
-  .discovery-background-top {
+  .discovery-bottom {
     width: 100%;
     height: 10px;
     position: absolute;
@@ -190,7 +105,6 @@ export default {
     background: linear-gradient(90.54deg, #879fff 1.32%, #a0ddff 99.13%);
     border-radius: 4px 4px 0 0;
   }
-
   .discovery-top {
     width: 100%;
     height: calc(100% - 5px);
@@ -204,7 +118,7 @@ export default {
     padding: 12px;
     .discovery-header {
       width: 100%;
-      height: 45px;
+      height: 50px;
       display: flex;
       align-items: center;
       > i {
@@ -216,73 +130,17 @@ export default {
         text-overflow: ellipsis;
         color: #000;
       }
-
-      &-icon {
-        font-size: 22px;
-        max-height: 22px;
-        max-width: 22px;
-      }
     }
-
-    .discovery-resources {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      &-count {
-        margin-left: 3px;
-        color: @text-color_3;
-        font-size: 12px;
-        font-weight: 400;
-      }
-
-      &-right {
-        display: flex;
-        align-items: center;
-      }
-
-      &-item {
-        padding: 3px 6px;
-        border-radius: 12px;
-        background-color: @layout-content-background;
-
-        color: @text-color_3;
-        font-size: 11px;
-        font-weight: 400;
-        max-width: 95px;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-
-        &:not(:last-child) {
-          margin-right: 6px;
-        }
-      }
-    }
-
     .discovery-footer {
       display: flex;
       align-items: center;
       justify-content: space-between;
       > span {
-        color: #86909c;
-        background-color: #f0f5ff;
+        color: #a5a9bc;
+        background-color: #d8eaff;
         border-radius: 2px;
-        padding: 2px 8px;
-        font-size: 11px;
-      }
-    }
-  }
-
-  &-http {
-    width: 263px;
-    height: 142px;
-
-    .discovery-header {
-      &-icon {
-        font-size: 30px !important;
-        max-height: 30px !important;
-        max-width: 30px !important;
+        padding: 0 5px;
+        font-size: 12px;
       }
     }
   }
@@ -291,11 +149,6 @@ export default {
   width: 170px;
   height: 80px;
   cursor: pointer;
-  // &:hover {
-  //   .discovery-top {
-  //     background-color: #f0f1f5;
-  //   }
-  // }
 }
 .discovery-card-small:hover,
 .discovery-card-small-selected {

cmdb-ui/src/modules/cmdb/views/discovery/editDrawer.vue

@@ -1,16 +1,6 @@
 <template>
-  <CustomDrawer
-    width="800px"
-    :title="title"
-    :visible="visible"
-    :bodyStyle="{ height: 'calc(-108px + 100vh)' }"
-    @close="handleClose"
-  >
-    <AgentTable
-      v-if="adType === DISCOVERY_CATEGORY_TYPE.AGENT"
-      :tableData="tableData"
-    />
-    <template v-else-if="adType === DISCOVERY_CATEGORY_TYPE.PLUGIN">
+  <CustomDrawer width="800px" :title="title" :visible="visible" @close="handleClose">
+    <template v-if="adType === 'agent'">
       <a-form-model
         ref="autoDiscoveryForm"
         :model="form"
@@ -57,9 +47,8 @@
         icon="plus"
         :style="{ marginBottom: '10px' }"
         @click="insertEvent(-1)"
+      >{{ $t('new') }}</a-button
       >
-        {{ $t('new') }}
-      </a-button>
       <vxe-table
         size="mini"
         stripe
@@ -88,11 +77,7 @@
             <vxe-input v-model="row.desc" type="text"></vxe-input>
           </template>
         </vxe-column>
-        <vxe-column
-          :title="$t('operation')"
-          width="60"
-          v-if="!form.is_plugin"
-        >
+        <vxe-column :title="$t('operation')" width="60" v-if="!form.is_plugin">
           <template #default="{ row }">
             <a-space v-if="$refs.xTable.isActiveByRow(row)">
               <a @click="saveRowEvent(row)"><a-icon type="save"/></a>
@@ -118,24 +103,15 @@
 </template>
 
 <script>
-import { postDiscovery, putDiscovery } from '../../api/discovery'
-import { DISCOVERY_CATEGORY_TYPE } from './constants.js'
-
-import AgentTable from './agentTable.vue'
 import CustomIconSelect from '@/components/CustomIconSelect'
+import { postDiscovery, putDiscovery } from '../../api/discovery'
 import HttpSnmpAD from '../../components/httpSnmpAD'
 import CustomCodeMirror from '@/components/CustomCodeMirror'
 import 'codemirror/lib/codemirror.css'
 import 'codemirror/theme/monokai.css'
-
 export default {
   name: 'EditDrawer',
-  components: {
-    CustomIconSelect,
-    CustomCodeMirror,
-    HttpSnmpAD,
-    AgentTable
-  },
+  components: { CustomIconSelect, CustomCodeMirror, HttpSnmpAD },
   props: {
     is_inner: {
       type: Boolean,
@@ -166,12 +142,11 @@ export default {
         tabSize: 4,
         lineWrapping: true,
       },
-      DISCOVERY_CATEGORY_TYPE,
     }
   },
   computed: {
     title() {
-      if ([DISCOVERY_CATEGORY_TYPE.HTTP, DISCOVERY_CATEGORY_TYPE.SNMP, DISCOVERY_CATEGORY_TYPE.AGENT].includes(this.adType)) {
+      if (this.adType === 'http' || this.adType === 'snmp') {
         return this.ruleData.name
       }
       if (this.type === 'edit') {
@@ -198,15 +173,10 @@ export default {
           is_plugin: true,
         }
       }
-      if (adType === DISCOVERY_CATEGORY_TYPE.HTTP || adType === DISCOVERY_CATEGORY_TYPE.SNMP) {
+      if (adType === 'http' || adType === 'snmp') {
         return
       }
       this.$nextTick(() => {
-        if (adType === DISCOVERY_CATEGORY_TYPE.AGENT) {
-          this.tableData = data?.attributes ?? []
-          return
-        }
-
         if (this.type === 'edit') {
           this.form = {
             name: data.name,
@@ -233,7 +203,7 @@ export default {
       this.tableData = []
       this.customIcon = { name: '', color: '' }
       this.form = { name: '', is_plugin: false }
-      if (this.adType === DISCOVERY_CATEGORY_TYPE.PLUGIN) {
+      if (this.adType === 'agent') {
         this.$refs.autoDiscoveryForm.clearValidate()
       } else {
         // this.$refs.httpSnmpAd.currentCate = ''
@@ -274,10 +244,9 @@ export default {
       const $table = this.$refs.xTable
       const { fullData: _tableData } = $table.getTableData()
       console.log(_tableData)
-      const type = this.adType === DISCOVERY_CATEGORY_TYPE.PLUGIN ? DISCOVERY_CATEGORY_TYPE.AGENT : this.adType
       const params = {
         ...this.form,
-        type,
+        type: this.adType,
         is_inner: this.is_inner,
         option: { icon: this.customIcon },
         attributes: this.form.is_plugin

cmdb-ui/src/modules/cmdb/views/discovery/index.vue

@@ -1,90 +1,39 @@
 <template>
   <div class="setting-discovery">
-    <div v-if="!isSelected" class="setting-discovery-header">
-      <a-input-search
-        class="setting-discovery-search"
-        :placeholder="$t('cmdb.ad.pluginSearchTip')"
-        @search="onSearchDiscovery"
-      />
-      <div class="setting-discovery-radio">
-        <div
-          v-for="{ type, label } in typeCategory"
-          :key="type"
-          :class="['setting-discovery-radio-item', radioKey === type ? 'setting-discovery-radio-item_active' : '']"
-          @click="changeRadio(type)"
-        >
-          {{ label }}
-        </div>
-      </div>
-
-      <div class="setting-discovery-header-action">
-        <a-upload
-          name="file"
-          :multiple="false"
-          accept=".json"
-          :fileList="[]"
-          :beforeUpload="beforeUpload"
-        >
-          <a class="setting-discovery-header-action-btn">
-            <a-icon type="upload" />
-            {{ $t('cmdb.ad.upload') }}
-          </a>
+    <div :style="{ textAlign: 'right' }">
+      <a-space v-if="!isSelected">
+        <a-upload name="file" :multiple="false" accept=".json" :fileList="[]" :beforeUpload="beforeUpload">
+          <a><a-icon type="upload" />{{ $t('cmdb.ad.upload') }}</a>
         </a-upload>
-        <a
-          @click="download"
-          class="setting-discovery-header-action-btn"
-        >
-          <a-icon type="download" />
-          {{ $t('cmdb.ad.download') }}
-        </a>
-      </div>
+        <a @click="download"><a-icon type="download" />{{ $t('cmdb.ad.download') }}</a>
+      </a-space>
     </div>
-    <div class="setting-discovery-body">
-      <template v-if="!showNullData">
-        <div v-for="{ type, label } in typeCategory" :key="type">
-          <template v-if="filterCategoryChildren[type] && (filterCategoryChildren[type].children.length || (showAddPlugin && type === DISCOVERY_CATEGORY_TYPE.PLUGIN))">
-            <div class="type-header">
-              <div>{{ label }}</div>
-            </div>
-            <a-row type="flex" justify="start">
-              <DiscoveryCard
-                v-for="rule in filterCategoryChildren[type].children"
-                :key="rule.id"
-                :rule="rule"
-                :isSelected="isSelected"
-                @editRule="handleOpenEditDrawer(rule, 'edit', type)"
-                @deleteRule="deleteRule(rule)"
-              />
-              <div
-                v-if="showAddPlugin && type === DISCOVERY_CATEGORY_TYPE.PLUGIN"
-                class="setting-discovery-add"
-                @click="handleOpenEditDrawer(null, 'add', DISCOVERY_CATEGORY_TYPE.PLUGIN)"
-              >
-                <a-icon type="plus-circle" theme="twoTone" />
-                <span class="setting-discovery-add-text">
-                  {{ $t('cmdb.ad.addPlugin') }}
-                </span>
-              </div>
-            </a-row>
-          </template>
-        </div>
-      </template>
-      <div class="setting-discovery-empty" v-else>
-        <img class="setting-discovery-empty-img" :src="require(`@/assets/data_empty.png`)" />
-        <p class="setting-discovery-empty-text">{{ $t('noData') }}</p>
+    <div v-for="{ type, label } in typeCategory" :key="type">
+      <div class="type-header">
+        <div>{{ label }}</div>
+        <a-space v-if="!isSelected && type === 'agent'">
+          <a @click="handleOpenEditDrawer(null, 'add', type)"><ops-icon type="icon-xianxing-tianjia"/></a>
+        </a-space>
       </div>
+      <a-row type="flex" justify="start">
+        <DiscoveryCard
+          @editRule="handleOpenEditDrawer(rule, 'edit', type)"
+          @deleteRule="deleteRule(rule)"
+          v-for="rule in typeCategoryChildren[type]"
+          :key="rule.id"
+          :rule="rule"
+          :isSelected="isSelected"
+        />
+      </a-row>
     </div>
     <EditDrawer ref="editDrawer" />
   </div>
 </template>
 
 <script>
-import _ from 'lodash'
 import { getDiscovery, deleteDiscovery } from '../../api/discovery'
-import { DISCOVERY_CATEGORY_TYPE } from './constants.js'
 import DiscoveryCard from './discoveryCard.vue'
 import EditDrawer from './editDrawer.vue'
-
 export default {
   name: 'AutoDiscovery',
   components: { DiscoveryCard, EditDrawer },
@@ -96,56 +45,26 @@ export default {
   },
   data() {
     return {
-      typeCategoryChildren: {},
-      DISCOVERY_CATEGORY_TYPE,
-      radioKey: '',
-      searchValue: '',
+      typeCategoryChildren: { agent: [], snmp: [], http: [] },
     }
   },
   computed: {
     typeCategory() {
       return [
         {
-          type: DISCOVERY_CATEGORY_TYPE.HTTP,
-          label: this.$t('cmdb.ad.http'),
-        },
-        {
-          type: DISCOVERY_CATEGORY_TYPE.AGENT,
+          type: 'agent',
           label: this.$t('cmdb.ad.agent'),
         },
         {
-          type: DISCOVERY_CATEGORY_TYPE.SNMP,
+          type: 'snmp',
           label: this.$t('cmdb.ad.snmp'),
         },
         {
-          type: DISCOVERY_CATEGORY_TYPE.PLUGIN,
-          label: this.$t('cmdb.ad.plugin'),
-        }
+          type: 'http',
+          label: this.$t('cmdb.ad.http'),
+        },
       ]
     },
-    filterCategoryChildren() {
-      const _typeCategoryChildren = _.cloneDeep(this.typeCategoryChildren)
-      const _filterCategoryChildren = Object.values(_typeCategoryChildren).reduce((obj, category) => {
-        if (this.radioKey === '' || category.type === this.radioKey) {
-          category.children = category.children.filter((item) => {
-            return item?.name?.indexOf(this.searchValue) !== -1
-          })
-          obj[category.type] = category
-        }
-        return obj
-      }, {})
-
-      return _filterCategoryChildren
-    },
-    showNullData() {
-      const showCount = Object.values(this.filterCategoryChildren).reduce((acc, item) => {
-        return acc + (item?.children?.length || 0)
-      }, 0)
-      return showCount === 0
-    },
-    showAddPlugin() {
-      return !this.isSelected && this.searchValue === ''
-    }
   },
   provide() {
     return {
@@ -157,41 +76,13 @@ export default {
   },
   methods: {
     getDiscovery() {
-      const _typeCategoryChildren = {
-        [DISCOVERY_CATEGORY_TYPE.HTTP]: {
-          type: DISCOVERY_CATEGORY_TYPE.HTTP,
-          children: []
-        },
-        [DISCOVERY_CATEGORY_TYPE.AGENT]: {
-          type: DISCOVERY_CATEGORY_TYPE.AGENT,
-          children: []
-        },
-        [DISCOVERY_CATEGORY_TYPE.SNMP]: {
-          type: DISCOVERY_CATEGORY_TYPE.SNMP,
-          children: []
-        },
-        [DISCOVERY_CATEGORY_TYPE.PLUGIN]: {
-          type: DISCOVERY_CATEGORY_TYPE.PLUGIN,
-          children: []
-        }
-      }
+      const _typeCategoryChildren = { agent: [], snmp: [], http: [] }
       getDiscovery().then((res) => {
         this.typeCategory.forEach(({ type }) => {
-          let categoryChildren = []
-          switch (type) {
-            case DISCOVERY_CATEGORY_TYPE.PLUGIN:
-              categoryChildren = res.filter((list) => list.is_plugin)
-              break
-            case DISCOVERY_CATEGORY_TYPE.AGENT:
-              categoryChildren = res.filter((list) => !list.is_plugin && list.type === type)
-              break
-            default:
-              categoryChildren = res.filter((list) => list.type === type)
-              break
-          }
-          _typeCategoryChildren[`${type}`]['children'] = categoryChildren
+          const _filterData = res.filter((list) => list.type === type && list.is_inner)
+          _typeCategoryChildren[`${type}`] = _filterData
         })
-        this.$set(this, 'typeCategoryChildren', _typeCategoryChildren)
+        this.typeCategoryChildren = _typeCategoryChildren
       })
     },
     handleOpenEditDrawer(data, type, autoType) {
@@ -246,106 +137,15 @@ export default {
       xhr.send(formData)
       return false
     },
-
-    onSearchDiscovery(v) {
-      this.searchValue = v
-    },
-
-    changeRadio(key) {
-      this.radioKey = key === this.radioKey ? '' : key
-    }
   },
 }
 </script>
 
 <style lang="less" scoped>
 .setting-discovery {
-  &-header {
-    display: flex;
-    align-items: center;
-
-    &-action {
-      margin-left: auto;
-      display: flex;
-      align-items: center;
-      gap: 14px;
-
-      &-btn {
-        display: flex;
-        align-items: center;
-        gap: 6px;
-        padding: 5px 12px;
-        border: solid 1px @primary-color_8;
-        background-color: #F4F9FF;
-        color: @link-color;
-      }
-    }
-  }
-
-  &-search {
-    width: 254px;
-  }
-
-  &-radio {
-    display: flex;
-    align-items: center;
-    margin-left: 15px;
-    gap: 15px;
-
-    &-item {
-      padding: 4px 14px;
-      font-size: 14px;
-      font-weight: 400;
-      line-height: 24px;
-      cursor: pointer;
-
-      &_active {
-        background-color: @primary-color_3;
-        color: @primary-color;
-      }
-    }
-  }
-
-  &-body {
-    background-color: #fff;
-    border-radius: @border-radius-box;
-    box-shadow: 0px 0px 4px 0px rgba(158, 171, 190, 0.25);
-    padding: 20px;
-    margin-top: 24px;
-
-    .setting-discovery-add {
-      height: 105px;
-      width: 180px;
-      border-radius: @border-radius-base;
-      border: 1px dashed @primary-color_8;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      cursor: pointer;
-
-      &-text {
-        color: @text-color_3;
-        font-size: 12px;
-        font-weight: 400;
-        margin-top: 13px;
-      }
-    }
-
-    .setting-discovery-empty {
-      text-align: center;
-      padding: 20px 0;
-
-      &-text {
-        margin-top: 20px;
-      }
-
-      &-img {
-        width: 100px;
-      }
-    }
-  }
-
+  background-color: #fff;
+  padding: 20px;
+  border-radius: @border-radius-box;
   .type-header {
     width: 100%;
     display: inline-flex;

cmdb-ui/src/modules/cmdb/views/discoveryCI/components/adcCounter.vue

@@ -1,234 +0,0 @@
-<template>
-  <div class="counter-wrap">
-    <div
-      v-for="(group, groupIndex) in counterData"
-      :key="groupIndex"
-      class="counter-group"
-    >
-      <div
-        v-for="(item, index) in group"
-        :key="index"
-        class="counter-item"
-      >
-        <div class="counter-item-header">
-          <ops-icon class="counter-item-icon" :type="item.icon" />
-          <span
-            class="counter-item-title"
-            :title="$t(item.title)"
-          >
-            {{ $t(item.title) }}
-          </span>
-        </div>
-        <div>
-          <span class="counter-item-number">{{ item.count }}</span>
-          <template v-if="item.percent !== undefined">
-            <span
-              v-if="item.percent !== -1"
-              :class="['counter-item-percent', 'counter-item-percent-' + (item.percentStatus ? 'up' : 'down')]"
-            >
-              <ops-icon class="counter-item-percent-icon" type="cmdb-arrow" />
-              <span
-                class="counter-item-percent-text"
-              >
-                {{ item.percent }}%
-              </span>
-            </span>
-            <span
-              v-else
-              class="counter-item-percent-null"
-            >
-              -
-            </span>
-          </template>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import _ from 'lodash'
-import { getAdcCounter } from '@/modules/cmdb/api/discovery'
-
-export default {
-  name: 'AdcCounter',
-  props: {
-    typeId: {
-      type: Number,
-      default: 0,
-    }
-  },
-  data() {
-    return {
-      counterDataTemplate: [
-        [
-          {
-            title: 'cmdb.ad.ruleCount',
-            icon: 'cmdb-rule',
-            type: 'ruleCount',
-            count: 0,
-          },
-          {
-            title: 'cmdb.ad.execMachine',
-            icon: 'cmdb-executing_machine',
-            type: 'execTargetCount',
-            count: 0,
-          },
-        ],
-        [
-          {
-            title: 'cmdb.ad.resource',
-            icon: 'cmdb-resource',
-            type: 'resource',
-            count: 0,
-          },
-          {
-            title: 'cmdb.ad.autoInventory',
-            icon: 'cmdb-automatic_inventory',
-            type: 'autoInventory',
-            count: 0,
-          },
-        ],
-        [
-          {
-            title: 'cmdb.ad.newThisWeek',
-            icon: 'cmdb-week_additions',
-            type: 'rule_count',
-            count: 0,
-            percentStatus: true,
-            percent: '',
-          },
-          {
-            title: 'cmdb.ad.newThisMonth',
-            icon: 'cmdb-month_additions',
-            type: 'rule_count',
-            count: 0,
-            percentStatus: true,
-            percent: '',
-          }
-        ]
-      ],
-      counterData: [],
-    }
-  },
-  watch: {
-    typeId: {
-      immediate: true,
-      handler(id) {
-        if (id) {
-          this.queryAdcCounter(id)
-        }
-      }
-    }
-  },
-  methods: {
-    async queryAdcCounter(id) {
-      const res = await getAdcCounter({
-        type_id: id
-      })
-      console.log('getAdcCounter res', res)
-      const _counterData = _.cloneDeep(this.counterDataTemplate)
-
-      _counterData[0][0]['count'] = res?.rule_count ?? 0
-      _counterData[0][1]['count'] = res?.exec_target_count ?? 0
-
-      _counterData[1][0]['count'] = res?.instance_count ?? 0
-      _counterData[1][1]['count'] = res?.accept_count ?? 0
-
-      const newWeekCount = Math.abs(res.this_week_count - res.last_week_count)
-      const newWeekPrecent = res.last_week_count ? Number((newWeekCount / res.last_week_count).toFixed(2)) * 100 : -1
-      _counterData[2][0]['count'] = res.this_week_count || 0
-      _counterData[2][0]['percent'] = newWeekPrecent
-      _counterData[2][0]['percentStatus'] = res.this_week_count >= res.last_week_count
-
-      const newMonthCount = Math.abs(res.this_month_count - res.last_month_count)
-      const newMonthPrecent = res.last_month_count ? Number((newMonthCount / res.last_month_count).toFixed(2)) * 100 : -1
-      _counterData[2][1]['count'] = res.this_month_count || 0
-      _counterData[2][1]['percent'] = newMonthPrecent
-      _counterData[2][1]['percentStatus'] = res.this_month_count >= res.last_month_count
-
-      this.counterData = _counterData
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.counter-wrap {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-
-  .counter-group {
-    display: flex;
-    align-items: center;
-    height: 82px;
-    border: solid 1px @border-color-base;
-    flex-grow: 0;
-    width: calc((100% - 30px) / 3);
-
-    .counter-item {
-      padding: 16px 18px;
-      flex-grow: 0;
-      width: 50%;
-
-      &-header {
-        width: 100%;
-        display: flex;
-        align-items: center;
-      }
-
-      &-icon {
-        font-size: 14px;
-      }
-
-      &-title {
-        font-size: 14px;
-        color: @text-color_2;
-        margin-left: 4px;
-
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        flex-grow: 0;
-      }
-
-      &-number {
-        color: @primary-color;
-        font-size: 22px;
-        font-weight: 700;
-      }
-
-      &-percent {
-        margin-left: 5px;
-
-        &-icon {
-          font-size: 12px;
-        }
-
-        &-text {
-          font-size: 10px;
-          font-weight: 400;
-        }
-
-        &-up {
-          color: #00B42A;
-        }
-
-        &-down {
-          color: #FD4C6A;
-
-          .counter-item-percent-icon {
-            transform: rotate(180deg);
-          }
-        }
-      }
-
-      &-percent-null {
-        padding: 0 10px;
-      }
-    }
-  }
-}
-</style>

cmdb-ui/src/modules/cmdb/views/discoveryCI/components/passwordField.vue

@@ -1,41 +0,0 @@
-<template>
-  <div>
-    <span v-if="!isShow">{{ showPassword }}</span>
-    <span v-else>{{ password }}</span>
-    <a
-      class="password-eye"
-      @click="switchPassword"
-    >
-      <a-icon :type="isShow ? 'eye-invisible' : 'eye'"/>
-    </a>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'PasswordField',
-  props: {
-    password: {
-      type: String,
-      default: '',
-    }
-  },
-  data() {
-    return {
-      isShow: false,
-      showPassword: '******',
-    }
-  },
-  methods: {
-    switchPassword() {
-      this.isShow = !this.isShow
-    },
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.password-eye {
-  margin-left: 10px
-}
-</style>

cmdb-ui/src/modules/cmdb/views/discoveryCI/index.vue

@@ -7,49 +7,42 @@
           ><span :style="{ color: 'rgb(195, 205, 215)' }">({{ group.ci_types.length }})</span>
         </p>
         <div
-          :class="{ 'cmdb-adc-side-item': true, 'cmdb-adc-side-item-selected': currentType === ciType.id }"
-          v-for="ciType in group.ci_types"
-          :key="ciType.id"
-          @click="clickSidebar(ciType.id)"
+          :class="{ 'cmdb-adc-side-item': true, 'cmdb-adc-side-item-selected': currentType === type.id }"
+          v-for="type in group.ci_types"
+          :key="type.id"
+          @click="clickSidebar(type.id)"
         >
           <span class="cmdb-adc-side-icon">
-            <template v-if="ciType.icon">
-              <img v-if="ciType.icon.split('$$')[2]" :src="`/api/common-setting/v1/file/${ciType.icon.split('$$')[3]}`" />
+            <template v-if="type.icon">
+              <img v-if="type.icon.split('$$')[2]" :src="`/api/common-setting/v1/file/${type.icon.split('$$')[3]}`" />
               <ops-icon
                 v-else
                 :style="{
-                  color: ciType.icon.split('$$')[1],
+                  color: type.icon.split('$$')[1],
                   fontSize: '14px',
                 }"
-                :type="ciType.icon.split('$$')[0]"
+                :type="type.icon.split('$$')[0]"
               />
             </template>
-            <span :style="{ color: '#2f54eb' }" v-else>{{ ciType.name[0].toUpperCase() }}</span>
+            <span :style="{ color: '#2f54eb' }" v-else>{{ type.name[0].toUpperCase() }}</span>
           </span>
-          <span :title="ciType.alias || ciType.name" class="cmdb-adc-side-name">{{ ciType.alias || ciType.name }}</span>
+          <span :title="type.alias || type.name" class="cmdb-adc-side-name">{{ type.alias || type.name }}</span>
         </div>
       </div>
     </template>
     <template #two>
       <div id="discovery-ci">
-        <AdcCounter :typeId="currentType" />
-        <div class="discovery-ci-header">
-          <a-input-search
-            :placeholder="$t('cmdb.components.pleaseSearch')"
-            :style="{ width: '200px', marginRight: '20px' }"
-            @search="handleSearch"
-            allowClear
-          />
-          <span class="ops-list-batch-action" v-show="selectedCount">
-            <span @click="batchAccept">{{ $t('cmdb.ad.accept') }}</span>
-            <a-divider type="vertical" />
-            <span @click="batchDelete">{{ $t('delete') }}</span>
-            <span>{{ $t('cmdb.ci.selectRows', { rows: selectedCount }) }}</span>
-          </span>
-          <div @click="clickLog" class="discovery-ci-log">
-            <ops-icon type="a-cmdb-log1" />
-            <span>{{ $t('cmdb.ad.log') }}</span>
-          </div>
+        <a-input-search
+          :placeholder="$t('cmdb.components.pleaseSearch')"
+          :style="{ width: '200px', marginRight: '20px', marginBottom: '10px' }"
+          @search="handleSearch"
+          allowClear
+        />
+        <div class="ops-list-batch-action" :style="{ marginBottom: '10px' }" v-show="!!selectedRowKeys.length">
+          <span @click="batchAccept">{{ $t('cmdb.ad.accept') }}</span>
+          <a-divider type="vertical" />
+          <span @click="batchDelete">{{ $t('delete') }}</span>
+          <span>{{ $t('cmdb.ci.selectRows', { rows: selectedRowKeys.length }) }}</span>
         </div>
         <ops-table
           show-overflow
@@ -69,75 +62,56 @@
           :checkbox-config="{ reserve: true, highlight: true, range: true }"
           :sort-config="{ remote: false, trigger: 'cell' }"
         >
+          <vxe-column align="center" type="checkbox" width="60"></vxe-column>
           <vxe-column
-            align="center"
-            type="checkbox"
-            width="60"
-            fixed="left"
-          ></vxe-column>
-          <vxe-column
-            v-for="(col, index) in columns"
-            :key="`${col.field}_${index}`"
+            v-for="col in columns"
+            :key="col.field"
             :title="col.title"
             :field="col.field"
             :width="col.width"
             :sortable="col.sortable"
           >
-            <template v-if="col.value_type === '6' || col.is_password" #default="{row}">
-              <PasswordField
-                v-if="col.is_password"
-                :password="row[col.field]"
-              />
-              <span
-                v-else-if="col.value_type === '6' && row[col.field]"
-              >
-                {{ row[col.field] }}
-              </span>
+            <template v-if="col.value_type === '6'" #default="{row}">
+              <span v-if="col.value_type === '6' && row[col.field]">{{ row[col.field] }}</span>
+            </template>
+          </vxe-column>
+          <vxe-column
+            align="center"
+            field="is_accept"
+            :title="$t('cmdb.ad.isAccept')"
+            v-bind="columns.length ? { width: '100px' } : { minWidth: '100px' }"
+            :filters="[
+              { label: $t('yes'), value: true },
+              { label: $t('no'), value: false },
+            ]"
+          >
+            <template #default="{row}">
+              {{ row.is_accept ? $t('yes') : $t('no') }}
             </template>
           </vxe-column>
           <vxe-column
             field="accept_by"
             :title="$t('cmdb.ad.acceptBy')"
             v-bind="columns.length ? { width: '80px' } : { minWidth: '80px' }"
-            :filters="acceptByFilters"
+            :filters="[]"
           ></vxe-column>
-          <vxe-column
-            align="center"
-            field="is_accept"
-            :title="$t('cmdb.ad.isAccept')"
-            v-bind="columns.length ? { width: '80px' } : { minWidth: '80px' }"
-            :filters="[
-              { label: $t('yes'), value: true },
-              { label: $t('no'), value: false },
-            ]"
-            fixed="right"
-          >
-            <template #default="{row}">
-              <ops-icon
-                :type="row.is_accept ? 'cmdb-warehousing' : 'cmdb-not_warehousing'"
-                :style="{ color: row.is_accept ? '#00B42A' : '#A5A9BC' }"
-              />
-            </template>
-          </vxe-column>
           <vxe-column
             field="accept_time"
             :title="$t('cmdb.ad.acceptTime')"
             sortable
-            v-bind="columns.length ? { width: '150px' } : { minWidth: '150px' }"
-            fixed="right"
+            v-bind="columns.length ? { width: '130px' } : { minWidth: '130px' }"
           ></vxe-column>
           <vxe-column
             :title="$t('operation')"
             v-bind="columns.length ? { width: '60px' } : { minWidth: '60px' }"
             align="center"
-            fixed="right"
           >
             <template #default="{row}">
               <a-space>
                 <a-tooltip :title="$t('cmdb.ad.accept')">
-                  <a v-if="!row.is_accept" @click="accept(row)"><ops-icon type="cmdb-manual_warehousing"/></a>
+                  <a v-if="!row.is_accept" @click="accept(row)"><ops-icon type="icon-xianxing-edit"/></a>
                 </a-tooltip>
-                <a :style="{ color: 'red' }" @click="deleteADC(row)"><a-icon type="delete"/></a>
+                <a :style="{ color: 'red' }" @click="deleteADC(row)"><ops-icon type="icon-xianxing-delete"/></a>
               </a-space>
             </template>
           </vxe-column>
@@ -148,23 +122,6 @@
             </div>
           </template>
         </ops-table>
-
-        <a-modal
-          v-model="logModalVisible"
-          :footer="null"
-          :width="596"
-        >
-          <div class="log-modal-title">{{ $t('cmdb.ad.log') }}</div>
-          <p ref="logModelText" class="log-modal-text">
-            <span
-              v-for="(item, index) in logTextArray"
-              :key="index"
-              class="log-modal-text-item"
-            >
-              {{ item }}
-            </span>
-          </p>
-        </a-modal>
       </div>
     </template>
   </TwoColumnLayout>
@@ -174,26 +131,11 @@
 import _ from 'lodash'
 import XEUtils from 'xe-utils'
 import TwoColumnLayout from '@/components/TwoColumnLayout'
-import AdcCounter from './components/adcCounter.vue'
-import PasswordField from './components/passwordField.vue'
-
-import {
-  getADCCiTypes,
-  getAdc,
-  updateADCAccept,
-  getADCCiTypesAttrs,
-  deleteAdc,
-  getAdcExecHistories
-} from '../../api/discovery'
+import { getADCCiTypes, getAdc, updateADCAccept, getADCCiTypesAttrs, deleteAdc } from '../../api/discovery'
 import { getCITableColumns } from '../../utils/helper'
-
 export default {
   name: 'DiscoveryCI',
-  components: {
-    TwoColumnLayout,
-    AdcCounter,
-    PasswordField
-  },
+  components: { TwoColumnLayout },
   data() {
     return {
       ci_types_list: [],
@@ -203,10 +145,6 @@ export default {
       columns: [],
       selectedRowKeys: [],
       searchValue: '',
-      logModalVisible: false,
-      logTextArray: [],
-      acceptByFilters: [],
-      selectedCount: 0,
     }
   },
   computed: {
@@ -214,7 +152,7 @@ export default {
       return this.$store.state.windowHeight
     },
     tableHeight() {
-      return this.windowHeight - 240
+      return this.windowHeight - 140
     },
     filterTableData() {
       const { searchValue } = this
@@ -231,7 +169,7 @@ export default {
         return rest
       }
       return this.tableData
-    }
+    },
   },
   watch: {
     currentType: {
@@ -242,13 +180,6 @@ export default {
         }
       },
     },
-    selectedRowKeys: {
-      deep: true,
-      immediate: true,
-      handler(selectedRowKeys) {
-        this.selectedCount = selectedRowKeys.length
-      },
-    },
   },
   mounted() {
     getADCCiTypes({ need_other: true }).then((res) => {
@@ -282,20 +213,18 @@ export default {
         if ($table) {
           const nameColumn = $table.getVxetableRef().getColumnByField('accept_by')
           if (nameColumn) {
-            const acceptByFilters = _.uniqBy(
-              res.result
-                .filter((item) => item.accept_by)
-                .map((item) => ({
-                  value: item.accept_by,
-                  label: item.accept_by,
-                })),
-              'value'
-            )
             $table.getVxetableRef().setFilter(
               nameColumn,
-              acceptByFilters
+              _.uniqBy(
+                res.result
+                  .filter((item) => item.accept_by)
+                  .map((item) => ({
+                    value: item.accept_by,
+                    label: item.accept_by,
+                  })),
+                'value'
+              )
             )
-            this.acceptByFilters = acceptByFilters
           }
         }
         this.tableData = res.result.map((item) => ({ ..._.cloneDeep(item), ...item.instance }))
@@ -373,33 +302,12 @@ export default {
         onCancel() {},
       })
     },
-    onSelectChange({ records, checked }) {
+    onSelectChange({ records, checked, row }) {
       this.selectedRowKeys = records.map((item) => item.id)
     },
     handleSearch(value) {
       this.searchValue = value
     },
-
-    async clickLog() {
-      this.logModalVisible = true
-      const logRes = await getAdcExecHistories({
-        type_id: this.currentType,
-        page_size: 1000
-      })
-      let logTextArray = []
-      if (logRes?.result?.length) {
-        logTextArray = logRes.result.map((log) => {
-          return `[${log.created_at}] ${log.stdout}`
-        })
-      }
-      this.logTextArray = logTextArray
-      this.$nextTick(() => {
-        const textEl = this.$refs.logModelText
-        if (textEl) {
-          textEl.scrollTop = textEl.scrollHeight
-        }
-      })
-    }
   },
 }
 </script>
@@ -442,48 +350,5 @@ export default {
     .ops_popover_item_selected();
     background-color: @primary-color_3;
   }
-
-  .discovery-ci-header {
-    display: flex;
-    align-items: center;
-    padding-top: 18px;
-    padding-bottom: 10px;
-  }
-
-  .discovery-ci-log {
-    cursor: pointer;
-    background-color: #F4F9FF;
-    border: solid 1px @primary-color_8;
-    color: @primary-color;
-    font-size: 12px;
-    padding: 5px 12px;
-    margin-left: auto;
-    display: flex;
-    align-items: center;
-    gap: 6px;
-  }
-}
-
-.log-modal-title {
-  font-size: 14px;
-  font-weight: 500;
-}
-
-.log-modal-text {
-  margin-top: 14px;
-  padding: 12px;
-  width: 100%;
-  height: 312px;
-  overflow: auto;
-  border: solid 1px @border-color-base;
-  background-color: #2f333d;
-
-  &-item {
-    color: #c5c8c6;
-    width: 100%;
-    display: block;
-    white-space: pre-wrap;
-    word-break: break-all;
-  }
 }
 </style>

cmdb-ui/src/modules/cmdb/views/model_relation/index.vue

@@ -70,16 +70,13 @@
           </a-select>
         </a-form-item>
         <a-form-item :label="$t('cmdb.ciType.attributeAssociation')">
-          <a-row
-            v-for="item in modalAttrList"
-            :key="item.id"
-          >
-            <a-col :span="10">
+          <a-row>
+            <a-col :span="11">
               <a-form-item>
                 <a-select
                   :placeholder="$t('cmdb.ciType.attributeAssociationTip4')"
                   allowClear
-                  v-model="item.parentAttrId"
+                  v-decorator="['parent_attr_id', { rules: [{ required: false }] }]"
                 >
                   <a-select-option v-for="attr in filterAttributes(modalParentAttributes)" :key="attr.id">
                     {{ attr.alias || attr.name }}
@@ -90,12 +87,12 @@
             <a-col :span="2" :style="{ textAlign: 'center' }">
               =>
             </a-col>
-            <a-col :span="9">
+            <a-col :span="11">
               <a-form-item>
                 <a-select
                   :placeholder="$t('cmdb.ciType.attributeAssociationTip5')"
                   allowClear
-                  v-model="item.childAttrId"
+                  v-decorator="['child_attr_id', { rules: [{ required: false }] }]"
                 >
                   <a-select-option v-for="attr in filterAttributes(modalChildAttributes)" :key="attr.id">
                     {{ attr.alias || attr.name }}
@@ -103,20 +100,6 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :span="3">
-              <a
-                class="modal-attribute-action"
-                @click="removeModalAttr(item.id)"
-              >
-                <a-icon type="minus-circle" />
-              </a>
-              <a
-                class="modal-attribute-action"
-                @click="addModalAttr"
-              >
-                <a-icon type="plus-circle" />
-              </a>
-            </a-col>
           </a-row>
         </a-form-item>
       </a-form>
@@ -131,7 +114,6 @@ import { getCITypeGroupsConfig } from '@/modules/cmdb/api/ciTypeGroup'
 import { getCITypes } from '@/modules/cmdb/api/CIType'
 import { createRelation, deleteRelation, getCITypeChildren, getRelationTypes } from '@/modules/cmdb/api/CITypeRelation'
 import { getCITypeAttributesById } from '@/modules/cmdb/api/CITypeAttr'
-import { v4 as uuidv4 } from 'uuid'
 
 export default {
   name: 'Index',
@@ -157,7 +139,6 @@ export default {
 
       modalParentAttributes: [],
       modalChildAttributes: [],
-      modalAttrList: [],
     }
   },
   computed: {
@@ -247,13 +228,6 @@ export default {
     handleCreate() {
       this.drawerTitle = this.$t('cmdb.ciType.addRelation')
       this.visible = true
-      this.$set(this, 'modalAttrList', [
-        {
-          id: uuidv4(),
-          parentAttrId: undefined,
-          childAttrId: undefined
-        }
-      ])
       this.$nextTick(() => {
         this.form.setFieldsValue({
           source_ci_type_id: this.sourceCITypeId,
@@ -275,22 +249,19 @@ export default {
             ci_type_id,
             relation_type_id,
             constraint,
+            parent_attr_id = undefined,
+            child_attr_id = undefined,
           } = values
 
-          const {
-            parent_attr_ids,
-            child_attr_ids,
-            validate
-          } = this.handleValidateAttrList(this.modalAttrList)
-          if (!validate) {
+          if ((!parent_attr_id && child_attr_id) || (parent_attr_id && !child_attr_id)) {
+            this.$message.warning(this.$t('cmdb.ciType.attributeAssociationTip3'))
             return
           }
-
           createRelation(source_ci_type_id, ci_type_id, {
             relation_type_id,
             constraint,
-            parent_attr_ids,
-            child_attr_ids,
+            parent_attr_id,
+            child_attr_id,
           }).then((res) => {
             this.$message.success(this.$t('addSuccess'))
             this.onClose()
@@ -301,37 +272,6 @@ export default {
       this.sourceCITypeId = undefined
       this.targetCITypeId = undefined
     },
-
-    /**
-     * 校验属性列表
-     * @param {*} attrList
-     */
-     handleValidateAttrList(attrList) {
-      const parent_attr_ids = []
-      const child_attr_ids = []
-      attrList.map((attr) => {
-        if (attr.parentAttrId) {
-          parent_attr_ids.push(attr.parentAttrId)
-        }
-        if (attr.childAttrId) {
-          child_attr_ids.push(attr.childAttrId)
-        }
-      })
-
-      if (parent_attr_ids.length !== child_attr_ids.length) {
-        this.$message.warning(this.$t('cmdb.ciType.attributeAssociationTip3'))
-        return {
-          validate: false
-        }
-      }
-
-      return {
-        validate: true,
-        parent_attr_ids,
-        child_attr_ids
-      }
-    },
-
     handleOk() {
       this.$refs.table.refresh()
     },
@@ -344,18 +284,14 @@ export default {
     },
     handleSourceTypeChange(value) {
       this.sourceCITypeId = value
-      this.modalAttrList.forEach((item) => {
-        item.parentAttrId = undefined
-      })
+      this.form.setFieldsValue({ parent_attr_id: undefined })
       getCITypeAttributesById(value).then((res) => {
         this.modalParentAttributes = res?.attributes ?? []
       })
     },
     handleTargetTypeChange(value) {
       this.targetCITypeId = value
-      this.modalAttrList.forEach((item) => {
-        item.childAttrId = undefined
-      })
+      this.form.setFieldsValue({ child_attr_id: undefined })
       getCITypeAttributesById(value).then((res) => {
         this.modalChildAttributes = res?.attributes ?? []
       })
@@ -367,30 +303,12 @@ export default {
       // filter password/json/is_list
       return attributes.filter((attr) => !attr.is_password && !attr.is_list && attr.value_type !== '6')
     },
-
-    addModalAttr() {
-      this.modalAttrList.push({
-        id: uuidv4(),
-        parentAttrId: undefined,
-        childAttrId: undefined
-      })
-    },
-
-    removeModalAttr(id) {
-      if (this.modalAttrList.length <= 1) {
-        this.$message.error(this.$t('cmdb.ciType.attributeAssociationTip6'))
-        return
-      }
-      const index = this.modalAttrList.findIndex((item) => item.id === id)
-      if (index !== -1) {
-        this.modalAttrList.splice(index, 1)
-      }
-    }
   },
 }
 </script>
 
 <style lang="less" scoped>
+
 .model-relation {
   background-color: #fff;
   border-radius: @border-radius-box;
@@ -398,8 +316,4 @@ export default {
   height: calc(100vh - 64px);
   margin-bottom: -24px;
 }
-
-.modal-attribute-action {
-  margin-left: 5px;
-}
 </style>

cmdb-ui/src/modules/cmdb/views/model_relation/modules/modelRelationTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="model-relation-table">
+  <div>
     <vxe-table
       ref="xTable"
       stripe
@@ -7,7 +7,6 @@
       show-header-overflow
       show-overflow
       resizable
-      :scroll-y="{enabled: false}"
       :height="`${windowHeight - 160}px`"
       :data="tableData"
       :sort-config="{ defaultSort: { field: 'created_at', order: 'desc' } }"
@@ -35,7 +34,7 @@
           {{ handleConstraint(row.constraint) }}
         </template>
       </vxe-column>
-      <vxe-column :width="300" field="attributeAssociation" :edit-render="{}">
+      <vxe-column :width="250" field="attributeAssociation" :edit-render="{}">
         <template #header>
           <span>
             <a-tooltip :title="$t('cmdb.ciType.attributeAssociationTip1')">
@@ -48,73 +47,37 @@
           </span>
         </template>
         <template #default="{row}">
-          <template
-            v-for="item in row.parentAndChildAttrList"
+          <span
+            v-if="row.parent_attr_id && row.child_attr_id"
+          >{{ getAttrNameById(type2attributes[row.parent_id], row.parent_attr_id) }}=>
+            {{ getAttrNameById(type2attributes[row.child_id], row.child_attr_id) }}</span
           >
-            <div
-              :key="item.id"
-              v-if="item.parentAttrId && item.childAttrId"
-            >
-              {{ getAttrNameById(type2attributes[row.parent_id], item.parentAttrId) }}=>
-              {{ getAttrNameById(type2attributes[row.child_id], item.childAttrId) }}
-            </div>
-          </template>
         </template>
         <template #edit="{ row }">
-          <div
-            v-for="item in tableAttrList"
-            :key="item.id"
-            class="table-attribute-row"
-          >
+          <div style="display:inline-flex;align-items:center;">
             <a-select
               allowClear
               size="small"
-              v-model="item.parentAttrId"
+              v-model="parent_attr_id"
               :getPopupContainer="(trigger) => trigger.parentNode"
               :style="{ width: '100px' }"
-              show-search
-              optionFilterProp="title"
             >
-              <a-select-option
-                v-for="attr in filterAttributes(type2attributes[row.parent_id])"
-                :key="attr.id"
-                :value="attr.id"
-                :title="attr.alias || attr.name"
-              >
+              <a-select-option v-for="attr in filterAttributes(type2attributes[row.parent_id])" :key="attr.id">
                 {{ attr.alias || attr.name }}
               </a-select-option>
             </a-select>
-            <span class="table-attribute-row-link">=></span>
+            =>
             <a-select
               allowClear
               size="small"
-              v-model="item.childAttrId"
+              v-model="child_attr_id"
               :getPopupContainer="(trigger) => trigger.parentNode"
               :style="{ width: '100px' }"
-              show-search
-              optionFilterProp="title"
             >
-              <a-select-option
-                v-for="attr in filterAttributes(type2attributes[row.child_id])"
-                :key="attr.id"
-                :value="attr.id"
-                :title="attr.alias || attr.name"
-              >
+              <a-select-option v-for="attr in filterAttributes(type2attributes[row.child_id])" :key="attr.id">
                 {{ attr.alias || attr.name }}
               </a-select-option>
             </a-select>
-            <a
-              class="table-attribute-row-action"
-              @click="removeTableAttr(item.id)"
-            >
-              <a-icon type="minus-circle" />
-            </a>
-            <a
-              class="table-attribute-row-action"
-              @click="addTableAttr"
-            >
-              <a-icon type="plus-circle" />
-            </a>
           </div>
         </template>
       </vxe-column>
@@ -134,7 +97,6 @@
 </template>
 
 <script>
-import { v4 as uuidv4 } from 'uuid'
 import { getCITypeRelations, deleteRelation, createRelation } from '@/modules/cmdb/api/CITypeRelation'
 import { getRelationTypes } from '@/modules/cmdb/api/relationType'
 import CMDBGrant from '../../../components/cmdbGrant'
@@ -146,7 +108,8 @@ export default {
       tableData: [],
       relationTypeList: null,
       type2attributes: {},
-      tableAttrList: [],
+      parent_attr_id: undefined,
+      child_attr_id: undefined,
     }
   },
   components: {
@@ -174,29 +137,9 @@ export default {
     },
     async getMainData() {
       const { relations, type2attributes } = await getCITypeRelations()
-      this.tableData = relations.map((item) => {
-        const parentAndChildAttrList = this.handleAttrList(item)
-        return {
-          ...item,
-          parentAndChildAttrList
-        }
-      })
+      this.tableData = relations
       this.type2attributes = type2attributes
     },
-
-    handleAttrList(data) {
-      const length = Math.min(data?.parent_attr_ids?.length || 0, data.child_attr_ids?.length || 0)
-      const parentAndChildAttrList = []
-      for (let i = 0; i < length; i++) {
-        parentAndChildAttrList.push({
-          id: uuidv4(),
-          parentAttrId: data?.parent_attr_ids?.[i] ?? '',
-          childAttrId: data?.child_attr_ids?.[i] ?? ''
-        })
-      }
-      return parentAndChildAttrList
-    },
-
     // 获取关系
     async getRelationTypes() {
       const res = await getRelationTypes()
@@ -228,75 +171,21 @@ export default {
       })
     },
     handleEditActived({ row }) {
-      const tableAttrList = []
-
-      const length = Math.min(row?.parent_attr_ids?.length || 0, row.child_attr_ids?.length || 0)
-      if (length) {
-        for (let i = 0; i < length; i++) {
-          tableAttrList.push({
-            id: uuidv4(),
-            parentAttrId: row?.parent_attr_ids?.[i] ?? undefined,
-            childAttrId: row?.child_attr_ids?.[i] ?? undefined
-          })
-        }
-      } else {
-        tableAttrList.push({
-          id: uuidv4(),
-          parentAttrId: undefined,
-          childAttrId: undefined
-        })
-      }
-      console.log('handleEditActived', tableAttrList)
-      this.$set(this, 'tableAttrList', tableAttrList)
+      this.parent_attr_id = row?.parent_attr_id ?? undefined
+      this.child_attr_id = row?.child_attr_id ?? undefined
     },
-
-    /**
-     * 校验属性列表
-     * @param {*} attrList
-     */
-     handleValidateAttrList(attrList) {
-      const parent_attr_ids = []
-      const child_attr_ids = []
-      attrList.map((attr) => {
-        if (attr.parentAttrId) {
-          parent_attr_ids.push(attr.parentAttrId)
-        }
-        if (attr.childAttrId) {
-          child_attr_ids.push(attr.childAttrId)
-        }
-      })
-
-      if (parent_attr_ids.length !== child_attr_ids.length) {
-        this.$message.warning(this.$t('cmdb.ciType.attributeAssociationTip3'))
-        return {
-          validate: false
-        }
-      }
-
-      return {
-        validate: true,
-        parent_attr_ids,
-        child_attr_ids
-      }
-    },
-
     async handleEditClose({ row }) {
       const { parent_id, child_id, constraint, relation_type_id } = row
-
-      const {
-        parent_attr_ids,
-        child_attr_ids,
-        validate
-      } = this.handleValidateAttrList(this.tableAttrList)
-      if (!validate) {
+      const { parent_attr_id = undefined, child_attr_id = undefined } = this
+      if ((!parent_attr_id && child_attr_id) || (parent_attr_id && !child_attr_id)) {
+        this.$message.warning(this.$t('cmdb.ciType.attributeAssociationTip3'))
         return
       }
-
       await createRelation(parent_id, child_id, {
         relation_type_id,
         constraint,
-        parent_attr_ids,
-        child_attr_ids,
+        parent_attr_id,
+        child_attr_id,
       }).finally(() => {
         this.getMainData()
       })
@@ -309,49 +198,8 @@ export default {
       // filter password/json/is_list
       return attributes.filter((attr) => !attr.is_password && !attr.is_list && attr.value_type !== '6')
     },
-
-    addTableAttr() {
-      this.tableAttrList.push({
-        id: uuidv4(),
-        parentAttrId: undefined,
-        childAttrId: undefined
-      })
-    },
-    removeTableAttr(id) {
-      if (this.tableAttrList.length <= 1) {
-        this.$message.error(this.$t('cmdb.ciType.attributeAssociationTip6'))
-        return
-      }
-      const index = this.tableAttrList.findIndex((item) => item.id === id)
-      if (index !== -1) {
-        this.tableAttrList.splice(index, 1)
-      }
-    },
   },
 }
 </script>
 
-<style lang="less" scoped>
-.relation-table {
-  /deep/ .vxe-cell {
-    max-height: max-content !important;
-  }
-}
-.table-attribute-row {
-  display: inline-flex;
-  align-items: center;
-  margin-top: 5px;
-
-  &:last-child {
-    margin-bottom: 5px;
-  }
-
-  &-link {
-    margin: 0 5px;
-  }
-
-  &-action {
-    margin-left: 5px;
-  }
-}
-</style>
+<style></style>

cmdb-ui/src/modules/cmdb/views/operation_history/modules/typeTable.vue

@@ -162,9 +162,6 @@ export default {
             { [this.$t('cmdb.history.deleteUniqueConstraint')]: 11 },
             { [this.$t('cmdb.history.addRelation')]: 12 },
             { [this.$t('cmdb.history.deleteRelation')]: 13 },
-            { [this.$t('cmdb.history.addReconciliation')]: 14 },
-            { [this.$t('cmdb.history.updateReconciliation')]: 15 },
-            { [this.$t('cmdb.history.deleteReconciliation')]: 16 },
           ],
         },
       ],
@@ -201,9 +198,6 @@ export default {
         ['11', this.$t('cmdb.history.deleteUniqueConstraint')],
         ['12', this.$t('cmdb.history.addRelation')],
         ['13', this.$t('cmdb.history.deleteRelation')],
-        ['14', this.$t('cmdb.history.addReconciliation')],
-        ['15', this.$t('cmdb.history.updateReconciliation')],
-        ['16', this.$t('cmdb.history.deleteReconciliation')],
       ])
     },
   },
@@ -318,22 +312,27 @@ export default {
         // update CIType
         case '1': {
           item.changeArr = []
-          const diffs = this.deepCompare({
-            obj1: item?.change?.old,
-            obj2: item?.change?.new,
-            ignoreKeys: ['updated_at']
-          })
-          for (const val of diffs) {
-            const str = ` [ ${val.path} :  ${val.value1} -> ${val.value2} ] `
-            item.changeDescription += str
-            item.changeArr.push(str)
+          for (const key in item.change.old) {
+            const newVal = item.change.new[key]
+            const oldVal = item.change.old[key]
+            if (!_.isEqual(newVal, oldVal) && key !== 'updated_at') {
+              if (oldVal === null) {
+                const str = ` [ ${key} :  ${newVal || '""'} ] `
+                item.changeDescription += str
+                item.changeArr.push(str)
+              } else {
+                const str = ` [ ${key} :  ${oldVal || '""'} -> ${newVal || '""'} ] `
+                item.changeDescription += ` [ ${key} :  ${oldVal || '""'} -> ${newVal || '""'} ] `
+                item.changeArr.push(str)
+              }
+            }
           }
           if (!item.changeDescription) item.changeDescription = this.$t('cmdb.history.noModifications')
           break
         }
         // delete CIType
         case '2': {
-          item.changeDescription = this.$t('cmdb.history.deleteCIType') + ': ' + `${item.change.alias}`
+          item.changeDescription = this.$t('cmdb.history.addCIType') + ': ' + `${item.change.alias}`
           break
         }
         // add Attribute
@@ -344,15 +343,24 @@ export default {
         // update Attribute
         case '4': {
           item.changeArr = []
-          const diffs = this.deepCompare({
-            obj1: item?.change?.old,
-            obj2: item?.change?.new,
-            ignoreKeys: ['updated_at']
-          })
-          for (const val of diffs) {
-            const str = ` [ ${val.path} :  ${val.value1} -> ${val.value2} ] `
-            item.changeDescription += str
-            item.changeArr.push(str)
+          for (const key in item.change.old) {
+            if (!_.isEqual(item.change.new[key], item.change.old[key]) && key !== 'updated_at') {
+              let newStr = item.change.new[key]
+              let oldStr = item.change.old[key]
+              if (key === 'choice_value') {
+                newStr = newStr ? newStr.map((item) => item[0]).join(',') : ''
+                oldStr = oldStr ? oldStr.map((item) => item[0]).join(',') : ''
+              }
+              if (Object.prototype.toString.call(newStr) === '[object Object]') {
+                newStr = JSON.stringify(newStr)
+              }
+              if (Object.prototype.toString.call(oldStr) === '[object Object]') {
+                oldStr = JSON.stringify(oldStr)
+              }
+              const str = `${key} : ${oldStr ? ` ${oldStr || '""'} ` : ''} -> ${newStr || '""'}`
+              item.changeDescription += ` [ ${str} ] `
+              item.changeArr.push(str)
+            }
           }
           if (!item.changeDescription) item.changeDescription = this.$t('cmdb.history.noModifications')
           break
@@ -364,29 +372,39 @@ export default {
         }
         // add trigger
         case '6': {
-          item.changeDescription = `${this.$t('cmdb.history.addTrigger')}：${item?.change?.option?.name || ''}`
+          item.changeDescription = this.$t('cmdb.history.noModifications', {
+            attr_id: item.change.attr_id,
+            before_days: item.change.option.before_days,
+            subject: item.change.option.subject,
+            body: item.change.option.body,
+            notify_at: item.change.option.notify_at,
+          })
           break
         }
         // update trigger
         case '7': {
           item.changeArr = []
-          const diffs = this.deepCompare({
-            obj1: item?.change?.old,
-            obj2: item?.change?.new,
-            directDeepKeys: ['notifies'],
-            ignoreKeys: ['updated_at']
-          })
-          for (const val of diffs) {
-            const str = ` [ ${val.path} :  ${val.value1} -> ${val.value2} ] `
-            item.changeDescription += str
-            item.changeArr.push(str)
+          for (const key in item.change.old.option) {
+            const newVal = item.change.new.option[key]
+            const oldVal = item.change.old.option[key]
+            if (!_.isEqual(newVal, oldVal) && key !== 'updated_at') {
+              const str = ` [ ${key} :  ${oldVal} -> ${newVal} ] `
+              item.changeDescription += str
+              item.changeArr.push(str)
+            }
           }
           if (!item.changeDescription) item.changeDescription = this.$t('cmdb.history.noModifications')
           break
         }
         // delete trigger
         case '8': {
-          item.changeDescription = `${this.$t('cmdb.history.deleteTrigger')}：${item?.change?.option?.name || ''}`
+          item.changeDescription = this.$t('cmdb.history.noModifications', {
+            attr_id: item.change.attr_id,
+            before_days: item.change.option.before_days,
+            subject: item.change.option.subject,
+            body: item.change.option.body,
+            notify_at: item.change.option.notify_at,
+          })
           break
         }
         // add unique constraint
@@ -423,77 +441,8 @@ export default {
           )} -> ${item.change.child.alias}`
           break
         }
-        case '14': {
-          item.changeDescription = this.$t('cmdb.history.addReconciliation') + ': ' + item.change.name || item.change.alias
-          break
-        }
-        case '15': {
-          item.changeArr = []
-          const diffs = this.deepCompare({
-            obj1: item?.change?.old,
-            obj2: item?.change?.new,
-            directDeepKeys: ['notifies'],
-            ignoreKeys: ['updated_at']
-          })
-          for (const val of diffs) {
-            const str = ` [ ${val.path} :  ${val.value1} -> ${val.value2} ] `
-            item.changeDescription += str
-            item.changeArr.push(str)
-          }
-          if (!item.changeDescription) item.changeDescription = this.$t('cmdb.history.updateReconciliation')
-          break
-        }
-        case '16': {
-          item.changeDescription = this.$t('cmdb.history.deleteReconciliation') + ': ' + item.change.name || item.change.alias
-          break
-        }
       }
     },
-
-    deepCompare({
-      obj1,
-      obj2,
-      directDeepKeys = [],
-      ignoreKeys = [],
-    }) {
-      const diffs = []
-
-      function compare(obj1, obj2, path = '') {
-        if (typeof obj1 !== 'object' || typeof obj2 !== 'object' || obj1 === null || obj2 === null) {
-          if (obj1 !== obj2) {
-            diffs.push({ path, value1: formatValue(obj1), value2: formatValue(obj2) })
-          }
-          return
-        }
-
-        const keys1 = new Set(Object.keys(obj1))
-        const keys2 = new Set(Object.keys(obj2))
-        const allKeys = new Set([...keys1, ...keys2])
-
-        allKeys.forEach(key => {
-          const newPath = path ? `${path}.${key}` : key
-          if (!ignoreKeys.includes(key)) {
-            if (directDeepKeys.includes(key) && !_.isEqual(obj1[key], obj2[key])) {
-              diffs.push({ path: newPath, value1: formatValue(obj1[key]), value2: formatValue(obj2[key]) })
-            } else if (!keys1.has(key)) {
-              diffs.push({ path: newPath, value1: undefined, value2: formatValue(obj2[key]) })
-            } else if (!keys2.has(key)) {
-              diffs.push({ path: newPath, value1: formatValue(obj1[key]), value2: undefined })
-            } else {
-              compare(obj1[key], obj2[key], newPath)
-            }
-          }
-        })
-      }
-
-      function formatValue(val) {
-        return _.isObject(val) ? JSON.stringify(val) : val
-      }
-
-      compare(obj1, obj2)
-      return diffs
-    },
-
     filterOperate() {
       this.queryParams.page = 1
       this.queryParams.page_size = 50

cmdb-ui/src/modules/cmdb/views/preference/index.vue

@@ -32,77 +32,62 @@
             }"
           /></span>
       </div>
-      <div class="cmdb-preference-group" v-for="(subType, index) in myPreferences" :key="subType.name">
+      <div class="cmdb-preference-group" v-for="(group, index) in myPreferences" :key="group.name">
         <div class="cmdb-preference-group-title">
-          <span> <ops-icon :style="{ marginRight: '10px' }" :type="subType.icon" />{{ subType.name }}</span>
+          <span> <ops-icon :style="{ marginRight: '10px' }" :type="group.icon" />{{ group.name }} </span>
         </div>
-        <draggable class="ci-types-left-content" :list="subType.groups" @end="handleChangeGroups" filter=".undraggable">
-          <div v-for="group in subType.groups" :key="group.id || group.name">
+        <draggable
+          v-model="group.ci_types"
+          :animation="300"
+          @change="
+            (e) => {
+              orderChange(e, group)
+            }
+          "
+        >
+          <div class="cmdb-preference-group-content" v-for="ciType in group.ci_types" :key="ciType.id">
+            <OpsMoveIcon class="cmdb-preference-move-icon" />
             <div
-              :class="
-                `${group.id === undefined ? 'undraggable' : ''}`
-              "
+              :class="{
+                'cmdb-preference-avatar': true,
+                'cmdb-preference-avatar-noicon': !ciType.icon,
+              }"
+              :style="{ width: '30px', height: '30px', marginRight: '10px' }"
             >
-              <div v-if="index === 0 && subType.groups.length > 1" class="cmdb-preference-group-content">
-                <OpsMoveIcon class="cmdb-preference-move-icon" v-if="group.name"/>
-                <span style="font-weight: 500; color: #a5a9bc"><ellipsis :length="25" tooltip>{{ group.name || $t('other') }}</ellipsis></span>
-                <span :style="{ color: '#c3cdd7' }">({{ group.ci_types.length }})</span>
-              </div>
-            </div>
-            <draggable
-              v-model="group.ci_types"
-              :animation="300"
-              @change="
-                (e) => {
-                  orderChange(e, group, index === 1)
-                }
-              "
-            >
-              <div class="cmdb-preference-group-content" v-for="ciType in group.ci_types" :key="ciType.id">
-                <OpsMoveIcon class="cmdb-preference-move-icon" />
-                <div
-                  :class="{
-                    'cmdb-preference-avatar': true,
-                    'cmdb-preference-avatar-noicon': !ciType.icon,
+              <template v-if="ciType.icon">
+                <img
+                  v-if="ciType.icon.split('$$')[2]"
+                  :src="`/api/common-setting/v1/file/${ciType.icon.split('$$')[3]}`"
+                  :style="{ maxHeight: '30px', maxWidth: '30px' }"
+                />
+                <ops-icon
+                  v-else
+                  :style="{
+                    color: ciType.icon.split('$$')[1],
+                    fontSize: '14px',
                   }"
-                  :style="{ width: '30px', height: '30px', marginRight: '10px' }"
-                >
-                  <template v-if="ciType.icon">
-                    <img
-                      v-if="ciType.icon.split('$$')[2]"
-                      :src="`/api/common-setting/v1/file/${ciType.icon.split('$$')[3]}`"
-                      :style="{ maxHeight: '30px', maxWidth: '30px' }"
-                    />
-                    <ops-icon
-                      v-else
-                      :style="{
-                        color: ciType.icon.split('$$')[1],
-                        fontSize: '14px',
-                      }"
-                      :type="ciType.icon.split('$$')[0]"
-                    />
-                  </template>
-                  <span v-else :style="{ fontSize: '20px' }">{{ ciType.name[0].toUpperCase() }}</span>
-                </div>
-                <span class="cmdb-preference-group-content-title">{{ ciType.alias || ciType.name }}</span>
-                <span class="cmdb-preference-group-content-action">
-                  <a-tooltip :title="$t('cmdb.preference.cancelSub')">
-                    <span
-                      @click="unsubscribe(ciType, group.type)"
-                    ><ops-icon type="cmdb-preference-cancel-subscribe" />
-                    </span>
-                  </a-tooltip>
-                  <a-divider type="vertical" :style="{ margin: '0 3px' }" />
-                  <a-tooltip :title="$t('cmdb.preference.editSub')">
-                    <span
-                      @click="openSubscribeSetting(ciType, `${index + 1}`)"
-                    ><ops-icon
-                      type="cmdb-preference-subscribe"
-                    /></span>
-                  </a-tooltip>
+                  :type="ciType.icon.split('$$')[0]"
+                />
+              </template>
+              <span v-else :style="{ fontSize: '20px' }">{{ ciType.name[0].toUpperCase() }}</span>
+            </div>
+            <span class="cmdb-preference-group-content-title">{{ ciType.alias || ciType.name }}</span>
+            <span class="cmdb-preference-group-content-action">
+              <a-tooltip :title="$t('cmdb.preference.cancelSub')">
+                <span
+                  @click="unsubscribe(ciType, group.type)"
+                ><ops-icon type="cmdb-preference-cancel-subscribe" />
                 </span>
-              </div>
-            </draggable>
+              </a-tooltip>
+              <a-divider type="vertical" :style="{ margin: '0 3px' }" />
+              <a-tooltip :title="$t('cmdb.preference.editSub')">
+                <span
+                  @click="openSubscribeSetting(ciType, `${index + 1}`)"
+                ><ops-icon
+                  type="cmdb-preference-subscribe"
+                /></span>
+              </a-tooltip>
+            </span>
           </div>
         </draggable>
       </div>
@@ -212,7 +197,6 @@ import store from '@/store'
 import { mapState } from 'vuex'
 import moment from 'moment'
 import draggable from 'vuedraggable'
-import { Ellipsis } from '@/components'
 import { getCITypeGroups } from '../../api/ciTypeGroup'
 import {
   getPreference,
@@ -228,7 +212,7 @@ import { ops_move_icon as OpsMoveIcon } from '@/core/icons'
 
 export default {
   name: 'Preference',
-  components: { CollapseTransition, SubscribeSetting, draggable, OpsMoveIcon, Ellipsis },
+  components: { CollapseTransition, SubscribeSetting, draggable, OpsMoveIcon },
   data() {
     return {
       citypeData: [],
@@ -277,7 +261,7 @@ export default {
       ciTypeGroup.forEach((group) => {
         if (group.ci_types && group.ci_types.length) {
           group.ci_types.forEach((type) => {
-            const idx = pref.type_ids.findIndex((p) => p === type.id)
+            const idx = pref.findIndex((p) => p.id === type.id)
             if (idx > -1) {
               type.is_subscribed = true
             }
@@ -299,18 +283,19 @@ export default {
       const _myPreferences = [
         {
           name: this.$t('cmdb.menu.ciTable'),
-          groups: pref.group_types,
+          ci_types: self.instance.map((item) => {
+            const _find = pref.find((ci) => ci.id === item)
+            return _find
+          }),
           icon: 'cmdb-ci',
           type: 'ci',
         },
         {
           name: this.$t('cmdb.menu.ciTree'),
-          groups: [
-            {
-              ci_types: pref.tree_types,
-              name: null,
-            }
-          ],
+          ci_types: self.tree.map((item) => {
+            const _find = pref.find((ci) => ci.id === item)
+            return _find
+          }),
           icon: 'cmdb-tree',
           type: 'tree',
         },
@@ -392,41 +377,10 @@ export default {
         this.expandKeys.push(group.id)
       }
     },
-    async handleChangeGroups() {
-      const typeIds = []
-      this.myPreferences[0].groups.forEach(groupTypes => {
-        groupTypes.ci_types.forEach(ciType => {
-          typeIds.push(ciType.id)
-        })
-      })
-      preferenceCitypeOrder({ type_ids: typeIds, is_tree: false })
+    orderChange(e, group) {
+      preferenceCitypeOrder({ type_ids: group.ci_types.map((type) => type.id), is_tree: group.type !== 'ci' })
         .then(() => {
-          this.resetRoute()
-        })
-        .catch(() => {
-          this.getCITypes(false)
-        })
-    },
-    orderChange(e, group, isTree) {
-      let typeIds = []
-      if (!isTree) {
-        this.myPreferences[0].groups.forEach(groupTypes => {
-          if (group.id === groupTypes.id) {
-            group.ci_types.forEach(ciType => {
-              typeIds.push(ciType.id)
-            })
-          } else {
-            groupTypes.ci_types.forEach(ciType => {
-              typeIds.push(ciType.id)
-            })
-          }
-        })
-      } else {
-        typeIds = group.ci_types.map(item => item.id)
-      }
-      preferenceCitypeOrder({ type_ids: typeIds, is_tree: isTree })
-        .then(() => {
-          if (!isTree) {
+          if (group.type === 'ci') {
             this.resetRoute()
           }
         })
@@ -488,23 +442,6 @@ export default {
       margin-bottom: 20px;
     }
     .cmdb-preference-group {
-      .ci-types-left-content {
-        max-height: calc(100% - 45px);
-        overflow: hidden;
-        &:hover {
-          overflow: auto;
-        }
-        .undraggable{
-          .cmdb-preference-group-content {
-            cursor: default;
-            margin-left: 20px;
-            &:hover {
-              background: transparent;
-              box-shadow: none;
-            }
-          }
-        }
-      }
       .cmdb-preference-group-title {
         text-align: center;
         margin-bottom: 5px;