chore: release v2.4.12

fix(ui): build error

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

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

README.md

@@ -113,4 +113,7 @@ docker compose up -d
 
 _**欢迎关注公众号(维易科技OneOps)，关注后可加入微信群，进行产品和技术交流。**_
 
-![公众号: 维易科技OneOps](docs/images/wechat.png)
+
+<p align="center">
+  <img src="docs/images/wechat.png" alt="公众号: 维易科技OneOps" />
+</p>

cmdb-api/api/lib/cmdb/attribute.py

@@ -108,7 +108,8 @@ class AttributeManager(object):
             return []
         choice_values = choice_table.get_by(fl=["value", "option"], attr_id=attr_id)
 
-        return [[ValueTypeMap.serialize[value_type](choice_value['value']), choice_value['option']]
+        return [[ValueTypeMap.serialize[value_type](choice_value['value']), choice_value['option'] or
+                 {"label": ValueTypeMap.serialize[value_type](choice_value['value'])}]
                 for choice_value in choice_values]
 
     @staticmethod
@@ -135,6 +136,15 @@ class AttributeManager(object):
         choice_table and choice_table.get_by(attr_id=_id, only_query=True).delete()
         db.session.flush()
 
+    @classmethod
+    def get_enum_map(cls, _attr_id, _attr=None):
+        attr = AttributeCache.get(_attr_id) if _attr_id else _attr
+        if attr and attr.is_choice:
+            choice_values = cls.get_choice_values(attr.id, attr.value_type, None, None)
+            return {i[0]: i[1]['label'] for i in choice_values if i[1] and i[1].get('label')}
+
+        return {}
+
     @classmethod
     def search_attributes(cls, name=None, alias=None, page=1, page_size=None):
         """
@@ -167,24 +177,30 @@ class AttributeManager(object):
     def get_attribute_by_name(self, name):
         attr = Attribute.get_by(name=name, first=True)
         if attr.get("is_choice"):
-            attr["choice_value"] = self.get_choice_values(attr["id"], attr["value_type"],
+            attr["choice_value"] = self.get_choice_values(attr["id"],
-                                                          attr["choice_web_hook"], attr.get("choice_other"))
+                                                          attr["value_type"],
+                                                          attr["choice_web_hook"],
+                                                          attr.get("choice_other"))
 
         return attr
 
     def get_attribute_by_alias(self, alias):
         attr = Attribute.get_by(alias=alias, first=True)
         if attr.get("is_choice"):
-            attr["choice_value"] = self.get_choice_values(attr["id"], attr["value_type"],
+            attr["choice_value"] = self.get_choice_values(attr["id"],
-                                                          attr["choice_web_hook"], attr.get("choice_other"))
+                                                          attr["value_type"],
+                                                          attr["choice_web_hook"],
+                                                          attr.get("choice_other"))
 
         return attr
 
     def get_attribute_by_id(self, _id):
         attr = Attribute.get_by_id(_id).to_dict()
         if attr.get("is_choice"):
-            attr["choice_value"] = self.get_choice_values(attr["id"], attr["value_type"],
+            attr["choice_value"] = self.get_choice_values(attr["id"],
-                                                          attr["choice_web_hook"], attr.get("choice_other"))
+                                                          attr["value_type"],
+                                                          attr["choice_web_hook"],
+                                                          attr.get("choice_other"))
 
         return attr
 
@@ -229,7 +245,7 @@ class AttributeManager(object):
         is_choice = True if choice_value or kwargs.get('choice_web_hook') or kwargs.get('choice_other') else False
 
         name = kwargs.pop("name")
-        if name in BUILTIN_KEYWORDS:
+        if name in BUILTIN_KEYWORDS or kwargs.get('alias') in BUILTIN_KEYWORDS:
             return abort(400, ErrFormat.attribute_name_cannot_be_builtin)
 
         while kwargs.get('choice_other'):

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

@@ -18,12 +18,10 @@ from api.lib.cmdb.cache import AutoDiscoveryMappingCache
 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 RelationSourceEnum
 from api.lib.cmdb.const import ResourceTypeEnum
 from api.lib.cmdb.custom_dashboard import SystemConfigManager
 from api.lib.cmdb.resp_format import ErrFormat
@@ -35,6 +33,7 @@ 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 AutoDiscoveryAccount
 from api.models.cmdb import AutoDiscoveryCI
 from api.models.cmdb import AutoDiscoveryCIType
 from api.models.cmdb import AutoDiscoveryCITypeRelation
@@ -42,6 +41,7 @@ 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 build_relations_for_ad_accept
 from api.tasks.cmdb import write_ad_rule_sync_history
 
 PWD = os.path.abspath(os.path.dirname(__file__))
@@ -226,14 +226,14 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
             adr = AutoDiscoveryRuleCRUD.get_by_id(adt.adr_id)
             if not adr:
                 continue
-            if adr.type == "http":
+            if adr.type == AutoDiscoveryType.HTTP:
                 for i in DEFAULT_INNER:
                     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":
+            elif adr.type == AutoDiscoveryType.SNMP:
                 attributes = AutoDiscoverySNMPManager.get_attributes()
                 result.extend([i.get('name') for i in (attributes or [])])
             else:
@@ -243,6 +243,14 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
 
     @classmethod
     def get(cls, ci_id, oneagent_id, oneagent_name, last_update_at=None):
+        """
+        OneAgent sync rules
+        :param ci_id:
+        :param oneagent_id:
+        :param oneagent_name:
+        :param last_update_at:
+        :return:
+        """
         result = []
         rules = cls.cls.get_by(to_dict=True)
 
@@ -250,17 +258,14 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
             if not rule['enabled']:
                 continue
 
-            if isinstance(rule.get("extra_option"), dict) and rule['extra_option'].get('secret'):
+            if isinstance(rule.get("extra_option"), dict):
-                if not (current_user.username in PRIVILEGED_USERS or current_user.uid == rule['uid']):
+                decrypt_account(rule['extra_option'], rule['uid'])
-                    rule['extra_option'].pop('secret', None)
-                else:
-                    rule['extra_option']['secret'] = AESCrypto.decrypt(rule['extra_option']['secret'])
 
-            if isinstance(rule.get("extra_option"), dict) and rule['extra_option'].get('password'):
+                if rule['extra_option'].get('_reference'):
-                if not (current_user.username in PRIVILEGED_USERS or current_user.uid == rule['uid']):
                     rule['extra_option'].pop('password', None)
-                else:
+                    rule['extra_option'].pop('secret', None)
-                    rule['extra_option']['password'] = AESCrypto.decrypt(rule['extra_option']['password'])
+                    rule['extra_option'].update(
+                        AutoDiscoveryAccountCRUD().get_config_by_id(rule['extra_option']['_reference']))
 
             if oneagent_id and rule['agent_id'] == oneagent_id:
                 result.append(rule)
@@ -364,7 +369,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
         if kwargs.get('adr_id'):
             adr = AutoDiscoveryRule.get_by_id(kwargs['adr_id']) or abort(
                 404, ErrFormat.adr_not_found.format("id={}".format(kwargs['adr_id'])))
-            if adr.type == "http":
+            if adr.type == AutoDiscoveryType.HTTP:
                 kwargs.setdefault('extra_option', dict())
                 en_name = None
                 for i in DEFAULT_INNER:
@@ -379,13 +384,16 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
                             kwargs["extra_option"]["provider"] = en_name
                             break
 
+            if adr.type == AutoDiscoveryType.COMPONENTS and kwargs.get('extra_option'):
+                for i in DEFAULT_INNER:
+                    if i['name'] == adr.name:
+                        kwargs['extra_option']['collect_key'] = i['option'].get('collect_key')
+                        break
+
         if kwargs.get('is_plugin') and kwargs.get('plugin_script'):
             kwargs = check_plugin_script(**kwargs)
 
-        if isinstance(kwargs.get('extra_option'), dict) and kwargs['extra_option'].get('secret'):
+        encrypt_account(kwargs.get('extra_option'))
-            kwargs['extra_option']['secret'] = AESCrypto.encrypt(kwargs['extra_option']['secret'])
-        if isinstance(kwargs.get('extra_option'), dict) and kwargs['extra_option'].get('password'):
-            kwargs['extra_option']['password'] = AESCrypto.encrypt(kwargs['extra_option']['password'])
 
         ci_type = CITypeCache.get(kwargs['type_id'])
         unique = AttributeCache.get(ci_type.unique_id)
@@ -403,7 +411,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
 
         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":
+        if adr.type == AutoDiscoveryType.HTTP:
             kwargs.setdefault('extra_option', dict())
             en_name = None
             for i in DEFAULT_INNER:
@@ -418,6 +426,12 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
                         kwargs["extra_option"]["provider"] = en_name
                         break
 
+        if adr.type == AutoDiscoveryType.COMPONENTS and kwargs.get('extra_option'):
+            for i in DEFAULT_INNER:
+                if i['name'] == adr.name:
+                    kwargs['extra_option']['collect_key'] = i['option'].get('collect_key')
+                    break
+
         if 'attributes' in kwargs:
             self.__valid_exec_target(kwargs.get('agent_id'), kwargs.get('query_expr'))
 
@@ -441,13 +455,10 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
         if kwargs.get('is_plugin') and kwargs.get('plugin_script'):
             kwargs = check_plugin_script(**kwargs)
 
-        if isinstance(kwargs.get('extra_option'), dict) and kwargs['extra_option'].get('secret'):
+        encrypt_account(kwargs.get('extra_option'))
-            kwargs['extra_option']['secret'] = AESCrypto.encrypt(kwargs['extra_option']['secret'])
-        if isinstance(kwargs.get('extra_option'), dict) and kwargs['extra_option'].get('password'):
-            kwargs['extra_option']['password'] = AESCrypto.encrypt(kwargs['extra_option']['password'])
 
         inst = self._can_update(_id=_id, **kwargs)
-        if len(kwargs) == 1 and 'enabled' in kwargs: # enable or disable
+        if len(kwargs) == 1 and 'enabled' in kwargs:  # enable or disable
             pass
         elif 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):
@@ -688,9 +699,11 @@ class AutoDiscoveryCICRUD(DBMixin):
         adt = AutoDiscoveryCITypeCRUD.get_by_id(adc.adt_id) or abort(404, ErrFormat.adt_not_found)
 
         ci_id = None
-        if adt.attributes:
+
-            ci_dict = {adt.attributes[k]: None if not v and isinstance(v, (list, dict)) else v
+        ad_key2attr = adt.attributes or {}
-                       for k, v in adc.instance.items() if k in adt.attributes}
+        if ad_key2attr:
+            ci_dict = {ad_key2attr[k]: None if not v and isinstance(v, (list, dict)) else v
+                       for k, v in adc.instance.items() if k in ad_key2attr}
             extra_option = adt.extra_option or {}
             mapping, path_mapping = AutoDiscoveryHTTPManager.get_predefined_value_mapping(
                 extra_option.get('provider'), extra_option.get('category'))
@@ -703,37 +716,7 @@ class AutoDiscoveryCICRUD(DBMixin):
             AutoDiscoveryExecHistoryCRUD().add(type_id=adt.type_id,
                                                stdout="accept resource: {}".format(adc.unique_value))
 
-        relation_ads = AutoDiscoveryCITypeRelation.get_by(ad_type_id=adt.type_id, to_dict=False)
+        build_relations_for_ad_accept.apply_async(args=(adc.to_dict(), ci_id, ad_key2attr), queue=CMDB_QUEUE)
-        for r_adt in relation_ads:
-            ad_key = r_adt.ad_key
-            if not adc.instance.get(ad_key):
-                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)
-                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']
-                    try:
-                        CIRelationManager.add(ci_id, relation_ci_id,
-                                              valid=False,
-                                              source=RelationSourceEnum.AUTO_DISCOVERY)
-
-                    except:
-                        try:
-                            CIRelationManager.add(relation_ci_id, ci_id,
-                                                  valid=False,
-                                                  source=RelationSourceEnum.AUTO_DISCOVERY)
-                        except:
-                            pass
 
         adc.update(is_accept=True,
                    accept_by=nickname or current_user.nickname,
@@ -893,3 +876,121 @@ class AutoDiscoveryCounterCRUD(DBMixin):
 
     def _can_delete(self, **kwargs):
         pass
+
+
+def encrypt_account(config):
+    if isinstance(config, dict):
+        if config.get('secret'):
+            config['secret'] = AESCrypto.encrypt(config['secret'])
+        if config.get('password'):
+            config['password'] = AESCrypto.encrypt(config['password'])
+
+
+def decrypt_account(config, uid):
+    if isinstance(config, dict):
+        if config.get('password'):
+            if not (current_user.username in PRIVILEGED_USERS or current_user.uid == uid):
+                config.pop('password', None)
+            else:
+                try:
+                    config['password'] = AESCrypto.decrypt(config['password'])
+                except Exception as e:
+                    current_app.logger.error('decrypt account failed: {}'.format(e))
+
+        if config.get('secret'):
+            if not (current_user.username in PRIVILEGED_USERS or current_user.uid == uid):
+                config.pop('secret', None)
+            else:
+                try:
+                    config['secret'] = AESCrypto.decrypt(config['secret'])
+                except Exception as e:
+                    current_app.logger.error('decrypt account failed: {}'.format(e))
+
+
+class AutoDiscoveryAccountCRUD(DBMixin):
+    cls = AutoDiscoveryAccount
+
+    def get(self, adr_id):
+        res = self.cls.get_by(adr_id=adr_id, to_dict=True)
+
+        for i in res:
+            decrypt_account(i.get('config'), i['uid'])
+
+        return res
+
+    def get_config_by_id(self, _id):
+        res = self.cls.get_by_id(_id)
+        if not res:
+            return {}
+
+        config = res.to_dict().get('config') or {}
+
+        decrypt_account(config, res.uid)
+
+        return config
+
+    def _can_add(self, **kwargs):
+        encrypt_account(kwargs.get('config'))
+
+        kwargs['uid'] = current_user.uid
+
+        return kwargs
+
+    def upsert(self, adr_id, accounts):
+        existed_all = self.cls.get_by(adr_id=adr_id, to_dict=False)
+        account_names = {i['name'] for i in accounts}
+
+        name_changed = dict()
+        for account in accounts:
+            existed = None
+            if account.get('id'):
+                existed = self.cls.get_by_id(account.get('id'))
+                if existed is None:
+                    continue
+
+                account.pop('id')
+                name_changed[existed.name] = account.get('name')
+            else:
+                account = self._can_add(**account)
+
+            if existed is not None:
+                if current_user.uid == existed.uid:
+                    config = copy.deepcopy(existed.config) or {}
+                    config.update(account.get('config') or {})
+                    account['config'] = config
+                    existed.update(**account)
+            else:
+                self.cls.create(adr_id=adr_id, **account)
+
+        for item in existed_all:
+            if name_changed.get(item.name, item.name) not in account_names:
+                if current_user.uid == item.uid:
+                    item.soft_delete()
+
+    def _can_update(self, **kwargs):
+        existed = self.cls.get_by_id(kwargs['_id']) or abort(404, ErrFormat.not_found)
+
+        if isinstance(kwargs.get('config'), dict) and kwargs['config'].get('secret'):
+            if current_user.uid != existed.uid:
+                return abort(403, ErrFormat.adt_secret_no_permission)
+        if isinstance(kwargs.get('config'), dict) and kwargs['config'].get('password'):
+            if current_user.uid != existed.uid:
+                return abort(403, ErrFormat.adt_secret_no_permission)
+
+        return existed
+
+    def update(self, _id, **kwargs):
+
+        if kwargs.get('is_plugin') and kwargs.get('plugin_script'):
+            kwargs = check_plugin_script(**kwargs)
+
+        encrypt_account(kwargs.get('config'))
+
+        inst = self._can_update(_id=_id, **kwargs)
+
+        obj = inst.update(_id=_id, filter_none=False, **kwargs)
+
+        return obj
+
+    def _can_delete(self, **kwargs):
+        pass

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

@@ -19,10 +19,21 @@ DEFAULT_INNER = [
     dict(name="KVM", en="kvm", type=AutoDiscoveryType.HTTP, is_inner=True, is_plugin=False,
          option={'icon': {'name': 'ops-KVM'}, "category": "private_cloud", "en": "kvm"}),
 
+
     dict(name="Nginx", en="nginx", type=AutoDiscoveryType.COMPONENTS, is_inner=True, is_plugin=False,
-         option={'icon': {'name': 'caise-nginx'}, "en": "nginx"}),
+         option={'icon': {'name': 'caise-nginx'}, "en": "nginx", "collect_key": "nginx"}),
+    dict(name="Apache", en="apache", type=AutoDiscoveryType.COMPONENTS, is_inner=True, is_plugin=False,
+         option={'icon': {'name': 'caise-apache'}, "en": "apache", "collect_key": "apache"}),
+    dict(name="Tomcat", en="tomcat", type=AutoDiscoveryType.COMPONENTS, is_inner=True, is_plugin=False,
+         option={'icon': {'name': 'caise-tomcat'}, "en": "tomcat", "collect_key": "tomcat"}),
+    dict(name="MySQL", en="mysql", type=AutoDiscoveryType.COMPONENTS, is_inner=True, is_plugin=False,
+         option={'icon': {'name': 'caise-mySQL'}, "en": "mysql", "collect_key": "mysql"}),
+    dict(name="MSSQL", en="mssql", type=AutoDiscoveryType.COMPONENTS, is_inner=True, is_plugin=False,
+             option={'icon': {'name': 'caise-SQLServer'}, "en": "mssql", "collect_key": "sqlserver"}),
+    dict(name="Oracle", en="oracle", type=AutoDiscoveryType.COMPONENTS, is_inner=True, is_plugin=False,
+         option={'icon': {'name': 'caise-oracle'}, "en": "oracle", "collect_key": "oracle"}),
     dict(name="Redis", en="redis", type=AutoDiscoveryType.COMPONENTS, is_inner=True, is_plugin=False,
-         option={'icon': {'name': 'caise-redis'}, "en": "redis"}),
+         option={'icon': {'name': 'caise-redis'}, "en": "redis", "collect_key": "redis"}),
 
     dict(name="交换机", type=AutoDiscoveryType.SNMP, is_inner=True, is_plugin=False,
          option={'icon': {'name': 'caise-jiaohuanji'}}),
@@ -294,7 +305,7 @@ CLOUD_MAP = {
             "category": "其他",
             "items": ["资源池", "数据中心", "文件夹"],
             "map": {
-                "资源池": "templates/vsphere_datastore.json",
+                "资源池": "templates/vsphere_pool.json",
                 "数据中心": "templates/vsphere_datacenter.json",
                 "文件夹": "templates/vsphere_folder.json",
             },

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

@@ -2,12 +2,13 @@
 
 from __future__ import unicode_literals
 
+from collections import defaultdict
+
 import datetime
 import os
 import yaml
-
 from flask import current_app
-
+import json
 from api.extensions import cache
 from api.extensions import db
 from api.lib.cmdb.custom_dashboard import CustomDashboardManager
@@ -254,7 +255,7 @@ class CMDBCounterCache(object):
 
     @classmethod
     def set(cls, result):
-        cache.set(cls.KEY, result, timeout=0)
+        cache.set(cls.KEY, json.loads(json.dumps(result)), timeout=0)
 
     @classmethod
     def reset(cls):
@@ -276,7 +277,7 @@ class CMDBCounterCache(object):
 
         cls.set(result)
 
-        return result
+        return json.loads(json.dumps(result))
 
     @classmethod
     def update(cls, custom, flush=True):
@@ -298,25 +299,36 @@ class CMDBCounterCache(object):
             result[custom['id']] = res
             cls.set(result)
 
-        return res
+        return json.loads(json.dumps(res))
 
-    @staticmethod
+    @classmethod
-    def relation_counter(type_id, level, other_filer, type_ids):
+    def relation_counter(cls, type_id, level, other_filer, type_ids):
         from api.lib.cmdb.search.ci_relation.search import Search as RelSearch
         from api.lib.cmdb.search import SearchError
         from api.lib.cmdb.search.ci import search
+        from api.lib.cmdb.attribute import AttributeManager
 
         query = "_type:{}".format(type_id)
+        if other_filer:
+            query = "{},{}".format(query, other_filer)
         s = search(query, count=1000000)
         try:
             type_names, _, _, _, _, _ = s.search()
         except SearchError as e:
             current_app.logger.error(e)
             return
+        root_type = CITypeCache.get(type_id)
+        show_attr_id = root_type and root_type.show_id
+        show_attr = AttributeCache.get(show_attr_id)
 
-        type_id_names = [(str(i.get('_id')), i.get(i.get('unique'))) for i in type_names]
+        type_id_names = []
+        for i in type_names:
+            attr_value = i.get(show_attr and show_attr.name) or i.get(i.get('unique'))
+            enum_map = AttributeManager.get_enum_map(show_attr_id or i.get('unique'))
 
-        s = RelSearch([i[0] for i in type_id_names], level, other_filer or '')
+            type_id_names.append((str(i.get('_id')), enum_map.get(attr_value, attr_value)))
+
+        s = RelSearch([i[0] for i in type_id_names], level)
         try:
             stats = s.statistics(type_ids, need_filter=False)
         except SearchError as e:
@@ -346,11 +358,12 @@ class CMDBCounterCache(object):
 
         return result
 
-    @staticmethod
+    @classmethod
-    def attribute_counter(custom):
+    def attribute_counter(cls, custom):
         from api.lib.cmdb.search import SearchError
         from api.lib.cmdb.search.ci import search
         from api.lib.cmdb.utils import ValueTypeMap
+        from api.lib.cmdb.attribute import AttributeManager
 
         custom.setdefault('options', {})
         type_id = custom.get('type_id')
@@ -366,16 +379,24 @@ class CMDBCounterCache(object):
         other_filter = "{}".format(other_filter) if other_filter else ''
 
         if custom['options'].get('ret') == 'cis':
+            enum_map = {}
+            for _attr_id in attr_ids:
+                _attr = AttributeCache.get(_attr_id)
+                if _attr:
+                    enum_map[_attr.alias] = AttributeManager.get_enum_map(_attr_id)
+
             query = "_type:({}),{}".format(";".join(map(str, type_ids)), other_filter)
             s = search(query, fl=attr_ids, ret_key='alias', count=100)
             try:
                 cis, _, _, _, _, _ = s.search()
+                cis = [{k: (enum_map.get(k) or {}).get(v, v) for k, v in ci.items()} for ci in cis]
             except SearchError as e:
                 current_app.logger.error(e)
                 return
 
             return cis
 
+        origin_result = dict()
         result = dict()
         # level = 1
         query = "_type:({}),{}".format(";".join(map(str, type_ids)), other_filter)
@@ -385,13 +406,18 @@ class CMDBCounterCache(object):
         except SearchError as e:
             current_app.logger.error(e)
             return
+
+        enum_map1 = AttributeManager.get_enum_map(attr_ids[0])
         for i in (list(facet.values()) or [[]])[0]:
-            result[ValueTypeMap.serialize2[attr2value_type[0]](str(i[0]))] = i[1]
+            k = ValueTypeMap.serialize2[attr2value_type[0]](str(i[0]))
+            result[enum_map1.get(k, k)] = i[1]
+            origin_result[k] = i[1]
         if len(attr_ids) == 1:
             return result
 
         # level = 2
-        for v in result:
+        enum_map2 = AttributeManager.get_enum_map(attr_ids[1])
+        for v in origin_result:
             query = "_type:({}),{},{}:{}".format(";".join(map(str, type_ids)), other_filter, attr_ids[0], v)
             s = search(query, fl=attr_ids, facet=[attr_ids[1]], count=1)
             try:
@@ -399,18 +425,22 @@ class CMDBCounterCache(object):
             except SearchError as e:
                 current_app.logger.error(e)
                 return
-            result[v] = dict()
+            result[enum_map1.get(v, v)] = dict()
+            origin_result[v] = dict()
             for i in (list(facet.values()) or [[]])[0]:
-                result[v][ValueTypeMap.serialize2[attr2value_type[1]](str(i[0]))] = i[1]
+                k = ValueTypeMap.serialize2[attr2value_type[1]](str(i[0]))
+                result[enum_map1.get(v, v)][enum_map2.get(k, k)] = i[1]
+                origin_result[v][k] = i[1]
 
         if len(attr_ids) == 2:
             return result
 
         # level = 3
-        for v1 in result:
+        enum_map3 = AttributeManager.get_enum_map(attr_ids[2])
-            if not isinstance(result[v1], dict):
+        for v1 in origin_result:
+            if not isinstance(result[enum_map1.get(v1, v1)], dict):
                 continue
-            for v2 in result[v1]:
+            for v2 in origin_result[v1]:
                 query = "_type:({}),{},{}:{},{}:{}".format(";".join(map(str, type_ids)), other_filter,
                                                            attr_ids[0], v1, attr_ids[1], v2)
                 s = search(query, fl=attr_ids, facet=[attr_ids[2]], count=1)
@@ -419,9 +449,10 @@ class CMDBCounterCache(object):
                 except SearchError as e:
                     current_app.logger.error(e)
                     return
-                result[v1][v2] = dict()
+                result[enum_map1.get(v1, v1)][enum_map2.get(v2, v2)] = dict()
                 for i in (list(facet.values()) or [[]])[0]:
-                    result[v1][v2][ValueTypeMap.serialize2[attr2value_type[2]](str(i[0]))] = i[1]
+                    k = ValueTypeMap.serialize2[attr2value_type[2]](str(i[0]))
+                    result[enum_map1.get(v1, v1)][enum_map2.get(v2, v2)][enum_map3.get(k, k)] = i[1]
 
         return result
 
@@ -525,19 +556,18 @@ class CMDBCounterCache(object):
 
     @classmethod
     def flush_sub_counter(cls):
-        result = dict(type_id2users=dict())
+        result = dict(type_id2users=defaultdict(list))
 
         types = db.session.query(PreferenceShowAttributes.type_id,
                                  PreferenceShowAttributes.uid, PreferenceShowAttributes.created_at).filter(
             PreferenceShowAttributes.deleted.is_(False)).group_by(
             PreferenceShowAttributes.uid, PreferenceShowAttributes.type_id)
         for i in types:
-            result['type_id2users'].setdefault(i.type_id, []).append(i.uid)
+            result['type_id2users'][i.type_id].append(i.uid)
 
         types = PreferenceTreeView.get_by(to_dict=False)
         for i in types:
 
-            result['type_id2users'].setdefault(i.type_id, [])
             if i.uid not in result['type_id2users'][i.type_id]:
                 result['type_id2users'][i.type_id].append(i.uid)
 
@@ -557,7 +587,8 @@ class AutoDiscoveryMappingCache(object):
     def get(cls, name):
         res = cache.get(cls.PREFIX.format(name)) or {}
         if not res:
-            path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "auto_discovery/mapping/{}.yaml".format(name))
+            path = os.path.join(os.path.abspath(os.path.dirname(__file__)),
+                                "auto_discovery/mapping/{}.yaml".format(name))
             if os.path.exists(path):
                 with open(path, 'r') as f:
                     mapping = yaml.safe_load(f)

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

@@ -161,7 +161,7 @@ class CIManager(object):
 
     @classmethod
     def get_ci_by_id_from_db(cls, ci_id, ret_key=RetKey.NAME, fields=None, need_children=True, use_master=False,
-                             valid=False):
+                             valid=False, enum_use_label=False):
         """
 
         :param ci_id:
@@ -170,6 +170,7 @@ class CIManager(object):
         :param need_children:
         :param use_master: whether to use master db
         :param valid:
+        :param enum_use_label:
         :return:
         """
 
@@ -187,13 +188,19 @@ class CIManager(object):
 
         res["ci_type"] = ci_type.name
 
-        fields = CITypeAttributeManager.get_attr_names_by_type_id(ci.type_id) if not fields else fields
+        enum_map = dict()
+        if not enum_use_label:
+            fields = CITypeAttributeManager.get_attr_names_by_type_id(ci.type_id) if not fields else fields
+        else:
+            fields, enum_map = CITypeAttributeManager.get_attr_names_label_enum(
+                ci.type_id) if not fields else (fields, {})
         unique_key = AttributeCache.get(ci_type.unique_id)
         _res = AttributeValueManager().get_attr_values(fields,
                                                        ci_id,
                                                        ret_key=ret_key,
                                                        unique_key=unique_key,
-                                                       use_master=use_master)
+                                                       use_master=use_master,
+                                                       enum_map=enum_map)
         res.update(_res)
 
         res['_type'] = ci_type.id
@@ -266,7 +273,7 @@ class CIManager(object):
                 value_table = TableMap(attr_name=id2name[attr_id]).table
 
                 values = value_table.get_by(attr_id=attr_id,
-                                            value=ci_dict.get(id2name[attr_id]) or None,
+                                            value=ci_dict.get(id2name[attr_id]),
                                             only_query=True).join(
                     CI, CI.id == value_table.ci_id).filter(CI.type_id == type_id)
                 _ci_ids = set([i.ci_id for i in values])
@@ -292,6 +299,53 @@ class CIManager(object):
 
         return 1
 
+    @staticmethod
+    def _reference_to_ci_id(attr, payload):
+        def __unique_value2id(_type, _v):
+            value_table = TableMap(attr_name=_type.unique_id).table
+            ci = value_table.get_by(attr_id=attr.id, value=_v)
+            if ci is not None:
+                return ci.ci_id
+
+            return abort(400, ErrFormat.ci_reference_invalid.format(attr.alias, _v))
+
+        def __valid_reference_id_existed(_id, _type_id):
+            ci = CI.get_by_id(_id) or abort(404, ErrFormat.ci_reference_not_found.format(attr.alias, _id))
+
+            if ci.type_id != _type_id:
+                return abort(400, ErrFormat.ci_reference_invalid.format(attr.alias, _id))
+
+        if attr.name in payload:
+            k, reference_value = attr.name, payload[attr.name]
+        elif attr.alias in payload:
+            k, reference_value = attr.alias, payload[attr.alias]
+        else:
+            return
+        if not reference_value:
+            return
+
+        reference_type = None
+        if isinstance(reference_value, list):
+            for idx, v in enumerate(reference_value):
+                if isinstance(v, dict) and v.get('unique'):
+                    if reference_type is None:
+                        reference_type = CITypeCache.get(attr.reference_type_id)
+                    if reference_type is not None:
+                        reference_value[idx] = __unique_value2id(reference_type, v)
+                else:
+                    __valid_reference_id_existed(v, attr.reference_type_id)
+
+        elif isinstance(reference_value, dict) and reference_value.get('unique'):
+            if reference_type is None:
+                reference_type = CITypeCache.get(attr.reference_type_id)
+            if reference_type is not None:
+                reference_value = __unique_value2id(reference_type, reference_value)
+        elif str(reference_value).isdigit():
+            reference_value = int(reference_value)
+            __valid_reference_id_existed(reference_value, attr.reference_type_id)
+
+        payload[k] = reference_value
+
     @classmethod
     def add(cls, ci_type_name,
             exist_policy=ExistPolicy.REPLACE,
@@ -319,8 +373,8 @@ class CIManager(object):
             400, ErrFormat.unique_value_not_found.format("unique_id={}".format(ci_type.unique_id)))
 
         unique_value = None
-        if not (unique_key.default and unique_key.default.get('default') == AttributeDefaultValueEnum.AUTO_INC_ID and
+        # primary key is not auto inc id
-                not ci_dict.get(unique_key.name)):  # primary key is not auto inc id
+        if not (unique_key.default and unique_key.default.get('default') == AttributeDefaultValueEnum.AUTO_INC_ID):
             unique_value = ci_dict.get(unique_key.name) or ci_dict.get(unique_key.alias) or ci_dict.get(unique_key.id)
             unique_value = unique_value or abort(400, ErrFormat.unique_key_required.format(unique_key.name))
 
@@ -328,6 +382,7 @@ class CIManager(object):
         ci_type_attrs_name = {attr.name: attr for _, attr in attrs}
         ci_type_attrs_alias = {attr.alias: attr for _, attr in attrs}
         ci_attr2type_attr = {type_attr.attr_id: type_attr for type_attr, _ in attrs}
+        ci_type_attrs_name_alias = {**ci_type_attrs_name, **ci_type_attrs_alias}
 
         ci = None
         record_id = None
@@ -391,6 +446,8 @@ class CIManager(object):
 
                     if attr.re_check and password_dict.get(attr.id):
                         value_manager.check_re(attr.re_check, attr.alias, password_dict[attr.id][0])
+                elif attr.is_reference:
+                    cls._reference_to_ci_id(attr, ci_dict)
 
             cls._valid_unique_constraint(ci_type.id, ci_dict, ci and ci.id)
 
@@ -412,7 +469,7 @@ class CIManager(object):
                     else:
                         ci_dict.pop(k)
 
-            ci_dict = {k: v for k, v in ci_dict.items() if k in ci_type_attrs_name or k in ci_type_attrs_alias}
+            ci_dict = {ci_type_attrs_name_alias[k].name: v for k, v in ci_dict.items() if k in ci_type_attrs_name_alias}
 
             key2attr = value_manager.valid_attr_value(ci_dict, ci_type.id, ci and ci.id,
                                                       ci_type_attrs_name, ci_type_attrs_alias, ci_attr2type_attr)
@@ -442,9 +499,10 @@ class CIManager(object):
 
         return ci.id
 
-    def update(self, ci_id, _is_admin=False, ticket_id=None, __sync=False, **ci_dict):
+    def update(self, ci_id, _is_admin=False, ticket_id=None, _sync=False, **ci_dict):
         now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         ci = self.confirm_ci_existed(ci_id)
+        ci_type = ci.ci_type
 
         attrs = CITypeAttributeManager.get_all_attributes(ci.type_id)
         ci_type_attrs_name = {attr.name: attr for _, attr in attrs}
@@ -474,11 +532,13 @@ class CIManager(object):
 
                 if attr.re_check and password_dict.get(attr.id):
                     value_manager.check_re(attr.re_check, attr.alias, password_dict[attr.id][0])
+            elif attr.is_reference:
+                self._reference_to_ci_id(attr, ci_dict)
 
         limit_attrs = self._valid_ci_for_no_read(ci) if not _is_admin else {}
 
         record_id = None
-        with redis_lock.Lock(rd.r, ci.ci_type.name):
+        with redis_lock.Lock(rd.r, ci_type.name):
             db.session.commit()
 
             self._valid_unique_constraint(ci.type_id, ci_dict, ci_id)
@@ -509,14 +569,14 @@ class CIManager(object):
                 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 not __sync:
+            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)
 
         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:
+            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)
@@ -577,7 +637,7 @@ class CIManager(object):
         if ci_dict:
             AttributeHistoryManger.add(None, ci_id, [(None, OperateType.DELETE, ci_dict, None)], ci.type_id)
 
-        ci_delete.apply_async(args=(ci_id,), queue=CMDB_QUEUE)
+        ci_delete.apply_async(args=(ci_id, ci.type_id), queue=CMDB_QUEUE)
         delete_id_filter.apply_async(args=(ci_id,), queue=CMDB_QUEUE)
 
         return ci_id
@@ -772,7 +832,7 @@ class CIManager(object):
         value_table = ValueTypeMap.table[ValueTypeEnum.PASSWORD]
         if current_app.config.get('SECRETS_ENGINE') == 'inner':
             if value:
-                encrypt_value, status = InnerCrypt().encrypt(value)
+                encrypt_value, status = InnerCrypt().encrypt(str(value))
                 if not status:
                     current_app.logger.error('save password failed: {}'.format(encrypt_value))
                     return abort(400, ErrFormat.password_save_failed.format(encrypt_value))
@@ -800,7 +860,7 @@ class CIManager(object):
             vault = VaultClient(current_app.config.get('VAULT_URL'), current_app.config.get('VAULT_TOKEN'))
             if value:
                 try:
-                    vault.update("/{}/{}".format(ci_id, attr_id), dict(v=value))
+                    vault.update("/{}/{}".format(ci_id, attr_id), dict(v=str(value)))
                 except Exception as e:
                     current_app.logger.error('save password to vault failed: {}'.format(e))
                     return abort(400, ErrFormat.password_save_failed.format('write vault failed'))
@@ -1456,7 +1516,8 @@ class CITriggerManager(object):
                 cls._update_old_attr_value(record_id, ci_dict)
 
             if ci_id is not None:
-                ci_dict = CIManager().get_ci_by_id_from_db(ci_id, need_children=False, use_master=False)
+                ci_dict = CIManager().get_ci_by_id_from_db(
+                    ci_id, need_children=False, use_master=False, enum_use_label=True)
 
             try:
                 response = webhook_request(webhook, ci_dict).text
@@ -1483,7 +1544,8 @@ class CITriggerManager(object):
         with app.app_context():
 
             if ci_id is not None:
-                ci_dict = CIManager().get_ci_by_id_from_db(ci_id, need_children=False, use_master=False)
+                ci_dict = CIManager().get_ci_by_id_from_db(
+                    ci_id, need_children=False, use_master=False, enum_use_label=True)
 
             if operate_type == OperateType.UPDATE:
                 cls._update_old_attr_value(record_id, ci_dict)

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

@@ -1,5 +1,7 @@
 # -*- coding:utf-8 -*-
 
+from collections import defaultdict
+
 import copy
 import toposort
 from flask import abort
@@ -145,7 +147,7 @@ class CITypeManager(object):
         kwargs["alias"] = kwargs["name"] if not kwargs.get("alias") else kwargs["alias"]
 
         cls._validate_unique(name=kwargs['name'])
-        cls._validate_unique(alias=kwargs['alias'])
+        # cls._validate_unique(alias=kwargs['alias'])
 
         kwargs["unique_id"] = unique_key.id
         kwargs['uid'] = current_user.uid
@@ -184,7 +186,7 @@ class CITypeManager(object):
         ci_type = cls.check_is_existed(type_id)
 
         cls._validate_unique(type_id=type_id, name=kwargs.get('name'))
-        cls._validate_unique(type_id=type_id, alias=kwargs.get('alias') or kwargs.get('name'))
+        # cls._validate_unique(type_id=type_id, alias=kwargs.get('alias') or kwargs.get('name'))
 
         unique_key = kwargs.pop("unique_key", None)
         unique_key = AttributeCache.get(unique_key)
@@ -234,6 +236,10 @@ class CITypeManager(object):
         if CITypeInheritance.get_by(parent_id=type_id, first=True):
             return abort(400, ErrFormat.ci_type_inheritance_cannot_delete)
 
+        reference = Attribute.get_by(reference_type_id=type_id, first=True, to_dict=False)
+        if reference is not None:
+            return abort(400, ErrFormat.ci_type_referenced_cannot_delete.format(reference.alias))
+
         relation_views = PreferenceRelationView.get_by(to_dict=False)
         for rv in relation_views:
             for item in (rv.cr_ids or []):
@@ -343,9 +349,9 @@ class CITypeInheritanceManager(object):
     @classmethod
     def add(cls, parent_ids, child_id):
 
-        rels = {}
+        rels = defaultdict(set)
         for i in cls.cls.get_by(to_dict=False):
-            rels.setdefault(i.child_id, set()).add(i.parent_id)
+            rels[i.child_id].add(i.parent_id)
 
         try:
             toposort_flatten(rels)
@@ -359,7 +365,7 @@ class CITypeInheritanceManager(object):
 
             existed = cls.cls.get_by(parent_id=parent_id, child_id=child_id, first=True, to_dict=False)
             if existed is None:
-                rels.setdefault(child_id, set()).add(parent_id)
+                rels[child_id].add(parent_id)
                 try:
                     toposort_flatten(rels)
                 except toposort.CircularDependencyError as e:
@@ -500,14 +506,13 @@ class CITypeAttributeManager(object):
     def __init__(self):
         pass
 
-    @staticmethod
+    @classmethod
-    def get_attr_name(ci_type_name, key):
+    def get_attr_name(cls, ci_type_name, key):
         ci_type = CITypeCache.get(ci_type_name)
         if ci_type is None:
             return
 
-        for i in CITypeAttributesCache.get(ci_type.id):
+        for _, attr in cls.get_all_attributes(ci_type.id):
-            attr = AttributeCache.get(i.attr_id)
             if attr and (attr.name == key or attr.alias == key):
                 return attr.name
 
@@ -519,12 +524,31 @@ class CITypeAttributeManager(object):
         for _type_id in parent_ids + [type_id]:
             result.extend(CITypeAttributesCache.get2(_type_id))
 
-        return result
+        attr_ids = set()
+        result2 = []
+        for i in result:
+            if i[1].id not in attr_ids:
+                result2.append(i)
+                attr_ids.add(i[1].id)
+
+        return result2
 
     @classmethod
     def get_attr_names_by_type_id(cls, type_id):
         return [attr.name for _, attr in cls.get_all_attributes(type_id)]
 
+    @classmethod
+    def get_attr_names_label_enum(cls, type_id):
+        attr_names, enum_map = list(), defaultdict(dict)
+        for _, attr in cls.get_all_attributes(type_id):
+            attr_names.append(attr.name)
+            if attr.is_choice and not attr.choice_other and not attr.choice_web_hook:
+                _map = AttributeManager.get_enum_map(attr.id)
+                if _map:
+                    enum_map[attr.name].update(_map)
+
+        return attr_names, enum_map
+
     @staticmethod
     def get_attributes_by_type_id(type_id, choice_web_hook_parse=True, choice_other_parse=True):
         has_config_perm = ACLManager('cmdb').has_permission(
@@ -565,10 +589,10 @@ class CITypeAttributeManager(object):
                 CITypeManager.get_name_by_id(type_id), ResourceTypeEnum.CI, PermEnum.CONFIG)
 
         result = {type_id: [i for _, i in cls.get_all_attributes(type_id)] for type_id in type_ids}
-        attr2types = {}
+        attr2types = defaultdict(list)
         for type_id in result:
             for i in result[type_id]:
-                attr2types.setdefault(i.id, []).append(type_id)
+                attr2types[i.id].append(type_id)
 
         attrs = []
         for attr_id in attr2types:
@@ -846,12 +870,12 @@ class CITypeRelationManager(object):
 
     @classmethod
     def recursive_level2children(cls, parent_id):
-        result = dict()
+        result = defaultdict(list)
 
         def get_children(_id, level):
             children = CITypeRelation.get_by(parent_id=_id, to_dict=False)
             if children:
-                result.setdefault(level + 1, []).extend([i.child.to_dict() for i in children])
+                result[level + 1].extend([i.child.to_dict() for i in children])
 
             for i in children:
                 if i.child_id != _id:
@@ -950,10 +974,10 @@ class CITypeRelationManager(object):
         p = CITypeManager.check_is_existed(parent)
         c = CITypeManager.check_is_existed(child)
 
-        rels = {}
+        rels = defaultdict(set)
         for i in CITypeRelation.get_by(to_dict=False):
-            rels.setdefault(i.child_id, set()).add(i.parent_id)
+            rels[i.child_id].add(i.parent_id)
-        rels.setdefault(c.id, set()).add(p.id)
+        rels[c.id].add(p.id)
 
         try:
             toposort_flatten(rels)
@@ -1244,17 +1268,16 @@ class CITypeAttributeGroupManager(object):
         if isinstance(_from, int):
             from_group = CITypeAttributeGroup.get_by_id(_from)
         else:
-            from_group = CITypeAttributeGroup.get_by(name=_from, first=True, to_dict=False)
+            from_group = CITypeAttributeGroup.get_by(name=_from, type_id=type_id, first=True, to_dict=False)
         from_group or abort(404, ErrFormat.ci_type_attribute_group_not_found.format("id={}".format(_from)))
 
         if isinstance(_to, int):
             to_group = CITypeAttributeGroup.get_by_id(_to)
         else:
-            to_group = CITypeAttributeGroup.get_by(name=_to, first=True, to_dict=False)
+            to_group = CITypeAttributeGroup.get_by(name=_to, type_id=type_id, first=True, to_dict=False)
         to_group or abort(404, ErrFormat.ci_type_attribute_group_not_found.format("id={}".format(_to)))
 
         from_order, to_order = from_group.order, to_group.order
-
         from_group.update(order=to_order)
         to_group.update(order=from_order)
 
@@ -1324,6 +1347,7 @@ class CITypeTemplateManager(object):
     def _import_attributes(self, type2attributes):
         attributes = [attr for type_id in type2attributes for attr in type2attributes[type_id]]
         attrs = []
+        references = []
         for i in copy.deepcopy(attributes):
             if i.pop('inherited', None):
                 continue
@@ -1338,6 +1362,10 @@ class CITypeTemplateManager(object):
             if not choice_value:
                 i['is_choice'] = False
 
+            if i.get('reference_type_id'):
+                references.append(copy.deepcopy(i))
+                i.pop('reference_type_id')
+
             attrs.append((i, choice_value))
 
         attr_id_map = self.__import(Attribute, [i[0] for i in copy.deepcopy(attrs)])
@@ -1346,7 +1374,7 @@ class CITypeTemplateManager(object):
             if choice_value and not i.get('choice_web_hook') and not i.get('choice_other'):
                 AttributeManager.add_choice_values(attr_id_map.get(i['id'], i['id']), i['value_type'], choice_value)
 
-        return attr_id_map
+        return attr_id_map, references
 
     def _import_ci_types(self, ci_types, attr_id_map):
         for i in ci_types:
@@ -1360,6 +1388,11 @@ class CITypeTemplateManager(object):
 
         return self.__import(CIType, ci_types)
 
+    def _import_reference_attributes(self, attrs, type_id_map):
+        for attr in attrs:
+            attr['reference_type_id'] = type_id_map.get(attr['reference_type_id'], attr['reference_type_id'])
+        self.__import(Attribute, attrs)
+
     def _import_ci_type_groups(self, ci_type_groups, type_id_map):
         _ci_type_groups = copy.deepcopy(ci_type_groups)
         for i in _ci_type_groups:
@@ -1373,6 +1406,10 @@ class CITypeTemplateManager(object):
                 payload = dict(group_id=group_id_map.get(group['id'], group['id']),
                                type_id=type_id_map.get(ci_type['id'], ci_type['id']),
                                order=order)
+                for i in CITypeGroupItem.get_by(type_id=payload['type_id'], to_dict=False):
+                    if i.group_id != payload['group_id']:
+                        i.soft_delete(flush=True)
+
                 existed = CITypeGroupItem.get_by(group_id=payload['group_id'], type_id=payload['type_id'],
                                                  first=True, to_dict=False)
                 if existed is None:
@@ -1541,6 +1578,9 @@ class CITypeTemplateManager(object):
                 if ((i.extra_option or {}).get('alias') or None) == (
                         (rule.get('extra_option') or {}).get('alias') or None):
                     existed = True
+                    rule.pop('extra_option', None)
+                    rule.pop('enabled', None)
+                    rule.pop('cron', None)
                     AutoDiscoveryCITypeCRUD().update(i.id, **rule)
                     break
 
@@ -1582,13 +1622,15 @@ class CITypeTemplateManager(object):
 
         import time
         s = time.time()
-        attr_id_map = self._import_attributes(tpt.get('type2attributes') or {})
+        attr_id_map, references = self._import_attributes(tpt.get('type2attributes') or {})
         current_app.logger.info('import attributes cost: {}'.format(time.time() - s))
 
         s = time.time()
         ci_type_id_map = self._import_ci_types(tpt.get('ci_types') or [], attr_id_map)
         current_app.logger.info('import ci_types cost: {}'.format(time.time() - s))
 
+        self._import_reference_attributes(references, ci_type_id_map)
+
         s = time.time()
         self._import_ci_type_groups(tpt.get('ci_type_groups') or [], ci_type_id_map)
         current_app.logger.info('import ci_type_groups cost: {}'.format(time.time() - s))
@@ -1673,6 +1715,16 @@ class CITypeTemplateManager(object):
             type_ids.extend(extend_type_ids)
             ci_types.extend(CITypeManager.get_ci_types(type_ids=extend_type_ids))
 
+        # handle reference type
+        references = Attribute.get_by(only_query=True).join(
+            CITypeAttribute, CITypeAttribute.attr_id == Attribute.id).filter(
+            CITypeAttribute.type_id.in_(type_ids)).filter(CITypeAttribute.deleted.is_(False)).filter(
+            Attribute.reference_type_id.isnot(None))
+        reference_type_ids = list(set([i.reference_type_id for i in references if i.reference_type_id]))
+        if reference_type_ids:
+            type_ids.extend(reference_type_ids)
+            ci_types.extend(CITypeManager.get_ci_types(type_ids=reference_type_ids))
+
         tpt = dict(
             ci_types=ci_types,
             relation_types=[i.to_dict() for i in RelationTypeManager.get_all()],
@@ -1685,6 +1737,7 @@ class CITypeTemplateManager(object):
             icons=dict()
         )
         tpt['ci_type_groups'] = CITypeGroupManager.get(ci_types=tpt['ci_types'], type_ids=type_ids)
+        tpt['ci_type_groups'] = [i for i in tpt['ci_type_groups'] if i.get('ci_types')]
 
         def get_icon_value(icon):
             try:
@@ -1698,6 +1751,9 @@ class CITypeTemplateManager(object):
         for r in ad_rules:
             r = r.to_dict()
 
+            if r.get('extra_option') and '_reference' in r['extra_option']:
+                r['extra_option'].pop('_reference')
+
             r['type_name'] = type_id2name.get(r.pop('type_id'))
             if r.get('adr_id'):
                 adr = AutoDiscoveryRuleCRUD.get_by_id(r.pop('adr_id'))

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

@@ -14,6 +14,8 @@ class ValueTypeEnum(BaseEnum):
     JSON = "6"
     PASSWORD = TEXT
     LINK = TEXT
+    BOOL = "7"
+    REFERENCE = INT
 
 
 class ConstraintEnum(BaseEnum):
@@ -118,7 +120,7 @@ REDIS_PREFIX_CI = "ONE_CMDB"
 REDIS_PREFIX_CI_RELATION = "CMDB_CI_RELATION"
 REDIS_PREFIX_CI_RELATION2 = "CMDB_CI_RELATION2"
 
-BUILTIN_KEYWORDS = {'id', '_id', 'ci_id', 'type', '_type', 'ci_type'}
+BUILTIN_KEYWORDS = {'id', '_id', 'ci_id', 'type', '_type', 'ci_type', 'ticket_id'}
 
 L_TYPE = None
 L_CI = None

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

@@ -1,8 +1,9 @@
 # -*- coding:utf-8 -*-
 
 
-import copy
+from collections import defaultdict
 
+import copy
 import six
 import toposort
 from flask import abort
@@ -263,12 +264,12 @@ class PreferenceManager(object):
         else:
             views = _views
 
-        view2cr_ids = dict()
+        view2cr_ids = defaultdict(list)
         name2view = dict()
         result = dict()
         name2id = list()
         for view in views:
-            view2cr_ids.setdefault(view['name'], []).extend(view['cr_ids'])
+            view2cr_ids[view['name']].extend(view['cr_ids'])
             name2id.append([view['name'], view['id']])
             name2view[view['name']] = view
 
@@ -383,14 +384,22 @@ class PreferenceManager(object):
     def add_search_option(**kwargs):
         kwargs['uid'] = current_user.uid
 
-        existed = PreferenceSearchOption.get_by(uid=current_user.uid,
+        if kwargs['name'] in ('__recent__', '__favor__'):
-                                                name=kwargs.get('name'),
+            if kwargs['name'] == '__recent__':
-                                                prv_id=kwargs.get('prv_id'),
+                for i in PreferenceSearchOption.get_by(
-                                                ptv_id=kwargs.get('ptv_id'),
+                        only_query=True, name=kwargs['name'], uid=current_user.uid).order_by(
-                                                type_id=kwargs.get('type_id'),
+                    PreferenceSearchOption.id.desc()).offset(20):
-                                                )
+                    i.delete()
-        if existed:
+
-            return abort(400, ErrFormat.preference_search_option_exists)
+        else:
+            existed = PreferenceSearchOption.get_by(uid=current_user.uid,
+                                                    name=kwargs.get('name'),
+                                                    prv_id=kwargs.get('prv_id'),
+                                                    ptv_id=kwargs.get('ptv_id'),
+                                                    type_id=kwargs.get('type_id'),
+                                                    )
+            if existed:
+                return abort(400, ErrFormat.preference_search_option_exists)
 
         return PreferenceSearchOption.create(**kwargs)
 

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

@@ -35,7 +35,7 @@ class ErrFormat(CommonErrFormat):
         "Only creators and administrators are allowed to delete attributes!")  # 目前只允许 属性创建人、管理员 删除属性!
     # 属性字段名不能是内置字段: id, _id, ci_id, type, _type, ci_type
     attribute_name_cannot_be_builtin = _l(
-        "Attribute field names cannot be built-in fields: id, _id, ci_id, type, _type, ci_type")
+        "Attribute field names cannot be built-in fields: id, _id, ci_id, type, _type, ci_type, ticket_id")
     attribute_choice_other_invalid = _l(
         "Predefined value: Other model request parameters are illegal!")  # 预定义值: 其他模型请求参数不合法!
 
@@ -44,6 +44,8 @@ class ErrFormat(CommonErrFormat):
     unique_value_not_found = _l("The model's primary key {} does not exist!")  # 模型的主键 {} 不存在!
     unique_key_required = _l("Primary key {} is missing")  # 主键字段 {} 缺失
     ci_is_already_existed = _l("CI already exists!")  # CI 已经存在!
+    ci_reference_not_found = _l("{}: CI reference {} does not exist!")  # {}: CI引用 {} 不存在!
+    ci_reference_invalid = _l("{}: CI reference {} is illegal!")  # {}, CI引用 {} 不合法!
     relation_constraint = _l("Relationship constraint: {}, verification failed")  # 关系约束: {}, 校验失败
     # 多对多关系 限制: 模型 {} <-> {} 已经存在多对多关系!
     m2m_relation_constraint = _l(
@@ -63,6 +65,8 @@ class ErrFormat(CommonErrFormat):
     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_type_referenced_cannot_delete = _l(
+        "The model is referenced by attribute {} and cannot be deleted")  # 该模型被属性 {} 引用, 不能删除
 
     # 因为关系视图 {} 引用了该模型，不能删除模型
     ci_relation_view_exists_and_cannot_delete_type = _l(

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

@@ -56,7 +56,7 @@ QUERY_CI_BY_ATTR_NAME = """
     SELECT {0}.ci_id
     FROM {0}
     WHERE {0}.attr_id={1:d}
-      AND {0}.value {2}
+      AND ({0}.value {2})
 """
 
 QUERY_CI_BY_ID = """

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

@@ -451,6 +451,9 @@ class Search(object):
             if field_type == ValueTypeEnum.DATE and len(v) == 10:
                 v = "{} 00:00:00".format(v)
 
+            if field_type == ValueTypeEnum.BOOL and "*" not in str(v):
+                v = str(int(v in current_app.config.get('BOOL_TRUE')))
+
             # in query
             if v.startswith("(") and v.endswith(")"):
                 _query_sql = self._in_query_handler(attr, v, is_not)

cmdb-api/api/lib/cmdb/utils.py

@@ -7,6 +7,7 @@ import json
 import re
 
 import six
+from flask import current_app
 
 import api.models.cmdb as model
 from api.lib.cmdb.cache import AttributeCache
@@ -64,6 +65,7 @@ class ValueTypeMap(object):
         ValueTypeEnum.DATETIME: str2datetime,
         ValueTypeEnum.DATE: str2date,
         ValueTypeEnum.JSON: lambda x: json.loads(x) if isinstance(x, six.string_types) and x else x,
+        ValueTypeEnum.BOOL: lambda x: x in current_app.config.get('BOOL_TRUE'),
     }
 
     serialize = {
@@ -74,6 +76,7 @@ class ValueTypeMap(object):
         ValueTypeEnum.DATE: lambda x: x.strftime("%Y-%m-%d") if not isinstance(x, six.string_types) else x,
         ValueTypeEnum.DATETIME: lambda x: x.strftime("%Y-%m-%d %H:%M:%S") if not isinstance(x, six.string_types) else x,
         ValueTypeEnum.JSON: lambda x: json.loads(x) if isinstance(x, six.string_types) and x else x,
+        ValueTypeEnum.BOOL: lambda x: x in current_app.config.get('BOOL_TRUE'),
     }
 
     serialize2 = {
@@ -84,6 +87,7 @@ class ValueTypeMap(object):
         ValueTypeEnum.DATE: lambda x: (x.decode() if not isinstance(x, six.string_types) else x).split()[0],
         ValueTypeEnum.DATETIME: lambda x: x.decode() if not isinstance(x, six.string_types) else x,
         ValueTypeEnum.JSON: lambda x: json.loads(x) if isinstance(x, six.string_types) and x else x,
+        ValueTypeEnum.BOOL: lambda x: x in current_app.config.get('BOOL_TRUE'),
     }
 
     choice = {
@@ -105,6 +109,7 @@ class ValueTypeMap(object):
         'index_{0}'.format(ValueTypeEnum.TIME): model.CIIndexValueText,
         'index_{0}'.format(ValueTypeEnum.FLOAT): model.CIIndexValueFloat,
         'index_{0}'.format(ValueTypeEnum.JSON): model.CIValueJson,
+        'index_{0}'.format(ValueTypeEnum.BOOL): model.CIIndexValueInteger,
     }
 
     table_name = {
@@ -117,6 +122,7 @@ class ValueTypeMap(object):
         'index_{0}'.format(ValueTypeEnum.TIME): 'c_value_index_texts',
         'index_{0}'.format(ValueTypeEnum.FLOAT): 'c_value_index_floats',
         'index_{0}'.format(ValueTypeEnum.JSON): 'c_value_json',
+        'index_{0}'.format(ValueTypeEnum.BOOL): 'c_value_index_integers',
     }
 
     es_type = {

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

@@ -3,13 +3,13 @@
 
 from __future__ import unicode_literals
 
-import copy
 import imp
+
+import copy
+import jinja2
 import os
 import re
 import tempfile
-
-import jinja2
 from flask import abort
 from flask import current_app
 from jinja2schema import infer
@@ -47,7 +47,7 @@ class AttributeValueManager(object):
         """
         return AttributeCache.get(key)
 
-    def get_attr_values(self, fields, ci_id, ret_key="name", unique_key=None, use_master=False):
+    def get_attr_values(self, fields, ci_id, ret_key="name", unique_key=None, use_master=False, enum_map=None):
         """
 
         :param fields:
@@ -55,6 +55,7 @@ class AttributeValueManager(object):
         :param ret_key: It can be name or alias
         :param unique_key: primary attribute
         :param use_master: Only for master-slave read-write separation
+        :param enum_map:
         :return:
         """
         res = dict()
@@ -76,6 +77,12 @@ class AttributeValueManager(object):
             else:
                 res[field_name] = ValueTypeMap.serialize[attr.value_type](rs[0].value) if rs else None
 
+            if enum_map and field_name in enum_map:
+                if attr.is_list:
+                    res[field_name] = [enum_map[field_name].get(i, i) for i in res[field_name]]
+                else:
+                    res[field_name] = enum_map[field_name].get(res[field_name], res[field_name])
+
             if unique_key is not None and attr.id == unique_key.id and rs:
                 res['unique'] = unique_key.name
                 res['unique_alias'] = unique_key.alias
@@ -128,14 +135,20 @@ class AttributeValueManager(object):
             return abort(400, ErrFormat.attribute_value_invalid2.format(alias, value))
 
     def _validate(self, attr, value, value_table, ci=None, type_id=None, ci_id=None, type_attr=None):
-        ci = ci or {}
+        if not attr.is_reference:
-        v = self._deserialize_value(attr.alias, attr.value_type, value)
+            ci = ci or {}
+            v = self._deserialize_value(attr.alias, attr.value_type, value)
+
+            attr.is_choice and value and self._check_is_choice(attr, attr.value_type, v)
+
+        else:
+            v = value or None
 
-        attr.is_choice and value and self._check_is_choice(attr, attr.value_type, v)
         attr.is_unique and self._check_is_unique(
             value_table, attr, ci and ci.id or ci_id, ci and ci.type_id or type_id, v)
-
         self._check_is_required(ci and ci.type_id or type_id, attr, v, type_attr=type_attr)
+        if attr.is_reference:
+            return v
 
         if v == "" and attr.value_type not in (ValueTypeEnum.TEXT,):
             v = None
@@ -235,10 +248,19 @@ class AttributeValueManager(object):
 
             try:
                 if attr.is_list:
+                    if isinstance(value, dict):
+                        if value.get('op') == "delete":
+                            value['v'] = [ValueTypeMap.serialize[attr.value_type](
+                                self._deserialize_value(attr.alias, attr.value_type, i))
+                                for i in handle_arg_list(value['v'])]
+                            continue
+                        _value = value.get('v') or []
+                    else:
+                        _value = value
                     value_list = [self._validate(attr, i, value_table, ci=None, type_id=type_id, ci_id=ci_id,
                                                  type_attr=ci_attr2type_attr.get(attr.id))
-                                  for i in handle_arg_list(value)]
+                                  for i in handle_arg_list(_value)]
-                    ci_dict[key] = value_list
+                    ci_dict[key] = value_list if not isinstance(value, dict) else dict(op=value.get('op'), v=value_list)
                     if not value_list:
                         self._check_is_required(type_id, attr, '')
 
@@ -278,28 +300,47 @@ class AttributeValueManager(object):
                 existed_values = [(ValueTypeMap.serialize[attr.value_type](i.value) if
                                    i.value or i.value == 0 else i.value) for i in existed_attrs]
 
-                # Comparison array starts from which position changes
+                if isinstance(value, dict):
-                min_len = min(len(value), len(existed_values))
+                    if value.get('op') == "add":
-                index = 0
+                        for v in (value.get('v') or []):
-                while index < min_len:
+                            if v not in existed_values:
-                    if value[index] != existed_values[index]:
+                                value_table.create(ci_id=ci.id, attr_id=attr.id, value=v, flush=False, commit=False)
-                        break
+                                if not attr.is_dynamic:
-                    index += 1
+                                    changed.append((ci.id, attr.id, OperateType.ADD, None, v, ci.type_id))
+                                else:
+                                    has_dynamic = True
 
-                # Delete first and then add to ensure id sorting
+                    elif value.get('op') == "delete":
-                for idx in range(index, len(existed_attrs)):
+                        for v in (value.get('v') or []):
-                    existed_attr = existed_attrs[idx]
+                            if v in existed_values:
-                    existed_attr.delete(flush=False, commit=False)
+                                existed_attrs[existed_values.index(v)].delete(flush=False, commit=False)
-                    if not attr.is_dynamic:
+                                if not attr.is_dynamic:
-                        changed.append((ci.id, attr.id, OperateType.DELETE, existed_values[idx], None, ci.type_id))
+                                    changed.append((ci.id, attr.id, OperateType.DELETE, v, None, ci.type_id))
-                    else:
+                                else:
-                        has_dynamic = True
+                                    has_dynamic = True
-                for idx in range(index, len(value)):
+                else:
-                    value_table.create(ci_id=ci.id, attr_id=attr.id, value=value[idx], flush=False, commit=False)
+                    # Comparison array starts from which position changes
-                    if not attr.is_dynamic:
+                    min_len = min(len(value), len(existed_values))
-                        changed.append((ci.id, attr.id, OperateType.ADD, None, value[idx], ci.type_id))
+                    index = 0
-                    else:
+                    while index < min_len:
-                        has_dynamic = True
+                        if value[index] != existed_values[index]:
+                            break
+                        index += 1
+
+                    # Delete first and then add to ensure id sorting
+                    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
+                    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
             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

cmdb-api/api/lib/mixin.py

@@ -1,21 +1,19 @@
 # -*- coding:utf-8 -*-
 
 
-from flask import abort
 from sqlalchemy import func
 
 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
 
     @classmethod
-    def search(cls, page, page_size, fl=None, only_query=False, reverse=False, count_query=False, **kwargs):
+    def search(cls, page, page_size, fl=None, only_query=False, reverse=False, count_query=False,
+               last_size=None, **kwargs):
         page = get_page(page)
         page_size = get_page_size(page_size)
         if fl is None:
@@ -47,14 +45,15 @@ class DBMixin(object):
             return _query, query
 
         numfound = query.count()
-        return numfound, [i.to_dict() if fl is None else getattr(i, '_asdict')()
+        if not last_size:
-                          for i in query.offset((page - 1) * page_size).limit(page_size)]
+            return numfound, [i.to_dict() if fl is None else getattr(i, '_asdict')()
-
+                              for i in query.offset((page - 1) * page_size).limit(page_size)]
-    def _must_be_required(self, _id):
+        else:
-        existed = self.cls.get_by_id(_id)
+            offset = numfound - last_size
-        existed or abort(404, "Factor [{}] does not exist".format(_id))
+            if offset < 0:
-
+                offset = 0
-        return existed
+            return numfound, [i.to_dict() if fl is None else getattr(i, '_asdict')()
+                              for i in query.offset(offset).limit(last_size)]
 
     def _can_add(self, **kwargs):
         raise NotImplementedError

cmdb-api/api/lib/notify.py

@@ -58,7 +58,7 @@ def _request_messenger(subject, body, tos, sender, payload):
 
 def notify_send(subject, body, methods, tos, payload=None):
     payload = payload or {}
-    payload = {k: v or '' for k, v in payload.items()}
+    payload = {k: '' if v is None else v for k, v in payload.items()}
     subject = Template(subject).render(payload)
     body = Template(body).render(payload)
 

cmdb-api/api/models/cmdb.py

@@ -105,6 +105,10 @@ class Attribute(Model):
     is_password = db.Column(db.Boolean, default=False)
     is_sortable = db.Column(db.Boolean, default=False)
     is_dynamic = db.Column(db.Boolean, default=False)
+    is_bool = db.Column(db.Boolean, default=False)
+
+    is_reference = db.Column(db.Boolean, default=False)
+    reference_type_id = db.Column(db.Integer, db.ForeignKey('c_ci_types.id'))
 
     default = db.Column(db.JSON)  # {"default": None}
 
@@ -636,6 +640,15 @@ class AutoDiscoveryCounter(Model2):
     last_week_count = db.Column(db.Integer, default=0)
 
 
+class AutoDiscoveryAccount(Model):
+    __tablename__ = "c_ad_accounts"
+
+    uid = db.Column(db.Integer, index=True)
+    name = db.Column(db.String(64))
+    adr_id = db.Column(db.Integer, db.ForeignKey('c_ad_rules.id'))
+    config = db.Column(db.JSON)
+
+
 class CIFilterPerms(Model):
     __tablename__ = "c_ci_filter_perms"
 

cmdb-api/api/tasks/cmdb.py

@@ -1,9 +1,8 @@
 # -*- coding:utf-8 -*- 
 
 
-import json
 import datetime
-
+import json
 import redis_lock
 from flask import current_app
 from flask_login import login_user
@@ -13,21 +12,26 @@ from api.extensions import celery
 from api.extensions import db
 from api.extensions import es
 from api.extensions import rd
+from api.lib.cmdb.cache import AttributeCache
 from api.lib.cmdb.cache import CITypeAttributesCache
 from api.lib.cmdb.const import CMDB_QUEUE
 from api.lib.cmdb.const import REDIS_PREFIX_CI
 from api.lib.cmdb.const import REDIS_PREFIX_CI_RELATION
 from api.lib.cmdb.const import REDIS_PREFIX_CI_RELATION2
+from api.lib.cmdb.const import RelationSourceEnum
 from api.lib.cmdb.perms import CIFilterPermsCRUD
+from api.lib.cmdb.utils import TableMap
 from api.lib.decorator import flush_db
 from api.lib.decorator import reconnect_db
 from api.lib.perm.acl.cache import UserCache
 from api.lib.utils import handle_arg_list
+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 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)
@@ -36,6 +40,7 @@ from api.models.cmdb import AutoDiscoveryCIType
 def ci_cache(ci_id, operate_type, record_id):
     from api.lib.cmdb.ci import CITriggerManager
     from api.lib.cmdb.ci import CIRelationManager
+    from api.lib.cmdb.ci_type import CITypeAttributeManager
 
     m = api.lib.cmdb.ci.CIManager()
     ci_dict = m.get_ci_by_id_from_db(ci_id, need_children=False, use_master=False)
@@ -51,7 +56,17 @@ def ci_cache(ci_id, operate_type, record_id):
         current_app.test_request_context().push()
         login_user(UserCache.get('worker'))
 
-        CITriggerManager.fire(operate_type, ci_dict, record_id)
+        _, enum_map = CITypeAttributeManager.get_attr_names_label_enum(ci_dict.get('_type'))
+        payload = dict()
+        for k, v in ci_dict.items():
+            if k in enum_map:
+                if isinstance(v, list):
+                    payload[k] = [enum_map[k].get(i, i) for i in v]
+                else:
+                    payload[k] = enum_map[k].get(v, v)
+            else:
+                payload[k] = v
+        CITriggerManager.fire(operate_type, payload, record_id)
 
     ci_dict and CIRelationManager.build_by_attribute(ci_dict)
 
@@ -82,7 +97,7 @@ def batch_ci_cache(ci_ids, ):  # only for attribute change index
 
 @celery.task(name="cmdb.ci_delete", queue=CMDB_QUEUE)
 @reconnect_db
-def ci_delete(ci_id):
+def ci_delete(ci_id, type_id):
     current_app.logger.info(ci_id)
 
     if current_app.config.get("USE_ES"):
@@ -97,6 +112,12 @@ def ci_delete(ci_id):
             adt.update(updated_at=datetime.datetime.now())
         instance.delete()
 
+    for attr in Attribute.get_by(reference_type_id=type_id, to_dict=False):
+        table = TableMap(attr=attr).table
+        for i in getattr(table, 'get_by')(attr_id=attr.id, value=ci_id, to_dict=False):
+            i.delete()
+            ci_cache(i.ci_id, None, None)
+
     current_app.logger.info("{0} delete..........".format(ci_id))
 
 
@@ -186,7 +207,7 @@ def ci_relation_add(parent_dict, child_id, uid):
             for ci in response:
                 try:
                     CIRelationManager.add(ci['_id'], child_id)
-                    ci_relation_cache(ci['_id'], child_id)
+                    ci_relation_cache(ci['_id'], child_id, None)
                 except Exception as e:
                     current_app.logger.warning(e)
                 finally:
@@ -277,3 +298,75 @@ def write_ad_rule_sync_history(rules, oneagent_id, oneagent_name, sync_at):
     except Exception as e:
         current_app.logger.error("write auto discovery rule sync history failed: {}".format(e))
         db.session.rollback()
+
+
+@celery.task(name="cmdb.build_relations_for_ad_accept", queue=CMDB_QUEUE)
+@reconnect_db
+def build_relations_for_ad_accept(adc, ci_id, ad_key2attr):
+    from api.lib.cmdb.ci import CIRelationManager
+    from api.lib.cmdb.search import SearchError
+    from api.lib.cmdb.search.ci import search as ci_search
+
+    current_app.test_request_context().push()
+    login_user(UserCache.get('worker'))
+
+    relation_ads = AutoDiscoveryCITypeRelation.get_by(ad_type_id=adc['type_id'], to_dict=False)
+    for r_adt in relation_ads:
+        ad_key = r_adt.ad_key
+        if not adc['instance'].get(ad_key):
+            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)
+            try:
+                response, _, _, _, _, _ = s.search()
+            except SearchError as e:
+                current_app.logger.error("build_relations_for_ad_accept failed: {}".format(e))
+                return
+
+            for relation_ci in response:
+                relation_ci_id = relation_ci['_id']
+                try:
+                    CIRelationManager.add(ci_id, relation_ci_id,
+                                          valid=False,
+                                          source=RelationSourceEnum.AUTO_DISCOVERY)
+
+                except:
+                    try:
+                        CIRelationManager.add(relation_ci_id, ci_id,
+                                              valid=False,
+                                              source=RelationSourceEnum.AUTO_DISCOVERY)
+                    except:
+                        pass
+
+    # build relations in reverse
+    relation_ads = AutoDiscoveryCITypeRelation.get_by(peer_type_id=adc['type_id'], to_dict=False)
+    attr2ad_key = {v: k for k, v in ad_key2attr.items()}
+    for r_adt in relation_ads:
+        attr = AttributeCache.get(r_adt.peer_attr_id)
+        ad_key = attr2ad_key.get(attr and attr.name)
+        if not ad_key:
+            continue
+
+        ad_value = adc['instance'].get(ad_key)
+        peer_ad_key = r_adt.ad_key
+        peer_instances = AutoDiscoveryCI.get_by(type_id=r_adt.ad_type_id, to_dict=False)
+        for peer_instance in peer_instances:
+            peer_ad_values = peer_instance.instance.get(peer_ad_key)
+            peer_ad_values = [peer_ad_values] if not isinstance(peer_ad_values, list) else peer_ad_values
+            if ad_value in peer_ad_values and peer_instance.ci_id:
+                try:
+                    CIRelationManager.add(peer_instance.ci_id, ci_id,
+                                          valid=False,
+                                          source=RelationSourceEnum.AUTO_DISCOVERY)
+
+                except:
+                    try:
+                        CIRelationManager.add(ci_id, peer_instance.ci_id,
+                                              valid=False,
+                                              source=RelationSourceEnum.AUTO_DISCOVERY)
+                    except:
+                        pass

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-08-20 13:47+0800\n"
 "PO-Revision-Date: 2023-12-25 20:21+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: zh\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.14.0\n"
+"Generated-By: Babel 2.16.0\n"
 
 #: api/lib/resp_format.py:7
 msgid "unauthorized"
@@ -169,8 +169,8 @@ msgstr "目前只允许 属性创建人、管理员 删除属性!"
 #: api/lib/cmdb/resp_format.py:37
 msgid ""
 "Attribute field names cannot be built-in fields: id, _id, ci_id, type, "
-"_type, ci_type"
+"_type, ci_type, ticket_id"
-msgstr "属性字段名不能是内置字段: id, _id, ci_id, type, _type, ci_type"
+msgstr "属性字段名不能是内置字段: id, _id, ci_id, type, _type, ci_type, ci_type, ticket_id"
 
 #: api/lib/cmdb/resp_format.py:39
 msgid "Predefined value: Other model request parameters are illegal!"
@@ -197,286 +197,298 @@ msgid "CI already exists!"
 msgstr "CI 已经存在!"
 
 #: api/lib/cmdb/resp_format.py:47
+msgid "{}: CI reference {} does not exist!"
+msgstr "{}: CI引用 {} 不存在!"
+
+#: api/lib/cmdb/resp_format.py:48
+msgid "{}: CI reference {} is illegal!"
+msgstr "{}, CI引用 {} 不合法!"
+
+#: api/lib/cmdb/resp_format.py:49
 msgid "Relationship constraint: {}, verification failed"
 msgstr "关系约束: {}, 校验失败"
 
-#: api/lib/cmdb/resp_format.py:49
+#: api/lib/cmdb/resp_format.py:51
 msgid ""
 "Many-to-many relationship constraint: Model {} <-> {} already has a many-"
 "to-many relationship!"
 msgstr "多对多关系 限制: 模型 {} <-> {} 已经存在多对多关系!"
 
-#: api/lib/cmdb/resp_format.py:52
+#: api/lib/cmdb/resp_format.py:54
 msgid "CI relationship: {} does not exist"
 msgstr "CI关系: {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:55
+#: api/lib/cmdb/resp_format.py:57
 msgid "In search expressions, not supported before parentheses: or, not"
 msgstr "搜索表达式里小括号前不支持: 或、非"
 
-#: api/lib/cmdb/resp_format.py:57
+#: api/lib/cmdb/resp_format.py:59
 msgid "Model {} does not exist"
 msgstr "模型 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:58
+#: api/lib/cmdb/resp_format.py:60
 msgid "Model {} already exists"
 msgstr "模型 {} 已经存在"
 
-#: api/lib/cmdb/resp_format.py:59
+#: api/lib/cmdb/resp_format.py:61
 msgid "The primary key is undefined or has been deleted"
 msgstr "主键未定义或者已被删除"
 
-#: api/lib/cmdb/resp_format.py:60
+#: api/lib/cmdb/resp_format.py:62
 msgid "Only the creator can delete it!"
 msgstr "只有创建人才能删除它!"
 
-#: api/lib/cmdb/resp_format.py:61
+#: api/lib/cmdb/resp_format.py:63
 msgid "The model cannot be deleted because the CI already exists"
 msgstr "因为CI已经存在，不能删除模型"
 
-#: api/lib/cmdb/resp_format.py:63
+#: api/lib/cmdb/resp_format.py:65
 msgid "The inheritance cannot be deleted because the CI already exists"
 msgstr "因为CI已经存在，不能删除继承关系"
 
-#: api/lib/cmdb/resp_format.py:65
+#: api/lib/cmdb/resp_format.py:67
 msgid "The model is inherited and cannot be deleted"
 msgstr "该模型被继承, 不能删除"
 
 #: api/lib/cmdb/resp_format.py:68
+msgid "The model is referenced by attribute {} and cannot be deleted"
+msgstr "该模型被属性 {} 引用, 不能删除"
+
+#: api/lib/cmdb/resp_format.py:72
 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:74
 msgid "Model group {} does not exist"
 msgstr "模型分组 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:71
+#: api/lib/cmdb/resp_format.py:75
 msgid "Model group {} already exists"
 msgstr "模型分组 {} 已经存在"
 
-#: api/lib/cmdb/resp_format.py:72
+#: api/lib/cmdb/resp_format.py:76
 msgid "Model relationship {} does not exist"
 msgstr "模型关系 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:73
+#: api/lib/cmdb/resp_format.py:77
 msgid "Attribute group {} already exists"
 msgstr "属性分组 {} 已存在"
 
-#: api/lib/cmdb/resp_format.py:74
+#: api/lib/cmdb/resp_format.py:78
 msgid "Attribute group {} does not exist"
 msgstr "属性分组 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:76
+#: api/lib/cmdb/resp_format.py:80
 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:81
 msgid "The unique constraint already exists!"
 msgstr "唯一约束已经存在!"
 
-#: api/lib/cmdb/resp_format.py:79
+#: api/lib/cmdb/resp_format.py:83
 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:84
 msgid "Duplicated trigger"
 msgstr "重复的触发器"
 
-#: api/lib/cmdb/resp_format.py:81
+#: api/lib/cmdb/resp_format.py:85
 msgid "Trigger {} does not exist"
 msgstr "触发器 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:82
+#: api/lib/cmdb/resp_format.py:86
 msgid "Duplicated reconciliation rule"
 msgstr ""
 
-#: api/lib/cmdb/resp_format.py:83
+#: api/lib/cmdb/resp_format.py:87
 msgid "Reconciliation rule {} does not exist"
 msgstr "关系类型 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:85
+#: api/lib/cmdb/resp_format.py:89
 msgid "Operation record {} does not exist"
 msgstr "操作记录 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:86
+#: api/lib/cmdb/resp_format.py:90
 msgid "Unique identifier cannot be deleted"
 msgstr "不能删除唯一标识"
 
-#: api/lib/cmdb/resp_format.py:87
+#: api/lib/cmdb/resp_format.py:91
 msgid "Cannot delete default sorted attributes"
 msgstr "不能删除默认排序的属性"
 
-#: api/lib/cmdb/resp_format.py:89
+#: api/lib/cmdb/resp_format.py:93
 msgid "No node selected"
 msgstr "没有选择节点"
 
-#: api/lib/cmdb/resp_format.py:90
+#: api/lib/cmdb/resp_format.py:94
 msgid "This search option does not exist!"
 msgstr "该搜索选项不存在!"
 
-#: api/lib/cmdb/resp_format.py:91
+#: api/lib/cmdb/resp_format.py:95
 msgid "This search option has a duplicate name!"
 msgstr "该搜索选项命名重复!"
 
-#: api/lib/cmdb/resp_format.py:93
+#: api/lib/cmdb/resp_format.py:97
 msgid "Relationship type {} already exists"
 msgstr "关系类型 {} 已经存在"
 
-#: api/lib/cmdb/resp_format.py:94
+#: api/lib/cmdb/resp_format.py:98
 msgid "Relationship type {} does not exist"
 msgstr "关系类型 {} 不存在"
 
-#: api/lib/cmdb/resp_format.py:96
+#: api/lib/cmdb/resp_format.py:100
 msgid "Invalid attribute value: {}"
 msgstr "无效的属性值: {}"
 
-#: api/lib/cmdb/resp_format.py:97
+#: api/lib/cmdb/resp_format.py:101
 msgid "{} Invalid value: {}"
 msgstr "{} 无效的值: {}"
 
-#: api/lib/cmdb/resp_format.py:98
+#: api/lib/cmdb/resp_format.py:102
 msgid "{} is not in the predefined values"
 msgstr "{} 不在预定义值里"
 
-#: api/lib/cmdb/resp_format.py:100
+#: api/lib/cmdb/resp_format.py:104
 msgid "The value of attribute {} must be unique, {} already exists"
 msgstr "属性 {} 的值必须是唯一的, 当前值 {} 已存在"
 
-#: api/lib/cmdb/resp_format.py:101
+#: api/lib/cmdb/resp_format.py:105
 msgid "Attribute {} value must exist"
 msgstr "属性 {} 值必须存在"
 
-#: api/lib/cmdb/resp_format.py:102
+#: api/lib/cmdb/resp_format.py:106
 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:108
 msgid "Unknown error when adding or modifying attribute value: {}"
 msgstr "新增或者修改属性值未知错误: {}"
 
-#: api/lib/cmdb/resp_format.py:106
+#: api/lib/cmdb/resp_format.py:110
 msgid "Duplicate custom name"
 msgstr "订制名重复"
 
-#: api/lib/cmdb/resp_format.py:108
+#: api/lib/cmdb/resp_format.py:112
 msgid "Number of models exceeds limit: {}"
 msgstr "模型数超过限制: {}"
 
-#: api/lib/cmdb/resp_format.py:109
+#: api/lib/cmdb/resp_format.py:113
 msgid "The number of CIs exceeds the limit: {}"
 msgstr "CI数超过限制: {}"
 
-#: api/lib/cmdb/resp_format.py:111
+#: api/lib/cmdb/resp_format.py:115
 msgid "Auto-discovery rule: {} already exists!"
 msgstr "自动发现规则: {} 已经存在!"
 
-#: api/lib/cmdb/resp_format.py:112
+#: api/lib/cmdb/resp_format.py:116
 msgid "Auto-discovery rule: {} does not exist!"
 msgstr "自动发现规则: {} 不存在!"
 
-#: api/lib/cmdb/resp_format.py:114
+#: api/lib/cmdb/resp_format.py:118
 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:120
 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:121
 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:122
 msgid "Attribute does not include unique identifier: {}"
 msgstr "属性字段没有包括唯一标识: {}"
 
-#: api/lib/cmdb/resp_format.py:119
+#: api/lib/cmdb/resp_format.py:123
 msgid "The auto-discovery instance does not exist!"
 msgstr "自动发现的实例不存在!"
 
-#: api/lib/cmdb/resp_format.py:120
+#: api/lib/cmdb/resp_format.py:124
 msgid "The model is not associated with this auto-discovery!"
 msgstr "模型并未关联该自动发现!"
 
-#: api/lib/cmdb/resp_format.py:121
+#: api/lib/cmdb/resp_format.py:125
 msgid "Only the creator can modify the Secret!"
 msgstr "只有创建人才能修改Secret!"
 
-#: api/lib/cmdb/resp_format.py:123
+#: api/lib/cmdb/resp_format.py:127
 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:129
 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:131
 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:132
 msgid "The attributes method must return a list"
 msgstr "attributes方法必须返回的是list"
 
-#: api/lib/cmdb/resp_format.py:130
+#: api/lib/cmdb/resp_format.py:134
 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:136
 msgid "Only administrators can define execution targets as: all nodes!"
 msgstr "只有管理员才可以定义执行机器为: 所有节点!"
 
-#: api/lib/cmdb/resp_format.py:133
+#: api/lib/cmdb/resp_format.py:137
 msgid "Execute targets permission check failed: {}"
 msgstr "执行机器权限检查不通过: {}"
 
-#: api/lib/cmdb/resp_format.py:135
+#: api/lib/cmdb/resp_format.py:139
 msgid "CI filter authorization must be named!"
 msgstr "CI过滤授权 必须命名!"
 
-#: api/lib/cmdb/resp_format.py:136
+#: api/lib/cmdb/resp_format.py:140
 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:143
 msgid "You do not have permission to operate attribute {}!"
 msgstr "您没有属性 {} 的操作权限!"
 
-#: api/lib/cmdb/resp_format.py:140
+#: api/lib/cmdb/resp_format.py:144
 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:146
 msgid "Failed to save password: {}"
 msgstr "保存密码失败: {}"
 
-#: api/lib/cmdb/resp_format.py:143
+#: api/lib/cmdb/resp_format.py:147
 msgid "Failed to get password: {}"
 msgstr "获取密码失败: {}"
 
-#: api/lib/cmdb/resp_format.py:145
+#: api/lib/cmdb/resp_format.py:149
 msgid "Scheduling time format error"
 msgstr "{}格式错误，应该为：%Y-%m-%d %H:%M:%S"
 
-#: api/lib/cmdb/resp_format.py:146
+#: api/lib/cmdb/resp_format.py:150
 msgid "CMDB data reconciliation results"
 msgstr ""
 
-#: api/lib/cmdb/resp_format.py:147
+#: api/lib/cmdb/resp_format.py:151
 msgid "Number of {} illegal: {}"
 msgstr ""
 
-#: api/lib/cmdb/resp_format.py:149
+#: api/lib/cmdb/resp_format.py:153
 msgid "Topology view {} already exists"
 msgstr "拓扑视图 {} 已经存在"
 
-#: api/lib/cmdb/resp_format.py:150
+#: api/lib/cmdb/resp_format.py:154
 msgid "Topology group {} already exists"
 msgstr "拓扑视图分组 {} 已经存在"
 
-#: api/lib/cmdb/resp_format.py:152
+#: api/lib/cmdb/resp_format.py:156
 msgid "The group cannot be deleted because the topology view already exists"
 msgstr "因为该分组下定义了拓扑视图，不能删除"
 

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

@@ -8,6 +8,7 @@ from flask import request
 from flask_login import current_user
 from io import BytesIO
 
+from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryAccountCRUD
 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
@@ -20,6 +21,7 @@ from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryRuleSyncHist
 from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoverySNMPManager
 from api.lib.cmdb.auto_discovery.const import DEFAULT_INNER
 from api.lib.cmdb.auto_discovery.const import PRIVILEGED_USERS
+from api.lib.cmdb.cache import AttributeCache
 from api.lib.cmdb.const import PermEnum
 from api.lib.cmdb.const import ResourceTypeEnum
 from api.lib.cmdb.resp_format import ErrFormat
@@ -223,6 +225,7 @@ class AutoDiscoveryCIView(APIView):
     @args_required("type_id")
     @args_required("adt_id")
     @args_required("instance")
+    @args_required("unique_value")
     def post(self):
         request.values.pop("_key", None)
         request.values.pop("_secret", None)
@@ -272,14 +275,16 @@ 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)
+        response = []
-        s = ci_search(query)
+        if AttributeCache.get('oneagent_id'):
-        try:
+            query = "oneagent_id:{}".format(oneagent_id)
-            response, _, _, _, _, _ = s.search()
+            s = ci_search(query)
-        except SearchError as e:
+            try:
-            import traceback
+                response, _, _, _, _, _ = s.search()
-            current_app.logger.error(traceback.format_exc())
+            except SearchError as e:
-            return abort(400, str(e))
+                import traceback
+                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'):
@@ -328,8 +333,12 @@ class AutoDiscoveryExecHistoryView(APIView):
     def get(self):
         page = get_page(request.values.pop('page', 1))
         page_size = get_page_size(request.values.pop('page_size', None))
+        last_size = request.values.pop('last_size', None)
+        if last_size and last_size.isdigit():
+            last_size = int(last_size)
         numfound, res = AutoDiscoveryExecHistoryCRUD.search(page=page,
                                                             page_size=page_size,
+                                                            last_size=last_size,
                                                             **request.values)
 
         return self.jsonify(page=page,
@@ -355,3 +364,31 @@ class AutoDiscoveryCounterView(APIView):
         type_id = request.values.get('type_id')
 
         return self.jsonify(AutoDiscoveryCounterCRUD().get(type_id))
+
+
+class AutoDiscoveryAccountView(APIView):
+    url_prefix = ("/adr/accounts", "/adr/accounts/<int:account_id>")
+
+    @args_required('adr_id')
+    def get(self):
+        adr_id = request.values.get('adr_id')
+
+        return self.jsonify(AutoDiscoveryAccountCRUD().get(adr_id))
+
+    @args_required('adr_id')
+    @args_required('accounts', value_required=False)
+    def post(self):
+        AutoDiscoveryAccountCRUD().upsert(**request.values)
+
+        return self.jsonify(code=200)
+
+    @args_required('config')
+    def put(self, account_id):
+        res = AutoDiscoveryAccountCRUD().update(account_id, **request.values)
+
+        return self.jsonify(res.to_dict())
+
+    def delete(self, account_id):
+        AutoDiscoveryAccountCRUD().delete(account_id)
+
+        return self.jsonify(account_id=account_id)

cmdb-api/api/views/cmdb/ci.py

@@ -15,7 +15,7 @@ from api.lib.cmdb.const import ResourceTypeEnum, PermEnum
 from api.lib.cmdb.const import RetKey
 from api.lib.cmdb.perms import has_perm_for_ci
 from api.lib.cmdb.search import SearchError
-from api.lib.cmdb.search.ci import search
+from api.lib.cmdb.search.ci import search as ci_search
 from api.lib.decorator import args_required
 from api.lib.perm.acl.acl import has_perm_from_args
 from api.lib.utils import get_page
@@ -160,7 +160,7 @@ class CISearchView(APIView):
         use_id_filter = request.values.get("use_id_filter", False) in current_app.config.get('BOOL_TRUE')
 
         start = time.time()
-        s = search(query, fl, facet, page, ret_key, count, sort, excludes, use_id_filter=use_id_filter)
+        s = ci_search(query, fl, facet, page, ret_key, count, sort, excludes, use_id_filter=use_id_filter)
         try:
             response, counter, total, page, numfound, facet = s.search()
         except SearchError as e:

cmdb-api/api/views/cmdb/ci_type.py

@@ -48,16 +48,21 @@ class CITypeView(APIView):
         if request.url.endswith("icons"):
             return self.jsonify(CITypeManager().get_icons())
 
-        q = request.args.get("type_name")
+        q = request.values.get("type_name")
+        type_ids = handle_arg_list(request.values.get("type_ids"))
+        type_ids = type_ids or (type_id and [type_id])
+        if type_ids:
+            ci_types = []
+            for _type_id in type_ids:
+                ci_type = CITypeCache.get(_type_id)
+                if ci_type is None:
+                    return abort(404, ErrFormat.ci_type_not_found)
 
-        if type_id is not None:
+                ci_type = ci_type.to_dict()
-            ci_type = CITypeCache.get(type_id)
+                ci_type['parent_ids'] = CITypeInheritanceManager.get_parents(_type_id)
-            if ci_type is None:
+                ci_type['show_name'] = ci_type.get('show_id') and AttributeCache.get(ci_type['show_id']).name
-                return abort(404, ErrFormat.ci_type_not_found)
+                ci_type['unique_name'] = ci_type['unique_id'] and AttributeCache.get(ci_type['unique_id']).name
-
+                ci_types.append(ci_type)
-            ci_type = ci_type.to_dict()
-            ci_type['parent_ids'] = CITypeInheritanceManager.get_parents(type_id)
-            ci_types = [ci_type]
         elif type_name is not None:
             ci_type = CITypeCache.get(type_name).to_dict()
             ci_type['parent_ids'] = CITypeInheritanceManager.get_parents(ci_type['id'])

cmdb-ui/.env

@@ -3,3 +3,4 @@ VUE_APP_PREVIEW=false
 VUE_APP_API_BASE_URL=http://127.0.0.1:5000/api
 VUE_APP_BUILD_PACKAGES="ticket,calendar,acl"
 VUE_APP_IS_OUTER=true
+VUE_APP_IS_OPEN_SOURCE=true

cmdb-ui/public/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3857903 */
-  src: url('iconfont.woff2?t=1719487341033') format('woff2'),
+  src: url('iconfont.woff2?t=1725331691589') format('woff2'),
-       url('iconfont.woff?t=1719487341033') format('woff'),
+       url('iconfont.woff?t=1725331691589') format('woff'),
-       url('iconfont.ttf?t=1719487341033') format('truetype');
+       url('iconfont.ttf?t=1725331691589') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,310 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.veops-expand:before {
+  content: "\e9b6";
+}
+
+.caise-public_cloud:before {
+  content: "\e9b1";
+}
+
+.caise-system:before {
+  content: "\e9b2";
+}
+
+.caise-IPAM:before {
+  content: "\e9b3";
+}
+
+.caise-hyperV:before {
+  content: "\e9b4";
+}
+
+.caise-data_center2:before {
+  content: "\e9b5";
+}
+
+.caise-hardware:before {
+  content: "\e9ad";
+}
+
+.caise-computer:before {
+  content: "\e9ae";
+}
+
+.caise-network_devices:before {
+  content: "\e9af";
+}
+
+.caise-storage_device:before {
+  content: "\e9b0";
+}
+
+.caise-load_balancing:before {
+  content: "\e9ab";
+}
+
+.caise-message_queue:before {
+  content: "\e9ac";
+}
+
+.caise-websever:before {
+  content: "\e9aa";
+}
+
+.caise-middleware:before {
+  content: "\e9a9";
+}
+
+.caise-database:before {
+  content: "\e9a7";
+}
+
+.caise-business:before {
+  content: "\e9a8";
+}
+
+.caise-virtualization:before {
+  content: "\e9a6";
+}
+
+.caise-storage_pool:before {
+  content: "\e9a4";
+}
+
+.caise-storage_volume1:before {
+  content: "\e9a5";
+}
+
+.ciase-aix:before {
+  content: "\e9a3";
+}
+
+.caise_pool:before {
+  content: "\e99b";
+}
+
+.caise-ip_address:before {
+  content: "\e99c";
+}
+
+.caise-computer_room:before {
+  content: "\e99d";
+}
+
+.caise-rack:before {
+  content: "\e99e";
+}
+
+.caise-pc:before {
+  content: "\e99f";
+}
+
+.caise-bandwidth_line:before {
+  content: "\e9a0";
+}
+
+.caise-fiber:before {
+  content: "\e9a1";
+}
+
+.caise-disk_array:before {
+  content: "\e9a2";
+}
+
+.veops-group:before {
+  content: "\e99a";
+}
+
+.veops-inheritance:before {
+  content: "\e999";
+}
+
+.veops-department:before {
+  content: "\e998";
+}
+
+.duose-changwenben1:before {
+  content: "\e997";
+}
+
+.duose-quote:before {
+  content: "\e995";
+}
+
+.duose-boole:before {
+  content: "\e996";
+}
+
+.veops-rule1:before {
+  content: "\e994";
+}
+
+.veops-operation_report:before {
+  content: "\e993";
+}
+
+.veops-ranking1:before {
+  content: "\e992";
+}
+
+.veops-ranking2:before {
+  content: "\e98f";
+}
+
+.veops-ranking3:before {
+  content: "\e990";
+}
+
+.veops-ranking4:before {
+  content: "\e991";
+}
+
+.veops-title5:before {
+  content: "\e98d";
+}
+
+.veops-repair1:before {
+  content: "\e98e";
+}
+
+.veops-ticket:before {
+  content: "\e988";
+}
+
+.veops-model4:before {
+  content: "\e989";
+}
+
+.veops-resource21:before {
+  content: "\e98a";
+}
+
+.veops-relationship3:before {
+  content: "\e98b";
+}
+
+.veops-title6:before {
+  content: "\e98c";
+}
+
+.veops-resource11:before {
+  content: "\e97a";
+}
+
+.veops-model11:before {
+  content: "\e97b";
+}
+
+.veops-relationship1:before {
+  content: "\e97c";
+}
+
+.veops-title1:before {
+  content: "\e97d";
+}
+
+.veops-title2:before {
+  content: "\e97e";
+}
+
+.veops-model2:before {
+  content: "\e97f";
+}
+
+.veops-resource2:before {
+  content: "\e980";
+}
+
+.veops-warehousing:before {
+  content: "\e981";
+}
+
+.veops-relationship2:before {
+  content: "\e982";
+}
+
+.veops-title3:before {
+  content: "\e983";
+}
+
+.veops-rule2:before {
+  content: "\e984";
+}
+
+.veops-model3:before {
+  content: "\e985";
+}
+
+.veops-title4:before {
+  content: "\e986";
+}
+
+.veops-rule3:before {
+  content: "\e987";
+}
+
+.veops-decline:before {
+  content: "\e978";
+}
+
+.veops-rise:before {
+  content: "\e979";
+}
+
+.caise-data_center:before {
+  content: "\e96f";
+}
+
+.caise-folder:before {
+  content: "\e970";
+}
+
+.caise-resource_pool:before {
+  content: "\e971";
+}
+
+.caise-network:before {
+  content: "\e972";
+}
+
+.caise-distributed_switch:before {
+  content: "\e973";
+}
+
+.caise-standard_switch:before {
+  content: "\e974";
+}
+
+.caise-host_cluster:before {
+  content: "\e975";
+}
+
+.caise-storage_cluster:before {
+  content: "\e976";
+}
+
+.caise-data_storage:before {
+  content: "\e977";
+}
+
+.veops-account:before {
+  content: "\e96e";
+}
+
+.veops-collect:before {
+  content: "\e96d";
+}
+
+.veops-collected:before {
+  content: "\e96c";
+}
+
+.veops-text:before {
+  content: "\e96b";
+}
+
 .veops-markdown:before {
   content: "\e96a";
 }

cmdb-ui/public/iconfont/iconfont.json

@@ -5,6 +5,538 @@
   "css_prefix_text": "",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "41681675",
+      "name": "veops-expand",
+      "font_class": "veops-expand",
+      "unicode": "e9b6",
+      "unicode_decimal": 59830
+    },
+    {
+      "icon_id": "41672951",
+      "name": "公有云",
+      "font_class": "caise-public_cloud",
+      "unicode": "e9b1",
+      "unicode_decimal": 59825
+    },
+    {
+      "icon_id": "41672952",
+      "name": "操作系统",
+      "font_class": "caise-system",
+      "unicode": "e9b2",
+      "unicode_decimal": 59826
+    },
+    {
+      "icon_id": "41673309",
+      "name": "IPAM",
+      "font_class": "caise-IPAM",
+      "unicode": "e9b3",
+      "unicode_decimal": 59827
+    },
+    {
+      "icon_id": "41673312",
+      "name": "hyperV",
+      "font_class": "caise-hyperV",
+      "unicode": "e9b4",
+      "unicode_decimal": 59828
+    },
+    {
+      "icon_id": "41673320",
+      "name": "数据中心",
+      "font_class": "caise-data_center2",
+      "unicode": "e9b5",
+      "unicode_decimal": 59829
+    },
+    {
+      "icon_id": "41669141",
+      "name": "硬件设备",
+      "font_class": "caise-hardware",
+      "unicode": "e9ad",
+      "unicode_decimal": 59821
+    },
+    {
+      "icon_id": "41669249",
+      "name": "计算机",
+      "font_class": "caise-computer",
+      "unicode": "e9ae",
+      "unicode_decimal": 59822
+    },
+    {
+      "icon_id": "41669250",
+      "name": "网络设备",
+      "font_class": "caise-network_devices",
+      "unicode": "e9af",
+      "unicode_decimal": 59823
+    },
+    {
+      "icon_id": "41669278",
+      "name": "存储设备",
+      "font_class": "caise-storage_device",
+      "unicode": "e9b0",
+      "unicode_decimal": 59824
+    },
+    {
+      "icon_id": "41659452",
+      "name": "负载均衡",
+      "font_class": "caise-load_balancing",
+      "unicode": "e9ab",
+      "unicode_decimal": 59819
+    },
+    {
+      "icon_id": "41659446",
+      "name": "消息队列",
+      "font_class": "caise-message_queue",
+      "unicode": "e9ac",
+      "unicode_decimal": 59820
+    },
+    {
+      "icon_id": "41659424",
+      "name": "websever",
+      "font_class": "caise-websever",
+      "unicode": "e9aa",
+      "unicode_decimal": 59818
+    },
+    {
+      "icon_id": "41655608",
+      "name": "中间件",
+      "font_class": "caise-middleware",
+      "unicode": "e9a9",
+      "unicode_decimal": 59817
+    },
+    {
+      "icon_id": "41655599",
+      "name": "数据库",
+      "font_class": "caise-database",
+      "unicode": "e9a7",
+      "unicode_decimal": 59815
+    },
+    {
+      "icon_id": "41655591",
+      "name": "业务",
+      "font_class": "caise-business",
+      "unicode": "e9a8",
+      "unicode_decimal": 59816
+    },
+    {
+      "icon_id": "41655550",
+      "name": "虚拟化",
+      "font_class": "caise-virtualization",
+      "unicode": "e9a6",
+      "unicode_decimal": 59814
+    },
+    {
+      "icon_id": "41654680",
+      "name": "存储池",
+      "font_class": "caise-storage_pool",
+      "unicode": "e9a4",
+      "unicode_decimal": 59812
+    },
+    {
+      "icon_id": "41654676",
+      "name": "存储卷",
+      "font_class": "caise-storage_volume1",
+      "unicode": "e9a5",
+      "unicode_decimal": 59813
+    },
+    {
+      "icon_id": "41654608",
+      "name": "aix",
+      "font_class": "ciase-aix",
+      "unicode": "e9a3",
+      "unicode_decimal": 59811
+    },
+    {
+      "icon_id": "41654233",
+      "name": "ip池",
+      "font_class": "caise_pool",
+      "unicode": "e99b",
+      "unicode_decimal": 59803
+    },
+    {
+      "icon_id": "41654237",
+      "name": "ip地址",
+      "font_class": "caise-ip_address",
+      "unicode": "e99c",
+      "unicode_decimal": 59804
+    },
+    {
+      "icon_id": "41654249",
+      "name": "机房",
+      "font_class": "caise-computer_room",
+      "unicode": "e99d",
+      "unicode_decimal": 59805
+    },
+    {
+      "icon_id": "41654271",
+      "name": "机柜",
+      "font_class": "caise-rack",
+      "unicode": "e99e",
+      "unicode_decimal": 59806
+    },
+    {
+      "icon_id": "41654276",
+      "name": "PC",
+      "font_class": "caise-pc",
+      "unicode": "e99f",
+      "unicode_decimal": 59807
+    },
+    {
+      "icon_id": "41654305",
+      "name": "带宽线路",
+      "font_class": "caise-bandwidth_line",
+      "unicode": "e9a0",
+      "unicode_decimal": 59808
+    },
+    {
+      "icon_id": "41654323",
+      "name": "光纤交换机",
+      "font_class": "caise-fiber",
+      "unicode": "e9a1",
+      "unicode_decimal": 59809
+    },
+    {
+      "icon_id": "41654369",
+      "name": "磁盘阵列",
+      "font_class": "caise-disk_array",
+      "unicode": "e9a2",
+      "unicode_decimal": 59810
+    },
+    {
+      "icon_id": "41643869",
+      "name": "veops-group",
+      "font_class": "veops-group",
+      "unicode": "e99a",
+      "unicode_decimal": 59802
+    },
+    {
+      "icon_id": "41637123",
+      "name": "veops-inheritance",
+      "font_class": "veops-inheritance",
+      "unicode": "e999",
+      "unicode_decimal": 59801
+    },
+    {
+      "icon_id": "41570722",
+      "name": "veops-department",
+      "font_class": "veops-department",
+      "unicode": "e998",
+      "unicode_decimal": 59800
+    },
+    {
+      "icon_id": "41437322",
+      "name": "duose-changwenben (1)",
+      "font_class": "duose-changwenben1",
+      "unicode": "e997",
+      "unicode_decimal": 59799
+    },
+    {
+      "icon_id": "41363381",
+      "name": "duose-quote",
+      "font_class": "duose-quote",
+      "unicode": "e995",
+      "unicode_decimal": 59797
+    },
+    {
+      "icon_id": "41363378",
+      "name": "duose-boole",
+      "font_class": "duose-boole",
+      "unicode": "e996",
+      "unicode_decimal": 59798
+    },
+    {
+      "icon_id": "41341306",
+      "name": "veops-rule1",
+      "font_class": "veops-rule1",
+      "unicode": "e994",
+      "unicode_decimal": 59796
+    },
+    {
+      "icon_id": "41337509",
+      "name": "veops-operation_report",
+      "font_class": "veops-operation_report",
+      "unicode": "e993",
+      "unicode_decimal": 59795
+    },
+    {
+      "icon_id": "41335526",
+      "name": "veops-ranking1",
+      "font_class": "veops-ranking1",
+      "unicode": "e992",
+      "unicode_decimal": 59794
+    },
+    {
+      "icon_id": "41335530",
+      "name": "veops-ranking2",
+      "font_class": "veops-ranking2",
+      "unicode": "e98f",
+      "unicode_decimal": 59791
+    },
+    {
+      "icon_id": "41335529",
+      "name": "veops-ranking3",
+      "font_class": "veops-ranking3",
+      "unicode": "e990",
+      "unicode_decimal": 59792
+    },
+    {
+      "icon_id": "41335528",
+      "name": "veops-ranking4",
+      "font_class": "veops-ranking4",
+      "unicode": "e991",
+      "unicode_decimal": 59793
+    },
+    {
+      "icon_id": "41334746",
+      "name": "veops-title5",
+      "font_class": "veops-title5",
+      "unicode": "e98d",
+      "unicode_decimal": 59789
+    },
+    {
+      "icon_id": "41334744",
+      "name": "veops-repair (1)",
+      "font_class": "veops-repair1",
+      "unicode": "e98e",
+      "unicode_decimal": 59790
+    },
+    {
+      "icon_id": "41334753",
+      "name": "veops-ticket",
+      "font_class": "veops-ticket",
+      "unicode": "e988",
+      "unicode_decimal": 59784
+    },
+    {
+      "icon_id": "41334751",
+      "name": "veops-model4",
+      "font_class": "veops-model4",
+      "unicode": "e989",
+      "unicode_decimal": 59785
+    },
+    {
+      "icon_id": "41334752",
+      "name": "veops-resource2 (1)",
+      "font_class": "veops-resource21",
+      "unicode": "e98a",
+      "unicode_decimal": 59786
+    },
+    {
+      "icon_id": "41334750",
+      "name": "veops-relationship3",
+      "font_class": "veops-relationship3",
+      "unicode": "e98b",
+      "unicode_decimal": 59787
+    },
+    {
+      "icon_id": "41334748",
+      "name": "veops-title6",
+      "font_class": "veops-title6",
+      "unicode": "e98c",
+      "unicode_decimal": 59788
+    },
+    {
+      "icon_id": "41334404",
+      "name": "veops-resource1 (1)",
+      "font_class": "veops-resource11",
+      "unicode": "e97a",
+      "unicode_decimal": 59770
+    },
+    {
+      "icon_id": "41334505",
+      "name": "veops-model1 (1)",
+      "font_class": "veops-model11",
+      "unicode": "e97b",
+      "unicode_decimal": 59771
+    },
+    {
+      "icon_id": "41334533",
+      "name": "veops-relationship1",
+      "font_class": "veops-relationship1",
+      "unicode": "e97c",
+      "unicode_decimal": 59772
+    },
+    {
+      "icon_id": "41334535",
+      "name": "veops-title1",
+      "font_class": "veops-title1",
+      "unicode": "e97d",
+      "unicode_decimal": 59773
+    },
+    {
+      "icon_id": "41334572",
+      "name": "veops-title2",
+      "font_class": "veops-title2",
+      "unicode": "e97e",
+      "unicode_decimal": 59774
+    },
+    {
+      "icon_id": "41334579",
+      "name": "veops-model2",
+      "font_class": "veops-model2",
+      "unicode": "e97f",
+      "unicode_decimal": 59775
+    },
+    {
+      "icon_id": "41334590",
+      "name": "veops-resource2",
+      "font_class": "veops-resource2",
+      "unicode": "e980",
+      "unicode_decimal": 59776
+    },
+    {
+      "icon_id": "41334594",
+      "name": "veops-warehousing",
+      "font_class": "veops-warehousing",
+      "unicode": "e981",
+      "unicode_decimal": 59777
+    },
+    {
+      "icon_id": "41334598",
+      "name": "veops-relationship2",
+      "font_class": "veops-relationship2",
+      "unicode": "e982",
+      "unicode_decimal": 59778
+    },
+    {
+      "icon_id": "41334602",
+      "name": "veops-title3",
+      "font_class": "veops-title3",
+      "unicode": "e983",
+      "unicode_decimal": 59779
+    },
+    {
+      "icon_id": "41334603",
+      "name": "veops-rule2",
+      "font_class": "veops-rule2",
+      "unicode": "e984",
+      "unicode_decimal": 59780
+    },
+    {
+      "icon_id": "41334604",
+      "name": "veops-model3",
+      "font_class": "veops-model3",
+      "unicode": "e985",
+      "unicode_decimal": 59781
+    },
+    {
+      "icon_id": "41334725",
+      "name": "veops-title4",
+      "font_class": "veops-title4",
+      "unicode": "e986",
+      "unicode_decimal": 59782
+    },
+    {
+      "icon_id": "41334739",
+      "name": "veops-rule3",
+      "font_class": "veops-rule3",
+      "unicode": "e987",
+      "unicode_decimal": 59783
+    },
+    {
+      "icon_id": "41334004",
+      "name": "veops-decline",
+      "font_class": "veops-decline",
+      "unicode": "e978",
+      "unicode_decimal": 59768
+    },
+    {
+      "icon_id": "41333990",
+      "name": "veops-rise",
+      "font_class": "veops-rise",
+      "unicode": "e979",
+      "unicode_decimal": 59769
+    },
+    {
+      "icon_id": "41143117",
+      "name": "caise-数据中心",
+      "font_class": "caise-data_center",
+      "unicode": "e96f",
+      "unicode_decimal": 59759
+    },
+    {
+      "icon_id": "41143118",
+      "name": "caise-文件夹",
+      "font_class": "caise-folder",
+      "unicode": "e970",
+      "unicode_decimal": 59760
+    },
+    {
+      "icon_id": "41143119",
+      "name": "caise-资源池",
+      "font_class": "caise-resource_pool",
+      "unicode": "e971",
+      "unicode_decimal": 59761
+    },
+    {
+      "icon_id": "41143120",
+      "name": "caise-网络",
+      "font_class": "caise-network",
+      "unicode": "e972",
+      "unicode_decimal": 59762
+    },
+    {
+      "icon_id": "41143121",
+      "name": "caise-分布式交换机",
+      "font_class": "caise-distributed_switch",
+      "unicode": "e973",
+      "unicode_decimal": 59763
+    },
+    {
+      "icon_id": "41143122",
+      "name": "caise-标准式交换机",
+      "font_class": "caise-standard_switch",
+      "unicode": "e974",
+      "unicode_decimal": 59764
+    },
+    {
+      "icon_id": "41143128",
+      "name": "caise-主机集群",
+      "font_class": "caise-host_cluster",
+      "unicode": "e975",
+      "unicode_decimal": 59765
+    },
+    {
+      "icon_id": "41143129",
+      "name": "caise-数据存储集群",
+      "font_class": "caise-storage_cluster",
+      "unicode": "e976",
+      "unicode_decimal": 59766
+    },
+    {
+      "icon_id": "41143143",
+      "name": "caise-数据存储",
+      "font_class": "caise-data_storage",
+      "unicode": "e977",
+      "unicode_decimal": 59767
+    },
+    {
+      "icon_id": "41141857",
+      "name": "veops-account",
+      "font_class": "veops-account",
+      "unicode": "e96e",
+      "unicode_decimal": 59758
+    },
+    {
+      "icon_id": "41128804",
+      "name": "veops-collect",
+      "font_class": "veops-collect",
+      "unicode": "e96d",
+      "unicode_decimal": 59757
+    },
+    {
+      "icon_id": "41128781",
+      "name": "veops-collected",
+      "font_class": "veops-collected",
+      "unicode": "e96c",
+      "unicode_decimal": 59756
+    },
+    {
+      "icon_id": "41106846",
+      "name": "veops-text",
+      "font_class": "veops-text",
+      "unicode": "e96b",
+      "unicode_decimal": 59755
+    },
     {
       "icon_id": "40896913",
       "name": "veops-markdown",

cmdb-ui/src/App.vue

@@ -61,12 +61,12 @@ export default {
     )
 
     // 注册富文本自定义元素
-    const resume = {
+    // const resume = {
-      type: 'attachment',
+    //   type: 'attachment',
-      attachmentLabel: '',
+    //   attachmentLabel: '',
-      attachmentValue: '',
+    //   attachmentValue: '',
-      children: [{ text: '' }], // void 元素必须有一个 children ，其中只有一个空字符串，重要！！！
+    //   children: [{ text: '' }], // void 元素必须有一个 children ，其中只有一个空字符串，重要！！！
-    }
+    // }
 
     function withAttachment(editor) {
       // JS 语法

cmdb-ui/src/api/cmdb.js

@@ -0,0 +1,18 @@
+import { axios } from '@/utils/request'
+
+export function searchCI(params, isShowMessage = true) {
+  return axios({
+    url: `/v0.1/ci/s`,
+    method: 'GET',
+    params: params,
+    isShowMessage
+  })
+}
+
+export function getCIType(CITypeName, parameter) {
+  return axios({
+    url: `/v0.1/ci_types/${CITypeName}`,
+    method: 'GET',
+    params: parameter
+  })
+}

cmdb-ui/src/components/CMDBFilterComp/expression.vue

@@ -84,7 +84,48 @@
         :zIndex="1050"
         :disabled="disabled"
       >
+        <div
+          slot="option-label"
+          slot-scope="{ node }"
+          :style="{ width: '100%', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' }"
+        >
+          <a-tooltip :title="node.label">
+            {{ node.label }}
+          </a-tooltip>
+        </div>
+        <div
+          :style="{ width: '100%', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' }"
+          slot="value-label"
+          slot-scope="{ node }"
+        >
+          <a-tooltip :title="node.label">
+            {{ node.label }}
+          </a-tooltip>
+        </div>
       </treeselect>
+      <CIReferenceAttr
+        v-if="getAttr(item.property).is_reference && (item.exp === 'is' || item.exp === '~is')"
+        :style="{ width: '175px' }"
+        class="select-filter-component"
+        :referenceTypeId="getAttr(item.property).reference_type_id"
+        :disabled="disabled"
+        v-model="item.value"
+      />
+      <a-select
+        v-else-if="getAttr(item.property).is_bool && (item.exp === 'is' || item.exp === '~is')"
+        v-model="item.value"
+        class="select-filter-component"
+        :style="{ width: '175px' }"
+        :disabled="disabled"
+        :placeholder="$t('placeholder2')"
+      >
+        <a-select-option key="1">
+          true
+        </a-select-option>
+        <a-select-option key="0">
+          false
+        </a-select-option>
+      </a-select>
       <treeselect
         class="custom-treeselect"
         :style="{ width: '175px', '--custom-height': '24px' }"
@@ -92,15 +133,15 @@
         :multiple="false"
         :clearable="false"
         searchable
-        v-if="isChoiceByProperty(item.property) && (item.exp === 'is' || item.exp === '~is')"
+        v-else-if="isChoiceByProperty(item.property) && (item.exp === 'is' || item.exp === '~is')"
         :options="getChoiceValueByProperty(item.property)"
         :placeholder="$t('placeholder2')"
         :normalizer="
           (node) => {
             return {
-              id: node[0],
+              id: String(node[0] || ''),
-              label: node[0],
+              label: node[1] ? node[1].label || node[0] : node[0],
-              children: node.children,
+              children: node.children && node.children.length ? node.children : undefined,
             }
           }
         "
@@ -199,10 +240,11 @@ import _ from 'lodash'
 import { v4 as uuidv4 } from 'uuid'
 import { ruleTypeList, expList, advancedExpList, compareTypeList } from './constants'
 import ValueTypeMapIcon from '../CMDBValueTypeMapIcon'
+import CIReferenceAttr from '../ciReferenceAttr/index.vue'
 
 export default {
   name: 'Expression',
-  components: { ValueTypeMapIcon },
+  components: { ValueTypeMapIcon, CIReferenceAttr },
   model: {
     prop: 'value',
     event: 'change',
@@ -255,7 +297,7 @@ export default {
     getExpListByProperty(property) {
       if (property) {
         const _find = this.canSearchPreferenceAttrList.find((item) => item.name === property)
-        if (_find && ['0', '1', '3', '4', '5'].includes(_find.value_type)) {
+        if (_find && (['0', '1', '3', '4', '5'].includes(_find.value_type) || _find.is_reference || _find.is_bool)) {
           return [
             { value: 'is', label: this.$t('cmdbFilterComp.is') },
             { value: '~is', label: this.$t('cmdbFilterComp.~is') },
@@ -315,6 +357,9 @@ export default {
       }
       return []
     },
+    getAttr(property) {
+      return this.canSearchPreferenceAttrList.find((item) => item.name === property) || {}
+    },
     handleChangeExp({ value }, item, index) {
       const _ruleList = _.cloneDeep(this.ruleList)
       if (value === 'range') {
@@ -343,4 +388,20 @@ export default {
 }
 </script>
 
-<style></style>
+<style lang="less" scoped>
+.select-filter-component {
+  height: 24px;
+
+  /deep/ .ant-select-selection {
+    height: 24px;
+    background: #f7f8fa;
+    line-height: 24px;
+    border: none;
+
+    .ant-select-selection__rendered {
+      height: 24px;
+      line-height: 24px;
+    }
+  }
+}
+</style>

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

@@ -15,18 +15,38 @@ export default {
   },
   methods: {
     getPropertyIcon(attr) {
-      switch (attr.value_type) {
+      let valueType = attr.value_type
+
+      if (valueType === '2') {
+        if (attr.is_password) {
+          valueType = '7'
+        } else if (attr.is_link) {
+          valueType = '8'
+        } else if (!attr.is_index) {
+          valueType = '9'
+        }
+      }
+
+      if (
+        valueType === '7' &&
+        attr.is_bool
+      ) {
+        valueType = '10'
+      }
+
+      if (
+        valueType === '0' &&
+        attr.is_reference
+      ) {
+        valueType = '11'
+      }
+
+      switch (valueType) {
         case '0':
           return 'duose-shishu'
         case '1':
           return 'duose-fudianshu'
         case '2':
-          if (attr.is_password) {
-            return 'duose-password'
-          }
-          if (attr.is_link) {
-            return 'duose-link'
-          }
           return 'duose-wenben'
         case '3':
           return 'duose-datetime'
@@ -40,6 +60,14 @@ export default {
           return 'duose-password'
         case '8':
           return 'duose-link'
+        case '9':
+          return 'duose-changwenben1'
+        case '10':
+          return 'duose-boole'
+        case '11':
+          return 'duose-quote'
+        default:
+          return ''
       }
     },
   },

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

@@ -905,6 +905,111 @@ export const multicolorIconList = [
     value: 'caise-application',
     label: '应用',
     list: [{
+      value: 'caise-disk_array',
+      label: '磁盘阵列'
+    }, {
+      value: 'caise-fiber',
+      label: '光纤交换机'
+    }, {
+      value: 'caise-bandwidth_line',
+      label: '带宽线路'
+    }, {
+      value: 'caise-pc',
+      label: 'PC'
+    }, {
+      value: 'caise-rack',
+      label: '机柜'
+    }, {
+      value: 'caise-computer_room',
+      label: '机房'
+    }, {
+      value: 'caise-ip_address',
+      label: 'ip地址'
+    }, {
+      value: 'caise_pool',
+      label: 'ip池'
+    }, {
+      value: 'ciase-aix',
+      label: 'aix'
+    }, {
+      value: 'caise-storage_volume1',
+      label: '存储卷'
+    }, {
+      value: 'caise-virtualization',
+      label: '虚拟化'
+    }, {
+      value: 'caise-business',
+      label: '业务'
+    }, {
+      value: 'caise-database',
+      label: '数据库'
+    }, {
+      value: 'caise-middleware',
+      label: '中间件'
+    }, {
+      value: 'caise-websever',
+      label: 'websever'
+    }, {
+      value: 'caise-message_queue',
+      label: '消息队列'
+    }, {
+      value: 'caise-load_balancing',
+      label: '负载均衡'
+    }, {
+      value: 'caise-storage_device',
+      label: '存储设备'
+    }, {
+      value: 'caise-network_devices',
+      label: '网络设备'
+    }, {
+      value: 'caise-computer',
+      label: '计算机'
+    }, {
+      value: 'caise-hardware',
+      label: '硬件设备'
+    }, {
+      value: 'caise-data_center2',
+      label: '数据中心'
+    }, {
+      value: 'caise-hyperV',
+      label: 'hyperV'
+    }, {
+      value: 'caise-IPAM',
+      label: 'IPAM'
+    }, {
+      value: 'caise-system',
+      label: '操作系统'
+    }, {
+      value: 'caise-public_cloud',
+      label: '公有云'
+    }, {
+      value: 'caise-data_center',
+      label: '数据中心'
+    }, {
+      value: 'caise-folder',
+      label: '文件夹'
+    }, {
+      value: 'caise-resource_pool',
+      label: '资源池'
+    }, {
+      value: 'caise-network',
+      label: '网络'
+    }, {
+      value: 'caise-distributed_switch',
+      label: '分布式交换机'
+    }, {
+      value: 'caise-standard_switch',
+      label: '标准式交换机'
+    }, {
+      value: 'caise-host_cluster',
+      label: '主机集群'
+    }, {
+      value: 'caise-storage_cluster',
+      label: '数据存储集群'
+    }, {
+      value: 'caise-data_storage',
+      label: '数据存储'
+    }, {
       value: 'caise-yilianjie',
       label: '已连接'
     }, {

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

@@ -257,7 +257,7 @@ export default {
       const props = {}
       if (this.$route.name === routeName && selectedIcon) {
         return <ops-icon type={selectedIcon}></ops-icon>
-      } else if (icon.startsWith('ops-') || icon.startsWith('icon-xianxing') || icon.startsWith('icon-shidi')) {
+      } else if (icon.startsWith('ops-') || icon.startsWith('icon-xianxing') || icon.startsWith('icon-shidi') || icon.startsWith('veops-')) {
         return <ops-icon type={icon}></ops-icon>
       } else {
         typeof (icon) === 'object' ? props.component = icon : props.type = icon

cmdb-ui/src/components/RegexSelect/regexSelect.vue

@@ -61,7 +61,13 @@
         </template>
       </div>
     </div>
-    <a-input ref="regInput" :placeholder="$t('regexSelect.placeholder')" :value="current.label" @change="changeLabel">
+    <a-input
+      ref="regInput"
+      :placeholder="$t('regexSelect.placeholder')"
+      :value="current.label"
+      :disabled="disabled"
+      @change="changeLabel"
+    >
     </a-input>
   </a-popover>
 </template>
@@ -88,6 +94,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {

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

@@ -0,0 +1,178 @@
+<template>
+  <div class="reference-attr-select-wrap">
+    <a-select
+      v-bind="$attrs"
+      v-model="selectCIIds"
+      optionFilterProp="title"
+      :mode="isList ? 'multiple' : 'default'"
+      showSearch
+      allowClear
+      :getPopupContainer="(trigger) => trigger.parentElement"
+      class="reference-attr-select"
+      :maxTagCount="2"
+      @dropdownVisibleChange="handleDropdownVisibleChange"
+      @search="handleSearch"
+      @change="handleChange"
+    >
+      <template v-if="!isInit">
+        <a-select-option
+          v-for="(item) in initSelectOption"
+          :key="item.key"
+          :title="item.title"
+        >
+          {{ item.title }}
+        </a-select-option>
+      </template>
+      <a-select-option
+        v-for="(item) in options"
+        :key="item.key"
+        :title="item.title"
+      >
+        {{ item.title }}
+      </a-select-option>
+    </a-select>
+  </div>
+</template>
+
+<script>
+import _ from 'lodash'
+import debounce from 'lodash/debounce'
+import { searchCI, getCIType } from '@/api/cmdb'
+
+export default {
+  name: 'CIReferenceAttr',
+  props: {
+    value: {
+      type: [Number, String, Array],
+      default: () => '',
+    },
+    isList: {
+      type: Boolean,
+      default: false,
+    },
+    referenceShowAttrName: {
+      type: String,
+      default: ''
+    },
+    referenceTypeId: {
+      type: [String, Number],
+      default: ''
+    },
+    initSelectOption: {
+      type: Array,
+      default: () => []
+    }
+  },
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  data() {
+    return {
+      isInit: false,
+      options: [],
+      innerReferenceShowAttrName: ''
+    }
+  },
+  watch: {
+    referenceTypeId: {
+      immediate: true,
+      deep: true,
+      handler() {
+        this.isInit = false
+      }
+    }
+  },
+  computed: {
+    selectCIIds: {
+      get() {
+        if (this.isList) {
+          return this.value || []
+        } else {
+          return this.value ? Number(this.value) : ''
+        }
+      },
+      set(val) {
+        this.$emit('change', val ?? (this.isList ? [] : null))
+        return val
+      },
+    },
+  },
+  methods: {
+    async handleDropdownVisibleChange(open) {
+      if (!this.isInit && open && this.referenceTypeId) {
+        this.isInit = true
+
+        if (!this.referenceShowAttrName) {
+          const res = await getCIType(this.referenceTypeId)
+          const ciType = res?.ci_types?.[0]
+          this.innerReferenceShowAttrName = ciType?.show_name || ciType?.unique_name || ''
+        }
+
+        const attrName = this.referenceShowAttrName || this.innerReferenceShowAttrName || ''
+        if (!attrName) {
+          return
+        }
+
+        const res = await searchCI({
+          q: `_type:${this.referenceTypeId}`,
+          fl: attrName,
+          count: 25,
+        })
+
+        let options = res?.result?.map((item) => {
+          return {
+            key: item._id,
+            title: String(item?.[attrName] ?? '')
+          }
+        })
+
+        options = _.uniqBy([...this.initSelectOption, ...options], 'key')
+
+        this.options = options
+      }
+    },
+
+    handleSearch: debounce(async function(v) {
+      const attrName = this.referenceShowAttrName || this.innerReferenceShowAttrName || ''
+
+      if (!attrName || !this.referenceTypeId) {
+        return
+      }
+
+      const res = await searchCI({
+        q: `_type:${this.referenceTypeId}${v ? ',*' + v + '*' : ''}`,
+        fl: attrName,
+        count: v ? 100 : 25,
+      })
+
+      this.options = res?.result?.map((item) => {
+        return {
+          key: item._id,
+          title: String(item?.[attrName] ?? '')
+        }
+      })
+    }, 300),
+
+    handleChange(v) {
+      if (Array.isArray(v) ? !v.length : !v) {
+        this.handleSearch()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.reference-attr-select-wrap {
+  width: 100%;
+
+  .reference-attr-select {
+    width: 100%;
+
+    /deep/ .ant-select-dropdown {
+      z-index: 15;
+    }
+  }
+}
+</style>

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

@@ -31,7 +31,7 @@ export default {
   text-align: center;
   border-radius: 4px;
   &:hover {
-    background: linear-gradient(0deg, rgba(0, 80, 201, 0.2) 0%, rgba(174, 207, 255, 0.06) 86.76%);
+    // background: linear-gradient(0deg, rgba(0, 80, 201, 0.2) 0%, rgba(174, 207, 255, 0.06) 86.76%);
     color: @layout-header-font-selected-color;
   }
 }

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

@@ -5,7 +5,6 @@
       v-for="route in defaultShowRoutes"
       :key="route.name"
       @click="() => handleClick(route)"
-      :title="$t(route.meta.title)"
     >
       {{ route.meta.title }}
     </span>
@@ -119,7 +118,9 @@ export default {
     line-height: @layout-header-line-height;
     display: inline-block;
   }
-  > span:hover,
+  > span:hover {
+    background-color: #f0f2f5;
+  }
   .top-menu-selected {
     font-weight: bold;
     color: @layout-header-font-selected-color;

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

@@ -5,15 +5,30 @@
       <span
         v-if="hasBackendPermission"
         @click="handleClick"
-        class="action"
+        class="common-settings-btn"
-        style="width: 40px; display: flex; justify-content: center"
       >
-        <a-icon type="setting" />
+        <ops-icon class="common-settings-btn-icon" type="veops-setting" />
+        <span class="common-settings-btn-text">{{ $t('settings') }}</span>
       </span>
-      <span class="locale" @click="changeLang">{{ locale === 'zh' ? 'English' : '中文' }}</span>
       <a-popover
-        trigger="click"
+        overlayClassName="lang-popover-wrap"
-        :overlayStyle="{ width: '150px' }"
+        placement="bottomRight"
+        :getPopupContainer="(trigger) => trigger.parentNode"
+      >
+        <span class="locale">{{ languageList.find((lang) => lang.key === locale).title }}</span>
+        <div class="lang-menu" slot="content">
+          <a
+            v-for="(lang) in languageList"
+            :key="lang.key"
+            :class="['lang-menu-item', lang.key === locale ? 'lang-menu-item_active' : '']"
+            @click="changeLang(lang.key)"
+          >
+            {{ lang.title }}
+          </a>
+        </div>
+      </a-popover>
+      <a-popover
+        :overlayStyle="{ width: '130px' }"
         placement="bottomRight"
         overlayClassName="custom-user"
       >
@@ -29,7 +44,7 @@
             <span>{{ $t('topMenu.logout') }}</span>
           </div>
         </template>
-        <span class="action ant-dropdown-link user-dropdown-menu">
+        <span class="action ant-dropdown-link user-dropdown-menu user-info-wrap">
           <a-avatar
             v-if="avatar()"
             class="avatar"
@@ -54,6 +69,20 @@ export default {
   components: {
     DocumentLink,
   },
+  data() {
+    return {
+      languageList: [
+        {
+          title: '简中',
+          key: 'zh'
+        },
+        {
+          title: 'EN',
+          key: 'en'
+        },
+      ]
+    }
+  },
   computed: {
     ...mapState(['user', 'locale']),
     hasBackendPermission() {
@@ -81,14 +110,9 @@ export default {
     handleClick() {
       this.$router.push('/setting')
     },
-    changeLang() {
+    changeLang(lang) {
-      if (this.locale === 'zh') {
+      this.SET_LOCALE(lang)
-        this.SET_LOCALE('en')
+      this.$i18n.locale = lang
-        this.$i18n.locale = 'en'
-      } else {
-        this.SET_LOCALE('zh')
-        this.$i18n.locale = 'zh'
-      }
       this.$nextTick(() => {
         setDocumentTitle(`${this.$t(this.$route.meta.title)} - ${domTitle}`)
       })
@@ -118,8 +142,88 @@ export default {
 
 .locale {
   cursor: pointer;
+  padding: 0 8px;
+
   &:hover {
     color: @primary-color;
   }
 }
+
+.lang-popover-wrap {
+  width: 70px;
+  padding: 0px;
+
+  .ant-popover-inner-content {
+    padding: 0px;
+  }
+}
+</style>
+
+<style lang="less" scoped>
+.user-wrapper {
+  .common-settings-btn {
+    cursor: pointer;
+    padding: 0px 18px;
+    background-color: #F0F5FF;
+    border-radius: 22px;
+    height: 26px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 0 8px;
+
+    &-icon {
+      font-size: 12px;
+      color: #2F54EB;
+    }
+
+    &-text {
+      margin-left: 4px;
+      font-size: 12px;
+      font-weight: 400;
+      color: #4E5969;
+    }
+
+    &:hover {
+      .commen-settings-btn-text {
+        color: #2F54EB;
+      }
+    }
+  }
+
+  .lang-menu {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+
+    &-item {
+      width: 100%;
+      padding: 5px 10px;
+      cursor: pointer;
+      color: #4E5969;
+
+      &_active {
+        color: #2F54EB;
+        background-color: #f0f5ff;
+      }
+
+      &:hover {
+        color: #2F54EB;
+      }
+    }
+  }
+
+  .user-info-wrap {
+    .avatar {
+      transition: all 0.2s;
+      border: solid 1px transparent;
+    }
+
+    &:hover {
+      .avatar {
+        border-color: #2F54EB;
+      }
+    }
+  }
+}
 </style>

cmdb-ui/src/core/use.js

@@ -69,6 +69,8 @@ Vue.prototype.$httpError = function (err, describe) {
 
 window.$message = Vue.prototype.$message
 
+Vue.prototype.isOpenSource = process.env.VUE_APP_IS_OPEN_SOURCE === 'true'
+
 Vue.use(Antd)
 Vue.use(Viser)
 

cmdb-ui/src/lang/en.js

@@ -10,6 +10,7 @@ export default {
         resourceType: 'Resource Types',
         trigger: 'Triggers',
     },
+    settings: 'Common Settings',
     screen: 'Big Screen',
     dashboard: 'Dashboard',
     admin: 'Admin',

cmdb-ui/src/lang/zh.js

@@ -10,6 +10,7 @@ export default {
         resourceType: '资源类型',
         trigger: '触发器',
     },
+    settings: '通用设置',
     screen: '大屏',
     dashboard: '仪表盘',
     admin: '管理员',

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

@@ -122,6 +122,31 @@ export function deleteCITypeGroupById(groupId, data) {
   })
 }
 
+/**
+ * 获取级联属性配置
+ * @param {*} typeId
+ * @returns
+ */
+export function getCITypeCascadeAttributes(typeId) {
+  return axios({
+    url: `/v0.1/cascade_attributes/ci_types/${typeId}`,
+    method: 'get'
+  })
+}
+
+/**
+ * 获取级联属性数据
+ * @param {*} typeId
+ * @returns
+ */
+export function postCITypeCascadeAttributesValues(attrId, data) {
+  return axios({
+    url: `/v0.1/cascade_attributes/${attrId}/values`,
+    method: 'post',
+    data
+  })
+}
+
 export function getUniqueConstraintList(type_id) {
   return axios({
     url: `/v0.1/ci_types/${type_id}/unique_constraint`,

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

@@ -62,6 +62,22 @@ export function getHttpAttrMapping(name, resource) {
   })
 }
 
+export function getHTTPAccounts(params) {
+  return axios({
+      url: `/v0.1/adr/accounts`,
+      method: 'GET',
+      params
+  })
+}
+
+export function postHTTPAccounts(data) {
+  return axios({
+      url: `/v0.1/adr/accounts`,
+      method: 'POST',
+      data
+  })
+}
+
 export function getCITypeDiscovery(type_id) {
     return axios({
         url: `/v0.1/adt/ci_types/${type_id}`,

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

@@ -11,7 +11,8 @@ export function getCIHistoryTable(params) {
   return axios({
     url: `/v0.1/history/records/attribute`,
     method: 'GET',
-    params: params
+    params: params,
+    timeout: 30 * 1000
   })
 }
 
@@ -19,7 +20,8 @@ export function getRelationTable(params) {
   return axios({
     url: `/v0.1/history/records/relation`,
     method: 'GET',
-    params: params
+    params: params,
+    timeout: 30 * 1000
   })
 }
 
@@ -27,7 +29,8 @@ export function getCITypesTable(params) {
   return axios({
     url: `/v0.1/history/ci_types`,
     method: 'GET',
-    params: params
+    params: params,
+    timeout: 30 * 1000
   })
 }
 

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

@@ -21,15 +21,15 @@
               >
                 *
               </span>
-              <vxe-select
+              <a-select
-                filterable
-                clearable
                 v-model="row.attr"
-                type="text"
-                :options="ciTypeAttributes"
-                transfer
                 :placeholder="$t('cmdb.ciType.attrMapTableAttrPlaceholder')"
-              ></vxe-select>
+                showSearch
+                allowClear
+                :options="ciTypeAttributes"
+                style="width: 100%; height: 28px; line-height: 28px;"
+                class="attr-map-table-left-select"
+              ></a-select>
             </div>
           </template>
         </vxe-column>
@@ -49,7 +49,7 @@
       >
         <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')">
+        <vxe-column v-if="ruleType !== DISCOVERY_CATEGORY_TYPE.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>
@@ -72,6 +72,8 @@
 </template>
 
 <script>
+import { DISCOVERY_CATEGORY_TYPE } from '@/modules/cmdb/views/discovery/constants.js'
+
 export default {
   name: 'AttrMapTable',
   props: {
@@ -93,7 +95,9 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+      DISCOVERY_CATEGORY_TYPE
+    }
   },
   methods: {
     getTableData() {
@@ -123,6 +127,18 @@ export default {
 
   &-left {
     width: 30%;
+
+    &-select {
+      /deep/ .ant-select-selection {
+        height: 28px;
+        line-height: 28px;
+
+        .ant-select-selection__rendered {
+          height: 28px;
+          line-height: 28px;
+        }
+      }
+    }
   }
 
   &-right {

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

@@ -0,0 +1,85 @@
+<template>
+  <div
+    v-if="icon || title"
+    class="ci-icon"
+    :style="{
+      '--size': size + 'px'
+    }"
+  >
+    <template v-if="icon">
+      <img
+        v-if="icon.split('$$')[2]"
+        :src="`/api/common-setting/v1/file/${icon.split('$$')[3]}`"
+      />
+      <ops-icon
+        v-else
+        :style="{
+          color: icon.split('$$')[1],
+        }"
+        :type="icon.split('$$')[0]"
+      />
+    </template>
+    <span
+      class="ci-icon-letter"
+      v-else
+    >
+      <span>
+        {{ title[0].toUpperCase() }}
+      </span>
+    </span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'CIIcon',
+  props: {
+    icon: {
+      type: String,
+      default: ''
+    },
+    // 如果没有icon, 默认以title 的第一个字符
+    title: {
+      type: String,
+      default: ''
+    },
+    size: {
+      type: [String, Number],
+      default: '12'
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.ci-icon {
+  font-size: var(--size);
+  width: var(--size);
+  height: var(--size);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  & > img {
+    width: var(--size);
+    height: var(--size);
+  }
+
+  &-letter {
+    background-color: #FFFFFF;
+    color: #2f54eb;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 2px;
+    box-shadow: 0px 1px 2px rgba(47, 84, 235, 0.2);
+
+    & > span {
+      transform-origin: center;
+      transform: scale(0.7);
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,578 @@
+<template>
+  <div class="ci-table-wrap">
+    <ops-table
+      :id="id"
+      border
+      keep-source
+      show-overflow
+      resizable
+      ref="xTable"
+      size="small"
+      :data="data"
+      :loading="loading"
+      :row-config="{ useKey: true, keyField: '_id' }"
+      show-header-overflow
+      highlight-hover-row
+      :checkbox-config="{ reserve: true, highlight: true, range: true }"
+      :edit-config="{ trigger: 'dblclick', mode: 'row', showIcon: false }"
+      :sort-config="{ remote: true, trigger: 'cell' }"
+      :row-key="true"
+      :column-key="true"
+      :cell-style="getCellStyle"
+      :scroll-y="{ enabled: true, gt: 20 }"
+      :scroll-x="{ enabled: true, gt: 20 }"
+      class="ops-unstripe-table checkbox-hover-table"
+      :custom-config="{ storage: true }"
+      @checkbox-change="onSelectChange"
+      @checkbox-all="onSelectChange"
+      @checkbox-range-end="onSelectRangeEnd"
+      v-bind="$attrs"
+      v-on="$listeners"
+    >
+      <vxe-column
+        align="center"
+        type="checkbox"
+        width="60"
+        :fixed="isCheckboxFixed ? 'left' : ''"
+        v-if="showCheckbox"
+      >
+        <template #default="{row}">
+          {{ getRowSeq(row) }}
+        </template>
+      </vxe-column>
+      <vxe-table-column
+        v-for="(col, index) in columns"
+        :key="`${col.field}_${index}`"
+        :title="col.title"
+        :field="col.field"
+        :width="col.width"
+        :sortable="col.sortable"
+        :edit-render="getColumnsEditRender(col)"
+        :cell-type="col.value_type === '2' ? 'string' : 'auto'"
+        :fixed="col.is_fixed ? 'left' : ''"
+      >
+        <template #header>
+          <span class="vxe-handle">
+            <OpsMoveIcon class="header-move-icon" />
+            <span>{{ col.title }}</span>
+          </span>
+        </template>
+        <template v-if="col.is_choice || col.is_password || col.is_bool || col.is_reference" #edit="{ row }">
+          <CIReferenceAttr
+            v-if="col.is_reference"
+            :referenceTypeId="col.reference_type_id"
+            :isList="col.is_list"
+            :referenceShowAttrName="referenceShowAttrNameMap[col.reference_type_id] || ''"
+            :initSelectOption="getInitReferenceSelectOption(row[col.field], col)"
+            v-model="row[col.field]"
+          />
+          <a-switch
+            v-else-if="col.is_bool"
+            v-model="row[col.field]"
+          />
+          <vxe-input v-else-if="col.is_password" v-model="passwordValue[col.field]" />
+          <a-select
+            v-if="col.is_choice"
+            v-model="row[col.field]"
+            :getPopupContainer="(trigger) => trigger.parentElement"
+            :style="{ width: '100%', height: '32px' }"
+            :placeholder="$t('placeholder2')"
+            :showArrow="false"
+            :mode="col.is_list ? 'multiple' : 'default'"
+            class="ci-table-edit-select"
+            allowClear
+            showSearch
+          >
+            <a-select-option
+              v-for="(choice, idx) in col.filters"
+              :value="choice[0]"
+              :key="'edit_' + col.field + idx"
+            >
+              <span
+                :style="{
+                  ...(choice[1] ? choice[1].style : {}),
+                  display: 'inline-flex',
+                  alignItems: 'center'
+                }"
+              >
+                <template v-if="choice[1] && choice[1].icon && choice[1].icon.name">
+                  <img
+                    v-if="choice[1].icon.id && choice[1].icon.url"
+                    :src="`/api/common-setting/v1/file/${choice[1].icon.url}`"
+                    :style="{ maxHeight: '13px', maxWidth: '13px', marginRight: '5px' }"
+                  />
+                  <ops-icon
+                    v-else
+                    :style="{ color: choice[1].icon.color, marginRight: '5px' }"
+                    :type="choice[1].icon.name"
+                  />
+                </template>
+                <a-tooltip placement="topLeft" :title="choice[1] ? choice[1].label || choice[0] : choice[0]">
+                  <span>{{ choice[1] ? choice[1].label || choice[0] : choice[0] }}</span>
+                </a-tooltip>
+              </span>
+            </a-select-option>
+          </a-select>
+        </template>
+        <template
+          v-if="col.value_type === '6' || col.is_link || col.is_password || col.is_choice || col.is_reference"
+          #default="{ row }"
+        >
+          <template v-if="col.is_reference" >
+            <a
+              v-for="(ciId) in (col.is_list ? row[col.field] : [row[col.field]])"
+              :key="ciId"
+              :href="`/cmdb/cidetail/${col.reference_type_id}/${ciId}`"
+              target="_blank"
+            >
+              {{ getReferenceAttrValue(ciId, col) }}
+            </a>
+          </template>
+          <span v-else-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"
+            >
+              {{ getChoiceValueLabel(col, item) || item }}
+            </a>
+          </template>
+          <PasswordField
+            v-else-if="col.is_password && row[col.field]"
+            :ci_id="row._id"
+            :attr_id="col.attr_id"
+          ></PasswordField>
+          <template v-else-if="col.is_choice">
+            <span
+              v-for="value in (col.is_list ? row[col.field] : [row[col.field]])"
+              :key="value"
+              :style="getChoiceValueStyle(col, value)"
+              class="column-default-choice"
+            >
+              <img
+                v-if="getChoiceValueIcon(col, value).id && getChoiceValueIcon(col, value).url"
+                :src="`/api/common-setting/v1/file/${getChoiceValueIcon(col, value).url}`"
+                :style="{ maxHeight: '13px', maxWidth: '13px', marginRight: '5px' }"
+              />
+              <ops-icon
+                v-else-if="getChoiceValueIcon(col, value).name"
+                :style="{ color: getChoiceValueIcon(col, value).color, marginRight: '5px' }"
+                :type="getChoiceValueIcon(col, value).name"
+              />
+              {{ getChoiceValueLabel(col, value) || value }}
+            </span>
+          </template>
+        </template>
+      </vxe-table-column>
+      <vxe-column align="left" field="operate" fixed="right" width="80">
+        <template #header>
+          <span>{{ $t('operation') }}</span>
+        </template>
+        <template #default="{ row }">
+          <a-space>
+            <a @click="openDetail(row.ci_id || row._id)">
+              <a-icon type="unordered-list" />
+            </a>
+            <a-tooltip :title="$t('cmdb.ci.viewRelation')">
+              <a @click="openDetail(row.ci_id || row._id, 'tab_2', '2')">
+                <a-icon type="retweet" />
+              </a>
+            </a-tooltip>
+            <a v-if="showDelete" @click="deleteCI(row)" :style="{ color: 'red' }">
+              <a-icon type="delete" />
+            </a>
+          </a-space>
+        </template>
+      </vxe-column>
+      <template #empty>
+        <div
+          v-if="loading"
+          class="ci-table-loading"
+        >
+          {{ loadingTip || $t('loading') }}
+        </div>
+        <div v-else>
+          <img :style="{ width: '200px' }" :src="require('@/assets/data_empty.png')" />
+          <div>{{ $t('noData') }}</div>
+        </div>
+      </template>
+      <template #loading>
+        <div class="ci-table-loading">{{ loadingTip || $t('loading') }}</div>
+      </template>
+    </ops-table>
+
+    <JsonEditor ref="jsonEditor" @jsonEditorOk="jsonEditorOk" />
+  </div>
+</template>
+
+<script>
+import _ from 'lodash'
+import { getCITypes } from '@/modules/cmdb/api/CIType'
+import { searchCI } from '@/modules/cmdb/api/ci'
+import JsonEditor from '../JsonEditor/jsonEditor.vue'
+import PasswordField from '../passwordField/index.vue'
+import { ops_move_icon as OpsMoveIcon } from '@/core/icons'
+import CIReferenceAttr from '@/components/ciReferenceAttr/index.vue'
+
+export default {
+  name: 'CITable',
+  components: {
+    JsonEditor,
+    PasswordField,
+    OpsMoveIcon,
+    CIReferenceAttr
+  },
+  props: {
+    // table ID
+    id: {
+      type: String,
+      default: ''
+    },
+    // table Loading
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+    // ci 属性列表
+    attrList: {
+      type: Array,
+      default: () => []
+    },
+    // table column
+    columns: {
+      type: Array,
+      default: () => []
+    },
+    passwordValue: {
+      type: Object,
+      default: () => {}
+    },
+    // 加载提示
+    loadingTip: {
+      type: String,
+      default: ''
+    },
+    // 是否展示复选框
+    showCheckbox: {
+      type: Boolean,
+      default: true
+    },
+    // 是否展示删除按钮
+    showDelete: {
+      type: Boolean,
+      default: true
+    },
+    // 表格数据
+    data: {
+      type: Array,
+      default: () => []
+    }
+  },
+
+  data() {
+    return {
+      referenceShowAttrNameMap: {},
+      referenceCIIdMap: {},
+    }
+  },
+
+  computed: {
+    isCheckboxFixed() {
+      const idx = this.columns.findIndex((item) => item.is_fixed)
+      return idx > -1
+    },
+    tableDataWatch() {
+      return {
+        data: this.data,
+        columns: this.columns
+      }
+    },
+    referenceCIIdWatch() {
+      const referenceTypeCol = this.columns?.filter((col) => col?.is_reference && col?.reference_type_id) || []
+      if (!this.data?.length || !referenceTypeCol?.length) {
+        return []
+      }
+
+      const ids = []
+      this.data.forEach((row) => {
+        referenceTypeCol.forEach((col) => {
+          if (row[col.field]) {
+            ids.push(...(Array.isArray(row[col.field]) ? row[col.field] : [row[col.field]]))
+          }
+        })
+      })
+
+      return _.uniq(ids)
+    }
+  },
+
+  watch: {
+    columns: {
+      immediate: true,
+      deep: true,
+      handler(newVal) {
+        this.handleReferenceShowAttrName(newVal)
+      }
+    },
+    referenceCIIdWatch: {
+      immediate: true,
+      deep: true,
+      handler() {
+        this.handleReferenceCIIdMap()
+      }
+    }
+  },
+
+  methods: {
+    getVxetableRef() {
+      return this?.$refs?.['xTable']?.getVxetableRef?.() || null
+    },
+
+    onSelectChange() {
+      const xTable = this.getVxetableRef()
+      const records = [...xTable.getCheckboxRecords(), ...xTable.getCheckboxReserveRecords()]
+      this.$emit('onSelectChange', records)
+    },
+
+    onSelectRangeEnd({ records }) {
+      this.$emit('onSelectChange', records)
+    },
+
+    getCellStyle({ row, rowIndex, $rowIndex, column, columnIndex, $columnIndex }) {
+      const { property } = column
+      const _find = this.attrList.find((attr) => attr.name === property)
+      if (
+        _find &&
+        _find.option &&
+        _find.option.fontOptions &&
+        row[`${property}`] !== undefined &&
+        row[`${property}`] !== null
+      ) {
+        return { ..._find.option.fontOptions }
+      }
+    },
+
+    getColumnsEditRender(col) {
+      const _editRender = {
+        ...col.editRender,
+      }
+
+      if (col.value_type === '6') {
+        _editRender.events = { focus: this.handleFocusJson }
+      }
+
+      return _editRender
+    },
+
+    handleFocusJson({ column, row }) {
+      this.$refs.jsonEditor.open(column, row)
+    },
+
+    jsonEditorOk(row, column, jsonData) {
+      this.data.forEach((item) => {
+        if (item._id === row._id) {
+          item[column.property] = JSON.stringify(jsonData)
+        }
+      })
+      this.getVxetableRef().refreshColumn()
+    },
+
+    getChoiceValueStyle(col, colValue) {
+      const _find = col.filters.find((item) => String(item[0]) === String(colValue))
+      if (_find) {
+        return _find[1]?.style || {}
+      }
+      return {}
+    },
+
+    getChoiceValueIcon(col, colValue) {
+      const _find = col.filters.find((item) => String(item[0]) === String(colValue))
+      if (_find) {
+        return _find[1]?.icon || {}
+      }
+      return {}
+    },
+
+    getChoiceValueLabel(col, colValue) {
+      const _find = col?.filters?.find((item) => String(item[0]) === String(colValue))
+      if (_find) {
+        return _find[1]?.label || ''
+      }
+      return ''
+    },
+
+    /**
+     * 开启当前 ci 详情弹窗
+     */
+    openDetail(id, activeTabKey, ciDetailRelationKey) {
+      this.$emit('openDetail', id, activeTabKey, ciDetailRelationKey)
+    },
+
+    deleteCI(row) {
+      this.$emit('deleteCI', row)
+    },
+
+    getRowSeq(row) {
+      return this.getVxetableRef().getRowSeq(row)
+    },
+
+    async handleReferenceShowAttrName(columns) {
+      const needRequiredCITypeIds = columns?.filter((col) => col?.is_reference && col?.reference_type_id).map((col) => col.reference_type_id) || []
+      if (!needRequiredCITypeIds.length) {
+        this.referenceShowAttrNameMap = {}
+        return
+      }
+
+      const res = await getCITypes({
+        type_ids: needRequiredCITypeIds.join(',')
+      })
+
+      const map = {}
+      res.ci_types.forEach((ciType) => {
+        map[ciType.id] = ciType?.show_name || ciType?.unique_name || ''
+      })
+
+      this.referenceShowAttrNameMap = map
+    },
+
+    async handleReferenceCIIdMap() {
+      const referenceTypeCol = this.columns.filter((col) => col?.is_reference && col?.reference_type_id) || []
+      if (!this.data?.length || !referenceTypeCol?.length) {
+        this.referenceCIIdMap = {}
+        return
+      }
+
+      const map = {}
+      this.data.forEach((row) => {
+        referenceTypeCol.forEach((col) => {
+          const ids = Array.isArray(row[col.field]) ? row[col.field] : row[col.field] ? [row[col.field]] : []
+          if (ids.length) {
+            if (!map?.[col.reference_type_id]) {
+              map[col.reference_type_id] = {}
+            }
+            ids.forEach((id) => {
+              map[col.reference_type_id][id] = {}
+            })
+          }
+        })
+      })
+
+      if (!Object.keys(map).length) {
+        this.referenceCIIdMap = {}
+        return
+      }
+
+      const allRes = await Promise.all(
+        Object.keys(map).map((key) => {
+          return searchCI({
+            q: `_type:${key},_id:(${Object.keys(map[key]).join(';')})`,
+            count: 9999
+          })
+        })
+      )
+
+      allRes.forEach((res) => {
+        res.result.forEach((item) => {
+          if (map?.[item._type]?.[item._id]) {
+            map[item._type][item._id] = item
+          }
+        })
+      })
+
+      this.referenceCIIdMap = map
+    },
+
+    getReferenceAttrValue(id, col) {
+      const ci = this?.referenceCIIdMap?.[col?.reference_type_id]?.[id]
+      if (!ci) {
+        return id
+      }
+
+      const attrName = this.referenceShowAttrNameMap?.[col.reference_type_id]
+      return ci?.[attrName] || id
+    },
+
+    getInitReferenceSelectOption(value, col) {
+      const ids = Array.isArray(value) ? value : value ? [value] : []
+      if (!ids.length) {
+        return []
+      }
+
+      const map = this?.referenceCIIdMap?.[col?.reference_type_id]
+      const attrName = this.referenceShowAttrNameMap?.[col?.reference_type_id]
+
+      const option = (Array.isArray(value) ? value : [value]).map((id) => {
+        return {
+          key: id,
+          title: map?.[id]?.[attrName] || id
+        }
+      })
+
+      return option
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.ci-table-wrap {
+  .ci-table-loading {
+    width: 100%;
+    line-height: 200px;
+  }
+
+  .header-move-icon {
+    width: 17px;
+    height: 17px;
+    display: none;
+    position: absolute;
+    left: -3px;
+    top: 12px;
+  }
+
+  .column-default-choice {
+    border-radius: 4px;
+    padding: 1px 5px;
+    margin: 2px;
+    vertical-align: bottom;
+    display: inline-flex;
+    align-items: center;
+  }
+}
+
+.checkbox-hover-table {
+  /deep/ .vxe-table--body-wrapper {
+    .vxe-checkbox--label {
+      display: inline;
+      padding-left: 0px !important;
+      color: #bfbfbf;
+    }
+
+    .vxe-icon-checkbox-unchecked {
+      display: none;
+    }
+
+    .vxe-icon-checkbox-checked ~ .vxe-checkbox--label {
+      display: none;
+    }
+
+    .vxe-cell--checkbox {
+      &:hover {
+        .vxe-icon-checkbox-unchecked {
+          display: inline;
+        }
+
+        .vxe-checkbox--label {
+          display: none;
+        }
+      }
+    }
+  }
+}
+</style>

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

@@ -53,6 +53,7 @@
             @setExpFromFilter="setExpFromFilter"
             :expression="expression"
           />
+          <div class="read-ci-tip">{{ $t('cmdb.ciType.ciGrantTip') }}</div>
         </a-form-model>
       </template>
     </CustomRadio>
@@ -209,4 +210,10 @@ export default {
 }
 </script>
 
-<style></style>
+<style lang="less" scoped>
+.read-ci-tip {
+  font-size: 12px;
+  line-height: 22px;
+  color: #a5a9bc;
+}
+</style>

cmdb-ui/src/modules/cmdb/components/conditionFilter/constants.js

@@ -0,0 +1,41 @@
+import i18n from '@/lang'
+
+export const ruleTypeList = () => {
+    return [
+        { value: 'and', label: i18n.t('cmdbFilterComp.and') },
+        { value: 'or', label: i18n.t('cmdbFilterComp.or') },
+        // { value: 'not', label: '非' },
+    ]
+}
+
+export const expList = () => {
+    return [
+        { value: 'is', label: i18n.t('cmdbFilterComp.is') },
+        { value: '~is', label: i18n.t('cmdbFilterComp.~is') },
+        { value: 'contain', label: i18n.t('cmdbFilterComp.contain') },
+        { value: '~contain', label: i18n.t('cmdbFilterComp.~contain') },
+        { value: 'start_with', label: i18n.t('cmdbFilterComp.start_with') },
+        { value: '~start_with', label: i18n.t('cmdbFilterComp.~start_with') },
+        { value: 'end_with', label: i18n.t('cmdbFilterComp.end_with') },
+        { value: '~end_with', label: i18n.t('cmdbFilterComp.~end_with') },
+        { value: '~value', label: i18n.t('cmdbFilterComp.~value') }, // 为空的定义有点绕
+        { value: 'value', label: i18n.t('cmdbFilterComp.value') },
+    ]
+}
+
+export const advancedExpList = () => {
+    return [
+        { value: 'in', label: i18n.t('cmdbFilterComp.in') },
+        { value: '~in', label: i18n.t('cmdbFilterComp.~in') },
+        { value: 'range', label: i18n.t('cmdbFilterComp.range') },
+        { value: '~range', label: i18n.t('cmdbFilterComp.~range') },
+        { value: 'compare', label: i18n.t('cmdbFilterComp.compare') },
+    ]
+}
+
+export const compareTypeList = [
+    { value: '1', label: '>' },
+    { value: '2', label: '>=' },
+    { value: '3', label: '<' },
+    { value: '4', label: '<=' },
+]

cmdb-ui/src/modules/cmdb/components/conditionFilter/expression.vue

@@ -0,0 +1,320 @@
+<template>
+  <div :style="{ lineHeight: rowHeight }">
+    <a-space :style="{ display: 'flex', marginBottom: '10px' }" v-for="(item, index) in ruleList" :key="item.id">
+      <div v-if="ruleList.length > 1" :style="{ width: '60px', height: rowHeight, position: 'relative' }">
+        <treeselect
+          v-if="index !== 0"
+          class="custom-treeselect"
+          :style="{ width: '60px', '--custom-height': rowHeight, position: 'absolute', top: '-24px' }"
+          v-model="item.type"
+          :multiple="false"
+          :clearable="false"
+          searchable
+          :options="ruleTypeList"
+          :normalizer="
+            (node) => {
+              return {
+                id: node.value,
+                label: node.label,
+                children: node.children,
+              }
+            }
+          "
+          :disabled="disabled"
+        >
+        </treeselect>
+      </div>
+      <treeselect
+        class="custom-treeselect"
+        :style="{ width: '120px', '--custom-height': rowHeight }"
+        v-model="item.property"
+        :multiple="false"
+        :clearable="false"
+        searchable
+        :options="canSearchPreferenceAttrList"
+        :normalizer="
+          (node) => {
+            return {
+              id: node.name,
+              label: node.alias || node.name,
+              children: node.children,
+            }
+          }
+        "
+        appendToBody
+        :zIndex="1050"
+        :disabled="disabled"
+      >
+        <div
+          v-if="node.id !== '$count'"
+          :title="node.label"
+          slot="option-label"
+          slot-scope="{ node }"
+          class="property-label"
+        >
+          <ValueTypeMapIcon :attr="node.raw" />
+          {{ node.label }}
+        </div>
+        <div
+          v-else
+          :title="node.label"
+          slot="option-label"
+          slot-scope="{ node }"
+          class="property-label"
+          :style="{ borderBottom: '1px solid #E4E7ED', marginBottom: '8px' }"
+        >
+          <ValueTypeMapIcon :attr="node.raw" />
+          {{ node.label }}
+        </div>
+        <div
+          class="property-label"
+          slot="value-label"
+          slot-scope="{ node }"
+        >
+          <ValueTypeMapIcon :attr="node.raw" /> {{ node.label }}
+        </div>
+      </treeselect>
+      <treeselect
+        class="custom-treeselect"
+        :style="{ width: '90px', '--custom-height': rowHeight }"
+        v-model="item.exp"
+        :multiple="false"
+        :clearable="false"
+        searchable
+        :options="getExpListByProperty(item.property)"
+        :normalizer="
+          (node) => {
+            return {
+              id: node.value,
+              label: node.label,
+              children: node.children,
+            }
+          }
+        "
+        appendToBody
+        @select="(value) => handleChangeExp(value, item, index)"
+        :zIndex="1050"
+        :disabled="disabled"
+      >
+      </treeselect>
+      <ValueControls
+        :rule="ruleList[index]"
+        :attrList="canSearchPreferenceAttrList"
+        :disabled="disabled"
+        :curModelAttrList="curModelAttrList"
+        :rowHeight="rowHeight"
+        @change="(value) => handleChangeValue(value, index)"
+      />
+      <template v-if="!disabled">
+        <a-tooltip :title="$t('copy')">
+          <a class="operation" @click="handleCopyRule(item)"><ops-icon type="veops-copy"/></a>
+        </a-tooltip>
+        <a-tooltip :title="$t('delete')">
+          <a class="operation" @click="handleDeleteRule(item)"><a-icon type="minus-circle"/></a>
+        </a-tooltip>
+        <a-tooltip :title="$t('cmdbFilterComp.addHere')">
+          <a class="operation" @click="handleAddRuleAt(item)"><a-icon type="plus-circle"/></a>
+        </a-tooltip>
+      </template>
+    </a-space>
+    <div class="table-filter-add" v-if="!disabled && ruleList.length === 0">
+      <a @click="handleAddRule">+ {{ $t('new') }}</a>
+    </div>
+  </div>
+</template>
+
+<script>
+import _ from 'lodash'
+import { v4 as uuidv4 } from 'uuid'
+import { ruleTypeList, expList, advancedExpList, compareTypeList } from './constants.js'
+import ValueTypeMapIcon from '@/components/CMDBValueTypeMapIcon'
+import ValueControls from './valueControls.vue'
+
+export default {
+  name: 'Expression',
+  components: {
+    ValueTypeMapIcon,
+    ValueControls
+  },
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  props: {
+    value: {
+      type: Array,
+      default: () => [],
+    },
+    canSearchPreferenceAttrList: {
+      type: Array,
+      required: true,
+      default: () => [],
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    curModelAttrList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      compareTypeList,
+      rowHeight: '36px',
+    }
+  },
+  computed: {
+    ruleList: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('change', val)
+        return val
+      },
+    },
+    ruleTypeList() {
+      return ruleTypeList()
+    },
+    expList() {
+      return expList()
+    },
+    advancedExpList() {
+      return advancedExpList()
+    }
+  },
+  methods: {
+    getExpListByProperty(property) {
+      if (property === '$count') {
+        return [
+          { value: 'is', label: this.$t('cmdbFilterComp.is') },
+          { value: '~is', label: this.$t('cmdbFilterComp.~is') },
+          { value: 'compare', label: this.$t('cmdbFilterComp.compare') }
+        ]
+      }
+      if (property) {
+        const _find = this.canSearchPreferenceAttrList.find((item) => item.name === property)
+        if (_find && ['0', '1', '3', '4', '5'].includes(_find.value_type)) {
+          return [
+            { value: 'is', label: this.$t('cmdbFilterComp.is') },
+            { value: '~is', label: this.$t('cmdbFilterComp.~is') },
+            { value: '~value', label: this.$t('cmdbFilterComp.~value') }, // 为空的定义有点绕
+            { value: 'value', label: this.$t('cmdbFilterComp.value') },
+            ...this.advancedExpList
+          ]
+        }
+      }
+      return [...this.expList, ...this.advancedExpList]
+    },
+    isChoiceByProperty(property) {
+      const _find = this.canSearchPreferenceAttrList.find((item) => item.name === property)
+      if (_find) {
+        return _find.is_choice
+      }
+      return false
+    },
+    handleAddRule() {
+      this.ruleList.push({
+        id: uuidv4(),
+        type: 'and',
+        property: this.canSearchPreferenceAttrList[0]?.name,
+        exp: 'is',
+        value: null,
+      })
+      this.$emit('change', this.ruleList)
+    },
+    handleCopyRule(item) {
+      this.ruleList.push({ ...item, id: uuidv4() })
+      this.$emit('change', this.ruleList)
+    },
+    handleDeleteRule(item) {
+      const idx = this.ruleList.findIndex((r) => r.id === item.id)
+      if (idx > -1) {
+        this.ruleList.splice(idx, 1)
+      }
+      this.$emit('change', this.ruleList)
+    },
+    handleAddRuleAt(item) {
+      const idx = this.ruleList.findIndex((r) => r.id === item.id)
+      if (idx > -1) {
+        this.ruleList.splice(idx + 1, 0, {
+          id: uuidv4(),
+          type: 'and',
+          property: this.canSearchPreferenceAttrList[0]?.name,
+          exp: 'is',
+          value: null,
+        })
+      }
+      this.$emit('change', this.ruleList)
+    },
+    getChoiceValueByProperty(property) {
+      const _find = this.canSearchPreferenceAttrList.find((item) => item.name === property)
+      if (_find) {
+        return _find.choice_value
+      }
+      return []
+    },
+    handleChangeExp({ value }, item, index) {
+      const _ruleList = _.cloneDeep(this.ruleList)
+      if (value === 'range') {
+        _ruleList[index] = {
+          ..._ruleList[index],
+          min: '',
+          max: '',
+          exp: value,
+        }
+      } else if (value === 'compare') {
+        _ruleList[index] = {
+          ..._ruleList[index],
+          compareType: '1',
+          exp: value,
+        }
+      } else {
+        _ruleList[index] = {
+          ..._ruleList[index],
+          exp: value,
+        }
+      }
+      this.ruleList = _ruleList
+      this.$emit('change', this.ruleList)
+    },
+
+    handleChangeValue(value, index) {
+      const _ruleList = _.cloneDeep(this.ruleList)
+      _ruleList[index] = value
+      this.$emit('change', _ruleList)
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.input-group {
+  display: flex;
+  align-items: center;
+  width: 150px;
+
+  &-range-icon {
+    margin: 0 8px;
+  }
+
+  input {
+    height: 36px;
+  }
+}
+
+.property-label {
+  width: 100%;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden
+}
+
+.attr-filter-tip {
+  color: #86909C;
+  font-size: 12px;
+  font-weight: 400;
+}
+</style>

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

@@ -0,0 +1,211 @@
+<template>
+  <div>
+    <Expression
+      v-model="ruleList"
+      :canSearchPreferenceAttrList="canSearchPreferenceAttrList.filter((attr) => !attr.is_password)"
+      :disabled="false"
+      :curModelAttrList="curModelAttrList"
+    />
+  </div>
+</template>
+
+<script>
+import { v4 as uuidv4 } from 'uuid'
+import { compareTypeList } from './constants.js'
+
+import Expression from './expression.vue'
+
+export default {
+  name: 'AttrFilter',
+  components: {
+    Expression
+  },
+  props: {
+    canSearchPreferenceAttrList: {
+      type: Array,
+      required: true,
+      default: () => [],
+    },
+    expression: {
+      type: String,
+      default: '',
+    },
+    regQ: {
+      type: String,
+      default: '(?<=q=).+(?=&)|(?<=q=).+$',
+    },
+    CITypeIds: {
+      type: Array,
+      default: () => [],
+    },
+    curModelAttrList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      compareTypeList,
+      visible: false,
+      ruleList: [],
+      filterExp: '',
+    }
+  },
+  methods: {
+    init(open, isInitOne = true) {
+      // isInitOne  初始化exp为空时，ruleList是否默认给一条
+      //   const regQ = /(?<=q=).+(?=&)|(?<=q=).+$/g
+      const exp = this.expression.match(new RegExp(this.regQ, 'g'))
+        ? this.expression.match(new RegExp(this.regQ, 'g'))[0]
+        : null
+      if (open && exp) {
+        const expArray = exp.split(',').map((item) => {
+          let has_not = ''
+          const key = item.split(':')[0]
+          const val = item
+            .split(':')
+            .slice(1)
+            .join(':')
+          let type, property, exp, value, min, max, compareType
+          if (key.includes('-')) {
+            type = 'or'
+            if (key.includes('~')) {
+              property = key.substring(2)
+              has_not = '~'
+            } else {
+              property = key.substring(1)
+            }
+          } else {
+            type = 'and'
+            if (key.includes('~')) {
+              property = key.substring(1)
+              has_not = '~'
+            } else {
+              property = key
+            }
+          }
+
+          const in_reg = /(?<=\().+(?=\))/g
+          const range_reg = /(?<=\[).+(?=\])/g
+          const compare_reg = /(?<=>=|<=|>(?!=)|<(?!=)).+/
+          if (val === '*') {
+            exp = has_not + 'value'
+            value = ''
+          } else if (in_reg.test(val)) {
+            exp = has_not + 'in'
+            value = val.match(in_reg)[0]
+          } else if (range_reg.test(val)) {
+            exp = has_not + 'range'
+            value = val.match(range_reg)[0]
+            min = value.split('_TO_')[0]
+            max = value.split('_TO_')[1]
+          } else if (compare_reg.test(val)) {
+            exp = has_not + 'compare'
+            value = val.match(compare_reg)[0]
+            const _compareType = val.substring(0, val.match(compare_reg)['index'])
+            const idx = compareTypeList.findIndex((item) => item.label === _compareType)
+            compareType = compareTypeList[idx].value
+          } else if (!val.includes('*')) {
+            exp = has_not + 'is'
+            value = val
+          } else {
+            const resList = [
+              ['contain', /(?<=\*).*(?=\*)/g],
+              ['end_with', /(?<=\*).+/g],
+              ['start_with', /.+(?=\*)/g],
+            ]
+            for (let i = 0; i < 3; i++) {
+              const reg = resList[i]
+              if (reg[1].test(val)) {
+                exp = has_not + reg[0]
+                value = val.match(reg[1])[0]
+                break
+              }
+            }
+          }
+          return {
+            id: uuidv4(),
+            type,
+            property,
+            exp,
+            value,
+            min,
+            max,
+            compareType,
+          }
+        })
+        this.ruleList = [...expArray]
+      } else if (open) {
+        const _canSearchPreferenceAttrList = this.canSearchPreferenceAttrList.filter((attr) => !attr.is_password)
+        this.ruleList = isInitOne
+          ? [
+              {
+                id: uuidv4(),
+                type: 'and',
+                property:
+                  _canSearchPreferenceAttrList && _canSearchPreferenceAttrList.length
+                    ? _canSearchPreferenceAttrList[0].name
+                    : undefined,
+                exp: 'is',
+                value: null,
+              },
+            ]
+          : []
+      }
+    },
+
+    handleSubmit() {
+      if (this.ruleList && this.ruleList.length) {
+        this.ruleList[0].type = 'and' // 增删后，以防万一第一个不是and
+        this.filterExp = ''
+        const expList = this.ruleList.filter((rule) => rule?.property).map((rule) => {
+          let singleRuleExp = ''
+          let _exp = rule.exp
+          if (rule.type === 'or') {
+            singleRuleExp += '-'
+          }
+          if (rule.exp.includes('~')) {
+            singleRuleExp += '~'
+            _exp = rule.exp.split('~')[1]
+          }
+          singleRuleExp += `${rule.property}:`
+          if (_exp === 'is') {
+            singleRuleExp += `${rule.value ?? ''}`
+          }
+          if (_exp === 'contain') {
+            singleRuleExp += `*${rule.value ?? ''}*`
+          }
+          if (_exp === 'start_with') {
+            singleRuleExp += `${rule.value ?? ''}*`
+          }
+          if (_exp === 'end_with') {
+            singleRuleExp += `*${rule.value ?? ''}`
+          }
+          if (_exp === 'value') {
+            singleRuleExp += `*`
+          }
+          if (_exp === 'in') {
+            singleRuleExp += `(${rule.value ?? ''})`
+          }
+          if (_exp === 'range') {
+            singleRuleExp += `[${rule.min}_TO_${rule.max}]`
+          }
+          if (_exp === 'compare') {
+            const idx = compareTypeList.findIndex((item) => item.value === rule.compareType)
+            singleRuleExp += `${compareTypeList[idx].label}${rule.value ?? ''}`
+          }
+          return singleRuleExp
+        })
+        this.filterExp = expList.join(',')
+        this.$emit('setExpFromFilter', this.filterExp)
+      } else {
+        this.$emit('setExpFromFilter', '')
+      }
+      this.visible = false
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+</style>

cmdb-ui/src/modules/cmdb/components/conditionFilter/valueControls.vue

@@ -0,0 +1,255 @@
+<template>
+  <div class="control-group">
+    <CIReferenceAttr
+      v-if="getAttr(rule.property).is_reference && (rule.exp === 'is' || rule.exp === '~is')"
+      class="select-filter"
+      :referenceTypeId="getAttr(rule.property).reference_type_id"
+      :value="rule.value"
+      :disabled="disabled"
+      @change="(value) => handleChange('value', value)"
+    />
+    <a-select
+      v-else-if="getAttr(rule.property).is_bool && (rule.exp === 'is' || rule.exp === '~is')"
+      class="select-filter"
+      :disabled="disabled"
+      :placeholder="$t('placeholder2')"
+      :value="rule.value"
+      @change="(value) => handleChange('value', value)"
+    >
+      <a-select-option key="1">
+        true
+      </a-select-option>
+      <a-select-option key="0">
+        false
+      </a-select-option>
+    </a-select>
+    <div
+      class="input-group"
+      v-else-if="isChoiceByProperty(rule.property) && (rule.exp === 'is' || rule.exp === '~is')"
+    >
+      <a-select
+        class="select-filter"
+        :style="{ width: '175px' }"
+        showSearch
+        :placeholder="$t('placeholder2')"
+        :disabled="disabled"
+        :value="rule.value"
+        @change="(value) => handleChange('value', value)"
+      >
+        <a-select-option
+          v-for="(node) in getChoiceValueByProperty(rule.property)"
+          :key="String(node[0])"
+          :title="node[1] ? node[1].label || node[0] : node[0]"
+        >
+          <a-tooltip placement="topLeft" :title="node[1] ? node[1].label || node[0] : node[0]" >
+            {{ node[1] ? node[1].label || node[0] : node[0] }}
+          </a-tooltip>
+        </a-select-option>
+      </a-select>
+      <!-- <treeselect
+        class="custom-treeselect"
+        :style="{ '--custom-height': rowHeight }"
+        :value="rule.value"
+        @input="(value) => handleChange('value', value)"
+        :multiple="false"
+        :clearable="false"
+        searchable
+        :options="getChoiceValueByProperty(rule.property)"
+        :placeholder="$t('placeholder2')"
+        :normalizer="
+          (node) => {
+            return {
+              id: node[0],
+              label: node[1] ? node[1].label || node[0] : node[0],
+              children: node.children,
+            }
+          }
+        "
+        :zIndex="1050"
+        :disabled="disabled"
+        appendToBody
+      >
+        <div
+          :title="node.label"
+          slot="option-label"
+          slot-scope="{ node }"
+          :style="{ width: '100%', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' }"
+        >
+          {{ node.label }}
+        </div>
+      </treeselect> -->
+    </div>
+    <div
+      compact
+      v-else-if="rule.exp === 'range' || rule.exp === '~range'"
+      class="input-group"
+    >
+      <a-input
+        class="ops-input"
+        :placeholder="$t('min')"
+        :disabled="disabled"
+        :value="rule.min"
+        @change="(e) => handleChange('min', e.target.value)"
+      />
+      <span class="input-group-range-icon">~</span>
+      <a-input
+        class="ops-input"
+        v-model="rule.max"
+        :placeholder="$t('max')"
+        :disabled="disabled"
+        :value="rule.max"
+        @change="(e) => handleChange('max', e.target.value)"
+      />
+    </div>
+    <div class="input-group" compact v-else-if="rule.exp === 'compare'">
+      <treeselect
+        class="custom-treeselect"
+        :style="{ width: '70px', '--custom-height': rowHeight, 'flex-shrink': 0 }"
+        :value="rule.compareType"
+        @input="(value) => handleChange('compareType', value)"
+        :multiple="false"
+        :clearable="false"
+        searchable
+        :options="compareTypeList"
+        :normalizer="
+          (node) => {
+            return {
+              id: node.value,
+              label: node.label,
+              children: node.children,
+            }
+          }
+        "
+        :zIndex="1050"
+        :disabled="disabled"
+        appendToBody
+      >
+      </treeselect>
+      <a-input :value="rule.value" @change="(e) => handleChange('value', e.target.value)" class="ops-input"/>
+    </div>
+    <div class="input-group" v-else-if="rule.exp !== 'value' && rule.exp !== '~value'">
+      <a-input
+        :value="rule.value"
+        @change="(e) => handleChange('value', e.target.value)"
+        :placeholder="rule.exp === 'in' || rule.exp === '~in' ? $t('cmdbFilterComp.split', { separator: ';' }) : ''"
+        class="ops-input"
+        :disabled="disabled"
+      ></a-input>
+    </div>
+    <div v-else :style="{ width: '136px' }"></div>
+  </div>
+</template>
+
+<script>
+import { compareTypeList } from './constants.js'
+import CIReferenceAttr from '@/components/ciReferenceAttr/index.vue'
+
+export default {
+  name: 'ValueControls',
+  components: {
+    CIReferenceAttr,
+  },
+  props: {
+    rule: {
+      type: Object,
+      default: () => {},
+    },
+    attrList: {
+      type: Array,
+      default: () => [],
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    // 当前模型属性
+    curModelAttrList: {
+      type: Array,
+      default: () => []
+    },
+    // 行高
+    rowHeight: {
+      type: String,
+      default: ''
+    },
+  },
+  data() {
+    return {
+      compareTypeList,
+    }
+  },
+  computed: {
+    choiceValue() {
+      const val = /\{\{([^}]+)\}\}/g.exec(this?.rule?.value || '')
+      return val ? val?.[1]?.trim() || '' : this?.value?.value
+    }
+  },
+  methods: {
+    isChoiceByProperty(property) {
+      const _find = this.attrList.find((item) => item.name === property)
+      if (_find) {
+        return _find.is_choice
+      }
+      return false
+    },
+    getChoiceValueByProperty(property) {
+      const _find = this.attrList.find((item) => item.name === property)
+      if (_find) {
+        return _find.choice_value
+      }
+      return []
+    },
+    handleChange(key, value) {
+      this.$emit('change', {
+        ...this.rule,
+        [key]: value
+      })
+    },
+    getAttr(property) {
+      return this.attrList.find((item) => item.name === property) || {}
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.control-group {
+  display: flex;
+}
+
+.input-group {
+  display: flex;
+  align-items: center;
+  width: 136px;
+
+  &-range-icon {
+    margin: 0 8px;
+  }
+
+  input {
+    height: 36px;
+  }
+}
+
+.select-filter {
+  height: 36px;
+  width: 136px;
+
+  /deep/ .ant-select-selection {
+    height: 36px;
+    background: #f7f8fa;
+    line-height: 36px;
+    border: none;
+
+    .ant-select-selection__rendered {
+      height: 36px;
+      line-height: 36px;
+    }
+  }
+
+  /deep/ .vue-treeselect__control {
+    background: #f7f8fa;
+    border: none;
+  }
+}
+</style>

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

@@ -29,7 +29,7 @@
                 class="category-side-children-item-corporate"
                 v-if="ruleType === 'private_cloud' || (ruleType === 'http' && (categoryIndex !== 0 || itemIndex !== 0))"
               >
-                企
+                {{ $t('cmdb.enterpriseVersionFlag') }}
               </span>
             </div>
           </div>
@@ -67,7 +67,7 @@
                 class="corporate-flag"
                 v-if="ruleType === 'private_cloud' || (ruleType === 'http' && (categoryIndex !== 0 || itemIndex !== 0))"
               >
-                <span class="corporate-flag-text">企</span>
+                <span class="corporate-flag-text">{{ $t('cmdb.enterpriseVersionFlag') }}</span>
               </div>
             </div>
           </div>

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

@@ -31,6 +31,7 @@
 <script>
 import _ from 'lodash'
 import { getHttpCategories, getHttpAttributes, getSnmpAttributes, getHttpAttrMapping } from '../../api/discovery'
+import { DISCOVERY_CATEGORY_TYPE } from '@/modules/cmdb/views/discovery/constants.js'
 import AttrMapTable from '@/modules/cmdb/components/attrMapTable/index.vue'
 import ADPreviewTable from './adPreviewTable.vue'
 import HttpADCategory from './httpADCategory.vue'
@@ -101,7 +102,7 @@ export default {
       }
     },
     isCloud() {
-      return ['http', 'private_cloud'].includes(this.ruleType)
+      return [DISCOVERY_CATEGORY_TYPE.HTTP, DISCOVERY_CATEGORY_TYPE.PRIVATE_CLOUD].includes(this.ruleType)
     }
   },
   watch: {
@@ -119,7 +120,7 @@ export default {
         this.currentCate = ''
         this.$nextTick(() => {
           const { ruleType, ruleName } = newVal
-          if (['snmp', 'components'].includes(ruleType) && ruleName) {
+          if ([DISCOVERY_CATEGORY_TYPE.SNMP, DISCOVERY_CATEGORY_TYPE.COMPONENT].includes(ruleType) && ruleName) {
             getSnmpAttributes(ruleType, ruleName).then((res) => {
               if (this.isEdit) {
                 this.formatTableData(res)

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

@@ -1,53 +1,27 @@
 <template>
   <div class="node-setting-wrap">
-    <a-row v-for="(node) in nodes" :key="node.id">
+    <ops-table
-      <a-col :span="6">
+      :data="nodes"
-        <a-form-item :label="$t('cmdb.ciType.nodeSettingIp')">
+      size="mini"
-          <a-input
+      show-header-overflow
-            allowClear
+      :row-config="{ height: 42 }"
-            v-decorator="[
+      border
-              `node_ip_${node.id}`,
+      :min-height="78"
-              {
+    >
-                rules: [
+      <vxe-column width="170" :title="$t('cmdb.ciType.nodeSettingIp')">
-                  { required: false, message: $t('cmdb.ciType.nodeSettingIpTip') },
+        <template #default="{ row }">
-                  {
+          <a-input v-model="row.ip"></a-input>
-                    pattern:
+        </template>
-                      '^(?:(?: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]?)$',
+      </vxe-column>
-                    message: $t('cmdb.ciType.nodeSettingIpTip1'),
+      <vxe-column width="170" :title="$t('cmdb.ciType.nodeSettingCommunity')">
-                    trigger: 'blur',
+        <template #default="{ row }">
-                  },
+          <a-input v-model="row.community"></a-input>
-                ],
+        </template>
-              },
+      </vxe-column>
-            ]"
+      <vxe-column width="170" :title="$t('cmdb.ciType.nodeSettingVersion')">
-            :placeholder="$t('cmdb.ciType.nodeSettingIpTip')"
+        <template #default="{ row }">
-          />
-        </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="[
+            v-model="row.version"
-              `node_version_${node.id}`,
-              {
-                rules: [{ required: false, message: $t('cmdb.ciType.nodeSettingVersionTip') }],
-              },
-            ]"
             :placeholder="$t('cmdb.ciType.nodeSettingVersionTip')"
             allowClear
             class="node-setting-select"
@@ -58,26 +32,25 @@
             <a-select-option value="2c">
               v2c
             </a-select-option>
-            <a-select-option value="3">
-              v3
-            </a-select-option>
           </a-select>
-        </a-form-item>
+        </template>
-      </a-col>
+      </vxe-column>
-      <a-col :span="3">
+      <vxe-column wdith="170">
-        <div class="action">
+        <template #default="{ row }">
-          <a @click="() => copyNode(node.id)">
+          <div class="action">
-            <a-icon type="copy" />
+            <a @click="() => copyNode(row.id)">
-          </a>
+              <a-icon type="copy" />
-          <a @click="() => removeNode(node.id, 1)">
+            </a>
-            <a-icon type="minus-circle" />
+            <a @click="() => removeNode(row.id, 1)">
-          </a>
+              <a-icon type="minus-circle" />
-          <a @click="addNode">
+            </a>
-            <a-icon type="plus-circle" />
+            <a @click="addNode">
-          </a>
+              <a-icon type="plus-circle" />
-        </div>
+            </a>
-      </a-col>
+          </div>
-    </a-row>
+        </template>
+      </vxe-column>
+    </ops-table>
   </div>
 </template>
 
@@ -110,17 +83,10 @@ export default {
       const newNode = {
         id: uuidv4(),
         ip: '',
-        community: '',
+        community: 'public',
         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) {
@@ -133,45 +99,20 @@ export default {
       }
     },
     copyNode(id) {
-      const newNode = {
+      const copyNode = this.nodes.find((item) => item.id === id)
-        id: uuidv4(),
+      if (copyNode) {
-        ip: this.form.getFieldValue(`node_ip_${id}`),
+        const newNode = {
-        community: this.form.getFieldValue(`node_community_${id}`),
+          ...copyNode,
-        version: this.form.getFieldValue(`node_version_${id}`),
+          id: uuidv4(),
-      }
-      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}`],
         }
-      })
+        this.nodes.push(newNode)
-    },
-    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()
+      const nodes = this.nodes.map((node) => {
-      return this.getInfoValuesFromForm(values)
+        return _.pick(node, ['ip', 'community', 'version'])
+      })
+      return nodes
     },
   },
 }
@@ -180,10 +121,9 @@ export default {
 <style lang="less" scoped>
 .node-setting-wrap {
   margin-left: 17px;
+  width: 600px;
 
   .ant-row {
-    // display: flex;
-
     /deep/ .ant-input-clear-icon {
       color: rgba(0,0,0,.25);
 

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

@@ -113,6 +113,11 @@ export default {
         this.editor.insertNode(node)
       }
     },
+    destroy() {
+      const editor = this.editor
+      if (editor == null) return
+      editor.destroy()
+    }
   },
 }
 </script>

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

@@ -65,9 +65,7 @@
               <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-button @click="reset">{{ $t('reset') }}</a-button>
-          </a-tooltip>
           <FilterComp
             ref="filterComp"
             :canSearchPreferenceAttrList="canSearchPreferenceAttrList"
@@ -310,6 +308,11 @@ export default {
   height: 32px;
   .search-form-bar-filter {
     .ops_display_wrapper(transparent);
+
+    &:hover {
+      color: @primary-color;
+    }
+
     .search-form-bar-filter-icon {
       color: @primary-color;
       font-size: 12px;

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

@@ -105,7 +105,7 @@ export default {
       return { method, url, parameters, body, headers, authorization }
     },
     setParams(params) {
-      const { method, url, parameters, body, headers, authorization = {} } = params ?? {}
+      const { method = 'GET', url = '', parameters = {}, body = '', headers = {}, authorization = {} } = params ?? {}
       this.method = method
       this.url = url
       this.$refs.Parameters.parameters =

cmdb-ui/src/modules/cmdb/lang/en.js

@@ -2,6 +2,8 @@ const cmdb_en = {
     relation: 'Relation',
     attribute: 'Attributes',
     configTable: 'Config Table',
+    enterpriseVersionFlag: 'Pro',
+    enterpriseVersionTip: 'Enterprise version only',
     menu: {
         views: 'Views',
         topologyView: 'Topology Views',
@@ -60,7 +62,7 @@ const cmdb_en = {
         desc: 'Reverse order',
         uniqueKey: 'Unique Identifies',
         uniqueKeySelect: 'Please select a unique identifier',
-        uniqueKeyTips: 'json/password/computed/choice can not be unique identifies',
+        uniqueKeyTips: 'json/password/computed/selectList can not be unique identifies',
         notfound: 'Can\'t find what you want?',
         cannotDeleteGroupTips: 'There is data under this group and cannot be deleted!',
         confirmDeleteGroup: 'Are you sure you want to delete group [{groupName}]?',
@@ -115,7 +117,7 @@ const cmdb_en = {
         advancedSettings: 'Advanced Settings',
         font: 'Font',
         color: 'Color',
-        choiceValue: 'Predefined value',
+        choiceValue: 'Select List',
         computedAttribute: 'Computed Attribute',
         computedAttributeTips: 'The value of this attribute is calculated through an expression constructed from other attributes of the CIType or by executing a piece of code. The reference method of the attribute is: {{ attribute name }}',
         addAttribute: 'New attribute',
@@ -128,6 +130,7 @@ const cmdb_en = {
         selectAttribute: 'Select Attribute',
         groupExisted: 'Group name already exists',
         attributeSortedTips: 'Attributes in other groups cannot be sorted. If you need to sort, please drag them to a custom group first!',
+        attributeSortedTips2: 'Non-inherited attributes cannot be inserted before inherited attributes!',
         buildinAttribute: 'built-in attributes',
         expr: 'Expression',
         code: 'Code',
@@ -139,7 +142,7 @@ const cmdb_en = {
         selectCIType: 'Please select a CMDB CIType',
         selectCITypeAttributes: 'Please select CIType attributes',
         selectAttributes: 'Please select attributes',
-        choiceScriptDemo: 'class ChoiceValue(object):\n    @staticmethod\n    def values():\n        """\n        Execution entry, returns predefined value\n        :return: Returns a list, the type of the value is the same as the type of the attribute\n        For example:\n        return ["online", "offline"]\n        """\n        return []',
+        choiceScriptDemo: 'class ChoiceValue(object):\n    @staticmethod\n    def values():\n        """\n        Execution entry, returns select list\n        :return: Returns a list, the type of the value is the same as the type of the attribute\n        For example:\n        return ["online", "offline"]\n        """\n        return []',
         valueExisted: 'The current value already exists!',
         addRelation: 'Add Relation',
         sourceCIType: 'Source CIType',
@@ -187,6 +190,14 @@ const cmdb_en = {
         confirmDeleteTrigger: 'Are you sure to delete this trigger?',
         int: 'Integer',
         float: 'Float',
+        longText: 'Long Text',
+        shortText: 'Short Text',
+        shortTextTip: 'Text length <= 128',
+        referenceModel: 'Reference Model',
+        referenceModelTip: 'Please select reference model',
+        referenceModelTip1: 'For quick view of referenced model instances',
+        bool: 'Bool',
+        reference: 'Reference',
         text: 'Text',
         datetime: 'DateTime',
         date: 'Date',
@@ -204,7 +215,7 @@ const cmdb_en = {
         otherGroupTips: 'Non sortable within the other group',
         filterTips: 'click to show {name}',
         attributeAssociation: 'Attribute Association',
-        attributeAssociationTip1: 'Automatically establish relationships through the attributes except password, json and multiple of two models',
+        attributeAssociationTip1: 'Automatically establish relationships through attribute values (except password, json, multi-value, long text, boolean, reference) of two models',
         attributeAssociationTip2: 'Double click to edit',
         attributeAssociationTip3: 'Two Attributes must be selected',
         attributeAssociationTip4: 'Please select a attribute from Source CIType',
@@ -236,7 +247,7 @@ const cmdb_en = {
         checkModalColumn4: 'Last checkup time',
         testModalTitle: 'Automated discovery testing',
         attrMapTableAttrPlaceholder: 'Please edit the name',
-        nodeSettingIp: 'IP Addresses',
+        nodeSettingIp: 'Network device IP address',
         nodeSettingIpTip: 'Please enter the ip address',
         nodeSettingIpTip1: 'ip address format error',
         nodeSettingCommunity: 'Community',
@@ -264,6 +275,50 @@ const cmdb_en = {
         resourceSearchTip3: 'Note 2: If you do not need to filter, please click the grey button to copy and paste directly to configure for all nodes',
         enable: 'Enable',
         enableTip: 'Confirm switching on?',
+        portScanConfig: 'Port Scan Config',
+        portScanLabel1: 'CIDR',
+        portScanLabel2: 'Port Range',
+        portScanLabel3: 'AgentID',
+        viewAllAttr: 'View All Prop',
+        attrGroup: 'Attr Group',
+        attrName: 'Attr Name',
+        attrAlias: 'Attr Alias',
+        attrCode: 'Attr Code',
+        computedAttrTip1: 'Reference attributes follow jinja2 syntax',
+        computedAttrTip2: `Multi-valued attributes (lists) are rendered with [ ] included by default, if you want to remove it, the reference method is: """{{ attr_name | join(',') }}""" where commas are separators`,
+        example: 'Example',
+        attrFilterTip: `The third column of values allows you to select attributes of this model to cascade attributes`,
+        rule: 'Rule',
+        cascadeAttr: 'Cascade',
+        cascadeAttrTip: 'Cascading attributes note the order',
+        enumValue: 'Value',
+        label: 'Label',
+        valueInputTip: 'Please input value',
+        enumValueTip2: 'Enumeration values cannot be repeated',
+        builtin: 'Built In',
+        department: 'Department',
+        user: 'User',
+        userGroup: 'User Group',
+        departmentTip: 'Scroll down to select all departments in the company structure for common settings',
+        userGroupSelectTip: 'Please select user group',
+        displayValue: 'Display Value',
+        displayValueSelectTip: 'Please select Display Value',
+        departmentCascadeDisplay: 'Cascade Display',
+        filterUsers: 'Filter Users',
+        enum: 'Enum',
+        ciGrantTip: `Filter conditions can be changed dynamically using {{}} referenced variables, currently user variables are supported, such as {{user.uid}},{{user.username}},{{user.email}},{{user.nickname}}`,
+        searchInputTip: 'Please search for resource keywords',
+        resourceSearch: 'Resource Search',
+        recentSearch: 'Recent Search',
+        myCollection: 'My Collection',
+        keyword: 'Keywords',
+        CIType: 'CIType',
+        filterPopoverLabel: 'Filter',
+        conditionFilter: 'Condition Filter',
+        advancedFilter: 'Advanced Filter',
+        saveCondition: 'Save Condition',
+        confirmClear: 'Confirm to clear?',
+        currentPage: 'Current Page'
     },
     components: {
         unselectAttributes: 'Unselected',
@@ -305,7 +360,7 @@ const cmdb_en = {
         pleaseSearch: 'Please search',
         conditionFilter: 'Conditional filtering',
         attributeDesc: 'Attribute Description',
-        ciSearchTips: '1. JSON/password/link attributes cannot be searched\n2. If the search content includes commas, they need to be escaped\n3. Only index attributes are searched, non-index attributes use conditional filtering',
+        ciSearchTips: '1. JSON/password/link/longText/reference attributes cannot be searched\n2. If the search content includes commas, they need to be escaped\n3. Only index attributes are searched, non-index attributes use conditional filtering',
         ciSearchTips2: 'For example: q=hostname:*0.0.0.0*',
         subCIType: 'Subscription CIType',
         already: 'already',
@@ -313,6 +368,7 @@ const cmdb_en = {
         sub: 'subscription',
         selectBelow: 'Please select below',
         subSuccess: 'Subscription successful',
+        subFailed: 'Subscription failed, please try again later',
         selectMethods: 'Please select a method',
         noAuthRequest: 'No certification requested yet',
         noParamRequest: 'No parameter certification yet',
@@ -348,7 +404,7 @@ const cmdb_en = {
         tips2: '1. Click to download the template, and users can customize the header of the template file, including model properties and model associations',
         // eslint-disable-next-line no-template-curly-in-string
         tips3: '2. The red color in the template file represents the model relationship, such as the $Product. Product Name (${Model Name}. {Attribute Name}) column, which establishes the relationship with the product.',
-        tips4: '3. In the download template Excel file, the predefined values of attributes will be set as dropdown options. Please note that due to the limitations of Excel itself, a single dropdown box is limited to a maximum of 255 characters. If it exceeds 255 characters, we will not set the dropdown options for this attribute',
+        tips4: `3. The download template excel file will have the property's drop-down list enumeration configured as a drop-down option. Please note that due to the limitations of Excel itself, a single dropdown box is limited to a maximum of 255 characters. If it exceeds 255 characters, we will not set the dropdown options for this attribute`,
         tips5: '4. When using Excel templates, please ensure that a single file does not exceed 5000 lines.',
     },
     preference: {
@@ -368,6 +424,8 @@ const cmdb_en = {
         yearsAgo: 'years ago',
         just: 'just now',
         searchPlaceholder: 'Please search CIType',
+        subCITable: 'Data',
+        subCITree: 'Tree',
     },
     custom_dashboard: {
         charts: 'Chart',
@@ -527,7 +585,7 @@ class AutoDiscovery(object):
         """
         Define attribute fields
         :return: Returns a list of attribute fields. The list items are (name, type, description). The name must be in English.
-        type: String Integer Float Date DateTime Time JSON
+        type: String Integer Float Date DateTime Time JSON Bool Reference
         For example:
         return [
             ("ci_type", "String", "CIType name"),
@@ -571,12 +629,19 @@ if __name__ == "__main__":
         discoveryCardResoureTip: 'Number of resource types automatically discovered',
         addPlugin: 'Add plugin',
         pluginSearchTip: 'Please search the rules',
-        innerFlag: 'Inner'
+        innerFlag: 'Inner',
+        defaultName: 'Default Name',
+        deleteTip: 'Cannot be deleted again.',
+        tabCustom: 'Custom',
+        tabConfig: 'Configured',
+        addConfig: 'Add Config',
+        configErrTip: 'Please select config'
     },
     ci: {
         attributeDesc: 'Attribute Description',
         selectRows: 'Select: {rows} items',
         addRelation: 'Add Relation',
+        viewRelation: 'View Relation',
         all: 'All',
         batchUpdate: 'Batch Update',
         batchUpdateConfirm: 'Are you sure you want to make batch updates?',
@@ -599,7 +664,7 @@ if __name__ == "__main__":
         tips4: 'At least one field must be selected',
         tips5: 'Search name | alias',
         tips6: 'Speed ​​up retrieval, full-text search possible, no need to use conditional filtering\n\n json/link/password currently does not support indexing \n\nText characters longer than 190 cannot be indexed',
-        tips7: 'The form of expression is a drop-down box, and the value must be in the predefined value',
+        tips7: 'Whether to configure a select list',
         tips8: 'Multiple values, such as intranet IP',
         tips9: 'For front-end only',
         tips10: 'Other attributes of the CIType are computed using expressions\n\nA code snippet computes the returned value.',
@@ -621,6 +686,7 @@ if __name__ == "__main__":
         rollbackingTips: 'Rollbacking',
         batchRollbacking: 'Deleting {total} items in total, {successNum} items successful, {errorNum} items failed',
         baselineTips: 'Changes at this point in time will also be rollbacked, Unique ID, password and dynamic attributes do not support',
+        cover: 'Cover',
     },
     serviceTree: {
         remove: 'Remove',

cmdb-ui/src/modules/cmdb/lang/zh.js

@@ -2,6 +2,8 @@ const cmdb_zh = {
     relation: '关系',
     attribute: '属性',
     configTable: '配置表格',
+    enterpriseVersionFlag: '企',
+    enterpriseVersionTip: '仅限企业版',
     menu: {
         views: '视图',
         topologyView: '拓扑视图',
@@ -60,7 +62,7 @@ const cmdb_zh = {
         desc: '倒序',
         uniqueKey: '唯一标识',
         uniqueKeySelect: '请选择唯一标识',
-        uniqueKeyTips: 'json、密码、计算属性、预定义值属性不能作为唯一标识',
+        uniqueKeyTips: 'json、密码、计算属性、下拉列表属性不能作为唯一标识',
         notfound: '找不到想要的?',
         cannotDeleteGroupTips: '该分组下有数据, 不能删除!',
         confirmDeleteGroup: '确定要删除分组 【{groupName}】 吗？',
@@ -115,7 +117,7 @@ const cmdb_zh = {
         advancedSettings: '高级设置',
         font: '字体',
         color: '颜色',
-        choiceValue: '预定义值',
+        choiceValue: '下拉列表',
         computedAttribute: '计算属性',
         computedAttributeTips: '该属性的值是通过模型的其它属性构建的表达式或者执行一段代码的方式计算而来，属性的引用方法为: {{ 属性名 }}',
         addAttribute: '新增属性',
@@ -128,6 +130,7 @@ const cmdb_zh = {
         selectAttribute: '添加属性',
         groupExisted: '分组名称已存在',
         attributeSortedTips: '其他分组中的属性不能进行排序，如需排序请先拖至自定义的分组！',
+        attributeSortedTips2: '非继承属性不能插入到继承属性前！',
         buildinAttribute: '内置字段',
         expr: '表达式',
         code: '代码',
@@ -139,7 +142,7 @@ const cmdb_zh = {
         selectCIType: '请选择CMDB模型',
         selectCITypeAttributes: '请选择模型属性',
         selectAttributes: '请选择属性',
-        choiceScriptDemo: 'class ChoiceValue(object):\n    @staticmethod\n    def values():\n        """\n        执行入口, 返回预定义值\n        :return: 返回一个列表, 值的类型同属性的类型\n        例如:\n        return ["在线", "下线"]\n        """\n        return []',
+        choiceScriptDemo: 'class ChoiceValue(object):\n    @staticmethod\n    def values():\n        """\n        执行入口, 返回下拉列表\n        :return: 返回一个列表, 值的类型同属性的类型\n        例如:\n        return ["在线", "下线"]\n        """\n        return []',
         valueExisted: '当前值已存在！',
         addRelation: '新增关系',
         sourceCIType: '源模型',
@@ -187,6 +190,14 @@ const cmdb_zh = {
         confirmDeleteTrigger: '确认删除该触发器吗?',
         int: '整数',
         float: '浮点数',
+        longText: '长文本',
+        shortText: '短文本',
+        shortTextTip: '文本长度 <= 128',
+        referenceModel: '引用模型',
+        referenceModelTip: '请选择引用模型',
+        referenceModelTip1: '用于快捷查看引用模型实例',
+        bool: '布尔',
+        reference: '引用',
         text: '文本',
         datetime: '日期时间',
         date: '日期',
@@ -204,7 +215,7 @@ const cmdb_zh = {
         otherGroupTips: '其他分组属性不可排序',
         filterTips: '点击可仅查看{name}属性',
         attributeAssociation: '属性关联',
-        attributeAssociationTip1: '通过2个模型的属性值(除密码、json、多值)来自动建立关系',
+        attributeAssociationTip1: '通过2个模型的属性值(除密码、json、多值、长文本、布尔、引用)来自动建立关系',
         attributeAssociationTip2: '双击可编辑',
         attributeAssociationTip3: '属性关联必须选择两个属性',
         attributeAssociationTip4: '请选择原模型属性',
@@ -236,7 +247,7 @@ const cmdb_zh = {
         checkModalColumn4: '最近检查时间',
         testModalTitle: '自动发现测试',
         attrMapTableAttrPlaceholder: '请编辑名称',
-        nodeSettingIp: 'ip地址',
+        nodeSettingIp: '网络设备IP地址',
         nodeSettingIpTip: '请输入 ip 地址',
         nodeSettingIpTip1: 'ip地址格式错误',
         nodeSettingCommunity: 'Community',
@@ -264,6 +275,50 @@ const cmdb_zh = {
         resourceSearchTip3: '注2：如不需要筛选，请直接点击灰色按钮进行复制粘贴，即可配置为所有节点',
         enable: '开启',
         enableTip: '确定切换开启状态吗',
+        portScanConfig: '端口扫描配置',
+        portScanLabel1: 'CIDR',
+        portScanLabel2: '端口范围',
+        portScanLabel3: 'AgentID',
+        viewAllAttr: '查看所有属性',
+        attrGroup: '属性分组',
+        attrName: '属性名称',
+        attrAlias: '属性别名',
+        attrCode: '属性代码',
+        computedAttrTip1: '引用属性遵循jinja2语法',
+        computedAttrTip2: `多值属性(列表)默认呈现包括[ ], 如果要去掉, 引用方法为: """{{ attr_name | join(',') }}"""  其中逗号为分隔符`,
+        example: '例如',
+        attrFilterTip: '第三列值可选择本模型的属性，来实现级联属性的功能',
+        rule: '规则',
+        cascadeAttr: '级联',
+        cascadeAttrTip: '级联属性注意顺序',
+        enumValue: '枚举值',
+        label: '标签',
+        valueInputTip: '请输入枚举值',
+        enumValueTip2: '枚举值不能重复',
+        builtin: '内置',
+        department: '部门',
+        user: '用户',
+        userGroup: '用户组',
+        departmentTip: '下拉选择为通用设置公司架构里的所有部门',
+        userGroupSelectTip: '请选择用户组',
+        displayValue: '展示值',
+        displayValueSelectTip: '请选择展示值',
+        departmentCascadeDisplay: '部门级联显示',
+        filterUsers: '筛选用户',
+        enum: '枚举',
+        ciGrantTip: `筛选条件可使用{{}}引用变量实现动态变化，目前支持用户变量，如{{user.uid}},{{user.username}},{{user.email}},{{user.nickname}}`,
+        searchInputTip: '请搜索资源关键字',
+        resourceSearch: '资源搜索',
+        recentSearch: '最近搜索',
+        myCollection: '我的收藏',
+        keyword: '关键字',
+        CIType: '模型',
+        filterPopoverLabel: '条件过滤',
+        conditionFilter: '条件过滤',
+        advancedFilter: '高级筛选',
+        saveCondition: '保存条件',
+        confirmClear: '确认清空?',
+        currentPage: '当前页'
     },
     components: {
         unselectAttributes: '未选属性',
@@ -305,7 +360,7 @@ const cmdb_zh = {
         pleaseSearch: '请查找',
         conditionFilter: '条件过滤',
         attributeDesc: '属性说明',
-        ciSearchTips: '1. json、密码、链接属性不能搜索\n2. 搜索内容包括逗号, 则需转义\n3. 只搜索索引属性, 非索引属性使用条件过滤',
+        ciSearchTips: '1. json、密码、链接、长文本、引用属性不能搜索\n2. 搜索内容包括逗号, 则需转义\n3. 只搜索索引属性, 非索引属性使用条件过滤',
         ciSearchTips2: '例: q=hostname:*0.0.0.0*',
         subCIType: '订阅模型',
         already: '已',
@@ -313,6 +368,7 @@ const cmdb_zh = {
         sub: '订阅',
         selectBelow: '请在下方进行选择',
         subSuccess: '订阅成功',
+        subFailed: '订阅失败，请稍后再试',
         selectMethods: '请选择方式',
         noAuthRequest: '暂无请求认证',
         noParamRequest: '暂无参数认证',
@@ -347,7 +403,7 @@ const cmdb_zh = {
         tips2: '1. 点击下载模板，用户可以自定义模板文件的表头，包括模型属性、模型关联',
         // eslint-disable-next-line no-template-curly-in-string
         tips3: '2. 模板文件中红色为模型关系，如$产品.产品名(${模型名}.{属性名})这一列就可建立和产品之间的关系',
-        tips4: '3. 下载模板excel文件中会将属性的预定义值置为下拉选项，请注意，受excel本身的限制，单个下拉框限制了最多255个字符，如果超过255个字符，我们不会设置该属性的下拉选项',
+        tips4: '3. 下载模板excel文件中会将属性的下拉列表枚举配置置为下拉选项，请注意，受excel本身的限制，单个下拉框限制了最多255个字符，如果超过255个字符，我们不会设置该属性的下拉选项',
         tips5: '4. 在使用excel模板时，请确保单个文件不超过5000行',
     },
     preference: {
@@ -367,6 +423,8 @@ const cmdb_zh = {
         yearsAgo: '年前',
         just: '刚刚',
         searchPlaceholder: '请搜索模型',
+        subCITable: '数据订阅',
+        subCITree: '层级订阅',
     },
     custom_dashboard: {
         charts: '图表',
@@ -526,7 +584,7 @@ class AutoDiscovery(object):
         """
         Define attribute fields
         :return: Returns a list of attribute fields. The list items are (name, type, description). The name must be in English.
-        type: String Integer Float Date DateTime Time JSON
+        type: String Integer Float Date DateTime Time JSON Bool Reference
         For example:
         return [
             ("ci_type", "String", "CIType name"),
@@ -570,12 +628,19 @@ if __name__ == "__main__":
         discoveryCardResoureTip: '自动发现的资源类型数',
         addPlugin: '新增插件',
         pluginSearchTip: '请搜索规则',
-        innerFlag: '内置'
+        innerFlag: '内置',
+        defaultName: '默认名称',
+        deleteTip: '不可再删除',
+        tabCustom: '自定义',
+        tabConfig: '已有配置',
+        addConfig: '添加配置',
+        configErrTip: '请选择配置'
     },
     ci: {
         attributeDesc: '查看属性配置',
         selectRows: '选取：{rows} 项',
         addRelation: '添加关系',
+        viewRelation: '查看关系',
         all: '全部',
         batchUpdate: '批量修改',
         batchUpdateConfirm: '确认要批量修改吗？',
@@ -598,7 +663,7 @@ if __name__ == "__main__":
         tips4: '必须至少选择一个字段',
         tips5: '搜索 名称 | 别名',
         tips6: '加快检索, 可以全文搜索, 无需使用条件过滤\n\n json、链接、密码目前不支持建索引 \n\n文本字符长度超过190不能建索引',
-        tips7: '表现形式是下拉框, 值必须在预定义值里',
+        tips7: '是否配置下拉列表',
         tips8: '多值, 比如内网IP',
         tips9: '仅针对前端',
         tips10: '模型的其他属性通过表达式的方式计算出来\n\n一个代码片段计算返回的值',
@@ -620,6 +685,7 @@ if __name__ == "__main__":
         rollbackingTips: '正在批量回滚中',
         batchRollbacking: '正在回滚，共{total}个，成功{successNum}个，失败{errorNum}个',
         baselineTips: '该时间点的变更也会被回滚, 唯一标识、密码属性、动态属性不支持回滚',
+        cover: '覆盖',
     },
     serviceTree: {
         remove: '移除',

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

@@ -54,7 +54,7 @@ const genCmdbRoutes = async () => {
         path: '/cmdb/resourcesearch',
         name: 'cmdb_resource_search',
         meta: { title: 'cmdb.menu.ciSearch', icon: 'ops-cmdb-search', selectedIcon: 'ops-cmdb-search', keepAlive: false },
-        component: () => import('../views/resource_search/index.vue')
+        component: () => import('../views/resource_search_2/index.vue')
       },
       {
         path: '/cmdb/adc',
@@ -102,7 +102,7 @@ const genCmdbRoutes = async () => {
         name: 'cmdb_ci_type',
         component: RouteView,
         redirect: '/cmdb/ci_type',
-        meta: { title: 'cmdb.menu.backendManage', icon: 'setting', permission: ['cmdb_admin', 'OneOPS_Application_Admin', 'admin'], },
+        meta: { title: 'cmdb.menu.backendManage', icon: 'veops-setting2', selectedIcon: 'veops-setting2', permission: ['cmdb_admin', 'OneOPS_Application_Admin', 'admin'], },
         children: [
           {
             path: '/cmdb/customdashboard',
@@ -117,11 +117,10 @@ const genCmdbRoutes = async () => {
             meta: { title: 'cmdb.menu.serviceTreeDefine', keepAlive: false, icon: 'ops-cmdb-preferencerelation', selectedIcon: 'ops-cmdb-preferencerelation-selected' }
           },
           {
-            path: '/cmdb/modelrelation',
+            path: '/cmdb/discovery',
-            name: 'model_relation',
+            name: 'discovery',
-            hideChildrenInMenu: true,
+            component: () => import('../views/discovery/index'),
-            component: () => import('../views/model_relation/index'),
+            meta: { title: 'cmdb.menu.ad', keepAlive: false, icon: 'ops-cmdb-adr', selectedIcon: 'ops-cmdb-adr-selected' }
-            meta: { title: 'cmdb.menu.citypeRelation', keepAlive: false, icon: 'ops-cmdb-modelrelation', selectedIcon: 'ops-cmdb-modelrelation-selected' }
           },
           {
             path: '/cmdb/operationhistory',
@@ -130,19 +129,20 @@ const genCmdbRoutes = async () => {
             component: () => import('../views/operation_history/index'),
             meta: { title: 'cmdb.menu.operationHistory', keepAlive: false, icon: 'ops-cmdb-operation', selectedIcon: 'ops-cmdb-operation-selected' }
           },
+          {
+            path: '/cmdb/modelrelation',
+            name: 'model_relation',
+            hideChildrenInMenu: true,
+            component: () => import('../views/model_relation/index'),
+            meta: { title: 'cmdb.menu.citypeRelation', keepAlive: false, icon: 'ops-cmdb-modelrelation', selectedIcon: 'ops-cmdb-modelrelation-selected' }
+          },
           {
             path: '/cmdb/relationtype',
             name: 'relation_type',
             hideChildrenInMenu: true,
             component: () => import('../views/relation_type/index'),
             meta: { title: 'cmdb.menu.relationType', keepAlive: false, icon: 'ops-cmdb-relationtype', selectedIcon: 'ops-cmdb-relationtype-selected' }
-          },
+          }
-          {
-            path: '/cmdb/discovery',
-            name: 'discovery',
-            component: () => import('../views/discovery/index'),
-            meta: { title: 'cmdb.menu.ad', keepAlive: false, icon: 'ops-cmdb-adr', selectedIcon: 'ops-cmdb-adr-selected' }
-          },
         ]
       }
     ]

cmdb-ui/src/modules/cmdb/utils/const.js

@@ -4,13 +4,16 @@ export const valueTypeMap = () => {
   return {
     '0': i18n.t('cmdb.ciType.int'),
     '1': i18n.t('cmdb.ciType.float'),
-    '2': i18n.t('cmdb.ciType.text'),
+    '2': i18n.t('cmdb.ciType.shortText'),
     '3': i18n.t('cmdb.ciType.datetime'),
     '4': i18n.t('cmdb.ciType.date'),
     '5': i18n.t('cmdb.ciType.time'),
     '6': 'JSON',
     '7': i18n.t('cmdb.ciType.password'),
-    '8': i18n.t('cmdb.ciType.link')
+    '8': i18n.t('cmdb.ciType.link'),
+    '9': i18n.t('cmdb.ciType.longText'),
+    '10': i18n.t('cmdb.ciType.bool'),
+    '11': i18n.t('cmdb.ciType.reference'),
   }
 }
 

cmdb-ui/src/modules/cmdb/utils/helper.js

@@ -91,12 +91,16 @@ export function getCITableColumns(data, attrList, width = 1600, height) {
             value_type: attr.value_type,
             sortable: !!attr.is_sortable,
             filters: attr.is_choice ? attr.choice_value : null,
+            choice_builtin: null,
             width: Math.min(Math.max(100, ...data.map(item => strLength(item[attr.name]))), 350),
             is_link: attr.is_link,
             is_password: attr.is_password,
             is_list: attr.is_list,
             is_choice: attr.is_choice,
             is_fixed: attr.is_fixed,
+            is_bool: attr.is_bool,
+            is_reference: attr.is_reference,
+            reference_type_id: attr.reference_type_id
         })
     }
 
@@ -137,6 +141,10 @@ export const getPropertyStyle = (attr) => {
 export const getPropertyIcon = (attr) => {
     switch (attr.value_type) {
         case '0':
+            if (attr.is_reference) {
+              return 'duose-quote'
+            }
+
             return 'duose-shishu'
         case '1':
             return 'duose-fudianshu'
@@ -147,6 +155,9 @@ export const getPropertyIcon = (attr) => {
             if (attr.is_link) {
                 return 'duose-link'
             }
+            if (attr.is_index === false) {
+              return 'duose-changwenben1'
+            }
             return 'duose-wenben'
         case '3':
             return 'duose-datetime'
@@ -157,12 +168,52 @@ export const getPropertyIcon = (attr) => {
         case '6':
             return 'duose-json'
         case '7':
+            if (attr.is_bool) {
+              return 'duose-boole'
+            }
             return 'duose-password'
         case '8':
             return 'duose-link'
+        case '9':
+            return 'duose-changwenben1'
+        case '10':
+            return 'duose-boole'
+        case '11':
+            return 'duose-quote'
+        default:
+            return ''
     }
 }
 
+export const getPropertyType = (attr) => {
+  if (attr.is_password) {
+    return '7'
+  }
+  if (attr.is_link) {
+    return '8'
+  }
+
+  switch (attr.value_type) {
+    case '0':
+      if (attr.is_reference) {
+        return '11'
+      }
+      return '0'
+    case '2':
+      if (!attr.is_index) {
+        return '9'
+      }
+      return '2'
+    case '7':
+      if (attr.is_bool) {
+        return '10'
+      }
+      return '7'
+    default:
+      return attr?.value_type ?? ''
+  }
+}
+
 export const getLastLayout = (data, x1 = 0, y1 = 0, w1 = 0) => {
     const _tempData = _.orderBy(data, ['y', 'x'], ['asc', 'asc'])
     if (!_tempData.length) {

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

@@ -74,202 +74,24 @@
           </div>
         </SearchForm>
         <CiDetailDrawer ref="detail" :typeId="typeId" />
-        <ops-table
+
-          :id="`cmdb-ci-${typeId}`"
+        <CITable
-          border
-          keep-source
-          show-overflow
-          resizable
           ref="xTable"
-          size="small"
+          :id="`cmdb-ci-${typeId}`"
-          :row-config="{ useKey: true, keyField: '_id' }"
+          :loading="loading"
-          :height="tableHeight"
+          :attrList="preferenceAttrList"
-          show-header-overflow
+          :columns="columns"
-          highlight-hover-row
+          :passwordValue="passwordValue"
           :data="instanceList"
-          @checkbox-change="onSelectChange"
+          :height="tableHeight"
-          @checkbox-all="onSelectChange"
+          @onSelectChange="onSelectChange"
-          @checkbox-range-end="onSelectRangeEnd"
-          :checkbox-config="{ reserve: true, highlight: true, range: true }"
           @edit-closed="handleEditClose"
           @edit-actived="handleEditActived"
-          :edit-config="{ trigger: 'dblclick', mode: 'row', showIcon: false }"
-          :sort-config="{ remote: true, trigger: 'cell' }"
           @sort-change="handleSortCol"
-          :row-key="true"
+          @openDetail="openDetail"
-          :column-key="true"
+          @deleteCI="deleteCI"
-          :cell-style="getCellStyle"
+        />
-          :scroll-y="{ enabled: true, gt: 20 }"
+
-          :scroll-x="{ enabled: true, gt: 0 }"
-          class="ops-unstripe-table checkbox-hover-table"
-          :custom-config="{ storage: true }"
-        >
-          <vxe-column align="center" type="checkbox" width="60" :fixed="isCheckboxFixed ? 'left' : ''">
-            <template #default="{row}">
-              {{ getRowSeq(row) }}
-            </template>
-          </vxe-column>
-          <vxe-table-column
-            v-for="(col, index) in columns"
-            :key="`${col.field}_${index}`"
-            :title="col.title"
-            :field="col.field"
-            :width="col.width"
-            :sortable="col.sortable"
-            :edit-render="getColumnsEditRender(col)"
-            :cell-type="col.value_type === '2' ? 'string' : 'auto'"
-            :fixed="col.is_fixed ? 'left' : ''"
-          >
-            <template #header>
-              <span class="vxe-handle">
-                <OpsMoveIcon
-                  style="width: 17px; height: 17px; display: none; position: absolute; left: -3px; top: 12px"
-                />
-                <span>{{ col.title }}</span>
-              </span>
-            </template>
-            <template v-if="col.is_choice || col.is_password" #edit="{ row }">
-              <vxe-input v-if="col.is_password" v-model="passwordValue[col.field]" />
-              <a-select
-                :getPopupContainer="(trigger) => trigger.parentElement"
-                :style="{ width: '100%', height: '32px' }"
-                v-model="row[col.field]"
-                :v-bind="$t('placeholder2')"
-                v-if="col.is_choice"
-                :showArrow="false"
-                :mode="col.is_list ? 'multiple' : 'default'"
-                class="ci-table-edit-select"
-                allowClear
-              >
-                <a-select-option
-                  :value="choice[0]"
-                  :key="'edit_' + col.field + idx"
-                  v-for="(choice, idx) in col.filters"
-                >
-                  <span
-                    :style="{ ...(choice[1] ? choice[1].style : {}), display: 'inline-flex', alignItems: 'center' }"
-                  >
-                    <template v-if="choice[1] && choice[1].icon && choice[1].icon.name">
-                      <img
-                        v-if="choice[1].icon.id && choice[1].icon.url"
-                        :src="`/api/common-setting/v1/file/${choice[1].icon.url}`"
-                        :style="{ maxHeight: '13px', maxWidth: '13px', marginRight: '5px' }"
-                      />
-                      <ops-icon
-                        v-else
-                        :style="{ color: choice[1].icon.color, marginRight: '5px' }"
-                        :type="choice[1].icon.name"
-                      />
-                    </template>
-                    {{ choice[0] }}
-                  </span>
-                </a-select-option>
-              </a-select>
-            </template>
-            <template
-              v-if="col.value_type === '6' || col.is_link || col.is_password || col.is_choice"
-              #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>
-              <PasswordField
-                v-else-if="col.is_password && row[col.field]"
-                :ci_id="row._id"
-                :attr_id="col.attr_id"
-              ></PasswordField>
-              <template v-else-if="col.is_choice">
-                <template v-if="col.is_list">
-                  <span
-                    v-for="value in row[col.field]"
-                    :key="value"
-                    :style="{
-                      borderRadius: '4px',
-                      padding: '1px 5px',
-                      margin: '2px',
-                      ...getChoiceValueStyle(col, value),
-                      display: 'inline-flex',
-                      alignItems: 'center',
-                    }"
-                  >
-                    <img
-                      v-if="getChoiceValueIcon(col, value).id && getChoiceValueIcon(col, value).url"
-                      :src="`/api/common-setting/v1/file/${getChoiceValueIcon(col, value).url}`"
-                      :style="{ maxHeight: '13px', maxWidth: '13px', marginRight: '5px' }"
-                    />
-                    <ops-icon
-                      v-else
-                      :style="{ color: getChoiceValueIcon(col, value).color, marginRight: '5px' }"
-                      :type="getChoiceValueIcon(col, value).name"
-                    />{{ value }}
-                  </span>
-                </template>
-                <span
-                  v-else
-                  :style="{
-                    borderRadius: '4px',
-                    padding: '1px 5px',
-                    margin: '2px 0',
-                    ...getChoiceValueStyle(col, row[col.field]),
-                    display: 'inline-flex',
-                    alignItems: 'center',
-                  }"
-                >
-                  <img
-                    v-if="getChoiceValueIcon(col, row[col.field]).id && getChoiceValueIcon(col, row[col.field]).url"
-                    :src="`/api/common-setting/v1/file/${getChoiceValueIcon(col, row[col.field]).url}`"
-                    :style="{ maxHeight: '13px', maxWidth: '13px', marginRight: '5px' }"
-                  />
-                  <ops-icon
-                    v-else
-                    :style="{ color: getChoiceValueIcon(col, row[col.field]).color, marginRight: '5px' }"
-                    :type="getChoiceValueIcon(col, row[col.field]).name"
-                  />
-                  {{ row[col.field] }}
-                </span>
-              </template>
-            </template>
-          </vxe-table-column>
-          <vxe-column align="left" field="operate" fixed="right" width="80">
-            <template #header>
-              <span>{{ $t('operation') }}</span>
-            </template>
-            <template #default="{ row }">
-              <a-space>
-                <a @click="$refs.detail.create(row.ci_id || row._id)">
-                  <a-icon type="unordered-list" />
-                </a>
-                <a-tooltip :title="$t('cmdb.ci.addRelation')">
-                  <a @click="$refs.detail.create(row.ci_id || row._id, 'tab_2', '2')">
-                    <a-icon type="retweet" />
-                  </a>
-                </a-tooltip>
-                <a @click="deleteCI(row)" :style="{ color: 'red' }">
-                  <a-icon type="delete" />
-                </a>
-              </a-space>
-            </template>
-          </vxe-column>
-          <template #empty>
-            <div v-if="loading" style="height: 200px; line-height: 200px">{{ $t('loading') }}</div>
-            <div v-else>
-              <img :style="{ width: '200px' }" :src="require('@/assets/data_empty.png')" />
-              <div>{{ $t('noData') }}</div>
-            </div>
-          </template>
-        </ops-table>
         <div :style="{ textAlign: 'right', marginTop: '4px' }">
           <a-pagination
             :showSizeChanger="true"
@@ -301,7 +123,6 @@
           </a-pagination>
         </div>
         <create-instance-form ref="create" @reload="reloadData" @submit="batchUpdate" />
-        <JsonEditor ref="jsonEditor" @jsonEditorOk="jsonEditorOk" />
         <BatchDownload ref="batchDownload" @batchDownload="batchDownload" />
         <ci-rollback-form ref="ciRollbackForm" @batchRollbackAsync="batchRollbackAsync($event)" :ciIds="selectedRowKeys" />
         <MetadataDrawer ref="metadataDrawer" />
@@ -321,7 +142,6 @@ import SearchForm from '../../components/searchForm/SearchForm.vue'
 import CreateInstanceForm from './modules/CreateInstanceForm'
 import CiDetailDrawer from './modules/ciDetailDrawer.vue'
 import EditAttrsPopover from './modules/editAttrsPopover'
-import JsonEditor from '../../components/JsonEditor/jsonEditor.vue'
 import { searchCI, updateCI, deleteCI } from '@/modules/cmdb/api/ci'
 import { getSubscribeAttributes, subscribeCIType, subscribeTreeView } from '@/modules/cmdb/api/preference'
 import { getCITypeAttributesById } from '@/modules/cmdb/api/CITypeAttr'
@@ -329,15 +149,14 @@ import { roleHasPermissionToGrant } from '@/modules/acl/api/permission'
 import { searchResourceType } from '@/modules/acl/api/resource'
 import { getCITableColumns } from '../../utils/helper'
 import { intersection } from '@/utils/functions/set'
-import PasswordField from '../../components/passwordField/index.vue'
 import BatchDownload from '../../components/batchDownload/batchDownload.vue'
 import PreferenceSearch from '../../components/preferenceSearch/preferenceSearch.vue'
 import MetadataDrawer from './modules/MetadataDrawer.vue'
 import CMDBGrant from '../../components/cmdbGrant'
-import { ops_move_icon as OpsMoveIcon } from '@/core/icons'
 import { getAttrPassword } from '../../api/CITypeAttr'
 import CiRollbackForm from './modules/ciRollbackForm.vue'
 import { CIBaselineRollback } from '../../api/history'
+import CITable from '@/modules/cmdb/components/ciTable/index.vue'
 
 export default {
   name: 'InstanceList',
@@ -345,24 +164,18 @@ export default {
     SearchForm,
     CreateInstanceForm,
     CiDetailDrawer,
-    JsonEditor,
-    PasswordField,
     EditAttrsPopover,
     BatchDownload,
     PreferenceSearch,
     MetadataDrawer,
     CMDBGrant,
-    OpsMoveIcon,
     CiRollbackForm,
+    CITable
   },
   computed: {
     windowHeight() {
       return this.$store.state.windowHeight
     },
-    isCheckboxFixed() {
-      const idx = this.columns.findIndex((item) => item.is_fixed)
-      return idx > -1
-    },
     tableHeight() {
       // if (this.selectedRowKeys && this.selectedRowKeys.length) {
       //   return this.windowHeight - 246
@@ -548,12 +361,7 @@ export default {
       const subscribed = await getSubscribeAttributes(this.typeId)
       this.preferenceAttrList = subscribed.attributes // All columns that have been subscribed
     },
-    onSelectChange() {
+    onSelectChange(records) {
-      const xTable = this.$refs.xTable.getVxetableRef()
-      const records = [...xTable.getCheckboxRecords(), ...xTable.getCheckboxReserveRecords()]
-      this.selectedRowKeys = records.map((i) => i.ci_id || i._id)
-    },
-    onSelectRangeEnd({ records }) {
       this.selectedRowKeys = records.map((i) => i.ci_id || i._id)
     },
     reloadData() {
@@ -609,7 +417,7 @@ export default {
 
     async openBatchDownload() {
       this.$refs.batchDownload.open({
-        preferenceAttrList: this.preferenceAttrList,
+        preferenceAttrList: this.preferenceAttrList.filter((attr) => !attr?.is_reference),
         ciTypeName: this.$route.meta.title || this.$route.meta.name,
       })
     },
@@ -657,13 +465,12 @@ export default {
       this.loadTip = this.$t('cmdb.ci.batchUpdateInProgress') + '...'
       const payload = {}
       Object.keys(values).forEach((key) => {
-        if (values[key] || values[key] === 0) {
-          payload[key] = values[key]
-        }
         // Field values support blanking
         // There are currently field values that do not support blanking and will be returned by the backend.
         if (values[key] === undefined || values[key] === null) {
           payload[key] = null
+        } else {
+          payload[key] = values[key]
         }
       })
       this.$refs.create.visible = false
@@ -817,28 +624,6 @@ export default {
       await this.loadPreferenceAttrList()
       await this.loadTableData()
     },
-    getColumnsEditRender(col) {
-      const _editRender = {
-        ...col.editRender,
-      }
-      if (col.value_type === '6') {
-        _editRender.events = { focus: this.handleFocusJson }
-      }
-      return _editRender
-    },
-    handleFocusJson({ column, row }) {
-      this.$refs.jsonEditor.open(column, row)
-    },
-    jsonEditorOk(row, column, jsonData) {
-      // The backend writes data at different speeds. You can modify the table data directly without pulling the interface.
-      // this.reloadData()
-      this.instanceList.forEach((item) => {
-        if (item._id === row._id) {
-          item[column.property] = JSON.stringify(jsonData)
-        }
-      })
-      this.$refs.xTable.getVxetableRef().refreshColumn()
-    },
     onShowSizeChange(current, pageSize) {
       this.pageSize = pageSize
       if (this.currentPage === 1) {
@@ -900,23 +685,6 @@ export default {
         )
       })
     },
-    // tableFilterChangeEvent({ column, property, values, datas, filterList, $event }) {
-    //   console.log(111)
-    // },
-    getChoiceValueStyle(col, colValue) {
-      const _find = col.filters.find((item) => String(item[0]) === String(colValue))
-      if (_find) {
-        return _find[1]?.style || {}
-      }
-      return {}
-    },
-    getChoiceValueIcon(col, colValue) {
-      const _find = col.filters.find((item) => String(item[0]) === String(colValue))
-      if (_find) {
-        return _find[1]?.icon || {}
-      }
-      return {}
-    },
     handleEditActived() {
       this.isEditActive = true
       const passwordCol = this.columns.filter((col) => col.is_password)
@@ -942,19 +710,6 @@ export default {
         this.lastEditCiId = row._id
       })
     },
-    getCellStyle({ row, rowIndex, $rowIndex, column, columnIndex, $columnIndex }) {
-      const { property } = column
-      const _find = this.preferenceAttrList.find((attr) => attr.name === property)
-      if (
-        _find &&
-        _find.option &&
-        _find.option.fontOptions &&
-        row[`${property}`] !== undefined &&
-        row[`${property}`] !== null
-      ) {
-        return { ..._find.option.fontOptions }
-      }
-    },
     getQAndSort() {
       const fuzzySearch = this.$refs['search'].fuzzySearch || ''
       const expression = this.$refs['search'].expression || ''
@@ -1052,8 +807,8 @@ export default {
         this.visible = false
       }
     },
-    getRowSeq(row) {
+    openDetail(id, activeTabKey, ciDetailRelationKey) {
-      return this.$refs.xTable.getVxetableRef().getRowSeq(row)
+      this.$refs.detail.create(id, activeTabKey, ciDetailRelationKey)
     }
   },
 }
@@ -1072,33 +827,4 @@ export default {
   overflow: auto;
   margin-bottom: -24px;
 }
-.checkbox-hover-table {
-  /deep/ .vxe-table--body-wrapper {
-    .vxe-checkbox--label {
-      display: inline;
-      padding-left: 0px !important;
-      color: #bfbfbf;
-    }
-
-    .vxe-icon-checkbox-unchecked {
-      display: none;
-    }
-
-    .vxe-icon-checkbox-checked ~ .vxe-checkbox--label {
-      display: none;
-    }
-
-    .vxe-cell--checkbox {
-      &:hover {
-        .vxe-icon-checkbox-unchecked {
-          display: inline;
-        }
-
-        .vxe-checkbox--label {
-          display: none;
-        }
-      }
-    }
-  }
-}
 </style>

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

@@ -19,8 +19,8 @@
           :ref="`createInstanceFormByGroup_${group.id}`"
           :key="group.id || group.name"
           :group="group"
-          @handleFocusInput="handleFocusInput"
           :attributeList="attributeList"
+          @handleFocusInput="handleFocusInput"
         />
       </template>
       <template v-if="parentsType && parentsType.length">
@@ -35,7 +35,7 @@
                   <a-select v-model="parentsForm[item.name].attr">
                     <a-select-option
                       :title="attr.alias || attr.name"
-                      v-for="attr in item.attributes"
+                      v-for="attr in filterAttributes(item.attributes)"
                       :key="attr.name"
                       :value="attr.name"
                     >
@@ -57,8 +57,8 @@
     <template v-if="action === 'update'">
       <a-form :form="form">
         <p>{{ $t('cmdb.ci.tips2') }}</p>
-        <a-row :gutter="24" v-for="list in batchUpdateLists" :key="list.name">
+        <a-row :gutter="8" v-for="list in batchUpdateLists" :key="list.name">
-          <a-col :span="11">
+          <a-col :span="6">
             <a-form-item>
               <el-select showSearch size="small" filterable v-model="list.name" :placeholder="$t('cmdb.ci.tips3')">
                 <el-option
@@ -72,13 +72,47 @@
               </el-select>
             </a-form-item>
           </a-col>
-          <a-col :span="11">
+          <a-col v-if="showListOperation(list.name)" :span="3">
             <a-form-item>
+              <el-select size="small" filterable v-model="list.operation" :placeholder="$t('placeholder2')">
+                <el-option
+                  v-for="(option) in listOperationOptions"
+                  :key="option.value"
+                  :value="option.value"
+                  :label="$t(option.label)"
+                >
+                </el-option>
+              </el-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="showListOperation(list.name) ? 10 : 13">
+            <a-form-item>
+              <CIReferenceAttr
+                v-if="getAttr(list.name).is_reference"
+                :referenceTypeId="getAttr(list.name).reference_type_id"
+                :isList="getAttr(list.name).is_list"
+                v-decorator="[
+                  list.name,
+                  {
+                    initialValue: getAttr(list.name).is_list ? [] : ''
+                  }
+                ]"
+              />
+              <a-switch
+                v-else-if="getAttr(list.name).is_bool"
+                v-decorator="[
+                  list.name,
+                  {
+                    valuePropName: 'checked',
+                    initialValue: false
+                  }
+                ]"
+              />
               <a-select
                 :style="{ width: '100%' }"
-                v-decorator="[list.name, { rules: [{ required: false }] }]"
+                v-decorator="[list.name, { rules: getDecoratorRules(list) }]"
                 :placeholder="$t('placeholder2')"
-                v-if="getFieldType(list.name).split('%%')[0] === 'select'"
+                v-else-if="getFieldType(list.name).split('%%')[0] === 'select'"
                 :mode="getFieldType(list.name).split('%%')[1] === 'multiple' ? 'multiple' : 'default'"
                 showSearch
                 allowClear
@@ -94,27 +128,29 @@
                       v-if="choice[1] && choice[1].icon && choice[1].icon.name"
                       :type="choice[1].icon.name"
                     />
-                    {{ choice[0] }}
+                    <a-tooltip placement="topLeft" :title="choice[1] ? choice[1].label || choice[0] : choice[0]" >
+                      {{ choice[1] ? choice[1].label || choice[0] : choice[0] }}
+                    </a-tooltip>
                   </span>
                 </a-select-option>
               </a-select>
               <a-input-number
-                v-decorator="[list.name, { rules: [{ required: false }] }]"
+                v-decorator="[list.name, { rules: getDecoratorRules(list) }]"
                 style="width: 100%"
-                v-if="getFieldType(list.name) === 'input_number'"
+                v-else-if="getFieldType(list.name) === 'input_number'"
               />
               <a-date-picker
-                v-decorator="[list.name, { rules: [{ required: false }] }]"
+                v-decorator="[list.name, { rules: getDecoratorRules(list) }]"
                 style="width: 100%"
                 :format="getFieldType(list.name) == '4' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss'"
                 :valueFormat="getFieldType(list.name) == '4' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss'"
-                v-if="getFieldType(list.name) === '4' || getFieldType(list.name) === '3'"
+                v-else-if="getFieldType(list.name) === '4' || getFieldType(list.name) === '3'"
                 :showTime="getFieldType(list.name) === '4' ? false : { format: 'HH:mm:ss' }"
               />
               <a-input
-                v-if="getFieldType(list.name) === 'input'"
+                v-else-if="getFieldType(list.name) === 'input'"
                 @focus="(e) => handleFocusInput(e, list)"
-                v-decorator="[list.name, { rules: [{ required: false }] }]"
+                v-decorator="[list.name, { rules: getDecoratorRules(list) }]"
               />
             </a-form-item>
           </a-col>
@@ -143,6 +179,7 @@ import JsonEditor from '../../../components/JsonEditor/jsonEditor.vue'
 import { valueTypeMap } from '../../../utils/const'
 import CreateInstanceFormByGroup from './createInstanceFormByGroup.vue'
 import { getCITypeParent, getCanEditByParentIdChildId } from '@/modules/cmdb/api/CITypeRelation'
+import CIReferenceAttr from '@/components/ciReferenceAttr/index.vue'
 
 export default {
   name: 'CreateInstanceForm',
@@ -151,6 +188,7 @@ export default {
     ElOption: Option,
     JsonEditor,
     CreateInstanceFormByGroup,
+    CIReferenceAttr
   },
   props: {
     typeIdFromRelation: {
@@ -173,6 +211,20 @@ export default {
       parentsType: [],
       parentsForm: {},
       canEdit: {},
+      listOperationOptions: [
+        {
+          value: 'cover',
+          label: 'cmdb.ci.cover'
+        },
+        {
+          value: 'add',
+          label: 'add'
+        },
+        {
+          value: 'delete',
+          label: 'delete'
+        }
+      ]
     }
   },
   computed: {
@@ -228,12 +280,17 @@ export default {
     createInstance() {
       const _this = this
       if (_this.action === 'update') {
-        this.form.validateFields((err, values) => {
+        this.form.validateFields({ force: true }, (err, values) => {
           if (err) {
             return
           }
           Object.keys(values).forEach((k) => {
             const _tempFind = this.attributeList.find((item) => item.name === k)
+
+            if (_tempFind.is_reference) {
+              values[k] = values[k] ? values[k] : null
+            }
+
             if (
               _tempFind.value_type === '3' &&
               values[k] &&
@@ -251,6 +308,21 @@ export default {
             if (_tempFind.value_type === '6') {
               values[k] = values[k] ? JSON.parse(values[k]) : undefined
             }
+
+            if (_tempFind.is_list) {
+              const operation = this.batchUpdateLists?.find((item) => item.name === k)?.operation || 'cover'
+              switch (operation) {
+                case 'add':
+                case 'delete':
+                  values[k] = {
+                    op: operation,
+                    v: values[k]
+                  }
+                  break
+                default:
+                  break
+              }
+            }
           })
 
           _this.$emit('submit', values)
@@ -267,6 +339,11 @@ export default {
 
         Object.keys(values).forEach((k) => {
           const _tempFind = this.attributeList.find((item) => item.name === k)
+
+          if (_tempFind.is_reference) {
+            values[k] = values[k] ? values[k] : null
+          }
+
           if (
             _tempFind.value_type === '3' &&
             values[k] &&
@@ -340,7 +417,10 @@ export default {
       this.$nextTick(() => {
         this.form.resetFields()
         Promise.all([this.getCIType(), this.getAttributeList()]).then(() => {
-          this.batchUpdateLists = [{ name: this.attributeList[0].name }]
+          this.batchUpdateLists = [{
+            name: this.attributeList?.[0]?.name || undefined,
+            operation: 'cover'
+          }]
         })
         if (action === 'create') {
           getCITypeParent(this.typeId).then(async (res) => {
@@ -381,6 +461,9 @@ export default {
       }
       return 'input'
     },
+    getAttr(name) {
+      return this.attributeList.find((item) => item.name === name) ?? {}
+    },
     getSelectFieldOptions(name) {
       const _find = this.attributeList.find((item) => item.name === name)
       if (_find) {
@@ -389,7 +472,10 @@ export default {
       return []
     },
     handleAdd() {
-      this.batchUpdateLists.push({ name: undefined })
+      this.batchUpdateLists.push({
+        name: undefined,
+        operation: 'cover'
+      })
     },
     handleDelete(name) {
       const _idx = this.batchUpdateLists.findIndex((item) => item.name === name)
@@ -415,6 +501,36 @@ export default {
     jsonEditorOk(jsonData) {
       this.form.setFieldsValue({ [this.editAttr.name]: JSON.stringify(jsonData) })
     },
+
+    showListOperation(name) {
+      if (!name) {
+        return false
+      }
+      const attr = this.attributeList.find((attr) => attr.name === name)
+
+      return attr && attr.is_list
+    },
+
+    getDecoratorRules(data) {
+      const { name, operation } = data
+      const isList = this.showListOperation(name)
+      const rules = [
+        { required: false }
+      ]
+      if (isList && ['delete', 'add'].includes(operation)) {
+        rules[0] = {
+          required: true,
+          message: this.$t('placeholder1')
+        }
+      }
+
+      return rules
+    },
+    filterAttributes(attributes) {
+      return attributes.filter((attr) => {
+        return !attr.is_bool && !attr.is_reference
+      })
+    },
   },
 }
 </script>
@@ -425,7 +541,7 @@ export default {
   }
   .ant-drawer-body {
     overflow-y: auto;
-    max-height: calc(100vh - 110px);
+    height: calc(100vh - 110px);
   }
 }
 </style>

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

@@ -79,6 +79,8 @@
 import XEUtils from 'xe-utils'
 import { getCITypeAttributesByName } from '@/modules/cmdb/api/CITypeAttr'
 import { valueTypeMap } from '@/modules/cmdb/utils/const'
+import { getPropertyType } from '@/modules/cmdb/utils/helper'
+
 export default {
   name: 'MetadataDrawer',
   data() {
@@ -187,12 +189,7 @@ export default {
       this.loading = true
       const { attributes = [] } = await getCITypeAttributesByName(this.typeId)
       this.tableData = attributes.map((attr) => {
-        if (attr.is_password) {
+        attr.value_type = getPropertyType(attr)
-          attr.value_type = '7'
-        }
-        if (attr.is_link) {
-          attr.value_type = '8'
-        }
         return attr
       })
       this.loading = false

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

@@ -1,9 +1,19 @@
 <template>
   <span :id="`ci-detail-attr-${attr.name}`">
     <span v-if="!isEdit || attr.value_type === '6'">
+      <template v-if="attr.is_reference" >
+        <a
+          v-for="(ciId) in (attr.is_list ? ci[attr.name] : [ci[attr.name]])"
+          :key="ciId"
+          :href="`/cmdb/cidetail/${attr.reference_type_id}/${ciId}`"
+          target="_blank"
+        >
+          {{ attr.referenceShowAttrNameMap ? attr.referenceShowAttrNameMap[ciId] || ciId : ciId }}
+        </a>
+      </template>
       <PasswordField
         :style="{ display: 'inline-block' }"
-        v-if="attr.is_password && ci[attr.name]"
+        v-else-if="attr.is_password && ci[attr.name]"
         :ci_id="ci._id"
         :attr_id="attr.id"
       ></PasswordField>
@@ -32,7 +42,7 @@
               :style="{ color: getChoiceValueIcon(attr, value).color, marginRight: '5px' }"
               :type="getChoiceValueIcon(attr, value).name"
             />
-            {{ value }}</span
+            {{ getChoiceValueLabel(attr, value) || value }}</span
           >
         </template>
         <span
@@ -56,7 +66,7 @@
             :style="{ color: getChoiceValueIcon(attr, ci[attr.name]).color, marginRight: '5px' }"
             :type="getChoiceValueIcon(attr, ci[attr.name]).name"
           />
-          {{ ci[attr.name] }}
+          {{ getChoiceValueLabel(attr, ci[attr.name]) || ci[attr.name] }}
         </span>
       </template>
       <template v-else-if="attr.is_list">
@@ -67,6 +77,29 @@
     <template v-else>
       <a-form :form="form">
         <a-form-item label="" :colon="false">
+          <CIReferenceAttr
+            v-if="attr.is_reference"
+            :referenceTypeId="attr.reference_type_id"
+            :isList="attr.is_list"
+            :referenceShowAttrName="attr.showAttrName"
+            :initSelectOption="getInitReferenceSelectOption(attr)"
+            v-decorator="[
+              attr.name,
+              {
+                rules: [{ required: attr.is_required, message: $t('placeholder2') + `${attr.alias || attr.name}` }],
+              }
+            ]"
+          />
+          <a-switch
+            v-else-if="attr.is_bool"
+            v-decorator="[
+              attr.name,
+              {
+                rules: [{ required: attr.is_required }],
+                valuePropName: 'checked',
+              }
+            ]"
+          />
           <a-select
             :style="{ width: '100%' }"
             v-decorator="[
@@ -76,7 +109,7 @@
               },
             ]"
             :placeholder="$t('placeholder2')"
-            v-if="attr.is_choice"
+            v-else-if="attr.is_choice"
             :mode="attr.is_list ? 'multiple' : 'default'"
             showSearch
             allowClear
@@ -101,7 +134,7 @@
                     :type="choice[1].icon.name"
                   />
                 </template>
-                {{ choice[0] }}
+                {{ choice[1] ? choice[1].label || choice[0] : choice[0] }}
               </span>
             </a-select-option>
           </a-select>
@@ -157,10 +190,11 @@ import { updateCI } from '@/modules/cmdb/api/ci'
 import JsonEditor from '../../../components/JsonEditor/jsonEditor.vue'
 import PasswordField from '../../../components/passwordField/index.vue'
 import { getAttrPassword } from '../../../api/CITypeAttr'
+import CIReferenceAttr from '@/components/ciReferenceAttr/index.vue'
 
 export default {
   name: 'CiDetailAttrContent',
-  components: { JsonEditor, PasswordField },
+  components: { JsonEditor, PasswordField, CIReferenceAttr },
   props: {
     ci: {
       type: Object,
@@ -209,7 +243,7 @@ export default {
       }
       this.isEdit = true
       this.$nextTick(async () => {
-        if (this.attr.is_list && !this.attr.is_choice) {
+        if (this.attr.is_list && !this.attr.is_choice && !this.attr.is_reference) {
           this.form.setFieldsValue({
             [`${this.attr.name}`]: Array.isArray(this.ci[this.attr.name])
               ? this.ci[this.attr.name].join(',')
@@ -237,6 +271,10 @@ export default {
           .then(() => {
             this.$message.success(this.$t('updateSuccess'))
             this.$emit('updateCIByself', { [`${this.attr.name}`]: newData }, this.attr.name)
+
+            if (this.attr.is_reference) {
+              this.$emit('refreshReferenceAttr')
+            }
           })
           .catch(() => {
             this.$emit('refresh', this.attr.name)
@@ -280,9 +318,28 @@ export default {
       }
       return {}
     },
+
+    getChoiceValueLabel(col, colValue) {
+      const _find = col.choice_value.find((item) => String(item[0]) === String(colValue))
+      if (_find) {
+        return _find[1]?.label || ''
+      }
+      return ''
+    },
+
     getName(name) {
       return name ?? ''
     },
+
+    getInitReferenceSelectOption(attr) {
+      const option = Object.keys(attr?.referenceShowAttrNameMap || {}).map((key) => {
+        return {
+          key: Number(key),
+          title: attr?.referenceShowAttrNameMap?.[key] ?? ''
+        }
+      })
+      return option
+    }
   },
 }
 </script>

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

@@ -105,7 +105,7 @@ export default {
       default: true,
     },
     attrList: {
-      type: Array,
+      type: Function,
       default: () => [],
     }
   },

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

@@ -38,6 +38,16 @@
             resizable
             class="ops-stripe-table"
           >
+            <template #reference_default="{ row, column }">
+              <a
+                v-for="(id) in (column.params.attr.is_list ? row[column.field] : [row[column.field]])"
+                :key="id"
+                :href="`/cmdb/cidetail/${column.params.attr.reference_type_id}/${id}`"
+                target="_blank"
+              >
+                {{ id }}
+              </a>
+            </template>
             <template #operation_default="{ row }">
               <a-popconfirm
                 arrowPointAtCenter
@@ -85,6 +95,16 @@
             resizable
             class="ops-stripe-table"
           >
+            <template #reference_default="{ row, column }">
+              <a
+                v-for="(id) in (column.params.attr.is_list ? row[column.field] : [row[column.field]])"
+                :key="id"
+                :href="`/cmdb/cidetail/${column.params.attr.reference_type_id}/${id}`"
+                target="_blank"
+              >
+                {{ id }}
+              </a>
+            </template>
             <template #operation_default="{ row }">
               <a-popconfirm
                 arrowPointAtCenter
@@ -132,6 +152,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    initQueryLoading: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {
@@ -145,11 +169,260 @@ export default {
       firstCIJsonAttr: {},
       secondCIJsonAttr: {},
       canEdit: {},
+      topoData: {
+        nodes: {},
+        edges: []
+      }
     }
   },
   computed: {
-    topoData() {
+    exsited_ci() {
+      const _exsited_ci = [this.ciId]
+      this.parentCITypes.forEach((parent) => {
+        if (this.firstCIs[parent.name]) {
+          this.firstCIs[parent.name].forEach((parentCi) => {
+            _exsited_ci.push(parentCi._id)
+          })
+        }
+      })
+      this.childCITypes.forEach((child) => {
+        if (this.secondCIs[child.name]) {
+          this.secondCIs[child.name].forEach((childCi) => {
+            _exsited_ci.push(childCi._id)
+          })
+        }
+      })
+      return _exsited_ci
+    },
+  },
+  inject: {
+    attrList: { from: 'attrList' },
+    attributes: { from: 'attributes' },
+    ci_types: { from: 'ci_types' },
+    relationViewRefreshNumber: {
+      from: 'relationViewRefreshNumber',
+      default: () => null,
+    },
+  },
+  mounted() {
+    if (!this.initQueryLoading) {
+      this.init(true)
+    }
+  },
+  methods: {
+    async init(isFirst) {
+      await Promise.all([this.getParentCITypes(), this.getChildCITypes()])
+      Promise.all([this.getFirstCIs(), this.getSecondCIs()]).then(() => {
+        const ci_types_list = this.ci_types()
+        this.handleTopoData()
+        if (
+          isFirst &&
+          this.$refs.ciDetailRelationTopo &&
+          ci_types_list.length
+        ) {
+          this.$refs.ciDetailRelationTopo.exsited_ci = this.exsited_ci
+          this.$refs.ciDetailRelationTopo.setTopoData(this.topoData)
+        }
+      })
+    },
+    async getFirstCIs() {
+      await searchCIRelation(`root_id=${Number(this.ciId)}&level=1&reverse=1&count=10000`)
+        .then((res) => {
+          const firstCIs = {}
+          res.result.forEach((item) => {
+            this.firstCIJsonAttr[item._type].forEach((attr) => {
+              item[`${attr}`] = item[`${attr}`] ? JSON.stringify(item[`${attr}`]) : ''
+            })
+            this.formatCI(item, this.firstCIColumns)
+            if (item.ci_type in firstCIs) {
+              firstCIs[item.ci_type].push(item)
+            } else {
+              firstCIs[item.ci_type] = [item]
+            }
+          })
+          this.firstCIs = firstCIs
+        })
+        .catch((e) => {})
+    },
+    async getSecondCIs() {
+      await searchCIRelation(`root_id=${Number(this.ciId)}&level=1&reverse=0&count=10000`)
+        .then((res) => {
+          const secondCIs = {}
+          res.result.forEach((item) => {
+            this.secondCIJsonAttr[item._type].forEach((attr) => {
+              item[`${attr}`] = item[`${attr}`] ? JSON.stringify(item[`${attr}`]) : ''
+            })
+            this.formatCI(item, this.secondCIColumns)
+            if (item.ci_type in secondCIs) {
+              secondCIs[item.ci_type].push(item)
+            } else {
+              secondCIs[item.ci_type] = [item]
+            }
+          })
+          this.secondCIs = secondCIs
+        })
+        .catch((e) => {})
+    },
+
+    formatCI(ci, columns) {
+      Object.keys(ci).forEach((key) => {
+        const attr = columns?.[ci?._type]?.find((item) => item?.params?.attr?.name === key)?.params?.attr
+        if (attr?.is_choice && attr?.choice_value?.length) {
+          if (attr?.is_list) {
+            ci[key] = ci[key].map((value) => {
+              const label = attr?.choice_value?.find((choice) => choice?.[0] === value)?.[1]?.label
+              return label || ci[key]
+            })
+          } else {
+            const label = attr?.choice_value?.find((choice) => choice?.[0] === ci[key])?.[1]?.label
+            ci[key] = label || ci[key]
+          }
+        }
+      })
+
+      return ci
+    },
+
+    async getParentCITypes() {
+      const res = await getCITypeParent(this.typeId)
+      this.parentCITypes = res.parents
+      for (let i = 0; i < res.parents.length; i++) {
+        await getCanEditByParentIdChildId(res.parents[i].id, this.typeId).then((p_res) => {
+          this.canEdit = {
+            ..._.cloneDeep(this.canEdit),
+            [res.parents[i].id]: p_res.result,
+          }
+        })
+      }
+      const firstCIColumns = {}
+      const firstCIJsonAttr = {}
+      res.parents.forEach((item) => {
+        const columns = []
+        const jsonAttr = []
+        item.attributes.forEach((attr) => {
+          const column = {
+            key: 'p_' + attr.id,
+            field: attr.name,
+            title: attr.alias,
+            minWidth: '100px',
+            params: {
+              attr
+            },
+          }
+          if (attr.is_reference) {
+            column.slots = {
+              default: 'reference_default'
+            }
+          }
+          columns.push(column)
+
+          if (attr.value_type === '6') {
+            jsonAttr.push(attr.name)
+          }
+        })
+        firstCIJsonAttr[item.id] = jsonAttr
+        firstCIColumns[item.id] = columns
+        firstCIColumns[item.id].push({
+          key: 'p_operation',
+          field: 'operation',
+          title: this.$t('operation'),
+          width: '60px',
+          fixed: 'right',
+          slots: {
+            default: 'operation_default',
+          },
+          align: 'center',
+        })
+      })
+
+      this.firstCIColumns = firstCIColumns
+      this.firstCIJsonAttr = firstCIJsonAttr
+    },
+    async getChildCITypes() {
+      const res = await getCITypeChildren(this.typeId)
+
+      this.childCITypes = res.children
+      for (let i = 0; i < res.children.length; i++) {
+        await getCanEditByParentIdChildId(this.typeId, res.children[i].id).then((c_res) => {
+          this.canEdit = {
+            ..._.cloneDeep(this.canEdit),
+            [res.children[i].id]: c_res.result,
+          }
+        })
+      }
+      const secondCIColumns = {}
+      const secondCIJsonAttr = {}
+      res.children.forEach((item) => {
+        const columns = []
+        const jsonAttr = []
+        item.attributes.forEach((attr) => {
+          const column = {
+            key: 'c_' + attr.id,
+            field: attr.name,
+            title: attr.alias,
+            minWidth: '100px',
+            params: {
+              attr
+            },
+          }
+          if (attr.is_reference) {
+            column.slots = {
+              default: 'reference_default'
+            }
+          }
+          columns.push(column)
+
+          if (attr.value_type === '6') {
+            jsonAttr.push(attr.name)
+          }
+        })
+        secondCIJsonAttr[item.id] = jsonAttr
+        secondCIColumns[item.id] = columns
+        secondCIColumns[item.id].push({
+          key: 'c_operation',
+          field: 'operation',
+          title: this.$t('operation'),
+          width: '60px',
+          fixed: 'right',
+          slots: {
+            default: 'operation_default',
+          },
+          align: 'center',
+        })
+      })
+
+      this.secondCIColumns = secondCIColumns
+      this.secondCIJsonAttr = secondCIJsonAttr
+    },
+    reload() {
+      this.init()
+    },
+    deleteRelation(first_ci_id, second_ci_id) {
+      deleteCIRelationView(first_ci_id, second_ci_id).then((res) => {
+        this.init()
+        if (this.relationViewRefreshNumber) {
+          this.relationViewRefreshNumber()
+        }
+      })
+    },
+    handleChangeActiveKey(e) {
+      if (e.target.value === '1') {
+        this.$nextTick(() => {
+          this.$refs.ciDetailRelationTopo.exsited_ci = this.exsited_ci
+          this.$refs.ciDetailRelationTopo.setTopoData(this.topoData)
+        })
+      }
+    },
+    handleTopoData() {
       const ci_types_list = this.ci_types()
+      if (!ci_types_list?.length) {
+        this.$set(this, 'topoData', {
+          nodes: {},
+          edges: []
+        })
+        return
+      }
+
       const _findCiType = ci_types_list.find((item) => item.id === this.typeId)
       const unique_id = _findCiType.show_id || this.attributes().unique_id
       const unique_name = _findCiType.show_name || this.attributes().unique
@@ -266,185 +539,11 @@ export default {
           })
         }
       })
-      return { nodes, edges }
+      this.$set(this, 'topoData', {
-    },
+        nodes,
-    exsited_ci() {
+        edges
-      const _exsited_ci = [this.ciId]
-      this.parentCITypes.forEach((parent) => {
-        if (this.firstCIs[parent.name]) {
-          this.firstCIs[parent.name].forEach((parentCi) => {
-            _exsited_ci.push(parentCi._id)
-          })
-        }
       })
-      this.childCITypes.forEach((child) => {
+    }
-        if (this.secondCIs[child.name]) {
-          this.secondCIs[child.name].forEach((childCi) => {
-            _exsited_ci.push(childCi._id)
-          })
-        }
-      })
-      return _exsited_ci
-    },
-  },
-  inject: {
-    attrList: { from: 'attrList' },
-    attributes: { from: 'attributes' },
-    ci_types: { from: 'ci_types' },
-    relationViewRefreshNumber: {
-      from: 'relationViewRefreshNumber',
-      default: () => null,
-    },
-  },
-  mounted() {
-    this.init(true)
-  },
-  methods: {
-    async init(isFirst) {
-      await Promise.all([this.getParentCITypes(), this.getChildCITypes()])
-      Promise.all([this.getFirstCIs(), this.getSecondCIs()]).then(() => {
-        if (isFirst && this.$refs.ciDetailRelationTopo) {
-          this.$refs.ciDetailRelationTopo.exsited_ci = this.exsited_ci
-          this.$refs.ciDetailRelationTopo.setTopoData(this.topoData)
-        }
-      })
-    },
-    async getFirstCIs() {
-      await searchCIRelation(`root_id=${Number(this.ciId)}&&level=1&&reverse=1&&count=10000`)
-        .then((res) => {
-          const firstCIs = {}
-          res.result.forEach((item) => {
-            this.firstCIJsonAttr[item._type].forEach((attr) => {
-              item[`${attr}`] = item[`${attr}`] ? JSON.stringify(item[`${attr}`]) : ''
-            })
-            if (item.ci_type in firstCIs) {
-              firstCIs[item.ci_type].push(item)
-            } else {
-              firstCIs[item.ci_type] = [item]
-            }
-          })
-          this.firstCIs = firstCIs
-        })
-        .catch((e) => {})
-    },
-    async getSecondCIs() {
-      await searchCIRelation(`root_id=${Number(this.ciId)}&&level=1&&reverse=0&&count=10000`)
-        .then((res) => {
-          const secondCIs = {}
-          res.result.forEach((item) => {
-            this.secondCIJsonAttr[item._type].forEach((attr) => {
-              item[`${attr}`] = item[`${attr}`] ? JSON.stringify(item[`${attr}`]) : ''
-            })
-            if (item.ci_type in secondCIs) {
-              secondCIs[item.ci_type].push(item)
-            } else {
-              secondCIs[item.ci_type] = [item]
-            }
-          })
-          this.secondCIs = secondCIs
-        })
-        .catch((e) => {})
-    },
-    async getParentCITypes() {
-      const res = await getCITypeParent(this.typeId)
-      this.parentCITypes = res.parents
-      for (let i = 0; i < res.parents.length; i++) {
-        await getCanEditByParentIdChildId(res.parents[i].id, this.typeId).then((p_res) => {
-          this.canEdit = {
-            ..._.cloneDeep(this.canEdit),
-            [res.parents[i].id]: p_res.result,
-          }
-        })
-      }
-      const firstCIColumns = {}
-      const firstCIJsonAttr = {}
-      res.parents.forEach((item) => {
-        const columns = []
-        const jsonAttr = []
-        item.attributes.forEach((attr) => {
-          columns.push({ key: 'p_' + attr.id, field: attr.name, title: attr.alias, minWidth: '100px' })
-          if (attr.value_type === '6') {
-            jsonAttr.push(attr.name)
-          }
-        })
-        firstCIJsonAttr[item.id] = jsonAttr
-        firstCIColumns[item.id] = columns
-        firstCIColumns[item.id].push({
-          key: 'p_operation',
-          field: 'operation',
-          title: this.$t('operation'),
-          width: '60px',
-          fixed: 'right',
-          slots: {
-            default: 'operation_default',
-          },
-          align: 'center',
-        })
-      })
-
-      this.firstCIColumns = firstCIColumns
-      this.firstCIJsonAttr = firstCIJsonAttr
-    },
-    async getChildCITypes() {
-      const res = await getCITypeChildren(this.typeId)
-
-      this.childCITypes = res.children
-      for (let i = 0; i < res.children.length; i++) {
-        await getCanEditByParentIdChildId(this.typeId, res.children[i].id).then((c_res) => {
-          this.canEdit = {
-            ..._.cloneDeep(this.canEdit),
-            [res.children[i].id]: c_res.result,
-          }
-        })
-      }
-      const secondCIColumns = {}
-      const secondCIJsonAttr = {}
-      res.children.forEach((item) => {
-        const columns = []
-        const jsonAttr = []
-        item.attributes.forEach((attr) => {
-          columns.push({ key: 'c_' + attr.id, field: attr.name, title: attr.alias, minWidth: '100px' })
-          if (attr.value_type === '6') {
-            jsonAttr.push(attr.name)
-          }
-        })
-        secondCIJsonAttr[item.id] = jsonAttr
-        secondCIColumns[item.id] = columns
-        secondCIColumns[item.id].push({
-          key: 'c_operation',
-          field: 'operation',
-          title: this.$t('operation'),
-          width: '60px',
-          fixed: 'right',
-          slots: {
-            default: 'operation_default',
-          },
-          align: 'center',
-        })
-      })
-
-      this.secondCIColumns = secondCIColumns
-      this.secondCIJsonAttr = secondCIJsonAttr
-    },
-    reload() {
-      this.init()
-    },
-    deleteRelation(first_ci_id, second_ci_id) {
-      deleteCIRelationView(first_ci_id, second_ci_id).then((res) => {
-        this.init()
-        if (this.relationViewRefreshNumber) {
-          this.relationViewRefreshNumber()
-        }
-      })
-    },
-    handleChangeActiveKey(e) {
-      if (e.target.value === '1') {
-        this.$nextTick(() => {
-          this.$refs.ciDetailRelationTopo.exsited_ci = this.exsited_ci
-          this.$refs.ciDetailRelationTopo.setTopoData(this.topoData)
-        })
-      }
-    },
   },
 }
 </script>

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

@@ -17,7 +17,7 @@
       border: 1px solid #d9d9d9;
       border-radius: 2px;
       padding: 4px 8px;
-      width: 100px;
+      width: auto;
       text-align: center;
       .title {
         font-size: 16px;
@@ -73,7 +73,7 @@
       }
     }
     .root {
-      width: 100px;
+      width: auto;
       border-color: @primary-color;
       font-weight: 700;
       padding: 4px 8px;

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

@@ -29,6 +29,10 @@ export default {
   methods: {
     init() {
       const root = document.getElementById('ci-detail-relation-topo')
+      const canvas = document.createElement('canvas')
+      const context = canvas.getContext('2d')
+      context.font = '16px'
+
       this.canvas = new TreeCanvas({
         root: root,
         disLinkable: false, // 可删除连线
@@ -54,7 +58,15 @@ export default {
               return 10
             },
             getWidth(d) {
-              return 40
+              const metrics = context.measureText(d?.title || '')
+              const width = metrics.width
+              /**
+               * width 文字宽度
+               * 20    icon 宽度
+               * 4     盒子内边距
+               * 40    节点间距
+               */
+              return width + 20 + 4 + 40
             },
             getHGap(d) {
               return 80
@@ -69,22 +81,27 @@ export default {
       this.canvas.on('events', ({ type, data }) => {
         const sourceNode = data?.id || null
         if (type === 'custom:clickLeft') {
-          searchCIRelation(`root_id=${Number(sourceNode)}&&level=1&&reverse=1&&count=10000`).then((res) => {
+          searchCIRelation(`root_id=${Number(sourceNode)}&level=1&reverse=1&count=10000`).then((res) => {
             this.redrawData(res, sourceNode, 'left')
           })
         }
         if (type === 'custom:clickRight') {
-          searchCIRelation(`root_id=${Number(sourceNode)}&&level=1&&reverse=0&&count=10000`).then((res) => {
+          searchCIRelation(`root_id=${Number(sourceNode)}&level=1&reverse=0&count=10000`).then((res) => {
             this.redrawData(res, sourceNode, 'right')
           })
         }
       })
     },
     setTopoData(data) {
+      const root = document.getElementById('ci-detail-relation-topo')
+      if (root && root?.innerHTML) {
+        root.innerHTML = ''
+      }
       this.canvas = null
       this.init()
       this.topoData = _.cloneDeep(data)
-      this.canvas.draw(data, {}, () => {
+
+      this.canvas.redraw(data, {}, () => {
         this.canvas.focusCenterWithAnimate()
       })
     },

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

@@ -20,7 +20,7 @@
               :key="attr.name"
               v-for="attr in group.attributes"
             >
-              <ci-detail-attr-content :ci="ci" :attr="attr" @refresh="refresh" @updateCIByself="updateCIByself" />
+              <ci-detail-attr-content :ci="ci" :attr="attr" @refresh="refresh" @updateCIByself="updateCIByself" @refreshReferenceAttr="handleReferenceAttr" />
             </el-descriptions-item>
           </el-descriptions>
         </div>
@@ -28,7 +28,7 @@
       <a-tab-pane key="tab_2">
         <span slot="tab"><a-icon type="branches" />{{ $t('cmdb.relation') }}</span>
         <div :style="{ height: '100%', padding: '24px', overflow: 'auto' }">
-          <ci-detail-relation ref="ciDetailRelation" :ciId="ciId" :typeId="typeId" :ci="ci" />
+          <ci-detail-relation ref="ciDetailRelation" :ciId="ciId" :typeId="typeId" :ci="ci" :initQueryLoading="initQueryLoading" />
         </div>
       </a-tab-pane>
       <a-tab-pane key="tab_3">
@@ -38,6 +38,9 @@
             <a-button type="primary" class="ops-button-ghost" ghost @click="handleRollbackCI()">
               <ops-icon type="shishizhuangtai" />{{ $t('cmdb.ci.rollback') }}
             </a-button>
+            <a-button type="primary" class="ops-button-ghost" ghost @click="handleExport">
+              <ops-icon type="veops-export" />{{ $t('export') }}
+            </a-button>
           </a-space>
           <ci-rollback-form ref="ciRollbackForm" :ciIds="[ciId]" @getCIHistory="getCIHistory" />
           <vxe-table
@@ -88,13 +91,13 @@
               :filters="[]"
               :filter-method="filterAttrMethod"
             ></vxe-table-column>
-            <vxe-table-column field="old" :title="$t('cmdb.history.old')">
+            <vxe-table-column :cell-type="'string'" field="old" :title="$t('cmdb.history.old')">
               <template #default="{ row }">
                 <span v-if="row.value_type === '6'">{{ JSON.parse(row.old) }}</span>
                 <span v-else>{{ row.old }}</span>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="new" :title="$t('cmdb.history.new')">
+            <vxe-table-column :cell-type="'string'" field="new" :title="$t('cmdb.history.new')">
               <template #default="{ row }">
                 <span v-if="row.value_type === '6'">{{ JSON.parse(row.new) }}</span>
                 <span v-else>{{ row.new }}</span>
@@ -134,7 +137,7 @@ import _ from 'lodash'
 import { Descriptions, DescriptionsItem } from 'element-ui'
 import { getCITypeGroupById, getCITypes } from '@/modules/cmdb/api/CIType'
 import { getCIHistory, judgeItsmInstalled } from '@/modules/cmdb/api/history'
-import { getCIById } from '@/modules/cmdb/api/ci'
+import { getCIById, searchCI } from '@/modules/cmdb/api/ci'
 import CiDetailAttrContent from './ciDetailAttrContent.vue'
 import CiDetailRelation from './ciDetailRelation.vue'
 import TriggerTable from '../../operation_history/modules/triggerTable.vue'
@@ -178,6 +181,7 @@ export default {
       hasPermission: true,
       itsmInstalled: true,
       tableHeight: this.attributeHistoryTableHeight || (this.$store.state.windowHeight - 120),
+      initQueryLoading: true,
     }
   },
   computed: {
@@ -215,6 +219,7 @@ export default {
   },
   methods: {
     async create(ciId, activeTabKey = 'tab_1', ciDetailRelationKey = '1') {
+      this.initQueryLoading = true
       this.activeTabKey = activeTabKey
       if (activeTabKey === 'tab_2') {
         this.$nextTick(() => {
@@ -227,18 +232,90 @@ export default {
       if (this.hasPermission) {
         this.getAttributes()
         this.getCIHistory()
-        getCITypes().then((res) => {
+        const ciTypeRes = await getCITypes()
-          this.ci_types = res.ci_types
+        this.ci_types = ciTypeRes.ci_types
-        })
+        if (this.activeTabKey === 'tab_2') {
+          this.$refs.ciDetailRelation.init(true)
+        }
       }
+      this.initQueryLoading = false
     },
     getAttributes() {
       getCITypeGroupById(this.typeId, { need_other: 1 })
         .then((res) => {
           this.attributeGroups = res
+
+          this.handleReferenceAttr()
         })
         .catch((e) => {})
     },
+
+    async handleReferenceAttr() {
+      const map = {}
+      this.attributeGroups.forEach((group) => {
+        group.attributes.forEach((attr) => {
+          if (attr?.is_reference && attr?.reference_type_id && this.ci[attr.name]) {
+            const ids = Array.isArray(this.ci[attr.name]) ? this.ci[attr.name] : this.ci[attr.name] ? [this.ci[attr.name]] : []
+            if (ids.length) {
+              if (!map?.[attr.reference_type_id]) {
+                map[attr.reference_type_id] = {}
+              }
+              ids.forEach((id) => {
+                map[attr.reference_type_id][id] = {}
+              })
+            }
+          }
+        })
+      })
+
+      if (!Object.keys(map).length) {
+        return
+      }
+
+      const ciTypesRes = await getCITypes({
+        type_ids: Object.keys(map).join(',')
+      })
+      const showAttrNameMap = {}
+      ciTypesRes.ci_types.forEach((ciType) => {
+        showAttrNameMap[ciType.id] = ciType?.show_name || ciType?.unique_name || ''
+      })
+
+      const allRes = await Promise.all(
+        Object.keys(map).map((key) => {
+          return searchCI({
+            q: `_type:${key},_id:(${Object.keys(map[key]).join(';')})`,
+            count: 9999
+          })
+        })
+      )
+
+      const ciNameMap = {}
+      allRes.forEach((res) => {
+        res.result.forEach((item) => {
+          ciNameMap[item._id] = item
+        })
+      })
+
+      const newAttrGroups = _.cloneDeep(this.attributeGroups)
+
+      newAttrGroups.forEach((group) => {
+        group.attributes.forEach((attr) => {
+          if (attr?.is_reference && attr?.reference_type_id) {
+            attr.showAttrName = showAttrNameMap?.[attr?.reference_type_id] || ''
+
+            const referenceShowAttrNameMap = {}
+            const referenceCIIds = this.ci[attr.name];
+            (Array.isArray(referenceCIIds) ? referenceCIIds : referenceCIIds ? [referenceCIIds] : []).forEach((id) => {
+              referenceShowAttrNameMap[id] = ciNameMap?.[id]?.[attr.showAttrName] ?? id
+            })
+            attr.referenceShowAttrNameMap = referenceShowAttrNameMap
+          }
+        })
+      })
+
+      this.$set(this, 'attributeGroups', newAttrGroups)
+    },
+
     async getCI() {
       await getCIById(this.ciId)
         .then((res) => {
@@ -402,6 +479,17 @@ export default {
         this.$refs.ciRollbackForm.onOpen()
       })
     },
+    async handleExport() {
+      this.$refs.xTable.exportData({
+        filename: this.$t('cmdb.ci.history'),
+        sheetName: 'Sheet1',
+        type: 'xlsx',
+        types: ['xlsx', 'csv', 'html', 'xml', 'txt'],
+        data: this.ciHistory,
+        isMerge: true,
+        isColgroup: true,
+      })
+    }
   },
 }
 </script>

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

@@ -16,24 +16,40 @@
         :key="attr.name + attr_idx"
       >
         <a-form-item :label="attr.alias || attr.name" :colon="false">
+          <CIReferenceAttr
+            v-if="attr.is_reference"
+            :referenceTypeId="attr.reference_type_id"
+            :isList="attr.is_list"
+            v-decorator="[
+              attr.name,
+              {
+                rules: [{ required: attr.is_required, message: $t('placeholder2') + `${attr.alias || attr.name}` }],
+                initialValue: attr.is_list ? [] : ''
+              }
+            ]"
+          />
+          <a-switch
+            v-else-if="attr.is_bool"
+            v-decorator="[
+              attr.name,
+              {
+                rules: [{ required: false }],
+                valuePropName: 'checked',
+                initialValue: attr.default ? Boolean(attr.default.default) : false
+              }
+            ]"
+          />
           <a-select
             :style="{ width: '100%' }"
             v-decorator="[
               attr.name,
               {
                 rules: [{ required: attr.is_required, message: $t('placeholder2') + `${attr.alias || attr.name}` }],
-                initialValue:
+                initialValue: getChoiceDefault(attr),
-                  attr.default && attr.default.default
-                    ? attr.is_list
-                      ? Array.isArray(attr.default.default)
-                        ? attr.default.default
-                        : attr.default.default.split(',')
-                      : attr.default.default
-                    : attr.is_list ? [] : null,
               },
             ]"
             :placeholder="$t('placeholder2')"
-            v-if="attr.is_choice"
+            v-else-if="attr.is_choice"
             :mode="attr.is_list ? 'multiple' : 'default'"
             showSearch
             allowClear
@@ -56,7 +72,9 @@
                     :type="choice[1].icon.name"
                   />
                 </template>
-                {{ choice[0] }}
+                <a-tooltip placement="topLeft" :title="choice[1] ? choice[1].label || choice[0] : choice[0]">
+                  {{ choice[1] ? choice[1].label || choice[0] : choice[0] }}
+                </a-tooltip>
               </span>
             </a-select-option>
           </a-select>
@@ -67,7 +85,7 @@
               attr.name,
               {
                 rules: [{ required: attr.is_required, message: $t('placeholder2') + `${attr.alias || attr.name}` }],
-                initialValue: attr.default && attr.default.default ? attr.default.default : '',
+                initialValue: attr.default && attr.default.default ? Array.isArray(attr.default.default) ? attr.default.default.join(',') : attr.default.default : '',
               },
             ]"
           >
@@ -130,13 +148,16 @@
 </template>
 
 <script>
-import _ from 'lodash'
 import moment from 'moment'
 import JsonEditor from '../../../components/JsonEditor/jsonEditor.vue'
+import CIReferenceAttr from '@/components/ciReferenceAttr/index.vue'
 
 export default {
   name: 'CreateInstanceFormByGroup',
-  components: { JsonEditor },
+  components: {
+    JsonEditor,
+    CIReferenceAttr
+  },
   props: {
     group: {
       type: Object,
@@ -146,6 +167,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    ciTypeId: {
+      type: [Number, String],
+      default: ''
+    }
   },
   inject: ['getFieldType'],
   data() {
@@ -183,6 +208,35 @@ export default {
     jsonEditorOk(jsonData) {
       this.form.setFieldsValue({ [this.editAttr.name]: JSON.stringify(jsonData) })
     },
+
+    getChoiceDefault(attr) {
+      if (!attr?.default?.default) {
+        return attr.is_list ? [] : null
+      }
+
+      if (attr.is_list) {
+        let defaultValue = []
+        if (Array.isArray(attr.default.default)) {
+          defaultValue = attr.default.default
+        } else {
+          defaultValue = String(attr.default.default).split(',')
+        }
+        if (['0', '1', '11'].includes(attr.value_type)) {
+          defaultValue = defaultValue?.map((item) => {
+            const numberValue = Number(item)
+            return Number.isNaN(numberValue) ? item : numberValue
+          })
+        }
+        return defaultValue
+      }
+
+      let defaultValue = attr.default.default
+      if (['0', '1', '11'].includes(attr.value_type)) {
+        const numberValue = Number(defaultValue)
+        defaultValue = Number.isNaN(numberValue) ? attr.default.default : numberValue
+      }
+      return defaultValue
+    }
   },
 }
 </script>

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

@@ -92,6 +92,10 @@ export default {
     font-size: 14px;
     font-weight: 400;
 
+    &:hover {
+      color: @primary-color;
+    }
+
     &:not(:first-child) {
       border-left: solid 1px @border-color-base;
     }
@@ -99,6 +103,10 @@ export default {
     &_active {
       background-color: @primary-color;
       color: #FFFFFF;
+
+      &:hover {
+        color: #FFFFFF;
+      }
     }
   }
 }

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

@@ -0,0 +1,147 @@
+<template>
+  <CustomDrawer
+    :title="$t('cmdb.ciType.viewAllAttr')"
+    :visible="visible"
+    placement="right"
+    width="800"
+    :bodyStyle="{ height: '100vh' }"
+    @close="handleClose"
+  >
+    <vxe-table
+      resizable
+      size="mini"
+      :span-method="mergeRowMethod"
+      :data="tableData"
+      show-overflow
+      show-header-overflow
+      border
+      class="ops-stripe-table"
+      :height="windowHeight - 160"
+    >
+      <vxe-table-column align="center" field="groupId" :title="$t('cmdb.ciType.attrGroup')" :width="100">
+        <template #default="{row}">
+          <span>{{ row.groupName }}</span>
+        </template>
+      </vxe-table-column>
+      <vxe-table-column field="name" :title="$t('cmdb.ciType.attrName')" :width="150"></vxe-table-column>
+      <vxe-table-column field="alias" :title="$t('cmdb.ciType.attrAlias')" :width="150"></vxe-table-column>
+      <vxe-table-column field="typeText" :title="$t('type')" :width="100"></vxe-table-column>
+      <vxe-table-column field="code" :title="$t('cmdb.ciType.attrCode')">
+        <template #default="{row}">
+          <a @click="copyText(row.code)" >{{ row.code }}</a>
+        </template>
+      </vxe-table-column>
+    </vxe-table>
+  </CustomDrawer>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import _ from 'lodash'
+import { valueTypeMap } from '@/modules/cmdb/utils/const'
+import { getPropertyType } from '@/modules/cmdb/utils/helper'
+
+export default {
+  name: 'AllAttrDrawer',
+  data() {
+    return {
+      visible: false,
+      tableData: [],
+    }
+  },
+  inject: {
+    providerGroupsData: {
+      default: () => {
+        return () => {
+          return {
+            CITypeGroups: [],
+            otherGroupAttributes: [],
+          }
+        }
+      }
+    }
+  },
+  computed: {
+    ...mapState({
+      windowHeight: (state) => state.windowHeight,
+    }),
+  },
+  methods: {
+    async open() {
+      this.visible = true
+      const tableData = []
+      const typeMap = valueTypeMap()
+      const providerGroupsData = _.cloneDeep(this.providerGroupsData() || {})
+      const groupsData = providerGroupsData?.CITypeGroups || []
+      const otherAttrData = providerGroupsData?.otherGroupAttributes || []
+
+      groupsData.forEach((group) => {
+        if (group?.attributes?.length) {
+          const attrArr = group.attributes.map((attr) => {
+            if (attr.is_password) {
+              attr.value_type = '7'
+            }
+            if (attr.is_link) {
+              attr.value_type = '8'
+            }
+            attr.groupId = group.id
+            attr.groupName = group.name
+            attr.code = ['0', '1', '6'].includes(attr.value_type) ? `{{ ${attr.name} }}` : `'''{{ ${attr.name} }}'''`
+            attr.typeText = typeMap?.[attr.value_type] ?? ''
+
+            return attr
+          })
+          tableData.push(...attrArr)
+        }
+      })
+
+      otherAttrData.forEach((attr) => {
+        attr.value_type = getPropertyType(attr)
+
+        attr.groupId = -1
+        attr.groupName = this.$t('other')
+        attr.code = `{{ ${attr.name} }}`
+        attr.typeText = typeMap?.[attr.value_type] ?? ''
+      })
+      tableData.push(...otherAttrData)
+
+      this.tableData = tableData
+    },
+
+    mergeRowMethod({ row, _rowIndex, column, visibleData }) {
+      const fields = ['groupId']
+      const currentValue = row.groupId
+
+      if (currentValue && fields.includes(column.property)) {
+        const prevRow = visibleData[_rowIndex - 1]
+        let nextRow = visibleData[_rowIndex + 1]
+        if (prevRow && prevRow.groupId === currentValue) {
+          return { rowspan: 0, colspan: 0 }
+        } else {
+          let countRowspan = 1
+          while (nextRow && nextRow.groupId === currentValue) {
+            nextRow = visibleData[++countRowspan + _rowIndex]
+          }
+          if (countRowspan > 1) {
+            return { rowspan: countRowspan, colspan: 1 }
+          }
+        }
+      }
+    },
+
+    handleClose() {
+      this.visible = false
+    },
+
+    copyText(text) {
+      this.$copyText(text)
+        .then(() => {
+          this.$message.success(this.$t('copySuccess'))
+        })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+</style>

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

@@ -51,7 +51,7 @@
       @pushCITypeList="pushCITypeList"
       @addPlugin="openEditDrawer(null, 'add', 'plugin')"
     />
-    <EditDrawer ref="editDrawer" :is_inner="false" @updateNotInner="updateNotInner" />
+    <EditDrawer ref="editDrawer" :isDiscoveryPage="false" @updateNotInner="updateNotInner" />
   </div>
 </template>
 
@@ -94,6 +94,7 @@ export default {
       clientCITypeList: [],
       currentTab: '',
       deletePlugin: false,
+      queryLoaded: false,
     }
   },
   computed: {
@@ -116,7 +117,7 @@ export default {
   watch: {
     currentTab: {
       handler() {
-        if (this.currentTab) {
+        if (this.currentTab && this.queryLoaded) {
           this.$nextTick(() => {
             this.$refs[`attrAdTabpaneRef`].init()
           })
@@ -131,6 +132,7 @@ export default {
       this.ciTypeAttributes = res.attributes.map((item) => {
         return { ...item, value: item.name, label: item.name }
       })
+      this.queryLoaded = true
       if (this.currentTab) {
         this.$nextTick(() => {
           this.$refs[`attrAdTabpaneRef`].init()

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

@@ -0,0 +1,156 @@
+<template>
+  <a-row class="attr-ad-form">
+    <a-col :span="24">
+      <a-form-item
+        label="CIDR"
+        :labelCol="labelCol"
+        :wrapperCol="{ span: 18 }"
+        labelAlign="right"
+        style="width: 100%; margin-top: 20px"
+      >
+        <div class="cidr-tag">
+          <div
+            v-for="(item) in list"
+            :key="item.id"
+            class="cidr-tag-item"
+          >
+            <a-tooltip :title="item.value">
+              <span class="cidr-tag-text">{{ item.value }}</span>
+            </a-tooltip>
+            <a-icon
+              class="cidrv-tag-close"
+              type="close"
+              @click.stop="clickClose(item.id)"
+            />
+          </div>
+          <a-input
+            v-if="showAddInput"
+            class="cidr-tag-input"
+            autofocus
+            @blur="addPreValue"
+            @pressEnter="showAddInput = false"
+          ></a-input>
+          <a v-else class="cidr-tag-add" @click="showAddInput = true">+ {{ $t('new') }}</a>
+        </div>
+      </a-form-item>
+    </a-col>
+  </a-row>
+</template>
+
+<script>
+import _ from 'lodash'
+import { v4 as uuidv4 } from 'uuid'
+
+export default {
+  name: 'CIDRTags',
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  props: {
+    value: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      showAddInput: false,
+    }
+  },
+  inject: ['provide_labelCol'],
+  computed: {
+    list: {
+      get() {
+        return this.value
+      },
+      set(newValue) {
+        this.$emit('change', newValue)
+      }
+    },
+    labelCol() {
+      return this.provide_labelCol()
+    }
+  },
+  methods: {
+    clickClose(id) {
+      const list = _.cloneDeep(this.value)
+      const index = list.findIndex((item) => item.id === id)
+      if (index !== -1) {
+        list.splice(index, 1)
+        this.$emit('change', list)
+      }
+    },
+    addPreValue(e) {
+      this.showAddInput = false
+      const val = e.target.value
+      if (!val) {
+        return
+      }
+      const list = _.cloneDeep(this.value)
+      list.push({
+        value: val,
+        id: uuidv4()
+      })
+      this.$emit('change', list)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.cidr-tag {
+  width: max-content;
+  max-width: 100%;
+  padding: 6px 9px;
+  border-radius: 2px;
+  border: 1px solid #E4E7ED;
+  background: #FFF;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+
+  &-item {
+    padding: 3px 6px;
+    background-color: #F0F5FF;
+    display: flex;
+    align-items: center;
+  }
+
+  &-text {
+    font-size: 12px;
+    font-weight: 400;
+    color: #1D2129;
+    line-height: 18px;
+    text-overflow: ellipsis;
+    word-break: break-all;
+    white-space: nowrap;
+    max-width: 100px;
+    overflow: hidden;
+  }
+
+  &-close {
+    font-size: 12px;
+    color: #1D2129;
+    margin-left: 4px;
+    cursor: pointer;
+  }
+
+  &-input {
+    max-width: 120px;
+    height: 26px;
+    line-height: 26px;
+    padding: 3px 6px;
+  }
+
+  &-add {
+    border: dashed 1px #e4e7ed;
+    padding: 3px 6px;
+    font-size: 12px;
+    font-weight: 400;
+    color: #1D2129;
+    line-height: 18px;
+    cursor: pointer;
+  }
+}
+</style>

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

@@ -0,0 +1,77 @@
+<template>
+  <div class="cloud-tabs">
+    <div
+      v-for="(item) in tabList"
+      :key="item.key"
+      :class="['cloud-tabs-item', activeKey === item.key ? 'cloud-tabs-item-active' : '']"
+      @click="clickTab(item.key)"
+    >
+      {{ $t(item.text) }}
+    </div>
+  </div>
+</template>
+
+<script>
+import { tabList, TAB_KEY } from '../constants.js'
+
+export default {
+  name: 'CloudTab',
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  props: {
+    value: {
+      type: String,
+      default: TAB_KEY.CUSTOM,
+    },
+  },
+  computed: {
+    activeKey: {
+      get() {
+        return this.value
+      },
+      set(newValue) {
+        this.$emit('change', newValue)
+      }
+    },
+  },
+  data() {
+    return {
+      tabList
+    }
+  },
+  methods: {
+    clickTab(key) {
+      this.$emit('change', key)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped >
+.cloud-tabs {
+  display: flex;
+  align-items: center;
+  margin-bottom: 26px;
+
+  &-item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 12px;
+    font-weight: 400;
+    color: #4E5969;
+    background-color: #F7F8FA;
+    width: 105px;
+    height: 32px;
+    cursor: pointer;
+
+    &-active {
+      border: solid 1px #B1C9FF;
+      background-color: #E1EFFF;
+      color: #2F54EB;
+    }
+  }
+}
+</style>

cmdb-ui/src/modules/cmdb/views/ci_types/attrAD/constants.js

@@ -0,0 +1,15 @@
+export const TAB_KEY = {
+  CUSTOM: 'custom',
+  CONFIG: 'config'
+}
+
+export const tabList = [
+  {
+    key: TAB_KEY.CUSTOM,
+    text: 'cmdb.ad.tabCustom'
+  },
+  {
+    key: TAB_KEY.CONFIG,
+    text: 'cmdb.ad.tabConfig'
+  }
+]

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

@@ -0,0 +1,52 @@
+<template>
+  <a-form-model
+    :model="formData"
+    labelAlign="right"
+    :labelCol="labelCol"
+    :wrapperCol="{ span: 6 }"
+    class="attr-ad-form"
+  >
+    <a-form-model-item :extra="`${$t('cmdb.ciType.example')}: 192.168.0.0/16`" :label="$t('cmdb.ciType.portScanLabel1')">
+      <a-input v-model="formData.cidr" />
+    </a-form-model-item>
+    <a-form-model-item :extra="`${$t('cmdb.ciType.example')}: 8000-8800`" :label="$t('cmdb.ciType.portScanLabel2')">
+      <a-input v-model="formData.ports" />
+    </a-form-model-item>
+    <a-form-model-item :extra="`${$t('cmdb.ciType.example')}: 0x1234`" :label="$t('cmdb.ciType.portScanLabel3')">
+      <a-input v-model="formData.enable_cidr" />
+    </a-form-model-item>
+  </a-form-model>
+</template>
+
+<script>
+export default {
+  name: 'PortScanConfig',
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  props: {
+    value: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  inject: ['provide_labelCol'],
+  computed: {
+    formData: {
+      get() {
+        return this.value
+      },
+      set(newValue) {
+        this.$emit('change', newValue)
+      }
+    },
+    labelCol() {
+      return this.provide_labelCol()
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+</style>

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

@@ -0,0 +1,154 @@
+<template>
+  <div class="private-cloud-wrap">
+    <CloudTab
+      v-model="formData.tabActive"
+      @change="handleTabChange"
+    />
+    <a-form-model
+      :model="formData"
+      labelAlign="right"
+      :labelCol="labelCol"
+      :wrapperCol="{ span: 6 }"
+      class="attr-ad-form"
+    >
+      <a-form-model-item
+        v-if="formData.tabActive === TAB_KEY.CONFIG"
+        :required="true"
+        :label="$t('cmdb.ad.tabConfig')"
+      >
+        <a-select
+          showSearch
+          optionFilterProp="title"
+          v-model="formData._reference"
+          @change="handleSelectChange"
+        >
+          <a-select-option
+            v-for="(item) in accountsList"
+            :key="item.id"
+            :value="item.id"
+            :title="item.name"
+          >
+            {{ item.name }}
+          </a-select-option>
+        </a-select>
+      </a-form-model-item>
+      <a-form-model-item :required="true" :label="$t('cmdb.ciType.host')">
+        <a-input
+          :disabled="formData.tabActive === TAB_KEY.CONFIG"
+          v-model="formData.host"
+        />
+      </a-form-model-item>
+      <a-form-model-item :required="true" :label="$t('cmdb.ciType.account')">
+        <a-input
+          :disabled="formData.tabActive === TAB_KEY.CONFIG"
+          v-model="formData.account"
+        />
+      </a-form-model-item>
+      <a-form-model-item v-if="formData.tabActive === TAB_KEY.CUSTOM" :required="true" :label="$t('cmdb.ciType.password')">
+        <a-input-password v-model="formData.password" />
+      </a-form-model-item>
+      <a-form-model-item :label="$t('cmdb.ciType.vcenterName')">
+        <a-input v-model="formData.vcenterName" />
+      </a-form-model-item>
+    </a-form-model>
+  </div>
+</template>
+
+<script>
+import { getHTTPAccounts } from '@/modules/cmdb/api/discovery'
+import { TAB_KEY } from '../constants.js'
+import CloudTab from '../cloudTab/index.vue'
+
+export default {
+  name: 'VCenterForm',
+  components: {
+    CloudTab
+  },
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  props: {
+    value: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      TAB_KEY,
+      accountsList: [],
+    }
+  },
+  inject: ['provide_labelCol'],
+  computed: {
+    formData: {
+      get() {
+        return this.value
+      },
+      set(newValue) {
+        this.$emit('change', newValue)
+      }
+    },
+    labelCol() {
+      return this.provide_labelCol()
+    }
+  },
+  methods: {
+    async init(id) {
+      const res = await getHTTPAccounts({
+        adr_id: id
+      })
+      this.accountsList = res?.length ? res : []
+
+      this.$nextTick(() => {
+        const { _reference = '', host = '', account = '', tabActive } = this?.formData || {}
+        const findSelect = this.accountsList?.find((item) => item.id === _reference)
+        const newFormData = findSelect?.config || {}
+
+        const changeData = {
+          ...this.value,
+          _reference: findSelect?.id ?? '',
+        }
+        if (tabActive === TAB_KEY.CONFIG) {
+          changeData.host = newFormData?.host ?? host
+          changeData.account = newFormData?.account ?? account
+        }
+
+        this.$emit('change', changeData)
+      })
+    },
+
+    handleTabChange(key) {
+      if (key === TAB_KEY.CONFIG) {
+        this.handleSelectChange(this.formData._referenceValue)
+      }
+    },
+
+    handleSelectChange(id) {
+      const accountConfig = this.accountsList.find((item) => item.id === id)?.config || {}
+      const { host, account } = this?.value
+      this.$emit('change', {
+        ...this.value,
+        host: accountConfig?.host ?? host ?? '',
+        account: accountConfig?.account ?? account ?? ''
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.private-cloud-wrap {
+  margin-left: 17px;
+
+  .input-disabled {
+    /deep/ input {
+      color: rgba(0, 0, 0, 0.25);
+      background-color: #f5f5f5;
+      pointer-events: none;
+      opacity: 1;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,142 @@
+<template>
+  <div class="public-cloud-wrap">
+    <CloudTab
+      v-model="formData.tabActive"
+      @change="handleTabChange"
+    />
+    <a-form-model
+      :model="formData"
+      labelAlign="right"
+      :labelCol="labelCol"
+      :wrapperCol="{ span: 6 }"
+      class="attr-ad-form"
+    >
+      <a-form-model-item
+        v-if="formData.tabActive === TAB_KEY.CONFIG"
+        :required="true"
+        :label="$t('cmdb.ad.tabConfig')"
+      >
+        <a-select
+          showSearch
+          optionFilterProp="title"
+          v-model="formData._reference"
+          @change="handleSelectChange"
+        >
+          <a-select-option
+            v-for="(item) in accountsList"
+            :key="item.id"
+            :value="item.id"
+            :title="item.name"
+          >
+            {{ item.name }}
+          </a-select-option>
+        </a-select>
+      </a-form-model-item>
+      <a-form-model-item :required="true" label="key">
+        <a-input-password
+          :class="[formData.tabActive === TAB_KEY.CONFIG ? 'input-disabled' : '']"
+          v-model="formData.key"
+        />
+      </a-form-model-item>
+      <a-form-model-item v-if="formData.tabActive === TAB_KEY.CUSTOM" :required="true" label="secret">
+        <a-input-password v-model="formData.secret" />
+      </a-form-model-item>
+    </a-form-model>
+  </div>
+</template>
+
+<script>
+import { getHTTPAccounts } from '@/modules/cmdb/api/discovery'
+import { TAB_KEY } from '../constants.js'
+import CloudTab from '../cloudTab/index.vue'
+
+export default {
+  name: 'PublicCloud',
+  components: {
+    CloudTab
+  },
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  props: {
+    value: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      TAB_KEY,
+      accountsList: []
+    }
+  },
+  inject: ['provide_labelCol'],
+  computed: {
+    formData: {
+      get() {
+        return this.value
+      },
+      set(newValue) {
+        this.$emit('change', newValue)
+      }
+    },
+    labelCol() {
+      return this.provide_labelCol()
+    }
+  },
+  methods: {
+    async init(id) {
+      const res = await getHTTPAccounts({
+        adr_id: id
+      })
+      this.accountsList = res?.length ? res : []
+
+      this.$nextTick(() => {
+        const { _reference = '', key = '', tabActive } = this?.formData || {}
+        const findSelect = this.accountsList?.find((item) => item.id === _reference)
+        const newFormData = findSelect?.config || {}
+
+        const changeData = {
+          ...this.value,
+          _reference: findSelect?.id ?? '',
+        }
+        if (tabActive === TAB_KEY.CONFIG) {
+          changeData.key = newFormData?.key ?? key
+        }
+        this.$emit('change', changeData)
+      })
+    },
+
+    handleTabChange(key) {
+      if (key === TAB_KEY.CONFIG) {
+        this.handleSelectChange(this.formData._reference)
+      }
+    },
+
+    handleSelectChange(id) {
+      const accountConfig = this.accountsList.find((item) => item.id === id)?.config || {}
+      const { key } = this?.value
+      this.$emit('change', {
+        ...this.value,
+        key: accountConfig?.key ?? key ?? '',
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.public-cloud-wrap {
+  margin-left: 17px;
+
+  .input-disabled {
+    /deep/ input {
+      color: rgba(0, 0, 0, 0.25);
+      background-color: #f5f5f5;
+      pointer-events: none;
+      opacity: 1;
+    }
+  }
+}
+</style>

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

@@ -32,7 +32,7 @@
     </div>
     <div class="attr-ad-attributemap-main">
       <AttrMapTable
-        v-if="adrType === 'agent'"
+        v-if="adrType === DISCOVERY_CATEGORY_TYPE.AGENT"
         ref="attrMapTable"
         :ruleType="adrType"
         :tableData="tableData"
@@ -53,17 +53,18 @@
         :style="{ marginBottom: '20px' }"
       />
     </div>
-    <template v-if="adrType === 'snmp'">
+    <template v-if="adrType === DISCOVERY_CATEGORY_TYPE.SNMP">
       <div class="attr-ad-header">{{ $t('cmdb.ciType.nodeConfig') }}</div>
-      <a-form :form="form3" layout="inline" class="attr-ad-snmp-form">
+      <a-form :form="nodeSettingForm" layout="inline" class="attr-ad-snmp-form">
-        <NodeSetting ref="nodeSetting" :initNodes="nodes" :form="form3" />
+        <NodeSetting ref="nodeSetting" :initNodes="nodes" />
+        <CIDRTags v-model="cidrList" />
       </a-form>
     </template>
     <div class="attr-ad-header">{{ $t('cmdb.ciType.adExecConfig') }}</div>
     <a-form-model
       :model="form"
       :labelCol="labelCol"
-      labelAlign="left"
+      labelAlign="right"
       :wrapperCol="{ span: 14 }"
       class="attr-ad-form"
     >
@@ -127,56 +128,32 @@
         </el-popover>
       </a-form-model-item>
     </a-form-model>
-    <template v-if="adrType === 'http'">
+    <template v-if="adrType === DISCOVERY_CATEGORY_TYPE.HTTP">
       <template v-if="isPrivateCloud">
         <template v-if="privateCloudName === PRIVATE_CLOUD_NAME.VCenter">
           <div class="attr-ad-header">{{ $t('cmdb.ciType.privateCloud') }}</div>
-          <a-form-model
+          <VcenterForm
-            :model="privateCloudForm"
+            v-model="privateCloudForm"
-            labelAlign="left"
+            ref="httpForm"
-            :labelCol="labelCol"
+          />
-            :wrapperCol="{ span: 6 }"
-            class="attr-ad-form"
-          >
-            <a-form-model-item :required="true" :label="$t('cmdb.ciType.host')">
-              <a-input v-model="privateCloudForm.host" />
-            </a-form-model-item>
-            <a-form-model-item :required="true" :label="$t('cmdb.ciType.account')">
-              <a-input v-model="privateCloudForm.account" />
-            </a-form-model-item>
-            <a-form-model-item :required="true" :label="$t('cmdb.ciType.password')">
-              <a-input-password v-model="privateCloudForm.password" />
-            </a-form-model-item>
-            <!-- <a-form-model-item :label="$t('cmdb.ciType.insecure')">
-              <a-switch v-model="privateCloudForm.insecure" />
-            </a-form-model-item> -->
-            <a-form-model-item :label="$t('cmdb.ciType.vcenterName')">
-              <a-input v-model="privateCloudForm.vcenterName" />
-            </a-form-model-item>
-          </a-form-model>
         </template>
       </template>
 
       <template v-else>
         <div class="attr-ad-header">{{ $t('cmdb.ciType.cloudAccessKey') }}</div>
         <!-- <div class="public-cloud-info">{{ $t('cmdb.ciType.cloudAccessKeyTip') }}</div> -->
-        <a-form-model
+        <PublicCloud
-          :model="form2"
+          v-model="publicCloudForm"
-          labelAlign="left"
+          ref="httpForm"
-          :labelCol="labelCol"
+        />
-          :wrapperCol="{ span: 6 }"
-          class="attr-ad-form"
-        >
-          <a-form-model-item :required="true" label="key">
-            <a-input-password v-model="form2.key" />
-          </a-form-model-item>
-          <a-form-model-item :required="true" label="secret">
-            <a-input-password v-model="form2.secret" />
-          </a-form-model-item>
-        </a-form-model>
       </template>
     </template>
 
+    <template v-if="adrType === DISCOVERY_CATEGORY_TYPE.COMPONENT">
+      <div class="attr-ad-header">{{ $t('cmdb.ciType.portScanConfig') }}</div>
+      <PortScanConfig v-model="portScanConfigForm" />
+    </template>
+
     <AttrADTest
       :adtId="currentAdt.id"
     />
@@ -194,7 +171,8 @@ import { v4 as uuidv4 } from 'uuid'
 import { mapState } from 'vuex'
 import Vcrontab from '@/components/Crontab'
 import { putCITypeDiscovery, postCITypeDiscovery } from '../../api/discovery'
-import { PRIVATE_CLOUD_NAME } from '@/modules/cmdb/views/discovery/constants.js'
+import { DISCOVERY_CATEGORY_TYPE, PRIVATE_CLOUD_NAME } from '@/modules/cmdb/views/discovery/constants.js'
+import { TAB_KEY } from './attrAD/constants.js'
 
 import HttpSnmpAD from '../../components/httpSnmpAD'
 import AttrMapTable from '@/modules/cmdb/components/attrMapTable/index.vue'
@@ -202,6 +180,10 @@ 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 VcenterForm from './attrAD/privateCloud/vcenterForm.vue'
+import PublicCloud from './attrAD/publicCloud/index.vue'
+import PortScanConfig from './attrAD/portScanConfig/index.vue'
+import CIDRTags from './attrAD/cidrTags/index.vue'
 
 export default {
   name: 'AttrADTabpane',
@@ -212,7 +194,11 @@ export default {
     NodeSetting,
     AttrMapTable,
     AttrADTest,
-    ElPopover: Popover
+    ElPopover: Popover,
+    VcenterForm,
+    PublicCloud,
+    PortScanConfig,
+    CIDRTags
   },
   props: {
     adr_id: {
@@ -253,9 +239,11 @@ export default {
         query_expr: '',
         enabled: true,
       },
-      form2: {
+      publicCloudForm: {
         key: '',
         secret: '',
+        _reference: '',
+        tabActive: TAB_KEY.CUSTOM,
       },
       privateCloudForm: {
         host: '',
@@ -263,26 +251,41 @@ export default {
         password: '',
         // insecure: false,
         vcenterName: '',
+        _reference: '',
+        tabActive: TAB_KEY.CUSTOM,
+      },
+      portScanConfigForm: {
+        cidr: '',
+        ports: '',
+        enable_cidr: '',
       },
-      interval: 'cron', // interval  cron
       cron: '',
+      cronVisible: false,
       intervalValue: 3,
       agent_type: 'agent_id',
       nodes: [
         {
           id: uuidv4(),
           ip: '',
-          community: '',
+          community: 'public',
           version: '',
         },
       ],
-      form3: this.$form.createForm(this, { name: 'snmp_form' }),
+      nodeSettingForm: this.$form.createForm(this, { name: 'snmp_form' }),
-      cronVisible: false,
       uniqueKey: '',
       isPrivateCloud: false,
       privateCloudName: '',
       PRIVATE_CLOUD_NAME,
+      DISCOVERY_CATEGORY_TYPE,
       isClient: false, // 是否前端新增临时数据
+      cidrList: [],
+    }
+  },
+  provide() {
+    return {
+      provide_labelCol: () => {
+        return this.labelCol
+      },
     }
   },
   computed: {
@@ -306,26 +309,28 @@ export default {
       ]
 
       const permissions = this?.user?.roles?.permissions
-      if ((permissions.includes('cmdb_admin') || permissions.includes('admin')) && this.adrType === 'agent') {
+      if ((permissions.includes('cmdb_admin') || permissions.includes('admin')) && this.adrType === DISCOVERY_CATEGORY_TYPE.AGENT) {
         radios.unshift({ value: 'all', label: this.$t('cmdb.ciType.allNodes') })
       }
 
-      if (this.adrType !== 'agent' || this?.currentAdr?.is_plugin) {
+      if (this.adrType !== DISCOVERY_CATEGORY_TYPE.AGENTv || this?.currentAdr?.is_plugin) {
         radios.unshift({ value: 'master', label: this.$t('cmdb.ciType.masterNode') })
       }
 
       return radios
     },
-    radioList() {
-      return [
-        { value: 'interval', label: this.$t('cmdb.ciType.byInterval') },
-        { value: 'cron', label: '按cron', layout: 'vertical' },
-      ]
-    },
     labelCol() {
-      const span = this.$i18n.locale === 'en' ? 5 : 3
+      const isEn = this.$i18n.locale === 'en'
       return {
-        span
+        xl: {
+          span: isEn ? 4 : 2
+        },
+        lg: {
+          span: isEn ? 5 : 3
+        },
+        sm: {
+          span: isEn ? 6 : 4
+        }
       }
     }
   },
@@ -337,7 +342,7 @@ export default {
       this.uniqueKey = _find?.unique_key ?? ''
       this.isClient = _findADT?.isClient ?? false
 
-      if (this.adrType === 'http') {
+      if (this.adrType === DISCOVERY_CATEGORY_TYPE.HTTP) {
         const {
           category = undefined,
           key = '',
@@ -346,49 +351,85 @@ export default {
           account = '',
           password = '',
           // insecure = false,
-          vcenterName = ''
+          vcenterName = '',
+          _reference = ''
         } = _findADT?.extra_option ?? {}
 
         if (_find?.option?.category === 'private_cloud') {
           this.isPrivateCloud = true
           this.privateCloudName = _find?.option?.en || ''
 
-          if (this.privateCloudName === PRIVATE_CLOUD_NAME.VCenter) {
+          switch (this.privateCloudName) {
-            this.privateCloudForm = {
+            case PRIVATE_CLOUD_NAME.VCenter:
-              host,
+              this.privateCloudForm = {
-              account,
+                host,
-              password,
+                account,
-              // insecure,
+                password,
-              vcenterName,
+                // insecure,
-            }
+                vcenterName,
+                _reference,
+                tabActive: _reference ? TAB_KEY.CONFIG : TAB_KEY.CUSTOM
+              }
+              break
+            default:
+              break
           }
         } else {
           this.isPrivateCloud = false
-          this.form2 = {
+          this.publicCloudForm = {
             key,
             secret,
+            _reference,
+            tabActive: _reference ? TAB_KEY.CONFIG : TAB_KEY.CUSTOM
           }
         }
 
         this.$refs.httpSnmpAd.setCurrentCate(category)
+        this.$nextTick(() => {
+          this.$refs.httpForm.init(this.adr_id)
+        })
       }
-      if (this.adrType === 'snmp') {
+
-        this.nodes = _findADT?.extra_option?.nodes?.length ? _findADT?.extra_option?.nodes : [
+      if (this.adrType === DISCOVERY_CATEGORY_TYPE.COMPONENT) {
+        const {
+          cidr = '',
+          ports = '',
+          enable_cidr = '',
+        } = _findADT?.extra_option ?? {}
+        this.portScanConfigForm = {
+          cidr,
+          ports,
+          enable_cidr
+        }
+      }
+
+      if (this.adrType === DISCOVERY_CATEGORY_TYPE.SNMP) {
+        const nodes = _findADT?.extra_option?.nodes?.length ? _findADT?.extra_option?.nodes : [
           {
             id: uuidv4(),
             ip: '',
-            community: '',
+            community: 'public',
             version: '',
           },
         ]
+        this.nodes = nodes
         this.$nextTick(() => {
           this.$refs.nodeSetting.initNodesFunc()
-          this.$nextTick(() => {
-            this.$refs.nodeSetting.setNodeField()
-          })
         })
+
+        let cidrList = []
+        const cidr = _findADT?.extra_option?.cidr
+        if (Array.isArray(cidr) && cidr?.length) {
+          cidrList = cidr.map((v) => {
+            return {
+              id: uuidv4(),
+              value: v?.value ? v.value : v
+            }
+          })
+        }
+        this.cidrList = cidrList
       }
-      if (this.adrType === 'agent') {
+      if (this.adrType === DISCOVERY_CATEGORY_TYPE.AGENT) {
         this.tableData = (_find?.attributes || []).map((item) => {
           if (_findADT.attributes) {
             return {
@@ -413,15 +454,19 @@ export default {
         query_expr: _findADT.query_expr || '',
         enabled: _findADT?.enabled ?? true,
       }
+
+      const allMachineIndex = this.agentTypeRadioList.findIndex((item) => item.value === 'all')
+
       if (_findADT.query_expr) {
         this.agent_type = 'query_expr'
       } else if (_findADT.agent_id) {
         this.agent_type = _findADT.agent_id === '0x0000' ? 'master' : 'agent_id'
+      } else if (_findADT.agent_id === '' && allMachineIndex !== -1) {
+        this.agent_type = 'all'
       } else {
         this.agent_type = this.agentTypeRadioList[0].value
       }
 
-      this.interval = 'cron'
       this.cron = _findADT?.cron || ''
     },
 
@@ -432,19 +477,10 @@ export default {
       const { currentAdt } = this
       let params
 
-      const isError = this.validateForm()
+      if (this.adrType === DISCOVERY_CATEGORY_TYPE.HTTP) {
-      if (isError) {
+        const { isError, data: cloudOption } = this.validateHTTPForm()
-        return
+        if (isError) {
-      }
+          return
-
-      if (this.adrType === 'http') {
-        let cloudOption = {}
-        if (this.isPrivateCloud) {
-          if (this.privateCloudName === PRIVATE_CLOUD_NAME.VCenter) {
-            cloudOption = this.privateCloudForm
-          }
-        } else {
-          cloudOption = this.form2
         }
 
         params = {
@@ -454,12 +490,25 @@ export default {
           },
         }
       }
-      if (this.adrType === 'snmp') {
+
+      if (this.adrType === DISCOVERY_CATEGORY_TYPE.COMPONENT) {
+        const portScanConfigForm = _.omitBy(this.portScanConfigForm, _.isEmpty) || {}
         params = {
-          extra_option: { nodes: this.$refs.nodeSetting?.getNodeValue() ?? [] },
+          extra_option: {
+            ...portScanConfigForm,
+          },
         }
       }
-      if (this.adrType === 'agent') {
+
+      if (this.adrType === DISCOVERY_CATEGORY_TYPE.SNMP) {
+        params = {
+          extra_option: {
+            nodes: this.$refs.nodeSetting?.getNodeValue() ?? [],
+            cidr: this?.cidrList?.map((item) => item.value) || []
+          },
+        }
+      }
+      if (this.adrType === DISCOVERY_CATEGORY_TYPE.AGENT) {
         const $table = this.$refs.attrMapTable
         const { fullData: _tableData } = $table.getTableData()
         const attributes = {}
@@ -490,7 +539,7 @@ export default {
         ...params,
         ...this.form,
         adr_id: currentAdt.adr_id,
-        cron: this.interval === 'cron' ? this.cron : null,
+        cron: this.cron,
       }
 
       if (this.agent_type === 'agent_id' || this.agent_type === 'all') {
@@ -525,8 +574,9 @@ export default {
         }
       }
 
+      // 去除合并后的旧配置
       if (params.extra_option) {
-        params.extra_option = _.omit(params.extra_option, 'insecure')
+        params.extra_option = this.handleOldExtraOption(params.extra_option)
       }
 
       if (currentAdt?.isClient) {
@@ -542,42 +592,96 @@ export default {
       }
     },
 
-    validateForm() {
+    /**
+     * HTTP 表单校验
+     * 公有云 私有云
+     */
+    validateHTTPForm() {
       let isError = false
+      let data = {}
 
-      if (this.adrType === 'http') {
+      const formData = this?.[this.isPrivateCloud ? 'privateCloudForm' : 'publicCloudForm']
-        if (this.isPrivateCloud) {
+      if (formData.tabActive === TAB_KEY.CONFIG) {
-          if (this.privateCloudName === PRIVATE_CLOUD_NAME.VCenter) {
+        if (!formData._reference) {
-            const vcenterErros = {
+          isError = true
-              'host': `${this.$t('placeholder1')} ${this.$t('cmdb.ciType.host')}`,
+          this.$message.error(this.$t('cmdb.ad.configErrTip'))
-              'account': `${this.$t('placeholder1')} ${this.$t('cmdb.ciType.account')}`,
+        }
-              'password': `${this.$t('placeholder1')} ${this.$t('cmdb.ciType.password')}`
+
-            }
+        data._reference = formData._reference
-            const findError = Object.keys(this.privateCloudForm).find((key) => !this.privateCloudForm[key] && vcenterErros[key])
+        if (this.privateCloudName === PRIVATE_CLOUD_NAME.VCenter) {
-            if (findError) {
+          data.vcenterName = formData.vcenterName
-              isError = true
+        }
-              this.$message.error(this.$t(vcenterErros[findError]))
+
-            }
+        return {
-          }
+          isError,
-        } else {
+          data
-          const publicCloudErros = {
-            'key': `${this.$t('placeholder1')} key`,
-            'secret': `${this.$t('placeholder1')} secret`
-          }
-          const findError = Object.keys(this.form2).find((key) => !this.form2[key] && publicCloudErros[key])
-          if (findError) {
-            isError = true
-            this.$message.error(this.$t(publicCloudErros[findError]))
-          }
         }
       }
 
-      return isError
+      if (this.isPrivateCloud) {
+        if (this.privateCloudName === PRIVATE_CLOUD_NAME.VCenter) {
+          data = _.pick(this.privateCloudForm, ['host', 'account', 'password', 'vcenterName'])
+          const vcenterErros = {
+            'host': `${this.$t('placeholder1')} ${this.$t('cmdb.ciType.host')}`,
+            'account': `${this.$t('placeholder1')} ${this.$t('cmdb.ciType.account')}`,
+            'password': `${this.$t('placeholder1')} ${this.$t('cmdb.ciType.password')}`
+          }
+          const findError = Object.keys(this.privateCloudForm).find((key) => !this.privateCloudForm[key] && vcenterErros[key])
+          if (findError) {
+            isError = true
+            this.$message.error(this.$t(vcenterErros[findError]))
+          }
+        }
+      } else {
+        data = _.pick(this.publicCloudForm, ['key', 'secret'])
+        const publicCloudErros = {
+          'key': `${this.$t('placeholder1')} key`,
+          'secret': `${this.$t('placeholder1')} secret`
+        }
+        const findError = Object.keys(this.publicCloudForm).find((key) => !this.publicCloudForm[key] && publicCloudErros[key])
+        if (findError) {
+          isError = true
+          this.$message.error(this.$t(publicCloudErros[findError]))
+        }
+      }
+
+      return {
+        isError,
+        data
+      }
+    },
+
+    /**
+     * 去除多余旧配置
+     */
+    handleOldExtraOption(option) {
+      let extra_option = _.cloneDeep(option)
+
+      // VCenter 旧配置
+      if (extra_option?.insecure) {
+        Reflect.deleteProperty(extra_option, 'insecure')
+      }
+
+      // 根据 HTTP 选项去除多余属性
+      const formData = this?.[this.isPrivateCloud ? 'privateCloudForm' : 'publicCloudForm']
+      switch (formData.tabActive) {
+        case TAB_KEY.CUSTOM:
+          Reflect.deleteProperty(extra_option, '_reference')
+          break
+        case TAB_KEY.CONFIG:
+          extra_option = _.omit(extra_option, ['host', 'account', 'password', 'key', 'secret'])
+          break
+        default:
+          break
+      }
+
+      return extra_option
     },
 
     handleOpenCmdb() {
       this.$refs.cmdbDrawer.open()
     },
+
     copySuccess(text) {
       this.form = {
         ...this.form,
@@ -653,6 +757,7 @@ export default {
   .radio-master-tip {
     font-size: 12px;
     color: #86909c;
+    line-height: 14px;
   }
 }
 .attr-ad-snmp-form {

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

@@ -21,9 +21,7 @@
             <div :class="{ 'attribute-card-name': true, 'attribute-card-name-default-show': property.default_show }">
               {{ property.alias || property.name }}
             </div>
-            <div v-if="property.is_password" class="attribute-card_value-type">{{ $t('cmdb.ciType.password') }}</div>
+            <div class="attribute-card_value-type">{{ valueTypeMap[getPropertyType(property)] }}</div>
-            <div v-else-if="property.is_link" class="attribute-card_value-type">{{ $t('cmdb.ciType.link') }}</div>
-            <div v-else class="attribute-card_value-type">{{ valueTypeMap[property.value_type] }}</div>
           </div>
           <div
             class="attribute-card-trigger"
@@ -74,7 +72,10 @@
                 !isUnique &&
                 !['6'].includes(property.value_type) &&
                 !property.is_password &&
-                !property.is_list
+                !property.is_list &&
+                !property.is_reference &&
+                !property.is_bool &&
+                !(Array.isArray(property.choice_value) ? property.choice_value.length > 0 : false)
             "
             :title="$t(isShowId ? 'cmdb.ciType.cancelSetAsShow' : 'cmdb.ciType.setAsShow')"
           >
@@ -101,6 +102,8 @@ import ValueTypeIcon from '@/components/CMDBValueTypeMapIcon'
 import { valueTypeMap } from '../../utils/const'
 import TriggerForm from './triggerForm.vue'
 import { updateCIType } from '@/modules/cmdb/api/CIType'
+import { getPropertyType } from '../../utils/helper'
+
 export default {
   name: 'AttributeCard',
   inject: {
@@ -191,6 +194,7 @@ export default {
     },
   },
   methods: {
+    getPropertyType,
     handleEdit() {
       this.$emit('edit')
     },

cmdb-ui/src/modules/cmdb/views/ci_types/attributeEdit/referenceModelSelect.vue

@@ -0,0 +1,78 @@
+<template>
+  <a-form-item
+    :label="$t('cmdb.ciType.referenceModel')"
+    :extra="$t('cmdb.ciType.referenceModelTip1')"
+    :label-col="formItemLayout.labelCol"
+    :wrapper-col="formItemLayout.wrapperCol"
+  >
+    <a-select
+      allowClear
+      v-decorator="['reference_type_id', {
+        rules: [{ required: true, message: $t('cmdb.ciType.referenceModelTip') }],
+        initialValue: ''
+      }]"
+      showSearch
+      optionFilterProp="title"
+      @dropdownVisibleChange="handleDropdownVisibleChange"
+    >
+      <a-select-option
+        v-for="(item) in options"
+        :key="item.value"
+        :title="item.label"
+      >
+        {{ item.label }}
+      </a-select-option>
+    </a-select>
+  </a-form-item>
+</template>
+
+<script>
+import { getCITypes } from '@/modules/cmdb/api/CIType'
+
+export default {
+  name: 'ReferenceModelSelect',
+  props: {
+    form: {
+      type: Object,
+      required: true,
+    },
+    isLazyRequire: {
+      type: Boolean,
+      default: true
+    },
+    formItemLayout: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      isInit: false,
+      options: []
+    }
+  },
+  mounted() {
+    if (!this.isLazyRequire) {
+      this.getSelectOptions()
+    }
+  },
+  methods: {
+    handleDropdownVisibleChange(open) {
+      if (!this.isInit && open) {
+        this.getSelectOptions()
+      }
+    },
+    async getSelectOptions() {
+      this.isInit = true
+      const res = await getCITypes()
+
+      this.options = res.ci_types.map((ciType) => {
+        return {
+          value: ciType.id,
+          label: ciType?.alias || ciType?.name || ''
+        }
+      })
+    }
+  }
+}
+</script>

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

@@ -60,14 +60,20 @@
           v-decorator="['value_type', { rules: [{ required: true }] }]"
           @change="handleChangeValueType"
         >
-          <a-select-option :value="key" :key="key" v-for="(value, key) in valueTypeMap">{{ value }}</a-select-option>
+          <a-select-option :value="key" :key="key" v-for="(value, key) in valueTypeMap">
+            <ops-icon :type="getPropertyIcon({ value_type: key })" />
+            <span class="value-type-text">{{ value }}</span>
+          </a-select-option>
         </a-select>
       </a-form-item></a-col
       >
-      <a-col :span="currentValueType === '6' ? 24 : 12">
+      <a-col
+        v-if="currentValueType !== '11'"
+        :span="currentValueType === '6' ? 24 : 12"
+      >
         <a-form-item
           :label-col="{ span: currentValueType === '6' ? 4 : 8 }"
-          :wrapper-col="{ span: currentValueType === '6' ? 18 : 12 }"
+          :wrapper-col="{ span: currentValueType === '6' ? 18 : 15 }"
           :label="$t('cmdb.ciType.defaultValue')"
         >
           <template>
@@ -77,6 +83,10 @@
               v-decorator="['default_value', { rules: [{ required: false }] }]"
             >
             </a-input>
+            <a-switch
+              v-else-if="currentValueType === '10'"
+              v-decorator="['default_value', { rules: [{ required: false }], valuePropName: 'checked' }]"
+            />
             <a-select
               v-decorator="['default_value', { rules: [{ required: false }] }]"
               mode="tags"
@@ -95,12 +105,7 @@
             </a-input-number>
             <a-input
               style="width: 100%"
-              v-else-if="
+              v-else-if="['2', '5', '7', '8', '9'].includes(currentValueType)"
-                currentValueType === '2' ||
-                  currentValueType === '5' ||
-                  currentValueType === '7' ||
-                  currentValueType === '8'
-              "
               v-decorator="['default_value', { rules: [{ required: false }] }]"
             >
             </a-input>
@@ -157,7 +162,18 @@
         </a-form-item>
       </a-col>
 
-      <a-col :span="currentValueType === '2' ? 6 : 0" v-if="currentValueType !== '6'">
+      <a-col
+        v-if="currentValueType === '11'"
+        :span="12"
+      >
+        <ReferenceModelSelect
+          :form="form"
+          :isLazyRequire="false"
+          :formItemLayout="formItemLayout"
+        />
+      </a-col>
+
+      <!-- <a-col :span="currentValueType === '2' ? 6 : 0" v-if="currentValueType !== '6'">
         <a-form-item
           :hidden="currentValueType === '2' ? false : true"
           :label-col="horizontalFormItemLayout.labelCol"
@@ -171,7 +187,6 @@
                 <a-icon
                   style="position:absolute;top:2px;left:-17px;color:#2f54eb;"
                   type="question-circle"
-                  theme="filled"
                   @click="
                     (e) => {
                       e.stopPropagation()
@@ -189,10 +204,10 @@
             v-decorator="['is_index', { rules: [], valuePropName: 'checked' }]"
           />
         </a-form-item>
-      </a-col>
+      </a-col> -->
       <a-col :span="6" v-if="currentValueType !== '6' && currentValueType !== '7'">
         <a-form-item
-          :label-col="currentValueType === '2' ? { span: 8 } : horizontalFormItemLayout.labelCol"
+          :label-col="horizontalFormItemLayout.labelCol"
           :wrapper-col="horizontalFormItemLayout.wrapperCol"
           :label="$t('cmdb.ciType.unique')"
         >
@@ -206,7 +221,7 @@
       </a-col>
       <a-col :span="6">
         <a-form-item
-          :label-col="['2', '6', '7'].findIndex(i => currentValueType === i) === -1 ? { span: 8 } : horizontalFormItemLayout.labelCol"
+          :label-col="horizontalFormItemLayout.labelCol"
           :wrapper-col="horizontalFormItemLayout.wrapperCol"
           :label="$t('required')"
         >
@@ -219,7 +234,7 @@
       </a-col>
       <a-col :span="6">
         <a-form-item
-          :label-col="currentValueType === '2' ? { span: 12 } : horizontalFormItemLayout.labelCol"
+          :label-col="horizontalFormItemLayout.labelCol"
           :wrapper-col="horizontalFormItemLayout.wrapperCol"
         >
           <template slot="label">
@@ -228,9 +243,8 @@
             >{{ $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:2px;left:-17px;color:#A5A9BC;"
-                  type="question-circle"
+                  type="info-circle"
-                  theme="filled"
                   @click="
                     (e) => {
                       e.stopPropagation()
@@ -250,7 +264,7 @@
       </a-col>
       <a-col :span="6" v-if="currentValueType !== '6' && currentValueType !== '7'">
         <a-form-item
-          :label-col="currentValueType === '2' ? horizontalFormItemLayout.labelCol : { span: 8 }"
+          :label-col="horizontalFormItemLayout.labelCol"
           :wrapper-col="horizontalFormItemLayout.wrapperCol"
           :label="$t('cmdb.ciType.isSortable')"
         >
@@ -263,9 +277,9 @@
         </a-form-item>
       </a-col>
 
-      <a-col :span="6" v-if="currentValueType !== '6' && currentValueType !== '7'">
+      <a-col :span="6" v-if="!['6', '7', '10'].includes(currentValueType)">
         <a-form-item
-          :label-col="currentValueType === '2' ? { span: 8 } : horizontalFormItemLayout.labelCol"
+          :label-col="horizontalFormItemLayout.labelCol"
           :wrapper-col="horizontalFormItemLayout.wrapperCol"
         >
           <template slot="label">
@@ -274,9 +288,8 @@
             >{{ $t('cmdb.ciType.list') }}
               <a-tooltip :title="$t('cmdb.ciType.listTips')">
                 <a-icon
-                  style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
+                  style="position:absolute;top:3px;left:-17px;color:#A5A9BC;"
-                  type="question-circle"
+                  type="info-circle"
-                  theme="filled"
                   @click="
                     (e) => {
                       e.stopPropagation()
@@ -297,7 +310,7 @@
       </a-col>
       <a-col span="6">
         <a-form-item
-          :label-col="['2', '6', '7'].findIndex(i => currentValueType === i) === -1 ? { span: 12 } : horizontalFormItemLayout.labelCol"
+          :label-col="horizontalFormItemLayout.labelCol"
           :wrapper-col="horizontalFormItemLayout.wrapperCol"
         >
           <template slot="label">
@@ -306,9 +319,8 @@
             >{{ $t('cmdb.ciType.isDynamic') }}
               <a-tooltip :title="$t('cmdb.ciType.dynamicTips')">
                 <a-icon
-                  style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
+                  style="position:absolute;top:3px;left:-17px;color:#A5A9BC;"
-                  type="question-circle"
+                  type="info-circle"
-                  theme="filled"
                   @click="
                     (e) => {
                       e.stopPropagation()
@@ -328,27 +340,36 @@
       </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)">
+        <a-col :span="24">
           <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 12 }" :label="$t('cmdb.ciType.reg')">
-            <RegSelect :isShowErrorMsg="false" v-model="re_check" :limitedFormat="getLimitedFormat()" />
+            <RegSelect
+              :isShowErrorMsg="false"
+              :limitedFormat="getLimitedFormat()"
+              :disabled="['6', '10', '11'].includes(currentValueType)"
+              v-model="re_check"
+            />
           </a-form-item>
         </a-col>
         <a-col :span="24">
           <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }" :label="$t('cmdb.ciType.font')">
-            <FontArea ref="fontArea" />
+            <FontArea ref="fontArea" :fontColorDisabled="['8', '11'].includes(currentValueType)" />
           </a-form-item>
         </a-col>
-        <a-col :span="24" v-if="!['6', '7'].includes(currentValueType)">
+        <a-col :span="24" v-if="!['6', '7', '10', '11'].includes(currentValueType)">
           <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }" :label="$t('cmdb.ciType.choiceValue')">
             <PreValueArea
               v-if="drawerVisible"
               :canDefineScript="canDefineScript"
               ref="preValueArea"
               :disabled="isShowComputedArea"
+              :CITypeId="CITypeId"
+              :enumValueType="enumValueType"
             />
+
+            <a-button type="primary" size="small" ghost @click="resetPreValue" >{{ $t('reset') }}</a-button>
           </a-form-item>
         </a-col>
-        <a-col :span="24" v-if="!['6', '7'].includes(currentValueType)">
+        <a-col :span="24" v-if="!['6', '7', '10', '11'].includes(currentValueType)">
           <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
             <template slot="label">
               <span
@@ -356,9 +377,8 @@
               >{{ $t('cmdb.ciType.computedAttribute') }}
                 <a-tooltip :title="$t('cmdb.ciType.computedAttributeTips')">
                   <a-icon
-                    style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
+                    style="position:absolute;top:3px;left:-17px;color:#A5A9BC;"
-                    type="question-circle"
+                    type="info-circle"
-                    theme="filled"
                     @click="
                       (e) => {
                         e.stopPropagation()
@@ -375,6 +395,10 @@
               name="is_computed"
               v-decorator="['is_computed', { rules: [], valuePropName: 'checked' }]"
             />
+            <div v-show="isShowComputedArea" class="computed-attr-tip">
+              <div>1. {{ $t('cmdb.ciType.computedAttrTip1') }}</div>
+              <div>2. {{ $t('cmdb.ciType.computedAttrTip2') }}</div>
+            </div>
             <ComputedArea
               showCalcComputed
               ref="computedArea"
@@ -410,14 +434,17 @@ import {
   calcComputedAttribute,
 } from '@/modules/cmdb/api/CITypeAttr'
 import { valueTypeMap } from '../../utils/const'
+import { getPropertyType, getPropertyIcon } from '../../utils/helper'
 import ComputedArea from './computedArea.vue'
 import PreValueArea from './preValueArea.vue'
 import FontArea from './fontArea.vue'
 import RegSelect from '@/components/RegexSelect'
+import ReferenceModelSelect from './attributeEdit/referenceModelSelect.vue'
+import { ENUM_VALUE_TYPE } from './preValueAttr/constants.js'
 
 export default {
   name: 'AttributeEditForm',
-  components: { ComputedArea, PreValueArea, vueJsonEditor, FontArea, RegSelect },
+  components: { ComputedArea, PreValueArea, vueJsonEditor, FontArea, RegSelect, ReferenceModelSelect },
   props: {
     CITypeId: {
       type: Number,
@@ -446,6 +473,7 @@ export default {
 
       defaultForDatetime: '',
       re_check: {},
+      enumValueType: ENUM_VALUE_TYPE.INPUT
     }
   },
 
@@ -462,7 +490,7 @@ export default {
       return formLayout === 'horizontal'
         ? {
             labelCol: { span: 8 },
-            wrapperCol: { span: 12 },
+            wrapperCol: { span: 15 },
           }
         : {}
     },
@@ -479,6 +507,7 @@ export default {
   },
   mounted() {},
   methods: {
+    getPropertyIcon,
     async handleCreate() {
       try {
         await canDefineComputed()
@@ -511,9 +540,7 @@ export default {
         }
       }
       if (property === 'is_list') {
-        this.form.setFieldsValue({
+        this.handleSwitchIsList(checked)
-          default_value: checked ? [] : '',
-        })
       }
       if (checked && property === 'is_sortable') {
         this.$message.warning(this.$t('cmdb.ciType.addAttributeTips1'))
@@ -531,6 +558,26 @@ export default {
       }
     },
 
+    handleSwitchIsList(checked) {
+      let defaultValue = checked ? [] : ''
+
+      switch (this.currentValueType) {
+        case '2':
+        case '9':
+          defaultValue = ''
+          break
+        case '10':
+          defaultValue = checked ? '' : false
+          break
+        default:
+          break
+      }
+
+      this.form.setFieldsValue({
+        default_value: defaultValue,
+      })
+    },
+
     async handleEdit(record, attributes) {
       try {
         await canDefineComputed()
@@ -539,12 +586,7 @@ export default {
         this.canDefineComputed = false
       }
       const _record = _.cloneDeep(record)
-      if (_record.is_password) {
+      _record.value_type = getPropertyType(_record)
-        _record.value_type = '7'
-      }
-      if (_record.is_link) {
-        _record.value_type = '8'
-      }
       this.drawerTitle = this.$t('cmdb.ciType.editAttribute')
       this.drawerVisible = true
       this.record = _record
@@ -568,8 +610,13 @@ export default {
             is_dynamic: _record.is_dynamic,
           })
         }
+        if (_record.value_type === '11') {
+          this.form.setFieldsValue({
+            reference_type_id: _record.reference_type_id
+          })
+        }
         console.log(_record)
-        if (!['6'].includes(_record.value_type) && _record.re_check) {
+        if (!['6', '10', '11'].includes(_record.value_type) && _record.re_check) {
           this.re_check = {
             value: _record.re_check,
           }
@@ -578,7 +625,11 @@ export default {
         }
         if (_record.default) {
           this.$nextTick(() => {
-            if (_record.value_type === '0') {
+            if (_record.value_type === '10') {
+              this.form.setFieldsValue({
+                default_value: Boolean(_record.default.default),
+              })
+            } else if (_record.value_type === '0') {
               if (_record.is_list) {
                 this.$nextTick(() => {
                   this.form.setFieldsValue({
@@ -634,7 +685,23 @@ export default {
           })
         }
         const _find = attributes.find((item) => item.id === _record.id)
-        if (!['6', '7'].includes(_record.value_type)) {
+        if (!['6', '7', '10', '11'].includes(_record.value_type)) {
+          switch (_record.value_type) {
+            case '0':
+            case '1':
+              this.enumValueType = ENUM_VALUE_TYPE.NUMBER
+              break
+            case '3':
+              this.enumValueType = ENUM_VALUE_TYPE.DATE_TIME
+              break
+            case '4':
+              this.enumValueType = ENUM_VALUE_TYPE.DATE
+              break
+            default:
+              this.enumValueType = ENUM_VALUE_TYPE.INPUT
+              break
+          }
+
           this.$refs.preValueArea.setData({
             choice_value: (_find || {}).choice_value || [],
             choice_web_hook: _record.choice_web_hook,
@@ -664,10 +731,10 @@ export default {
             })
           }
 
-          delete values['default_show']
-          delete values['is_required']
           const { default_value } = values
-          if (values.value_type === '0' && default_value) {
+          if (values.value_type === '10') {
+            values.default = { default: values.is_list ? default_value : Boolean(default_value) }
+          } else if (values.value_type === '0' && default_value) {
             if (values.is_list) {
               values.default = { default: default_value || null }
             } else {
@@ -695,29 +762,56 @@ export default {
             values.default = { default: null }
           }
 
-          delete values.default_value
           if (values.is_computed) {
             const computedAreaData = this.$refs.computedArea.getData()
             values = { ...values, ...computedAreaData }
           } else {
             // If it is a non-computed attribute, check to see if there is a predefined value
-            if (!['6', '7'].includes(values.value_type)) {
+            if (!['6', '7', '10', '11'].includes(values.value_type)) {
               const preValueAreaData = this.$refs.preValueArea.getData()
+              // 预定义值校验错误
+              if (preValueAreaData?.isError) {
+                return
+              }
               values = { ...values, ...preValueAreaData }
             }
           }
+
+          delete values['default_show']
+          delete values['is_required']
+          delete values.default_value
+
           const fontOptions = this.$refs.fontArea.getData()
-          if (values.value_type === '7') {
+
-            values.value_type = '2'
+          if (!['6', '10', '11'].includes(values.value_type)) {
-            values.is_password = true
-          }
-          if (values.value_type === '8') {
-            values.value_type = '2'
-            values.is_link = true
-          }
-          if (values.value_type !== '6') {
             values.re_check = this.re_check?.value ?? null
           }
+
+          // 重置数据类型
+          switch (values.value_type) {
+            case '7':
+              values.value_type = '2'
+              values.is_password = true
+              break
+            case '8':
+              values.value_type = '2'
+              values.is_link = true
+              break
+            case '9':
+              values.value_type = '2'
+              break
+            case '10':
+              values.value_type = '7'
+              values.is_bool = true
+              break
+            case '11':
+              values.value_type = '0'
+              values.is_reference = true
+              break
+            default:
+              break
+          }
+
           if (values.id) {
             await this.updateAttribute(values.id, { ...values, option: { fontOptions } }, isCalcComputed)
           } else {
@@ -759,10 +853,19 @@ export default {
     },
     changeDefaultForDatetime(value) {
       this.defaultForDatetime = value
-      if (value === '$custom_time') {
+      switch (value) {
-        this.form.setFieldsValue({
+        case '$custom_time':
-          default_value: undefined,
+          this.form.setFieldsValue({
-        })
+            default_value: undefined,
+          })
+          break
+        case '$updated_at':
+          this.form.setFieldsValue({
+            is_dynamic: true,
+          })
+          break
+        default:
+          break
       }
     },
     onClick({ key }) {
@@ -790,12 +893,27 @@ export default {
       }
       return []
     },
+
+    resetPreValue() {
+      if (this.$refs.preValueArea) {
+        this.$refs.preValueArea.resetData()
+      }
+    }
   },
   watch: {},
 }
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.computed-attr-tip {
+  font-size: 12px;
+  line-height: 22px;
+  color: #a5a9bc;
+}
+.value-type-text {
+  margin-left: 4px;
+}
+</style>
 <style lang="less">
 .attribute-edit-form {
   .jsoneditor-outer {

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

@@ -16,21 +16,21 @@
       <a-space style="margin-bottom: 10px">
         <a-button @click="handleAddGroup" size="small" icon="plus">{{ $t('cmdb.ciType.group') }}</a-button>
         <a-button @click="handleOpenUniqueConstraint" size="small">{{ $t('cmdb.ciType.uniqueConstraint') }}</a-button>
-        <div>
+        <div class="ci-types-attributes-flex">
           <a-tooltip
-            v-for="type in Object.keys(valueTypeMap)"
+            v-for="item in valueTypeMap"
-            :key="type"
+            :key="item.key"
-            :title="$t('cmdb.ciType.filterTips', { name: valueTypeMap[type] })"
+            :title="$t('cmdb.ciType.filterTips', { name: item.value })"
           >
             <span
-              @click="handleFilterType(type)"
+              @click="handleFilterType(item.key)"
               :class="{
                 'ci-types-attributes-filter': true,
-                'ci-types-attributes-filter-selected': attrTypeFilter.includes(type),
+                'ci-types-attributes-filter-selected': attrTypeFilter.includes(item.key),
               }"
             >
-              <ops-icon :type="getPropertyIcon({ value_type: type })" />
+              <ops-icon :type="getPropertyIcon({ value_type: item.key })" />
-              {{ valueTypeMap[type] }}
+              {{ item.value }}
             </span>
           </a-tooltip>
         </div>
@@ -200,7 +200,7 @@ import AttributeEditForm from './attributeEditForm.vue'
 import NewCiTypeAttrModal from './newCiTypeAttrModal.vue'
 import UniqueConstraint from './uniqueConstraint.vue'
 import { valueTypeMap } from '../../utils/const'
-import { getPropertyIcon } from '../../utils/helper'
+import { getPropertyIcon, getPropertyType } from '../../utils/helper'
 
 export default {
   name: 'AttributesTable',
@@ -233,6 +233,7 @@ export default {
       attrTypeFilter: [],
       unique: '',
       show_id: null,
+      groupMaxCount: {},
     }
   },
   computed: {
@@ -243,7 +244,12 @@ export default {
       return this.$store.state.windowHeight
     },
     valueTypeMap() {
-      return valueTypeMap()
+      const map = valueTypeMap()
+      const keys = ['0', '1', '2', '9', '3', '4', '5', '6', '7', '8', '10', '11']
+      return keys.map((key) => ({
+        key,
+        value: map[key]
+      }))
     },
   },
   provide() {
@@ -255,6 +261,12 @@ export default {
       show_id: () => {
         return this.show_id
       },
+      providerGroupsData: () => {
+        return {
+          CITypeGroups: this.CITypeGroups,
+          otherGroupAttributes: this.otherGroupAttributes
+        }
+      }
     }
   },
   beforeCreate() {},
@@ -329,6 +341,7 @@ export default {
         })
         this.CITypeGroups = values[1]
         this.CITypeGroups.forEach((g) => {
+          this.groupMaxCount[g.name] = g.attributes.filter(a => a.inherited).length
           g.attributes.forEach((a) => {
             a.is_required = (temp[a.id] && temp[a.id].is_required) || false
             a.default_show = (temp[a.id] && temp[a.id].default_show) || false
@@ -464,44 +477,43 @@ export default {
     handleChange(e, group) {
       console.log('changess', group)
       if (e.hasOwnProperty('moved') && e.moved.oldIndex !== e.moved.newIndex) {
-        if (group === -1) {
+        if (group === -1 || group === null) {
-          this.$message.error(this.$t('cmdb.ciType.attributeSortedTips'))
+          this.refreshPage(this.$t('cmdb.ciType.attributeSortedTips'))
+        } else if (e.moved.newIndex < this.groupMaxCount[group]) {
+          this.refreshPage(this.$t('cmdb.ciType.attributeSortedTips2'))
         } else {
           transferCITypeAttrIndex(this.CITypeId, {
             from: { attr_id: e.moved.element.id, group_name: group },
-            to: { order: e.moved.newIndex, group_name: group },
+            to: { order: e.moved.newIndex, group_name: group }
           })
-            .then((res) => this.$message.success(this.$t('updateSuccess')))
+            .then(() => this.$message.success(this.$t('updateSuccess')))
-            .catch(() => {
+            .catch(() => this.init())
-              this.abortDraggable()
-            })
         }
       }
-
       if (e.hasOwnProperty('added')) {
         this.addRemoveGroupFlag = { to: { group_name: group, order: e.added.newIndex }, inited: true }
       }
-
       if (e.hasOwnProperty('removed')) {
         this.$nextTick(() => {
-          transferCITypeAttrIndex(this.CITypeId, {
+          if (this.addRemoveGroupFlag.to.order < this.groupMaxCount[this.addRemoveGroupFlag.to.group_name]) {
-            from: { attr_id: e.removed.element.id, group_name: group },
+            this.refreshPage(this.$t('cmdb.ciType.attributeSortedTips2'))
-            to: { group_name: this.addRemoveGroupFlag.to.group_name, order: this.addRemoveGroupFlag.to.order },
+          } else {
-          })
+            transferCITypeAttrIndex(this.CITypeId, {
-            .then((res) => this.$message.success(this.$t('saveSuccess')))
+              from: { attr_id: e.removed.element.id, group_name: group },
-            .catch(() => {
+              to: { group_name: this.addRemoveGroupFlag.to.group_name, order: this.addRemoveGroupFlag.to.order }
-              this.abortDraggable()
-            })
-            .finally(() => {
-              this.addRemoveGroupFlag = {}
             })
+              .then(() => this.$message.success(this.$t('saveSuccess')))
+              .catch(() => this.init())
+              .finally(() => {
+                this.addRemoveGroupFlag = {}
+              })
+          }
         })
       }
     },
-    abortDraggable() {
+    refreshPage(errorMessage) {
-      this.$nextTick(() => {
+      this.$message.error(errorMessage)
-        this.$router.push({ name: 'ci_type' })
+      this.init()
-      })
     },
     updatePropertyIndex() {
       const attributes = [] // All attributes
@@ -579,26 +591,11 @@ export default {
         if (!attrTypeFilter.length) {
           return true
         } else {
-          if (attrTypeFilter.includes('7') && attr.is_password) {
+          const valueType = getPropertyType(attr)
-            return true
+          return attrTypeFilter.includes(valueType)
-          }
-          if (attrTypeFilter.includes('8') && attr.is_link) {
-            return true
-          }
-          if (
-            attrTypeFilter.includes(attr.value_type) &&
-            attr.value_type === '2' &&
-            (attr.is_password || attr.is_link)
-          ) {
-            return false
-          }
-          if (attrTypeFilter.includes(attr.value_type)) {
-            return true
-          }
-          return false
         }
       })
-    },
+    }
   },
 }
 </script>
@@ -612,6 +609,12 @@ export default {
 .ci-types-attributes {
   padding: 0 20px;
   overflow-y: auto;
+
+  &-flex {
+    display: flex;
+    flex-wrap: wrap;
+  }
+
   .ci-types-attributes-filter {
     color: @text-color_4;
     cursor: pointer;

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

@@ -46,16 +46,21 @@
             v-decorator="['value_type', { rules: [{ required: true }], initialValue: '2' }]"
             @change="handleChangeValueType"
           >
-            <a-select-option :value="key" :key="key" v-for="(value, key) in valueTypeMap">
+            <a-select-option :value="item.key" :key="item.key" v-for="(item) in valueTypeMap">
-              {{ value }}
+              <ops-icon :type="getPropertyIcon({ value_type: item.key })" />
-              <span class="value-type-des" v-if="key === '3'">yyyy-mm-dd HH:MM:SS</span>
+              <span class="value-type-text">{{ item.value }}</span>
-              <span class="value-type-des" v-if="key === '4'">yyyy-mm-dd</span>
+              <span class="value-type-des" v-if="item.key === '2'">{{ $t('cmdb.ciType.shortTextTip') }}</span>
-              <span class="value-type-des" v-if="key === '5'">HH:MM:SS</span>
+              <span class="value-type-des" v-if="item.key === '3'">yyyy-mm-dd HH:MM:SS</span>
+              <span class="value-type-des" v-if="item.key === '4'">yyyy-mm-dd</span>
+              <span class="value-type-des" v-if="item.key === '5'">HH:MM:SS</span>
             </a-select-option>
           </a-select>
         </a-form-item>
       </a-col>
-      <a-col :span="currentValueType === '6' ? 24 : 12">
+      <a-col
+        v-if="currentValueType !== '11'"
+        :span="currentValueType === '6' ? 24 : 12"
+      >
         <a-form-item
           :label-col="{ span: currentValueType === '6' ? 4 : 8 }"
           :wrapper-col="{ span: currentValueType === '6' ? 18 : 15 }"
@@ -68,6 +73,10 @@
               v-decorator="['default_value', { rules: [{ required: false }] }]"
             >
             </a-input>
+            <a-switch
+              v-else-if="currentValueType === '10'"
+              v-decorator="['default_value', { rules: [{ required: false }], valuePropName: 'checked' }]"
+            />
             <a-input-number
               style="width: 100%"
               v-else-if="currentValueType === '1'"
@@ -86,12 +95,7 @@
             </a-select>
             <a-input
               style="width: 100%"
-              v-else-if="
+              v-else-if="['2', '5', '7', '8', '9'].includes(currentValueType)"
-                currentValueType === '2' ||
-                  currentValueType === '5' ||
-                  currentValueType === '7' ||
-                  currentValueType === '8'
-              "
               v-decorator="['default_value', { rules: [{ required: false }] }]"
             >
             </a-input>
@@ -148,9 +152,19 @@
           </template>
         </a-form-item>
       </a-col>
+
+      <a-col
+        v-if="currentValueType === '11'"
+        :span="12"
+      >
+        <ReferenceModelSelect
+          :form="form"
+          :formItemLayout="formItemLayout"
+        />
+      </a-col>
     </a-row>
 
-    <a-col :span="currentValueType === '2' ? 6 : 0" v-if="currentValueType !== '6'">
+    <!-- <a-col :span="currentValueType === '2' ? 6 : 0" v-if="currentValueType !== '6'">
       <a-form-item
         :hidden="currentValueType === '2' ? false : true"
         :label-col="horizontalFormItemLayout.labelCol"
@@ -164,7 +178,6 @@
               <a-icon
                 style="position:absolute;top:2px;left:-17px;color:#2f54eb;"
                 type="question-circle"
-                theme="filled"
                 @click="
                   (e) => {
                     e.stopPropagation()
@@ -182,10 +195,10 @@
           v-decorator="['is_index', { rules: [], valuePropName: 'checked', initialValue: true }]"
         />
       </a-form-item>
-    </a-col>
+    </a-col> -->
     <a-col :span="6" v-if="currentValueType !== '6' && currentValueType !== '7'">
       <a-form-item
-        :label-col="currentValueType === '2' ? { span: 8 } : horizontalFormItemLayout.labelCol"
+        :label-col="horizontalFormItemLayout.labelCol"
         :wrapper-col="horizontalFormItemLayout.wrapperCol"
         :label="$t('cmdb.ciType.unique')"
       >
@@ -199,7 +212,7 @@
     </a-col>
     <a-col :span="6">
       <a-form-item
-        :label-col="['2', '6', '7'].findIndex(i => currentValueType === i) === -1 ? { span: 8 } : horizontalFormItemLayout.labelCol"
+        :label-col="horizontalFormItemLayout.labelCol"
         :wrapper-col="horizontalFormItemLayout.wrapperCol"
         :label="$t('required')"
       >
@@ -212,7 +225,7 @@
     </a-col>
     <a-col :span="6">
       <a-form-item
-        :label-col="currentValueType === '2' ? { span: 12 } : horizontalFormItemLayout.labelCol"
+        :label-col="horizontalFormItemLayout.labelCol"
         :wrapper-col="horizontalFormItemLayout.wrapperCol"
       >
         <template slot="label">
@@ -221,9 +234,8 @@
           >{{ $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:2px;left:-17px;color:#A5A9BC;"
-                type="question-circle"
+                type="info-circle"
-                theme="filled"
                 @click="
                   (e) => {
                     e.stopPropagation()
@@ -243,7 +255,7 @@
     </a-col>
     <a-col :span="6" v-if="currentValueType !== '6' && currentValueType !== '7'">
       <a-form-item
-        :label-col="currentValueType === '2' ? horizontalFormItemLayout.labelCol : { span: 8 }"
+        :label-col="horizontalFormItemLayout.labelCol"
         :wrapper-col="horizontalFormItemLayout.wrapperCol"
         :label="$t('cmdb.ciType.isSortable')"
       >
@@ -256,20 +268,19 @@
       </a-form-item>
     </a-col>
 
-    <a-col :span="6" v-if="currentValueType !== '6' && currentValueType !== '7'">
+    <a-col :span="6" v-if="!['6', '7', '10'].includes(currentValueType)">
       <a-form-item
-        :label-col="currentValueType === '2' ? { span: 8 } : horizontalFormItemLayout.labelCol"
+        :label-col="horizontalFormItemLayout.labelCol"
         :wrapper-col="horizontalFormItemLayout.wrapperCol"
       >
         <template slot="label">
           <span
             style="position:relative;white-space:pre;"
-          >{{ $t('cmdb.ciType.list') }}
+          >
             <a-tooltip :title="$t('cmdb.ciType.listTips')">
               <a-icon
-                style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
+                style="position:absolute;top:3px;left:-17px;color:#A5A9BC;"
-                type="question-circle"
+                type="info-circle"
-                theme="filled"
                 @click="
                   (e) => {
                     e.stopPropagation()
@@ -278,6 +289,7 @@
                 "
               />
             </a-tooltip>
+            {{ $t('cmdb.ciType.list') }}
           </span>
         </template>
         <a-switch
@@ -290,18 +302,17 @@
     </a-col>
     <a-col span="6">
       <a-form-item
-        :label-col="['2', '6', '7'].findIndex(i => currentValueType === i) === -1 ? { span: 12 } : horizontalFormItemLayout.labelCol"
+        :label-col="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;"
+                style="position:absolute;top:3px;left:-17px;color:#A5A9BC;"
-                type="question-circle"
+                type="info-circle"
-                theme="filled"
                 @click="
                   (e) => {
                     e.stopPropagation()
@@ -310,6 +321,7 @@
                 "
               />
             </a-tooltip>
+            {{ $t('cmdb.ciType.isDynamic') }}
           </span>
         </template>
         <a-switch
@@ -321,32 +333,44 @@
     </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)">
+      <a-col :span="24">
         <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 12 }" :label="$t('cmdb.ciType.reg')">
-          <RegSelect :isShowErrorMsg="false" v-model="re_check" :limitedFormat="getLimitedFormat()" />
+          <RegSelect
+            v-model="re_check"
+            :isShowErrorMsg="false"
+            :limitedFormat="getLimitedFormat()"
+            :disabled="['6', '10', '11'].includes(currentValueType)"
+          />
         </a-form-item>
       </a-col>
       <a-col :span="24">
         <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }" :label="$t('cmdb.ciType.font')">
-          <FontArea ref="fontArea" />
+          <FontArea ref="fontArea" :fontColorDisabled="['8', '11'].includes(currentValueType)" />
         </a-form-item>
       </a-col>
-      <a-col :span="24" v-if="!['6', '7'].includes(currentValueType)">
+      <a-col :span="24" v-if="!['6', '7', '10', '11'].includes(currentValueType)">
         <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }" :label="$t('cmdb.ciType.choiceValue')">
-          <PreValueArea ref="preValueArea" :canDefineScript="canDefineScript" :disabled="isShowComputedArea" />
+          <PreValueArea
+            ref="preValueArea"
+            :canDefineScript="canDefineScript"
+            :disabled="isShowComputedArea"
+            :CITypeId="CITypeId"
+            :enumValueType="enumValueType"
+          />
+
+          <a-button type="primary" size="small" ghost @click="resetPreValue" >{{ $t('reset') }}</a-button>
         </a-form-item>
       </a-col>
-      <a-col :span="24" v-if="!['6', '7'].includes(currentValueType)">
+      <a-col :span="24" v-if="!['6', '7', '10', '11'].includes(currentValueType)">
         <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
           <template slot="label">
             <span
               style="position:relative;white-space:pre;"
-            >{{ $t('cmdb.ciType.computedAttribute') }}
+            >
               <a-tooltip :title="$t('cmdb.ciType.computedAttributeTips')">
                 <a-icon
-                  style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
+                  style="position:absolute;top:3px;left:-17px;color:#A5A9BC;"
-                  type="question-circle"
+                  type="info-circle"
-                  theme="filled"
                   @click="
                     (e) => {
                       e.stopPropagation()
@@ -355,6 +379,7 @@
                   "
                 />
               </a-tooltip>
+              {{ $t('cmdb.ciType.computedAttribute') }}
             </span>
           </template>
           <a-switch
@@ -363,6 +388,10 @@
             name="is_computed"
             v-decorator="['is_computed', { rules: [], valuePropName: 'checked' }]"
           />
+          <div v-show="isShowComputedArea" class="computed-attr-tip">
+            <div>1. {{ $t('cmdb.ciType.computedAttrTip1') }}</div>
+            <div>2. {{ $t('cmdb.ciType.computedAttrTip2') }}</div>
+          </div>
           <ComputedArea ref="computedArea" v-if="isShowComputedArea" :canDefineComputed="canDefineComputed" />
         </a-form-item>
       </a-col>
@@ -383,6 +412,9 @@ import ComputedArea from './computedArea.vue'
 import PreValueArea from './preValueArea.vue'
 import FontArea from './fontArea.vue'
 import RegSelect from '@/components/RegexSelect'
+import { getPropertyIcon } from '../../utils/helper'
+import ReferenceModelSelect from './attributeEdit/referenceModelSelect.vue'
+import { ENUM_VALUE_TYPE } from './preValueAttr/constants.js'
 
 export default {
   name: 'CreateNewAttribute',
@@ -392,12 +424,17 @@ export default {
     vueJsonEditor,
     FontArea,
     RegSelect,
+    ReferenceModelSelect,
   },
   props: {
     hasFooter: {
       type: Boolean,
       default: true,
     },
+    CITypeId: {
+      type: Number,
+      default: null
+    }
   },
   data() {
     return {
@@ -420,17 +457,24 @@ export default {
       defaultForDatetime: '',
 
       re_check: {},
+      enumValueType: ENUM_VALUE_TYPE.INPUT
     }
   },
   computed: {
     valueTypeMap() {
-      return valueTypeMap()
+      const map = valueTypeMap()
+      const keys = ['0', '1', '2', '9', '3', '4', '5', '6', '7', '8', '10', '11']
+      return keys.map((key) => ({
+        key,
+        value: map[key]
+      }))
     },
     canDefineScript() {
       return this.canDefineComputed
     },
   },
   methods: {
+    getPropertyIcon,
     handleSubmit(isCloseModal = true) {
       this.form.validateFields(async (err, values) => {
         if (!err) {
@@ -441,9 +485,10 @@ export default {
           console.log(values)
           const { is_required, default_show, default_value, is_dynamic } = values
           const data = { is_required, default_show, is_dynamic }
-          delete values.is_required
+
-          delete values.default_show
+          if (values.value_type === '10') {
-          if (values.value_type === '0' && default_value) {
+            values.default = { default: values.is_list ? (default_value || null) : Boolean(default_value) }
+          } else if (values.value_type === '0' && default_value) {
             if (values.is_list) {
               values.default = { default: default_value || null }
             } else {
@@ -470,45 +515,63 @@ export default {
           } else {
             values.default = { default: null }
           }
-          delete values.default_value
+
           if (values.is_computed) {
             const computedAreaData = this.$refs.computedArea.getData()
             values = { ...values, ...computedAreaData }
           } else {
             // If it is a non-computed attribute, check to see if there is a predefined value
-            if (!['6', '7'].includes(values.value_type)) {
+            if (!['6', '7', '10', '11'].includes(values.value_type)) {
               const preValueAreaData = this.$refs.preValueArea.getData()
+              // 预定义值校验错误
+              if (preValueAreaData?.isError) {
+                return
+              }
               values = { ...values, ...preValueAreaData }
             }
           }
+
+          delete values.is_required
+          delete values.default_show
+          delete values.default_value
+
           const fontOptions = this.$refs.fontArea.getData()
 
-          // is_index: except for text, the index is hidden, text index default is true
+          // 索引
-          // 5 types in the box,  is_index=true
+          values.is_index = !['6', '7', '8', '9', '11'].includes(values.value_type)
-          // json, password, link  is_index=false
+
-          if (['6', '7', '8'].includes(values.value_type)) {
+          // 重置数据类型
-            values.is_index = false
+          switch (values.value_type) {
-          } else if (values.value_type !== '2') {
+            case '7':
-            values.is_index = true
+              values.value_type = '2'
-          }
+              values.is_password = true
-          if (values.value_type === '7') {
+              break
-            values.value_type = '2'
+            case '8':
-            values.is_password = true
+              values.value_type = '2'
-          }
+              values.is_link = true
-          if (values.value_type === '8') {
+              break
-            values.value_type = '2'
+            case '9':
-            values.is_link = true
+              values.value_type = '2'
-          }
+              break
-          if (values.value_type !== '6') {
+            case '10':
-            values.re_check = this.re_check?.value ?? null
+              values.value_type = '7'
+              values.is_bool = true
+              break
+            case '11':
+              values.value_type = '0'
+              values.is_reference = true
+              break
+            default:
+              break
           }
+
           const { attr_id } = await createAttribute({ ...values, option: { fontOptions } })
 
           this.form.resetFields()
-          this.currentValueType = '2'
+          if (this?.$refs?.preValueArea) {
-          if (!['6'].includes(values.value_type) && !values.is_password) {
             this.$refs.preValueArea.valueList = []
           }
+          this.currentValueType = '2'
           this.$emit('done', attr_id, data, isCloseModal)
         } else {
           throw new Error()
@@ -527,11 +590,34 @@ export default {
       }
     },
     handleChangeValueType(value) {
-      this.currentValueType = value
       this.$nextTick(() => {
-        this.form.setFieldsValue({
+        this.currentValueType = value
-          default_value: this.form.getFieldValue('is_list') || value === '0' ? [] : null,
+        if (['6', '10', '11'].includes(value)) {
-        })
+          this.re_check = {}
+        }
+
+        switch (value) {
+          case '0':
+          case '1':
+            this.enumValueType = ENUM_VALUE_TYPE.NUMBER
+            break
+          case '3':
+            this.enumValueType = ENUM_VALUE_TYPE.DATE_TIME
+            break
+          case '4':
+            this.enumValueType = ENUM_VALUE_TYPE.DATE
+            break
+          default:
+            this.enumValueType = ENUM_VALUE_TYPE.INPUT
+            break
+        }
+        if (['0', '1', '3', '4'].includes(value)) {
+          if (this.$refs.preValueArea) {
+            this.$refs.preValueArea.initEnumValue()
+          }
+        }
+
+        this.handleSwitchType({ valueType: value })
       })
     },
     onChange(checked, property) {
@@ -547,9 +633,7 @@ export default {
         }
       }
       if (property === 'is_list') {
-        this.form.setFieldsValue({
+        this.handleSwitchType({ checked })
-          default_value: checked ? [] : '',
-        })
       }
       if (checked && property === 'is_sortable') {
         this.$message.warning(this.$t('cmdb.ciType.addAttributeTips1'))
@@ -566,6 +650,33 @@ export default {
         })
       }
     },
+
+    handleSwitchType({
+      checked,
+      valueType
+    }) {
+      checked = checked ?? this.form.getFieldValue('is_list')
+      valueType = valueType ?? this.currentValueType
+
+      let defaultValue = checked || valueType === '0' ? [] : ''
+
+      switch (valueType) {
+        case '2':
+        case '9':
+          defaultValue = ''
+          break
+        case '10':
+          defaultValue = checked ? '' : false
+          break
+        default:
+          break
+      }
+
+      this.form.setFieldsValue({
+        default_value: defaultValue,
+      })
+    },
+
     onJsonChange(value) {
       this.default_value_json_right = true
     },
@@ -579,10 +690,19 @@ export default {
     },
     changeDefaultForDatetime(value) {
       this.defaultForDatetime = value
-      if (value === '$custom_time') {
+      switch (value) {
-        this.form.setFieldsValue({
+        case '$custom_time':
-          default_value: undefined,
+          this.form.setFieldsValue({
-        })
+            default_value: undefined,
+          })
+          break
+        case '$updated_at':
+          this.form.setFieldsValue({
+            is_dynamic: true,
+          })
+          break
+        default:
+          break
       }
     },
     onClick({ key }) {
@@ -607,9 +727,25 @@ export default {
       }
       return []
     },
+
+    resetPreValue() {
+      if (this.$refs.preValueArea) {
+        this.$refs.preValueArea.resetData()
+      }
+    }
   },
 }
 </script>
+<style lang="less" scoped>
+.computed-attr-tip {
+  font-size: 12px;
+  line-height: 22px;
+  color: #a5a9bc;
+}
+.value-type-text {
+  margin: 0 4px;
+}
+</style>
 <style lang="less">
 .create-new-attribute {
   .jsoneditor-outer {

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

@@ -32,6 +32,8 @@ import TriggerTable from './triggerTable.vue'
 import ADTab from './adTab.vue'
 import GrantComp from '../../components/cmdbGrant/grantComp.vue'
 
+const ACTIVE_KEY_STORAGE_KEY = 'ops_model_config_tab_key'
+
 export default {
   name: 'CITypeDetail',
   components: {
@@ -53,11 +55,21 @@ export default {
   },
   data() {
     return {
-      activeKey: '1',
+      activeKey: localStorage.getItem(ACTIVE_KEY_STORAGE_KEY) || '1',
     }
   },
   beforeCreate() {},
-  mounted() {},
+  mounted() {
+    this.$nextTick(() => {
+      switch (this.activeKey) {
+        case '5':
+          this.$refs.triggerTable.getTableData()
+          break
+        default:
+          break
+      }
+    })
+  },
   computed: {
     ...mapState({
       windowHeight: (state) => state.windowHeight,
@@ -66,15 +78,20 @@ export default {
   methods: {
     changeTab(activeKey) {
       this.activeKey = activeKey
+      localStorage.setItem(ACTIVE_KEY_STORAGE_KEY, activeKey)
       this.$nextTick(() => {
-        if (activeKey === '1') {
+        switch (activeKey) {
-          this.$refs.attributesTable.getCITypeGroupData()
+          case '1':
-        }
+            this.$refs.attributesTable.getCITypeGroupData()
-        if (activeKey === '5') {
+            break
-          this.$refs.triggerTable.getTableData()
+          case '5':
+            this.$refs.triggerTable.getTableData()
+            break
+          default:
+            break
         }
       })
-    },
+    }
   },
 }
 </script>
@@ -90,4 +107,12 @@ export default {
 .grant-config-wrap {
   overflow: auto;
 }
+
+.ops-tab.ant-tabs {
+  /deep/ .ant-tabs-bar {
+    .ant-tabs-tab:hover {
+      color: @primary-color;
+    }
+  }
+}
 </style>

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

@@ -1,38 +1,49 @@
 <template>
-  <a-tabs v-model="activeKey" size="small" :tabBarStyle="{ borderBottom: 'none' }">
+  <a-tabs v-model="activeKey" size="small" :tabBarStyle="{ borderBottom: 'none' }" @change="handleTabsChange">
     <a-tab-pane key="expr" :disabled="!canDefineComputed">
       <span style="font-size:12px;" slot="tab">{{ $t('cmdb.ciType.expr') }}</span>
       <a-textarea v-model="compute_expr" :placeholder="`{{a}}+{{b}}`" :rows="2" :disabled="!canDefineComputed" />
     </a-tab-pane>
     <a-tab-pane key="script" :disabled="!canDefineComputed">
       <span style="font-size:12px;" slot="tab">{{ $t('cmdb.ciType.code') }}</span>
-      <codemirror
+      <CustomCodeMirror
-        style="z-index: 9999"
+        codeMirrorId="cmdb-computed-attr"
-        :options="cmOptions"
+        ref="codemirror"
-        v-model="compute_script"
+        @changeCodeContent="onCodeChange"
-        @input="onCodeChange"
+      ></CustomCodeMirror>
-      ></codemirror>
     </a-tab-pane>
-    <template slot="tabBarExtraContent" v-if="showCalcComputed">
+    <template slot="tabBarExtraContent">
-      <a-button type="primary" size="small" @click="handleCalcComputed">
+      <a-button size="small" @click="showAllPropDrawer">
-        {{ $t('cmdb.ciType.apply') }}
+        {{ $t('cmdb.ciType.viewAllAttr') }}
       </a-button>
-      <a-tooltip :title="$t('cmdb.ciType.computeForAllCITips')">
+      <AllAttrDrawer ref="allAttrDrawer" />
-        <a-icon type="question-circle" style="margin-left:5px" />
+
-      </a-tooltip>
+      <template v-if="showCalcComputed">
+        <a-button style="margin: 0px 5px;" type="primary" size="small" @click="handleCalcComputed">
+          {{ $t('cmdb.ciType.apply') }}
+        </a-button>
+        <a-tooltip :title="$t('cmdb.ciType.computeForAllCITips')">
+          <a-icon type="question-circle" />
+        </a-tooltip>
+      </template>
     </template>
   </a-tabs>
 </template>
 
 <script>
-import { codemirror } from 'vue-codemirror'
+import AllAttrDrawer from './allAttrDrawer.vue'
+
+import CustomCodeMirror from '@/components/CustomCodeMirror'
 import 'codemirror/lib/codemirror.css'
 import 'codemirror/theme/monokai.css'
 
 require('codemirror/mode/python/python.js')
 export default {
   name: 'ComputedArea',
-  components: { codemirror },
+  components: {
+    CustomCodeMirror,
+    AllAttrDrawer
+  },
   props: {
     canDefineComputed: {
       type: Boolean,
@@ -48,33 +59,6 @@ export default {
       activeKey: 'expr', // expr script
       compute_expr: '',
       compute_script: 'def computed(): \n    return',
-      cmOptions: {
-        lineNumbers: true,
-        mode: 'python',
-        height: '200px',
-        theme: 'monokai',
-        tabSize: 4,
-        indentUnit: 4,
-        lineWrapping: false,
-        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 })
-            }
-          },
-        },
-      },
     }
   },
   methods: {
@@ -92,6 +76,9 @@ export default {
       this.compute_script = compute_script || 'def computed(): \n    return'
       if (compute_script) {
         this.activeKey = 'script'
+        this.$nextTick(() => {
+          this.$refs.codemirror.initCodeMirror(this.compute_script)
+        })
       } else {
         this.activeKey = 'expr'
       }
@@ -108,6 +95,18 @@ export default {
     },
     onCodeChange(v) {
       this.compute_script = v.replace('\t', '    ')
+    },
+    showAllPropDrawer() {
+      this.$refs.allAttrDrawer.open()
+    },
+
+    handleTabsChange(activeKey) {
+      console.log('handleTabsChange', activeKey)
+      if (activeKey === 'script') {
+        this.$nextTick(() => {
+          this.$refs.codemirror.initCodeMirror(this.compute_script)
+        })
+      }
     }
   },
 }

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

@@ -21,7 +21,13 @@
       <a-icon type="underline" />
     </div>
     <div :style="{ width: '100px', marginLeft: '10px', display: 'inline-flex', alignItems: 'center' }">
-      <a-icon type="font-colors" /><el-color-picker size="mini" v-model="fontOptions.color"> </el-color-picker>
+      <a-icon type="font-colors" />
+      <el-color-picker
+        size="mini"
+        :disabled="fontColorDisabled"
+        v-model="fontOptions.color"
+      >
+      </el-color-picker>
     </div>
   </div>
 </template>
@@ -30,6 +36,12 @@
 import _ from 'lodash'
 export default {
   name: 'FontArea',
+  props: {
+    fontColorDisabled: {
+      type: Boolean,
+      default: false
+    }
+  },
   data() {
     return {
       fontOptions: {
@@ -57,7 +69,11 @@ export default {
       if (flag) {
         return undefined
       } else {
-        return this.fontOptions
+        const fontOptions = _.cloneDeep(this.fontOptions)
+        if (this.fontColorDisabled) {
+          Reflect.deleteProperty(fontOptions, 'color')
+        }
+        return fontOptions
       }
     },
     setData({ fontOptions = {} }) {

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

@@ -545,7 +545,7 @@ export default {
     },
     showIdSelectOptions() {
       const _showIdSelectOptions = this.currentTypeAttrs.filter(
-        (item) => item.id !== this.unique_id && !['6'].includes(item.value_type) && !item.is_password && !item.is_list
+        (item) => item.id !== this.unique_id && !['6'].includes(item.value_type) && !item.is_password && !item.is_list && !item.is_bool && !item.is_reference && !item?.choice_value?.length
       )
       if (this.showIdFilterInput) {
         return _showIdSelectOptions.filter(
@@ -898,6 +898,7 @@ export default {
         this.loadCITypes()
         this.loading = false
         this.drawerVisible = false
+        this.isInherit = false
       }, 1000)
     },
     async updateCIType(CITypeId, data) {
@@ -916,6 +917,7 @@ export default {
               this.loadCITypes()
               this.loading = false
               this.drawerVisible = false
+              this.isInherit = false
             }, 1000)
           })
         })