fix: ci_type find_path _graph

fix(ui): ci - number type attr default value display error

README.md

@@ -27,7 +27,6 @@
 
 <img src=docs/images/dashboard.png />
 
-[查看更多展示](docs/screenshot.md)
 
 ### 相关文章
 
@@ -51,14 +50,12 @@
 
 ### 主要功能
 
-- 模型属性支持索引、多值、默认排序、字体颜色，支持计算属性
-- 支持自动发现、定时巡检、文件导入
+- 自定义模型和模型关系，模型属性支持下拉列表、字体颜色、计算属性等高级特性
+- 支持计算机、网络设备、存储设备、数据库、中间件、公有云资源等自动发现
 - 支持资源、层级、关系视图展示
-- 支持模型间关系配置和展示
 - 细粒度访问控制，完备的操作日志
-- 支持跨模型搜索
-
-
+- 通用的资源搜索和关系搜索
+- 支持IP地址管理(IPAM), 数据中心基础设施管理(DCIM)
 
 
 

cmdb-api/.ruff.toml

@@ -0,0 +1,79 @@
+line-length = 120
+cache-dir = ".ruff_cache"
+target-version = "py310"
+unsafe-fixes = true
+show-fixes = true
+
+[lint]
+select = [
+    "E",
+    "F",
+    "I",
+    "TCH",
+    # W
+    "W505",
+    # PT
+    "PT018",
+    # SIM
+    "SIM101",
+    "SIM114",
+    # PGH
+    "PGH004",
+    # PL
+    "PLE1142",
+    # RUF
+    "RUF100",
+    # UP
+    "UP007"
+]
+preview = true
+ignore = ["FURB101"]
+
+[lint.flake8-pytest-style]
+mark-parentheses = false
+parametrize-names-type = "list"
+parametrize-values-row-type = "list"
+parametrize-values-type = "tuple"
+
+[lint.flake8-unused-arguments]
+ignore-variadic-names = true
+
+[lint.isort]
+lines-between-types = 1
+order-by-type = true
+
+[lint.per-file-ignores]
+"**/api/v1/*.py" = ["TCH"]
+"**/model/*.py" = ["TCH003"]
+"**/models/__init__.py" = ["F401", "F403"]
+"**/tests/*.py" = ["E402"]
+"celery_worker.py" = ["F401"]
+"api/views/entry.py" = ["I001"]
+"migrations/*.py" = ["I001", "E402"]
+"*.py" = ["I001"]
+"api/views/common_setting/department.py" = ["F841"]
+"api/lib/common_setting/upload_file.py" = ["F841"]
+"api/lib/common_setting/acl.py" = ["F841"]
+"**/__init__.py" = ["F822"]
+"api/tasks/*.py" = ["E722"]
+"api/views/cmdb/*.py" = ["E722"]
+"api/views/acl/*.py" = ["E722"]
+"api/lib/secrets/*.py" = ["E722", "F841"]
+"api/lib/utils.py" = ["E722", "E731"]
+"api/lib/perm/authentication/cas/*" = ["E113", "F841"]
+"api/lib/perm/acl/*" = ["E722"]
+"api/lib/*" = ["E721", "F722"]
+"api/lib/cmdb/*" = ["F722", "E722"]
+"api/lib/cmdb/search/ci/es/search.py" = ["F841", "SIM114"]
+"api/lib/cmdb/search/ci/db/search.py" = ["F841"]
+"api/lib/cmdb/value.py" = ["F841"]
+"api/lib/cmdb/history.py" = ["E501"]
+"api/commands/common.py" = ["E722"]
+"api/commands/click_cmdb.py" = ["E722"]
+"api/lib/perm/auth.py" = ["SIM114"]
+
+[format]
+preview = true
+quote-style = "single"
+docstring-code-format = true
+skip-magic-trailing-comma = false

cmdb-api/api/commands/click_cmdb.py

@@ -23,6 +23,7 @@ from api.lib.cmdb.const import REDIS_PREFIX_CI_RELATION2
 from api.lib.cmdb.const import ResourceTypeEnum
 from api.lib.cmdb.const import RoleEnum
 from api.lib.cmdb.const import ValueTypeEnum
+from api.lib.cmdb.dcim.rack import RackManager
 from api.lib.exception import AbortException
 from api.lib.perm.acl.acl import ACLManager
 from api.lib.perm.acl.acl import UserCache
@@ -195,7 +196,7 @@ def cmdb_counter():
     today = datetime.date.today()
     while True:
         try:
-            db.session.remove()
+            db.session.commit()
 
             CMDBCounterCache.reset()
 
@@ -209,6 +210,8 @@ def cmdb_counter():
 
             CMDBCounterCache.flush_sub_counter()
 
+            RackManager().check_u_slot()
+
             i += 1
         except:
             import traceback
@@ -253,10 +256,10 @@ def cmdb_trigger():
                         trigger2cis[trigger.id] = (trigger, ready_cis)
                     else:
                         cur = trigger2cis[trigger.id]
-                        cur_ci_ids = {i.ci_id for i in cur[1]}
+                        cur_ci_ids = {_ci.ci_id for _ci in cur[1]}
                         trigger2cis[trigger.id] = (
-                            trigger, cur[1] + [i for i in ready_cis if i.ci_id not in cur_ci_ids
-                                               and i.ci_id not in trigger2completed.get(trigger.id, {})])
+                            trigger, cur[1] + [_ci for _ci in ready_cis if _ci.ci_id not in cur_ci_ids
+                                               and _ci.ci_id not in trigger2completed.get(trigger.id, {})])
 
             for tid in trigger2cis:
                 trigger, cis = trigger2cis[tid]
@@ -343,7 +346,7 @@ def cmdb_inner_secrets_init(address):
     if valid_address(address):
         token = current_app.config.get("INNER_TRIGGER_TOKEN", "") if not token else token
         if not token:
-            token = click.prompt(f'Enter root token', hide_input=True, confirmation_prompt=False)
+            token = click.prompt('Enter root token', hide_input=True, confirmation_prompt=False)
         assert token is not None
         resp = requests.post("{}/api/v0.1/secrets/auto_seal".format(address.strip("/")),
                              headers={"Inner-Token": token})

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

@@ -415,7 +415,7 @@ class AttributeManager(object):
             db.session.rollback()
             current_app.logger.error("update attribute error, {0}".format(str(e)))
 
-            return abort(400, ErrFormat.update_attribute_failed.format(("id=".format(_id))))
+            return abort(400, ErrFormat.update_attribute_failed.format(("id={}".format(_id))))
 
         new = attr.to_dict()
         if not new['choice_web_hook'] and new['is_choice']:

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

