chore: add volumes cmdb_cache-data in docker-compose

Common check new columns

README.md

@@ -74,20 +74,20 @@
 
 ### Docker 一键快速构建
 > 方法一
-- 第一步: 先安装 docker 环境, 以及docker-compose
+- 第一步: 先安装 Docker 环境, 以及Docker Compose (v2)
 - 第二步: 拷贝项目
 ```shell 
 git clone https://github.com/veops/cmdb.git
 ```
 - 第三步：进入主目录，执行:
 ```
-docker-compose up -d
+docker compose up -d
 ```
 > 方法二, 该方法适用于linux系统
-- 第一步： 先安装 docker 环境, 以及docker-compose
+- 第一步： 先安装 Docker 环境, 以及Docker Compose (v2)
 - 第二步： 直接使用项目根目录下的install.sh 文件进行 `安装`、`启动`、`暂停`、`查状态`、`删除`、`卸载`
 ```shell
-curl -so install.sh https://raw.githubusercontent.com/veops/cmdb/master/install.sh
+curl -so install.sh https://raw.githubusercontent.com/veops/cmdb/deploy_on_kylin_docker/install.sh
 sh install.sh install
 ```
 

cmdb-api/Pipfile

@@ -66,6 +66,7 @@ hvac = "==2.0.0"
 colorama = ">=0.4.6"
 pycryptodomex = ">=3.19.0"
 lz4 = ">=4.3.2"
+python-magic = "==0.4.27"
 
 [dev-packages]
 # Testing

cmdb-api/api/commands/click_cmdb.py

@@ -55,9 +55,12 @@ def cmdb_init_cache():
     for cr in ci_relations:
         relations.setdefault(cr.first_ci_id, {}).update({cr.second_ci_id: cr.second_ci.type_id})
         if cr.ancestor_ids:
-            relations2.setdefault(cr.ancestor_ids, {}).update({cr.second_ci_id: cr.second_ci.type_id})
+            relations2.setdefault('{},{}'.format(cr.ancestor_ids, cr.first_ci_id), {}).update(
+                {cr.second_ci_id: cr.second_ci.type_id})
     for i in relations:
         relations[i] = json.dumps(relations[i])
+    for i in relations2:
+        relations2[i] = json.dumps(relations2[i])
     if relations:
         rd.create_or_update(relations, REDIS_PREFIX_CI_RELATION)
     if relations2:
@@ -357,13 +360,13 @@ def cmdb_inner_secrets_unseal(address):
     """
     unseal the secrets feature
     """
-    if not valid_address(address):
-        return
+    # if not valid_address(address):
+    #     return
     address = "{}/api/v0.1/secrets/unseal".format(address.strip("/"))
     for i in range(global_key_threshold):
         token = click.prompt(f'Enter unseal token {i + 1}', hide_input=True, confirmation_prompt=False)
         assert token is not None
-        resp = requests.post(address, headers={"Unseal-Token": token})
+        resp = requests.post(address, headers={"Unseal-Token": token}, timeout=5)
         if resp.status_code == 200:
             KeyManage.print_response(resp.json())
             if resp.json().get("status") in ["success", "skip"]:

cmdb-api/api/commands/click_common_setting.py

@@ -6,6 +6,7 @@ from werkzeug.datastructures import MultiDict
 from api.lib.common_setting.acl import ACLManager
 from api.lib.common_setting.employee import EmployeeAddForm, GrantEmployeeACLPerm
 from api.lib.common_setting.resp_format import ErrFormat
+from api.lib.common_setting.utils import CheckNewColumn
 from api.models.common_setting import Employee, Department
 
 
@@ -209,57 +210,7 @@ def common_check_new_columns():
     """
     add new columns to tables
     """
-    from api.extensions import db
-    from sqlalchemy import inspect, text
-
-    def get_model_by_table_name(_table_name):
-        registry = getattr(db.Model, 'registry', None)
-        class_registry = getattr(registry, '_class_registry', None)
-        for _model in class_registry.values():
-            if hasattr(_model, '__tablename__') and _model.__tablename__ == _table_name:
-                return _model
-        return None
-
-    def add_new_column(target_table_name, new_column):
-        column_type = new_column.type.compile(engine.dialect)
-        default_value = new_column.default.arg if new_column.default else None
-
-        sql = "ALTER TABLE " + target_table_name + " ADD COLUMN " + new_column.name + " " + column_type
-        if new_column.comment:
-            sql += f" comment '{new_column.comment}'"
-
-        if column_type == 'JSON':
-            pass
-        elif default_value:
-            if column_type.startswith('VAR') or column_type.startswith('Text'):
-                if default_value is None or len(default_value) == 0:
-                    pass
-            else:
-                sql += f" DEFAULT {default_value}"
-
-        sql = text(sql)
-        db.session.execute(sql)
-
-    engine = db.get_engine()
-    inspector = inspect(engine)
-    table_names = inspector.get_table_names()
-    for table_name in table_names:
-        existed_columns = inspector.get_columns(table_name)
-        existed_column_name_list = [c['name'] for c in existed_columns]
-
-        model = get_model_by_table_name(table_name)
-        if model is None:
-            continue
-
-        model_columns = getattr(getattr(getattr(model, '__table__'), 'columns'), '_all_columns')
-        for column in model_columns:
-            if column.name not in existed_column_name_list:
-                try:
-                    add_new_column(table_name, column)
-                    current_app.logger.info(f"add new column [{column.name}] in table [{table_name}] success.")
-                except Exception as e:
-                    current_app.logger.error(f"add new column [{column.name}] in table [{table_name}] err:")
-                    current_app.logger.error(e)
+    CheckNewColumn().run()
 
 
 @click.command()

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

@@ -331,14 +331,14 @@ class AutoDiscoveryCICRUD(DBMixin):
     @staticmethod
     def get_attributes_by_type_id(type_id):
         from api.lib.cmdb.ci_type import CITypeAttributeManager
-        attributes = [i[1] for i in CITypeAttributeManager.get_all_attributes(type_id) or []]
+        attributes = [i for i in CITypeAttributeManager.get_attributes_by_type_id(type_id) or []]
 
         attr_names = set()
         adts = AutoDiscoveryCITypeCRUD.get_by_type_id(type_id)
         for adt in adts:
             attr_names |= set((adt.attributes or {}).values())
 
-        return [attr.to_dict() for attr in attributes if attr.name in attr_names]
+        return [attr for attr in attributes if attr['name'] in attr_names]
 
     @classmethod
     def search(cls, page, page_size, fl=None, **kwargs):

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

@@ -295,6 +295,7 @@ class CIManager(object):
             _no_attribute_policy=ExistPolicy.IGNORE,
             is_auto_discovery=False,
             _is_admin=False,
+            ticket_id=None,
             **ci_dict):
         """
         add ci
@@ -303,6 +304,7 @@ class CIManager(object):
         :param _no_attribute_policy: ignore or reject
         :param is_auto_discovery: default is False
         :param _is_admin: default is False
+        :param ticket_id:
         :param ci_dict:
         :return:
         """
@@ -417,7 +419,7 @@ class CIManager(object):
             operate_type = OperateType.UPDATE if ci is not None else OperateType.ADD
             try:
                 ci = ci or CI.create(type_id=ci_type.id, is_auto_discovery=is_auto_discovery)
-                record_id = value_manager.create_or_update_attr_value(ci, ci_dict, key2attr)
+                record_id = value_manager.create_or_update_attr_value(ci, ci_dict, key2attr, ticket_id=ticket_id)
             except BadRequest as e:
                 if existed is None:
                     cls.delete(ci.id)
@@ -435,7 +437,7 @@ class CIManager(object):
 
         return ci.id
 
-    def update(self, ci_id, _is_admin=False, **ci_dict):
+    def update(self, ci_id, _is_admin=False, ticket_id=None, **ci_dict):
         now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         ci = self.confirm_ci_existed(ci_id)
 
@@ -487,7 +489,7 @@ class CIManager(object):
                             ci_dict.pop(k)
 
             try:
-                record_id = value_manager.create_or_update_attr_value(ci, ci_dict, key2attr)
+                record_id = value_manager.create_or_update_attr_value(ci, ci_dict, key2attr, ticket_id=ticket_id)
             except BadRequest as e:
                 raise e
 
@@ -958,7 +960,7 @@ class CIRelationManager(object):
                     return abort(400, ErrFormat.relation_constraint.format("1-N"))
 
     @classmethod
-    def add(cls, first_ci_id, second_ci_id, more=None, relation_type_id=None, ancestor_ids=None):
+    def add(cls, first_ci_id, second_ci_id, more=None, relation_type_id=None, ancestor_ids=None, valid=True):
 
         first_ci = CIManager.confirm_ci_existed(first_ci_id)
         second_ci = CIManager.confirm_ci_existed(second_ci_id)
@@ -983,7 +985,7 @@ class CIRelationManager(object):
                 relation_type_id or abort(404, ErrFormat.relation_not_found.format("{} -> {}".format(
                     first_ci.ci_type.name, second_ci.ci_type.name)))
 
-                if current_app.config.get('USE_ACL'):
+                if current_app.config.get('USE_ACL') and valid:
                     resource_name = CITypeRelationManager.acl_resource_name(first_ci.ci_type.name,
                                                                             second_ci.ci_type.name)
                     if not ACLManager().has_permission(
@@ -1086,6 +1088,57 @@ class CIRelationManager(object):
                 for ci_id in ci_ids:
                     cls.delete_2(parent_id, ci_id, ancestor_ids=ancestor_ids)
 
+    @classmethod
+    def build_by_attribute(cls, ci_dict):
+        type_id = ci_dict['_type']
+        child_items = CITypeRelation.get_by(parent_id=type_id, only_query=True).filter(
+            CITypeRelation.parent_attr_id.isnot(None))
+        for item in child_items:
+            parent_attr = AttributeCache.get(item.parent_attr_id)
+            child_attr = AttributeCache.get(item.child_attr_id)
+            attr_value = ci_dict.get(parent_attr.name)
+            value_table = TableMap(attr=child_attr).table
+            for child in value_table.get_by(attr_id=child_attr.id, value=attr_value, only_query=True).join(
+                    CI, CI.id == value_table.ci_id).filter(CI.type_id == item.child_id):
+                CIRelationManager.add(ci_dict['_id'], child.ci_id, valid=False)
+
+        parent_items = CITypeRelation.get_by(child_id=type_id, only_query=True).filter(
+            CITypeRelation.child_attr_id.isnot(None))
+        for item in parent_items:
+            parent_attr = AttributeCache.get(item.parent_attr_id)
+            child_attr = AttributeCache.get(item.child_attr_id)
+            attr_value = ci_dict.get(child_attr.name)
+            value_table = TableMap(attr=parent_attr).table
+            for parent in value_table.get_by(attr_id=parent_attr.id, value=attr_value, only_query=True).join(
+                    CI, CI.id == value_table.ci_id).filter(CI.type_id == item.parent_id):
+                CIRelationManager.add(parent.ci_id, ci_dict['_id'], valid=False)
+
+    @classmethod
+    def rebuild_all_by_attribute(cls, ci_type_relation):
+        parent_attr = AttributeCache.get(ci_type_relation['parent_attr_id'])
+        child_attr = AttributeCache.get(ci_type_relation['child_attr_id'])
+        if not parent_attr or not child_attr:
+            return
+
+        parent_value_table = TableMap(attr=parent_attr).table
+        child_value_table = TableMap(attr=child_attr).table
+
+        parent_values = parent_value_table.get_by(attr_id=parent_attr.id, only_query=True).join(
+            CI, CI.id == parent_value_table.ci_id).filter(CI.type_id == ci_type_relation['parent_id'])
+        child_values = child_value_table.get_by(attr_id=child_attr.id, only_query=True).join(
+            CI, CI.id == child_value_table.ci_id).filter(CI.type_id == ci_type_relation['child_id'])
+
+        child_value2ci_ids = {}
+        for child in child_values:
+            child_value2ci_ids.setdefault(child.value, []).append(child.ci_id)
+
+        for parent in parent_values:
+            for child_ci_id in child_value2ci_ids.get(parent.value, []):
+                try:
+                    cls.add(parent.ci_id, child_ci_id, valid=False)
+                except:
+                    pass
+
 
 class CITriggerManager(object):
     @staticmethod

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

@@ -92,6 +92,9 @@ class CITypeManager(object):
         for type_dict in ci_types:
             attr = AttributeCache.get(type_dict["unique_id"])
             type_dict["unique_key"] = attr and attr.name
+            if type_dict.get('show_id'):
+                attr = AttributeCache.get(type_dict["show_id"])
+                type_dict["show_name"] = attr and attr.name
             type_dict['parent_ids'] = CITypeInheritanceManager.get_parents(type_dict['id'])
             if resources is None or type_dict['name'] in resources:
                 res.append(type_dict)
@@ -192,7 +195,7 @@ class CITypeManager(object):
                 CITypeAttributeManager.update(type_id, [attr])
 
         ci_type2 = ci_type.to_dict()
-        new = ci_type.update(**kwargs)
+        new = ci_type.update(**kwargs, filter_none=False)
 
         CITypeCache.clean(type_id)
 
@@ -672,10 +675,17 @@ class CITypeAttributeManager(object):
                     item = CITypeTrigger.get_by(type_id=_type_id, attr_id=attr_id, to_dict=False, first=True)
                     item and item.soft_delete(commit=False)
 
+                for item in (CITypeRelation.get_by(parent_id=type_id, parent_attr_id=attr_id, to_dict=False) +
+                             CITypeRelation.get_by(child_id=type_id, child_attr_id=attr_id, to_dict=False)):
+                    item.soft_delete(commit=False)
+
                 db.session.commit()
 
                 CITypeAttributeCache.clean(type_id, attr_id)
 
+            if ci_type.show_id == attr_id:
+                ci_type.update(show_id=None, filter_none=False)
+
             CITypeHistoryManager.add(CITypeOperateType.DELETE_ATTRIBUTE, type_id, attr_id=attr.id,
                                      change=attr and attr.to_dict())
 
@@ -699,6 +709,10 @@ class CITypeAttributeManager(object):
             to_group = CITypeAttributeGroup.get_by(type_id=type_id, name=to_group_name, first=True, to_dict=False)
             to_group_id = to_group and to_group.id
 
+            if not to_group_id and CITypeInheritance.get_by(child_id=type_id, to_dict=False):
+                to_group = CITypeAttributeGroup.create(type_id=type_id, name=to_group_name)
+                to_group_id = to_group and to_group.id
+
         if from_group_id != to_group_id:
             if from_group_id is not None:
                 CITypeAttributeGroupManager.delete_item(from_group_id, attr_id)
@@ -726,14 +740,19 @@ class CITypeRelationManager(object):
     @staticmethod
     def get():
         res = CITypeRelation.get_by(to_dict=False)
+        type2attributes = dict()
         for idx, item in enumerate(res):
             _item = item.to_dict()
             res[idx] = _item
             res[idx]['parent'] = item.parent.to_dict()
+            if item.parent_id not in type2attributes:
+                type2attributes[item.parent_id] = [i[1].to_dict() for i in CITypeAttributesCache.get2(item.parent_id)]
             res[idx]['child'] = item.child.to_dict()
+            if item.child_id not in type2attributes:
+                type2attributes[item.child_id] = [i[1].to_dict() for i in CITypeAttributesCache.get2(item.child_id)]
             res[idx]['relation_type'] = item.relation_type.to_dict()
 
-        return res
+        return res, type2attributes
 
     @staticmethod
     def get_child_type_ids(type_id, level):
@@ -765,6 +784,8 @@ class CITypeRelationManager(object):
 
         ci_type_dict["relation_type"] = relation_inst.relation_type.name
         ci_type_dict["constraint"] = relation_inst.constraint
+        ci_type_dict["parent_attr_id"] = relation_inst.parent_attr_id
+        ci_type_dict["child_attr_id"] = relation_inst.child_attr_id
 
         return ci_type_dict
 
@@ -809,7 +830,8 @@ class CITypeRelationManager(object):
         return "{} -> {}".format(first_name, second_name)
 
     @classmethod
-    def add(cls, parent, child, relation_type_id, constraint=ConstraintEnum.One2Many):
+    def add(cls, parent, child, relation_type_id, constraint=ConstraintEnum.One2Many,
+            parent_attr_id=None, child_attr_id=None):
         p = CITypeManager.check_is_existed(parent)
         c = CITypeManager.check_is_existed(child)
 
@@ -824,24 +846,21 @@ class CITypeRelationManager(object):
             current_app.logger.warning(str(e))
             return abort(400, ErrFormat.circular_dependency_error)
 
-        # if constraint == ConstraintEnum.Many2Many:
-        #     other_c = CITypeRelation.get_by(parent_id=p.id, constraint=ConstraintEnum.Many2Many,
-        #                                     to_dict=False, first=True)
-        #     other_p = CITypeRelation.get_by(child_id=c.id, constraint=ConstraintEnum.Many2Many,
-        #                                     to_dict=False, first=True)
-        #     if other_c and other_c.child_id != c.id:
-        #         return abort(400, ErrFormat.m2m_relation_constraint.format(p.name, other_c.child.name))
-        #     if other_p and other_p.parent_id != p.id:
-        #         return abort(400, ErrFormat.m2m_relation_constraint.format(other_p.parent.name, c.name))
-
+        old_parent_attr_id = None
         existed = cls._get(p.id, c.id)
         if existed is not None:
-            existed.update(relation_type_id=relation_type_id,
-                           constraint=constraint)
+            old_parent_attr_id = existed.parent_attr_id
+            existed = existed.update(relation_type_id=relation_type_id,
+                                     constraint=constraint,
+                                     parent_attr_id=parent_attr_id,
+                                     child_attr_id=child_attr_id,
+                                     filter_none=False)
         else:
             existed = CITypeRelation.create(parent_id=p.id,
                                             child_id=c.id,
                                             relation_type_id=relation_type_id,
+                                            parent_attr_id=parent_attr_id,
+                                            child_attr_id=child_attr_id,
                                             constraint=constraint)
 
             if current_app.config.get("USE_ACL"):
@@ -855,6 +874,11 @@ class CITypeRelationManager(object):
                                                     current_user.username,
                                                     ResourceTypeEnum.CI_TYPE_RELATION)
 
+        if parent_attr_id and parent_attr_id != old_parent_attr_id:
+            if parent_attr_id and parent_attr_id != existed.parent_attr_id:
+                from api.tasks.cmdb import rebuild_relation_for_attribute_changed
+                rebuild_relation_for_attribute_changed.apply_async(args=(existed.to_dict()))
+
         CITypeHistoryManager.add(CITypeOperateType.ADD_RELATION, p.id,
                                  change=dict(parent=p.to_dict(), child=c.to_dict(), relation_type_id=relation_type_id))
 
@@ -1147,6 +1171,8 @@ class CITypeTemplateManager(object):
                                                  id2obj_dicts[added_id].get('child_id'),
                                                  id2obj_dicts[added_id].get('relation_type_id'),
                                                  id2obj_dicts[added_id].get('constraint'),
+                                                 id2obj_dicts[added_id].get('parent_attr_id'),
+                                                 id2obj_dicts[added_id].get('child_attr_id'),
                                                  )
             else:
                 obj = cls.create(flush=True, **id2obj_dicts[added_id])
@@ -1188,6 +1214,8 @@ class CITypeTemplateManager(object):
             i.pop('choice_web_hook', None)
             i.pop('choice_other', None)
             i.pop('order', None)
+            i.pop('inherited', None)
+            i.pop('inherited_from', None)
             choice_value = i.pop('choice_value', None)
             if not choice_value:
                 i['is_choice'] = False
@@ -1205,7 +1233,10 @@ class CITypeTemplateManager(object):
     def _import_ci_types(self, ci_types, attr_id_map):
         for i in ci_types:
             i.pop("unique_key", None)
+            i.pop("show_name", None)
             i['unique_id'] = attr_id_map.get(i['unique_id'], i['unique_id'])
+            if i.get('show_id'):
+                i['show_id'] = attr_id_map.get(i['show_id'], i['show_id'])
             i['uid'] = current_user.uid
 
         return self.__import(CIType, ci_types)