@@ -512,7 +512,7 @@ class CMDBCounterCache(object):
                 result[i.type_id]['rule_count'] = len(adts) + AutoDiscoveryCITypeRelation.get_by(
                     ad_type_id=i.type_id, only_query=True).count()
                 result[i.type_id]['exec_target_count'] = len(
-                    set([i.oneagent_id for adt in adts for i in db.session.query(
+                    set([j.oneagent_id for adt in adts for j in db.session.query(
                         AutoDiscoveryRuleSyncHistory.oneagent_id).filter(
                         AutoDiscoveryRuleSyncHistory.adt_id == adt.id)]))
 

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

@@ -295,7 +295,7 @@ class CIManager(object):
         db.session.commit()
 
         value_table = TableMap(attr_name=attr.name).table
-        with redis_lock.Lock(rd.r, "auto_inc_id_{}".format(attr.name)):
+        with redis_lock.Lock(rd.r, "auto_inc_id_{}".format(attr.name), expire=10):
             max_v = value_table.get_by(attr_id=attr.id, only_query=True).order_by(
                 getattr(value_table, 'value').desc()).first()
             if max_v is not None:
@@ -357,6 +357,7 @@ class CIManager(object):
             is_auto_discovery=False,
             _is_admin=False,
             ticket_id=None,
+            _sync=False,
             **ci_dict):
         """
         add ci
@@ -366,6 +367,7 @@ class CIManager(object):
         :param is_auto_discovery: default is False
         :param _is_admin: default is False
         :param ticket_id:
+        :param _sync:
         :param ci_dict:
         :return:
         """
@@ -391,7 +393,7 @@ class CIManager(object):
         ci = None
         record_id = None
         password_dict = {}
-        with redis_lock.Lock(rd.r, ci_type.name):
+        with redis_lock.Lock(rd.r, ci_type.name, expire=10):
             db.session.commit()
 
             if (unique_key.default and unique_key.default.get('default') == AttributeDefaultValueEnum.AUTO_INC_ID and
@@ -496,10 +498,16 @@ class CIManager(object):
                 record_id = cls.save_password(ci.id, attr_id, password_dict[attr_id], record_id, ci_type.id)
 
         if record_id or has_dynamic:  # has changed
-            ci_cache.apply_async(args=(ci.id, operate_type, record_id), queue=CMDB_QUEUE)
+            if not _sync:
+                ci_cache.apply_async(args=(ci.id, operate_type, record_id), queue=CMDB_QUEUE)
+            else:
+                ci_cache(ci.id, operate_type, record_id)
 
         if ref_ci_dict:  # add relations
-            ci_relation_add.apply_async(args=(ref_ci_dict, ci.id, current_user.uid), queue=CMDB_QUEUE)
+            if not _sync:
+                ci_relation_add.apply_async(args=(ref_ci_dict, ci.id, current_user.uid), queue=CMDB_QUEUE)
+            else:
+                ci_relation_add(ref_ci_dict, ci.id, current_user.uid)
 
         return ci.id
 
@@ -542,7 +550,7 @@ class CIManager(object):
         limit_attrs = self._valid_ci_for_no_read(ci) if not _is_admin else {}
 
         record_id = None
-        with redis_lock.Lock(rd.r, ci_type.name):
+        with redis_lock.Lock(rd.r, ci_type.name, expire=10):
             db.session.commit()
 
             self._valid_unique_constraint(ci.type_id, ci_dict, ci_id)
@@ -1260,7 +1268,9 @@ class CIRelationManager(object):
             else:
                 type_relation = CITypeRelation.get_by_id(relation_type_id)
 
-            with redis_lock.Lock(rd.r, "ci_relation_add_{}_{}".format(first_ci.type_id, second_ci.type_id)):
+            with redis_lock.Lock(rd.r,
+                                 "ci_relation_add_{}_{}".format(first_ci.type_id, second_ci.type_id),
+                                 expire=10):
 
                 cls._check_constraint(first_ci_id, first_ci.type_id, second_ci_id, second_ci.type_id, type_relation)
 
@@ -1281,10 +1291,10 @@ class CIRelationManager(object):
         return existed.id
 
     @staticmethod
-    def delete(cr_id, apply_async=True):
+    def delete(cr_id, apply_async=True, valid=True):
         cr = CIRelation.get_by_id(cr_id) or abort(404, ErrFormat.relation_not_found.format("id={}".format(cr_id)))
 
-        if current_app.config.get('USE_ACL') and current_user.username != 'worker':
+        if current_app.config.get('USE_ACL') and current_user.username != 'worker' and valid:
             resource_name = CITypeRelationManager.acl_resource_name(cr.first_ci.ci_type.name, cr.second_ci.ci_type.name)
             if not ACLManager().has_permission(
                     resource_name,
@@ -1323,7 +1333,7 @@ class CIRelationManager(object):
         return cr
 
     @classmethod
-    def delete_3(cls, first_ci_id, second_ci_id, apply_async=True):
+    def delete_3(cls, first_ci_id, second_ci_id, apply_async=True, valid=True):
         cr = CIRelation.get_by(first_ci_id=first_ci_id,
                                second_ci_id=second_ci_id,
                                to_dict=False,
@@ -1333,7 +1343,7 @@ class CIRelationManager(object):
             # ci_relation_delete.apply_async(args=(first_ci_id, second_ci_id, cr.ancestor_ids), queue=CMDB_QUEUE)
             # delete_id_filter.apply_async(args=(second_ci_id,), queue=CMDB_QUEUE)
 
-            cls.delete(cr.id, apply_async=apply_async)
+            cls.delete(cr.id, apply_async=apply_async, valid=valid)
 
         return cr
 
@@ -1526,7 +1536,8 @@ class CITriggerManager(object):
         ci_dict.update(attr_dict)
 
     @classmethod
-    def _exec_webhook(cls, operate_type, webhook, ci_dict, trigger_id, trigger_name, record_id, ci_id=None, app=None):
+    def _exec_webhook(cls, operate_type, webhook, ci_dict, trigger_id, trigger_name, record_id,
+                      ci_id=None, app=None, record_history=True):
         app = app or current_app
 
         with app.app_context():
@@ -1544,19 +1555,20 @@ class CITriggerManager(object):
                 current_app.logger.warning("exec webhook failed: {}".format(e))
                 response = e
                 is_ok = False
-
-            CITriggerHistoryManager.add(operate_type,
-                                        record_id,
-                                        ci_dict.get('_id'),
-                                        trigger_id,
-                                        trigger_name,
-                                        is_ok=is_ok,
-                                        webhook=response)
+            if record_history:
+                CITriggerHistoryManager.add(operate_type,
+                                            record_id,
+                                            ci_dict.get('_id'),
+                                            trigger_id,
+                                            trigger_name,
+                                            is_ok=is_ok,
+                                            webhook=response)
 
             return is_ok
 
     @classmethod
-    def _exec_notify(cls, operate_type, notify, ci_dict, trigger_id, trigger_name, record_id, ci_id=None, app=None):
+    def _exec_notify(cls, operate_type, notify, ci_dict, trigger_id, trigger_name, record_id,
+                     ci_id=None, app=None, record_history=True):
         app = app or current_app
 
         with app.app_context():
@@ -1580,13 +1592,14 @@ class CITriggerManager(object):
                     response = "{}\n{}".format(response, e)
                     is_ok = False
 
-            CITriggerHistoryManager.add(operate_type,
-                                        record_id,
-                                        ci_dict.get('_id'),
-                                        trigger_id,
-                                        trigger_name,
-                                        is_ok=is_ok,
-                                        notify=response.strip())
+            if record_history:
+                CITriggerHistoryManager.add(operate_type,
+                                            record_id,
+                                            ci_dict.get('_id'),
+                                            trigger_id,
+                                            trigger_name,
+                                            is_ok=is_ok,
+                                            notify=response.strip())
 
             return is_ok
 
@@ -1663,25 +1676,47 @@ class CITriggerManager(object):
         return result
 
     @classmethod
-    def trigger_notify(cls, trigger, ci):
+    def trigger_notify(cls, trigger, ci, only_test=False):
         """
         only for date attribute
         :param trigger:
         :param ci:
+        :param only_test:
         :return:
         """
         if (trigger.option.get('notifies', {}).get('notify_at') == datetime.datetime.now().strftime("%H:%M") or
-                not trigger.option.get('notifies', {}).get('notify_at')):
+            not trigger.option.get('notifies', {}).get('notify_at')) or only_test:
 
             if trigger.option.get('webhooks'):
-                threading.Thread(target=cls._exec_webhook, args=(
-                    None, trigger.option['webhooks'], None, trigger.id, trigger.option.get('name'), None, ci.ci_id,
-                    current_app._get_current_object())).start()
+                threading.Thread(
+                    target=cls._exec_webhook,
+                    args=(None, trigger.option['webhooks'], None, trigger.id,
+                          trigger.option.get('name'), None,
+                          ci and ci.ci_id,
+                          current_app._get_current_object(), not only_test)).start()
             elif trigger.option.get('notifies'):
                 threading.Thread(target=cls._exec_notify, args=(
-                    None, trigger.option['notifies'], None, trigger.id, trigger.option.get('name'), None, ci.ci_id,
-                    current_app._get_current_object())).start()
+                    None, trigger.option['notifies'], None, trigger.id,
+                    trigger.option.get('name'), None,
+                    ci and ci.ci_id,
+                    current_app._get_current_object(), not only_test)).start()
 
             return True
 
         return False
+
+    @classmethod
+    def trigger_notify_test(cls, type_id, trigger_id):
+        trigger = CITypeTrigger.get_by_id(trigger_id) or abort(
+            404, ErrFormat.ci_type_trigger_not_found.format(trigger_id))
+
+        ci_type = CITypeCache.get(type_id) or abort(404, ErrFormat.ci_type_not_found.format(type_id))
+        attr = AttributeCache.get(ci_type.unique_id)
+        value_table = TableMap(attr=attr).table
+        if not value_table:
+            return
+
+        value = value_table.get_by(attr_id=attr.id, only_query=True).join(
+            CI, value_table.ci_id == CI.id).filter(CI.type_id == type_id).first()
+
+        cls.trigger_notify(trigger, value, only_test=True)

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

@@ -421,7 +421,10 @@ class CITypeGroupManager(object):
         group_types = set()
         for group in groups:
             for t in sorted(CITypeGroupItem.get_by(group_id=group['id']), key=lambda x: x['order'] or 0):
-                ci_type = CITypeCache.get(t['type_id']).to_dict()
+                ci_type = CITypeCache.get(t['type_id'])
+                if ci_type is None:
+                    continue
+                ci_type = ci_type.to_dict()
                 if type_ids is not None and ci_type['id'] not in type_ids:
                     continue
                 if resources is None or (ci_type and ci_type['name'] in resources):
@@ -859,15 +862,15 @@ class CITypeRelationManager(object):
 
         graph = nx.DiGraph()
 
-        def get_children(_id):
+        def get_children(_id, _graph):
             children = CITypeRelation.get_by(parent_id=_id, to_dict=False)
 
             for i in children:
                 if i.child_id != _id:
-                    graph.add_edge(i.parent_id, i.child_id)
-                    get_children(i.child_id)
+                    _graph.add_edge(i.parent_id, i.child_id)
+                    get_children(i.child_id, _graph)
 
-        get_children(source_type_id)
+        get_children(source_type_id, graph)
 
         paths = list(nx.all_simple_paths(graph, source_type_id, target_type_ids))
 
@@ -879,6 +882,8 @@ class CITypeRelationManager(object):
     def _wrap_relation_type_dict(type_id, relation_inst):
         ci_type_dict = CITypeCache.get(type_id).to_dict()
         ci_type_dict["ctr_id"] = relation_inst.id
+        show_key = AttributeCache.get(ci_type_dict.get('show_id') or ci_type_dict['unique_id'])
+        ci_type_dict["show_key"] = show_key and show_key.name
         ci_type_dict["attributes"] = CITypeAttributeManager.get_attributes_by_type_id(ci_type_dict["id"])
         attr_filter = CIFilterPermsCRUD.get_attr_filter(type_id)
         if attr_filter:
@@ -1551,7 +1556,10 @@ class CITypeTemplateManager(object):
                 if existed is None:
                     _group['type_id'] = type_id_map.get(_group['type_id'], _group['type_id'])
 
-                    existed = CITypeAttributeGroup.create(flush=True, **_group)
+                    try:
+                        existed = CITypeAttributeGroup.create(flush=True, **_group)
+                    except:
+                        continue
 
                 for order, attr in enumerate(group['attributes'] or []):
                     item_existed = CITypeAttributeGroupItem.get_by(group_id=existed.id,

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

@@ -123,6 +123,11 @@ class BuiltinModelEnum(BaseEnum):
     IPAM_ADDRESS = "ipam_address"
     IPAM_SCOPE = "ipam_scope"
 
+    DCIM_REGION = "dcim_region"
+    DCIM_IDC = "dcim_idc"
+    DCIM_SERVER_ROOM = "dcim_server_room"
+    DCIM_RACK = "dcim_rack"
+
 
 BUILTIN_ATTRIBUTES = {
     "_updated_at": _l("Update Time"),

cmdb-api/api/lib/cmdb/dcim/__init__.py

@@ -0,0 +1 @@
+# -*- coding:utf-8 -*-

cmdb-api/api/lib/cmdb/dcim/base.py

@@ -0,0 +1,33 @@
+# -*- coding:utf-8 -*-
+
+from api.lib.cmdb.ci import CIManager
+from api.lib.cmdb.ci import CIRelationManager
+from api.lib.cmdb.const import ExistPolicy
+
+
+class DCIMBase(object):
+    def __init__(self):
+        self.type_id = None
+
+    @staticmethod
+    def add_relation(parent_id, child_id):
+        if not parent_id or not child_id:
+            return
+
+        CIRelationManager().add(parent_id, child_id, valid=False, apply_async=False)
+
+    def add(self, parent_id, **kwargs):
+        ci_id = CIManager().add(self.type_id, exist_policy=ExistPolicy.REJECT, **kwargs)
+
+        if parent_id:
+            self.add_relation(parent_id, ci_id)
+
+        return ci_id
+
+    @classmethod
+    def update(cls, _id, **kwargs):
+        CIManager().update(_id, **kwargs)
+
+    @classmethod
+    def delete(cls, _id):
+        CIManager().delete(_id)

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

@@ -0,0 +1,17 @@
+# -*- coding:utf-8 -*-
+
+
+from api.lib.utils import BaseEnum
+
+
+class RackBuiltinAttributes(BaseEnum):
+    U_COUNT = 'u_count'
+    U_START = 'u_start'
+    FREE_U_COUNT = 'free_u_count'
+    U_SLOT_ABNORMAL = 'u_slot_abnormal'
+
+
+class OperateTypeEnum(BaseEnum):
+    ADD_DEVICE = "0"
+    REMOVE_DEVICE = "1"
+    MOVE_DEVICE = "2"

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

@@ -0,0 +1,40 @@
+from flask_login import current_user
+
+from api.lib.cmdb.cache import AttributeCache
+from api.lib.cmdb.cache import CITypeCache
+from api.lib.cmdb.ci import CIManager
+from api.lib.mixin import DBMixin
+from api.models.cmdb import DCIMOperationHistory
+
+
+class OperateHistoryManager(DBMixin):
+    cls = DCIMOperationHistory
+
+    @classmethod
+    def search(cls, page, page_size, fl=None, only_query=False, reverse=False, count_query=False,
+               last_size=None, **kwargs):
+        numfound, result = super(OperateHistoryManager, cls).search(page, page_size, fl, only_query, reverse,
+                                                                    count_query, last_size, **kwargs)
+
+        ci_ids = [i['ci_id'] for i in result]
+        id2ci = {i['_id']: i for i in (CIManager.get_cis_by_ids(ci_ids) or []) if i}
+        type2show_key = dict()
+        for i in id2ci.values():
+            if i.get('_type') not in type2show_key:
+                ci_type = CITypeCache.get(i.get('_type'))
+                if ci_type:
+                    show_key = AttributeCache.get(ci_type.show_id or ci_type.unique_id)
+                    type2show_key[i['_type']] = show_key and show_key.name
+
+        return numfound, result, id2ci, type2show_key
+
+    def _can_add(self, **kwargs):
+        kwargs['uid'] = current_user.uid
+
+        return kwargs
+
+    def _can_update(self, **kwargs):
+        pass
+
+    def _can_delete(self, **kwargs):
+        pass

cmdb-api/api/lib/cmdb/dcim/idc.py

@@ -0,0 +1,19 @@
+# -*- coding:utf-8 -*-
+
+
+from flask import abort
+
+from api.lib.cmdb.cache import CITypeCache
+from api.lib.cmdb.const import BuiltinModelEnum
+from api.lib.cmdb.dcim.base import DCIMBase
+from api.lib.cmdb.resp_format import ErrFormat
+
+
+class IDCManager(DCIMBase):
+    def __init__(self):
+        super(IDCManager, self).__init__()
+
+        self.ci_type = CITypeCache.get(BuiltinModelEnum.DCIM_IDC) or abort(
+            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_IDC))
+
+        self.type_id = self.ci_type.id

cmdb-api/api/lib/cmdb/dcim/rack.py

@@ -0,0 +1,182 @@
+# -*- coding:utf-8 -*-
+
+import itertools
+import redis_lock
+from flask import abort
+
+from api.extensions import rd
+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.const import BuiltinModelEnum
+from api.lib.cmdb.dcim.base import DCIMBase
+from api.lib.cmdb.dcim.const import OperateTypeEnum
+from api.lib.cmdb.dcim.const import RackBuiltinAttributes
+from api.lib.cmdb.dcim.history import OperateHistoryManager
+from api.lib.cmdb.resp_format import ErrFormat
+from api.lib.cmdb.search.ci.db.search import Search as SearchFromDB
+from api.lib.cmdb.search.ci_relation.search import Search as RelationSearch
+
+
+class RackManager(DCIMBase):
+    def __init__(self):
+        super(RackManager, self).__init__()
+
+        self.ci_type = CITypeCache.get(BuiltinModelEnum.DCIM_RACK) or abort(
+            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_RACK))
+
+        self.type_id = self.ci_type.id
+
+    @classmethod
+    def update(cls, _id, **kwargs):
+        if RackBuiltinAttributes.U_COUNT in kwargs:
+            devices, _, _, _, _, _ = RelationSearch(
+                [_id],
+                level=[1],
+                fl=[RackBuiltinAttributes.U_COUNT, RackBuiltinAttributes.U_START],
+                count=1000000).search()
+            for device in devices:
+                u_start = device.get(RackBuiltinAttributes.U_START)
+                u_count = device.get(RackBuiltinAttributes.U_COUNT) or 2
+                if u_start and u_start + u_count - 1 > kwargs[RackBuiltinAttributes.U_COUNT]:
+                    return abort(400, ErrFormat.dcim_rack_u_count_invalid)
+
+        CIManager().update(_id, _sync=True, **kwargs)
+
+        if RackBuiltinAttributes.U_COUNT in kwargs:
+            payload = {RackBuiltinAttributes.FREE_U_COUNT: cls.calc_u_free_count(_id)}
+
+            CIManager().update(_id, _sync=True, **payload)
+
+    def delete(self, _id):
+        super(RackManager, self).delete(_id)
+
+        payload = {RackBuiltinAttributes.U_START: None}
+        _, _, second_cis = CIRelationManager.get_second_cis(_id, per_page='all')
+        for ci in second_cis:
+            CIManager().update(ci['_id'], **payload)
+
+    @staticmethod
+    def calc_u_free_count(rack_id, device_id=None, u_start=None, u_count=None):
+        rack = CIManager.get_ci_by_id(rack_id, need_children=False)
+        if not rack.get(RackBuiltinAttributes.U_COUNT):
+            return 0
+
+        if device_id is not None and u_count is None:
+            ci = CIManager().get_ci_by_id(device_id, need_children=False)
+            u_count = ci.get(RackBuiltinAttributes.U_COUNT) or 2
+
+        if u_start and u_start + u_count - 1 > rack.get(RackBuiltinAttributes.U_COUNT):
+            return abort(400, ErrFormat.dcim_rack_u_slot_invalid)
+
+        devices, _, _, _, _, _ = RelationSearch(
+            [rack_id],
+            level=[1],
+            fl=[RackBuiltinAttributes.U_COUNT, RackBuiltinAttributes.U_START],
+            count=1000000).search()
+
+        u_count_sum = 0
+        for device in devices:
+            u_count_sum += (device.get(RackBuiltinAttributes.U_COUNT) or 2)
+            if device_id is not None:
+                _u_start = device.get(RackBuiltinAttributes.U_START)
+                _u_count = device.get(RackBuiltinAttributes.U_COUNT) or 2
+                if not _u_start:
+                    continue
+
+                if device.get('_id') != device_id and set(range(u_start, u_start + u_count)) & set(
+                        range(_u_start, _u_start + _u_count)):
+                    return abort(400, ErrFormat.dcim_rack_u_slot_invalid)
+
+        return rack[RackBuiltinAttributes.U_COUNT] - u_count_sum
+
+    def check_u_slot(self):
+        racks, _, _, _, _, _ = SearchFromDB(
+            "_type:{}".format(self.type_id),
+            count=10000000,
+            fl=[RackBuiltinAttributes.U_START, RackBuiltinAttributes.U_COUNT, RackBuiltinAttributes.U_SLOT_ABNORMAL],
+            parent_node_perm_passed=True).search()
+
+        for rack in racks:
+            devices, _, _, _, _, _ = RelationSearch(
+                [rack['_id']],
+                level=[1],
+                fl=[RackBuiltinAttributes.U_COUNT, RackBuiltinAttributes.U_START],
+                count=1000000).search()
+
+            u_slot_sets = []
+            for device in devices:
+                u_start = device.get(RackBuiltinAttributes.U_START)
+                u_count = device.get(RackBuiltinAttributes.U_COUNT) or 2
+                if u_start is not None and str(u_start).isdigit():
+                    u_slot_sets.append(set(range(u_start, u_start + u_count)))
+
+            if len(u_slot_sets) > 1:
+                u_slot_abnormal = False
+                for a, b in itertools.combinations(u_slot_sets, 2):
+                    if a.intersection(b):
+                        u_slot_abnormal = True
+                        break
+                if u_slot_abnormal != rack.get(RackBuiltinAttributes.U_SLOT_ABNORMAL):
+                    payload = {RackBuiltinAttributes.U_SLOT_ABNORMAL: u_slot_abnormal}
+                    CIManager().update(rack['_id'], **payload)
+
+    def add_device(self, rack_id, device_id, u_start, u_count=None):
+        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
+            self.calc_u_free_count(rack_id, device_id, u_start, u_count)
+
+            self.add_relation(rack_id, device_id)
+
+            payload = {RackBuiltinAttributes.U_START: u_start}
+            if u_count:
+                payload[RackBuiltinAttributes.U_COUNT] = u_count
+            CIManager().update(device_id, _sync=True, **payload)
+
+            payload = {
+                RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(rack_id, device_id, u_start, u_count)}
+            CIManager().update(rack_id, _sync=True, **payload)
+
+        OperateHistoryManager().add(operate_type=OperateTypeEnum.ADD_DEVICE, rack_id=rack_id, ci_id=device_id)
+
+    def remove_device(self, rack_id, device_id):
+        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
+            CIRelationManager.delete_3(rack_id, device_id, apply_async=False, valid=False)
+
+            payload = {RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(rack_id)}
+            CIManager().update(rack_id, _sync=True, **payload)
+
+            payload = {RackBuiltinAttributes.U_START: None}
+            CIManager().update(device_id, _sync=True, **payload)
+
+        OperateHistoryManager().add(operate_type=OperateTypeEnum.REMOVE_DEVICE, rack_id=rack_id, ci_id=device_id)
+
+    def move_device(self, rack_id, device_id, to_u_start):
+        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
+            payload = {RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(rack_id, device_id, to_u_start)}
+            CIManager().update(rack_id, _sync=True, **payload)
+
+            CIManager().update(device_id, _sync=True, **{RackBuiltinAttributes.U_START: to_u_start})
+
+        OperateHistoryManager().add(operate_type=OperateTypeEnum.MOVE_DEVICE, rack_id=rack_id, ci_id=device_id)
+
+    def migrate_device(self, rack_id, device_id, to_rack_id, to_u_start):
+        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
+            self.calc_u_free_count(to_rack_id, device_id, to_u_start)
+
+            if rack_id != to_rack_id:
+                CIRelationManager.delete_3(rack_id, device_id, apply_async=False, valid=False)
+
+                self.add_relation(to_rack_id, device_id)
+
+                payload = {
+                    RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(to_rack_id, device_id, to_u_start)}
+                CIManager().update(to_rack_id, _sync=True, **payload)
+
+            CIManager().update(device_id, _sync=True, **{RackBuiltinAttributes.U_START: to_u_start})
+
+            if rack_id != to_rack_id:
+                payload = {RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(rack_id)}
+                CIManager().update(rack_id, _sync=True, **payload)
+
+        OperateHistoryManager().add(operate_type=OperateTypeEnum.REMOVE_DEVICE, rack_id=rack_id, ci_id=device_id)
+        OperateHistoryManager().add(operate_type=OperateTypeEnum.ADD_DEVICE, rack_id=to_rack_id, ci_id=device_id)

cmdb-api/api/lib/cmdb/dcim/region.py

@@ -0,0 +1,29 @@
+# -*- coding:utf-8 -*-
+
+
+from flask import abort
+
+from api.lib.cmdb.cache import CITypeCache
+from api.lib.cmdb.ci import CIManager
+from api.lib.cmdb.const import BuiltinModelEnum
+from api.lib.cmdb.const import ExistPolicy
+from api.lib.cmdb.resp_format import ErrFormat
+
+
+class RegionManager(object):
+    def __init__(self):
+        self.ci_type = CITypeCache.get(BuiltinModelEnum.DCIM_REGION) or abort(
+            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_REGION))
+
+        self.type_id = self.ci_type.id
+
+    def add(self, **kwargs):
+        return CIManager().add(self.type_id, exist_policy=ExistPolicy.REJECT, **kwargs)
+
+    @classmethod
+    def update(cls, _id, **kwargs):
+        CIManager().update(_id, **kwargs)
+
+    @classmethod
+    def delete(cls, _id):
+        CIManager().delete(_id)

cmdb-api/api/lib/cmdb/dcim/server_room.py

@@ -0,0 +1,56 @@
+# -*- coding:utf-8 -*-
+
+
+from flask import abort
+
+from api.lib.cmdb.cache import CITypeCache
+from api.lib.cmdb.const import BuiltinModelEnum
+from api.lib.cmdb.dcim.base import DCIMBase
+from api.lib.cmdb.dcim.const import RackBuiltinAttributes
+from api.lib.cmdb.resp_format import ErrFormat
+from api.lib.cmdb.search.ci.db.search import Search as SearchFromDB
+from api.models.cmdb import CI
+from api.models.cmdb import CIRelation
+
+
+class ServerRoomManager(DCIMBase):
+    def __init__(self):
+        super(ServerRoomManager, self).__init__()
+
+        self.ci_type = CITypeCache.get(BuiltinModelEnum.DCIM_SERVER_ROOM) or abort(
+            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_SERVER_ROOM))
+        self.type_id = self.ci_type.id
+
+    @staticmethod
+    def get_racks(_id, q=None):
+        rack_type = CITypeCache.get(BuiltinModelEnum.DCIM_RACK) or abort(
+            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_RACK))
+
+        relations = CIRelation.get_by(first_ci_id=_id, only_query=True).join(
+            CI, CI.id == CIRelation.second_ci_id).filter(CI.type_id == rack_type.id)
+        rack_ids = [i.second_ci_id for i in relations]
+
+        q = "_type:{}".format(rack_type.id) if not q else "_type:{},{}".format(rack_type.id, q)
+        if rack_ids:
+            response, _, _, _, numfound, _ = SearchFromDB(
+                q,
+                ci_ids=list(rack_ids),
+                count=1000000,
+                parent_node_perm_passed=True).search()
+        else:
+            response, numfound = [], 0
+
+        counter = dict(rack_count=numfound)
+        u_count = 0
+        free_u_count = 0
+        for i in response:
+            _u_count = i.get(RackBuiltinAttributes.U_COUNT) or 0
+            u_count += _u_count
+            free_u_count += (_u_count if i.get(RackBuiltinAttributes.FREE_U_COUNT) is None else
+                             i.get(RackBuiltinAttributes.FREE_U_COUNT))
+        counter["u_count"] = u_count
+        counter["u_used_count"] = u_count - free_u_count
+        counter["device_count"] = CIRelation.get_by(only_query=True).filter(
+            CIRelation.first_ci_id.in_(rack_ids)).count()
+
+        return counter, response

cmdb-api/api/lib/cmdb/dcim/tree_view.py

@@ -0,0 +1,85 @@
+# -*- coding:utf-8 -*-
+
+from collections import defaultdict
+
+from flask import abort
+
+from api.lib.cmdb.cache import AttributeCache
+from api.lib.cmdb.cache import CITypeCache
+from api.lib.cmdb.const import BuiltinModelEnum
+from api.lib.cmdb.resp_format import ErrFormat
+from api.lib.cmdb.search.ci.db.search import Search as SearchFromDB
+from api.models.cmdb import CI
+from api.models.cmdb import CIRelation
+
+
+class TreeViewManager(object):
+    @classmethod
+    def get(cls):
+        region_type = CITypeCache.get(BuiltinModelEnum.DCIM_REGION) or abort(
+            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_REGION))
+
+        idc_type = CITypeCache.get(BuiltinModelEnum.DCIM_IDC) or abort(
+            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_IDC))
+
+        server_room_type = CITypeCache.get(BuiltinModelEnum.DCIM_SERVER_ROOM) or abort(
+            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_SERVER_ROOM))
+
+        rack_type = CITypeCache.get(BuiltinModelEnum.DCIM_RACK) or abort(
+            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_RACK))
+
+        relations = defaultdict(set)
+        ids = set()
+        has_parent_ids = set()
+
+        for i in CIRelation.get_by(only_query=True).join(CI, CI.id == CIRelation.first_ci_id).filter(
+                CI.type_id.in_([region_type.id, idc_type.id])):
+            relations[i.first_ci_id].add(i.second_ci_id)
+            ids.add(i.first_ci_id)
+            ids.add(i.second_ci_id)
+            has_parent_ids.add(i.second_ci_id)
+
+        for i in CIRelation.get_by(only_query=True).join(
+                CI, CI.id == CIRelation.second_ci_id).filter(CI.type_id.in_([idc_type.id, server_room_type.id])):
+            relations[i.first_ci_id].add(i.second_ci_id)
+            ids.add(i.first_ci_id)
+            ids.add(i.second_ci_id)
+            has_parent_ids.add(i.second_ci_id)
+
+        for i in CI.get_by(only_query=True).filter(CI.type_id.in_([region_type.id, idc_type.id])):
+            ids.add(i.id)
+
+        for _id in ids:
+            if _id not in has_parent_ids:
+                relations[None].add(_id)
+
+        type2name = dict()
+        type2name[region_type.id] = AttributeCache.get(region_type.show_id or region_type.unique_id).name
+        type2name[idc_type.id] = AttributeCache.get(idc_type.show_id or idc_type.unique_id).name
+        type2name[server_room_type.id] = AttributeCache.get(server_room_type.show_id or server_room_type.unique_id).name
+
+        response, _, _, _, _, _ = SearchFromDB(
+            "_type:({})".format(";".join(map(str, [region_type.id, idc_type.id, server_room_type.id]))),
+            ci_ids=list(ids),
+            count=1000000,
+            fl=list(type2name.values()),
+            parent_node_perm_passed=True).search()
+        id2ci = {i['_id']: i for i in response}
+
+        def _build_tree(_tree, parent_id=None):
+            tree = []
+            for child_id in _tree.get(parent_id, []):
+                children = sorted(_build_tree(_tree, child_id), key=lambda x: x['_id'])
+                if not id2ci.get(child_id):
+                    continue
+                ci = id2ci[child_id]
+                if ci['ci_type'] == BuiltinModelEnum.DCIM_SERVER_ROOM:
+                    ci['rack_count'] = CIRelation.get_by(first_ci_id=child_id, only_query=True).join(
+                        CI, CI.id == CIRelation.second_ci_id).filter(CI.type_id == rack_type.id).count()
+
+                tree.append({'children': children, **ci})
+            return tree
+
+        result = sorted(_build_tree(relations), key=lambda x: x['_id'])
+
+        return result, type2name

cmdb-api/api/lib/cmdb/ipam/address.py

@@ -3,7 +3,6 @@
 import redis_lock
 from flask import abort
 
-from api.extensions import db
 from api.extensions import rd
 from api.lib.cmdb.cache import CITypeCache
 from api.lib.cmdb.ci import CIManager
@@ -21,9 +20,8 @@ from api.lib.cmdb.search.ci_relation.search import Search as RelationSearch
 
 class IpAddressManager(object):
     def __init__(self):
-        self.ci_type = CITypeCache.get(BuiltinModelEnum.IPAM_ADDRESS)
-        not self.ci_type and abort(400, ErrFormat.ipam_address_model_not_found.format(
-            BuiltinModelEnum.IPAM_ADDRESS))
+        self.ci_type = CITypeCache.get(BuiltinModelEnum.IPAM_ADDRESS) or abort(
+            404, ErrFormat.ipam_address_model_not_found.format(BuiltinModelEnum.IPAM_ADDRESS))
 
         self.type_id = self.ci_type.id
 
@@ -33,10 +31,11 @@ class IpAddressManager(object):
 
         return numfound, result
 
-    def _get_cis(self, ips):
-        response, _, _, _, _, _ = SearchFromDB(
-            "_type:{},{}:({})".format(self.type_id, IPAddressBuiltinAttributes.IP, ";".join(ips or [])),
-            count=10000000, parent_node_perm_passed=True).search()
+    def _get_cis(self, subnet_id, ips):
+
+        q = "_type:{},{}:({})".format(self.type_id, IPAddressBuiltinAttributes.IP, ";".join(ips or []))
+
+        response, _, _, _, _, _ = RelationSearch([subnet_id], level=[1], query=q, count=1000000).search()
 
         return response
 
@@ -48,25 +47,28 @@ class IpAddressManager(object):
         CIRelationManager().add(parent_id, child_id, valid=False, apply_async=False)
 
     @staticmethod
-    def calc_free_count(subnet_id):
-        db.session.commit()
+    def calc_used_count(subnet_id):
         q = "{}:(0;2),-{}:true".format(IPAddressBuiltinAttributes.ASSIGN_STATUS, IPAddressBuiltinAttributes.IS_USED)
 
-        return len(set(RelationSearch([subnet_id], level=[1], query=q).search(only_ids=True) or []))
+        return len(set(RelationSearch([subnet_id], level=[1], query=q, count=1000000).search(only_ids=True) or []))
 
-    def _update_subnet_count(self, subnet_id, assign_count, used_count=None):
+    @staticmethod
+    def _calc_assign_count(subnet_id):
+        q = "{}:(0;2)".format(IPAddressBuiltinAttributes.ASSIGN_STATUS)
+
+        return len(set(RelationSearch([subnet_id], level=[1], query=q, count=1000000).search(only_ids=True) or []))
+
+    def _update_subnet_count(self, subnet_id, assign_count_computed, used_count=None):
         payload = {}
 
         cur = CIManager.get_ci_by_id(subnet_id, need_children=False)
-        if assign_count is not None:
-            payload[SubnetBuiltinAttributes.ASSIGN_COUNT] = (cur.get(
-                SubnetBuiltinAttributes.ASSIGN_COUNT) or 0) + assign_count
-
+        if assign_count_computed:
+            payload[SubnetBuiltinAttributes.ASSIGN_COUNT] = self._calc_assign_count(subnet_id)
         if used_count is not None:
             payload[SubnetBuiltinAttributes.USED_COUNT] = used_count
 
         payload[SubnetBuiltinAttributes.FREE_COUNT] = (cur[SubnetBuiltinAttributes.HOSTS_COUNT] -
-                                                       self.calc_free_count(subnet_id))
+                                                       self.calc_used_count(subnet_id))
         CIManager().update(subnet_id, **payload)
 
     def assign_ips(self, ips, subnet_id, cidr, **kwargs):
@@ -90,40 +92,33 @@ class IpAddressManager(object):
             else:
                 return abort(400, ErrFormat.ipam_address_model_not_found)
 
-        with (redis_lock.Lock(rd.r, "IPAM_ASSIGN_ADDRESS_{}".format(subnet_id))):
-            cis = self._get_cis(ips)
+        with (redis_lock.Lock(rd.r, "IPAM_ASSIGN_ADDRESS_{}".format(subnet_id), expire=10)):
+            cis = self._get_cis(subnet_id, ips)
             ip2ci = {ci[IPAddressBuiltinAttributes.IP]: ci for ci in cis}
 
             ci_ids = []
-            status_change_num = 0
             for ip in ips:
                 kwargs['name'] = ip
                 kwargs[IPAddressBuiltinAttributes.IP] = ip
                 if ip not in ip2ci:
                     ci_id = CIManager.add(self.type_id, _sync=True, **kwargs)
-                    status_change_num += 1
                 else:
                     ci_id = ip2ci[ip]['_id']
                     CIManager().update(ci_id, _sync=True, **kwargs)
-                    if IPAddressBuiltinAttributes.ASSIGN_STATUS in kwargs and (
-                            (kwargs[IPAddressBuiltinAttributes.ASSIGN_STATUS] or 2) !=
-                            (ip2ci[ip].get(IPAddressBuiltinAttributes.ASSIGN_STATUS) or 2)):
-                        status_change_num += 1
                 ci_ids.append(ci_id)
 
                 self._add_relation(subnet_id, ci_id)
 
             if ips and IPAddressBuiltinAttributes.ASSIGN_STATUS in kwargs:
-                self._update_subnet_count(subnet_id, -status_change_num if kwargs.get(
-                    IPAddressBuiltinAttributes.ASSIGN_STATUS) == IPAddressAssignStatus.UNASSIGNED else status_change_num)
+                self._update_subnet_count(subnet_id, True)
 
             if ips and IPAddressBuiltinAttributes.IS_USED in kwargs:
                 q = "{}:true".format(IPAddressBuiltinAttributes.IS_USED)
                 cur_used_ids = RelationSearch([subnet_id], level=[1], query=q).search(only_ids=True)
                 for _id in set(cur_used_ids) - set(ci_ids):
-                    CIManager().update(_id, _sync=True, **{IPAddressBuiltinAttributes.IS_USED: False})
+                    CIManager().update(_id, **{IPAddressBuiltinAttributes.IS_USED: False})
 
-                self._update_subnet_count(subnet_id, None, used_count=len(ips))
+                self._update_subnet_count(subnet_id, False, used_count=len(ips))
 
         if kwargs.get(IPAddressBuiltinAttributes.ASSIGN_STATUS) in (
                 IPAddressAssignStatus.ASSIGNED, IPAddressAssignStatus.RESERVED):

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

@@ -50,6 +50,10 @@ class ScanHistoryManager(DBMixin):
             if scan_rule is not None:
                 scan_rule.update(last_scan_time=kwargs.get('start_at'))
 
+        for i in self.cls.get_by(subnet_scan_id=kwargs.get('subnet_scan_id'), only_query=True).order_by(
+                self.cls.id.desc()).offset(100):
+            i.delete()
+
     def _can_update(self, **kwargs):
         pass
 

cmdb-api/api/lib/cmdb/ipam/stats.py

@@ -18,15 +18,13 @@ from api.models.cmdb import IPAMSubnetScan
 
 class Stats(object):
     def __init__(self):
-        self.address_type = CITypeCache.get(BuiltinModelEnum.IPAM_ADDRESS)
-        not self.address_type and abort(400, ErrFormat.ipam_address_model_not_found.format(
-            BuiltinModelEnum.IPAM_ADDRESS))
+        self.address_type = CITypeCache.get(BuiltinModelEnum.IPAM_ADDRESS) or abort(
+            404, ErrFormat.ipam_address_model_not_found.format(BuiltinModelEnum.IPAM_ADDRESS))
 
         self.address_type_id = self.address_type.id
 
-        self.subnet_type = CITypeCache.get(BuiltinModelEnum.IPAM_SUBNET)
-        not self.subnet_type and abort(400, ErrFormat.ipam_address_model_not_found.format(
-            BuiltinModelEnum.IPAM_ADDRESS))
+        self.subnet_type = CITypeCache.get(BuiltinModelEnum.IPAM_SUBNET) or abort(
+            404, ErrFormat.ipam_address_model_not_found.format(BuiltinModelEnum.IPAM_ADDRESS))
 
         self.subnet_type_id = self.subnet_type.id
 
@@ -40,8 +38,10 @@ class Stats(object):
             return list(set(ci_ids) - set(has_children_ci_ids))
 
         else:
-            type_id = CIManager().get_by_id(parent_id).type_id
-            key = [(str(parent_id), type_id)]
+            _type = CIManager().get_by_id(parent_id)
+            if not _type:
+                return abort(404, ErrFormat.ipam_subnet_not_found)
+            key = [(str(parent_id), _type.type_id)]
             result = []
             while True:
                 res = [json.loads(x).items() for x in [i or '{}' for i in rd.get(

cmdb-api/api/lib/cmdb/ipam/subnet.py

@@ -2,6 +2,7 @@
 
 from collections import defaultdict
 
+import datetime
 import ipaddress
 from flask import abort
 
@@ -9,7 +10,7 @@ from api.lib.cmdb.cache import AttributeCache
 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.const import BuiltinModelEnum, BUILTIN_ATTRIBUTES
+from api.lib.cmdb.const import BuiltinModelEnum
 from api.lib.cmdb.ipam.const import OperateTypeEnum
 from api.lib.cmdb.ipam.const import SubnetBuiltinAttributes
 from api.lib.cmdb.ipam.history import OperateHistoryManager
@@ -22,9 +23,8 @@ from api.models.cmdb import IPAMSubnetScan
 
 class SubnetManager(object):
     def __init__(self):
-        self.ci_type = CITypeCache.get(BuiltinModelEnum.IPAM_SUBNET)
-        not self.ci_type and abort(400, ErrFormat.ipam_subnet_model_not_found.format(
-            BuiltinModelEnum.IPAM_SUBNET))
+        self.ci_type = CITypeCache.get(BuiltinModelEnum.IPAM_SUBNET) or abort(
+            404, ErrFormat.ipam_subnet_model_not_found.format(BuiltinModelEnum.IPAM_SUBNET))
 
         self.type_id = self.ci_type.id
 
@@ -47,7 +47,7 @@ class SubnetManager(object):
 
         new_last_update_at = ""
         for i in result:
-            __last_update_at = max([i['updated_at'] or "", i['created_at'] or ""])
+            __last_update_at = max([i['rule_updated_at'] or "", i['created_at'] or ""])
             if new_last_update_at < __last_update_at:
                 new_last_update_at = __last_update_at
 
@@ -131,7 +131,11 @@ class SubnetManager(object):
     @staticmethod
     def _is_valid_cidr(cidr):
         try:
-            return str(ipaddress.ip_network(cidr))
+            cidr = ipaddress.ip_network(cidr)
+            if not (8 <= cidr.prefixlen <= 31):
+                raise ValueError
+
+            return str(cidr)
         except ValueError:
             return abort(400, ErrFormat.ipam_cidr_invalid_notation.format(cidr))
 
@@ -143,6 +147,7 @@ class SubnetManager(object):
         root_nodes = set(all_nodes) - set(none_root_nodes) - set(_id and [_id] or [])
         response, _, _, _, _, _ = SearchFromDB("_type:{}".format(self.type_id),
                                                ci_ids=list(root_nodes),
+                                               count=1000000,
                                                parent_node_perm_passed=True).search()
 
         cur_subnet = ipaddress.ip_network(cidr)
@@ -163,6 +168,7 @@ class SubnetManager(object):
 
         response, _, _, _, _, _ = SearchFromDB("_type:{}".format(self.type_id),
                                                ci_ids=list(child_nodes),
+                                               count=1000000,
                                                parent_node_perm_passed=True).search()
 
         cur_subnet = ipaddress.ip_network(cidr)
@@ -199,7 +205,7 @@ class SubnetManager(object):
         return cidr
 
     def _add_subnet(self, cidr, **kwargs):
-        kwargs[SubnetBuiltinAttributes.HOSTS_COUNT] = ipaddress.ip_network(cidr).num_addresses - 2
+        kwargs[SubnetBuiltinAttributes.HOSTS_COUNT] = len(list(ipaddress.ip_network(cidr).hosts()))
         kwargs[SubnetBuiltinAttributes.USED_COUNT] = 0
         kwargs[SubnetBuiltinAttributes.ASSIGN_COUNT] = 0
         kwargs[SubnetBuiltinAttributes.FREE_COUNT] = kwargs[SubnetBuiltinAttributes.HOSTS_COUNT]
@@ -240,7 +246,8 @@ class SubnetManager(object):
     def _update_scan_rule(ci_id, agent_id, cron, scan_enabled=True):
         existed = IPAMSubnetScan.get_by(ci_id=ci_id, first=True, to_dict=False)
         if existed is not None:
-            existed.update(ci_id=ci_id, agent_id=agent_id, cron=cron, scan_enabled=scan_enabled)
+            existed.update(ci_id=ci_id, agent_id=agent_id, cron=cron, scan_enabled=scan_enabled,
+                           rule_updated_at=datetime.datetime.now())
         else:
             IPAMSubnetScan.create(ci_id=ci_id, agent_id=agent_id, cron=cron, scan_enabled=scan_enabled)
 
@@ -273,7 +280,9 @@ class SubnetManager(object):
         existed = IPAMSubnetScan.get_by(ci_id=_id, first=True, to_dict=False)
         existed and existed.delete()
 
+        delete_ci_ids = []
         for i in CIRelation.get_by(first_ci_id=_id, to_dict=False):
+            delete_ci_ids.append(i.second_ci_id)
             i.delete()
 
         cur = CIManager.get_ci_by_id(_id, need_children=False)
@@ -284,6 +293,8 @@ class SubnetManager(object):
                                     cidr=cur.get(SubnetBuiltinAttributes.CIDR),
                                     description=cur.get(SubnetBuiltinAttributes.CIDR))
 
+        # batch_delete_ci.apply_async(args=(delete_ci_ids,))
+
         return _id
 
 

cmdb-api/api/lib/cmdb/perms.py

@@ -163,7 +163,7 @@ class CIFilterPermsCRUD(DBMixin):
 
     def add(self, **kwargs):
         kwargs = self._can_add(**kwargs) or kwargs
-        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid'])):
+        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid']), expire=10):
             request_id_filter = {}
             if kwargs.get('id_filter'):
                 obj = self.cls.get_by(type_id=kwargs.get('type_id'),
@@ -232,7 +232,7 @@ class CIFilterPermsCRUD(DBMixin):
         pass
 
     def delete(self, **kwargs):
-        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid'])):
+        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid']), expire=10):
             obj = self.cls.get_by(type_id=kwargs.get('type_id'),
                                   rid=kwargs.get('rid'),
                                   id_filter=None,
@@ -249,7 +249,7 @@ class CIFilterPermsCRUD(DBMixin):
 
     def delete2(self, **kwargs):
 
-        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid'])):
+        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid']), expire=10):
             obj = self.cls.get_by(type_id=kwargs.get('type_id'),
                                   rid=kwargs.get('rid'),
                                   ci_filter=None,

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

@@ -16,8 +16,9 @@ class ErrFormat(CommonErrFormat):
     argument_file_not_found = _l("The file doesn't seem to be uploaded")  # 文件似乎并未上传
 
     attribute_not_found = _l("Attribute {} does not exist!")  # 属性 {} 不存在!
+    # 该属性是模型的唯一标识，不能被删除!
     attribute_is_unique_id = _l(
-        "This attribute is the unique identifier of the model and cannot be deleted!")  # 该属性是模型的唯一标识，不能被删除!
+        "This attribute is the unique identifier of the model and cannot be deleted!")  
     attribute_is_ref_by_type = _l(
         "This attribute is referenced by model {} and cannot be deleted!")  # 该属性被模型 {} 引用, 不能删除!
     attribute_value_type_cannot_change = _l(
@@ -129,7 +130,8 @@ class ErrFormat(CommonErrFormat):
     adr_default_ref_once = _l("The default auto-discovery rule is already referenced by model {}!")
     # unique_key方法必须返回非空字符串!
     adr_unique_key_required = _l("The unique_key method must return a non-empty string!")
-    adr_plugin_attributes_list_required = _l("The attributes method must return a list")  # attributes方法必须返回的是list
+    # attributes方法必须返回的是list
+    adr_plugin_attributes_list_required = _l("The attributes method must return a list")  
     # attributes方法返回的list不能为空!
     adr_plugin_attributes_list_no_empty = _l("The list returned by the attributes method cannot be empty!")
     # 只有管理员才可以定义执行机器为: 所有节点!
@@ -169,3 +171,8 @@ class ErrFormat(CommonErrFormat):
     ipam_subnet_cannot_delete = _l("Cannot delete because child nodes exist")
     ipam_subnet_not_found = _l("Subnet is not found")
     ipam_scope_cannot_delete = _l("Cannot delete because child nodes exist")
+
+    # # DCIM
+    dcim_builtin_model_not_found = _l("The dcim model {} does not exist")
+    dcim_rack_u_slot_invalid = _l("Irregularities in Rack Units")
+    dcim_rack_u_count_invalid = _l("The device's position is greater than the rack unit height")

cmdb-api/api/lib/cmdb/search/ci_relation/search.py

@@ -64,7 +64,7 @@ class Search(object):
 
         self.ancestor_ids = ancestor_ids
         self.descendant_ids = descendant_ids
-        self.root_parent_path = root_parent_path
+        self.root_parent_path = root_parent_path or []
         self.has_m2m = has_m2m or False
         if not self.has_m2m:
             if self.ancestor_ids:

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

@@ -55,7 +55,6 @@ def str2datetime(x):
     return datetime.datetime.strptime(x, "%Y-%m-%d %H:%M")
 
 
-
 class ValueTypeMap(object):
     deserialize = {
         ValueTypeEnum.INT: string2int,

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

@@ -1,6 +1,6 @@
 import functools
 
-from flask import abort, session
+from flask import abort, session, current_app
 from api.lib.common_setting.acl import ACLManager
 from api.lib.common_setting.resp_format import ErrFormat
 from api.lib.perm.acl.acl import is_app_admin
@@ -15,6 +15,7 @@ def perms_role_required(app_name, resource_type_name, resource_name, perm, role_
             try:
                 has_perms = acl.role_has_perms(session["acl"]['rid'], resource_name, resource_type_name, perm)
             except Exception as e:
+                current_app.logger.error(f"acl role_has_perms err: {e}")
                 # resource_type not exist, continue check role
                 if role_name:
                     if role_name not in session.get("acl", {}).get("parentRoles", []) and not is_app_admin(app_name):

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

@@ -476,7 +476,7 @@ class EditDepartmentInACL(object):
         for employee in e_list:
             employee_acl_rid = employee.get('e_acl_rid')
             if employee_acl_rid == 0:
-                result.append(f"employee_acl_rid == 0")
+                result.append("employee_acl_rid == 0")
                 continue
             cls.remove_single_employee_from_old_department(acl, employee, result)
 
@@ -501,8 +501,8 @@ class EditDepartmentInACL(object):
             acl.remove_user_from_role(employee.get('e_acl_rid'), payload)
             current_app.logger.info(f"remove {employee.get('e_acl_rid')} from {d_acl_rid}")
         except Exception as e:
-            result.append(
-                f"remove_user_from_role employee_acl_rid: {employee.get('e_acl_rid')}, parent_id: {d_acl_rid}, err: {e}")
+            err = f"remove_user_from_role e_acl_rid: {employee.get('e_acl_rid')}, parent_id: {d_acl_rid}, err: {e}"
+            result.append(err)
 
         return True
 
@@ -548,7 +548,7 @@ class EditDepartmentInACL(object):
         for employee in e_list:
             employee_acl_rid = employee.get('e_acl_rid')
             if employee_acl_rid == 0:
-                result.append(f"employee_acl_rid == 0")
+                result.append("employee_acl_rid == 0")
                 continue
 
             cls.remove_single_employee_from_old_department(acl, employee, result)

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

@@ -4,7 +4,7 @@ import traceback
 from datetime import datetime
 
 import requests
-from flask import abort
+from flask import abort, current_app
 from flask_login import current_user
 from sqlalchemy import or_, literal_column, func, not_, and_
 from werkzeug.datastructures import MultiDict
@@ -478,7 +478,7 @@ class EmployeeCRUD(object):
             Employee.deleted == 0,
             Employee.block == block,
         ]
-        if type(department_id) == list:
+        if isinstance(department_id, list):
             if len(department_id) == 0:
                 return []
             else:
@@ -702,6 +702,7 @@ class EmployeeCRUD(object):
             try:
                 last_login = datetime.strptime(last_login, '%Y-%m-%d %H:%M:%S')
             except Exception as e:
+                current_app.logger.error(f"strptime {last_login} err: {e}")
                 last_login = datetime.now()
         else:
             last_login = datetime.now()
@@ -712,6 +713,7 @@ class EmployeeCRUD(object):
             )
             return last_login
         except Exception as e:
+            current_app.logger.error(f"update last_login err: {e}")
             return
 
 

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

@@ -2,7 +2,7 @@ import requests
 
 from api.lib.common_setting.const import BotNameMap
 from api.lib.common_setting.resp_format import ErrFormat
-from api.models.common_setting import CompanyInfo, NoticeConfig
+from api.models.common_setting import NoticeConfig
 from wtforms import Form
 from wtforms import StringField
 from wtforms import validators

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

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

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

@@ -6,7 +6,7 @@ from functools import wraps
 from flask import abort
 from flask import request
 
-from api.lib.perm.acl.cache import AppCache, AppAccessTokenCache
+from api.lib.perm.acl.cache import AppCache
 from api.lib.perm.acl.resp_format import ErrFormat
 
 

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

@@ -138,14 +138,14 @@ class HasResourceRoleCache(object):
 
     @classmethod
     def add(cls, rid, app_id):
-        with redis_lock.Lock(rd.r, 'HasResourceRoleCache'):
+        with redis_lock.Lock(rd.r, 'HasResourceRoleCache', expire=10):
             c = cls.get(app_id)
             c[rid] = 1
             cache.set(cls.PREFIX_KEY.format(app_id), c, timeout=0)
 
     @classmethod
     def remove(cls, rid, app_id):
-        with redis_lock.Lock(rd.r, 'HasResourceRoleCache'):
+        with redis_lock.Lock(rd.r, 'HasResourceRoleCache', expire=10):
             c = cls.get(app_id)
             c.pop(rid, None)
             cache.set(cls.PREFIX_KEY.format(app_id), c, timeout=0)

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

@@ -1,8 +1,5 @@
 # -*- coding:utf-8 -*-
 
-
-import time
-
 import redis_lock
 import six
 from flask import abort
@@ -145,7 +142,7 @@ class RoleRelationCRUD(object):
 
     @classmethod
     def add(cls, role, parent_id, child_ids, app_id):
-        with redis_lock.Lock(rd.r, "ROLE_RELATION_ADD"):
+        with redis_lock.Lock(rd.r, "ROLE_RELATION_ADD", expire=10):
             db.session.commit()
 
             result = []

cmdb-api/api/lib/utils.py

@@ -1,7 +1,6 @@
 # -*- coding:utf-8 -*- 
 
 import base64
-from typing import Set
 
 import elasticsearch
 import redis

cmdb-api/api/models/acl.py

@@ -105,8 +105,8 @@ class User(CRUDModel, SoftDeleteMixin):
     _password = db.Column("password", db.String(80))
     key = db.Column(db.String(32), nullable=False)
     secret = db.Column(db.String(32), nullable=False)
-    date_joined = db.Column(db.DateTime, default=datetime.utcnow)
-    last_login = db.Column(db.DateTime, default=datetime.utcnow)
+    date_joined = db.Column(db.DateTime, default=datetime.now)
+    last_login = db.Column(db.DateTime, default=datetime.now)
     block = db.Column(db.Boolean, default=False)
     has_logined = db.Column(db.Boolean, default=False)
     wx_id = db.Column(db.String(32))

cmdb-api/api/models/cmdb.py

@@ -676,6 +676,7 @@ class IPAMSubnetScan(Model):
 
     ci_id = db.Column(db.Integer, index=True, nullable=False)
     scan_enabled = db.Column(db.Boolean, default=True)
+    rule_updated_at = db.Column(db.DateTime)
     last_scan_time = db.Column(db.DateTime)
 
     # scan rules
@@ -706,3 +707,14 @@ class IPAMOperationHistory(Model2):
     cidr = db.Column(db.String(18), index=True)
     operate_type = db.Column(db.Enum(*OperateTypeEnum.all()))
     description = db.Column(db.Text)
+
+
+class DCIMOperationHistory(Model2):
+    __tablename__ = "c_dcim_operation_histories"
+
+    from api.lib.cmdb.dcim.const import OperateTypeEnum
+
+    uid = db.Column(db.Integer, index=True)
+    rack_id = db.Column(db.Integer, index=True)
+    ci_id = db.Column(db.Integer, index=True)
+    operate_type = db.Column(db.Enum(*OperateTypeEnum.all()))

cmdb-api/api/tasks/acl.py

@@ -32,7 +32,7 @@ from api.models.acl import Trigger
 def role_rebuild(rids, app_id):
     rids = rids if isinstance(rids, list) else [rids]
     for rid in rids:
-        with redis_lock.Lock(rd.r, "ROLE_REBUILD_{}_{}".format(rid, app_id)):
+        with redis_lock.Lock(rd.r, "ROLE_REBUILD_{}_{}".format(rid, app_id), expire=10):
             RoleRelationCache.rebuild(rid, app_id)
 
     current_app.logger.info("Role {0} App {1} rebuild..........".format(rids, app_id))

cmdb-api/api/tasks/cmdb.py

@@ -1,4 +1,4 @@
-# -*- coding:utf-8 -*- 
+# -*- coding:utf-8 -*-
 
 
 import datetime
@@ -145,7 +145,7 @@ def ci_delete_trigger(trigger, operate_type, ci_dict):
 @flush_db
 @reconnect_db
 def ci_relation_cache(parent_id, child_id, ancestor_ids):
-    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id)):
+    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id), expire=10):
         children = rd.get([parent_id], REDIS_PREFIX_CI_RELATION)[0]
         children = json.loads(children) if children is not None else {}
 
@@ -223,7 +223,7 @@ def ci_relation_add(parent_dict, child_id, uid):
 @celery.task(name="cmdb.ci_relation_delete", queue=CMDB_QUEUE)
 @reconnect_db
 def ci_relation_delete(parent_id, child_id, ancestor_ids):
-    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id)):
+    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id), expire=10):
         children = rd.get([parent_id], REDIS_PREFIX_CI_RELATION)[0]
         children = json.loads(children) if children is not None else {}
 
@@ -374,3 +374,25 @@ def build_relations_for_ad_accept(adc, ci_id, ad_key2attr):
                                               source=RelationSourceEnum.AUTO_DISCOVERY)
                     except:
                         pass
+
+
+@celery.task(name="cmdb.dcim_calc_u_free_count", queue=CMDB_QUEUE)
+@reconnect_db
+def dcim_calc_u_free_count():
+    from api.lib.cmdb.ci import CIManager
+    from api.lib.cmdb.dcim.rack import RackManager
+    from api.lib.cmdb.dcim.const import RackBuiltinAttributes
+
+    if not has_request_context():
+        current_app.test_request_context().push()
+        login_user(UserCache.get('worker'))
+
+    try:
+        rack_m = RackManager()
+    except Exception:
+        return
+
+    racks = CI.get_by(type_id=rack_m.type_id, to_dict=False)
+    for rack in racks:
+        payload = {RackBuiltinAttributes.FREE_U_COUNT: rack_m.calc_u_free_count(rack.id)}
+        CIManager().update(rack.id, **payload)

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-11-11 17:40+0800\n"
+"POT-Creation-Date: 2024-11-26 18:54+0800\n"
 "PO-Revision-Date: 2023-12-25 20:21+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: zh\n"
@@ -92,11 +92,11 @@ msgstr "您没有操作权限!"
 msgid "Only the creator or administrator has permission!"
 msgstr "只有创建人或者管理员才有权限!"
 
-#: api/lib/cmdb/const.py:128
+#: api/lib/cmdb/const.py:133
 msgid "Update Time"
 msgstr "更新时间"
 
-#: api/lib/cmdb/const.py:129
+#: api/lib/cmdb/const.py:134
 msgid "Updated By"
 msgstr "更新人"
 
@@ -544,6 +544,18 @@ msgstr "因为子节点已经存在，不能删除"
 msgid "Subnet is not found"
 msgstr "子网不存在"
 
+#: api/lib/cmdb/resp_format.py:174
+msgid "The dcim model {} does not exist"
+msgstr "DCIM模型 {} 不存在!"
+
+#: api/lib/cmdb/resp_format.py:175
+msgid "Irregularities in Rack Units"
+msgstr "机架U位异常!"
+
+#: api/lib/cmdb/resp_format.py:176
+msgid "The device's position is greater than the rack unit height"
+msgstr "有设备的位置大于机柜的U数!"
+
 #: api/lib/common_setting/resp_format.py:8
 msgid "Company info already existed"
 msgstr "公司信息已存在,无法创建!"

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

@@ -2,14 +2,14 @@
 
 
 import json
-from io import BytesIO
-
 from flask import abort
 from flask import current_app
 from flask import request
+from io import BytesIO
 
 from api.lib.cmdb.cache import AttributeCache
 from api.lib.cmdb.cache import CITypeCache
+from api.lib.cmdb.ci import CITriggerManager
 from api.lib.cmdb.ci_type import CITypeAttributeGroupManager
 from api.lib.cmdb.ci_type import CITypeAttributeManager
 from api.lib.cmdb.ci_type import CITypeGroupManager
@@ -497,6 +497,16 @@ class CITypeTriggerView(APIView):
         return self.jsonify(code=200)
 
 
+class CITypeTriggerTestView(APIView):
+    url_prefix = ("/ci_types/<int:type_id>/triggers/<int:_id>/test_notify",)
+
+    @has_perm_from_args("type_id", ResourceTypeEnum.CI, PermEnum.CONFIG, CITypeManager.get_name_by_id)
+    def post(self, type_id, _id):
+        CITriggerManager().trigger_notify_test(type_id, _id)
+
+        return self.jsonify(code=200)
+
+
 class CITypeGrantView(APIView):
     url_prefix = "/ci_types/<int:type_id>/roles/<int:rid>/grant"
 

cmdb-api/api/views/cmdb/dcim/__init__.py

@@ -0,0 +1 @@
+# -*- coding:utf-8 -*-

cmdb-api/api/views/cmdb/dcim/dcim_history.py

@@ -0,0 +1,30 @@
+# -*- coding:utf-8 -*-
+
+from flask import request
+
+from api.lib.cmdb.dcim.history import OperateHistoryManager
+from api.lib.common_setting.decorator import perms_role_required
+from api.lib.common_setting.role_perm_base import CMDBApp
+from api.lib.utils import get_page
+from api.lib.utils import get_page_size
+from api.lib.utils import handle_arg_list
+from api.resource import APIView
+
+app_cli = CMDBApp()
+
+
+class DCIMOperateHistoryView(APIView):
+    url_prefix = ("/dcim/history/operate",)
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def get(self):
+        page = get_page(request.values.pop("page", 1))
+        page_size = get_page_size(request.values.pop("page_size", None))
+        operate_type = handle_arg_list(request.values.pop('operate_type', []))
+        if operate_type:
+            request.values["operate_type"] = operate_type
+
+        numfound, result, id2ci, type2show_key = OperateHistoryManager.search(page, page_size, **request.values)
+
+        return self.jsonify(numfound=numfound, result=result, id2ci=id2ci, type2show_key=type2show_key)

cmdb-api/api/views/cmdb/dcim/idc.py

@@ -0,0 +1,35 @@
+# -*- coding:utf-8 -*-
+
+from flask import request
+
+from api.lib.cmdb.dcim.idc import IDCManager
+from api.lib.common_setting.decorator import perms_role_required
+from api.lib.common_setting.role_perm_base import CMDBApp
+from api.resource import APIView
+
+app_cli = CMDBApp()
+
+
+class IDCView(APIView):
+    url_prefix = ("/dcim/idc", "/dcim/idc/<int:_id>")
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def post(self):
+        parent_id = request.values.pop("parent_id")
+
+        return self.jsonify(ci_id=IDCManager().add(parent_id, **request.values))
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def put(self, _id):
+        IDCManager().update(_id, **request.values)
+
+        return self.jsonify(ci_id=_id)
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def delete(self, _id):
+        IDCManager().delete(_id)
+
+        return self.jsonify(ci_id=_id)

cmdb-api/api/views/cmdb/dcim/rack.py