@@ -1299,6 +1330,8 @@ class CITypeTemplateManager(object):
                 _group = copy.deepcopy(group)
                 _group.pop('attributes', None)
                 _group.pop('id', None)
+                _group.pop('inherited', None)
+                _group.pop('inherited_from', None)
                 existed = CITypeAttributeGroup.get_by(name=_group['name'],
                                                       type_id=type_id_map.get(_group['type_id'], _group['type_id']),
                                                       first=True, to_dict=False)
@@ -1354,9 +1387,13 @@ class CITypeTemplateManager(object):
             rule.pop("id", None)
             rule.pop("created_at", None)
             rule.pop("updated_at", None)
+            rule.pop("relation", None)
 
             rule['uid'] = current_user.uid
 
+            if not rule.get('attributes'):
+                continue
+
             existed = False
             for i in AutoDiscoveryCIType.get_by(type_id=ci_type.id, adr_id=rule['adr_id'], to_dict=False):
                 if ((i.extra_option or {}).get('alias') or None) == (
@@ -1429,7 +1466,7 @@ class CITypeTemplateManager(object):
             ci_types=CITypeManager.get_ci_types(),
             ci_type_groups=CITypeGroupManager.get(),
             relation_types=[i.to_dict() for i in RelationTypeManager.get_all()],
-            ci_type_relations=CITypeRelationManager.get(),
+            ci_type_relations=CITypeRelationManager.get()[0],
             ci_type_auto_discovery_rules=list(),
             type2attributes=dict(),
             type2attribute_group=dict(),

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

@@ -167,6 +167,7 @@ class AttributeHistoryManger(object):
                         new=hist.new,
                         created_at=record.created_at.strftime('%Y-%m-%d %H:%M:%S'),
                         record_id=record.id,
+                        ticket_id=record.ticket_id,
                         hid=hist.id
                         )
             result.append(item)
@@ -200,9 +201,9 @@ class AttributeHistoryManger(object):
         return username, timestamp, attr_dict, rel_dict
 
     @staticmethod
-    def add(record_id, ci_id, history_list, type_id=None, flush=False, commit=True):
+    def add(record_id, ci_id, history_list, type_id=None, ticket_id=None, flush=False, commit=True):
         if record_id is None:
-            record = OperationRecord.create(uid=current_user.uid, type_id=type_id)
+            record = OperationRecord.create(uid=current_user.uid, type_id=type_id, ticket_id=ticket_id)
             record_id = record.id
 
         for attr_id, operate_type, old, new in history_list or []:

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

@@ -258,7 +258,7 @@ class CIFilterPermsCRUD(DBMixin):
 
             request_id_filter = {}
             for _id, v in (kwargs.get('id_filter') or {}).items():
-                key = ",".join([v['parent_path']] if v.get('parent_path') else [] + [str(_id)])
+                key = ",".join(([v['parent_path']] if v.get('parent_path') else []) + [str(_id)])
                 request_id_filter[key] = v['name']
 
             resource = None

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

@@ -238,11 +238,13 @@ class PreferenceManager(object):
             views = _views
 
         view2cr_ids = dict()
+        name2view = dict()
         result = dict()
         name2id = list()
         for view in views:
             view2cr_ids.setdefault(view['name'], []).extend(view['cr_ids'])
             name2id.append([view['name'], view['id']])
+            name2view[view['name']] = view
 
         id2type = dict()
         for view_name in view2cr_ids:
@@ -286,6 +288,8 @@ class PreferenceManager(object):
                                      topo_flatten=topo_flatten,
                                      level2constraint=level2constraint,
                                      leaf=leaf,
+                                     option=name2view[view_name]['option'],
+                                     is_public=name2view[view_name]['is_public'],
                                      leaf2show_types=leaf2show_types,
                                      node2show_types=node2show_types,
                                      show_types=[CITypeCache.get(j).to_dict()
@@ -293,18 +297,26 @@ class PreferenceManager(object):
 
         for type_id in id2type:
             id2type[type_id] = CITypeCache.get(type_id).to_dict()
+            id2type[type_id]['unique_name'] = AttributeCache.get(id2type[type_id]['unique_id']).name
+            if id2type[type_id]['show_id']:
+                show_attr = AttributeCache.get(id2type[type_id]['show_id'])
+                id2type[type_id]['show_name'] = show_attr and show_attr.name
 
         return result, id2type, sorted(name2id, key=lambda x: x[1])
 
     @classmethod
-    def create_or_update_relation_view(cls, name, cr_ids, is_public=False):
+    def create_or_update_relation_view(cls, name=None, cr_ids=None, _id=None, is_public=False, option=None):
         if not cr_ids:
             return abort(400, ErrFormat.preference_relation_view_node_required)
 
-        existed = PreferenceRelationView.get_by(name=name, to_dict=False, first=True)
+        if _id is None:
+            existed = PreferenceRelationView.get_by(name=name, to_dict=False, first=True)
+        else:
+            existed = PreferenceRelationView.get_by_id(_id)
         current_app.logger.debug(existed)
         if existed is None:
-            PreferenceRelationView.create(name=name, cr_ids=cr_ids, uid=current_user.uid, is_public=is_public)
+            PreferenceRelationView.create(name=name, cr_ids=cr_ids, uid=current_user.uid,
+                                          is_public=is_public, option=option)
 
             if current_app.config.get("USE_ACL"):
                 ACLManager().add_resource(name, ResourceTypeEnum.RELATION_VIEW)
@@ -312,6 +324,11 @@ class PreferenceManager(object):
                                                     RoleEnum.CMDB_READ_ALL,
                                                     ResourceTypeEnum.RELATION_VIEW,
                                                     permissions=[PermEnum.READ])
+        else:
+            if existed.name != name and current_app.config.get("USE_ACL"):
+                ACLManager().update_resource(existed.name, name, ResourceTypeEnum.RELATION_VIEW)
+
+            existed.update(name=name, cr_ids=cr_ids, is_public=is_public, option=option)
 
         return cls.get_relation_view()
 

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

@@ -96,7 +96,7 @@ class ErrFormat(CommonErrFormat):
     # 属性 {} 的值必须是唯一的, 当前值 {} 已存在
     attribute_value_unique_required = _l("The value of attribute {} must be unique, {} already exists")
     attribute_value_required = _l("Attribute {} value must exist")  # 属性 {} 值必须存在
-
+    attribute_value_out_of_range = _l("Out of range value, the maximum value is 2147483647")
     # 新增或者修改属性值未知错误: {}
     attribute_value_unknown_error = _l("Unknown error when adding or modifying attribute value: {}")
 

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

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

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

@@ -8,6 +8,8 @@ from flask import current_app
 from flask_login import current_user
 
 from api.extensions import rd
+from api.lib.cmdb.cache import AttributeCache
+from api.lib.cmdb.cache import CITypeCache
 from api.lib.cmdb.ci import CIRelationManager
 from api.lib.cmdb.ci_type import CITypeRelationManager
 from api.lib.cmdb.const import ConstraintEnum
@@ -18,6 +20,8 @@ from api.lib.cmdb.perms import CIFilterPermsCRUD
 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.es.search import Search as SearchFromES
+from api.lib.cmdb.utils import TableMap
+from api.lib.cmdb.utils import ValueTypeMap
 from api.lib.perm.acl.acl import ACLManager
 from api.lib.perm.acl.acl import is_app_admin
 from api.models.cmdb import CI
@@ -66,7 +70,7 @@ class Search(object):
                         self.has_m2m = True
 
         self.type2filter_perms = None
-        
+
         self.is_app_admin = is_app_admin('cmdb') or current_user.username == "worker"
 
     def _get_ids(self, ids):
@@ -236,7 +240,7 @@ class Search(object):
                 type2filter_perms = CIFilterPermsCRUD().get_by_ids(list(map(int, [i['name'] for i in res2])))
 
         ids = [self.root_id] if not isinstance(self.root_id, list) else self.root_id
-        _tmp = []
+        _tmp, tmp_res = [], []
         level2ids = {}
         for lv in range(1, self.level + 1):
             level2ids[lv] = []
@@ -303,24 +307,26 @@ class Search(object):
                         if key:
                             res = [json.loads(x).items() for x in [i or '{}' for i in rd.get(key, prefix) or []]]
                             if type_ids and lv == self.level:
-                                __tmp = [[i for i in x if i[1] in type_ids and
-                                          (not id_filter_limit or (
-                                                  key[idx] not in id_filter_limit or
-                                                  int(i[0]) in id_filter_limit[key[idx]]) or
-                                           int(i[0]) in id_filter_limit)] for idx, x in enumerate(res)]
+                                tmp_res = [[i for i in x if i[1] in type_ids and
+                                            (not id_filter_limit or (
+                                                    key[idx] not in id_filter_limit or
+                                                    int(i[0]) in id_filter_limit[key[idx]]) or
+                                             int(i[0]) in id_filter_limit)] for idx, x in enumerate(res)]
                             else:
-                                __tmp = [[i for i in x if (not id_filter_limit or (
+                                tmp_res = [[i for i in x if (not id_filter_limit or (
                                         key[idx] not in id_filter_limit or
                                         int(i[0]) in id_filter_limit[key[idx]]) or
-                                                           int(i[0]) in id_filter_limit)] for idx, x in enumerate(res)]
+                                                             int(i[0]) in id_filter_limit)] for idx, x in
+                                           enumerate(res)]
 
                             if ci_filter_limit:
-                                __tmp = [[j for j in i if j[1] not in ci_filter_limit or
-                                          int(j[0]) in ci_filter_limit[j[1]]] for i in __tmp]
+                                tmp_res = [[j for j in i if j[1] not in ci_filter_limit or
+                                            int(j[0]) in ci_filter_limit[j[1]]] for i in tmp_res]
                         else:
-                            __tmp = []
+                            tmp_res = []
 
-                        _tmp[idx] = [j for i in __tmp for j in i]
+                        if tmp_res:
+                            _tmp[idx] = [j for i in tmp_res for j in i]
                     else:
                         _tmp[idx] = []
                         level2ids[lv].append([])
@@ -331,3 +337,84 @@ class Search(object):
             detail={str(_id): dict(Counter([i[1] for i in _tmp[idx]]).items()) for idx, _id in enumerate(ids)})
 
         return result
+
+    def search_full(self, type_ids):
+        def _get_id2name(_type_id):
+            ci_type = CITypeCache.get(_type_id)
+
+            attr = AttributeCache.get(ci_type.unique_id)
+            value_table = TableMap(attr=attr).table
+            serializer = ValueTypeMap.serialize[attr.value_type]
+            unique_value = {i.ci_id: serializer(i.value) for i in value_table.get_by(attr_id=attr.id, to_dict=False)}
+
+            attr = AttributeCache.get(ci_type.show_id)
+            if attr:
+                value_table = TableMap(attr=attr).table
+                serializer = ValueTypeMap.serialize[attr.value_type]
+                show_value = {i.ci_id: serializer(i.value) for i in value_table.get_by(attr_id=attr.id, to_dict=False)}
+            else:
+                show_value = unique_value
+
+            return show_value, unique_value
+
+        self.level = int(self.level)
+
+        acl = ACLManager('cmdb')
+
+        type2filter_perms = dict()
+        if not self.is_app_admin:
+            res2 = acl.get_resources(ResourceTypeEnum.CI_FILTER)
+            if res2:
+                type2filter_perms = CIFilterPermsCRUD().get_by_ids(list(map(int, [i['name'] for i in res2])))
+
+        ids = [self.root_id] if not isinstance(self.root_id, list) else self.root_id
+
+        level_ids = [str(i) for i in ids]
+        result = []
+        id2children = {}
+        id2name = _get_id2name(type_ids[0])
+        for i in level_ids:
+            item = dict(id=int(i),
+                        type_id=type_ids[0],
+                        isLeaf=False,
+                        title=id2name[0].get(int(i)),
+                        uniqueValue=id2name[1].get(int(i)),
+                        children=[])
+            result.append(item)
+            id2children[str(i)] = item['children']
+
+        for lv in range(1, self.level):
+
+            if len(type_ids or []) >= lv and type2filter_perms.get(type_ids[lv]):
+                id_filter_limit, _ = self._get_ci_filter(type2filter_perms[type_ids[lv]])
+            else:
+                id_filter_limit = {}
+
+            if self.has_m2m and lv != 1:
+                key, prefix = [i for i in level_ids], REDIS_PREFIX_CI_RELATION2
+            else:
+                key, prefix = [i.split(',')[-1] for i in level_ids], REDIS_PREFIX_CI_RELATION
+            res = [json.loads(x).items() for x in [i or '{}' for i in rd.get(key, prefix) or []]]
+            res = [[i for i in x if (not id_filter_limit or (key[idx] not in id_filter_limit or
+                                                             int(i[0]) in id_filter_limit[key[idx]]) or
+                                     int(i[0]) in id_filter_limit)] for idx, x in enumerate(res)]
+            _level_ids = []
+            type_id = type_ids[lv]
+            id2name = _get_id2name(type_id)
+            for idx, node_path in enumerate(level_ids):
+                for child_id, _ in (res[idx] or []):
+                    item = dict(id=int(child_id),
+                                type_id=type_id,
+                                isLeaf=True if lv == self.level - 1 else False,
+                                title=id2name[0].get(int(child_id)),
+                                uniqueValue=id2name[1].get(int(child_id)),
+                                children=[])
+                    id2children[node_path].append(item)
+
+                    _node_path = "{},{}".format(node_path, child_id)
+                    _level_ids.append(_node_path)
+                    id2children[_node_path] = item['children']
+
+            level_ids = _level_ids
+
+        return result

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

@@ -11,12 +11,21 @@ import six
 import api.models.cmdb as model
 from api.lib.cmdb.cache import AttributeCache
 from api.lib.cmdb.const import ValueTypeEnum
+from api.lib.cmdb.resp_format import ErrFormat
 
 TIME_RE = re.compile(r'(?:[01]\d|2[0-3]):[0-5]\d:[0-5]\d')
 
 
+class ValueDeserializeError(Exception):
+    pass
+
+
 def string2int(x):
-    return int(float(x))
+    v = int(float(x))
+    if v > 2147483647:
+        raise ValueDeserializeError(ErrFormat.attribute_value_out_of_range)
+
+    return v
 
 
 def str2datetime(x):

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

@@ -5,14 +5,16 @@ from __future__ import unicode_literals
 
 import copy
 import imp
-import jinja2
 import os
 import re
 import tempfile
+
+import jinja2
 from flask import abort
 from flask import current_app
 from jinja2schema import infer
 from jinja2schema import to_json_schema
+from werkzeug.exceptions import BadRequest
 
 from api.extensions import db
 from api.lib.cmdb.attribute import AttributeManager
@@ -23,6 +25,7 @@ from api.lib.cmdb.const import ValueTypeEnum
 from api.lib.cmdb.history import AttributeHistoryManger
 from api.lib.cmdb.resp_format import ErrFormat
 from api.lib.cmdb.utils import TableMap
+from api.lib.cmdb.utils import ValueDeserializeError
 from api.lib.cmdb.utils import ValueTypeMap
 from api.lib.utils import handle_arg_list
 from api.models.cmdb import CI
@@ -80,7 +83,7 @@ class AttributeValueManager(object):
         return res
 
     @staticmethod
-    def _deserialize_value(value_type, value):
+    def _deserialize_value(alias, value_type, value):
         if not value:
             return value
 
@@ -88,6 +91,8 @@ class AttributeValueManager(object):
         try:
             v = deserialize(value)
             return v
+        except ValueDeserializeError as e:
+            return abort(400, ErrFormat.attribute_value_invalid2.format(alias, e))
         except ValueError:
             return abort(400, ErrFormat.attribute_value_invalid.format(value))
 
@@ -124,7 +129,7 @@ class AttributeValueManager(object):
 
     def _validate(self, attr, value, value_table, ci=None, type_id=None, ci_id=None, type_attr=None):
         ci = ci or {}
-        v = self._deserialize_value(attr.value_type, value)
+        v = self._deserialize_value(attr.alias, attr.value_type, value)
 
         attr.is_choice and value and self._check_is_choice(attr, attr.value_type, v)
         attr.is_unique and self._check_is_unique(
@@ -145,9 +150,10 @@ class AttributeValueManager(object):
         return AttributeHistoryManger.add(record_id, ci_id, [(attr_id, operate_type, old, new)], type_id)
 
     @staticmethod
-    def write_change2(changed, record_id=None):
+    def write_change2(changed, record_id=None, ticket_id=None):
         for ci_id, attr_id, operate_type, old, new, type_id in changed:
             record_id = AttributeHistoryManger.add(record_id, ci_id, [(attr_id, operate_type, old, new)], type_id,
+                                                   ticket_id=ticket_id,
                                                    commit=False, flush=False)
         try:
             db.session.commit()
@@ -240,6 +246,8 @@ class AttributeValueManager(object):
                     value = self._validate(attr, value, value_table, ci=None, type_id=type_id, ci_id=ci_id,
                                            type_attr=ci_attr2type_attr.get(attr.id))
                     ci_dict[key] = value
+            except BadRequest as e:
+                raise
             except Exception as e:
                 current_app.logger.warning(str(e))
 
@@ -248,12 +256,13 @@ class AttributeValueManager(object):
 
         return key2attr
 
-    def create_or_update_attr_value(self, ci, ci_dict, key2attr):
+    def create_or_update_attr_value(self, ci, ci_dict, key2attr, ticket_id=None):
         """
         add or update attribute value, then write history
         :param ci: instance object
         :param ci_dict: attribute dict
         :param key2attr: attr key to attr
+        :param ticket_id:
         :return:
         """
         changed = []
@@ -299,7 +308,7 @@ class AttributeValueManager(object):
             current_app.logger.warning(str(e))
             return abort(400, ErrFormat.attribute_value_unknown_error.format(e.args[0]))
 
-        return self.write_change2(changed)
+        return self.write_change2(changed, ticket_id=ticket_id)
 
     @staticmethod
     def delete_attr_value(attr_id, ci_id, commit=True):

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

@@ -35,3 +35,32 @@ AuthCommonConfigAutoRedirect = 'auto_redirect'
 class TestType(BaseEnum):
     Connect = 'connect'
     Login = 'login'
+
+
+MIMEExtMap = {
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document': '.docx',
+    'application/msword': '.doc',
+    'application/vnd.ms-word.document.macroEnabled.12': '.docm',
+    'application/vnd.ms-excel': '.xls',
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': '.xlsx',
+    'application/vnd.ms-excel.sheet.macroEnabled.12': '.xlsm',
+    'application/vnd.ms-powerpoint': '.ppt',
+    'application/vnd.openxmlformats-officedocument.presentationml.presentation': '.pptx',
+    'application/vnd.ms-powerpoint.presentation.macroEnabled.12': '.pptm',
+    'application/zip': '.zip',
+    'application/x-7z-compressed': '.7z',
+    'application/json': '.json',
+    'application/pdf': '.pdf',
+    'image/png': '.png',
+    'image/bmp': '.bmp',
+    'image/prs.btif': '.btif',
+    'image/gif': '.gif',
+    'image/jpeg': '.jpg',
+    'image/tiff': '.tif',
+    'image/vnd.microsoft.icon': '.ico',
+    'image/webp': '.webp',
+    'image/svg+xml': '.svg',
+    'image/vnd.adobe.photoshop': '.psd',
+    'text/plain': '.txt',
+    'text/csv': '.csv',
+}

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

@@ -470,8 +470,58 @@ class EditDepartmentInACL(object):
 
         return f"edit_department_name_in_acl, rid: {d_rid}, success"
 
+    @classmethod
+    def remove_from_old_department_role(cls, e_list, acl):
+        result = []
+        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")
+                continue
+            cls.remove_single_employee_from_old_department(acl, employee, result)
+
     @staticmethod
-    def edit_employee_department_in_acl(e_list: list, new_d_id: int, op_uid: int):
+    def remove_single_employee_from_old_department(acl, employee, result):
+        from api.models.acl import Role
+        old_department = DepartmentCRUD.get_department_by_id(employee.get('department_id'), False)
+        if not old_department:
+            return False
+
+        old_role = Role.get_by(first=True, name=old_department.department_name, app_id=None)
+        old_d_rid_in_acl = old_role.get('id') if old_role else 0
+        if old_d_rid_in_acl == 0:
+            return False
+
+        d_acl_rid = old_department.acl_rid if old_d_rid_in_acl == old_department.acl_rid else old_d_rid_in_acl
+        payload = {
+            'app_id': 'acl',
+            'parent_id': d_acl_rid,
+        }
+        try:
+            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}")
+
+        return True
+
+    @staticmethod
+    def add_employee_to_new_department(acl, employee_acl_rid, new_department_acl_rid, result):
+        payload = {
+            'app_id': 'acl',
+            'child_ids': [employee_acl_rid],
+        }
+        try:
+            acl.add_user_to_role(new_department_acl_rid, payload)
+            current_app.logger.info(f"add {employee_acl_rid} to {new_department_acl_rid}")
+        except Exception as e:
+            result.append(
+                f"add_user_to_role employee_acl_rid: {employee_acl_rid}, parent_id: {new_department_acl_rid}, \
+                             err: {e}")
+
+    @classmethod
+    def edit_employee_department_in_acl(cls, e_list: list, new_d_id: int, op_uid: int):
         result = []
         new_department = DepartmentCRUD.get_department_by_id(new_d_id, False)
         if not new_department:
@@ -481,7 +531,11 @@ class EditDepartmentInACL(object):
         from api.models.acl import Role
         new_role = Role.get_by(first=True, name=new_department.department_name, app_id=None)
         new_d_rid_in_acl = new_role.get('id') if new_role else 0
+        acl = ACLManager('acl', str(op_uid))
+
         if new_d_rid_in_acl == 0:
+            # only remove from old department role
+            cls.remove_from_old_department_role(e_list, acl)
             return
 
         if new_d_rid_in_acl != new_department.acl_rid:
@@ -491,43 +545,15 @@ class EditDepartmentInACL(object):
         new_department_acl_rid = new_department.acl_rid if new_d_rid_in_acl == new_department.acl_rid else \
             new_d_rid_in_acl
 
-        acl = ACLManager('acl', str(op_uid))
         for employee in e_list:
-            old_department = DepartmentCRUD.get_department_by_id(employee.get('department_id'), False)
-            if not old_department:
-                continue
             employee_acl_rid = employee.get('e_acl_rid')
             if employee_acl_rid == 0:
                 result.append(f"employee_acl_rid == 0")
                 continue
 
-            old_role = Role.get_by(first=True, name=old_department.department_name, app_id=None)
-            old_d_rid_in_acl = old_role.get('id') if old_role else 0
-            if old_d_rid_in_acl == 0:
-                return
-            if old_d_rid_in_acl != old_department.acl_rid:
-                old_department.update(
-                    acl_rid=old_d_rid_in_acl
-                )
-            d_acl_rid = old_department.acl_rid if old_d_rid_in_acl == old_department.acl_rid else old_d_rid_in_acl
-            payload = {
-                'app_id': 'acl',
-                'parent_id': d_acl_rid,
-            }
-            try:
-                acl.remove_user_from_role(employee_acl_rid, payload)
-            except Exception as e:
-                result.append(
-                    f"remove_user_from_role employee_acl_rid: {employee_acl_rid}, parent_id: {d_acl_rid}, err: {e}")
+            cls.remove_single_employee_from_old_department(acl, employee, result)
 
-            payload = {
-                'app_id': 'acl',
-                'child_ids': [employee_acl_rid],
-            }
-            try:
-                acl.add_user_to_role(new_department_acl_rid, payload)
-            except Exception as e:
-                result.append(
-                    f"add_user_to_role employee_acl_rid: {employee_acl_rid}, parent_id: {d_acl_rid}, err: {e}")
+            # 在新部门中添加员工
+            cls.add_employee_to_new_department(acl, employee_acl_rid, new_department_acl_rid, result)
 
         return result

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

@@ -1,5 +1,10 @@
 # -*- coding:utf-8 -*-
 from datetime import datetime
+from flask import current_app
+from sqlalchemy import inspect, text
+from sqlalchemy.dialects.mysql import ENUM
+
+from api.extensions import db
 
 
 def get_cur_time_str(split_flag='-'):
@@ -23,3 +28,115 @@ class BaseEnum(object):
                 if not attr.startswith("_") and not callable(getattr(cls, attr))
             }
         return cls._ALL_
+
+
+class CheckNewColumn(object):
+
+    def __init__(self):
+        self.engine = db.get_engine()
+        self.inspector = inspect(self.engine)
+        self.table_names = self.inspector.get_table_names()
+
+    @staticmethod
+    def get_model_by_table_name(_table_name):
+        registry = getattr(db.Model, 'registry', None)
+        class_registry = getattr(registry, '_class_registry', None)
+        for _model in class_registry.values():
+            if hasattr(_model, '__tablename__') and _model.__tablename__ == _table_name:
+                return _model
+        return None
+
+    def run(self):
+        for table_name in self.table_names:
+            self.check_by_table(table_name)
+
+    def check_by_table(self, table_name):
+        existed_columns = self.inspector.get_columns(table_name)
+        enum_columns = []
+        existed_column_name_list = []
+        for c in existed_columns:
+            if isinstance(c['type'], ENUM):
+                enum_columns.append(c['name'])
+            existed_column_name_list.append(c['name'])
+
+        model = self.get_model_by_table_name(table_name)
+        if model is None:
+            return
+        model_columns = getattr(getattr(getattr(model, '__table__'), 'columns'), '_all_columns')
+        for column in model_columns:
+            if column.name not in existed_column_name_list:
+                add_res = self.add_new_column(table_name, column)
+                if not add_res:
+                    continue
+
+                current_app.logger.info(f"add new column [{column.name}] in table [{table_name}] success.")
+
+                if column.name in enum_columns:
+                    enum_columns.remove(column.name)
+
+                self.add_new_index(table_name, column)
+
+        if len(enum_columns) > 0:
+            self.check_enum_column(enum_columns, existed_columns, model_columns, table_name)
+
+    def add_new_column(self, target_table_name, new_column):
+        try:
+            column_type = new_column.type.compile(self.engine.dialect)
+            default_value = new_column.default.arg if new_column.default else None
+
+            sql = "ALTER TABLE " + target_table_name + " ADD COLUMN " + f"`{new_column.name}`" + " " + column_type
+            if new_column.comment:
+                sql += f" comment '{new_column.comment}'"
+
+            if column_type == 'JSON':
+                pass
+            elif default_value:
+                if column_type.startswith('VAR') or column_type.startswith('Text'):
+                    if default_value is None or len(default_value) == 0:
+                        pass
+                else:
+                    sql += f" DEFAULT {default_value}"
+
+            sql = text(sql)
+            db.session.execute(sql)
+            return True
+        except Exception as e:
+            err = f"add_new_column [{new_column.name}] to table [{target_table_name}] err: {e}"
+            current_app.logger.error(err)
+            return False
+
+    @staticmethod
+    def add_new_index(target_table_name, new_column):
+        try:
+            if new_column.index:
+                index_name = f"{target_table_name}_{new_column.name}"
+                sql = "CREATE INDEX " + f"{index_name}" + " ON " + target_table_name + " (" + new_column.name + ")"
+                db.session.execute(sql)
+                current_app.logger.info(f"add new index [{index_name}] in table [{target_table_name}] success.")
+
+            return True
+        except Exception as e:
+            err = f"add_new_index [{new_column.name}] to table [{target_table_name}] err: {e}"
+            current_app.logger.error(err)
+            return False
+
+    @staticmethod
+    def check_enum_column(enum_columns, existed_columns, model_columns, table_name):
+        for column_name in enum_columns:
+            try:
+                enum_column = list(filter(lambda x: x['name'] == column_name, existed_columns))[0]
+                old_enum_value = enum_column.get('type', {}).enums
+                target_column = list(filter(lambda x: x.name == column_name, model_columns))[0]
+                new_enum_value = target_column.type.enums
+
+                if set(old_enum_value) == set(new_enum_value):
+                    continue
+
+                enum_values_str = ','.join(["'{}'".format(value) for value in new_enum_value])
+                sql = f"ALTER TABLE {table_name} MODIFY COLUMN" + f"`{column_name}`" + f" enum({enum_values_str})"
+                db.session.execute(sql)
+                current_app.logger.info(
+                    f"modify column [{column_name}] ENUM: {new_enum_value} in table [{table_name}] success.")
+            except Exception as e:
+                current_app.logger.error(
+                    f"modify column  ENUM [{column_name}] in table [{table_name}] err: {e}")

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

@@ -148,10 +148,10 @@ class ACLManager(object):
             if group:
                 PermissionCRUD.revoke(rid, permissions, group_id=group.id, rebuild=rebuild)
 
-    def del_resource(self, name, resource_type_name=None):
+    def del_resource(self, name, resource_type_name=None, rebuild=True):
         resource = self._get_resource(name, resource_type_name)
         if resource:
-            return ResourceCRUD.delete(resource.id)
+            return ResourceCRUD.delete(resource.id, rebuild=rebuild)
 
     def has_permission(self, resource_name, resource_type, perm, resource_id=None):
         if is_app_admin(self.app_id):

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

@@ -309,7 +309,7 @@ class ResourceCRUD(object):
         return resource
 
     @staticmethod
-    def delete(_id):
+    def delete(_id, rebuild=True):
         resource = Resource.get_by_id(_id) or abort(404, ErrFormat.resource_not_found.format("id={}".format(_id)))
 
         origin = resource.to_dict()
@@ -322,8 +322,9 @@ class ResourceCRUD(object):
             i.soft_delete()
             rebuilds.append((i.rid, i.app_id))
 
-        for rid, app_id in set(rebuilds):
-            role_rebuild.apply_async(args=(rid, app_id), queue=ACL_QUEUE)
+        if rebuild:
+            for rid, app_id in set(rebuilds):
+                role_rebuild.apply_async(args=(rid, app_id), queue=ACL_QUEUE)
 
         AuditCRUD.add_resource_log(resource.app_id, AuditOperateType.delete,
                                    AuditScope.resource, resource.id, origin, {}, {})

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

@@ -1,19 +1,15 @@
+import json
 import os
 import secrets
 import sys
-from base64 import b64decode, b64encode
+import threading
 
+from base64 import b64decode, b64encode
 from Cryptodome.Protocol.SecretSharing import Shamir
-from colorama import Back
-from colorama import Fore
-from colorama import Style
-from colorama import init as colorama_init
+from colorama import Back, Fore, Style, init as colorama_init
 from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives import hashes
-from cryptography.hazmat.primitives import padding
-from cryptography.hazmat.primitives.ciphers import Cipher
-from cryptography.hazmat.primitives.ciphers import algorithms
-from cryptography.hazmat.primitives.ciphers import modes
+from cryptography.hazmat.primitives import hashes, padding
+from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
 from flask import current_app
@@ -27,11 +23,16 @@ backend_encrypt_key_name = "encrypt_key"
 backend_root_key_salt_name = "root_key_salt"
 backend_encrypt_key_salt_name = "encrypt_key_salt"
 backend_seal_key = "seal_status"
+
 success = "success"
 seal_status = True
 
+secrets_encrypt_key = ""
+secrets_root_key = ""
 
 def string_to_bytes(value):
+    if not value:
+        return ""
     if isinstance(value, bytes):
         return value
     if sys.version_info.major == 2:
@@ -44,6 +45,8 @@ def string_to_bytes(value):
 class Backend:
     def __init__(self, backend=None):
         self.backend = backend
+        # cache is a redis object
+        self.cache = backend.cache
 
     def get(self, key):
         return self.backend.get(key)
@@ -54,23 +57,33 @@ class Backend:
     def update(self, key, value):
         return self.backend.update(key, value)
 
+    def get_shares(self, key):
+        return self.backend.get_shares(key)
+
+    def set_shares(self, key, value):
+        return self.backend.set_shares(key, value)
+
 
 class KeyManage:
 
     def __init__(self, trigger=None, backend=None):
         self.trigger = trigger
         self.backend = backend
+        self.share_key = "cmdb::secret::secrets_share"
         if backend:
             self.backend = Backend(backend)
 
     def init_app(self, app, backend=None):
         if (sys.argv[0].endswith("gunicorn") or
                 (len(sys.argv) > 1 and sys.argv[1] in ("run", "cmdb-password-data-migrate"))):
+
+            self.backend = backend
+            threading.Thread(target=self.watch_root_key, args=(app,)).start()
+
             self.trigger = app.config.get("INNER_TRIGGER_TOKEN")
             if not self.trigger:
                 return
 
-            self.backend = backend
             resp = self.auto_unseal()
             self.print_response(resp)
 
@@ -124,6 +137,8 @@ class KeyManage:
         return new_shares
 
     def is_valid_root_key(self, root_key):
+        if not root_key:
+            return False
         root_key_hash, ok = self.hash_root_key(root_key)
         if not ok:
             return root_key_hash, ok
@@ -135,35 +150,42 @@ class KeyManage:
         else:
             return "", True
 
-    def auth_root_secret(self, root_key):
-        msg, ok = self.is_valid_root_key(root_key)
-        if not ok:
-            return {
-                "message": msg,
-                "status": "failed"
-            }
+    def auth_root_secret(self, root_key, app):
+        with app.app_context():
+            msg, ok = self.is_valid_root_key(root_key)
+            if not ok:
+                return {
+                    "message": msg,
+                    "status": "failed"
+                }
 
-        encrypt_key_aes = self.backend.get(backend_encrypt_key_name)
-        if not encrypt_key_aes:
-            return {
-                "message": "encrypt key is empty",
-                "status": "failed"
-            }
+            encrypt_key_aes = self.backend.get(backend_encrypt_key_name)
+            if not encrypt_key_aes:
+                return {
+                    "message": "encrypt key is empty",
+                    "status": "failed"
+                }
 
-        secrets_encrypt_key, ok = InnerCrypt.aes_decrypt(string_to_bytes(root_key), encrypt_key_aes)
-        if ok:
-            msg, ok = self.backend.update(backend_seal_key, "open")
+            secret_encrypt_key, ok = InnerCrypt.aes_decrypt(string_to_bytes(root_key), encrypt_key_aes)
             if ok:
-                current_app.config["secrets_encrypt_key"] = secrets_encrypt_key
-                current_app.config["secrets_root_key"] = root_key
-                current_app.config["secrets_shares"] = []
-                return {"message": success, "status": success}
-            return {"message": msg, "status": "failed"}
-        else:
-            return {
-                "message": secrets_encrypt_key,
-                "status": "failed"
-            }
+                msg, ok = self.backend.update(backend_seal_key, "open")
+                if ok:
+                    global secrets_encrypt_key, secrets_root_key
+                    secrets_encrypt_key = secret_encrypt_key
+                    secrets_root_key = root_key
+                    self.backend.cache.set(self.share_key, json.dumps([]))
+                    return {"message": success, "status": success}
+                return {"message": msg, "status": "failed"}
+            else:
+                return {
+                    "message": secret_encrypt_key,
+                    "status": "failed"
+                }
+
+    def parse_shares(self, shares, app):
+        if len(shares) >= global_key_threshold:
+            recovered_secret = Shamir.combine(shares[:global_key_threshold], False)
+            return self.auth_root_secret(b64encode(recovered_secret), app)
 
     def unseal(self, key):
         if not self.is_seal():
@@ -175,14 +197,12 @@ class KeyManage:
         try:
             t = [i for i in b64decode(key)]
             v = (int("".join([chr(i) for i in t[-2:]])), bytes(t[:-2]))
-            shares = current_app.config.get("secrets_shares", [])
+            shares = self.backend.get_shares(self.share_key)
             if v not in shares:
                 shares.append(v)
-                current_app.config["secrets_shares"] = shares
-
+                self.set_shares(shares)
             if len(shares) >= global_key_threshold:
-                recovered_secret = Shamir.combine(shares[:global_key_threshold], False)
-                return self.auth_root_secret(b64encode(recovered_secret))
+                return self.parse_shares(shares, current_app)
             else:
                 return {
                     "message": "waiting for inputting other unseal key {0}/{1}".format(len(shares),
@@ -242,8 +262,11 @@ class KeyManage:
             msg, ok = self.backend.add(backend_seal_key, "open")
             if not ok:
                 return {"message": msg, "status": "failed"}, False
-            current_app.config["secrets_root_key"] = root_key
-            current_app.config["secrets_encrypt_key"] = encrypt_key
+
+            global secrets_encrypt_key, secrets_root_key
+            secrets_encrypt_key = encrypt_key
+            secrets_root_key = root_key
+
             self.print_token(shares, root_token=root_key)
 
             return {"message": "OK",
@@ -266,7 +289,7 @@ class KeyManage:
             }
             #  TODO
         elif len(self.trigger.strip()) == 24:
-            res = self.auth_root_secret(self.trigger.encode())
+            res = self.auth_root_secret(self.trigger.encode(), current_app)
             if res.get("status") == success:
                 return {
                     "message": success,
@@ -298,22 +321,31 @@ class KeyManage:
                     "message": msg,
                     "status": "failed",
                 }
-            current_app.config["secrets_root_key"] = ''
-            current_app.config["secrets_encrypt_key"] = ''
+            self.clear()
+            self.backend.cache.publish(self.share_key, "clear")
+
             return {
                 "message": success,
                 "status": success
             }
 
+    @staticmethod
+    def clear():
+        global secrets_encrypt_key, secrets_root_key
+        secrets_encrypt_key = ''
+        secrets_root_key = ''
+
     def is_seal(self):
         """
-        If there is no initialization or the root key is inconsistent, it is considered to be in a sealed state.
+        If there is no initialization or the root key is inconsistent, it is considered to be in a sealed state..
         :return:
         """
-        secrets_root_key = current_app.config.get("secrets_root_key")
+        # secrets_root_key = current_app.config.get("secrets_root_key")
+        if not secrets_root_key:
+            return True
         msg, ok = self.is_valid_root_key(secrets_root_key)
         if not ok:
-            return true
+            return True
         status = self.backend.get(backend_seal_key)
         return status == "block"
 
@@ -349,22 +381,53 @@ class KeyManage:
         }
         print(status_colors.get(status, Fore.GREEN), message, Style.RESET_ALL)
 
+    def set_shares(self, values):
+        new_value = list()
+        for v in values:
+            new_value.append((v[0], b64encode(v[1]).decode("utf-8")))
+        self.backend.cache.publish(self.share_key, json.dumps(new_value))
+        self.backend.cache.set(self.share_key, json.dumps(new_value))
+
+    def watch_root_key(self, app):
+        pubsub = self.backend.cache.pubsub()
+        pubsub.subscribe(self.share_key)
+
+        new_value = set()
+        for message in pubsub.listen():
+            if message["type"] == "message":
+                if message["data"] == b"clear":
+                    self.clear()
+                    continue
+                try:
+                    value = json.loads(message["data"].decode("utf-8"))
+                    for v in value:
+                        new_value.add((v[0], b64decode(v[1])))
+                except Exception as e:
+                    return []
+                if len(new_value) >= global_key_threshold:
+                    self.parse_shares(list(new_value), app)
+                    new_value = set()
+
 
 class InnerCrypt:
     def __init__(self):
-        secrets_encrypt_key = current_app.config.get("secrets_encrypt_key", "")
-        self.encrypt_key = b64decode(secrets_encrypt_key.encode("utf-8"))
+        self.encrypt_key = b64decode(secrets_encrypt_key)
+        #self.encrypt_key = b64decode(secrets_encrypt_key, "".encode("utf-8"))
 
     def encrypt(self, plaintext):
         """
         encrypt method contain aes currently
         """
+        if not self.encrypt_key:
+            return ValueError("secret is disabled, please seal firstly"), False
         return self.aes_encrypt(self.encrypt_key, plaintext)
 
     def decrypt(self, ciphertext):
         """
         decrypt method contain aes currently
         """
+        if not self.encrypt_key:
+            return ValueError("secret is disabled, please seal firstly"), False
         return self.aes_decrypt(self.encrypt_key, ciphertext)
 
     @classmethod
@@ -381,6 +444,7 @@ class InnerCrypt:
 
             return b64encode(iv + ciphertext).decode("utf-8"), True
         except Exception as e:
+
             return str(e), False
 
     @classmethod
@@ -426,4 +490,4 @@ if __name__ == "__main__":
     t_ciphertext, status1 = c.encrypt(t_plaintext)
     print("Ciphertext:", t_ciphertext)
     decrypted_plaintext, status2 = c.decrypt(t_ciphertext)
-    print("Decrypted plaintext:", decrypted_plaintext)
+    print("Decrypted plaintext:", decrypted_plaintext)

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

@@ -1,8 +1,13 @@
+import base64
+import json
+
 from api.models.cmdb import InnerKV
+from api.extensions import rd
 
 
 class InnerKVManger(object):
     def __init__(self):
+        self.cache = rd.r
         pass
 
     @classmethod
@@ -33,3 +38,26 @@ class InnerKVManger(object):
             return "success", True
 
         return "update failed", True
+
+    @classmethod
+    def get_shares(cls, key):
+        new_value = list()
+        v = rd.get_str(key)
+        if not v:
+            return new_value
+        try:
+            value = json.loads(v.decode("utf-8"))
+            for v in value:
+                new_value.append((v[0], base64.b64decode(v[1])))
+        except Exception as e:
+            return []
+        return new_value
+
+    @classmethod
+    def set_shares(cls, key, value):
+        new_value = list()
+        for v in value:
+            new_value.append((v[0], base64.b64encode(v[1]).decode("utf-8")))
+        rd.set_str(key, json.dumps(new_value))
+
+

cmdb-api/api/lib/utils.py

@@ -117,6 +117,23 @@ class RedisHandler(object):
         except Exception as e:
             current_app.logger.error("delete redis key error, {0}".format(str(e)))
 
+    def set_str(self, key, value, expired=None):
+        try:
+            if expired:
+                self.r.setex(key, expired, value)
+            else:
+                self.r.set(key, value)
+        except Exception as e:
+            current_app.logger.error("set redis error, {0}".format(str(e)))
+
+    def get_str(self, key):
+        try:
+            value = self.r.get(key)
+        except Exception as e:
+            current_app.logger.error("get redis error, {0}".format(str(e)))
+            return
+        return value
+
 
 class ESHandler(object):
     def __init__(self, flask_app=None):

cmdb-api/api/models/cmdb.py

@@ -46,13 +46,17 @@ class CIType(Model):
     name = db.Column(db.String(32), nullable=False)
     alias = db.Column(db.String(32), nullable=False)
     unique_id = db.Column(db.Integer, db.ForeignKey("c_attributes.id"), nullable=False)
+    show_id = db.Column(db.Integer, db.ForeignKey("c_attributes.id"))
     enabled = db.Column(db.Boolean, default=True, nullable=False)
     is_attached = db.Column(db.Boolean, default=False, nullable=False)
     icon = db.Column(db.Text)
     order = db.Column(db.SmallInteger, default=0, nullable=False)
     default_order_attr = db.Column(db.String(33))
 
-    unique_key = db.relationship("Attribute", backref="c_ci_types.unique_id")
+    unique_key = db.relationship("Attribute", backref="c_ci_types.unique_id",
+                                 primaryjoin="Attribute.id==CIType.unique_id", foreign_keys=[unique_id])
+    show_key = db.relationship("Attribute", backref="c_ci_types.show_id",
+                               primaryjoin="Attribute.id==CIType.show_id", foreign_keys=[show_id])
 
     uid = db.Column(db.Integer, index=True)
 
@@ -75,6 +79,9 @@ class CITypeRelation(Model):
     relation_type_id = db.Column(db.Integer, db.ForeignKey("c_relation_types.id"), nullable=False)
     constraint = db.Column(db.Enum(*ConstraintEnum.all()), default=ConstraintEnum.One2Many)
 
+    parent_attr_id = db.Column(db.Integer, db.ForeignKey("c_attributes.id"))
+    child_attr_id = db.Column(db.Integer, db.ForeignKey("c_attributes.id"))
+
     parent = db.relationship("CIType", primaryjoin="CIType.id==CITypeRelation.parent_id")
     child = db.relationship("CIType", primaryjoin="CIType.id==CITypeRelation.child_id")
     relation_type = db.relationship("RelationType", backref="c_ci_type_relations.relation_type_id")
@@ -460,6 +467,7 @@ class PreferenceRelationView(Model):
     name = db.Column(db.String(64), index=True, nullable=False)
     cr_ids = db.Column(db.JSON)  # [{parent_id: x, child_id: y}]
     is_public = db.Column(db.Boolean, default=False)
+    option = db.Column(db.JSON)
 
 
 class PreferenceSearchOption(Model):

cmdb-api/api/tasks/cmdb.py

@@ -2,7 +2,6 @@
 
 
 import json
-import time
 
 import redis_lock
 from flask import current_app
@@ -33,8 +32,7 @@ from api.models.cmdb import CITypeAttribute
 @reconnect_db
 def ci_cache(ci_id, operate_type, record_id):
     from api.lib.cmdb.ci import CITriggerManager
-
-    time.sleep(0.01)
+    from api.lib.cmdb.ci import CIRelationManager
 
     m = api.lib.cmdb.ci.CIManager()
     ci_dict = m.get_ci_by_id_from_db(ci_id, need_children=False, use_master=False)
@@ -52,13 +50,21 @@ def ci_cache(ci_id, operate_type, record_id):
 
         CITriggerManager.fire(operate_type, ci_dict, record_id)
 
+    ci_dict and CIRelationManager.build_by_attribute(ci_dict)
+
+
+@celery.task(name="cmdb.rebuild_relation_for_attribute_changed", queue=CMDB_QUEUE)
+@reconnect_db
+def rebuild_relation_for_attribute_changed(ci_type_relation):
+    from api.lib.cmdb.ci import CIRelationManager
+
+    CIRelationManager.rebuild_all_by_attribute(ci_type_relation)
+
 
 @celery.task(name="cmdb.batch_ci_cache", queue=CMDB_QUEUE)
 @flush_db
 @reconnect_db
 def batch_ci_cache(ci_ids, ):  # only for attribute change index
-    time.sleep(1)
-
     for ci_id in ci_ids:
         m = api.lib.cmdb.ci.CIManager()
         ci_dict = m.get_ci_by_id_from_db(ci_id, need_children=False, use_master=False)
@@ -87,7 +93,6 @@ def ci_delete(ci_id):
 @celery.task(name="cmdb.delete_id_filter", queue=CMDB_QUEUE)
 @reconnect_db
 def delete_id_filter(ci_id):
-
     CIFilterPermsCRUD().delete_id_filter_by_ci_id(ci_id)
 
 

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-03-01 13:49+0800\n"
+"POT-Creation-Date: 2024-03-29 10:42+0800\n"
 "PO-Revision-Date: 2023-12-25 20:21+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: zh\n"
@@ -322,7 +322,7 @@ msgstr "无效的属性值: {}"
 
 #: api/lib/cmdb/resp_format.py:94
 msgid "{} Invalid value: {}"
-msgstr "无效的值: {}"
+msgstr "{} 无效的值: {}"
 
 #: api/lib/cmdb/resp_format.py:95
 msgid "{} is not in the predefined values"
@@ -336,6 +336,10 @@ msgstr "属性 {} 的值必须是唯一的, 当前值 {} 已存在"
 msgid "Attribute {} value must exist"
 msgstr "属性 {} 值必须存在"
 
+#: api/lib/cmdb/resp_format.py:99
+msgid "Out of range value, the maximum value is 2147483647"
+msgstr "超过最大值限制, 最大值是2147483647"
+
 #: api/lib/cmdb/resp_format.py:101
 msgid "Unknown error when adding or modifying attribute value: {}"
 msgstr "新增或者修改属性值未知错误: {}"

cmdb-api/api/views/acl/login.py

@@ -38,8 +38,9 @@ class LoginView(APIView):
         username = request.values.get("username") or request.values.get("email")
         password = request.values.get("password")
         _role = None
+        auth_with_ldap = request.values.get('auth_with_ldap', True)
         config = AuthenticateDataCRUD(AuthenticateType.LDAP).get()
-        if config.get('enabled') or config.get('enable'):
+        if (config.get('enabled') or config.get('enable')) and auth_with_ldap:
             from api.lib.perm.authentication.ldap import authenticate_with_ldap
             user, authenticated = authenticate_with_ldap(username, password)
         else:

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

@@ -76,6 +76,7 @@ class CIView(APIView):
     @has_perm_for_ci("ci_type", ResourceTypeEnum.CI, PermEnum.ADD, lambda x: CITypeCache.get(x))
     def post(self):
         ci_type = request.values.get("ci_type")
+        ticket_id = request.values.pop("ticket_id", None)
         _no_attribute_policy = request.values.get("no_attribute_policy", ExistPolicy.IGNORE)
 
         exist_policy = request.values.pop('exist_policy', None)
@@ -87,6 +88,7 @@ class CIView(APIView):
                             exist_policy=exist_policy or ExistPolicy.REJECT,
                             _no_attribute_policy=_no_attribute_policy,
                             _is_admin=request.values.pop('__is_admin', None) or False,
+                            ticket_id=ticket_id,
                             **ci_dict)
 
         return self.jsonify(ci_id=ci_id)
@@ -95,6 +97,7 @@ class CIView(APIView):
     def put(self, ci_id=None):
         args = request.values
         ci_type = args.get("ci_type")
+        ticket_id = request.values.pop("ticket_id", None)
         _no_attribute_policy = args.get("no_attribute_policy", ExistPolicy.IGNORE)
 
         ci_dict = self._wrap_ci_dict()
@@ -102,6 +105,7 @@ class CIView(APIView):
         if ci_id is not None:
             manager.update(ci_id,
                            _is_admin=request.values.pop('__is_admin', None) or False,
+                           ticket_id=ticket_id,
                            **ci_dict)
         else:
             request.values.pop('exist_policy', None)
@@ -109,6 +113,7 @@ class CIView(APIView):
                                 exist_policy=ExistPolicy.REPLACE,
                                 _no_attribute_policy=_no_attribute_policy,
                                 _is_admin=request.values.pop('__is_admin', None) or False,
+                                ticket_id=ticket_id,
                                 **ci_dict)
 
         return self.jsonify(ci_id=ci_id)
@@ -221,7 +226,6 @@ class CIHeartbeatView(APIView):
 class CIFlushView(APIView):
     url_prefix = ("/ci/flush", "/ci/<int:ci_id>/flush")
 
-    # @auth_abandoned
     def get(self, ci_id=None):
         from api.tasks.cmdb import ci_cache
         from api.lib.cmdb.const import CMDB_QUEUE

cmdb-api/api/views/cmdb/ci_relation.py

@@ -30,6 +30,7 @@ class CIRelationSearchView(APIView):
                     level: default is 1
                     facet: statistic
         """
+
         page = get_page(request.values.get("page", 1))
         count = get_page_size(request.values.get("count") or request.values.get("page_size"))
 
@@ -86,6 +87,26 @@ class CIRelationStatisticsView(APIView):
         return self.jsonify(result)
 
 
+class CIRelationSearchFullView(APIView):
+    url_prefix = "/ci_relations/search/full"
+
+    def get(self):
+        root_ids = list(map(int, handle_arg_list(request.values.get('root_ids'))))
+        level = request.values.get('level', 1)
+        type_ids = list(map(int, handle_arg_list(request.values.get('type_ids', []))))
+        has_m2m = request.values.get("has_m2m") in current_app.config.get('BOOL_TRUE')
+
+        start = time.time()
+        s = Search(root_ids, level, has_m2m=has_m2m)
+        try:
+            result = s.search_full(type_ids)
+        except SearchError as e:
+            return abort(400, str(e))
+        current_app.logger.debug("search time is :{0}".format(time.time() - start))
+
+        return self.jsonify(result)
+
+
 class GetSecondCIsView(APIView):
     url_prefix = "/ci_relations/<int:first_ci_id>/second_cis"
 

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

@@ -43,16 +43,19 @@ class CITypeRelationView(APIView):
 
     @role_required(RoleEnum.CONFIG)
     def get(self):
-        res = CITypeRelationManager.get()
+        res, type2attributes = CITypeRelationManager.get()
 
-        return self.jsonify(res)
+        return self.jsonify(relations=res, type2attributes=type2attributes)
 
     @has_perm_from_args("parent_id", ResourceTypeEnum.CI, PermEnum.CONFIG, CITypeManager.get_name_by_id)
     @args_required("relation_type_id")
     def post(self, parent_id, child_id):
         relation_type_id = request.values.get("relation_type_id")
         constraint = request.values.get("constraint")
-        ctr_id = CITypeRelationManager.add(parent_id, child_id, relation_type_id, constraint)
+        parent_attr_id = request.values.get("parent_attr_id")
+        child_attr_id = request.values.get("child_attr_id")
+        ctr_id = CITypeRelationManager.add(parent_id, child_id, relation_type_id, constraint,
+                                           parent_attr_id, child_attr_id)
 
         return self.jsonify(ctr_id=ctr_id)
 

cmdb-api/api/views/cmdb/preference.py

@@ -97,7 +97,7 @@ class PreferenceTreeApiView(APIView):
 
 
 class PreferenceRelationApiView(APIView):
-    url_prefix = "/preference/relation/view"
+    url_prefix = ("/preference/relation/view", "/preference/relation/view/<int:_id>")
 
     def get(self):
         views, id2type, name2id = PreferenceManager.get_relation_view()
@@ -110,14 +110,20 @@ class PreferenceRelationApiView(APIView):
     @args_validate(PreferenceManager.pref_rel_cls)
     def post(self):
         name = request.values.get("name")
+        is_public = request.values.get("is_public") in current_app.config.get('BOOL_TRUE')
         cr_ids = request.values.get("cr_ids")
-        views, id2type, name2id = PreferenceManager.create_or_update_relation_view(name, cr_ids)
+        option = request.values.get("option") or None
+        views, id2type, name2id = PreferenceManager.create_or_update_relation_view(name, cr_ids, is_public=is_public,
+                                                                                   option=option)
 
         return self.jsonify(views=views, id2type=id2type, name2id=name2id)
 
     @role_required(RoleEnum.CONFIG)
-    def put(self):
-        return self.post()
+    @args_required("name")
+    def put(self, _id):
+        views, id2type, name2id = PreferenceManager.create_or_update_relation_view(_id=_id, **request.values)
+
+        return self.jsonify(views=views, id2type=id2type, name2id=name2id)
 
     @role_required(RoleEnum.CONFIG)
     @args_required("name")

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

@@ -1,10 +1,10 @@
 # -*- coding:utf-8 -*-
-import os
-
-from flask import request, abort, current_app, send_from_directory
+from flask import request, abort, current_app
 from werkzeug.utils import secure_filename
 import lz4.frame
+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.resource import APIView
@@ -45,32 +45,35 @@ class PostFileView(APIView):
 
         if not file:
             abort(400, ErrFormat.file_is_required)
-        extension = file.mimetype.split('/')[-1]
-        if '+' in extension:
-            extension = file.filename.split('.')[-1]
-        if file.filename == '':
-            filename = f'.{extension}'
-        else:
-            if extension not in file.filename:
-                filename = file.filename + f".{extension}"
-            else:
-                filename = file.filename
 
-        if allowed_file(filename, current_app.config.get('ALLOWED_EXTENSIONS', ALLOWED_EXTENSIONS)):
-            new_filename = generate_new_file_name(filename)
-            new_filename = secure_filename(new_filename)
-            file_content = file.read()
-            compressed_data = lz4.frame.compress(file_content)
-            try:
-                CommonFileCRUD.add_file(
-                    origin_name=filename,
-                    file_name=new_filename,
-                    binary=compressed_data,
-                )
+        m_type = magic.from_buffer(file.read(2048), mime=True)
+        file.seek(0)
 
-                return self.jsonify(file_name=new_filename)
-            except Exception as e:
-                current_app.logger.error(e)
-                abort(400, ErrFormat.upload_failed.format(e))
+        if m_type == 'application/octet-stream':
+            m_type = file.mimetype
+        elif m_type == 'text/plain':
+            # https://github.com/ahupp/python-magic/issues/193
+            m_type = m_type if file.mimetype == m_type else file.mimetype
 
-        abort(400, ErrFormat.file_type_not_allowed.format(filename))
+        extension = MIMEExtMap.get(m_type, None)
+
+        if extension is None:
+            abort(400, f"不支持的文件类型: {m_type}")
+
+        filename = file.filename if file.filename and file.filename.endswith(extension) else file.filename + extension
+
+        new_filename = generate_new_file_name(filename)
+        new_filename = secure_filename(new_filename)
+        file_content = file.read()
+        compressed_data = lz4.frame.compress(file_content)
+        try:
+            CommonFileCRUD.add_file(
+                origin_name=filename,
+                file_name=new_filename,
+                binary=compressed_data,
+            )
+
+            return self.jsonify(file_name=new_filename)
+        except Exception as e:
+            current_app.logger.error(e)
+            abort(400, ErrFormat.upload_failed.format(e))

cmdb-api/requirements.txt

@@ -52,4 +52,5 @@ WTForms==3.0.0
 shamir~=17.12.0
 pycryptodomex>=3.19.0
 colorama>=0.4.6
-lz4>=4.3.2
+lz4>=4.3.2
+python-magic==0.4.27

cmdb-ui/package.json

@@ -42,9 +42,11 @@
     "relation-graph": "^1.1.0",
     "snabbdom": "^3.5.1",
     "sortablejs": "1.9.0",
+    "style-resources-loader": "^1.5.0",
     "viser-vue": "^2.4.8",
     "vue": "2.6.11",
     "vue-clipboard2": "^0.3.3",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
     "vue-codemirror": "^4.0.6",
     "vue-cropper": "^0.6.2",
     "vue-grid-layout": "2.3.12",

cmdb-ui/public/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3857903 */
-  src: url('iconfont.woff2?t=1702544951995') format('woff2'),
-       url('iconfont.woff?t=1702544951995') format('woff'),
-       url('iconfont.ttf?t=1702544951995') format('truetype');
+  src: url('iconfont.woff2?t=1713335725699') format('woff2'),
+       url('iconfont.woff?t=1713335725699') format('woff'),
+       url('iconfont.ttf?t=1713335725699') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,246 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.veops-show:before {
+  content: "\e914";
+}
+
+.itsm-duration:before {
+  content: "\e913";
+}
+
+.a-itsm-workload1:before {
+  content: "\e912";
+}
+
+.caise-VPC:before {
+  content: "\e910";
+}
+
+.caise-CDN:before {
+  content: "\e911";
+}
+
+.caise-OOS:before {
+  content: "\e90f";
+}
+
+.Google_Cloud_Platform:before {
+  content: "\e90b";
+}
+
+.Ctyun:before {
+  content: "\e90c";
+}
+
+.Alibaba_Cloud:before {
+  content: "\e90d";
+}
+
+.Azure:before {
+  content: "\e90e";
+}
+
+.ZStack:before {
+  content: "\e904";
+}
+
+.Tencent_Cloud:before {
+  content: "\e905";
+}
+
+.Nutanix:before {
+  content: "\e906";
+}
+
+.OpenStack:before {
+  content: "\e907";
+}
+
+.Huawei_Cloud:before {
+  content: "\e908";
+}
+
+.Bytecloud:before {
+  content: "\e909";
+}
+
+.UCloud:before {
+  content: "\e90a";
+}
+
+.AWS:before {
+  content: "\e901";
+}
+
+.ECloud:before {
+  content: "\e902";
+}
+
+.JDCloud:before {
+  content: "\e903";
+}
+
+.veops-more:before {
+  content: "\e900";
+}
+
+.duose-date:before {
+  content: "\e8ff";
+}
+
+.duose-shishu:before {
+  content: "\e8fd";
+}
+
+.duose-wenben:before {
+  content: "\e8fe";
+}
+
+.duose-json:before {
+  content: "\e8f7";
+}
+
+.duose-fudianshu:before {
+  content: "\e8f8";
+}
+
+.duose-time:before {
+  content: "\e8f9";
+}
+
+.duose-password:before {
+  content: "\e8fa";
+}
+
+.duose-link:before {
+  content: "\e8fb";
+}
+
+.duose-datetime:before {
+  content: "\e8fc";
+}
+
+.veops-setting2:before {
+  content: "\e8f6";
+}
+
+.veops-search:before {
+  content: "\e8f5";
+}
+
+.veops-delete:before {
+  content: "\e8f4";
+}
+
+.veops-refresh:before {
+  content: "\e8f3";
+}
+
+.veops-filter:before {
+  content: "\e8f2";
+}
+
+.veops-reduce:before {
+  content: "\e8ed";
+}
+
+.veops-increase:before {
+  content: "\e8ee";
+}
+
+.veops-configuration_table:before {
+  content: "\e8ef";
+}
+
+.veops-copy:before {
+  content: "\e8f0";
+}
+
+.veops-save:before {
+  content: "\e8f1";
+}
+
+.veops-setting:before {
+  content: "\e8ec";
+}
+
+.veops-default_avatar:before {
+  content: "\e8ea";
+}
+
+.veops-notice:before {
+  content: "\e8eb";
+}
+
+.itsm-quickStart:before {
+  content: "\e8e9";
+}
+
+.itsm-associatedWith:before {
+  content: "\e8e8";
+}
+
+.itsm-folder:before {
+  content: "\e8e7";
+}
+
+.report:before {
+  content: "\e8e5";
+}
+
+.folder:before {
+  content: "\e8e6";
+}
+
+.itsm-refresh:before {
+  content: "\e8e4";
+}
+
+.itsm-add_table:before {
+  content: "\e8e2";
+}
+
+.itsm-delete_page:before {
+  content: "\e8e3";
+}
+
+.oneterm-secret_key:before {
+  content: "\e8e0";
+}
+
+.oneterm-password:before {
+  content: "\e8e1";
+}
+
+.itsm-sla_timeout_not_handled:before {
+  content: "\e8dd";
+}
+
+.itsm-sla_not_timeout:before {
+  content: "\e8de";
+}
+
+.itsm-SLA:before {
+  content: "\e8df";
+}
+
+.itsm-sla_timeout_handled:before {
+  content: "\e8dc";
+}
+
+.itsm-sla_all:before {
+  content: "\e8da";
+}
+
+.itsm-generate_by_node_id:before {
+  content: "\e8db";
+}
+
+.cmdb-MySQL:before {
+  content: "\e8d9";
+}
+
 .OAUTH2:before {
   content: "\e8d8";
 }
@@ -33,7 +273,7 @@
   content: "\e8d4";
 }
 
-.a-itsm-knowledge2:before {
+.itsm-knowledge2:before {
   content: "\e8d2";
 }
 

cmdb-ui/public/iconfont/iconfont.json

@@ -5,6 +5,426 @@
   "css_prefix_text": "",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "39948814",
+      "name": "veops-show",
+      "font_class": "veops-show",
+      "unicode": "e914",
+      "unicode_decimal": 59668
+    },
+    {
+      "icon_id": "39926816",
+      "name": "itsm-duration",
+      "font_class": "itsm-duration",
+      "unicode": "e913",
+      "unicode_decimal": 59667
+    },
+    {
+      "icon_id": "39926833",
+      "name": "itsm-workload (1)",
+      "font_class": "a-itsm-workload1",
+      "unicode": "e912",
+      "unicode_decimal": 59666
+    },
+    {
+      "icon_id": "39782649",
+      "name": "VPC",
+      "font_class": "caise-VPC",
+      "unicode": "e910",
+      "unicode_decimal": 59664
+    },
+    {
+      "icon_id": "39782643",
+      "name": "CDN",
+      "font_class": "caise-CDN",
+      "unicode": "e911",
+      "unicode_decimal": 59665
+    },
+    {
+      "icon_id": "39782632",
+      "name": "OOS",
+      "font_class": "caise-OOS",
+      "unicode": "e90f",
+      "unicode_decimal": 59663
+    },
+    {
+      "icon_id": "39729980",
+      "name": "Google Cloud Platform",
+      "font_class": "Google_Cloud_Platform",
+      "unicode": "e90b",
+      "unicode_decimal": 59659
+    },
+    {
+      "icon_id": "39729978",
+      "name": "Ctyun",
+      "font_class": "Ctyun",
+      "unicode": "e90c",
+      "unicode_decimal": 59660
+    },
+    {
+      "icon_id": "39729977",
+      "name": "Alibaba Cloud",
+      "font_class": "Alibaba_Cloud",
+      "unicode": "e90d",
+      "unicode_decimal": 59661
+    },
+    {
+      "icon_id": "39729976",
+      "name": "Azure",
+      "font_class": "Azure",
+      "unicode": "e90e",
+      "unicode_decimal": 59662
+    },
+    {
+      "icon_id": "39729985",
+      "name": "ZStack",
+      "font_class": "ZStack",
+      "unicode": "e904",
+      "unicode_decimal": 59652
+    },
+    {
+      "icon_id": "39729986",
+      "name": "Tencent Cloud",
+      "font_class": "Tencent_Cloud",
+      "unicode": "e905",
+      "unicode_decimal": 59653
+    },
+    {
+      "icon_id": "39729981",
+      "name": "Nutanix",
+      "font_class": "Nutanix",
+      "unicode": "e906",
+      "unicode_decimal": 59654
+    },
+    {
+      "icon_id": "39729983",
+      "name": "OpenStack",
+      "font_class": "OpenStack",
+      "unicode": "e907",
+      "unicode_decimal": 59655
+    },
+    {
+      "icon_id": "39729982",
+      "name": "Huawei Cloud",
+      "font_class": "Huawei_Cloud",
+      "unicode": "e908",
+      "unicode_decimal": 59656
+    },
+    {
+      "icon_id": "39729979",
+      "name": "Bytecloud",
+      "font_class": "Bytecloud",
+      "unicode": "e909",
+      "unicode_decimal": 59657
+    },
+    {
+      "icon_id": "39729984",
+      "name": "UCloud",
+      "font_class": "UCloud",
+      "unicode": "e90a",
+      "unicode_decimal": 59658
+    },
+    {
+      "icon_id": "39729988",
+      "name": "AWS",
+      "font_class": "AWS",
+      "unicode": "e901",
+      "unicode_decimal": 59649
+    },
+    {
+      "icon_id": "39729989",
+      "name": "ECloud",
+      "font_class": "ECloud",
+      "unicode": "e902",
+      "unicode_decimal": 59650
+    },
+    {
+      "icon_id": "39729987",
+      "name": "JDCloud",
+      "font_class": "JDCloud",
+      "unicode": "e903",
+      "unicode_decimal": 59651
+    },
+    {
+      "icon_id": "39713390",
+      "name": "veops-more",
+      "font_class": "veops-more",
+      "unicode": "e900",
+      "unicode_decimal": 59648
+    },
+    {
+      "icon_id": "39712276",
+      "name": "duose-date",
+      "font_class": "duose-date",
+      "unicode": "e8ff",
+      "unicode_decimal": 59647
+    },
+    {
+      "icon_id": "39712289",
+      "name": "duose-shishu",
+      "font_class": "duose-shishu",
+      "unicode": "e8fd",
+      "unicode_decimal": 59645
+    },
+    {
+      "icon_id": "39712286",
+      "name": "duose-wenben",
+      "font_class": "duose-wenben",
+      "unicode": "e8fe",
+      "unicode_decimal": 59646
+    },
+    {
+      "icon_id": "39712314",
+      "name": "duose-json",
+      "font_class": "duose-json",
+      "unicode": "e8f7",
+      "unicode_decimal": 59639
+    },
+    {
+      "icon_id": "39712315",
+      "name": "duose-fudianshu",
+      "font_class": "duose-fudianshu",
+      "unicode": "e8f8",
+      "unicode_decimal": 59640
+    },
+    {
+      "icon_id": "39712312",
+      "name": "duose-time",
+      "font_class": "duose-time",
+      "unicode": "e8f9",
+      "unicode_decimal": 59641
+    },
+    {
+      "icon_id": "39712313",
+      "name": "duose-password",
+      "font_class": "duose-password",
+      "unicode": "e8fa",
+      "unicode_decimal": 59642
+    },
+    {
+      "icon_id": "39712311",
+      "name": "duose-link",
+      "font_class": "duose-link",
+      "unicode": "e8fb",
+      "unicode_decimal": 59643
+    },
+    {
+      "icon_id": "39712310",
+      "name": "duose-datetime",
+      "font_class": "duose-datetime",
+      "unicode": "e8fc",
+      "unicode_decimal": 59644
+    },
+    {
+      "icon_id": "39705895",
+      "name": "veops-setting2",
+      "font_class": "veops-setting2",
+      "unicode": "e8f6",
+      "unicode_decimal": 59638
+    },
+    {
+      "icon_id": "39692404",
+      "name": "veops-search",
+      "font_class": "veops-search",
+      "unicode": "e8f5",
+      "unicode_decimal": 59637
+    },
+    {
+      "icon_id": "39680289",
+      "name": "veops-delete",
+      "font_class": "veops-delete",
+      "unicode": "e8f4",
+      "unicode_decimal": 59636
+    },
+    {
+      "icon_id": "39677378",
+      "name": "veops-refresh",
+      "font_class": "veops-refresh",
+      "unicode": "e8f3",
+      "unicode_decimal": 59635
+    },
+    {
+      "icon_id": "39677152",
+      "name": "veops-filter",
+      "font_class": "veops-filter",
+      "unicode": "e8f2",
+      "unicode_decimal": 59634
+    },
+    {
+      "icon_id": "39677216",
+      "name": "veops-reduce",
+      "font_class": "veops-reduce",
+      "unicode": "e8ed",
+      "unicode_decimal": 59629
+    },
+    {
+      "icon_id": "39677215",
+      "name": "veops-increase",
+      "font_class": "veops-increase",
+      "unicode": "e8ee",
+      "unicode_decimal": 59630
+    },
+    {
+      "icon_id": "39677211",
+      "name": "veops-configuration_table",
+      "font_class": "veops-configuration_table",
+      "unicode": "e8ef",
+      "unicode_decimal": 59631
+    },
+    {
+      "icon_id": "39677210",
+      "name": "veops-copy",
+      "font_class": "veops-copy",
+      "unicode": "e8f0",
+      "unicode_decimal": 59632
+    },
+    {
+      "icon_id": "39677207",
+      "name": "veops-save",
+      "font_class": "veops-save",
+      "unicode": "e8f1",
+      "unicode_decimal": 59633
+    },
+    {
+      "icon_id": "39664281",
+      "name": "veops-setting",
+      "font_class": "veops-setting",
+      "unicode": "e8ec",
+      "unicode_decimal": 59628
+    },
+    {
+      "icon_id": "39664295",
+      "name": "veops-default_avatar",
+      "font_class": "veops-default_avatar",
+      "unicode": "e8ea",
+      "unicode_decimal": 59626
+    },
+    {
+      "icon_id": "39664288",
+      "name": "veops-notice",
+      "font_class": "veops-notice",
+      "unicode": "e8eb",
+      "unicode_decimal": 59627
+    },
+    {
+      "icon_id": "39603135",
+      "name": "quickly_initiate",
+      "font_class": "itsm-quickStart",
+      "unicode": "e8e9",
+      "unicode_decimal": 59625
+    },
+    {
+      "icon_id": "39588554",
+      "name": "itsm-associated",
+      "font_class": "itsm-associatedWith",
+      "unicode": "e8e8",
+      "unicode_decimal": 59624
+    },
+    {
+      "icon_id": "39517726",
+      "name": "itsm-folder",
+      "font_class": "itsm-folder",
+      "unicode": "e8e7",
+      "unicode_decimal": 59623
+    },
+    {
+      "icon_id": "39517542",
+      "name": "report",
+      "font_class": "report",
+      "unicode": "e8e5",
+      "unicode_decimal": 59621
+    },
+    {
+      "icon_id": "39517539",
+      "name": "folder",
+      "font_class": "folder",
+      "unicode": "e8e6",
+      "unicode_decimal": 59622
+    },
+    {
+      "icon_id": "39123642",
+      "name": "itsm-refresh (1)",
+      "font_class": "itsm-refresh",
+      "unicode": "e8e4",
+      "unicode_decimal": 59620
+    },
+    {
+      "icon_id": "39123405",
+      "name": "itsm-add_table (1)",
+      "font_class": "itsm-add_table",
+      "unicode": "e8e2",
+      "unicode_decimal": 59618
+    },
+    {
+      "icon_id": "39123409",
+      "name": "itsm-delete_page",
+      "font_class": "itsm-delete_page",
+      "unicode": "e8e3",
+      "unicode_decimal": 59619
+    },
+    {
+      "icon_id": "39117681",
+      "name": "oneterm-secret_key",
+      "font_class": "oneterm-secret_key",
+      "unicode": "e8e0",
+      "unicode_decimal": 59616
+    },
+    {
+      "icon_id": "39117679",
+      "name": "oneterm-password",
+      "font_class": "oneterm-password",
+      "unicode": "e8e1",
+      "unicode_decimal": 59617
+    },
+    {
+      "icon_id": "39079529",
+      "name": "itsm-unprocessed",
+      "font_class": "itsm-sla_timeout_not_handled",
+      "unicode": "e8dd",
+      "unicode_decimal": 59613
+    },
+    {
+      "icon_id": "39079522",
+      "name": "itsm-not_timeout",
+      "font_class": "itsm-sla_not_timeout",
+      "unicode": "e8de",
+      "unicode_decimal": 59614
+    },
+    {
+      "icon_id": "39079520",
+      "name": "itsm-SLA",
+      "font_class": "itsm-SLA",
+      "unicode": "e8df",
+      "unicode_decimal": 59615
+    },
+    {
+      "icon_id": "39079538",
+      "name": "itsm-processed",
+      "font_class": "itsm-sla_timeout_handled",
+      "unicode": "e8dc",
+      "unicode_decimal": 59612
+    },
+    {
+      "icon_id": "39079519",
+      "name": "itsm-all_SLA",
+      "font_class": "itsm-sla_all",
+      "unicode": "e8da",
+      "unicode_decimal": 59610
+    },
+    {
+      "icon_id": "38970103",
+      "name": "itsm-generate_by_node_id",
+      "font_class": "itsm-generate_by_node_id",
+      "unicode": "e8db",
+      "unicode_decimal": 59611
+    },
+    {
+      "icon_id": "38806676",
+      "name": "cmdb-MySQL",
+      "font_class": "cmdb-MySQL",
+      "unicode": "e8d9",
+      "unicode_decimal": 59609
+    },
     {
       "icon_id": "38566548",
       "name": "OAuth2.0",
@@ -43,7 +463,7 @@
     {
       "icon_id": "38533133",
       "name": "itsm-knowledge (2)",
-      "font_class": "a-itsm-knowledge2",
+      "font_class": "itsm-knowledge2",
       "unicode": "e8d2",
       "unicode_decimal": 59602
     },
@@ -1841,7 +2261,7 @@
     },
     {
       "icon_id": "35341667",
-      "name": "caise-chajian ",
+      "name": "caise-chajian",
       "font_class": "caise-chajian",
       "unicode": "e7d2",
       "unicode_decimal": 59346

cmdb-ui/src/api/auth.js

@@ -30,9 +30,9 @@ export function getAuthDataEnable() {
     })
 }
 
-export function testLDAP(test_type, data) {
+export function testLDAP(data) {
     return axios({
-        url: `/common-setting/v1/auth_config/LDAP/test?test_type=${test_type}`,
+        url: `/common-setting/v1/auth_config/LDAP/test`,
         method: 'post',
         data,
     })

cmdb-ui/src/assets/icons/ops-default_show.svg

@@ -1,14 +0,0 @@
-<svg width="1em" height="1em" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1 0H2.5V1.25H1.25V2.5H0V1C0 0.447715 0.447715 0 1 0ZM0 7.5V9C0 9.55229 0.447715 10 1 10H2.5V8.75H1.25V7.5H0ZM8.75 7.5V8.75H7.5V10H9C9.55229 10 10 9.55228 10 9V7.5H8.75ZM10 2.5V1C10 0.447715 9.55228 0 9 0H7.5V1.25H8.75V2.5H10Z" fill="url(#paint0_linear_124_16807)"/>
-<rect x="2.5" y="3.125" width="5" height="3.75" fill="url(#paint1_linear_124_16807)"/>
-<defs>
-<linearGradient id="paint0_linear_124_16807" x1="5" y1="0" x2="5" y2="10" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4F84FF"/>
-<stop offset="1" stop-color="#85CBFF"/>
-</linearGradient>
-<linearGradient id="paint1_linear_124_16807" x1="5" y1="3.125" x2="5" y2="6.875" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4F84FF"/>
-<stop offset="1" stop-color="#85CBFF"/>
-</linearGradient>
-</defs>
-</svg>

cmdb-ui/src/assets/icons/ops-is_choice.svg

@@ -1,14 +0,0 @@
-<svg width="1em" height="1em" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="2.5" y="2.5" width="5" height="5" rx="0.5" fill="url(#paint0_linear_124_16808)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1 0C0.447715 0 0 0.447715 0 1V9C0 9.55229 0.447715 10 1 10H9C9.55229 10 10 9.55228 10 9V1C10 0.447715 9.55228 0 9 0H1ZM8.75 1.25H1.25V8.75H8.75V1.25Z" fill="url(#paint1_linear_124_16808)"/>
-<defs>
-<linearGradient id="paint0_linear_124_16808" x1="5" y1="2.5" x2="5" y2="7.5" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5187FF"/>
-<stop offset="1" stop-color="#84C9FF"/>
-</linearGradient>
-<linearGradient id="paint1_linear_124_16808" x1="5" y1="0" x2="5" y2="10" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5187FF"/>
-<stop offset="1" stop-color="#84C9FF"/>
-</linearGradient>
-</defs>
-</svg>

cmdb-ui/src/assets/icons/ops-is_index.svg

@@ -1,9 +0,0 @@
-<svg width="1em" height="1em" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.56845 8.8409C3.06335 8.78963 1.86719 8.05799 2.06279 6.48243C2.1538 5.75105 2.64549 5.3214 3.34457 5.16041C3.67173 5.08909 4.00806 5.06954 4.34128 5.10247C4.40203 5.10811 4.44843 5.11401 4.47689 5.11837L4.51586 5.12631C4.64379 5.15574 4.77263 5.18104 4.90218 5.20219C5.26786 5.2651 5.63914 5.28941 6.0099 5.27474C6.8046 5.23219 7.21015 4.97429 7.23092 4.41672C7.25424 3.79429 6.76332 3.29619 5.86659 2.91832C5.52815 2.77793 5.17843 2.66645 4.82117 2.58506C4.70325 2.55755 4.58482 2.53328 4.46587 2.51226C4.30323 2.94847 3.9867 3.31016 3.57591 3.5292C3.16512 3.74824 2.68841 3.80952 2.23557 3.70149C1.90324 3.61651 1.60053 3.44214 1.36029 3.1973C1.12004 2.95245 0.951447 2.64649 0.872793 2.3126C0.794138 1.97872 0.808429 1.62967 0.914116 1.30333C1.0198 0.976995 1.21285 0.685836 1.4723 0.461451C1.73176 0.237065 2.04771 0.0880244 2.38588 0.0305017C2.72404 -0.0270211 3.07151 0.00917138 3.39056 0.135152C3.70961 0.261132 3.98807 0.472088 4.19571 0.745127C4.40335 1.01817 4.53225 1.34286 4.56841 1.68397C4.6812 1.70269 4.83374 1.73217 5.01524 1.77421C5.42003 1.86601 5.81625 1.99216 6.1996 2.15131C7.38191 2.64966 8.1156 3.39463 8.07638 4.4462C8.03639 5.53187 7.23425 6.04253 6.0563 6.10533C5.62418 6.12373 5.19132 6.09614 4.76503 6.02304C4.61925 5.99997 4.47398 5.9716 4.32923 5.93793C4.30731 5.93532 4.28534 5.9331 4.26335 5.93127C4.02033 5.90687 3.77501 5.92018 3.53606 5.97075C3.15153 6.05893 2.94311 6.24146 2.90056 6.58267C2.78725 7.49504 3.47915 7.94443 5.42694 8.00416C5.44492 7.65558 5.5586 7.3187 5.75548 7.03049C5.95237 6.74229 6.22485 6.51389 6.54303 6.37039C6.8612 6.22689 7.21277 6.17383 7.55912 6.21703C7.90548 6.26023 8.23323 6.39802 8.50641 6.61528C8.77959 6.83254 8.98763 7.12086 9.10769 7.4486C9.22775 7.77634 9.25519 8.13082 9.187 8.47314C9.11881 8.81545 8.95763 9.13235 8.72114 9.38907C8.48465 9.64578 8.18201 9.83237 7.84643 9.92836C7.39921 10.0556 6.92094 10.0153 6.50129 9.81515C6.08164 9.61495 5.74941 9.26855 5.56691 8.8409H5.56845Z" fill="url(#paint0_linear_124_16804)"/>
-<defs>
-<linearGradient id="paint0_linear_124_16804" x1="5.02318" y1="0.00390625" x2="5.02318" y2="10.0013" gradientUnits="userSpaceOnUse">
-<stop stop-color="#497DFF"/>
-<stop offset="1" stop-color="#8CD5FF"/>
-</linearGradient>
-</defs>
-</svg>

cmdb-ui/src/assets/icons/ops-is_link.svg

@@ -1,9 +0,0 @@
-<svg width="1em" height="1em" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.01211 4.50621L2.7769 5.74077C2.712 5.80565 2.66051 5.88268 2.62538 5.96747C2.59025 6.05225 2.57217 6.14313 2.57217 6.2349C2.57217 6.32668 2.59025 6.41755 2.62538 6.50234C2.66051 6.58712 2.712 6.66416 2.7769 6.72904L3.27085 7.223C3.33573 7.28791 3.41276 7.3394 3.49754 7.37453C3.58232 7.40966 3.67319 7.42774 3.76496 7.42774C3.85674 7.42774 3.94761 7.40966 4.03239 7.37453C4.11717 7.3394 4.1942 7.28791 4.25908 7.223L5.49394 5.98775C5.6237 6.1175 5.72663 6.27155 5.79686 6.44109C5.86708 6.61063 5.90323 6.79234 5.90323 6.97585C5.90323 7.15935 5.86708 7.34106 5.79686 7.5106C5.72663 7.68014 5.6237 7.83419 5.49394 7.96394L3.76479 9.69316C3.56827 9.88963 3.30176 10 3.02387 10C2.74599 10 2.47948 9.88963 2.28296 9.69316L0.306832 7.71696C0.110368 7.52043 0 7.25391 0 6.97602C0 6.69813 0.110368 6.43161 0.306832 6.23508L2.03599 4.50586C2.16574 4.3761 2.31978 4.27317 2.48931 4.20294C2.65884 4.13271 2.84055 4.09657 3.02405 4.09657C3.20755 4.09657 3.38925 4.13271 3.55879 4.20294C3.72832 4.27317 3.88236 4.3761 4.01211 4.50586V4.50621ZM5.98789 5.49414L7.2231 4.25923C7.288 4.19435 7.33949 4.11732 7.37462 4.03253C7.40975 3.94775 7.42783 3.85687 7.42783 3.7651C7.42783 3.67332 7.40975 3.58245 7.37462 3.49766C7.33949 3.41288 7.288 3.33584 7.2231 3.27096L6.72915 2.777C6.66428 2.71209 6.58724 2.6606 6.50246 2.62547C6.41768 2.59034 6.32681 2.57226 6.23504 2.57226C6.14326 2.57226 6.05239 2.59034 5.96761 2.62547C5.88283 2.6606 5.8058 2.71209 5.74092 2.777L4.50606 4.01225C4.3763 3.8825 4.27337 3.72845 4.20314 3.55891C4.13292 3.38937 4.09677 3.20766 4.09677 3.02415C4.09677 2.84065 4.13292 2.65894 4.20314 2.4894C4.27337 2.31986 4.3763 2.16581 4.50606 2.03606L6.23521 0.306843C6.43173 0.110371 6.69824 0 6.97613 0C7.25401 0 7.52052 0.110371 7.71704 0.306843L9.69317 2.28304C9.88963 2.47957 10 2.74609 10 3.02398C10 3.30187 9.88963 3.56839 9.69317 3.76492L7.96401 5.49414C7.83426 5.6239 7.68022 5.72683 7.51069 5.79706C7.34116 5.86729 7.15945 5.90343 6.97595 5.90343C6.79245 5.90343 6.61075 5.86729 6.44121 5.79706C6.27168 5.72683 6.11764 5.6239 5.98789 5.49414ZM3.51817 5.9881L5.98789 3.51829C6.05339 3.45274 6.14225 3.4159 6.23491 3.41586C6.32758 3.41583 6.41646 3.45261 6.48201 3.51812C6.54755 3.58362 6.5844 3.67248 6.58443 3.76515C6.58446 3.85782 6.54768 3.9467 6.48218 4.01225L4.01211 6.48206C3.94661 6.54761 3.85775 6.58445 3.76509 6.58449C3.67242 6.58452 3.58354 6.54774 3.51799 6.48223C3.45245 6.41673 3.4156 6.32787 3.41557 6.2352C3.41554 6.14253 3.45232 6.05365 3.51782 5.9881H3.51817Z" fill="url(#paint0_linear_124_16775)"/>
-<defs>
-<linearGradient id="paint0_linear_124_16775" x1="5" y1="0" x2="5" y2="10" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5A85FF"/>
-<stop offset="1" stop-color="#8DD8FF"/>
-</linearGradient>
-</defs>
-</svg>

cmdb-ui/src/assets/icons/ops-is_password.svg

@@ -1,9 +0,0 @@
-<svg width="1em" height="1em" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.31822 4.16667H2.54549V2.5C2.54549 1.11458 3.63981 0 5.00003 0C6.36026 0 7.45458 1.11458 7.45458 2.5V4.16667H8.68185C8.90685 4.16667 9.09094 4.35417 9.09094 4.58333V9.58333C9.09094 9.8125 8.90685 10 8.68185 10H1.31822C1.09322 10 0.909124 9.8125 0.909124 9.58333V4.58333C0.909124 4.35417 1.09322 4.16667 1.31822 4.16667ZM5.00003 7.91667C5.45003 7.91667 5.81822 7.54167 5.81822 7.08333C5.81822 6.625 5.45003 6.25 5.00003 6.25C4.55003 6.25 4.18185 6.625 4.18185 7.08333C4.18185 7.54167 4.55003 7.91667 5.00003 7.91667ZM3.36367 4.16667H6.6364V2.5C6.6364 1.58333 5.90003 0.833333 5.00003 0.833333C4.10003 0.833333 3.36367 1.58333 3.36367 2.5V4.16667Z" fill="url(#paint0_linear_124_16805)"/>
-<defs>
-<linearGradient id="paint0_linear_124_16805" x1="5.00003" y1="0" x2="5.00003" y2="10" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4D82FF"/>
-<stop offset="1" stop-color="#88CFFF"/>
-</linearGradient>
-</defs>
-</svg>

cmdb-ui/src/assets/icons/ops-is_sortable.svg

@@ -1,9 +0,0 @@
-<svg width="1em" height="1em" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.91242 9.46382C3.91242 9.57428 3.82288 9.66382 3.71242 9.66382H2.35075C2.2403 9.66382 2.15075 9.57428 2.15075 9.46382V3.55962C2.15075 3.44916 2.06121 3.35962 1.95075 3.35962H0.539905C0.354312 3.35962 0.268806 3.12879 0.40961 3.00788L3.58212 0.283626C3.71182 0.172253 3.91242 0.264405 3.91242 0.43536V9.46382ZM6.08758 0.567715C6.08758 0.457258 6.17712 0.367716 6.28758 0.367716H7.64925C7.7597 0.367716 7.84925 0.457259 7.84925 0.567716V6.4411C7.84925 6.55156 7.93879 6.6411 8.04925 6.6411H9.46001C9.64561 6.6411 9.73111 6.87195 9.59029 6.99285L6.41786 9.71645C6.28816 9.8278 6.08758 9.73565 6.08758 9.5647V0.567715Z" fill="url(#paint0_linear_124_16806)"/>
-<defs>
-<linearGradient id="paint0_linear_124_16806" x1="5" y1="0" x2="5" y2="10" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5A85FF"/>
-<stop offset="1" stop-color="#8DD8FF"/>
-</linearGradient>
-</defs>
-</svg>

cmdb-ui/src/assets/icons/ops-is_unique.svg

@@ -1,9 +0,0 @@
-<svg width="1em" height="1em" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.51961 6.8937V10H4.48V6.8937H1.76732C1.65823 6.8937 1.56223 6.85372 1.48369 6.77237C1.40522 6.69504 1.3621 6.5915 1.36369 6.48421C1.36369 5.95891 1.52769 5.48566 1.85895 5.06411C2.18986 4.64428 2.56258 4.43334 2.97893 4.43334V1.64277C2.75966 1.64277 2.57167 1.56142 2.41022 1.39873C2.25355 1.24349 2.16738 1.0362 2.17022 0.821384C2.17022 0.598718 2.25022 0.407762 2.41022 0.244037C2.56912 0.0827244 2.7593 0 2.97893 0H7.01959C7.23885 0 7.42685 0.0813456 7.5883 0.244037C7.74721 0.406728 7.82866 0.598718 7.82866 0.821384C7.82866 1.04405 7.74866 1.23501 7.58867 1.39873C7.4283 1.5628 7.23885 1.64277 7.01959 1.64277V4.43196C7.43594 4.43196 7.81012 4.64291 8.13956 5.06273C8.46631 5.47151 8.64098 5.97137 8.63628 6.48421C8.63628 6.59486 8.59701 6.6924 8.51665 6.77237C8.43665 6.85234 8.34211 6.8937 8.23302 6.8937H5.51998H5.51961Z" fill="url(#paint0_linear_124_16803)"/>
-<defs>
-<linearGradient id="paint0_linear_124_16803" x1="5.00001" y1="0" x2="5.00001" y2="10" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5A85FF"/>
-<stop offset="1" stop-color="#8DD8FF"/>
-</linearGradient>
-</defs>
-</svg>

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

@@ -178,7 +178,7 @@
       <div v-else :style="{ width: '175px' }"></div>
       <template v-if="!disabled">
         <a-tooltip :title="$t('copy')">
-          <a class="operation" @click="handleCopyRule(item)"><ops-icon type="icon-xianxing-copy"/></a>
+          <a class="operation" @click="handleCopyRule(item)"><ops-icon type="veops-copy"/></a>
         </a-tooltip>
         <a-tooltip :title="$t('delete')">
           <a class="operation" @click="handleDeleteRule(item)"><ops-icon type="icon-xianxing-delete"/></a>

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

@@ -17,25 +17,29 @@ export default {
     getPropertyIcon(attr) {
       switch (attr.value_type) {
         case '0':
-          return 'icon-xianxing-shishu'
+          return 'duose-shishu'
         case '1':
-          return 'icon-xianxing-fudianshu'
+          return 'duose-fudianshu'
         case '2':
           if (attr.is_password) {
-            return 'icon-xianxing-password'
+            return 'duose-password'
           }
           if (attr.is_link) {
-            return 'icon-xianxing-link'
+            return 'duose-link'
           }
-          return 'icon-xianxing-wenben'
+          return 'duose-wenben'
         case '3':
-          return 'icon-xianxing-datetime'
+          return 'duose-datetime'
         case '4':
-          return 'icon-xianxing-date'
+          return 'duose-date'
         case '5':
-          return 'icon-xianxing-time'
+          return 'duose-time'
         case '6':
-          return 'icon-xianxing-json'
+          return 'duose-json'
+        case '7':
+          return 'duose-password'
+        case '8':
+          return 'duose-link'
       }
     },
   },

cmdb-ui/src/components/CustomDrawer/CustomDrawer.vue

@@ -69,7 +69,6 @@ export default {
 </script>
 
 <style lang="less">
-@import '~@/style/static.less';
 
 .custom-drawer-close {
   position: absolute;

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

@@ -759,6 +759,52 @@ export const multicolorIconList = [
       value: 'caise-redis',
       label: 'redis'
     }]
+  }, {
+    value: 'cloud',
+    label: '云',
+    list: [{
+      value: 'AWS',
+      label: 'AWS'
+    }, {
+      value: 'Azure',
+      label: 'Azure'
+    }, {
+      value: 'Google_Cloud_Platform',
+      label: 'Google Cloud Platform'
+    }, {
+      value: 'Alibaba_Cloud',
+      label: '阿里云'
+    }, {
+      value: 'Huawei_Cloud',
+      label: '华为云'
+    }, {
+      value: 'Tencent_Cloud',
+      label: '腾讯云'
+    }, {
+      value: 'UCloud',
+      label: 'UCloud'
+    }, {
+      value: 'Ctyun',
+      label: '天翼云'
+    }, {
+      value: 'ECloud',
+      label: '移动云'
+    }, {
+      value: 'JDCloud',
+      label: '京东云'
+    }, {
+      value: 'Bytecloud',
+      label: '字节云'
+    }, {
+      value: 'OpenStack',
+      label: 'OpenStack'
+    }, {
+      value: 'ZStack',
+      label: 'ZStack'
+    }, {
+      value: 'Nutanix',
+      label: 'Nutanix'
+    }]
   }, {
     value: 'system',
     label: '操作系统',
@@ -976,17 +1022,14 @@ export const multicolorIconList = [
       value: 'caise-tomcat',
       label: 'Tomcat'
     }, {
-      value: 'caise-aliyun',
-      label: '阿里云'
+      value: 'caise-VPC',
+      label: 'VPC'
     }, {
-      value: 'caise-tengxunyun',
-      label: '腾讯云'
+      value: 'caise-CDN',
+      label: 'CDN'
     }, {
-      value: 'caise-huaweiyun',
-      label: '华为云'
-    }, {
-      value: 'caise-aws',
-      label: 'AWS'
+      value: 'caise-OOS',
+      label: '对象存储'
     }]
   }, {
     value: 'data',

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

@@ -230,7 +230,6 @@ export default {
 </script>
 
 <style lang="less">
-@import '~@/style/static.less';
 .employee-transfer {
   width: 100%;
   .vue-treeselect__multi-value-item-container {
@@ -263,7 +262,6 @@ export default {
 </style>
 
 <style lang="less" scoped>
-@import '~@/style/static.less';
 .employee-transfer {
   display: flex;
   justify-content: space-between;

cmdb-ui/src/components/Menu/SideMenu.vue

@@ -1,7 +1,7 @@
 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null]"
-    width="200px"
+    width="220px"
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null"
@@ -15,6 +15,7 @@
       @select="onSelect"
       style="padding: 16px 0px;"
     ></s-menu>
+    <!-- <OpsDocs :collapsed="collapsed" /> -->
   </a-layout-sider>
 </template>
 
@@ -22,10 +23,13 @@
 import Logo from '@/components/tools/Logo'
 import SMenu from './index'
 import { mixin, mixinDevice } from '@/utils/mixin'
+// import OpsDocs from '@/modules/docs/index.vue'
 
 export default {
   name: 'SideMenu',
-  components: { Logo, SMenu },
+  components: { Logo, SMenu,
+    // OpsDocs
+  },
   mixins: [mixin, mixinDevice],
   props: {
     mode: {

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: '100px', 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: '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>

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

@@ -146,7 +146,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-@import '~@/style/static.less';
 .regex-select {
   width: 100%;
   height: 300px;

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

@@ -126,7 +126,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-@import '~@/style/static.less';
 .role-transfer {
   display: flex;
   justify-content: space-between;

cmdb-ui/src/components/SidebarList/SidebarList.vue

@@ -60,7 +60,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-@import '~@/style/static.less';
 .sidebar-list-item {
   .ops_popover_item();
   margin: 2px 0;

cmdb-ui/src/components/SplitPane/SplitPane.vue

@@ -64,7 +64,7 @@ export default {
     },
     triggerColor: {
       type: String,
-      default: '#f0f2f5',
+      default: '#f7f8fa',
     },
   },
   data() {

cmdb-ui/src/components/TwoColumnLayout/TwoColumnLayout.vue

@@ -35,7 +35,7 @@ export default {
     },
     triggerColor: {
       type: String,
-      default: '#F0F5FF',
+      default: '#f7f8fa',
     },
   },
   data() {
@@ -52,22 +52,20 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 .two-column-layout {
   margin-bottom: -24px;
   width: 100%;
   .two-column-layout-sidebar {
     height: 100%;
-    padding: 15px 7px;
-    border-radius: 15px;
     overflow-y: auto;
-    background-color: #fff;
   }
   .two-column-layout-main {
     height: 100%;
     padding: 12px;
     background-color: #fff;
     overflow-y: auto;
-    border-radius: 15px;
+    border-radius: @border-radius-box;
   }
 }
 </style>

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

@@ -4,34 +4,22 @@
       @click="jumpTo"
       v-if="showTitle && !collapsed"
       style="width: 100%; height: 100%; cursor: pointer"
-      :src="file_name ? `/api/common-setting/v1/file/${file_name}` : require('@/assets/logo_VECMDB.png')"
+      :src="require('@/assets/logo_VECMDB.png')"
     />
     <img
       @click="jumpTo"
       v-else
       style="width: 32px; height: 32px; margin-left: 24px; cursor: pointer"
-      :src="small_file_name ? `/api/common-setting/v1/file/${small_file_name}` : require('@/assets/logo.png')"
+      :src="require('@/assets/logo.png')"
     />
-    <!-- <logo-svg/> -->
-    <!-- <img v-if="showTitle" style="width:92px;height: 32px" src="@/assets/OneOps.png" /> -->
-    <!-- <h1 v-if="showTitle">{{ title }}</h1> -->
   </div>
 </template>
 
 <script>
-// import LogoSvg from '@/assets/logo.svg?inline'
-import { mapState } from 'vuex'
 export default {
   name: 'Logo',
-  components: {
-    // LogoSvg,
-  },
-  computed: {
-    ...mapState({
-      file_name: (state) => state.logo.file_name,
-      small_file_name: (state) => state.logo.small_file_name,
-    }),
-  },
+  components: {},
+  computed: {},
   props: {
     title: {
       type: String,

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

@@ -1,15 +1,11 @@
 <template>
   <div class="top-menu" v-if="routes.length > 2">
-    <!-- <a-menu v-model="current" mode="horizontal">
-      <a-menu-item :key="route.name" v-for="route in routes.slice(0, routes.length - 1)">
-        <router-link :to="{ name: route.name }">{{ route.meta.title }}</router-link>
-      </a-menu-item>
-    </a-menu>-->
     <span
       :class="current === route.name ? 'top-menu-selected' : ''"
       v-for="route in defaultShowRoutes"
       :key="route.name"
       @click="() => handleClick(route)"
+      :title="$t(route.meta.title)"
     >
       {{ route.meta.title }}
     </span>
@@ -43,6 +39,7 @@
 <script>
 import store from '@/store'
 import { gridSvg, top_agent, top_acl } from '@/core/icons'
+import { getPreference } from '@/modules/cmdb/api/preference'
 export default {
   name: 'TopMenu',
   components: { gridSvg, top_agent, top_acl },
@@ -78,10 +75,20 @@ export default {
     this.current = this.$route.matched[0].name
   },
   methods: {
-    handleClick(route) {
+    async handleClick(route) {
       this.visible = false
       if (route.name !== this.current) {
-        this.$router.push(route.redirect)
+        if (route.name === 'cmdb') {
+          const preference = await getPreference()
+          const lastTypeId = window.localStorage.getItem('ops_ci_typeid') || undefined
+          if (lastTypeId && preference.some((item) => item.id === Number(lastTypeId))) {
+            this.$router.push(`/cmdb/instances/types/${lastTypeId}`)
+          } else {
+            this.$router.push('/cmdb/dashboard')
+          }
+        } else {
+          this.$router.push(route.redirect)
+        }
         // this.current = route.name
       }
     },
@@ -91,15 +98,6 @@ export default {
 
 <style lang="less">
 @import '../../style/static.less';
-// .top-menu {
-//   display: inline-block;
-// }
-// .ant-menu-horizontal {
-//   border-bottom: 0 !important;
-// }
-// .ant-menu-horizontal > .ant-menu-item {
-//   border-bottom: 0;
-// }
 
 .top-menu {
   display: inline-flex;
@@ -110,33 +108,29 @@ export default {
     line-height: @layout-header-icon-height;
     border-radius: 4px !important;
     display: inline-flex;
-    align-items: flex-end;
+    align-items: center;
   }
   > span {
     cursor: pointer;
     padding: 4px 10px;
     margin: 0 5px;
-    border-radius: 4px;
     color: @layout-header-font-color;
     height: @layout-header-height;
-    display: inline-flex;
-    align-items: center;
-    &:hover {
-      background: linear-gradient(0deg, rgba(0, 80, 201, 0.2) 0%, rgba(174, 207, 255, 0.06) 86.76%);
-      color: @layout-header-font-selected-color;
-      border-radius: 3px 3px 0px 0px;
-    }
+    line-height: @layout-header-line-height;
+    display: inline-block;
   }
+  > span:hover,
   .top-menu-selected {
-    background: linear-gradient(0deg, rgba(0, 80, 201, 0.2) 0%, rgba(174, 207, 255, 0.06) 86.76%);
+    font-weight: bold;
     color: @layout-header-font-selected-color;
-    border-radius: 3px 3px 0px 0px;
-    border-bottom: 3px solid @layout-header-font-selected-color;
-    &:hover {
-      background: linear-gradient(0deg, rgba(0, 80, 201, 0.2) 0%, rgba(174, 207, 255, 0.06) 86.76%);
-      color: @layout-header-font-selected-color;
-      border-radius: 3px 3px 0px 0px;
-    }
+  }
+  > span::before {
+    display: block;
+    content: attr(title);
+    font-weight: bold;
+    height: 0;
+    overflow: hidden;
+    visibility: hidden;
   }
 }
 

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

@@ -96,7 +96,6 @@ export default {
 </script>
 
 <style lang="less">
-@import '~@/style/static.less';
 .color {
   color: #custom_colors[color_1];
   background-color: #custom_colors[color_2];

cmdb-ui/src/core/icons.js

@@ -9,25 +9,11 @@
 import gridSvg from '@/assets/icons/grid.svg?inline'
 import top_agent from '@/assets/icons/top_agent.svg?inline'
 import top_acl from '@/assets/icons/top_acl.svg?inline'
-import ops_default_show from '@/assets/icons/ops-default_show.svg?inline'
-import ops_is_choice from '@/assets/icons/ops-is_choice.svg?inline'
-import ops_is_index from '@/assets/icons/ops-is_index.svg?inline'
-import ops_is_link from '@/assets/icons/ops-is_link.svg?inline'
-import ops_is_password from '@/assets/icons/ops-is_password.svg?inline'
-import ops_is_sortable from '@/assets/icons/ops-is_sortable.svg?inline'
-import ops_is_unique from '@/assets/icons/ops-is_unique.svg?inline'
 import ops_move_icon from '@/assets/icons/ops-move-icon.svg?inline'
 
 export {
     gridSvg,
     top_agent,
     top_acl,
-    ops_default_show,
-    ops_is_choice,
-    ops_is_index,
-    ops_is_link,
-    ops_is_password,
-    ops_is_sortable,
-    ops_is_unique,
     ops_move_icon
 }

cmdb-ui/src/directive/highlight/highlight.js

@@ -0,0 +1,14 @@
+import './highlight.less'
+
+const highlight = (el, binding) => {
+    if (binding.value.value) {
+        let testValue = `${binding.value.value}`
+        if (['(', ')', '$'].includes(testValue)) {
+            testValue = `\\${testValue}`
+        }
+        const regex = new RegExp(`(${testValue})`, 'gi')
+        el.innerHTML = el.innerText.replace(regex, `<span class='${binding.value.class ?? 'ops-text-highlight'}'>$1</span>`)
+    }
+}
+
+export default highlight

cmdb-ui/src/directive/highlight/highlight.less

@@ -0,0 +1,5 @@
+@import '~@/style/static.less';
+
+.ops-text-highlight {
+  background-color: @primary-color_3;
+}

cmdb-ui/src/directive/highlight/index.js

@@ -0,0 +1,12 @@
+import hightlight from './highlight'
+
+const install = function (Vue) {
+    Vue.directive('hightlight', hightlight)
+}
+
+if (window.Vue) {
+    window.hightlight = hightlight
+    Vue.use(install); // eslint-disable-line
+}
+hightlight.install = install
+export default hightlight

cmdb-ui/src/directive/waves/index.js

@@ -0,0 +1,13 @@
+import waves from './waves'
+
+const install = function (Vue) {
+    Vue.directive('waves', waves)
+}
+
+if (window.Vue) {
+    window.waves = waves
+    Vue.use(install); // eslint-disable-line
+}
+
+waves.install = install
+export default waves

cmdb-ui/src/directive/waves/waves.css

@@ -0,0 +1,26 @@
+.waves-ripple {
+  position: absolute;
+  border-radius: 100%;
+  background-color: rgba(0, 0, 0, 0.15);
+  background-clip: padding-box;
+  pointer-events: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  -webkit-transform: scale(0);
+  -ms-transform: scale(0);
+  transform: scale(0);
+  opacity: 1;
+}
+
+.waves-ripple.z-active {
+  opacity: 0;
+  -webkit-transform: scale(2);
+  -ms-transform: scale(2);
+  transform: scale(2);
+  -webkit-transition: opacity 1.2s ease-out, -webkit-transform 0.6s ease-out;
+  transition: opacity 1.2s ease-out, -webkit-transform 0.6s ease-out;
+  transition: opacity 1.2s ease-out, transform 0.6s ease-out;
+  transition: opacity 1.2s ease-out, transform 0.6s ease-out, -webkit-transform 0.6s ease-out;
+}

cmdb-ui/src/directive/waves/waves.js

@@ -0,0 +1,72 @@
+import './waves.css'
+
+const context = '@@wavesContext'
+
+function handleClick(el, binding) {
+    function handle(e) {
+        const customOpts = Object.assign({}, binding.value)
+        const opts = Object.assign({
+            ele: el, // 波纹作用元素
+            type: 'hit', // hit 点击位置扩散 center中心点扩展
+            color: 'rgba(0, 0, 0, 0.15)' // 波纹颜色
+        },
+            customOpts
+        )
+        const target = opts.ele
+        if (target) {
+            target.style.position = 'relative'
+            target.style.overflow = 'hidden'
+            const rect = target.getBoundingClientRect()
+            let ripple = target.querySelector('.waves-ripple')
+            if (!ripple) {
+                ripple = document.createElement('span')
+                ripple.className = 'waves-ripple'
+                ripple.style.height = ripple.style.width = Math.max(rect.width, rect.height) + 'px'
+                target.appendChild(ripple)
+            } else {
+                ripple.className = 'waves-ripple'
+            }
+            switch (opts.type) {
+                case 'center':
+                    ripple.style.top = rect.height / 2 - ripple.offsetHeight / 2 + 'px'
+                    ripple.style.left = rect.width / 2 - ripple.offsetWidth / 2 + 'px'
+                    break
+                default:
+                    ripple.style.top =
+                        (e.pageY - rect.top - ripple.offsetHeight / 2 - document.documentElement.scrollTop ||
+                            document.body.scrollTop) + 'px'
+                    ripple.style.left =
+                        (e.pageX - rect.left - ripple.offsetWidth / 2 - document.documentElement.scrollLeft ||
+                            document.body.scrollLeft) + 'px'
+            }
+            ripple.style.backgroundColor = opts.color
+            ripple.className = 'waves-ripple z-active'
+            return false
+        }
+    }
+
+    if (!el[context]) {
+        el[context] = {
+            removeHandle: handle
+        }
+    } else {
+        el[context].removeHandle = handle
+    }
+
+    return handle
+}
+
+export default {
+    bind(el, binding) {
+        el.addEventListener('click', handleClick(el, binding), false)
+    },
+    update(el, binding) {
+        el.removeEventListener('click', el[context].removeHandle, false)
+        el.addEventListener('click', handleClick(el, binding), false)
+    },
+    unbind(el) {
+        el.removeEventListener('click', el[context].removeHandle, false)
+        el[context] = null
+        delete el[context]
+    }
+}

cmdb-ui/src/guard.js

@@ -31,7 +31,6 @@ router.beforeEach(async (to, from, next) => {
       store.dispatch("loadAllUsers")
       store.dispatch("loadAllEmployees")
       store.dispatch("loadAllDepartments")
-      store.dispatch("getCompanyInfo")
       store.dispatch('GenerateRoutes', { roles }).then(() => {
         router.addRoutes(store.getters.appRoutes)
         const redirect = decodeURIComponent(from.query.redirect || to.path)

cmdb-ui/src/layouts/BasicLayout.vue

@@ -87,21 +87,21 @@ export default {
   computed: {
     ...mapState({
       // 动态主路由
-      mainMenu: state => state.routes.appRoutes,
+      mainMenu: (state) => state.routes.appRoutes,
     }),
     contentPaddingLeft() {
       if (!this.fixSidebar || this.isMobile()) {
         return '0'
       }
       if (this.sidebarOpened) {
-        return '200px'
+        return '220px'
       }
       return '80px'
     },
     sideBarMenu() {
-      const sideMenus = this.mainMenu.filter(item => this.$route.path.startsWith(item.path))
+      const sideMenus = this.mainMenu.filter((item) => this.$route.path.startsWith(item.path))
       if (sideMenus.length > 1) {
-        return sideMenus.find(item => item.path !== '/').children
+        return sideMenus.find((item) => item.path !== '/').children
       } else {
         return sideMenus[0].children
       }
@@ -110,6 +110,9 @@ export default {
   provide() {
     return {
       reloadBoard: this.reload,
+      collapsed: () => {
+        return this.collapsed
+      },
     }
   },
   watch: {
@@ -146,15 +149,6 @@ export default {
         this.alive = true
       })
     },
-    paddingCalc() {
-      let left = ''
-      if (this.sidebarOpened) {
-        left = this.isDesktop() ? '200px' : '80px'
-      } else {
-        left = (this.isMobile() && '0') || (this.fixSidebar && '80px') || '0'
-      }
-      return left
-    },
     menuSelect() {
       if (!this.isDesktop()) {
         this.collapsed = false

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

@@ -233,8 +233,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 .acl-history {
-  border-radius: 15px;
+  border-radius: @border-radius-box;
   height: calc(100vh - 64px);
   margin-bottom: -24px;
   padding: 24px;

cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue

@@ -290,7 +290,6 @@ export default {
                 const str = ` 【 ${key} : -> ${newVal} 】 `
                 item.description += str
               } else {
-                const str = ` 【 ${key} : ${oldVal} -> ${newVal} 】 `
                 item.description += ` 【 ${key} : ${oldVal} -> ${newVal} 】 `
               }
             }

cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue

@@ -241,7 +241,6 @@ export default {
                 const str = ` 【 ${key} : -> ${newVal} 】 `
                 item.changeDescription += str
               } else {
-                const str = ` 【 ${key} : ${oldVal} -> ${newVal} 】 `
                 item.changeDescription += ` 【 ${key} : ${oldVal} -> ${newVal} 】 `
               }
             }

cmdb-ui/src/modules/acl/views/operation_history/index.vue

@@ -32,8 +32,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 .acl-operation-history {
-  border-radius: 15px;
+  border-radius: @border-radius-box;
   height: calc(100vh - 64px);
   margin-bottom: -24px;
   padding: 24px;

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

@@ -189,8 +189,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 .acl-resource-types {
-  border-radius: 15px;
+  border-radius: @border-radius-box;
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;

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

@@ -352,8 +352,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 .acl-resources {
-  border-radius: 15px;
+  border-radius: @border-radius-box;
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;

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

@@ -285,8 +285,9 @@ export default {
 </script>
 
 <style lang="less">
+
 .acl-roles {
-  border-radius: 15px;
+  border-radius: @border-radius-box;
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;

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

@@ -88,10 +88,11 @@ export default {
 </script>
 
 <style lang="less">
+
 .acl-secret-key {
   background-color: #fff;
   padding: 24px;
-  border-radius: 15px;
+  border-radius: @border-radius-box;
   height: calc(100% + 24px);
   .ant-input[disabled] {
     color: rgba(0, 0, 0, 0.5);

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

@@ -320,8 +320,9 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+
 .acl-trigger {
-  border-radius: 15px;
+  border-radius: @border-radius-box;
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;

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

@@ -188,8 +188,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 .acl-users {
-  border-radius: 15px;
+  border-radius: @border-radius-box;
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;

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

@@ -73,3 +73,11 @@ export function deleteCIRelationView(firstCiId, secondCiId, data) {
     data
   })
 }
+
+export function searchCIRelationFull(params) {
+  return axios({
+    url: `/v0.1/ci_relations/search/full`,
+    method: 'GET',
+    params,
+  })
+}

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

@@ -30,11 +30,11 @@ export function getRelationTypes(CITypeID, parameter) {
   })
 }
 
-export function createRelation(parentId, childrenId, relationTypeId, constraint) {
+export function createRelation(parentId, childrenId, data) {
   return axios({
     url: `/v0.1/ci_type_relations/${parentId}/${childrenId}`,
     method: 'post',
-    data: { relation_type_id: relationTypeId, constraint }
+    data
   })
 }
 
@@ -42,7 +42,6 @@ export function deleteRelation(parentId, childrenId) {
   return axios({
     url: `/v0.1/ci_type_relations/${parentId}/${childrenId}`,
     method: 'delete'
-
   })
 }
 

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

@@ -71,6 +71,14 @@ export function subscribeRelationView(payload) {
   })
 }
 
+export function putRelationView(id, data) {
+  return axios({
+    url: `/v0.1/preference/relation/view/${id}`,
+    method: 'put',
+    data
+  })
+}
+
 // 用户保存条件过滤选项
 export function getPreferenceSearch(payload) {
   // 参数有prv_id: 关系视图的id， ptv_id: 层级视图的id, type_id: 模型id

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

@@ -221,7 +221,6 @@ export default {
 </script>
 
 <style lang="less">
-@import '~@/style/static.less';
 
 .cmdb-transfer {
   .ant-transfer-list {

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="cmdb-grant" :style="{ maxHeight: `${windowHeight - 104}px` }">
+  <div class="cmdb-grant" :style="{ maxHeight: `${windowHeight - 130}px` }">
     <template v-if="cmdbGrantType.includes('ci_type')">
       <div class="cmdb-grant-title">{{ $t('cmdb.components.ciTypeGrant') }}</div>
       <CiTypeGrant
@@ -311,32 +311,31 @@ export default {
 </script>
 
 <style lang="less" scoped>
-@import '~@/style/static.less';
 .cmdb-grant {
   position: relative;
-  padding: 24px 24px 0 24px;
+  padding: 0 20px;
   overflow: auto;
   .cmdb-grant-title {
-    border-left: 4px solid #custom_colors[color_1];
+    border-left: 4px solid @primary-color;
     padding-left: 10px;
   }
 }
 </style>
 
 <style lang="less">
-@import '~@/style/static.less';
+
 .cmdb-grant {
   .grant-button {
     padding: 6px 8px;
-    color: #custom_colors[color_1];
-    background-color: #custom_colors[color_2];
+    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 #custom_colors[color_2];
+      box-shadow: 2px 3px 4px @primary-color_5;
     }
   }
 }

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

@@ -1,5 +1,11 @@
 <template>
-  <a-modal width="800px" :visible="visible" @ok="handleOk" @cancel="handleCancel" :bodyStyle="{ padding: 0 }">
+  <a-modal
+    width="800px"
+    :visible="visible"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    :bodyStyle="{ padding: 0, paddingTop: '20px' }"
+  >
     <GrantComp
       :resourceType="resourceType"
       :app_id="app_id"

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

@@ -59,7 +59,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-@import '~@/style/static.less';
 .read-checkbox {
   .read-checkbox-half-checked {
     width: 16px;

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

@@ -112,7 +112,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-@import '~@/style/static.less';
 .notice-content {
   width: 100%;
   & &-main {
@@ -186,7 +185,6 @@ export default {
 </style>
 
 <style lang="less">
-@import '~@/style/static.less';
 
 .notice-content {
   .w-e-bar {

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

@@ -11,7 +11,7 @@
         @blur="handleInputConfirm"
         @keyup.enter="handleInputConfirm"
       />
-      <a-button v-else type="primary" size="small" ghost @click="showInput">{{ $t('cmdb.components.saveQuery') }}</a-button>
+      <a v-else @click="showInput"> {{ $t('cmdb.components.saveQuery') }}</a>
     </span>
     <template v-for="(item, index) in preferenceSearchList.slice(0, 3)">
       <span
@@ -178,10 +178,10 @@ export default {
 <style lang="less" scoped>
 .preference-search-tag {
   cursor: pointer;
-  border-radius: 5px;
-  border: none;
+  border-radius: 2px;
+  border: 1px solid #d9d9d9;
   display: inline-block;
-  padding: 0 7px;
+  padding: 2px 7px;
   margin-right: 8px;
   > span {
     margin-right: 4px;

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

@@ -5,8 +5,15 @@
         <a-space>
           <treeselect
             v-if="type === 'resourceSearch'"
-            class="custom-treeselect"
-            :style="{ width: '250px', marginRight: '10px', '--custom-height': '32px' }"
+            class="custom-treeselect custom-treeselect-bgcAndBorder"
+            :style="{
+              width: '200px',
+              marginRight: '10px',
+              '--custom-height': '32px',
+              '--custom-bg-color': '#fff',
+              '--custom-border': '1px solid #d9d9d9',
+              '--custom-multiple-lineHeight': '16px',
+            }"
             v-model="currenCiType"
             :multiple="true"
             :clearable="true"
@@ -41,15 +48,14 @@
           </treeselect>
           <a-input
             v-model="fuzzySearch"
-            :style="{ display: 'inline-block', width: '244px' }"
+            :style="{ display: 'inline-block', width: '200px' }"
             :placeholder="$t('cmdb.components.pleaseSearch')"
             @pressEnter="emitRefresh"
-            class="ops-input ops-input-radius"
           >
             <a-icon
               type="search"
               slot="suffix"
-              :style="{ color: fuzzySearch ? '#2f54eb' : '', cursor: 'pointer' }"
+              :style="{ color: fuzzySearch ? '#2f54eb' : '#d9d9d9', cursor: 'pointer' }"
               @click="emitRefresh"
             />
             <a-tooltip slot="prefix" placement="bottom" :overlayStyle="{ maxWidth: '550px', whiteSpace: 'pre-line' }">
@@ -59,6 +65,9 @@
               <a><a-icon type="question-circle"/></a>
             </a-tooltip>
           </a-input>
+          <a-tooltip :title="$t('reset')">
+            <a-button @click="reset">{{ $t('reset') }}</a-button>
+          </a-tooltip>
           <FilterComp
             ref="filterComp"
             :canSearchPreferenceAttrList="canSearchPreferenceAttrList"
@@ -69,7 +78,7 @@
             <div slot="popover_item" class="search-form-bar-filter">
               <a-icon class="search-form-bar-filter-icon" type="filter" />
               {{ $t('cmdb.components.conditionFilter') }}
-              <a-icon class="search-form-bar-filter-icon" type="down" />
+              <a-icon class="search-form-bar-filter-icon" type="down" :style="{ color: '#d9d9d9' }" />
             </div>
           </FilterComp>
           <a-input
@@ -86,19 +95,18 @@
                 isFocusExpression = false
               }
             "
-            class="ci-searchform-expression"
+            :class="{ 'ci-searchform-expression': true, 'ci-searchform-expression-has-value': expression }"
             :style="{ width }"
             :placeholder="placeholder"
             @keyup.enter="emitRefresh"
           >
-            <a-icon slot="suffix" type="copy" @click="handleCopyExpression" />
+            <a-icon slot="suffix" type="check-circle" @click="handleCopyExpression" />
           </a-input>
           <slot></slot>
         </a-space>
       </div>
       <a-space>
         <slot name="extraContent"></slot>
-        <a-button @click="reset" size="small">{{ $t('reset') }}</a-button>
         <a-tooltip :title="$t('cmdb.components.attributeDesc')" v-if="type === 'relationView'">
           <a
             @click="
@@ -237,7 +245,6 @@ export default {
       }
     },
     inputCiTypeGroup(value) {
-      console.log(value)
       if (!value || !value.length) {
         this.$emit('updateAllAttributesList', value)
       }
@@ -266,17 +273,20 @@ export default {
     border-right: none;
     &:hover,
     &:focus {
-      border-bottom: 2px solid #2f54eb;
+      border-bottom: 2px solid @primary-color;
     }
     &:focus {
       box-shadow: 0 2px 2px -2px #1f78d133;
     }
   }
   .ant-input-suffix {
-    color: #2f54eb;
+    color: #d9d9d9;
     cursor: pointer;
   }
 }
+.ci-searchform-expression-has-value .ant-input-suffix {
+  color: @func-color_3;
+}
 .cmdb-search-form {
   .ant-form-item-label {
     overflow: hidden;
@@ -287,17 +297,16 @@ export default {
 </style>
 
 <style lang="less" scoped>
-@import '~@/style/static.less';
-
 .search-form-bar {
-  margin-bottom: 10px;
+  margin-bottom: 20px;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  height: 32px;
   .search-form-bar-filter {
-    .ops_display_wrapper();
+    .ops_display_wrapper(transparent);
     .search-form-bar-filter-icon {
-      color: #custom_colors[color_1];
+      color: @primary-color;
       font-size: 12px;
     }
   }

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

@@ -244,7 +244,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-@import '~@/style/static.less';
 
 .cmdb-subscribe-drawer {
   .cmdb-subscribe-drawer-container {
@@ -315,7 +314,6 @@ export default {
 </style>
 
 <style lang="less">
-@import '~@/style/static.less';
 .cmdb-subscribe-drawer {
   .ant-tabs-bar {
     background-color: #custom_colors[color_2];

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

@@ -1,6 +1,7 @@
 const cmdb_en = {
     relation: 'Relation',
     attribute: 'Attributes',
+    configTable: 'Config Table',
     menu: {
         views: 'Views',
         config: 'Configuration',
@@ -182,7 +183,21 @@ const cmdb_en = {
         inheritType: 'Inherit Type',
         inheritTypePlaceholder: 'Please select inherit types',
         inheritFrom: 'inherit from {name}',
-        groupInheritFrom: 'Please go to the {name} for modification'
+        groupInheritFrom: 'Please go to the {name} for modification',
+        downloadType: 'Download CIType',
+        deleteCIType: 'Delete CIType',
+        otherGroupTips: 'Non sortable within the other group',
+        filterTips: 'click to show {name}',
+        attributeAssociation: 'Attribute Association',
+        attributeAssociationTip1: 'Automatically establish relationships through the attributes except password, json and multiple of two models',
+        attributeAssociationTip2: 'Double click to edit',
+        attributeAssociationTip3: 'Two Attributes must be selected',
+        attributeAssociationTip4: 'Please select a attribute from Source CIType',
+        attributeAssociationTip5: 'Please select a attribute from Target CIType',
+        show: 'show attribute',
+        setAsShow: 'Set as show attribute',
+        cancelSetAsShow: 'Cancel show attribute',
+        showTips: 'The names of nodes in the service tree and topology view'
     },
     components: {
         unselectAttributes: 'Unselected',
@@ -245,8 +260,10 @@ const cmdb_en = {
         unselectCIType: 'No CIType selected yet',
         pleaseUploadFile: 'Please upload files',
         batchUploadCanceled: 'Batch upload canceled',
-        selectCITypeTips: 'Please select CIType',
+        selectCIType: 'Select CIType',
+        selectCITypeTips: 'Please select a CIType and then download',
         downloadTemplate: 'Download Template',
+        clickDownload: 'Click to Download',
         drawTips: 'Click or drag files here to upload!',
         supportFileTypes: 'Supported file types: xls, xlsx',
         uploadResult: 'Upload results',
@@ -257,6 +274,16 @@ const cmdb_en = {
         errorTips: 'Error message',
         requestFailedTips: 'An error occurred with the request, please try again later',
         requestSuccessTips: 'Upload completed',
+        uploadFile: 'Upload File',
+        drawTips1: 'Please <span class="cmdb-batch-upload-tips">select a CIType</span>, and then <span class="cmdb-batch-upload-tips">download</span> ,',
+        drawTips2: '<span class="cmdb-batch-upload-tips">click or drag file</span> to upload',
+        dataPreview: 'Preview data and upload',
+        tips1: 'Kind Reminder :',
+        tips2: '1. Click to download the template, and users can customize the header of the template file, including model properties and model associations',
+        // eslint-disable-next-line no-template-curly-in-string
+        tips3: '2. The red color in the template file represents the model relationship, such as the $Product. Product Name (${Model Name}. {Attribute Name}) column, which establishes the relationship with the product.',
+        tips4: '3. In the download template Excel file, the predefined values of attributes will be set as dropdown options. Please note that due to the limitations of Excel itself, a single dropdown box is limited to a maximum of 255 characters. If it exceeds 255 characters, we will not set the dropdown options for this attribute',
+        tips5: '4. When using Excel templates, please ensure that a single file does not exceed 5000 lines.',
     },
     preference: {
         mySub: 'My Subscription',
@@ -274,6 +301,7 @@ const cmdb_en = {
         monthsAgo: 'month ago',
         yearsAgo: 'years ago',
         just: 'just now',
+        searchPlaceholder: 'Please search CIType',
     },
     custom_dashboard: {
         charts: 'Chart',
@@ -313,14 +341,23 @@ const cmdb_en = {
         noCustomDashboard: 'The administrator has not customized the dashboard yet',
     },
     preference_relation: {
-        newServiceTree: 'Add ServiceTree',
+        newServiceTree: 'Add Service Tree',
+        editServiceTree: 'Edit Service Tree',
         serviceTreeName: 'Name',
+        serviceTreeNamePlaceholder: 'Please enter the service tree name',
         public: 'Public',
         saveLayout: 'Save Layout',
         childNodesNotFound: 'There are no child nodes and no business relationship can be formed. Please select again!',
         tips1: 'Cannot form a view with the currently selected node, please select again!',
         tips2: 'Please enter the new serviceTree name!',
         tips3: 'Please select at least two nodes!',
+        tips4: 'Leaf node must be selected',
+        tips5: 'Select the tree directory node and display the service tree sub nodes as a Table',
+        showLeafNode: 'Show Leaf Node',
+        showTreeNode: 'Show Tree Node',
+        sort: 'Sort',
+        sort1: 'Leaf node information comes first',
+        sort2: 'Tree node information comes first'
     },
     history: {
         ciChange: 'CI',
@@ -392,51 +429,51 @@ const cmdb_en = {
         updateFields: 'Update Field',
         pluginScript: `# -*- coding:utf-8 -*-
 
-        import json
+import json
         
         
-        class AutoDiscovery(object):
+class AutoDiscovery(object):
         
-            @property
-            def unique_key(self):
-                """
+    @property
+    def unique_key(self):
+        """
         
-                :return: Returns the name of a unique attribute
-                """
-                return
+        :return: Returns the name of a unique attribute
+        """
+        return
         
-            @staticmethod
-            def attributes():
-                """
-                Define attribute fields
-                :return: Returns a list of attribute fields. The list items are (name, type, description). The name must be in English.
-                type: String Integer Float Date DateTime Time JSON
-                For example:
-                return [
-                    ("ci_type", "String", "CIType name"),
-                    ("private_ip", "String", "Internal IP, multiple values separated by commas")
-                ]
-                """
-                return []
+    @staticmethod
+    def attributes():
+        """
+        Define attribute fields
+        :return: Returns a list of attribute fields. The list items are (name, type, description). The name must be in English.
+        type: String Integer Float Date DateTime Time JSON
+        For example:
+        return [
+            ("ci_type", "String", "CIType name"),
+            ("private_ip", "String", "Internal IP, multiple values separated by commas")
+        ]
+        """
+        return []
         
-            @staticmethod
-            def run():
-                """
-                Execution entry, returns collected attribute values
-                :return: 
-                Returns a list, the list item is a dictionary, the dictionary key is the attribute name, and the value is the attribute value
-                For example:
-                return [dict(ci_type="server", private_ip="192.168.1.1")]
-                """
-                return []
+    @staticmethod
+    def run():
+        """
+        Execution entry, returns collected attribute values
+        :return: 
+        Returns a list, the list item is a dictionary, the dictionary key is the attribute name, and the value is the attribute value
+        For example:
+        return [dict(ci_type="server", private_ip="192.168.1.1")]
+        """
+        return []
         
         
-        if __name__ == "__main__":
-            result = AutoDiscovery().run()
-            if isinstance(result, list):
-                print("AutoDiscovery::Result::{}".format(json.dumps(result)))
-            else:
-                print("ERROR: The collection return must be a list")
+if __name__ == "__main__":
+    result = AutoDiscovery().run()
+    if isinstance(result, list):
+        print("AutoDiscovery::Result::{}".format(json.dumps(result)))
+    else:
+        print("ERROR: The collection return must be a list")
         `,
         server: 'Server',
         vserver: 'VServer',
@@ -478,13 +515,16 @@ const cmdb_en = {
         noPermission: 'No Permission'
     },
     serviceTree: {
-        deleteNode: 'Delete Node',
+        remove: 'Remove',
+        deleteNode: 'Delete {name}',
         tips1: 'For example: q=os_version:centos&sort=os_version',
         tips2: 'Expression search',
         alert1: 'The administrator has not configured the ServiceTree(relation view), or you do not have permission to access it!',
         copyFailed: 'Copy failed',
         deleteRelationConfirm: 'Confirm to remove selected {name} from current relationship?',
         batch: 'Batch',
+        editNode: 'Edit Node',
+        editNodeName: 'Edit Node Name',
         grantTitle: 'Grant(read)',
         userPlaceholder: 'Please select users',
         rolePlaceholder: 'Please select roles',
@@ -493,7 +533,8 @@ const cmdb_en = {
         peopleHasRead: 'Personnel authorized to read:',
         authorizationPolicy: 'CI Authorization Policy:',
         idAuthorizationPolicy: 'Authorized by node:',
-        view: 'View permissions'
+        view: 'View permissions',
+        searchTips: 'Search in service tree'
     },
     tree: {
         tips1: 'Please go to Preference page first to complete your subscription!',

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

@@ -1,6 +1,7 @@
 const cmdb_zh = {
     relation: '关系',
     attribute: '属性',
+    configTable: '配置表格',
     menu: {
         views: '视图',
         config: '配置',
@@ -35,7 +36,7 @@ const cmdb_zh = {
         attributeLibray: '属性库',
         addCITypeInGroup: '在该组中新增CI模型',
         addCIType: '新增CI模型',
-        editGroupName: '编辑组名称',
+        editGroupName: '重命名分组',
         deleteGroup: '删除该组',
         CITypeName: '模型名(英文)',
         English: '英文',
@@ -128,7 +129,7 @@ const cmdb_zh = {
         addRelation: '新增关系',
         sourceCIType: '源模型',
         sourceCITypeTips: '请选择源模型',
-        dstCIType: '目标模型名',
+        dstCIType: '目标模型',
         dstCITypeTips: '请选择目标模型',
         relationType: '关联类型',
         relationTypeTips: '请选择关联类型',
@@ -182,7 +183,21 @@ const cmdb_zh = {
         inheritType: '继承模型',
         inheritTypePlaceholder: '请选择继承模型（多选）',
         inheritFrom: '属性继承自{name}',
-        groupInheritFrom: '请至{name}进行修改'
+        groupInheritFrom: '请至{name}进行修改',
+        downloadType: '下载模型',
+        deleteCIType: '删除模型',
+        otherGroupTips: '其他分组属性不可排序',
+        filterTips: '点击可仅查看{name}属性',
+        attributeAssociation: '属性关联',
+        attributeAssociationTip1: '通过2个模型的属性值(除密码、json、多值)来自动建立关系',
+        attributeAssociationTip2: '双击可编辑',
+        attributeAssociationTip3: '属性关联必须选择两个属性',
+        attributeAssociationTip4: '请选择原模型属性',
+        attributeAssociationTip5: '请选择目标模型属性',
+        show: '展示属性',
+        setAsShow: '设置为展示属性',
+        cancelSetAsShow: '取消设置为展示属性',
+        showTips: '服务树和拓扑视图里节点的名称'
     },
     components: {
         unselectAttributes: '未选属性',
@@ -220,7 +235,7 @@ const cmdb_zh = {
         beforeChange: '变更前',
         afterChange: '变更后',
         noticeContentTips: '请输入通知内容',
-        saveQuery: '保存筛选条件',
+        saveQuery: '保存条件',
         pleaseSearch: '请查找',
         conditionFilter: '条件过滤',
         attributeDesc: '属性说明',
@@ -245,9 +260,10 @@ const cmdb_zh = {
         unselectCIType: '尚未选择模板类型',
         pleaseUploadFile: '请上传文件',
         batchUploadCanceled: '批量上传已取消',
-        selectCITypeTips: '请选择模板类型',
+        selectCIType: '选择模型',
+        selectCITypeTips: '请选择模型后下载模板',
         downloadTemplate: '下载模板',
-        drawTips: '点击或拖拽文件至此上传！',
+        clickDownload: '点击下载',
         supportFileTypes: '支持文件类型：xls，xlsx',
         uploadResult: '上传结果',
         total: '共',
@@ -257,6 +273,16 @@ const cmdb_zh = {
         errorTips: '错误信息',
         requestFailedTips: '请求出现错误，请稍后再试',
         requestSuccessTips: '批量上传已完成',
+        uploadFile: '文件上传',
+        drawTips1: '请先<span class="cmdb-batch-upload-tips">选择模型</span>，<span class="cmdb-batch-upload-tips">下载模板</span>后',
+        drawTips2: '<span class="cmdb-batch-upload-tips">点击或拖拽文件</span>至此上传',
+        dataPreview: '数据预览并导入',
+        tips1: '温馨提示：',
+        tips2: '1. 点击下载模板，用户可以自定义模板文件的表头，包括模型属性、模型关联',
+        // eslint-disable-next-line no-template-curly-in-string
+        tips3: '2. 模板文件中红色为模型关系，如$产品.产品名(${模型名}.{属性名})这一列就可建立和产品之间的关系',
+        tips4: '3. 下载模板excel文件中会将属性的预定义值置为下拉选项，请注意，受excel本身的限制，单个下拉框限制了最多255个字符，如果超过255个字符，我们不会设置该属性的下拉选项',
+        tips5: '4. 在使用excel模板时，请确保单个文件不超过5000行',
     },
     preference: {
         mySub: '我的订阅',
@@ -274,6 +300,7 @@ const cmdb_zh = {
         monthsAgo: '月前',
         yearsAgo: '年前',
         just: '刚刚',
+        searchPlaceholder: '请搜索模型',
     },
     custom_dashboard: {
         charts: '图表',
@@ -314,13 +341,23 @@ const cmdb_zh = {
     },
     preference_relation: {
         newServiceTree: '新增服务树',
+        editServiceTree: '编辑服务树',
         serviceTreeName: '服务树名',
+        serviceTreeNamePlaceholder: '请输入服务树名',
         public: '公开',
         saveLayout: '保存布局',
         childNodesNotFound: '不存在子节点，不能形成业务关系，请重新选择！',
         tips1: '不能与当前选中节点形成视图，请重新选择！',
         tips2: '请输入新增服务树名！',
         tips3: '请选择至少两个节点！',
+        tips4: '树子节点为必选',
+        tips5: '选中树目录节点，服务树子节点展示成Table',
+        showLeafNode: '树的子节点展示成Table',
+        showTreeNode: '展示树节点信息',
+        sort: '顺序',
+        sort1: '树子节点信息在前',
+        sort2: '树节点信息在前'
+
     },
     history: {
         ciChange: 'CI变更',
@@ -392,50 +429,51 @@ const cmdb_zh = {
         updateFields: '更新字段',
         pluginScript: `# -*- coding:utf-8 -*-
 
-        import json
+import json
         
         
-        class AutoDiscovery(object):
+class AutoDiscovery(object):
         
-            @property
-            def unique_key(self):
-                """
+    @property
+    def unique_key(self):
+        """
         
-                :return: 返回唯一属性的名字
-                """
-                return
+        :return: Returns the name of a unique attribute
+        """
+        return
         
-            @staticmethod
-            def attributes():
-                """
-                定义属性字段
-                :return: 返回属性字段列表, 列表项是(名称, 类型, 描述), 名称必须是英文
-                类型: String Integer Float Date DateTime Time JSON
-                例如:
-                return [
-                    ("ci_type", "String", "模型名称"),
-                    ("private_ip", "String", "内网IP, 多值逗号分隔")
-                ]
-                """
-                return []
+    @staticmethod
+    def attributes():
+        """
+        Define attribute fields
+        :return: Returns a list of attribute fields. The list items are (name, type, description). The name must be in English.
+        type: String Integer Float Date DateTime Time JSON
+        For example:
+        return [
+            ("ci_type", "String", "CIType name"),
+            ("private_ip", "String", "Internal IP, multiple values separated by commas")
+        ]
+        """
+        return []
         
-            @staticmethod
-            def run():
-                """
-                执行入口, 返回采集的属性值
-                :return: 返回一个列表, 列表项是字典, 字典key是属性名称, value是属性值
-                例如:
-                return [dict(ci_type="server", private_ip="192.168.1.1")]
-                """
-                return []
+    @staticmethod
+    def run():
+        """
+        Execution entry, returns collected attribute values
+        :return: 
+        Returns a list, the list item is a dictionary, the dictionary key is the attribute name, and the value is the attribute value
+        For example:
+        return [dict(ci_type="server", private_ip="192.168.1.1")]
+        """
+        return []
         
         
-        if __name__ == "__main__":
-            result = AutoDiscovery().run()
-            if isinstance(result, list):
-                print("AutoDiscovery::Result::{}".format(json.dumps(result)))
-            else:
-                print("ERROR: 采集返回必须是列表")
+if __name__ == "__main__":
+    result = AutoDiscovery().run()
+    if isinstance(result, list):
+        print("AutoDiscovery::Result::{}".format(json.dumps(result)))
+    else:
+        print("ERROR: The collection return must be a list")
         `,
         server: '物理机',
         vserver: '虚拟机',
@@ -443,7 +481,7 @@ const cmdb_zh = {
         disk: '硬盘',
     },
     ci: {
-        attributeDesc: '属性说明',
+        attributeDesc: '查看属性配置',
         selectRows: '选取：{rows} 项',
         addRelation: '添加关系',
         all: '全部',
@@ -477,13 +515,16 @@ const cmdb_zh = {
         noPermission: '暂无权限'
     },
     serviceTree: {
-        deleteNode: '删除节点',
+        remove: '移除',
+        deleteNode: '移除 {name}',
         tips1: '例：q=os_version:centos&sort=os_version',
         tips2: '表达式搜索',
         alert1: '管理员 还未配置业务关系, 或者你无权限访问!',
         copyFailed: '复制失败',
         deleteRelationConfirm: '确认将选中的 {name} 从当前关系中删除？',
         batch: '批量操作',
+        editNode: '编辑节点',
+        editNodeName: '修改节点名',
         grantTitle: '授权（查看权限）',
         userPlaceholder: '请选择用户',
         rolePlaceholder: '请选择角色',
@@ -492,7 +533,8 @@ const cmdb_zh = {
         peopleHasRead: '当前有查看权限的人员：',
         authorizationPolicy: '实例授权策略：',
         idAuthorizationPolicy: '按节点授权的：',
-        view: '查看权限'
+        view: '查看权限',
+        searchTips: '在服务树中筛选'
     },
     tree: {
         tips1: '请先到 我的订阅 页面完成订阅!',