@@ -0,0 +1,102 @@
+# -*- coding:utf-8 -*-
+
+from flask import request
+
+from api.lib.cmdb.const import CMDB_QUEUE
+from api.lib.cmdb.dcim.const import RackBuiltinAttributes
+from api.lib.cmdb.dcim.rack import RackManager
+from api.lib.common_setting.decorator import perms_role_required
+from api.lib.common_setting.role_perm_base import CMDBApp
+from api.lib.decorator import args_required
+from api.resource import APIView
+from api.tasks.cmdb import dcim_calc_u_free_count
+
+app_cli = CMDBApp()
+
+
+class RackView(APIView):
+    url_prefix = ("/dcim/rack", "/dcim/rack/<int:_id>")
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    @args_required("parent_id")
+    def post(self):
+        parent_id = request.values.pop("parent_id")
+
+        return self.jsonify(ci_id=RackManager().add(parent_id, **request.values))
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def put(self, _id):
+        RackManager().update(_id, **request.values)
+
+        return self.jsonify(ci_id=_id)
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def delete(self, _id):
+        RackManager().delete(_id)
+
+        return self.jsonify(ci_id=_id)
+
+
+class RackDetailView(APIView):
+    url_prefix = ("/dcim/rack/<int:rack_id>/device/<int:device_id>",)
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    @args_required(RackBuiltinAttributes.U_START)
+    def post(self, rack_id, device_id):
+        u_start = request.values.pop(RackBuiltinAttributes.U_START)
+        u_count = request.values.get(RackBuiltinAttributes.U_COUNT)
+
+        RackManager().add_device(rack_id, device_id, u_start, u_count)
+
+        return self.jsonify(rack_id=rack_id, device_id=device_id)
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    @args_required("to_u_start")
+    def put(self, rack_id, device_id):
+        to_u_start = request.values.pop("to_u_start")
+
+        RackManager().move_device(rack_id, device_id, to_u_start)
+
+        return self.jsonify(rack_id=rack_id, device_id=device_id, to_u_start=to_u_start)
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def delete(self, rack_id, device_id):
+        RackManager().remove_device(rack_id, device_id)
+
+        return self.jsonify(code=200)
+
+
+class RackDeviceMigrateView(APIView):
+    url_prefix = ("/dcim/rack/<int:rack_id>/device/<int:device_id>/migrate",)
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    @args_required("to_rack_id")
+    @args_required("to_u_start")
+    def put(self, rack_id, device_id):
+        to_rack_id = request.values.pop("to_rack_id")
+        to_u_start = request.values.pop("to_u_start")
+
+        RackManager().migrate_device(rack_id, device_id, to_rack_id, to_u_start)
+
+        return self.jsonify(rack_id=rack_id,
+                            device_id=device_id,
+                            to_u_start=to_u_start,
+                            to_rack_id=to_rack_id)
+
+
+class RackCalcUFreeCountView(APIView):
+    url_prefix = ("/dcim/rack/calc_u_free_count",)
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def post(self):
+        dcim_calc_u_free_count.apply_async(queue=CMDB_QUEUE)
+
+        return self.jsonify(code=200)

cmdb-api/api/views/cmdb/dcim/region.py

@@ -0,0 +1,33 @@
+# -*- coding:utf-8 -*-
+
+from flask import request
+
+from api.lib.cmdb.dcim.region import RegionManager
+from api.lib.common_setting.decorator import perms_role_required
+from api.lib.common_setting.role_perm_base import CMDBApp
+from api.resource import APIView
+
+app_cli = CMDBApp()
+
+
+class RegionView(APIView):
+    url_prefix = ("/dcim/region", "/dcim/region/<int:_id>")
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def post(self):
+        return self.jsonify(ci_id=RegionManager().add(**request.values))
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def put(self, _id):
+        RegionManager().update(_id, **request.values)
+
+        return self.jsonify(ci_id=_id)
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def delete(self, _id):
+        RegionManager().delete(_id)
+
+        return self.jsonify(ci_id=_id)

cmdb-api/api/views/cmdb/dcim/server_room.py

@@ -0,0 +1,43 @@
+# -*- coding:utf-8 -*-
+
+from flask import request
+
+from api.lib.cmdb.dcim.server_room import ServerRoomManager
+from api.lib.common_setting.decorator import perms_role_required
+from api.lib.common_setting.role_perm_base import CMDBApp
+from api.lib.decorator import args_required
+from api.resource import APIView
+
+app_cli = CMDBApp()
+
+
+class ServerRoomView(APIView):
+    url_prefix = ("/dcim/server_room", "/dcim/server_room/<int:_id>", "/dcim/server_room/<int:_id>/racks")
+
+    def get(self, _id):
+        q = request.values.get('q')
+        counter, result = ServerRoomManager.get_racks(_id, q)
+
+        return self.jsonify(counter=counter, result=result)
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    @args_required("parent_id")
+    def post(self):
+        parent_id = request.values.pop("parent_id")
+
+        return self.jsonify(ci_id=ServerRoomManager().add(parent_id, **request.values))
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def put(self, _id):
+        ServerRoomManager().update(_id, **request.values)
+
+        return self.jsonify(ci_id=_id)
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def delete(self, _id):
+        ServerRoomManager().delete(_id)
+
+        return self.jsonify(ci_id=_id)

cmdb-api/api/views/cmdb/dcim/tree_view.py

@@ -0,0 +1,19 @@
+# -*- coding:utf-8 -*-
+
+from api.lib.cmdb.dcim.tree_view import TreeViewManager
+from api.lib.common_setting.decorator import perms_role_required
+from api.lib.common_setting.role_perm_base import CMDBApp
+from api.resource import APIView
+
+app_cli = CMDBApp()
+
+
+class DCIMTreeView(APIView):
+    url_prefix = "/dcim/tree_view"
+
+    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
+                         app_cli.op.read, app_cli.admin_name)
+    def get(self):
+        result, type2name = TreeViewManager.get()
+
+        return self.jsonify(result=result, type2name=type2name)

cmdb-api/api/views/common_setting/employee.py

@@ -131,7 +131,7 @@ class EmployeeChangePasswordWithACLID(APIView):
         if not password:
             abort(400, ErrFormat.password_is_required)
 
-        data = EmployeeCRUD.change_password_by_uid(_uid, password)
+        EmployeeCRUD.change_password_by_uid(_uid, password)
         return self.jsonify(200)
 
 

cmdb-api/api/views/common_setting/file_manage.py

@@ -6,7 +6,7 @@ import magic
 
 from api.lib.common_setting.const import MIMEExtMap
 from api.lib.common_setting.resp_format import ErrFormat
-from api.lib.common_setting.upload_file import allowed_file, generate_new_file_name, CommonFileCRUD
+from api.lib.common_setting.upload_file import generate_new_file_name, CommonFileCRUD
 from api.resource import APIView
 
 prefix = '/file'

cmdb-api/requirements.txt

@@ -58,3 +58,4 @@ python-magic==0.4.27
 jsonpath==0.82.2
 networkx>=3.1
 ipaddress>=1.0.23
+ruff==0.8.3

cmdb-ui/public/iconfont/demo_index.html

@@ -54,6 +54,66 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xea02;</span>
+                <div class="name">veops-rear</div>
+                <div class="code-name">&amp;#xea02;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea03;</span>
+                <div class="name">veops-front</div>
+                <div class="code-name">&amp;#xea03;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea01;</span>
+                <div class="name">veops-xianggang</div>
+                <div class="code-name">&amp;#xea01;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea00;</span>
+                <div class="name">veops-device (2)</div>
+                <div class="code-name">&amp;#xea00;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe9ff;</span>
+                <div class="name">veops-room (1)</div>
+                <div class="code-name">&amp;#xe9ff;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe9fe;</span>
+                <div class="name">veops-IDC</div>
+                <div class="code-name">&amp;#xe9fe;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe9fd;</span>
+                <div class="name">veops-region</div>
+                <div class="code-name">&amp;#xe9fd;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe9fb;</span>
+                <div class="name">veops-device</div>
+                <div class="code-name">&amp;#xe9fb;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe9fc;</span>
+                <div class="name">veops-cabinet</div>
+                <div class="code-name">&amp;#xe9fc;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe9f9;</span>
+                <div class="name">veops-data_center</div>
+                <div class="code-name">&amp;#xe9f9;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe9fa;</span>
                 <div class="name">ops-setting-holiday_management-copy</div>
@@ -6102,9 +6162,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1731312848138') format('woff2'),
-       url('iconfont.woff?t=1731312848138') format('woff'),
-       url('iconfont.ttf?t=1731312848138') format('truetype');
+  src: url('iconfont.woff2?t=1732673294759') format('woff2'),
+       url('iconfont.woff?t=1732673294759') format('woff'),
+       url('iconfont.ttf?t=1732673294759') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -6130,6 +6190,96 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont veops-rear"></span>
+            <div class="name">
+              veops-rear
+            </div>
+            <div class="code-name">.veops-rear
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont veops-front"></span>
+            <div class="name">
+              veops-front
+            </div>
+            <div class="code-name">.veops-front
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont veops-xianggang"></span>
+            <div class="name">
+              veops-xianggang
+            </div>
+            <div class="code-name">.veops-xianggang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont a-veops-device2"></span>
+            <div class="name">
+              veops-device (2)
+            </div>
+            <div class="code-name">.a-veops-device2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont a-veops-room1"></span>
+            <div class="name">
+              veops-room (1)
+            </div>
+            <div class="code-name">.a-veops-room1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont veops-IDC"></span>
+            <div class="name">
+              veops-IDC
+            </div>
+            <div class="code-name">.veops-IDC
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont veops-region"></span>
+            <div class="name">
+              veops-region
+            </div>
+            <div class="code-name">.veops-region
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont veops-device"></span>
+            <div class="name">
+              veops-device
+            </div>
+            <div class="code-name">.veops-device
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont veops-cabinet"></span>
+            <div class="name">
+              veops-cabinet
+            </div>
+            <div class="code-name">.veops-cabinet
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont veops-data_center"></span>
+            <div class="name">
+              veops-data_center
+            </div>
+            <div class="code-name">.veops-data_center
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont ops-setting-holidays"></span>
             <div class="name">
@@ -15202,6 +15352,86 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#veops-rear"></use>
+                </svg>
+                <div class="name">veops-rear</div>
+                <div class="code-name">#veops-rear</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#veops-front"></use>
+                </svg>
+                <div class="name">veops-front</div>
+                <div class="code-name">#veops-front</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#veops-xianggang"></use>
+                </svg>
+                <div class="name">veops-xianggang</div>
+                <div class="code-name">#veops-xianggang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#a-veops-device2"></use>
+                </svg>
+                <div class="name">veops-device (2)</div>
+                <div class="code-name">#a-veops-device2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#a-veops-room1"></use>
+                </svg>
+                <div class="name">veops-room (1)</div>
+                <div class="code-name">#a-veops-room1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#veops-IDC"></use>
+                </svg>
+                <div class="name">veops-IDC</div>
+                <div class="code-name">#veops-IDC</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#veops-region"></use>
+                </svg>
+                <div class="name">veops-region</div>
+                <div class="code-name">#veops-region</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#veops-device"></use>
+                </svg>
+                <div class="name">veops-device</div>
+                <div class="code-name">#veops-device</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#veops-cabinet"></use>
+                </svg>
+                <div class="name">veops-cabinet</div>
+                <div class="code-name">#veops-cabinet</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#veops-data_center"></use>
+                </svg>
+                <div class="name">veops-data_center</div>
+                <div class="code-name">#veops-data_center</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#ops-setting-holidays"></use>

cmdb-ui/public/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3857903 */
-  src: url('iconfont.woff2?t=1731312848138') format('woff2'),
-       url('iconfont.woff?t=1731312848138') format('woff'),
-       url('iconfont.ttf?t=1731312848138') format('truetype');
+  src: url('iconfont.woff2?t=1732673294759') format('woff2'),
+       url('iconfont.woff?t=1732673294759') format('woff'),
+       url('iconfont.ttf?t=1732673294759') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,46 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.veops-rear:before {
+  content: "\ea02";
+}
+
+.veops-front:before {
+  content: "\ea03";
+}
+
+.veops-xianggang:before {
+  content: "\ea01";
+}
+
+.a-veops-device2:before {
+  content: "\ea00";
+}
+
+.a-veops-room1:before {
+  content: "\e9ff";
+}
+
+.veops-IDC:before {
+  content: "\e9fe";
+}
+
+.veops-region:before {
+  content: "\e9fd";
+}
+
+.veops-device:before {
+  content: "\e9fb";
+}
+
+.veops-cabinet:before {
+  content: "\e9fc";
+}
+
+.veops-data_center:before {
+  content: "\e9f9";
+}
+
 .ops-setting-holidays:before {
   content: "\e9fa";
 }

cmdb-ui/public/iconfont/iconfont.json

@@ -5,6 +5,76 @@
   "css_prefix_text": "",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "42510712",
+      "name": "veops-rear",
+      "font_class": "veops-rear",
+      "unicode": "ea02",
+      "unicode_decimal": 59906
+    },
+    {
+      "icon_id": "42510708",
+      "name": "veops-front",
+      "font_class": "veops-front",
+      "unicode": "ea03",
+      "unicode_decimal": 59907
+    },
+    {
+      "icon_id": "42497603",
+      "name": "veops-xianggang",
+      "font_class": "veops-xianggang",
+      "unicode": "ea01",
+      "unicode_decimal": 59905
+    },
+    {
+      "icon_id": "42485038",
+      "name": "veops-device (2)",
+      "font_class": "a-veops-device2",
+      "unicode": "ea00",
+      "unicode_decimal": 59904
+    },
+    {
+      "icon_id": "42455620",
+      "name": "veops-room (1)",
+      "font_class": "a-veops-room1",
+      "unicode": "e9ff",
+      "unicode_decimal": 59903
+    },
+    {
+      "icon_id": "42455607",
+      "name": "veops-IDC",
+      "font_class": "veops-IDC",
+      "unicode": "e9fe",
+      "unicode_decimal": 59902
+    },
+    {
+      "icon_id": "42455609",
+      "name": "veops-region",
+      "font_class": "veops-region",
+      "unicode": "e9fd",
+      "unicode_decimal": 59901
+    },
+    {
+      "icon_id": "42448953",
+      "name": "veops-device",
+      "font_class": "veops-device",
+      "unicode": "e9fb",
+      "unicode_decimal": 59899
+    },
+    {
+      "icon_id": "42448948",
+      "name": "veops-cabinet",
+      "font_class": "veops-cabinet",
+      "unicode": "e9fc",
+      "unicode_decimal": 59900
+    },
+    {
+      "icon_id": "42433324",
+      "name": "veops-data_center",
+      "font_class": "veops-data_center",
+      "unicode": "e9f9",
+      "unicode_decimal": 59897
+    },
     {
       "icon_id": "42337844",
       "name": "ops-setting-holiday_management-copy",

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

@@ -139,9 +139,9 @@
         :normalizer="
           (node) => {
             return {
-              id: String(node[0] || ''),
-              label: node[1] ? node[1].label || node[0] : node[0],
-              children: node.children && node.children.length ? node.children : undefined,
+              id: node.id,
+              label: node.label,
+              children: node.children,
             }
           }
         "
@@ -352,8 +352,12 @@ export default {
     },
     getChoiceValueByProperty(property) {
       const _find = this.canSearchPreferenceAttrList.find((item) => item.name === property)
-      if (_find) {
-        return _find.choice_value
+      if (_find?.choice_value?.length) {
+        return _find.choice_value.map((node) => ({
+          id: String(node?.[0] ?? ''),
+          label: node?.[1]?.label || node?.[0] || '',
+          children: node?.children?.length ? node.children : undefined
+        }))
       }
       return []
     },

cmdb-ui/src/components/Menu/index.module.less

@@ -11,10 +11,19 @@
 
     .ant-input {
       box-shadow: none;
-      border: none;
-      background-color: #F7F8FA;
       height: 30px;
       line-height: 30px;
+      border-radius: 30px;
+
+      &:focus {
+        border: solid 1px #B1C9FF;
+      }
+    }
+
+    .cmdb-side-menu-search-focused {
+      .ant-input {
+        border: solid 1px #B1C9FF;
+      }
     }
 
     .ant-input-suffix {

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

@@ -92,7 +92,7 @@ export default {
       e.preventDefault()
       e.stopPropagation()
       this.$confirm({
-        title: this.$t('alert'),
+        title: this.$t('warning'),
         content: this.$t('cmdb.preference.confirmcancelSub2', { name: menu.meta.title }),
         onOk() {
           const citypeId = menu.meta.typeId
@@ -313,10 +313,7 @@ export default {
         <Item class={styles['cmdb-side-menu-search']}>
           <a-input
             ref="cmdbSideMenuSearchInputRef"
-            class={styles['cmdb-side-menu-search-input']}
-            style={{
-              border: this.$route.name === 'cmdb_resource_search' ? 'solid 1px #B1C9FF' : ''
-            }}
+            class={`ops-input ${this.$route.name === 'cmdb_resource_search' ? 'cmdb-side-menu-search-focused' : ''}`}
             placeholder={this.$t('cmdbSearch')}
             onPressEnter={(e) => {
               this.jumpCMDBSearch(e.target.value)

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

@@ -1,121 +1,121 @@
-<template>
-  <vxe-table v-bind="$attrs" v-on="new$listeners" ref="xTable">
-    <slot></slot>
-    <template #empty>
-      <slot name="empty">
-        <div :style="{ paddingTop: '10px' }">
-          <img :style="{ width: '140px', height: '90px' }" :src="require('@/assets/data_empty.png')" />
-          <div>{{ $t('noData') }}</div>
-        </div>
-      </slot>
-    </template>
-    <template #loading>
-      <slot name="loading"></slot>
-    </template>
-  </vxe-table>
-</template>
-
-<script>
-import _ from 'lodash'
-// 该组件使用方法与vxe-table一致，但调用它的方法时，需先调用getVxetableRef()获取到vxe-table实体
-export default {
-  name: 'OpsTable',
-  data() {
-    return {
-      // isShifting: false,
-      // lastIndex: -1,
-      lastSelected: [],
-      currentSelected: [],
-    }
-  },
-  computed: {
-    new$listeners() {
-      if (!Object.keys(this.$listeners).length) {
-        return this.$listeners
-      }
-      return Object.assign(this.$listeners, {
-        // 在这里覆盖原有的change事件
-        // 'checkbox-change': this.selectChangeEvent,
-        'checkbox-range-change': this.checkboxRangeChange,
-        'checkbox-range-start': this.checkboxRangeStart,
-        'checkbox-range-end': this.checkboxRangeEnd,
-      })
-    },
-  },
-  mounted() {
-    // window.onkeydown = (e) => {
-    //   if (e.key === 'Shift') {
-    //     this.isShifting = true
-    //   }
-    // }
-    // window.onkeyup = (e) => {
-    //   if (e.key === 'Shift') {
-    //     this.isShifting = false
-    //     this.lastIndex = -1
-    //   }
-    // }
-  },
-  beforeDestroy() {
-    // window.onkeydown = ''
-    // window.onkeyup = ''
-  },
-  methods: {
-    getVxetableRef() {
-      return this.$refs.xTable
-    },
-    // selectChangeEvent(e) {
-    //   const xTable = this.$refs.xTable
-    //   const { lastIndex } = this
-    //   const currentIndex = e.rowIndex
-    //   const { tableData } = xTable.getTableData()
-    //   if (lastIndex > -1 && this.isShifting) {
-    //     let start = lastIndex
-    //     let end = currentIndex
-    //     if (lastIndex > currentIndex) {
-    //       start = currentIndex
-    //       end = lastIndex
-    //     }
-    //     const rangeData = tableData.slice(start, end + 1)
-    //     xTable.setCheckboxRow(rangeData, true)
-    //   }
-    //   this.lastIndex = currentIndex
-    //   this.$emit('checkbox-change', { ...e, records: xTable.getCheckboxRecords() })
-    // },
-    checkboxRangeStart(e) {
-      const xTable = this.$refs.xTable
-      const lastSelected = xTable.getCheckboxRecords()
-      const selectedReserve = xTable.getCheckboxReserveRecords()
-      this.lastSelected = [...lastSelected, ...selectedReserve]
-      this.$emit('checkbox-range-start', e)
-    },
-    checkboxRangeChange(e) {
-      const xTable = this.$refs.xTable
-      xTable.setCheckboxRow(this.lastSelected, true)
-      this.currentSelected = e.records
-      // this.lastSelected = [...new Set([...this.lastSelected, ...e.records])]
-      this.$emit('checkbox-range-change', {
-        ...e,
-        records: [...xTable.getCheckboxRecords(), ...xTable.getCheckboxReserveRecords()],
-      })
-    },
-    checkboxRangeEnd(e) {
-      const xTable = this.$refs.xTable
-      const isAllSelected = this.currentSelected.every((item) => {
-        const _idx = this.lastSelected.findIndex((ele) => _.isEqual(ele, item))
-        return _idx > -1
-      })
-      if (isAllSelected) {
-        xTable.setCheckboxRow(this.currentSelected, false)
-      }
-      this.currentSelected = []
-      this.lastSelected = []
-      this.$emit('checkbox-range-end', {
-        ...e,
-        records: [...xTable.getCheckboxRecords(), ...xTable.getCheckboxReserveRecords()],
-      })
-    },
-  },
-}
-</script>
-
-<style lang="less"></style>
+<template>
+  <vxe-table v-bind="$attrs" v-on="new$listeners" ref="xTable">
+    <slot></slot>
+    <template #empty>
+      <slot name="empty">
+        <div :style="{ paddingTop: '10px' }">
+          <img :style="{ width: '140px', height: '120px' }" :src="require('@/assets/data_empty.png')" />
+          <div>{{ $t('noData') }}</div>
+        </div>
+      </slot>
+    </template>
+    <template #loading>
+      <slot name="loading"></slot>
+    </template>
+  </vxe-table>
+</template>
+
+<script>
+import _ from 'lodash'
+// 该组件使用方法与vxe-table一致，但调用它的方法时，需先调用getVxetableRef()获取到vxe-table实体
+export default {
+  name: 'OpsTable',
+  data() {
+    return {
+      // isShifting: false,
+      // lastIndex: -1,
+      lastSelected: [],
+      currentSelected: [],
+    }
+  },
+  computed: {
+    new$listeners() {
+      if (!Object.keys(this.$listeners).length) {
+        return this.$listeners
+      }
+      return Object.assign(this.$listeners, {
+        // 在这里覆盖原有的change事件
+        // 'checkbox-change': this.selectChangeEvent,
+        'checkbox-range-change': this.checkboxRangeChange,
+        'checkbox-range-start': this.checkboxRangeStart,
+        'checkbox-range-end': this.checkboxRangeEnd,
+      })
+    },
+  },
+  mounted() {
+    // window.onkeydown = (e) => {
+    //   if (e.key === 'Shift') {
+    //     this.isShifting = true
+    //   }
+    // }
+    // window.onkeyup = (e) => {
+    //   if (e.key === 'Shift') {
+    //     this.isShifting = false
+    //     this.lastIndex = -1
+    //   }
+    // }
+  },
+  beforeDestroy() {
+    // window.onkeydown = ''
+    // window.onkeyup = ''
+  },
+  methods: {
+    getVxetableRef() {
+      return this.$refs.xTable
+    },
+    // selectChangeEvent(e) {
+    //   const xTable = this.$refs.xTable
+    //   const { lastIndex } = this
+    //   const currentIndex = e.rowIndex
+    //   const { tableData } = xTable.getTableData()
+    //   if (lastIndex > -1 && this.isShifting) {
+    //     let start = lastIndex
+    //     let end = currentIndex
+    //     if (lastIndex > currentIndex) {
+    //       start = currentIndex
+    //       end = lastIndex
+    //     }
+    //     const rangeData = tableData.slice(start, end + 1)
+    //     xTable.setCheckboxRow(rangeData, true)
+    //   }
+    //   this.lastIndex = currentIndex
+    //   this.$emit('checkbox-change', { ...e, records: xTable.getCheckboxRecords() })
+    // },
+    checkboxRangeStart(e) {
+      const xTable = this.$refs.xTable
+      const lastSelected = xTable.getCheckboxRecords()
+      const selectedReserve = xTable.getCheckboxReserveRecords()
+      this.lastSelected = [...lastSelected, ...selectedReserve]
+      this.$emit('checkbox-range-start', e)
+    },
+    checkboxRangeChange(e) {
+      const xTable = this.$refs.xTable
+      xTable.setCheckboxRow(this.lastSelected, true)
+      this.currentSelected = e.records
+      // this.lastSelected = [...new Set([...this.lastSelected, ...e.records])]
+      this.$emit('checkbox-range-change', {
+        ...e,
+        records: [...xTable.getCheckboxRecords(), ...xTable.getCheckboxReserveRecords()],
+      })
+    },
+    checkboxRangeEnd(e) {
+      const xTable = this.$refs.xTable
+      const isAllSelected = this.currentSelected.every((item) => {
+        const _idx = this.lastSelected.findIndex((ele) => _.isEqual(ele, item))
+        return _idx > -1
+      })
+      if (isAllSelected) {
+        xTable.setCheckboxRow(this.currentSelected, false)
+      }
+      this.currentSelected = []
+      this.lastSelected = []
+      this.$emit('checkbox-range-end', {
+        ...e,
+        records: [...xTable.getCheckboxRecords(), ...xTable.getCheckboxReserveRecords()],
+      })
+    },
+  },
+}
+</script>
+
+<style lang="less"></style>

cmdb-ui/src/modules/acl/views/resource_types.vue

@@ -195,11 +195,11 @@ export default {
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;
-  padding: 24px;
+  padding: 20px;
   .acl-resource-types-header {
     width: 100%;
     display: inline-flex;
-    margin-bottom: 15px;
+    margin-bottom: 20px;
     align-items: center;
   }
 }

cmdb-ui/src/modules/acl/views/resources.vue

@@ -358,11 +358,11 @@ export default {
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;
-  padding: 12px 24px 24px 24px;
+  padding: 8px 20px 20px 20px;
   .acl-resources-header {
     width: 100%;
     display: inline-flex;
-    margin-bottom: 15px;
+    margin-bottom: 20px;
     align-items: center;
     justify-content: space-between;
     .ant-switch {

cmdb-ui/src/modules/acl/views/roles.vue

@@ -291,11 +291,11 @@ export default {
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;
-  padding: 24px;
+  padding: 20px;
   .acl-roles-header {
     width: 100%;
     display: inline-flex;
-    margin-bottom: 15px;
+    margin-bottom: 20px;
     align-items: center;
     .ant-checkbox-wrapper {
       margin-left: auto;

cmdb-ui/src/modules/acl/views/trigger.vue

@@ -326,11 +326,11 @@ export default {
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;
-  padding: 24px;
+  padding: 20px;
   .acl-trigger-header {
     width: 100%;
     display: inline-flex;
-    margin-bottom: 15px;
+    margin-bottom: 20px;
     align-items: center;
   }
 }

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

@@ -207,6 +207,13 @@ export function deleteTrigger(type_id, id) {
   })
 }
 
+export function testTrigger(type_id, id) {
+  return axios({
+    url: `/v0.1/ci_types/${type_id}/triggers/${id}/test_notify`,
+    method: 'post',
+  })
+}
+
 // CMDB的模型和实例的授权接口
 export function grantCiType(type_id, rid, data) {
   return axios({

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

@@ -0,0 +1,93 @@
+import { axios } from '@/utils/request'
+
+export function getDCIMTreeView(params) {
+  return axios({
+    url: '/v0.1/dcim/tree_view ',
+    method: 'GET',
+    params
+  })
+}
+
+export function getDCIMById(type, id) {
+  return axios({
+    url: `/v0.1/dcim/${type}/${id}`,
+    method: 'GET'
+  })
+}
+
+export function postDCIM(type, data) {
+  return axios({
+    url: `/v0.1/dcim/${type}`,
+    method: 'POST',
+    data
+  })
+}
+
+export function putDCIM(type, id, data) {
+  return axios({
+    url: `/v0.1/dcim/${type}/${id}`,
+    method: 'PUT',
+    data
+  })
+}
+
+export function deleteDCIM(type, id) {
+  return axios({
+    url: `/v0.1/dcim/${type}/${id}`,
+    method: 'DELETE',
+  })
+}
+
+export function getDCIMRacks(id, params) {
+  return axios({
+    url: `/v0.1/dcim/server_room/${id}/racks`,
+    method: 'GET',
+    params
+  })
+}
+
+export function postDevice(rackId, deviceId, data) {
+  return axios({
+    url: `/v0.1/dcim/rack/${rackId}/device/${deviceId}`,
+    method: 'POST',
+    data
+  })
+}
+
+export function deleteDevice(rackId, deviceId) {
+  return axios({
+    url: `/v0.1/dcim/rack/${rackId}/device/${deviceId}`,
+    method: 'DELETE'
+  })
+}
+
+export function putDevice(rackId, deviceId, data) {
+  return axios({
+    url: `/v0.1/dcim/rack/${rackId}/device/${deviceId}`,
+    method: 'PUT',
+    data
+  })
+}
+
+export function migrateDevice(rackId, deviceId, data) {
+  return axios({
+    url: `/v0.1/dcim/rack/${rackId}/device/${deviceId}/migrate`,
+    method: 'PUT',
+    data
+  })
+}
+
+export function getDCIMHistoryOperate(params) {
+  return axios({
+    url: `/v0.1/dcim/history/operate`,
+    method: 'GET',
+    params
+  })
+}
+
+export function calcUnitFreeCount() {
+  return axios({
+    url: `/v0.1/dcim/rack/calc_u_free_count`,
+    method: 'POST'
+  })
+}

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

@@ -15,7 +15,7 @@
       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' }"
+      :sort-config="sortConfig"
       :row-key="true"
       :column-key="true"
       :cell-style="getCellStyle"
@@ -170,7 +170,7 @@
           </template>
         </template>
       </vxe-table-column>
-      <vxe-column align="left" field="operate" fixed="right" width="80">
+      <vxe-column v-if="showOperation" align="left" field="operate" fixed="right" width="80">
         <template #header>
           <span>{{ $t('operation') }}</span>
         </template>
@@ -272,6 +272,18 @@ export default {
     data: {
       type: Array,
       default: () => []
+    },
+    sortConfig: {
+      type: Object,
+      default: () => ({
+        remote: true,
+        trigger: 'cell'
+      })
+    },
+    // 是否展示操作列
+    showOperation: {
+      type: Boolean,
+      default: true
     }
   },
 

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

@@ -1,371 +1,370 @@
-<template>
-  <div class="cmdb-grant" :style="{ }">
-    <template v-if="cmdbGrantType.includes('ci_type')">
-      <div class="cmdb-grant-title">{{ $t('cmdb.components.ciTypeGrant') }}</div>
-      <CiTypeGrant
-        :CITypeId="CITypeId"
-        :tableData="tableData"
-        grantType="ci_type"
-        @grantDepart="grantDepart"
-        @grantRole="grantRole"
-        @getTableData="getTableData"
-        ref="grant_ci_type"
-        :addedRids="addedRids"
-      />
-    </template>
-    <template
-      v-if="
-        cmdbGrantType.includes('ci_type,ci') || (cmdbGrantType.includes('ci') && !cmdbGrantType.includes('ci_type'))
-      "
-    >
-      <div class="cmdb-grant-title">{{ $t('cmdb.components.ciGrant') }}</div>
-      <CiTypeGrant
-        :CITypeId="CITypeId"
-        :tableData="tableData"
-        grantType="ci"
-        @grantDepart="grantDepart"
-        @grantRole="grantRole"
-        @getTableData="getTableData"
-        @openReadGrantModal="openReadGrantModal"
-        ref="grant_ci"
-        :addedRids="addedRids"
-      />
-    </template>
-    <template v-if="cmdbGrantType.includes('type_relation')">
-      <div class="cmdb-grant-title">{{ $t('cmdb.components.relationGrant') }}</div>
-      <TypeRelationGrant
-        :typeRelationIds="typeRelationIds"
-        :tableData="tableData"
-        grantType="type_relation"
-        @grantDepart="grantDepart"
-        @grantRole="grantRole"
-        @getTableData="getTableData"
-        ref="grant_type_relation"
-        :addedRids="addedRids"
-      />
-    </template>
-    <template v-if="cmdbGrantType.includes('relation_view')">
-      <div class="cmdb-grant-title">{{ resourceTypeName }}{{ $t('cmdb.components.perm') }}</div>
-      <RelationViewGrant
-        :resourceTypeName="resourceTypeName"
-        :tableData="tableData"
-        grantType="relation_view"
-        @grantDepart="grantDepart"
-        @grantRole="grantRole"
-        @getTableData="getTableData"
-        ref="grant_relation_view"
-        :addedRids="addedRids"
-      />
-    </template>
-    <template v-if="cmdbGrantType.includes('TopologyView')">
-      <div class="cmdb-grant-title">{{ resourceTypeName }}{{ $t('cmdb.components.perm') }}</div>
-      <TopologyViewGrant
-        :resourceTypeName="resourceTypeName"
-        :tableData="tableData"
-        :viewId="CITypeId"
-        grantType="TopologyView"
-        @grantDepart="grantDepart"
-        @grantRole="grantRole"
-        @getTableData="getTableData"
-        ref="grantTopologyView"
-        :addedRids="addedRids"
-      />
-    </template>
-
-    <GrantModal ref="grantModal" @handleOk="handleOk" />
-    <ReadGrantModal ref="readGrantModal" :CITypeId="CITypeId" @updateTableDataRead="updateTableDataRead" />
-  </div>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import CiTypeGrant from './ciTypeGrant.vue'
-import TypeRelationGrant from './typeRelationGrant.vue'
-import { searchResource } from '@/modules/acl/api/resource'
-import { getResourcePerms } from '@/modules/acl/api/permission'
-import GrantModal from './grantModal.vue'
-import ReadGrantModal from './readGrantModal'
-import RelationViewGrant from './relationViewGrant.vue'
-import TopologyViewGrant from './topologyViewGrant.vue'
-import { getCITypeGroupById, ciTypeFilterPermissions } from '../../api/CIType'
-
-export default {
-  name: 'GrantComp',
-  components: { CiTypeGrant, TypeRelationGrant, RelationViewGrant, TopologyViewGrant, GrantModal, ReadGrantModal },
-  props: {
-    CITypeId: {
-      type: Number,
-      default: null,
-    },
-    resourceTypeName: {
-      type: String,
-      default: '',
-    },
-    resourceType: {
-      type: String,
-      default: 'CIType',
-    },
-    app_id: {
-      type: String,
-      default: 'cmdb',
-    },
-    cmdbGrantType: {
-      type: String,
-      default: 'ci_type,ci',
-    },
-    typeRelationIds: {
-      type: Array,
-      default: null,
-    },
-    isModal: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  inject: ['resource_type'],
-  data() {
-    return {
-      tableData: [],
-      grantType: '',
-      resource_id: null,
-      attrGroup: [],
-      filerPerimissions: {},
-      loading: false,
-      addedRids: [], // added rid this time
-    }
-  },
-  computed: {
-    ...mapState({
-      allEmployees: (state) => state.user.allEmployees,
-      allDepartments: (state) => state.user.allDepartments,
-    }),
-    child_resource_type() {
-      return this.resource_type()
-    },
-    windowHeight() {
-      return this.$store.state.windowHeight
-    },
-  },
-  provide() {
-    return {
-      attrGroup: () => {
-        return this.attrGroup
-      },
-      filerPerimissions: () => {
-        return this.filerPerimissions
-      },
-      loading: () => {
-        return this.loading
-      },
-      isModal: this.isModal,
-    }
-  },
-  watch: {
-    resourceTypeName: {
-      immediate: true,
-      handler() {
-        this.init()
-      },
-    },
-    CITypeId: {
-      immediate: true,
-      handler() {
-        if (this.CITypeId && this.cmdbGrantType.includes('ci')) {
-          this.getFilterPermissions()
-          this.getAttrGroup()
-        }
-      },
-    },
-  },
-  mounted() {},
-  methods: {
-    getAttrGroup() {
-      getCITypeGroupById(this.CITypeId, { need_other: true }).then((res) => {
-        this.attrGroup = res
-      })
-    },
-    getFilterPermissions() {
-      ciTypeFilterPermissions(this.CITypeId).then((res) => {
-        this.filerPerimissions = res
-      })
-    },
-    async init() {
-      const _find = this.child_resource_type.groups.find((item) => item.name === this.resourceType)
-      const resource_type_id = _find?.id ?? 0
-      const res = await searchResource({
-        app_id: this.app_id,
-        resource_type_id,
-        page_size: 9999,
-      })
-      const _tempFind = res.resources.find((item) => item.name === this.resourceTypeName)
-      console.log(this.resourceTypeName)
-      this.resource_id = _tempFind?.id || 0
-      this.getTableData()
-    },
-    async getTableData() {
-      this.loading = true
-      const _tableData = await getResourcePerms(this.resource_id, { need_users: 0 })
-      const perms = []
-      for (const key in _tableData) {
-        const obj = {}
-        obj.name = key
-        _tableData[key].perms.forEach((perm) => {
-          obj[`${perm.name}`] = true
-          obj.rid = perm?.rid ?? null
-        })
-        perms.push(obj)
-      }
-      this.tableData = perms
-      this.loading = false
-    },
-    // Grant the department in common-setting and get the roleid from it
-    grantDepart(grantType) {
-      this.$refs.grantModal.open('depart')
-      this.grantType = grantType
-    },
-    // Grant the oldest role permissions
-    grantRole(grantType) {
-      this.$refs.grantModal.open('role')
-      this.grantType = grantType
-    },
-    handleOk(params, type) {
-      const { grantType } = this
-      let rids
-      if (type === 'depart') {
-        rids = [
-          ...params.department.map((rid) => {
-            const _find = this.allDepartments.find((dep) => dep.acl_rid === rid)
-            return { rid, name: _find?.department_name ?? rid }
-          }),
-          ...params.user.map((rid) => {
-            const _find = this.allEmployees.find((dep) => dep.acl_rid === rid)
-            return { rid, name: _find?.nickname ?? rid }
-          }),
-        ]
-      }
-      if (type === 'role') {
-        rids = [
-          ...params.map((role) => {
-            return { rid: role.id, name: role.name }
-          }),
-        ]
-      }
-      if (grantType === 'ci_type') {
-        this.tableData.unshift(
-          ...rids.map(({ rid, name }) => {
-            const _find = this.tableData.find((item) => item.rid === rid)
-            return {
-              rid,
-              name,
-              conifg: false,
-              grant: false,
-              ..._find,
-            }
-          })
-        )
-      }
-      if (grantType === 'ci') {
-        this.tableData.unshift(
-          ...rids.map(({ rid, name }) => {
-            const _find = this.tableData.find((item) => item.rid === rid)
-            return {
-              rid,
-              name,
-              read_attr: false,
-              read_ci: false,
-              create: false,
-              update: false,
-              delete: false,
-              ..._find,
-            }
-          })
-        )
-      }
-      if (grantType === 'type_relation') {
-        this.tableData.unshift(
-          ...rids.map(({ rid, name }) => {
-            return {
-              rid,
-              name,
-              create: false,
-              grant: false,
-              delete: false,
-            }
-          })
-        )
-      }
-      if (grantType === 'relation_view') {
-        this.tableData.unshift(
-          ...rids.map(({ rid, name }) => {
-            return {
-              rid,
-              name,
-              read: false,
-              grant: false,
-            }
-          })
-        )
-      }
-      if (grantType === 'TopologyView') {
-        this.tableData.unshift(
-          ...rids.map(({ rid, name }) => {
-            return {
-              rid,
-              name,
-              read: false,
-              update: false,
-              delete: false,
-              grant: false,
-            }
-          })
-        )
-      }
-      this.addedRids = rids
-      this.$nextTick(() => {
-        setTimeout(() => {
-          this.$refs[`grant_${grantType}`].$refs.xTable.elemStore['main-body-wrapper'].scrollTo(0, 0)
-        }, 300)
-      })
-    },
-    openReadGrantModal(col, row) {
-      this.$refs.readGrantModal.open(col, row)
-    },
-    updateTableDataRead(row, hasRead) {
-      const _idx = this.tableData.findIndex((item) => item.rid === row.rid)
-      this.$set(this.tableData, _idx, { ...this.tableData[_idx], read: hasRead })
-      this.getFilterPermissions()
-    },
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.cmdb-grant {
-  position: relative;
-  padding: 0 20px;
-  overflow: auto;
-  .cmdb-grant-title {
-    border-left: 4px solid @primary-color;
-    padding-left: 10px;
-  }
-}
-</style>
-
-<style lang="less">
-
-.cmdb-grant {
-  .grant-button {
-    padding: 6px 8px;
-    color: @primary-color;
-    background-color: @primary-color_5;
-    border-radius: 2px;
-    cursor: pointer;
-    margin: 15px 0;
-    display: inline-block;
-    transition: all 0.3s;
-    &:hover {
-      box-shadow: 2px 3px 4px @primary-color_5;
-    }
-  }
-}
-</style>
+<template>
+  <div class="cmdb-grant" :style="{ }">
+    <template v-if="cmdbGrantType.includes('ci_type')">
+      <div class="cmdb-grant-title">{{ $t('cmdb.components.ciTypeGrant') }}</div>
+      <CiTypeGrant
+        :CITypeId="CITypeId"
+        :tableData="tableData"
+        grantType="ci_type"
+        @grantDepart="grantDepart"
+        @grantRole="grantRole"
+        @getTableData="getTableData"
+        ref="grant_ci_type"
+        :addedRids="addedRids"
+      />
+    </template>
+    <template
+      v-if="
+        cmdbGrantType.includes('ci_type,ci') || (cmdbGrantType.includes('ci') && !cmdbGrantType.includes('ci_type'))
+      "
+    >
+      <div class="cmdb-grant-title">{{ $t('cmdb.components.ciGrant') }}</div>
+      <CiTypeGrant
+        :CITypeId="CITypeId"
+        :tableData="tableData"
+        grantType="ci"
+        @grantDepart="grantDepart"
+        @grantRole="grantRole"
+        @getTableData="getTableData"
+        @openReadGrantModal="openReadGrantModal"
+        ref="grant_ci"
+        :addedRids="addedRids"
+      />
+    </template>
+    <template v-if="cmdbGrantType.includes('type_relation')">
+      <div class="cmdb-grant-title">{{ $t('cmdb.components.relationGrant') }}</div>
+      <TypeRelationGrant
+        :typeRelationIds="typeRelationIds"
+        :tableData="tableData"
+        grantType="type_relation"
+        @grantDepart="grantDepart"
+        @grantRole="grantRole"
+        @getTableData="getTableData"
+        ref="grant_type_relation"
+        :addedRids="addedRids"
+      />
+    </template>
+    <template v-if="cmdbGrantType.includes('relation_view')">
+      <div class="cmdb-grant-title">{{ resourceTypeName }}{{ $t('cmdb.components.perm') }}</div>
+      <RelationViewGrant
+        :resourceTypeName="resourceTypeName"
+        :tableData="tableData"
+        grantType="relation_view"
+        @grantDepart="grantDepart"
+        @grantRole="grantRole"
+        @getTableData="getTableData"
+        ref="grant_relation_view"
+        :addedRids="addedRids"
+      />
+    </template>
+    <template v-if="cmdbGrantType.includes('TopologyView')">
+      <div class="cmdb-grant-title">{{ resourceTypeName }}{{ $t('cmdb.components.perm') }}</div>
+      <TopologyViewGrant
+        :resourceTypeName="resourceTypeName"
+        :tableData="tableData"
+        :viewId="CITypeId"
+        grantType="TopologyView"
+        @grantDepart="grantDepart"
+        @grantRole="grantRole"
+        @getTableData="getTableData"
+        ref="grantTopologyView"
+        :addedRids="addedRids"
+      />
+    </template>
+
+    <GrantModal ref="grantModal" @handleOk="handleOk" />
+    <ReadGrantModal ref="readGrantModal" :CITypeId="CITypeId" @updateTableDataRead="updateTableDataRead" />
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import CiTypeGrant from './ciTypeGrant.vue'
+import TypeRelationGrant from './typeRelationGrant.vue'
+import { searchResource } from '@/modules/acl/api/resource'
+import { getResourcePerms } from '@/modules/acl/api/permission'
+import GrantModal from './grantModal.vue'
+import ReadGrantModal from './readGrantModal'
+import RelationViewGrant from './relationViewGrant.vue'
+import TopologyViewGrant from './topologyViewGrant.vue'
+import { getCITypeGroupById, ciTypeFilterPermissions } from '../../api/CIType'
+
+export default {
+  name: 'GrantComp',
+  components: { CiTypeGrant, TypeRelationGrant, RelationViewGrant, TopologyViewGrant, GrantModal, ReadGrantModal },
+  props: {
+    CITypeId: {
+      type: Number,
+      default: null,
+    },
+    resourceTypeName: {
+      type: String,
+      default: '',
+    },
+    resourceType: {
+      type: String,
+      default: 'CIType',
+    },
+    app_id: {
+      type: String,
+      default: 'cmdb',
+    },
+    cmdbGrantType: {
+      type: String,
+      default: 'ci_type,ci',
+    },
+    typeRelationIds: {
+      type: Array,
+      default: null,
+    },
+    isModal: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  inject: ['resource_type'],
+  data() {
+    return {
+      tableData: [],
+      grantType: '',
+      resource_id: null,
+      attrGroup: [],
+      filerPerimissions: {},
+      loading: false,
+      addedRids: [], // added rid this time
+    }
+  },
+  computed: {
+    ...mapState({
+      allEmployees: (state) => state.user.allEmployees,
+      allDepartments: (state) => state.user.allDepartments,
+    }),
+    child_resource_type() {
+      return this.resource_type()
+    },
+    windowHeight() {
+      return this.$store.state.windowHeight
+    },
+  },
+  provide() {
+    return {
+      attrGroup: () => {
+        return this.attrGroup
+      },
+      filerPerimissions: () => {
+        return this.filerPerimissions
+      },
+      loading: () => {
+        return this.loading
+      },
+      isModal: this.isModal,
+    }
+  },
+  watch: {
+    resourceTypeName: {
+      immediate: true,
+      handler() {
+        this.init()
+      },
+    },
+    CITypeId: {
+      immediate: true,
+      handler() {
+        if (this.CITypeId && this.cmdbGrantType.includes('ci')) {
+          this.getFilterPermissions()
+          this.getAttrGroup()
+        }
+      },
+    },
+  },
+  mounted() {},
+  methods: {
+    getAttrGroup() {
+      getCITypeGroupById(this.CITypeId, { need_other: true }).then((res) => {
+        this.attrGroup = res
+      })
+    },
+    getFilterPermissions() {
+      ciTypeFilterPermissions(this.CITypeId).then((res) => {
+        this.filerPerimissions = res
+      })
+    },
+    async init() {
+      const _find = this.child_resource_type.groups.find((item) => item.name === this.resourceType)
+      const resource_type_id = _find?.id ?? 0
+      const res = await searchResource({
+        app_id: this.app_id,
+        resource_type_id,
+        page_size: 9999,
+      })
+      const _tempFind = res.resources.find((item) => item.name === this.resourceTypeName)
+      console.log(this.resourceTypeName)
+      this.resource_id = _tempFind?.id || 0
+      this.getTableData()
+    },
+    async getTableData() {
+      this.loading = true
+      const _tableData = await getResourcePerms(this.resource_id, { need_users: 0 })
+      const perms = []
+      for (const key in _tableData) {
+        const obj = {}
+        obj.name = key
+        _tableData[key].perms.forEach((perm) => {
+          obj[`${perm.name}`] = true
+          obj.rid = perm?.rid ?? null
+        })
+        perms.push(obj)
+      }
+      this.tableData = perms
+      this.loading = false
+    },
+    // Grant the department in common-setting and get the roleid from it
+    grantDepart(grantType) {
+      this.$refs.grantModal.open('depart')
+      this.grantType = grantType
+    },
+    // Grant the oldest role permissions
+    grantRole(grantType) {
+      this.$refs.grantModal.open('role')
+      this.grantType = grantType
+    },
+    handleOk(params, type) {
+      const { grantType } = this
+      let rids
+      if (type === 'depart') {
+        rids = [
+          ...params.department.map((rid) => {
+            const _find = this.allDepartments.find((dep) => dep.acl_rid === rid)
+            return { rid, name: _find?.department_name ?? rid }
+          }),
+          ...params.user.map((rid) => {
+            const _find = this.allEmployees.find((dep) => dep.acl_rid === rid)
+            return { rid, name: _find?.nickname ?? rid }
+          }),
+        ]
+      }
+      if (type === 'role') {
+        rids = [
+          ...params.map((role) => {
+            return { rid: role.id, name: role.name }
+          }),
+        ]
+      }
+      if (grantType === 'ci_type') {
+        this.tableData.unshift(
+          ...rids.map(({ rid, name }) => {
+            const _find = this.tableData.find((item) => item.rid === rid)
+            return {
+              rid,
+              name,
+              conifg: false,
+              grant: false,
+              ..._find,
+            }
+          })
+        )
+      }
+      if (grantType === 'ci') {
+        this.tableData.unshift(
+          ...rids.map(({ rid, name }) => {
+            const _find = this.tableData.find((item) => item.rid === rid)
+            return {
+              rid,
+              name,
+              read_attr: false,
+              read_ci: false,
+              create: false,
+              update: false,
+              delete: false,
+              ..._find,
+            }
+          })
+        )
+      }
+      if (grantType === 'type_relation') {
+        this.tableData.unshift(
+          ...rids.map(({ rid, name }) => {
+            return {
+              rid,
+              name,
+              create: false,
+              grant: false,
+              delete: false,
+            }
+          })
+        )
+      }
+      if (grantType === 'relation_view') {
+        this.tableData.unshift(
+          ...rids.map(({ rid, name }) => {
+            return {
+              rid,
+              name,
+              read: false,
+              grant: false,
+            }
+          })
+        )
+      }
+      if (grantType === 'TopologyView') {
+        this.tableData.unshift(
+          ...rids.map(({ rid, name }) => {
+            return {
+              rid,
+              name,
+              read: false,
+              update: false,
+              delete: false,
+              grant: false,
+            }
+          })
+        )
+      }
+      this.addedRids = rids
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.$refs[`grant_${grantType}`].$refs.xTable.elemStore['main-body-wrapper'].scrollTo(0, 0)
+        }, 300)
+      })
+    },
+    openReadGrantModal(col, row) {
+      this.$refs.readGrantModal.open(col, row)
+    },
+    updateTableDataRead(row, hasRead) {
+      const _idx = this.tableData.findIndex((item) => item.rid === row.rid)
+      this.$set(this.tableData, _idx, { ...this.tableData[_idx], read: hasRead })
+      this.getFilterPermissions()
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.cmdb-grant {
+  position: relative;
+  padding: 0 20px;
+  overflow: auto;
+  .cmdb-grant-title {
+    border-left: 4px solid @primary-color;
+    padding-left: 10px;
+  }
+}
+</style>
+
+<style lang="less">
+.cmdb-grant {
+  .grant-button {
+    padding: 6px 8px;
+    color: @primary-color;
+    background-color: @primary-color_5;
+    border-radius: 2px;
+    cursor: pointer;
+    margin: 15px 0;
+    display: inline-block;
+    transition: all 0.3s;
+    z-index: 1;
+
+    .btn-wave-hover(@primary-color_4, -1);
+  }
+}
+</style>

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

@@ -1,122 +1,118 @@
-<template>
-  <a-modal :visible="visible" @cancel="handleCancel" @ok="handleOK" :title="$t('revoke')">
-    <a-form-model :model="form" :label-col="{ span: 4 }" :wrapper-col="{ span: 16 }">
-      <a-form-model-item :label="$t('user')">
-        <EmployeeTreeSelect
-          class="custom-treeselect custom-treeselect-bgcAndBorder"
-          :style="{
-            '--custom-height': '32px',
-            lineHeight: '32px',
-            '--custom-bg-color': '#fff',
-            '--custom-border': '1px solid #d9d9d9',
-            '--custom-multiple-lineHeight': '18px',
-          }"
-          :multiple="true"
-          v-model="form.users"
-          :placeholder="$t('cmdb.serviceTree.userPlaceholder')"
-          :idType="2"
-          departmentKey="acl_rid"
-          employeeKey="acl_rid"
-        />
-      </a-form-model-item>
-      <a-form-model-item :label="$t('role')">
-        <treeselect
-          v-model="form.roles"
-          :multiple="true"
-          :options="filterAllRoles"
-          class="custom-treeselect custom-treeselect-bgcAndBorder"
-          :style="{
-            '--custom-height': '32px',
-            lineHeight: '32px',
-            '--custom-bg-color': '#fff',
-            '--custom-border': '1px solid #d9d9d9',
-            '--custom-multiple-lineHeight': '18px',
-          }"
-          :limit="10"
-          :limitText="(count) => `+ ${count}`"
-          :normalizer="
-            (node) => {
-              return {
-                id: node.id,
-                label: node.name,
-              }
-            }
-          "
-          appendToBody
-          zIndex="1050"
-          :placeholder="$t('cmdb.serviceTree.rolePlaceholder')"
-          @search-change="searchRole"
-        />
-      </a-form-model-item>
-    </a-form-model>
-  </a-modal>
-</template>
-
-<script>
-import EmployeeTreeSelect from '@/views/setting/components/employeeTreeSelect.vue'
-import { getAllDepAndEmployee } from '@/api/company'
-import { searchRole } from '@/modules/acl/api/role'
-
-export default {
-  name: 'RevokeModal',
-  components: { EmployeeTreeSelect },
-  data() {
-    return {
-      visible: false,
-      form: {
-        users: undefined,
-        roles: undefined,
-      },
-      allTreeDepAndEmp: [],
-      allRoles: [],
-      filterAllRoles: [],
-    }
-  },
-  provide() {
-    return {
-      provide_allTreeDepAndEmp: () => {
-        return this.allTreeDepAndEmp
-      },
-    }
-  },
-  mounted() {
-    this.getAllDepAndEmployee()
-    this.loadRoles()
-  },
-  methods: {
-    async loadRoles() {
-      const res = await searchRole({ page_size: 9999, app_id: 'cmdb', is_all: true })
-      this.allRoles = res.roles
-      this.filterAllRoles = this.allRoles.slice(0, 100)
-    },
-    getAllDepAndEmployee() {
-      getAllDepAndEmployee({ block: 0 }).then((res) => {
-        this.allTreeDepAndEmp = res
-      })
-    },
-    open() {
-      this.visible = true
-      this.$nextTick(() => {
-        this.form = {
-          users: undefined,
-          roles: undefined,
-        }
-      })
-    },
-    handleCancel() {
-      this.visible = false
-    },
-    searchRole(searchQuery) {
-      this.filterAllRoles = this.allRoles
-        .filter((item) => item.name.toLowerCase().includes(searchQuery.toLowerCase()))
-        .slice(0, 100)
-    },
-    handleOK() {
-      this.$emit('handleRevoke', this.form)
-      this.handleCancel()
-    },
-  },
-}
-</script>
-
-<style></style>
+<template>
+  <a-modal :visible="visible" @cancel="handleCancel" @ok="handleOK" :title="$t('revoke')">
+    <a-form-model :model="form" :label-col="{ span: 4 }" :wrapper-col="{ span: 16 }">
+      <a-form-model-item :label="$t('user')">
+        <EmployeeTreeSelect
+          class="custom-treeselect custom-treeselect-white"
+          :style="{
+            '--custom-height': '32px',
+            lineHeight: '32px',
+            '--custom-multiple-lineHeight': '18px',
+          }"
+          :multiple="true"
+          v-model="form.users"
+          :placeholder="$t('cmdb.serviceTree.userPlaceholder')"
+          :idType="2"
+          departmentKey="acl_rid"
+          employeeKey="acl_rid"
+        />
+      </a-form-model-item>
+      <a-form-model-item :label="$t('role')">
+        <treeselect
+          v-model="form.roles"
+          :multiple="true"
+          :options="filterAllRoles"
+          class="custom-treeselect custom-treeselect-white"
+          :style="{
+            '--custom-height': '32px',
+            lineHeight: '32px',
+            '--custom-multiple-lineHeight': '18px',
+          }"
+          :limit="10"
+          :limitText="(count) => `+ ${count}`"
+          :normalizer="
+            (node) => {
+              return {
+                id: node.id,
+                label: node.name,
+              }
+            }
+          "
+          appendToBody
+          zIndex="1050"
+          :placeholder="$t('cmdb.serviceTree.rolePlaceholder')"
+          @search-change="searchRole"
+        />
+      </a-form-model-item>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+import EmployeeTreeSelect from '@/views/setting/components/employeeTreeSelect.vue'
+import { getAllDepAndEmployee } from '@/api/company'
+import { searchRole } from '@/modules/acl/api/role'
+
+export default {
+  name: 'RevokeModal',
+  components: { EmployeeTreeSelect },
+  data() {
+    return {
+      visible: false,
+      form: {
+        users: undefined,
+        roles: undefined,
+      },
+      allTreeDepAndEmp: [],
+      allRoles: [],
+      filterAllRoles: [],
+    }
+  },
+  provide() {
+    return {
+      provide_allTreeDepAndEmp: () => {
+        return this.allTreeDepAndEmp
+      },
+    }
+  },
+  mounted() {
+    this.getAllDepAndEmployee()
+    this.loadRoles()
+  },
+  methods: {
+    async loadRoles() {
+      const res = await searchRole({ page_size: 9999, app_id: 'cmdb', is_all: true })
+      this.allRoles = res.roles
+      this.filterAllRoles = this.allRoles.slice(0, 100)
+    },
+    getAllDepAndEmployee() {
+      getAllDepAndEmployee({ block: 0 }).then((res) => {
+        this.allTreeDepAndEmp = res
+      })
+    },
+    open() {
+      this.visible = true
+      this.$nextTick(() => {
+        this.form = {
+          users: undefined,
+          roles: undefined,
+        }
+      })
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    searchRole(searchQuery) {
+      this.filterAllRoles = this.allRoles
+        .filter((item) => item.name.toLowerCase().includes(searchQuery.toLowerCase()))
+        .slice(0, 100)
+    },
+    handleOK() {
+      this.$emit('handleRevoke', this.form)
+      this.handleCancel()
+    },
+  },
+}
+</script>
+
+<style></style>

cmdb-ui/src/modules/cmdb/components/cmdbTypeSelect/cmdbTypeSelect.vue

@@ -3,12 +3,10 @@
     :disabled="disabled"
     ref="cmdb_type_select"
     :disable-branch-nodes="true"
-    class="custom-treeselect custom-treeselect-bgcAndBorder"
+    class="custom-treeselect custom-treeselect-white"
     :style="{
       '--custom-height': '30px',
-      lineHeight: '30px',
-      '--custom-bg-color': '#fff',
-      '--custom-border': '1px solid #d9d9d9',
+      lineHeight: '30px'
     }"
     v-model="currenCiType"
     :multiple="multiple"

cmdb-ui/src/modules/cmdb/components/preferenceSearch/preferenceSearch.vue

@@ -35,8 +35,8 @@
         :key="`${item.id}_${index}`"
         class="preference-search-tag"
         :style="{
-          backgroundColor: item.id === currentPreferenceSearch ? '#2f54eb' : '#fafafa',
-          color: item.id === currentPreferenceSearch ? '#fff' : '#000000a6',
+          backgroundColor: item.id === currentPreferenceSearch ? '#2f54eb' : '',
+          color: item.id === currentPreferenceSearch ? '#fff' : '',
         }"
       >
         <span @click="clickPreferenceSearch(item)">{{ item.name }}</span>
@@ -189,6 +189,10 @@ export default {
   > i {
     font-size: 12px;
   }
+
+  &:hover {
+    color: @primary-color;
+  }
 }
 .preference-search-delete {
   color: #a9a9a9;

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

@@ -5,13 +5,11 @@
         <a-space>
           <treeselect
             v-if="type === 'resourceSearch'"
-            class="custom-treeselect custom-treeselect-bgcAndBorder"
+            class="custom-treeselect"
             :style="{
               width: '200px',
               marginRight: '10px',
               '--custom-height': '32px',
-              '--custom-bg-color': '#fff',
-              '--custom-border': '1px solid #d9d9d9',
               '--custom-multiple-lineHeight': '16px',
             }"
             v-model="currenCiType"

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

@@ -135,9 +135,15 @@ export default {
     border: 1px solid #f3f4f6;
   }
   .authorization-input {
-    border: none;
+    border: 1px solid transparent;
+
     &:focus {
       box-shadow: none;
+      border-color: @primary-color;
+    }
+
+    &:hover {
+      border-color: @primary-color;
     }
   }
 }

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

@@ -29,7 +29,7 @@
         <tr v-for="(item, index) in headers" :key="item.id">
           <td><a-input class="headers-input" v-model="item.key" :placeholder="$t('cmdb.components.param', { param: `${index + 1}` })" /></td>
           <td><a-input class="headers-input" v-model="item.value" :placeholder="$t('cmdb.components.value', { value: `${index + 1}` })" /></td>
-          <td>
+          <td class="headers-delete">
             <a style="color:red">
               <ops-icon type="icon-xianxing-delete" @click="deleteParam(index)" />
             </a>
@@ -92,10 +92,20 @@ export default {
     border: 1px solid #f3f4f6;
   }
   .headers-input {
-    border: none;
+    border: 1px solid transparent;
+
     &:focus {
       box-shadow: none;
+      border-color: @primary-color;
     }
+
+    &:hover {
+      border-color: @primary-color;
+    }
+  }
+
+  .headers-delete {
+    text-align: center;
   }
 }
 </style>

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

@@ -3,12 +3,10 @@
     <a-input-group compact>
       <treeselect
         :disable-branch-nodes="true"
-        class="custom-treeselect custom-treeselect-bgcAndBorder"
+        class="custom-treeselect custom-treeselect-white"
         :style="{
           '--custom-height': '30px',
           lineHeight: '30px',
-          '--custom-bg-color': '#fff',
-          '--custom-border': '1px solid #d9d9d9',
           display: 'inline-block',
           width: '100px',
         }"

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

@@ -23,7 +23,7 @@
         <tr v-for="(item, index) in parameters" :key="item.id">
           <td><a-input class="parameters-input" v-model="item.key" :placeholder="$t('cmdb.components.param', { param: `${index + 1}` })" /></td>
           <td><a-input class="parameters-input" v-model="item.value" :placeholder="$t('cmdb.components.value', { value: `${index + 1}` })" /></td>
-          <td>
+          <td class="parameters-delete">
             <a style="color:red">
               <ops-icon type="icon-xianxing-delete" @click="deleteParam(index)" />
             </a>
@@ -91,10 +91,20 @@ export default {
     border: 1px solid #f3f4f6;
   }
   .parameters-input {
-    border: none;
+    border: 1px solid transparent;
+
     &:focus {
       box-shadow: none;
+      border-color: @primary-color;
     }
+
+    &:hover {
+      border-color: @primary-color;
+    }
+  }
+
+  .parameters-delete {
+    text-align: center;
   }
 }
 </style>

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

@@ -25,7 +25,8 @@ const cmdb_en = {
         relationType: 'Relation Type',
         ad: 'AutoDiscovery',
         cidetail: 'CI Detail',
-        scene: 'Scene'
+        scene: 'Scene',
+        dcim: 'DCIM'
     },
     ciType: {
         ciType: 'CIType',
@@ -185,6 +186,9 @@ const cmdb_en = {
         botSelect: 'Please select a robot',
         refAttributeTips: 'The title and content can reference the attribute value of the CIType. The reference method is: {{ attr_name }}',
         webhookRefAttributeTips: 'Request parameters can reference the attribute value of the model. The reference method is: {{ attr_name }}',
+        testSend: 'Test Send',
+        testSendTip: 'Please save the trigger first',
+        testSendSuccess: 'Send Success',
         newTrigger: 'Add trigger',
         editTriggerTitle: 'Edit trigger {name}',
         newTriggerTitle: 'Add trigger {name}',
@@ -837,7 +841,67 @@ if __name__ == "__main__":
         onlineRatio: 'Online Ratio',
         scanEnable: 'Scan Enable',
         lastScanTime: 'Last Scan Time',
-        isSuccess: 'Is Success'
+        isSuccess: 'Is Success',
+        batchAssign: 'Batch Assign',
+        batchAssignInProgress: 'Assign in batches, {total} in total, {successNum} successful, {errorNum} failed',
+        batchAssignCompleted: 'Batch Assign Completed',
+        batchRecycle: 'Batch Recycle',
+        batchRecycleInProgress: 'Recycle in batches, {total} in total, {successNum} successful, {errorNum} failed',
+        batchRecycleCompleted: 'Batch Recycle Completed',
+    },
+    dcim: {
+        addRegion: 'Add Region',
+        addIDC: 'Add IDC',
+        addServerRoom: 'Add Server Room',
+        addRack: 'Add Rack',
+        editRegion: 'Edit Region',
+        editIDC: 'Edit IDC',
+        editServerRoom: 'Edit Server Room',
+        editRack: 'Edit Rack',
+        rackCount: 'Rack Count',
+        total: 'Total',
+        deviceCount: 'Device Count',
+        utilizationRation: 'Utilization Ration',
+        used: 'Used',
+        unused: 'Unused',
+        rackSearchTip: 'Please search for rack name',
+        viewDetail: 'View Detail',
+        deleteNode: 'Delete Node',
+        editNode: 'Edit Node',
+        roomNullTip: 'Please select the server room on the left first',
+        unitAbnormal: 'Unit Abnormal',
+        rack: 'Rack',
+        unitCount: 'Unit Count',
+        rackView: 'Rack View',
+        deviceList: 'Device List',
+        operationLog: 'Operation Log',
+        frontView: 'Front View',
+        rearView: 'Rear View',
+        addDevice: 'Add Device',
+        device: 'Device',
+        ciType: 'CIType',
+        unitStart: 'Unit Start',
+        toChange: 'To Change',
+        abnormalModalTip1: 'and',
+        abnormalModalTip2: ' location duplication',
+        abnormalModalTip3: 'Please select one of the devices to change',
+        remove: 'Remove',
+        migrate: 'Migrate',
+        deviceMigrate: 'Device Migrate',
+        migrationSuccess: 'Migration Success',
+        removeDeviceTip: 'Confirmed to remove {deviceName} device?',
+        operationTime: 'Operation Time',
+        operationUser: 'Operation User',
+        operationType: 'Operation Type',
+        deviceType: 'Device Type',
+        deviceName: 'Device Name',
+        removeDevice: 'Remove Device',
+        moveDevice: 'Move Device',
+        rackDetail: 'Rack Detail',
+        calcUnitFreeCount: 'Calculate Rack Free Unit Count',
+        calcUnitFreeCountTip: 'Calculating in the background, refresh the page later to see the result',
+        calcUnitFreeCountTip1: 'Calculate Trigger Success, refresh the page later to see the result',
+        calcUnitFreeCountTip2: `Confirm that you want to calculate the number of free Units for all rack?`
     }
 }
 export default cmdb_en

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

@@ -25,7 +25,8 @@ const cmdb_zh = {
         relationType: '关系类型',
         ad: '自动发现',
         cidetail: 'CI 详情',
-        scene: '场景'
+        scene: '场景',
+        dcim: '数据中心'
     },
     ciType: {
         ciType: '模型',
@@ -185,6 +186,9 @@ const cmdb_zh = {
         botSelect: '请选择机器人',
         refAttributeTips: '标题、内容可以引用该模型的属性值，引用方法为: {{ attr_name }}',
         webhookRefAttributeTips: '请求参数可以引用该模型的属性值，引用方法为: {{ attr_name }}',
+        testSend: '测试发送',
+        testSendTip: '请先保存触发器',
+        testSendSuccess: '发送成功',
         newTrigger: '新增触发器',
         editTriggerTitle: '编辑触发器 {name}',
         newTriggerTitle: '新增触发器 {name}',
@@ -836,7 +840,67 @@ if __name__ == "__main__":
         onlineRatio: '在线率',
         scanEnable: '是否扫描',
         lastScanTime: '最后扫描时间',
-        isSuccess: '是否成功'
+        isSuccess: '是否成功',
+        batchAssign: '批量分配',
+        batchAssignInProgress: '正在批量分配，共{total}个，成功{successNum}个，失败{errorNum}个',
+        batchAssignCompleted: '批量分配已完成',
+        batchRecycle: '批量回收',
+        batchRecycleInProgress: '正在批量回收，共{total}个，成功{successNum}个，失败{errorNum}个',
+        batchRecycleCompleted: '批量回收已完成',
+    },
+    dcim: {
+        addRegion: '新增区域',
+        addIDC: '新增数据中心',
+        addServerRoom: '新增机房',
+        addRack: '添加机柜',
+        editRegion: '编辑区域',
+        editIDC: '编辑数据中心',
+        editServerRoom: '编辑机房',
+        editRack: '编辑机柜',
+        rackCount: '机柜数',
+        total: '总数',
+        deviceCount: '设备数',
+        utilizationRation: '利用率',
+        used: '已使用',
+        unused: '未使用',
+        rackSearchTip: '请搜索机柜名称',
+        viewDetail: '查看详情',
+        deleteNode: '删除节点',
+        editNode: '编辑节点',
+        roomNullTip: '请先选择左侧的机房',
+        unitAbnormal: 'U位异常',
+        rack: '机柜',
+        unitCount: 'U位数',
+        rackView: '机柜视图',
+        deviceList: '设备列表',
+        operationLog: '操作记录',
+        frontView: '前视图',
+        rearView: '后视图',
+        addDevice: '添加设备',
+        device: '设备',
+        ciType: '模型',
+        unitStart: '起始U位',
+        toChange: '去修改',
+        abnormalModalTip1: '和',
+        abnormalModalTip2: ' 位置重复',
+        abnormalModalTip3: '请选择其中一台设备进行修改',
+        remove: '移除',
+        migrate: '迁移',
+        deviceMigrate: '设备迁移',
+        migrationSuccess: '迁移成功',
+        removeDeviceTip: '确认要移除 {deviceName} 设备吗？',
+        operationTime: '操作时间',
+        operationUser: '操作人',
+        operationType: '操作类型',
+        deviceType: '设备类型',
+        deviceName: '设备名',
+        removeDevice: '删除设备',
+        moveDevice: '移动设备',
+        rackDetail: '机柜详情',
+        calcUnitFreeCount: '计算机柜空闲U数',
+        calcUnitFreeCountTip: '后台计算中，稍后刷新页面查看结果',
+        calcUnitFreeCountTip1: '计算触发成功，稍后刷新页面查看结果',
+        calcUnitFreeCountTip2: '确认要计算所有机柜的空闲U数？'
     }
 }
 export default cmdb_zh

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

@@ -81,6 +81,12 @@ const genCmdbRoutes = async () => {
         name: 'cmdb_ipam',
         meta: { title: 'IPAM', appName: 'cmdb', icon: 'veops-ipam', selectedIcon: 'veops-ipam', keepAlive: false, permission: ['admin', 'cmdb_admin'] }
       },
+      {
+        path: '/cmdb/dcim',
+        component: () => import('../views/dcim'),
+        name: 'cmdb_dcim',
+        meta: { title: 'cmdb.menu.dcim', appName: 'cmdb', icon: 'veops-data_center', selectedIcon: 'veops-data_center', keepAlive: false, permission: ['cmdb_admin', 'admin'] }
+      },
       {
         path: '/cmdb/disabled2',
         name: 'cmdb_disabled2',

cmdb-ui/src/modules/cmdb/views/batch/modules/UploadFileForm.vue

@@ -104,6 +104,16 @@ export default {
     .cmdb-batch-upload-tips {
       color: @primary-color;
     }
+
+    &:hover {
+      background: linear-gradient(90deg, @primary-color_2 50%, transparent 0) repeat-x,
+      linear-gradient(90deg, @primary-color_2 50%, transparent 0) repeat-x,
+      linear-gradient(0deg, @primary-color_2 50%, transparent 0) repeat-y,
+      linear-gradient(0deg, @primary-color_2 50%, transparent 0) repeat-y;
+      background-size: 15px 1px, 15px 1px, 1px 15px, 1px 15px;
+      background-position: 0 0, 0 100%, 0 0, 100% 0;
+      background-color: @primary-color_7;
+    }
   }
   .ant-upload.ant-upload-drag .ant-upload-drag-container {
     vertical-align: baseline;

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

@@ -9,22 +9,18 @@
     "
     :title="$t('cmdb.ci.attributeDesc')"
     width="72%"
-    :bodyStyle="{ height: '100vh' }"
+    :bodyStyle="{ height: '100vh', paddingTop: '16px' }"
   >
-    <vxe-toolbar>
-      <template #buttons>
-        <a-input
-          v-model="searchKey"
-          :style="{ display: 'inline-block', width: '244px' }"
-          class="ops-input ops-input-radius"
-          type="search"
-          :placeholder="$t('cmdb.ci.tips5')"
-          @keyup="searchAttributes"
-        >
-          <a-icon type="search" slot="suffix" />
-        </a-input>
-      </template>
-    </vxe-toolbar>
+    <a-input
+      v-model="searchKey"
+      :style="{ display: 'inline-block', width: '244px', marginBottom: '16px' }"
+      class="ops-input ops-input-radius"
+      type="search"
+      :placeholder="$t('cmdb.ci.tips5')"
+      @keyup="searchAttributes"
+    >
+      <a-icon type="search" slot="suffix" />
+    </a-input>
 
     <a-spin :spinning="loading">
       <vxe-table

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

@@ -178,7 +178,7 @@
         </a-form-item>
       </a-form>
     </template>
-    <a v-if="!isEdit && !attr.is_computed && !attr.sys_computed" @click="handleEdit" :style="{ opacity: 0 }"><a-icon type="edit"/></a>
+    <a v-if="!isEdit && !attr.is_computed && !attr.sys_computed && showEdit" @click="handleEdit" :style="{ opacity: 0 }"><a-icon type="edit"/></a>
     <JsonEditor ref="jsonEditor" @jsonEditorOk="jsonEditorOk" />
   </span>
 </template>
@@ -204,6 +204,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    showEdit: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {