feat(api): Replace imp with importlib

feat(ui): update relative views menu display

.gitignore

@@ -78,4 +78,3 @@ cmdb-ui/npm-debug.log*
 cmdb-ui/yarn-debug.log*
 cmdb-ui/yarn-error.log*
 cmdb-ui/package-lock.json
-start.sh

CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of the level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

README.md

@@ -1,116 +1,138 @@
 
 <p align="center">
-  <a href="https://veops.cn"><img src="docs/images/logo.png" alt="维易CMDB" width="300"/></a>
+  <a href="https://veops.cn">
+    <img src="https://github.com/user-attachments/assets/c5cfb272-899b-418d-9e69-8e1dd07db0f6" alt="维易CMDB"/>
+  </a>
 </p>
-<h3 align="center">简单、轻量、通用的运维配置管理数据库</h3>
+
+<h4 align="center">简单、轻量、通用的运维配置管理数据库</h4>
+
 <p align="center">
   <a href="https://github.com/veops/cmdb/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-AGPLv3-brightgreen" alt="License: GPLv3"></a>
-  <a href="https:https://github.com/sendya/ant-design-pro-vue"><img src="https://img.shields.io/badge/UI-Ant%20Design%20Pro%20Vue-brightgreen" alt="UI"></a>
-  <a href="https://github.com/pallets/flask"><img src="https://img.shields.io/badge/API-Flask-brightgreen" alt="API"></a>
+  <a href="https://github.com/veops/cmdb/releases"><img alt="the latest release version" src="https://img.shields.io/github/v/release/veops/cmdb?color=75C1C4&include_prereleases&label=Release&logo=github&logoColor=white"></a>
+  <a href="https:https://github.com/sendya/ant-design-pro-vue"><img src="https://img.shields.io/badge/UI-Ant%20Design%20Pro%20Vue-green" alt="UI"></a>
+  <a href="https://github.com/pallets/flask"><img src="https://img.shields.io/badge/API-Flask-bright" alt="API"></a>
+  <a href="https://github.com/veops/cmdb/stargazers"><img src="https://img.shields.io/github/stars/veops/cmdb" alt="Stars Badge"/></a>
+  <a href="https://github.com/veops/cmdb"><img src="https://img.shields.io/github/forks/veops/cmdb" alt="Forks Badge"/></a>
+</p>
+<p align="center">
+  中文(简体) · <a href="docs/README_en.md">English</a>
 </p>
-
-
-------------------------------
-
-[English](docs/README_en.md) / [中文](README.md)
-- 产品文档：https://veops.cn/docs/
-- 在线体验：<a href="https://cmdb.veops.cn" target="_blank">CMDB</a>
-  - username: demo 或者 admin
-  - password: 123456
-
-> **重要提示**: `master` 分支在开发过程中可能处于 _不稳定的状态_ 。
-> 请通过[releases](https://github.com/veops/cmdb/releases)获取
 
 ## 系统介绍
 
-### 系统概览
+维易CMDB是一个简洁、轻量且高度可定制的运维配置管理数据库（CMDB）。它支持灵活的模型配置和资源自动发现，旨在为企业提供便捷的资产管理解决方案，帮助运维团队高效地管理 IT 基础设施和服务。
 
-<img src=docs/images/dashboard.png />
-
-
-### 相关文章
-
-- <a href="https://mp.weixin.qq.com/s/v3eANth64UBW5xdyOkK3tg" target="_blank">概要设计</a>
-- <a href="https://github.com/veops/cmdb/tree/master/docs/cmdb_api.md" target="_blank">API 文档</a>
-- <a href="https://mp.weixin.qq.com/s/rQaf4AES7YJsyNQG_MKOLg" target="_blank">自动发现</a>
-- 更多文章可以在公众号 **维易科技OneOps** 里查看
-
-### 特点
-
-- 灵活性
-  1. 配置灵活，不设定任何运维场景，有内置模板
-  2. 自动发现、入库 IT 资产
-- 安全性
-  1. 细粒度权限控制
-  2. 完备操作日志
-- 多应用
-  1. 丰富视图展示维度
-  2. API简单强大
-  3. 支持定义属性触发器、计算属性
+- 产品文档：[https://veops.cn/docs/](https://veops.cn/docs/)
+- 在线体验：[https://cmdb.veops.cn](https://cmdb.veops.cn)
+  - 用户名：demo 或者 admin
+  - 密码：123456
+- **重要提示**：`master` 分支在开发过程中可能处于**不稳定的状态**。请通过 [releases](https://github.com/veops/cmdb/releases) 获取最新稳定版本。
 
 ### 主要功能
 
-- 自定义模型和模型关系，模型属性支持下拉列表、字体颜色、计算属性等高级特性
-- 支持计算机、网络设备、存储设备、数据库、中间件、公有云资源等自动发现
-- 支持资源、层级、关系视图展示
-- 细粒度访问控制，完备的操作日志
-- 通用的资源搜索和关系搜索
-- 支持IP地址管理(IPAM), 数据中心基础设施管理(DCIM)
+- **自定义模型和模型关系**：支持模型属性的自定义，包括下拉列表、字体颜色、计算属性等高级功能，满足不同业务需求。
+- **自动发现资源**：支持计算机、网络设备、存储设备、数据库、中间件、公有云资源等自动发现。
+- **多维度视图展示**：包括资源视图、层级视图、关系视图等，帮助运维人员全面管理资源。
+- **细粒度权限控制**：通过精确的访问控制和完备的操作日志保障系统的安全性。
+- **全面的资源搜索功能**：支持灵活的资源和关系搜索，快速定位和操作资源。
+- **集成 IP 地址管理（IPAM）和数据中心基础设施管理（DCIM）**：简化网络资源和数据中心设备的管理。
 
+更多详细功能，请移步 [维易科技官网](https://veops.cn) 进行了解。
 
+### 系统优势
 
-### 更多功能
+- 灵活性
+  + 无需指定固定运维场景，支持自由配置并内置多种模板
+  + 支持自动发现和入库 IT 资产，快速搭建资产管理系统
+- 安全性
+  + 细粒度的权限控制机制，确保资源管理的安全性
+  + 完整的操作日志记录，便于审计和问题追踪
+- 多应用
+  + 提供多种视图展示方式，满足不同场景的需求
+  + 强大的 API 接口，支持深度集成
+  + 支持定义属性触发器和计算属性，增强数据处理能力
 
-> 也欢迎移步[维易科技官网](https://veops.cn)，发现更多免费运维系统。
+### 技术栈
+
++ 后端：Python [3.8-3.11]
++ 数据存储：MySQL、Redis
++ 前端：Vue.js
++ UI组件库：Ant Design Vue
+
+### 系统概览
+
+<table style="border-collapse: collapse;">
+  <tr>
+    <td style="padding: 5px;background-color:#fff;">
+      <img width="400" src="https://github.com/user-attachments/assets/6d2df835-ae93-4d91-9bd9-213c270eca7a"/>
+    </td>
+    <td style="padding: 5px;background-color:#fff;">
+      <img width="400" src="https://github.com/user-attachments/assets/cb8b598a-a1f9-4c74-adf1-6e59aea2c9b3"/>
+    </td>
+  </tr>
+
+  <tr>
+    <td style="padding: 5px;background-color:#fff;">
+      <img width="400" src="https://github.com/user-attachments/assets/b440224f-53c3-4b7f-a9be-285d7a4b848f"/>
+    </td>
+    <td style="padding: 5px;background-color:#fff;">
+      <img width="400" src="https://github.com/user-attachments/assets/f457d5a0-b60b-4949-b94e-020f4c61444b"/>
+    </td>
+  </tr>
+</table>
+
+## 关注我们
+
+欢迎 Star 加关注，第一时间获取更新动态！
+
+![star us](https://github.com/user-attachments/assets/f9056d5a-171c-4f53-9fec-d40c9e5ff94d)
+
+## 快速开始
+
+### 1. 搭建
+
++ 方案一：Docker 一键快速构建
+
+  - 第1步: 安装 Docker 环境和 Docker Compose（v2）
+  - 第2步: 拷贝项目代码, `git clone https://github.com/veops/cmdb.git`
+  - 第3步：进入主目录并启动, `docker compose up -d`
+
++ 方案二：[本地开发环境搭建](docs/local.md)
++ 方案三：[Makefile 安装](docs/makefile.md)
+
+### 2. 访问
+- 打开浏览器并访问: [http://127.0.0.1:8000](http://127.0.0.1:8000)
+- 用户名: demo 或者 admin
+- 密码: 123456
 
 ## 接入公司
 
-> 欢迎使用开源CMDB的公司，在 [#112](https://github.com/veops/cmdb/issues/112) 登记
++ 欢迎使用开源CMDB的公司和团队，在 [#112](https://github.com/veops/cmdb/issues/112) 登记
 
-## 安装
+## 代码贡献
+我们欢迎所有开发者贡献代码，改善和扩展这个项目。请先阅读我们的[贡献指南](docs/CONTRIBUTING.md)。此外，您还可以通过社交媒体、活动和分享来支持 Veops 的开源。
 
-### Docker 一键快速构建
+<a href="https://github.com/veops/cmdb/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=veops/cmdb" />
+</a>
 
-[//]: # (> 方法一)
-- 第一步: 先安装 Docker 环境, 以及Docker Compose (v2)
-- 第二步: 拷贝项目
-```shell 
-git clone https://github.com/veops/cmdb.git
-```
-- 第三步：进入主目录，执行:
-```
-docker compose up -d
-```
+## 更多开源
 
-[//]: # (> 方法二, 该方法适用于linux系统)
+- [OneTerm](https://github.com/veops/oneterm): 一款简单、轻量、灵活的堡垒机服务。
+- [messenger](https://github.com/veops/messenger): 一个简单轻量的消息发送服务。
+- [ACL](https://github.com/veops/acl): 一个简单通用的权限管理系统设计与实践。
 
-[//]: # (- 第一步： 先安装 Docker 环境, 以及Docker Compose &#40;v2&#41;)
+## 相关文章
 
-[//]: # (- 第二步： 直接使用项目根目录下的install.sh 文件进行 `安装`、`启动`、`暂停`、`查状态`、`删除`、`卸载`)
+- <a href="https://mp.weixin.qq.com/s/v3eANth64UBW5xdyOkK3tg" target="_blank">尽可能通用的运维CMDB的设计与实践(Ⅰ) - 概览</a>
+- <a href="https://mp.weixin.qq.com/s/rQaf4AES7YJsyNQG_MKOLg" target="_blank">尽可能通用的运维CMDB的设计与实践(ⅠⅠ) - 自动发现</a>
+- <a href="https://github.com/veops/cmdb/tree/master/docs/cmdb_api.md" target="_blank">CMDB接口文档</a>
 
-[//]: # (```shell)
+更多文章可以在公众号 **维易科技OneOps** 里查看
 
-[//]: # (curl -so install.sh https://raw.githubusercontent.com/veops/cmdb/deploy_on_kylin_docker/install.sh)
+## 与我联系
 
-[//]: # (sh install.sh install)
-
-[//]: # (```)
-
-### [本地开发环境搭建](docs/local.md)
-
-### [Makefile 安装](docs/makefile.md)
-
-## 验证
-- 浏览器打开: [http://127.0.0.1:8000](http://127.0.0.1:8000)
-- username: demo 或者 admin
-- password: 123456
-
-
----
-
-_**欢迎关注公众号(维易科技OneOps)，关注后可加入微信群，进行产品和技术交流。**_
-
-
-<p align="center">
-  <img src="docs/images/wechat.png" alt="公众号: 维易科技OneOps" />
-</p>
++ 邮箱: <a href="mailto:bd@veops.cn">bd@veops.cn</a>
++ 公众号：**维易科技OneOps**。关注后可以加入微信群，参与产品和技术交流  
+  <img src="docs/images/wechat.png" alt="公众号: 维易科技OneOps" />

cmdb-api/.ruff.toml

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

cmdb-api/api/commands/click_cmdb.py

@@ -228,6 +228,12 @@ def cmdb_trigger():
     """
     from api.lib.cmdb.ci import CITriggerManager
 
+    current_app.test_request_context().push()
+    if not UserCache.get('worker'):
+        from api.lib.perm.acl.user import UserCRUD
+        UserCRUD.add(username='worker', password=uuid.uuid4().hex, email='worker@xxx.com')
+    login_user(UserCache.get('worker'))
+
     current_day = datetime.datetime.today().strftime("%Y-%m-%d")
     trigger2cis = dict()
     trigger2completed = dict()
@@ -256,10 +262,10 @@ def cmdb_trigger():
                         trigger2cis[trigger.id] = (trigger, ready_cis)
                     else:
                         cur = trigger2cis[trigger.id]
-                        cur_ci_ids = {i.ci_id for i in cur[1]}
+                        cur_ci_ids = {_ci.ci_id for _ci in cur[1]}
                         trigger2cis[trigger.id] = (
-                            trigger, cur[1] + [i for i in ready_cis if i.ci_id not in cur_ci_ids
-                                               and i.ci_id not in trigger2completed.get(trigger.id, {})])
+                            trigger, cur[1] + [_ci for _ci in ready_cis if _ci.ci_id not in cur_ci_ids
+                                               and _ci.ci_id not in trigger2completed.get(trigger.id, {})])
 
             for tid in trigger2cis:
                 trigger, cis = trigger2cis[tid]
@@ -346,7 +352,7 @@ def cmdb_inner_secrets_init(address):
     if valid_address(address):
         token = current_app.config.get("INNER_TRIGGER_TOKEN", "") if not token else token
         if not token:
-            token = click.prompt(f'Enter root token', hide_input=True, confirmation_prompt=False)
+            token = click.prompt('Enter root token', hide_input=True, confirmation_prompt=False)
         assert token is not None
         resp = requests.post("{}/api/v0.1/secrets/auto_seal".format(address.strip("/")),
                              headers={"Inner-Token": token})

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

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

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

@@ -295,7 +295,7 @@ class CIManager(object):
         db.session.commit()
 
         value_table = TableMap(attr_name=attr.name).table
-        with redis_lock.Lock(rd.r, "auto_inc_id_{}".format(attr.name)):
+        with redis_lock.Lock(rd.r, "auto_inc_id_{}".format(attr.name), expire=10):
             max_v = value_table.get_by(attr_id=attr.id, only_query=True).order_by(
                 getattr(value_table, 'value').desc()).first()
             if max_v is not None:
@@ -393,7 +393,7 @@ class CIManager(object):
         ci = None
         record_id = None
         password_dict = {}
-        with redis_lock.Lock(rd.r, ci_type.name):
+        with redis_lock.Lock(rd.r, ci_type.name, expire=10):
             db.session.commit()
 
             if (unique_key.default and unique_key.default.get('default') == AttributeDefaultValueEnum.AUTO_INC_ID and
@@ -524,10 +524,14 @@ class CIManager(object):
         raw_dict = copy.deepcopy(ci_dict)
 
         ci_attr2type_attr = {type_attr.attr_id: type_attr for type_attr, _ in attrs}
+        unique_name = None
         for _, attr in attrs:
             if attr.default and attr.default.get('default') == AttributeDefaultValueEnum.UPDATED_AT:
                 ci_dict[attr.name] = now
 
+            if attr.id == ci_type.unique_id:
+                unique_name = attr.name
+
         value_manager = AttributeValueManager()
 
         password_dict = dict()
@@ -550,14 +554,15 @@ class CIManager(object):
         limit_attrs = self._valid_ci_for_no_read(ci) if not _is_admin else {}
 
         record_id = None
-        with redis_lock.Lock(rd.r, ci_type.name):
+        with redis_lock.Lock(rd.r, ci_type.name, expire=10):
             db.session.commit()
 
             self._valid_unique_constraint(ci.type_id, ci_dict, ci_id)
 
             ci_dict = {k: v for k, v in ci_dict.items() if k in ci_type_attrs_name}
             key2attr = value_manager.valid_attr_value(ci_dict, ci.type_id, ci.id, ci_type_attrs_name,
-                                                      ci_attr2type_attr=ci_attr2type_attr)
+                                                      ci_attr2type_attr=ci_attr2type_attr,
+                                                      unique_name=unique_name)
 
             if computed_attrs:
                 value_manager.handle_ci_compute_attributes(ci_dict, computed_attrs, ci)
@@ -1268,7 +1273,9 @@ class CIRelationManager(object):
             else:
                 type_relation = CITypeRelation.get_by_id(relation_type_id)
 
-            with redis_lock.Lock(rd.r, "ci_relation_add_{}_{}".format(first_ci.type_id, second_ci.type_id)):
+            with redis_lock.Lock(rd.r,
+                                 "ci_relation_add_{}_{}".format(first_ci.type_id, second_ci.type_id),
+                                 expire=10):
 
                 cls._check_constraint(first_ci_id, first_ci.type_id, second_ci_id, second_ci.type_id, type_relation)
 

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

@@ -722,9 +722,6 @@ class CITypeAttributeManager(object):
 
                     ci_cache.apply_async(args=(ci.id, None, None), queue=CMDB_QUEUE)
 
-                for item in PreferenceShowAttributes.get_by(type_id=type_id, attr_id=attr_id, to_dict=False):
-                    item.soft_delete(commit=False)
-
                 child_ids = CITypeInheritanceManager.recursive_children(type_id)
                 for _type_id in [type_id] + child_ids:
                     for item in CITypeUniqueConstraint.get_by(type_id=_type_id, to_dict=False):
@@ -740,6 +737,9 @@ class CITypeAttributeManager(object):
                     item = CITypeTrigger.get_by(type_id=_type_id, attr_id=attr_id, to_dict=False, first=True)
                     item and item.soft_delete(commit=False)
 
+                    for item in PreferenceShowAttributes.get_by(type_id=_type_id, attr_id=attr_id, to_dict=False):
+                        item.soft_delete(commit=False)
+                    
                 for item in (CITypeRelation.get_by(parent_id=type_id, to_dict=False) +
                              CITypeRelation.get_by(child_id=type_id, to_dict=False)):
                     if item.parent_id == type_id and attr_id in (item.parent_attr_ids or []):
@@ -862,15 +862,15 @@ class CITypeRelationManager(object):
 
         graph = nx.DiGraph()
 
-        def get_children(_id):
+        def get_children(_id, _graph):
             children = CITypeRelation.get_by(parent_id=_id, to_dict=False)
 
             for i in children:
                 if i.child_id != _id:
-                    graph.add_edge(i.parent_id, i.child_id)
-                    get_children(i.child_id)
+                    _graph.add_edge(i.parent_id, i.child_id)
+                    get_children(i.child_id, _graph)
 
-        get_children(source_type_id)
+        get_children(source_type_id, graph)
 
         paths = list(nx.all_simple_paths(graph, source_type_id, target_type_ids))
 
@@ -1145,13 +1145,14 @@ class CITypeAttributeGroupManager(object):
             else:
                 group_pos = group2pos[group['name']]
 
-            attr = None
             for i in items:
                 if i.attr_id in id2attr:
                     attr = id2attr[i.attr_id]
                     attr['inherited'] = group['inherited']
                     attr['inherited_from'] = group.get('inherited_from')
                     result[group_pos]['attributes'].append(attr)
+                else:
+                    continue
 
                 if i.attr_id in attr2pos:
                     result[attr2pos[i.attr_id][0]]['attributes'].remove(attr2pos[i.attr_id][1])

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

@@ -122,7 +122,7 @@ class RackManager(DCIMBase):
                     CIManager().update(rack['_id'], **payload)
 
     def add_device(self, rack_id, device_id, u_start, u_count=None):
-        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id))):
+        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
             self.calc_u_free_count(rack_id, device_id, u_start, u_count)
 
             self.add_relation(rack_id, device_id)
@@ -139,7 +139,7 @@ class RackManager(DCIMBase):
         OperateHistoryManager().add(operate_type=OperateTypeEnum.ADD_DEVICE, rack_id=rack_id, ci_id=device_id)
 
     def remove_device(self, rack_id, device_id):
-        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id))):
+        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
             CIRelationManager.delete_3(rack_id, device_id, apply_async=False, valid=False)
 
             payload = {RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(rack_id)}
@@ -151,7 +151,7 @@ class RackManager(DCIMBase):
         OperateHistoryManager().add(operate_type=OperateTypeEnum.REMOVE_DEVICE, rack_id=rack_id, ci_id=device_id)
 
     def move_device(self, rack_id, device_id, to_u_start):
-        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id))):
+        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
             payload = {RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(rack_id, device_id, to_u_start)}
             CIManager().update(rack_id, _sync=True, **payload)
 
@@ -160,7 +160,7 @@ class RackManager(DCIMBase):
         OperateHistoryManager().add(operate_type=OperateTypeEnum.MOVE_DEVICE, rack_id=rack_id, ci_id=device_id)
 
     def migrate_device(self, rack_id, device_id, to_rack_id, to_u_start):
-        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id))):
+        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
             self.calc_u_free_count(to_rack_id, device_id, to_u_start)
 
             if rack_id != to_rack_id:

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

@@ -92,7 +92,7 @@ class IpAddressManager(object):
             else:
                 return abort(400, ErrFormat.ipam_address_model_not_found)
 
-        with (redis_lock.Lock(rd.r, "IPAM_ASSIGN_ADDRESS_{}".format(subnet_id))):
+        with (redis_lock.Lock(rd.r, "IPAM_ASSIGN_ADDRESS_{}".format(subnet_id), expire=10)):
             cis = self._get_cis(subnet_id, ips)
             ip2ci = {ci[IPAddressBuiltinAttributes.IP]: ci for ci in cis}
 

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

@@ -43,7 +43,7 @@ class ScanHistoryManager(DBMixin):
 
         if kwargs.get('ips'):
             from api.lib.cmdb.ipam.address import IpAddressManager
-            IpAddressManager().assign_ips(kwargs['ips'], None, kwargs.get('cidr'),
+            IpAddressManager().assign_ips(kwargs['ips'], ci_id, kwargs.get('cidr'),
                                           **{IPAddressBuiltinAttributes.IS_USED: 1})
 
             scan_rule = IPAMSubnetScan.get_by(ci_id=ci_id, first=True, to_dict=False)

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

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

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

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

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

@@ -107,3 +107,12 @@ FROM
     WHERE c_value_index_datetime.value LIKE "{0}") AS {1}
 GROUP BY  {1}.ci_id
 """
+
+QUERY_CI_BY_NO_ATTR_IN = """
+SELECT *
+FROM 
+    (SELECT c_value_index_texts.ci_id
+    FROM c_value_index_texts
+    WHERE c_value_index_texts.value in ({0})) AS {1}
+GROUP BY {1}.ci_id
+"""

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

@@ -6,6 +6,7 @@ from __future__ import unicode_literals
 import copy
 import six
 import time
+from flask import abort
 from flask import current_app
 from flask_login import current_user
 from jinja2 import Template
@@ -27,6 +28,7 @@ from api.lib.cmdb.search.ci.db.query_sql import FACET_QUERY
 from api.lib.cmdb.search.ci.db.query_sql import QUERY_CI_BY_ATTR_NAME
 from api.lib.cmdb.search.ci.db.query_sql import QUERY_CI_BY_ID
 from api.lib.cmdb.search.ci.db.query_sql import QUERY_CI_BY_NO_ATTR
+from api.lib.cmdb.search.ci.db.query_sql import QUERY_CI_BY_NO_ATTR_IN
 from api.lib.cmdb.search.ci.db.query_sql import QUERY_CI_BY_TYPE
 from api.lib.cmdb.search.ci.db.query_sql import QUERY_UNION_CI_ATTRIBUTE_IS_NULL
 from api.lib.cmdb.utils import TableMap
@@ -141,7 +143,7 @@ class Search(object):
                                     if str(ci_type.id) in self.type_id_list:
                                         self.type_id_list.remove(str(ci_type.id))
                                     type_id_list.remove(str(ci_type.id))
-                                    sub.extend([i for i in queries[1:] if isinstance(i, six.string_types)])
+                                    sub.extend([i for i in queries[1:] if isinstance(i, (six.string_types, list))])
 
                                     sub.insert(0, "_type:{}".format(ci_type.id))
                                     queries.append(dict(operator="|", queries=sub))
@@ -151,7 +153,9 @@ class Search(object):
                                 if not self.fl:
                                     self.fl = set(self.type2filter_perms[ci_type.id]['attr_filter'])
                                 else:
-                                    self.fl = set(self.fl) & set(self.type2filter_perms[ci_type.id]['attr_filter'])
+                                    fl = set(self.fl) & set(self.type2filter_perms[ci_type.id]['attr_filter'])
+                                    not fl and abort(400, ErrFormat.ci_filter_perm_attr_no_permission.format(self.fl))
+                                    self.fl = fl
                             else:
                                 self.fl = self.fl or {}
                                 if not self.fl or isinstance(self.fl, dict):
@@ -433,11 +437,14 @@ class Search(object):
                 if not q.startswith("("):
                     raise SearchError(ErrFormat.ci_search_Parentheses_invalid)
 
-                operator, q = self._operator_proc(q)
-                if q.endswith(")"):
-                    result.append(dict(operator=operator, queries=[q[1:-1]]))
+                if ":" not in q:  # multi-line search
+                    result.append(q[1:-1].split(';'))
+                else:
+                    operator, q = self._operator_proc(q)
+                    if q.endswith(")"):
+                        result.append(dict(operator=operator, queries=[q[1:-1]]))
 
-                sub = dict(operator=operator, queries=[q[1:]])
+                    sub = dict(operator=operator, queries=[q[1:]])
             elif q.endswith(")") and sub:
                 sub['queries'].append(q[:-1])
                 result.append(copy.deepcopy(sub))
@@ -525,22 +532,31 @@ class Search(object):
         query_sql = ""
 
         for q in queries:
+            # current_app.logger.debug(q)
             _query_sql = ""
             if isinstance(q, dict):
-                alias, _query_sql, operator = self.__query_build_by_field(q['queries'], True, True, alias, is_sub=True)
-                # current_app.logger.info(_query_sql)
-                # current_app.logger.info((operator, is_first, alias))
-                operator = q['operator']
+                if len(q['queries']) == 1 and ";" in q['queries'][0]:
+                    values = q['queries'][0].split(";")
+                    in_values = ",".join("'{0}'".format(v) for v in values)
+                    _query_sql = QUERY_CI_BY_NO_ATTR_IN.format(in_values, alias)
+                    operator = q['operator']
+                else:
+                    alias, _query_sql, operator = self.__query_build_by_field(q['queries'], True, True, alias,
+                                                                              is_sub=True)
+                    operator = q['operator']
 
             elif ":" in q and not q.startswith("*"):
                 alias, _query_sql, operator = self.__query_by_attr(q, queries, alias, is_sub)
             elif q == "*":
                 continue
             elif q:
-                q = q.replace("'", "\\'")
-                q = q.replace('"', '\\"')
-                q = q.replace("*", "%").replace('\\n', '%')
-                _query_sql = QUERY_CI_BY_NO_ATTR.format(q, alias)
+                if not isinstance(q, list):
+                    q = q.replace("'", "\\'")
+                    q = q.replace('"', '\\"')
+                    q = q.replace("*", "%").replace('\\n', '%')
+                    _query_sql = QUERY_CI_BY_NO_ATTR.format(q, alias)
+                else:
+                    _query_sql = QUERY_CI_BY_NO_ATTR_IN.format(",".join("'{0}'".format(v) for v in q), alias)
 
             if is_first and _query_sql and not self.only_type_query:
                 query_sql = "SELECT * FROM ({0}) AS {1}".format(_query_sql, alias)

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

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

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

@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 
-import imp
+import importlib.util
 
 import copy
 import jinja2
@@ -136,7 +136,7 @@ class AttributeValueManager(object):
         if not re.compile(expr).match(str(value)):
             return abort(400, ErrFormat.attribute_value_invalid2.format(alias, value))
 
-    def _validate(self, attr, value, value_table, ci=None, type_id=None, ci_id=None, type_attr=None):
+    def _validate(self, attr, value, value_table, ci=None, type_id=None, ci_id=None, type_attr=None, unique_name=None):
         if not attr.is_reference:
             ci = ci or {}
             v = self._deserialize_value(attr.alias, attr.value_type, value)
@@ -146,7 +146,7 @@ class AttributeValueManager(object):
         else:
             v = value or None
 
-        attr.is_unique and self._check_is_unique(
+        (attr.is_unique or attr.name == unique_name) and self._check_is_unique(
             value_table, attr, ci and ci.id or ci_id, ci and ci.type_id or type_id, v)
         self._check_is_required(ci and ci.type_id or type_id, attr, v, type_attr=type_attr)
         if attr.is_reference:
@@ -198,11 +198,11 @@ class AttributeValueManager(object):
 
         try:
             path = script_f.name
-            dir_name, name = os.path.dirname(path), os.path.basename(path)[:-3]
+            name = os.path.basename(path)[:-3]
 
-            fp, path, desc = imp.find_module(name, [dir_name])
-
-            mod = imp.load_module(name, fp, path, desc)
+            spec = importlib.util.spec_from_file_location(name, path)
+            mod = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(mod)
 
             if hasattr(mod, 'computed'):
                 return mod.computed()
@@ -237,7 +237,10 @@ class AttributeValueManager(object):
             if computed_value is not None:
                 ci_dict[attr['name']] = computed_value
 
-    def valid_attr_value(self, ci_dict, type_id, ci_id, name2attr, alias2attr=None, ci_attr2type_attr=None):
+    def valid_attr_value(self, ci_dict, type_id, ci_id, name2attr,
+                         alias2attr=None,
+                         ci_attr2type_attr=None,
+                         unique_name=None):
         key2attr = dict()
         alias2attr = alias2attr or {}
         ci_attr2type_attr = ci_attr2type_attr or {}
@@ -268,7 +271,8 @@ class AttributeValueManager(object):
 
                 else:
                     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))
+                                           type_attr=ci_attr2type_attr.get(attr.id),
+                                           unique_name=unique_name)
                     ci_dict[key] = value
             except BadRequest as e:
                 raise

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

cmdb-api/api/lib/utils.py

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

cmdb-api/api/models/acl.py

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

cmdb-api/api/tasks/acl.py

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

cmdb-api/api/tasks/cmdb.py

@@ -145,7 +145,7 @@ def ci_delete_trigger(trigger, operate_type, ci_dict):
 @flush_db
 @reconnect_db
 def ci_relation_cache(parent_id, child_id, ancestor_ids):
-    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id)):
+    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id), expire=10):
         children = rd.get([parent_id], REDIS_PREFIX_CI_RELATION)[0]
         children = json.loads(children) if children is not None else {}
 
@@ -223,7 +223,7 @@ def ci_relation_add(parent_dict, child_id, uid):
 @celery.task(name="cmdb.ci_relation_delete", queue=CMDB_QUEUE)
 @reconnect_db
 def ci_relation_delete(parent_id, child_id, ancestor_ids):
-    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id)):
+    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id), expire=10):
         children = rd.get([parent_id], REDIS_PREFIX_CI_RELATION)[0]
         children = json.loads(children) if children is not None else {}
 

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

@@ -30,6 +30,7 @@ from api.lib.cmdb.search import SearchError
 from api.lib.cmdb.search.ci import search as ci_search
 from api.lib.decorator import args_required
 from api.lib.decorator import args_validate
+from api.lib.exception import AbortException
 from api.lib.perm.acl.acl import has_perm_from_args
 from api.lib.utils import AESCrypto
 from api.lib.utils import get_page
@@ -296,7 +297,10 @@ class AutoDiscoveryRuleSyncView(APIView):
 
         rules, last_update_at1 = AutoDiscoveryCITypeCRUD.get(None, oneagent_id, oneagent_name, last_update_at)
 
-        subnet_scan_rules, last_update_at2 = SubnetManager().scan_rules(oneagent_id, last_update_at)
+        try:
+            subnet_scan_rules, last_update_at2 = SubnetManager().scan_rules(oneagent_id, last_update_at)
+        except AbortException:
+            subnet_scan_rules, last_update_at2 = [], ""
 
         return self.jsonify(rules=rules,
                             subnet_scan_rules=subnet_scan_rules,

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

@@ -64,9 +64,13 @@ class CITypeView(APIView):
                 ci_type['unique_name'] = ci_type['unique_id'] and AttributeCache.get(ci_type['unique_id']).name
                 ci_types.append(ci_type)
         elif type_name is not None:
-            ci_type = CITypeCache.get(type_name).to_dict()
-            ci_type['parent_ids'] = CITypeInheritanceManager.get_parents(ci_type['id'])
-            ci_types = [ci_type]
+            ci_type = CITypeCache.get(type_name)
+            if ci_type is not None:
+                ci_type = ci_type.to_dict()
+                ci_type['parent_ids'] = CITypeInheritanceManager.get_parents(ci_type['id'])
+                ci_types = [ci_type]
+            else:
+                ci_types = []
         else:
             ci_types = CITypeManager().get_ci_types(q)
         count = len(ci_types)

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

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

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

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

cmdb-api/requirements.txt

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

cmdb-ui/.env

@@ -1,6 +1,6 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=false
-VUE_APP_API_BASE_URL=/api
+VUE_APP_API_BASE_URL=http://127.0.0.1:5000/api
 VUE_APP_BUILD_PACKAGES="ticket,calendar,acl"
 VUE_APP_IS_OUTER=true
 VUE_APP_IS_OPEN_SOURCE=true

cmdb-ui/public/iconfont/demo_index.html

@@ -54,6 +54,54 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xea0b;</span>
+                <div class="name">veops-servicetree</div>
+                <div class="code-name">&amp;#xea0b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea0a;</span>
+                <div class="name">veops-switch (1)</div>
+                <div class="code-name">&amp;#xea0a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea09;</span>
+                <div class="name">veops-label</div>
+                <div class="code-name">&amp;#xea09;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea08;</span>
+                <div class="name">top_acl</div>
+                <div class="code-name">&amp;#xea08;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea06;</span>
+                <div class="name">top_ticket</div>
+                <div class="code-name">&amp;#xea06;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea07;</span>
+                <div class="name">top_agent</div>
+                <div class="code-name">&amp;#xea07;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea05;</span>
+                <div class="name">itsm-table_download</div>
+                <div class="code-name">&amp;#xea05;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea04;</span>
+                <div class="name">itsm-image_download</div>
+                <div class="code-name">&amp;#xea04;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xea02;</span>
                 <div class="name">veops-rear</div>
@@ -6162,9 +6210,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1732673294759') format('woff2'),
-       url('iconfont.woff?t=1732673294759') format('woff'),
-       url('iconfont.ttf?t=1732673294759') format('truetype');
+  src: url('iconfont.woff2?t=1735191938771') format('woff2'),
+       url('iconfont.woff?t=1735191938771') format('woff'),
+       url('iconfont.ttf?t=1735191938771') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -6190,6 +6238,78 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont veops-servicetree"></span>
+            <div class="name">
+              veops-servicetree
+            </div>
+            <div class="code-name">.veops-servicetree
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont veops-switch1"></span>
+            <div class="name">
+              veops-switch (1)
+            </div>
+            <div class="code-name">.veops-switch1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont veops-label"></span>
+            <div class="name">
+              veops-label
+            </div>
+            <div class="code-name">.veops-label
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont top_acl"></span>
+            <div class="name">
+              top_acl
+            </div>
+            <div class="code-name">.top_acl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont top_ticket"></span>
+            <div class="name">
+              top_ticket
+            </div>
+            <div class="code-name">.top_ticket
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont top_agent"></span>
+            <div class="name">
+              top_agent
+            </div>
+            <div class="code-name">.top_agent
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont itsm-table_download"></span>
+            <div class="name">
+              itsm-table_download
+            </div>
+            <div class="code-name">.itsm-table_download
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont itsm-image_download"></span>
+            <div class="name">
+              itsm-image_download
+            </div>
+            <div class="code-name">.itsm-image_download
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont veops-rear"></span>
             <div class="name">
@@ -15352,6 +15472,70 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#veops-servicetree"></use>
+                </svg>
+                <div class="name">veops-servicetree</div>
+                <div class="code-name">#veops-servicetree</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#veops-switch1"></use>
+                </svg>
+                <div class="name">veops-switch (1)</div>
+                <div class="code-name">#veops-switch1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#veops-label"></use>
+                </svg>
+                <div class="name">veops-label</div>
+                <div class="code-name">#veops-label</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#top_acl"></use>
+                </svg>
+                <div class="name">top_acl</div>
+                <div class="code-name">#top_acl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#top_ticket"></use>
+                </svg>
+                <div class="name">top_ticket</div>
+                <div class="code-name">#top_ticket</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#top_agent"></use>
+                </svg>
+                <div class="name">top_agent</div>
+                <div class="code-name">#top_agent</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#itsm-table_download"></use>
+                </svg>
+                <div class="name">itsm-table_download</div>
+                <div class="code-name">#itsm-table_download</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#itsm-image_download"></use>
+                </svg>
+                <div class="name">itsm-image_download</div>
+                <div class="code-name">#itsm-image_download</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#veops-rear"></use>

cmdb-ui/public/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3857903 */
-  src: url('iconfont.woff2?t=1732673294759') format('woff2'),
-       url('iconfont.woff?t=1732673294759') format('woff'),
-       url('iconfont.ttf?t=1732673294759') format('truetype');
+  src: url('iconfont.woff2?t=1735191938771') format('woff2'),
+       url('iconfont.woff?t=1735191938771') format('woff'),
+       url('iconfont.ttf?t=1735191938771') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,38 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.veops-servicetree:before {
+  content: "\ea0b";
+}
+
+.veops-switch1:before {
+  content: "\ea0a";
+}
+
+.veops-label:before {
+  content: "\ea09";
+}
+
+.top_acl:before {
+  content: "\ea08";
+}
+
+.top_ticket:before {
+  content: "\ea06";
+}
+
+.top_agent:before {
+  content: "\ea07";
+}
+
+.itsm-table_download:before {
+  content: "\ea05";
+}
+
+.itsm-image_download:before {
+  content: "\ea04";
+}
+
 .veops-rear:before {
   content: "\ea02";
 }

cmdb-ui/public/iconfont/iconfont.json

@@ -5,6 +5,62 @@
   "css_prefix_text": "",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "42930714",
+      "name": "veops-servicetree",
+      "font_class": "veops-servicetree",
+      "unicode": "ea0b",
+      "unicode_decimal": 59915
+    },
+    {
+      "icon_id": "42921461",
+      "name": "veops-switch (1)",
+      "font_class": "veops-switch1",
+      "unicode": "ea0a",
+      "unicode_decimal": 59914
+    },
+    {
+      "icon_id": "42857659",
+      "name": "veops-label",
+      "font_class": "veops-label",
+      "unicode": "ea09",
+      "unicode_decimal": 59913
+    },
+    {
+      "icon_id": "42790685",
+      "name": "top_acl",
+      "font_class": "top_acl",
+      "unicode": "ea08",
+      "unicode_decimal": 59912
+    },
+    {
+      "icon_id": "42790687",
+      "name": "top_ticket",
+      "font_class": "top_ticket",
+      "unicode": "ea06",
+      "unicode_decimal": 59910
+    },
+    {
+      "icon_id": "42790686",
+      "name": "top_agent",
+      "font_class": "top_agent",
+      "unicode": "ea07",
+      "unicode_decimal": 59911
+    },
+    {
+      "icon_id": "42732510",
+      "name": "itsm-table_download",
+      "font_class": "itsm-table_download",
+      "unicode": "ea05",
+      "unicode_decimal": 59909
+    },
+    {
+      "icon_id": "42732515",
+      "name": "itsm-image_download",
+      "font_class": "itsm-image_download",
+      "unicode": "ea04",
+      "unicode_decimal": 59908
+    },
     {
       "icon_id": "42510712",
       "name": "veops-rear",

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

@@ -106,7 +106,7 @@
       <CIReferenceAttr
         v-if="getAttr(item.property).is_reference && (item.exp === 'is' || item.exp === '~is')"
         :style="{ width: '175px' }"
-        class="select-filter-component"
+        class="select-filter-component ops-select-bg"
         :referenceTypeId="getAttr(item.property).reference_type_id"
         :disabled="disabled"
         v-model="item.value"
@@ -114,7 +114,7 @@
       <a-select
         v-else-if="getAttr(item.property).is_bool && (item.exp === 'is' || item.exp === '~is')"
         v-model="item.value"
-        class="select-filter-component"
+        class="select-filter-component ops-select-bg"
         :style="{ width: '175px' }"
         :disabled="disabled"
         :placeholder="$t('placeholder2')"
@@ -398,7 +398,6 @@ export default {
 
   /deep/ .ant-select-selection {
     height: 24px;
-    background: #f7f8fa;
     line-height: 24px;
     border: none;
 

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

@@ -1,302 +1,302 @@
-<template>
-  <div>
-    <a-popover
-      v-if="isDropdown"
-      v-model="visible"
-      trigger="click"
-      :placement="placement"
-      overlayClassName="table-filter"
-      @visibleChange="visibleChange"
-    >
-      <slot name="popover_item">
-        <a-button type="primary" ghost>{{ $t('cmdbFilterComp.conditionFilter') }}<a-icon type="filter"/></a-button>
-      </slot>
-      <template slot="content">
-        <Expression
-          :needAddHere="needAddHere"
-          v-model="ruleList"
-          :canSearchPreferenceAttrList="canSearchPreferenceAttrList.filter((attr) => !attr.is_password)"
-          :disabled="disabled"
-        />
-        <a-divider :style="{ margin: '10px 0' }" />
-        <div style="width:554px">
-          <a-space :style="{ display: 'flex', justifyContent: 'flex-end' }">
-            <a-button type="primary" size="small" @click="handleSubmit">{{ $t('confirm') }}</a-button>
-            <a-button size="small" @click="handleClear">{{ $t('clear') }}</a-button>
-          </a-space>
-        </div>
-      </template>
-    </a-popover>
-    <Expression
-      :needAddHere="needAddHere"
-      v-else
-      v-model="ruleList"
-      :canSearchPreferenceAttrList="canSearchPreferenceAttrList.filter((attr) => !attr.is_password)"
-      :disabled="disabled"
-    />
-  </div>
-</template>
-
-<script>
-import { v4 as uuidv4 } from 'uuid'
-import Expression from './expression.vue'
-import { advancedExpList, compareTypeList } from './constants'
-
-export default {
-  name: 'FilterComp',
-  components: { Expression },
-  props: {
-    canSearchPreferenceAttrList: {
-      type: Array,
-      required: true,
-      default: () => [],
-    },
-    expression: {
-      type: String,
-      default: '',
-    },
-    regQ: {
-      type: String,
-      default: '(?<=q=).+(?=&)|(?<=q=).+$',
-    },
-    placement: {
-      type: String,
-      default: 'bottomRight',
-    },
-    isDropdown: {
-      type: Boolean,
-      default: true,
-    },
-    needAddHere: {
-      type: Boolean,
-      default: false,
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      advancedExpList,
-      compareTypeList,
-      visible: false,
-      ruleList: [],
-      filterExp: '',
-    }
-  },
-
-  methods: {
-    visibleChange(open, isInitOne = true) {
-      // isInitOne  初始化exp为空时，ruleList是否默认给一条
-      //   const regQ = /(?<=q=).+(?=&)|(?<=q=).+$/g
-      const exp = this.expression.match(new RegExp(this.regQ, 'g'))
-        ? this.expression.match(new RegExp(this.regQ, 'g'))[0]
-        : null
-      if (open && exp) {
-        const expArray = exp.split(',').map((item) => {
-          let has_not = ''
-          const key = item.split(':')[0]
-          const val = item
-            .split(':')
-            .slice(1)
-            .join(':')
-          let type, property, exp, value, min, max, compareType
-          if (key.includes('-')) {
-            type = 'or'
-            if (key.includes('~')) {
-              property = key.substring(2)
-              has_not = '~'
-            } else {
-              property = key.substring(1)
-            }
-          } else {
-            type = 'and'
-            if (key.includes('~')) {
-              property = key.substring(1)
-              has_not = '~'
-            } else {
-              property = key
-            }
-          }
-
-          const in_reg = /(?<=\().+(?=\))/g
-          const range_reg = /(?<=\[).+(?=\])/g
-          const compare_reg = /(?<=>=|<=|>(?!=)|<(?!=)).+/
-          if (val === '*') {
-            exp = has_not + 'value'
-            value = ''
-          } else if (in_reg.test(val)) {
-            exp = has_not + 'in'
-            value = val.match(in_reg)[0]
-          } else if (range_reg.test(val)) {
-            exp = has_not + 'range'
-            value = val.match(range_reg)[0]
-            min = value.split('_TO_')[0]
-            max = value.split('_TO_')[1]
-          } else if (compare_reg.test(val)) {
-            exp = has_not + 'compare'
-            value = val.match(compare_reg)[0]
-            const _compareType = val.substring(0, val.match(compare_reg)['index'])
-            const idx = compareTypeList.findIndex((item) => item.label === _compareType)
-            compareType = compareTypeList[idx].value
-          } else if (!val.includes('*')) {
-            exp = has_not + 'is'
-            value = val
-          } else {
-            const resList = [
-              ['contain', /(?<=\*).*(?=\*)/g],
-              ['end_with', /(?<=\*).+/g],
-              ['start_with', /.+(?=\*)/g],
-            ]
-            for (let i = 0; i < 3; i++) {
-              const reg = resList[i]
-              if (reg[1].test(val)) {
-                exp = has_not + reg[0]
-                value = val.match(reg[1])[0]
-                break
-              }
-            }
-          }
-          return {
-            id: uuidv4(),
-            type,
-            property,
-            exp,
-            value,
-            min,
-            max,
-            compareType,
-          }
-        })
-        this.ruleList = [...expArray]
-      } else if (open) {
-        const _canSearchPreferenceAttrList = this.canSearchPreferenceAttrList.filter((attr) => !attr.is_password)
-        this.ruleList = isInitOne
-          ? [
-              {
-                id: uuidv4(),
-                type: 'and',
-                property:
-                  _canSearchPreferenceAttrList && _canSearchPreferenceAttrList.length
-                    ? _canSearchPreferenceAttrList[0].name
-                    : undefined,
-                exp: 'is',
-                value: null,
-              },
-            ]
-          : []
-      }
-    },
-    handleClear() {
-      this.ruleList = [
-        {
-          id: uuidv4(),
-          type: 'and',
-          property: this.canSearchPreferenceAttrList[0].name,
-          exp: 'is',
-          value: null,
-        },
-      ]
-      this.filterExp = ''
-      this.visible = false
-      this.$emit('setExpFromFilter', this.filterExp)
-    },
-    handleSubmit() {
-      if (this.ruleList && this.ruleList.length) {
-        this.ruleList[0].type = 'and' // 增删后，以防万一第一个不是and
-        this.filterExp = ''
-        const expList = this.ruleList.map((rule) => {
-          let singleRuleExp = ''
-          let _exp = rule.exp
-          if (rule.type === 'or') {
-            singleRuleExp += '-'
-          }
-          if (rule.exp.includes('~')) {
-            singleRuleExp += '~'
-            _exp = rule.exp.split('~')[1]
-          }
-          singleRuleExp += `${rule.property}:`
-          if (_exp === 'is') {
-            singleRuleExp += `${rule.value ?? ''}`
-          }
-          if (_exp === 'contain') {
-            singleRuleExp += `*${rule.value ?? ''}*`
-          }
-          if (_exp === 'start_with') {
-            singleRuleExp += `${rule.value ?? ''}*`
-          }
-          if (_exp === 'end_with') {
-            singleRuleExp += `*${rule.value ?? ''}`
-          }
-          if (_exp === 'value') {
-            singleRuleExp += `*`
-          }
-          if (_exp === 'in') {
-            singleRuleExp += `(${rule.value ?? ''})`
-          }
-          if (_exp === 'range') {
-            singleRuleExp += `[${rule.min}_TO_${rule.max}]`
-          }
-          if (_exp === 'compare') {
-            const idx = compareTypeList.findIndex((item) => item.value === rule.compareType)
-            singleRuleExp += `${compareTypeList[idx].label}${rule.value ?? ''}`
-          }
-          return singleRuleExp
-        })
-        this.filterExp = expList.join(',')
-        this.$emit('setExpFromFilter', this.filterExp)
-      } else {
-        this.$emit('setExpFromFilter', '')
-      }
-      this.visible = false
-    },
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.table-filter {
-  .table-filter-add {
-    margin-top: 10px;
-    & > a {
-      padding: 2px 8px;
-      &:hover {
-        background-color: #f0faff;
-        border-radius: 5px;
-      }
-    }
-  }
-  .table-filter-extra-icon {
-    padding: 0px 2px;
-    &:hover {
-      display: inline-block;
-      border-radius: 5px;
-      background-color: #f0faff;
-    }
-  }
-}
-</style>
-
-<style lang="less">
-.table-filter-extra-operation {
-  .ant-popover-inner-content {
-    padding: 3px 4px;
-    .operation {
-      cursor: pointer;
-      width: 90px;
-      height: 30px;
-      line-height: 30px;
-      padding: 3px 4px;
-      border-radius: 5px;
-      transition: all 0.3s;
-      &:hover {
-        background-color: #f0faff;
-      }
-      > .anticon {
-        margin-right: 10px;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div>
+    <a-popover
+      v-if="isDropdown"
+      v-model="visible"
+      trigger="click"
+      :placement="placement"
+      overlayClassName="table-filter"
+      @visibleChange="visibleChange"
+    >
+      <slot name="popover_item">
+        <a-button type="primary" ghost>{{ $t('cmdbFilterComp.conditionFilter') }}<a-icon type="filter"/></a-button>
+      </slot>
+      <template slot="content">
+        <Expression
+          :needAddHere="needAddHere"
+          v-model="ruleList"
+          :canSearchPreferenceAttrList="canSearchPreferenceAttrList.filter((attr) => !attr.is_password)"
+          :disabled="disabled"
+        />
+        <a-divider :style="{ margin: '10px 0' }" />
+        <div style="width:554px">
+          <a-space :style="{ display: 'flex', justifyContent: 'flex-end' }">
+            <a-button type="primary" size="small" @click="handleSubmit">{{ $t('confirm') }}</a-button>
+            <a-button size="small" @click="handleClear">{{ $t('clear') }}</a-button>
+          </a-space>
+        </div>
+      </template>
+    </a-popover>
+    <Expression
+      :needAddHere="needAddHere"
+      v-else
+      v-model="ruleList"
+      :canSearchPreferenceAttrList="canSearchPreferenceAttrList.filter((attr) => !attr.is_password)"
+      :disabled="disabled"
+    />
+  </div>
+</template>
+
+<script>
+import { v4 as uuidv4 } from 'uuid'
+import Expression from './expression.vue'
+import { advancedExpList, compareTypeList } from './constants'
+
+export default {
+  name: 'FilterComp',
+  components: { Expression },
+  props: {
+    canSearchPreferenceAttrList: {
+      type: Array,
+      required: true,
+      default: () => [],
+    },
+    expression: {
+      type: String,
+      default: '',
+    },
+    regQ: {
+      type: String,
+      default: '(?<=q=).+(?=&)|(?<=q=).+$',
+    },
+    placement: {
+      type: String,
+      default: 'bottomRight',
+    },
+    isDropdown: {
+      type: Boolean,
+      default: true,
+    },
+    needAddHere: {
+      type: Boolean,
+      default: false,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      advancedExpList,
+      compareTypeList,
+      visible: false,
+      ruleList: [],
+      filterExp: '',
+    }
+  },
+
+  methods: {
+    visibleChange(open, isInitOne = true) {
+      // isInitOne  初始化exp为空时，ruleList是否默认给一条
+      //   const regQ = /(?<=q=).+(?=&)|(?<=q=).+$/g
+      const exp = this.expression.match(new RegExp(this.regQ, 'g'))
+        ? this.expression.match(new RegExp(this.regQ, 'g'))[0]
+        : null
+      if (open && exp) {
+        const expArray = exp.split(',').map((item) => {
+          let has_not = ''
+          const key = item.split(':')[0]
+          const val = item
+            .split(':')
+            .slice(1)
+            .join(':')
+          let type, property, exp, value, min, max, compareType
+          if (key.includes('-')) {
+            type = 'or'
+            if (key.includes('~')) {
+              property = key.substring(2)
+              has_not = '~'
+            } else {
+              property = key.substring(1)
+            }
+          } else {
+            type = 'and'
+            if (key.includes('~')) {
+              property = key.substring(1)
+              has_not = '~'
+            } else {
+              property = key
+            }
+          }
+
+          const in_reg = /(?<=\().+(?=\))/g
+          const range_reg = /(?<=\[).+(?=\])/g
+          const compare_reg = /(?<=>=|<=|>(?!=)|<(?!=)).+/
+          if (val === '*') {
+            exp = has_not + 'value'
+            value = ''
+          } else if (in_reg.test(val)) {
+            exp = has_not + 'in'
+            value = val.match(in_reg)[0]
+          } else if (range_reg.test(val)) {
+            exp = has_not + 'range'
+            value = val.match(range_reg)[0]
+            min = value.split('_TO_')[0]
+            max = value.split('_TO_')[1]
+          } else if (compare_reg.test(val)) {
+            exp = has_not + 'compare'
+            value = val.match(compare_reg)[0]
+            const _compareType = val.substring(0, val.match(compare_reg)['index'])
+            const idx = compareTypeList.findIndex((item) => item.label === _compareType)
+            compareType = compareTypeList[idx].value
+          } else if (!val.includes('*')) {
+            exp = has_not + 'is'
+            value = val
+          } else {
+            const resList = [
+              ['contain', /(?<=\*).*(?=\*)/g],
+              ['end_with', /(?<=\*).+/g],
+              ['start_with', /.+(?=\*)/g],
+            ]
+            for (let i = 0; i < 3; i++) {
+              const reg = resList[i]
+              if (reg[1].test(val)) {
+                exp = has_not + reg[0]
+                value = val.match(reg[1])[0]
+                break
+              }
+            }
+          }
+          return {
+            id: uuidv4(),
+            type,
+            property,
+            exp,
+            value,
+            min,
+            max,
+            compareType,
+          }
+        })
+        this.ruleList = [...expArray]
+      } else if (open) {
+        const _canSearchPreferenceAttrList = this.canSearchPreferenceAttrList.filter((attr) => !attr.is_password)
+        this.ruleList = isInitOne
+          ? [
+              {
+                id: uuidv4(),
+                type: 'and',
+                property:
+                  _canSearchPreferenceAttrList && _canSearchPreferenceAttrList.length
+                    ? _canSearchPreferenceAttrList[0].name
+                    : undefined,
+                exp: 'is',
+                value: null,
+              },
+            ]
+          : []
+      }
+    },
+    handleClear() {
+      this.ruleList = [
+        {
+          id: uuidv4(),
+          type: 'and',
+          property: this.canSearchPreferenceAttrList[0].name,
+          exp: 'is',
+          value: null,
+        },
+      ]
+      this.filterExp = ''
+      this.visible = false
+      this.$emit('setExpFromFilter', this.filterExp)
+    },
+    handleSubmit() {
+      if (this.ruleList && this.ruleList.length) {
+        this.ruleList[0].type = 'and' // 增删后，以防万一第一个不是and
+        this.filterExp = ''
+        const expList = this.ruleList.map((rule) => {
+          let singleRuleExp = ''
+          let _exp = rule.exp
+          if (rule.type === 'or') {
+            singleRuleExp += '-'
+          }
+          if (rule.exp.includes('~')) {
+            singleRuleExp += '~'
+            _exp = rule.exp.split('~')[1]
+          }
+          singleRuleExp += `${rule.property}:`
+          if (_exp === 'is') {
+            singleRuleExp += `${rule.value ?? ''}`
+          }
+          if (_exp === 'contain') {
+            singleRuleExp += `*${rule.value ?? ''}*`
+          }
+          if (_exp === 'start_with') {
+            singleRuleExp += `${rule.value ?? ''}*`
+          }
+          if (_exp === 'end_with') {
+            singleRuleExp += `*${rule.value ?? ''}`
+          }
+          if (_exp === 'value') {
+            singleRuleExp += `*`
+          }
+          if (_exp === 'in') {
+            singleRuleExp += `(${rule.value ?? ''})`
+          }
+          if (_exp === 'range') {
+            singleRuleExp += `[${rule.min}_TO_${rule.max}]`
+          }
+          if (_exp === 'compare') {
+            const idx = compareTypeList.findIndex((item) => item.value === rule.compareType)
+            singleRuleExp += `${compareTypeList[idx].label}${rule.value ?? ''}`
+          }
+          return singleRuleExp
+        })
+        this.filterExp = expList.join(',')
+        this.$emit('setExpFromFilter', this.filterExp)
+      } else {
+        this.$emit('setExpFromFilter', '')
+      }
+      this.visible = false
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.table-filter {
+  .table-filter-add {
+    margin-top: 10px;
+    & > a {
+      padding: 2px 8px;
+      &:hover {
+        background-color: @primary-color_5;
+        border-radius: 5px;
+      }
+    }
+  }
+  .table-filter-extra-icon {
+    padding: 0px 2px;
+    &:hover {
+      display: inline-block;
+      border-radius: 5px;
+      background-color: #f0faff;
+    }
+  }
+}
+</style>
+
+<style lang="less">
+.table-filter-extra-operation {
+  .ant-popover-inner-content {
+    padding: 3px 4px;
+    .operation {
+      cursor: pointer;
+      width: 90px;
+      height: 30px;
+      line-height: 30px;
+      padding: 3px 4px;
+      border-radius: 5px;
+      transition: all 0.3s;
+      &:hover {
+        background-color: #f0faff;
+      }
+      > .anticon {
+        margin-right: 10px;
+      }
+    }
+  }
+}
+</style>

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

@@ -341,7 +341,7 @@ export default {
   },
 }
 </script>
-<style scoped>
+<style lang="less" scoped>
 .pop_btn {
   text-align: right;
   margin-top: 24px;

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

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

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

@@ -92,7 +92,7 @@ export default {
       e.preventDefault()
       e.stopPropagation()
       this.$confirm({
-        title: this.$t('alert'),
+        title: this.$t('warning'),
         content: this.$t('cmdb.preference.confirmcancelSub2', { name: menu.meta.title }),
         onOk() {
           const citypeId = menu.meta.typeId
@@ -171,7 +171,6 @@ export default {
     },
     renderMenuItem(menu) {
       const isShowDot = menu.path.substr(0, 22) === '/cmdb/instances/types/'
-      const isShowGrant = menu.path.substr(0, 20) === '/cmdb/relationviews/'
       const target = menu.meta.target || null
       const tag = target && 'a' || 'router-link'
       const props = { to: { name: menu.name } }
@@ -205,11 +204,9 @@ export default {
                   <a-icon type="menu" ref="extraEllipsis" class="custom-menu-extra-ellipsis"></a-icon>
                 </a-popover>
               }
-              {isShowGrant && <a-icon class="custom-menu-extra-ellipsis" onClick={e => this.handlePerm(e, menu, 'RelationView')} type="user-add" />}
             </span>
           </tag>
           {isShowDot && <CMDBGrant ref="cmdbGrantCIType" resourceType="CIType" app_id="cmdb" />}
-          {isShowGrant && <CMDBGrant ref="cmdbGrantRelationView" resourceType="RelationView" app_id="cmdb" />}
         </Item>
       )
     },
@@ -313,10 +310,7 @@ export default {
         <Item class={styles['cmdb-side-menu-search']}>
           <a-input
             ref="cmdbSideMenuSearchInputRef"
-            class={styles['cmdb-side-menu-search-input']}
-            style={{
-              border: this.$route.name === 'cmdb_resource_search' ? 'solid 1px #B1C9FF' : ''
-            }}
+            class={`ops-input ${this.$route.name === 'cmdb_resource_search' ? 'cmdb-side-menu-search-focused' : ''}`}
             placeholder={this.$t('cmdbSearch')}
             onPressEnter={(e) => {
               this.jumpCMDBSearch(e.target.value)

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

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

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

@@ -226,16 +226,16 @@ export default {
     right: 4px;
     display: none;
     &:hover {
-      color: #1f78d1;
+      color: @primary-color;
     }
   }
   &:hover .ant-transfer-list-icon {
     display: inline;
-    background-color: #c0eaff;
+    background-color: @primary-color_4;
     border-radius: 4px;
   }
 }
 .ant-transfer-list-content-item-selected {
-  background-color: #f0faff;
+  background-color: ~'@{primary-color_8}35';
 }
 </style>

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

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

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

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

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

@@ -58,10 +58,7 @@
           :title="$t('acl.visualRole')"
           :width="120"
           align="center"
-          :filters="[
-            { label: $t('yes'), value: 1 },
-            { label: $t('no'), value: 0 },
-          ]"
+          :filters="visualRoleFilters"
           :filterMultiple="false"
           :filter-method="
             ({ value, row }) => {
@@ -155,6 +152,10 @@ export default {
       pageSizeOptions: ['20', '50', '100', '200'],
       searchName: '',
       filterTableValue: { user_role: 1, user_only: 0 },
+      visualRoleFilters: [
+        { label: this.$t('yes'), value: 1 },
+        { label: this.$t('no'), value: 0 }
+      ]
     }
   },
   computed: {
@@ -291,11 +292,11 @@ export default {
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;
-  padding: 24px;
+  padding: 20px;
   .acl-roles-header {
     width: 100%;
     display: inline-flex;
-    margin-bottom: 15px;
+    margin-bottom: 20px;
     align-items: center;
     .ant-checkbox-wrapper {
       margin-left: auto;

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

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

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

@@ -187,7 +187,7 @@ export default {
       width: 12px;
       height: 12px;
       background-color: @primary-color;
-      border: solid 3px #E2E7FC;
+      border: solid 3px @primary-color_4;
       border-radius: 50%;
     }
 

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

@@ -1,150 +1,156 @@
-<template>
-  <div class="ci-type-grant">
-    <vxe-table
-      ref="xTable"
-      size="mini"
-      stripe
-      class="ops-stripe-table"
-      :data="filterTableData"
-      :max-height="`${tableHeight}px`"
-      :row-style="(params) => getCurrentRowStyle(params, addedRids)"
-    >
-      <vxe-column field="name"></vxe-column>
-      <vxe-column v-for="col in columns" :key="col" :field="col" :title="permMap[col]">
-        <template #default="{row}">
-          <ReadCheckbox
-            v-if="['read'].includes(col.split('_')[0])"
-            :value="row[col.split('_')[0]]"
-            :valueKey="col"
-            :rid="row.rid"
-            @openReadGrantModal="() => openReadGrantModal(col, row)"
-          />
-          <a-checkbox v-else-if="col === 'grant'" :checked="row[col]" @click="clickGrant(col, row)"></a-checkbox>
-          <a-checkbox @change="(e) => handleChange(e, col, row)" v-else v-model="row[col]"></a-checkbox>
-        </template>
-      </vxe-column>
-      <template #empty>
-        <div v-if="loading()" style="height: 200px; line-height: 200px;color:#2F54EB">
-          <a-icon type="loading" /> {{ $t('loading') }}
-        </div>
-        <div v-else>
-          <img :style="{ width: '100px' }" :src="require('@/assets/data_empty.png')" />
-          <div>{{ $t('noData') }}</div>
-        </div>
-      </template>
-    </vxe-table>
-    <a-space>
-      <span class="grant-button" @click="grantDepart">{{ $t('cmdb.components.grantUser') }}</span>
-      <span class="grant-button" @click="grantRole">{{ $t('cmdb.components.grantRole') }}</span>
-    </a-space>
-  </div>
-</template>
-
-<script>
-import _ from 'lodash'
-import { permMap } from './constants.js'
-import { grantCiType, revokeCiType } from '../../api/CIType'
-import ReadCheckbox from './readCheckbox.vue'
-import { getCurrentRowStyle } from './utils'
-
-export default {
-  name: 'CiTypeGrant',
-  components: { ReadCheckbox },
-  inject: ['loading', 'isModal'],
-  props: {
-    CITypeId: {
-      type: Number,
-      default: null,
-    },
-    tableData: {
-      type: Array,
-      default: () => [],
-    },
-    grantType: {
-      type: String,
-      default: 'ci_type',
-    },
-    addedRids: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  computed: {
-    filterTableData() {
-      const _tableData = this.tableData.filter((data) => {
-        const _intersection = _.intersection(
-          Object.keys(data),
-          this.columns.map((col) => col.split('_')[0])
-        )
-        return _intersection && _intersection.length
-      })
-      return _.uniqBy(_tableData, (item) => item.rid)
-    },
-    columns() {
-      if (this.grantType === 'ci_type') {
-        return ['config', 'grant']
-      }
-      return ['read_attr', 'read_ci', 'create', 'update', 'delete']
-    },
-    windowHeight() {
-      return this.$store.state.windowHeight
-    },
-    tableHeight() {
-      if (this.isModal) {
-        return (this.windowHeight - 104) / 2
-      }
-      return (this.windowHeight - 104) / 2 - 116
-    },
-    permMap() {
-      return permMap()
-    }
-  },
-  methods: {
-    getCurrentRowStyle,
-    async handleChange(e, col, row) {
-      if (e.target.checked) {
-        await grantCiType(this.CITypeId, row.rid, { perms: [col] }).catch(() => {
-          this.$emit('getTableData')
-        })
-      } else {
-        await revokeCiType(this.CITypeId, row.rid, { perms: [col] }).catch(() => {
-          this.$emit('getTableData')
-        })
-      }
-    },
-    grantDepart() {
-      this.$emit('grantDepart', this.grantType)
-    },
-    grantRole() {
-      this.$emit('grantRole', this.grantType)
-    },
-    openReadGrantModal(col, row) {
-      this.$emit('openReadGrantModal', col, row)
-    },
-    clickGrant(col, row, rowIndex) {
-      if (!row[col]) {
-        this.handleChange({ target: { checked: true } }, col, row)
-        const _idx = this.tableData.findIndex((item) => item.rid === row.rid)
-        this.$set(this.tableData, _idx, { ...this.tableData[_idx], grant: true })
-      } else {
-        const that = this
-        this.$confirm({
-          title: that.$t('warning'),
-          content: that.$t('cmdb.components.confirmRevoke', { name: `${row.name}` }),
-          onOk() {
-            that.handleChange({ target: { checked: false } }, col, row)
-            const _idx = that.tableData.findIndex((item) => item.rid === row.rid)
-            that.$set(that.tableData, _idx, { ...that.tableData[_idx], grant: false })
-          },
-        })
-      }
-    },
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.ci-type-grant {
-  padding: 10px 0;
-}
-</style>
+<template>
+  <div class="ci-type-grant">
+    <vxe-table
+      ref="xTable"
+      size="mini"
+      stripe
+      class="ops-stripe-table"
+      :data="filterTableData"
+      :max-height="`${tableHeight}px`"
+      :row-class-name="(params) => getCurrentRowClass(params, addedRids)"
+    >
+      <vxe-column field="name"></vxe-column>
+      <vxe-column v-for="col in columns" :key="col" :field="col" :title="permMap[col]">
+        <template #default="{row}">
+          <ReadCheckbox
+            v-if="['read'].includes(col.split('_')[0])"
+            :value="row[col.split('_')[0]]"
+            :valueKey="col"
+            :rid="row.rid"
+            @openReadGrantModal="() => openReadGrantModal(col, row)"
+          />
+          <a-checkbox v-else-if="col === 'grant'" :checked="row[col]" @click="clickGrant(col, row)"></a-checkbox>
+          <a-checkbox @change="(e) => handleChange(e, col, row)" v-else v-model="row[col]"></a-checkbox>
+        </template>
+      </vxe-column>
+      <template #empty>
+        <div v-if="loading()" class="ci-type-grant-loading">
+          <a-icon type="loading" /> {{ $t('loading') }}
+        </div>
+        <div v-else>
+          <img :style="{ width: '100px' }" :src="require('@/assets/data_empty.png')" />
+          <div>{{ $t('noData') }}</div>
+        </div>
+      </template>
+    </vxe-table>
+    <a-space>
+      <span class="grant-button" @click="grantDepart">{{ $t('cmdb.components.grantUser') }}</span>
+      <span class="grant-button" @click="grantRole">{{ $t('cmdb.components.grantRole') }}</span>
+    </a-space>
+  </div>
+</template>
+
+<script>
+import _ from 'lodash'
+import { permMap } from './constants.js'
+import { grantCiType, revokeCiType } from '../../api/CIType'
+import ReadCheckbox from './readCheckbox.vue'
+import { getCurrentRowClass } from './utils'
+
+export default {
+  name: 'CiTypeGrant',
+  components: { ReadCheckbox },
+  inject: ['loading', 'isModal'],
+  props: {
+    CITypeId: {
+      type: Number,
+      default: null,
+    },
+    tableData: {
+      type: Array,
+      default: () => [],
+    },
+    grantType: {
+      type: String,
+      default: 'ci_type',
+    },
+    addedRids: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  computed: {
+    filterTableData() {
+      const _tableData = this.tableData.filter((data) => {
+        const _intersection = _.intersection(
+          Object.keys(data),
+          this.columns.map((col) => col.split('_')[0])
+        )
+        return _intersection && _intersection.length
+      })
+      return _.uniqBy(_tableData, (item) => item.rid)
+    },
+    columns() {
+      if (this.grantType === 'ci_type') {
+        return ['config', 'grant']
+      }
+      return ['read_attr', 'read_ci', 'create', 'update', 'delete']
+    },
+    windowHeight() {
+      return this.$store.state.windowHeight
+    },
+    tableHeight() {
+      if (this.isModal) {
+        return (this.windowHeight - 104) / 2
+      }
+      return (this.windowHeight - 104) / 2 - 116
+    },
+    permMap() {
+      return permMap()
+    }
+  },
+  methods: {
+    getCurrentRowClass,
+    async handleChange(e, col, row) {
+      if (e.target.checked) {
+        await grantCiType(this.CITypeId, row.rid, { perms: [col] }).catch(() => {
+          this.$emit('getTableData')
+        })
+      } else {
+        await revokeCiType(this.CITypeId, row.rid, { perms: [col] }).catch(() => {
+          this.$emit('getTableData')
+        })
+      }
+    },
+    grantDepart() {
+      this.$emit('grantDepart', this.grantType)
+    },
+    grantRole() {
+      this.$emit('grantRole', this.grantType)
+    },
+    openReadGrantModal(col, row) {
+      this.$emit('openReadGrantModal', col, row)
+    },
+    clickGrant(col, row, rowIndex) {
+      if (!row[col]) {
+        this.handleChange({ target: { checked: true } }, col, row)
+        const _idx = this.tableData.findIndex((item) => item.rid === row.rid)
+        this.$set(this.tableData, _idx, { ...this.tableData[_idx], grant: true })
+      } else {
+        const that = this
+        this.$confirm({
+          title: that.$t('warning'),
+          content: that.$t('cmdb.components.confirmRevoke', { name: `${row.name}` }),
+          onOk() {
+            that.handleChange({ target: { checked: false } }, col, row)
+            const _idx = that.tableData.findIndex((item) => item.rid === row.rid)
+            that.$set(that.tableData, _idx, { ...that.tableData[_idx], grant: false })
+          },
+        })
+      }
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.ci-type-grant {
+  padding: 10px 0;
+
+  &-loading {
+    height: 200px;
+    line-height: 200px;
+    color: @primary-color;
+  }
+}
+</style>

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

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

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

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

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

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

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

@@ -8,7 +8,7 @@
       :data="tableData"
       :max-height="`${tableHeight}px`"
       :scroll-y="{enabled: true}"
-      :row-style="(params) => getCurrentRowStyle(params, addedRids)"
+      :row-class-name="(params) => getCurrentRowClass(params, addedRids)"
     >
       <vxe-column field="name"></vxe-column>
       <vxe-column v-for="col in columns" :key="col" :field="col" :title="permMap[col]">
@@ -27,7 +27,7 @@
 <script>
 import { permMap } from './constants.js'
 import { grantTopologyView, revokeTopologyView } from '@/modules/cmdb/api/topology.js'
-import { getCurrentRowStyle } from './utils'
+import { getCurrentRowClass } from './utils'
 export default {
   name: 'TopologyViewGrant',
   inject: ['loading', 'isModal'],
@@ -73,7 +73,7 @@ export default {
     }
   },
   methods: {
-    getCurrentRowStyle,
+    getCurrentRowClass,
     grantDepart() {
       this.$emit('grantDepart', this.grantType)
     },

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

@@ -1,100 +1,100 @@
-<template>
-  <div class="ci-relation-grant">
-    <vxe-table
-      ref="xTable"
-      size="mini"
-      stripe
-      class="ops-stripe-table"
-      :data="tableData"
-      :max-height="`${tableHeight}px`"
-      :row-style="(params) => getCurrentRowStyle(params, addedRids)"
-    >
-      <vxe-column field="name"></vxe-column>
-      <vxe-column v-for="col in columns" :key="col" :field="col" :title="permMap[col]">
-        <template #default="{row}">
-          <a-checkbox @change="(e) => handleChange(e, col, row)" v-model="row[col]"></a-checkbox>
-        </template>
-      </vxe-column>
-    </vxe-table>
-    <a-space>
-      <span class="grant-button" @click="grantDepart">{{ $t('cmdb.components.grantUser') }}</span>
-      <span class="grant-button" @click="grantRole">{{ $t('cmdb.components.grantRole') }}</span>
-    </a-space>
-  </div>
-</template>
-
-<script>
-import { permMap } from './constants.js'
-import { grantTypeRelation, revokeTypeRelation } from '../../api/CITypeRelation.js'
-import { getCurrentRowStyle } from './utils'
-
-export default {
-  name: 'TypeRelationGrant',
-  inject: ['loading', 'isModal'],
-  props: {
-    tableData: {
-      type: Array,
-      default: () => [],
-    },
-    grantType: {
-      type: String,
-      default: 'type_relation',
-    },
-    typeRelationIds: {
-      type: Array,
-      default: null,
-    },
-    addedRids: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      columns: ['create', 'grant', 'delete'],
-    }
-  },
-  computed: {
-    windowHeight() {
-      return this.$store.state.windowHeight
-    },
-    tableHeight() {
-      if (this.isModal) {
-        return (this.windowHeight - 104) / 2
-      }
-      return (this.windowHeight - 104) / 2 - 116
-    },
-    permMap() {
-      return permMap()
-    }
-  },
-  methods: {
-    getCurrentRowStyle,
-    grantDepart() {
-      this.$emit('grantDepart', this.grantType)
-    },
-    grantRole() {
-      this.$emit('grantRole', this.grantType)
-    },
-    handleChange(e, col, row) {
-      const first = this.typeRelationIds[0]
-      const second = this.typeRelationIds[1]
-      if (e.target.checked) {
-        grantTypeRelation(first, second, row.rid, { perms: [col] }).catch(() => {
-          this.$emit('getTableData')
-        })
-      } else {
-        revokeTypeRelation(first, second, row.rid, { perms: [col] }).catch(() => {
-          this.$emit('getTableData')
-        })
-      }
-    },
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.ci-relation-grant {
-  padding: 10px 0;
-}
-</style>
+<template>
+  <div class="ci-relation-grant">
+    <vxe-table
+      ref="xTable"
+      size="mini"
+      stripe
+      class="ops-stripe-table"
+      :data="tableData"
+      :max-height="`${tableHeight}px`"
+      :row-class-name="(params) => getCurrentRowClass(params, addedRids)"
+    >
+      <vxe-column field="name"></vxe-column>
+      <vxe-column v-for="col in columns" :key="col" :field="col" :title="permMap[col]">
+        <template #default="{row}">
+          <a-checkbox @change="(e) => handleChange(e, col, row)" v-model="row[col]"></a-checkbox>
+        </template>
+      </vxe-column>
+    </vxe-table>
+    <a-space>
+      <span class="grant-button" @click="grantDepart">{{ $t('cmdb.components.grantUser') }}</span>
+      <span class="grant-button" @click="grantRole">{{ $t('cmdb.components.grantRole') }}</span>
+    </a-space>
+  </div>
+</template>
+
+<script>
+import { permMap } from './constants.js'
+import { grantTypeRelation, revokeTypeRelation } from '../../api/CITypeRelation.js'
+import { getCurrentRowClass } from './utils'
+
+export default {
+  name: 'TypeRelationGrant',
+  inject: ['loading', 'isModal'],
+  props: {
+    tableData: {
+      type: Array,
+      default: () => [],
+    },
+    grantType: {
+      type: String,
+      default: 'type_relation',
+    },
+    typeRelationIds: {
+      type: Array,
+      default: null,
+    },
+    addedRids: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      columns: ['create', 'grant', 'delete'],
+    }
+  },
+  computed: {
+    windowHeight() {
+      return this.$store.state.windowHeight
+    },
+    tableHeight() {
+      if (this.isModal) {
+        return (this.windowHeight - 104) / 2
+      }
+      return (this.windowHeight - 104) / 2 - 116
+    },
+    permMap() {
+      return permMap()
+    }
+  },
+  methods: {
+    getCurrentRowClass,
+    grantDepart() {
+      this.$emit('grantDepart', this.grantType)
+    },
+    grantRole() {
+      this.$emit('grantRole', this.grantType)
+    },
+    handleChange(e, col, row) {
+      const first = this.typeRelationIds[0]
+      const second = this.typeRelationIds[1]
+      if (e.target.checked) {
+        grantTypeRelation(first, second, row.rid, { perms: [col] }).catch(() => {
+          this.$emit('getTableData')
+        })
+      } else {
+        revokeTypeRelation(first, second, row.rid, { perms: [col] }).catch(() => {
+          this.$emit('getTableData')
+        })
+      }
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.ci-relation-grant {
+  padding: 10px 0;
+}
+</style>

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

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

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

@@ -16,12 +16,8 @@
     <template v-for="(item, index) in preferenceSearchList.slice(0, 3)">
       <span
         v-if="item.name.length > 6"
-        class="preference-search-tag"
+        :class="['preference-search-tag', item.id === currentPreferenceSearch ? 'preference-search-tag-focus' : '']"
         :key="`${item.id}_${index}`"
-        :style="{
-          backgroundColor: item.id === currentPreferenceSearch ? '#2f54eb' : '',
-          color: item.id === currentPreferenceSearch ? '#fff' : '',
-        }"
       >
         <a-tooltip :title="item.name">
           <span @click="clickPreferenceSearch(item)">{{ `${item.name.slice(0, 6)}...` }}</span>
@@ -33,11 +29,7 @@
       <span
         v-else
         :key="`${item.id}_${index}`"
-        class="preference-search-tag"
-        :style="{
-          backgroundColor: item.id === currentPreferenceSearch ? '#2f54eb' : '#fafafa',
-          color: item.id === currentPreferenceSearch ? '#fff' : '#000000a6',
-        }"
+        :class="['preference-search-tag', item.id === currentPreferenceSearch ? 'preference-search-tag-focus' : '']"
       >
         <span @click="clickPreferenceSearch(item)">{{ item.name }}</span>
         <a-popconfirm :title="$t('cmdb.ciType.confirmDelete2')" @confirm="deletePreferenceSearch(item)">
@@ -189,6 +181,15 @@ export default {
   > i {
     font-size: 12px;
   }
+
+  &:hover {
+    color: @primary-color;
+  }
+
+  &-focus {
+    background-color: @primary-color;
+    color: #FFFFFF !important;
+  }
 }
 .preference-search-delete {
   color: #a9a9a9;

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

@@ -5,13 +5,11 @@
         <a-space>
           <treeselect
             v-if="type === 'resourceSearch'"
-            class="custom-treeselect custom-treeselect-bgcAndBorder"
+            class="custom-treeselect"
             :style="{
               width: '200px',
               marginRight: '10px',
               '--custom-height': '32px',
-              '--custom-bg-color': '#fff',
-              '--custom-border': '1px solid #d9d9d9',
               '--custom-multiple-lineHeight': '16px',
             }"
             v-model="currenCiType"
@@ -55,7 +53,7 @@
             <a-icon
               type="search"
               slot="suffix"
-              :style="{ color: fuzzySearch ? '#2f54eb' : '#d9d9d9', cursor: 'pointer' }"
+              :class="['search-form-bar-input-icon', fuzzySearch ? 'search-form-bar-input-icon-focus' : '']"
               @click="emitRefresh"
             />
             <a-tooltip slot="prefix" placement="bottom" :overlayStyle="{ maxWidth: '550px', whiteSpace: 'pre-line' }">
@@ -310,6 +308,16 @@ export default {
   justify-content: space-between;
   align-items: center;
   height: 32px;
+
+  &-input-icon {
+    cursor: pointer;
+    color: #d9d9d9;
+
+    &-focus {
+      color: @primary-color;
+    }
+  }
+
   .search-form-bar-filter {
     .ops_display_wrapper(transparent);
 

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

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

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

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

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

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

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

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

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

@@ -26,7 +26,8 @@ const cmdb_en = {
         ad: 'AutoDiscovery',
         cidetail: 'CI Detail',
         scene: 'Scene',
-        dcim: 'DCIM'
+        dcim: 'DCIM',
+        serviceTree: 'Service Tree'
     },
     ciType: {
         ciType: 'CIType',
@@ -314,6 +315,10 @@ const cmdb_en = {
         enum: 'Enum',
         ciGrantTip: `Filter conditions can be changed dynamically using {{}} referenced variables, currently user variables are supported, such as {{user.uid}},{{user.username}},{{user.email}},{{user.nickname}}`,
         searchInputTip: 'Please search for resource keywords',
+        columnSearchInputTip: '192.168.1.1\n192.168.1.2\n192.168.1.3',
+        rowSearchMode: 'Single Row',
+        columnSearchMode: 'Multi Row',
+        columnSearchTip: 'Supports retrieval of short texts only',
         resourceSearch: 'Resource Search',
         recentSearch: 'Recent Search',
         myCollection: 'My Collection',

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

@@ -26,7 +26,8 @@ const cmdb_zh = {
         ad: '自动发现',
         cidetail: 'CI 详情',
         scene: '场景',
-        dcim: '数据中心'
+        dcim: '数据中心',
+        serviceTree: '服务树'
     },
     ciType: {
         ciType: '模型',
@@ -314,6 +315,10 @@ const cmdb_zh = {
         enum: '枚举',
         ciGrantTip: `筛选条件可使用{{}}引用变量实现动态变化，目前支持用户变量，如{{user.uid}},{{user.username}},{{user.email}},{{user.nickname}}`,
         searchInputTip: '请搜索资源关键字',
+        columnSearchInputTip: '192.168.1.1\n192.168.1.2\n192.168.1.3',
+        rowSearchMode: '单行',
+        columnSearchMode: '多行',
+        columnSearchTip: '仅支持检索短文本',
         resourceSearch: '资源搜索',
         recentSearch: '最近搜索',
         myCollection: '我的收藏',

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

@@ -27,6 +27,17 @@ const genCmdbRoutes = async () => {
         name: 'cmdb_disabled1',
         meta: { title: 'cmdb.menu.resources', disabled: true },
       },
+      {
+        path: '/cmdb/relationviews/:viewId?',
+        name: 'cmdb_relation_views',
+        component: () => import('../views/relation_views/index'),
+        meta: {
+          title: 'cmdb.menu.serviceTree',
+          appName: 'cmdb',
+          icon: 'veops-servicetree',
+          keepAlive: false
+        },
+      },
       {
         path: '/cmdb/resourceviews',
         name: 'cmdb_resource_views',
@@ -194,15 +205,14 @@ const genCmdbRoutes = async () => {
   } else {
     routes.redirect = '/cmdb/dashboard'
   }
-  const relationViews = relation.name2id.map(item => {
-    return {
-      path: `/cmdb/relationviews/${item[1]}`,
-      name: `cmdb_relation_views_${item[1]}`,
-      component: () => import('../views/relation_views/index'),
-      meta: { title: item[0], icon: 'ops-cmdb-relation', selectedIcon: 'ops-cmdb-relation', keepAlive: false, name: item[0] },
+
+  if (relation?.name2id?.length === 0) {
+    const relationViewRouteIndex = routes.children?.findIndex?.((route) => route.name === 'cmdb_relation_views')
+    if (relationViewRouteIndex >= 0) {
+      routes.children.splice(relationViewRouteIndex, 1)
     }
-  })
-  routes.children.splice(resourceViewsIndex, 0, ...relationViews)
+  }
+
   return routes
 }
 

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

@@ -14,7 +14,7 @@
       <p v-html="$t('cmdb.batch.drawTips1')"></p>
       <p v-html="$t('cmdb.batch.drawTips2')"></p>
       <div v-for="item in fileList" :key="item.name" class="cmdb-batch-upload-dragger-file">
-        <span><a-icon type="file" :style="{ color: '#2F54EB', marginRight: '5px' }" />{{ item.name }}</span>
+        <span><a-icon type="file" class="cmdb-batch-upload-dragger-file-icon"/>{{ item.name }}</span>
         <a-progress :status="progressStatus" :percent="percent" />
       </div>
     </a-upload-dragger>
@@ -92,18 +92,17 @@ export default {
   }
   .ant-upload.ant-upload-drag {
     border: none;
-    background: linear-gradient(90deg, @text-color_5 50%, transparent 0) repeat-x,
-      linear-gradient(90deg, @text-color_5 50%, transparent 0) repeat-x,
-      linear-gradient(0deg, @text-color_5 50%, transparent 0) repeat-y,
-      linear-gradient(0deg, @text-color_5 50%, transparent 0) repeat-y;
-    background-size: 15px 1px, 15px 1px, 1px 15px, 1px 15px;
-    background-position: 0 0, 0 100%, 0 0, 100% 0;
+    background: ~'linear-gradient(90deg, @{text-color_5} 50%, transparent 0) repeat-x 0 0 / 15px 1px, linear-gradient(90deg, @{text-color_5} 50%, transparent 0) repeat-x 0 100% / 15px 1px, linear-gradient(0deg, @{text-color_5} 50%, transparent 0) repeat-y 0 0 / 1px 15px, linear-gradient(0deg, @{text-color_5} 50%, transparent 0) repeat-y 100% 0 / 1px 15px';
     .ant-upload-drag-container > i {
       font-size: 60px;
     }
     .cmdb-batch-upload-tips {
       color: @primary-color;
     }
+
+    &:hover {
+      background: ~'linear-gradient(90deg, @{primary-color_2} 50%, transparent 0) repeat-x 0 0 / 15px 1px, linear-gradient(90deg, @{primary-color_2} 50%, transparent 0) repeat-x 0 100% / 15px 1px, linear-gradient(0deg, @{primary-color_2} 50%, transparent 0) repeat-y 0 0 / 1px 15px, linear-gradient(0deg, @{primary-color_2} 50%, transparent 0) repeat-y 100% 0 / 1px 15px, @{primary-color_7}';
+    }
   }
   .ant-upload.ant-upload-drag .ant-upload-drag-container {
     vertical-align: baseline;
@@ -129,6 +128,11 @@ export default {
       white-space: nowrap;
       margin-right: 10px;
     }
+
+    &-icon {
+      color: @primary-color;
+      margin-right: 5px;
+    }
   }
   .cmdb-batch-upload-tips {
     width: 50%;

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

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

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

@@ -33,8 +33,8 @@
       </a-tab-pane>
       <a-tab-pane key="tab_3">
         <span slot="tab"><a-icon type="clock-circle" />{{ $t('cmdb.ci.history') }}</span>
-        <div :style="{ padding: '24px', height: '100%' }">
-          <a-space :style="{ 'margin-bottom': '10px', display: 'flex' }">
+        <div :style="{ padding: '16px 24px 24px', height: '100%' }">
+          <a-space :style="{ marginBottom: '16px', display: 'flex' }">
             <a-button type="primary" class="ops-button-ghost" ghost @click="handleRollbackCI()">
               <ops-icon type="shishizhuangtai" />{{ $t('cmdb.ci.rollback') }}
             </a-button>
@@ -180,7 +180,7 @@ export default {
       ci_types: [],
       hasPermission: true,
       itsmInstalled: true,
-      tableHeight: this.attributeHistoryTableHeight || (this.$store.state.windowHeight - 120),
+      tableHeight: this.attributeHistoryTableHeight || (this.$store.state.windowHeight - 130),
       initQueryLoading: true,
     }
   },

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

@@ -95,7 +95,7 @@
               attr.name,
               {
                 rules: [{ required: attr.is_required, message: $t('placeholder1') + `${attr.alias || attr.name}` }],
-                initialValue: attr.default && attr.default.default ? attr.default.default : null,
+                initialValue: attr.default && attr.default.default !== undefined && attr.default.default !== null ? attr.default.default : null,
               },
             ]"
             style="width: 100%"
@@ -148,6 +148,7 @@
 </template>
 
 <script>
+import _ from 'lodash'
 import moment from 'moment'
 import JsonEditor from '../../../components/JsonEditor/jsonEditor.vue'
 import CIReferenceAttr from '@/components/ciReferenceAttr/index.vue'
@@ -210,7 +211,7 @@ export default {
     },
 
     getChoiceDefault(attr) {
-      if (!attr?.default?.default) {
+      if (_.isNil(attr?.default?.default)) {
         return attr.is_list ? [] : null
       }
 

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

@@ -61,16 +61,20 @@ export default {
     justify-content: center;
     font-size: 12px;
     font-weight: 400;
-    color: #4E5969;
-    background-color: #F7F8FA;
+    color: @text-color_2;
+    background-color: @primary-color_7;
     width: 105px;
     height: 32px;
     cursor: pointer;
 
     &-active {
-      border: solid 1px #B1C9FF;
-      background-color: #E1EFFF;
-      color: #2F54EB;
+      border: solid 1px @primary-color_8;
+      background-color: @primary-color_4;
+      color: @primary-color;
+    }
+
+    &:hover {
+      color: @primary-color;
     }
   }
 }

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

@@ -154,6 +154,17 @@ export default {
       margin-left: 6px;
     }
 
+    &:hover {
+      background-color: @primary-color_5;
+
+      .attr-ad-tab-edit {
+        display: inline-block;
+      }
+      .attr-ad-tab-delete {
+        display: inline-block;
+      }
+    }
+
     &_active {
       border: solid 1px @primary-color_8;
       background-color: @primary-color_6;
@@ -161,14 +172,9 @@ export default {
       .attr-ad-tab-name {
         color: @primary-color;
       }
-    }
 
-    &:hover {
-      .attr-ad-tab-edit {
-        display: inline-block;
-      }
-      .attr-ad-tab-delete {
-        display: inline-block;
+      &:hover {
+        background-color: @primary-color_6;
       }
     }
   }
@@ -178,6 +184,11 @@ export default {
     background-color: @primary-color_7;
     font-size: 12px;
     color: @text-color_4;
+
+    &:hover {
+      background-color: @primary-color_5;
+      color: @primary-color;
+    }
   }
 }
 </style>

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

@@ -3,12 +3,14 @@
     <div class="attr-ad-header attr-ad-header-margin">{{ $t('cmdb.ciType.configCheckTitle') }}</div>
     <div class="attr-ad-content">
       <div class="ad-test-title-info">{{ $t('cmdb.ciType.checkTestTip') }}</div>
-      <div
-        class="ad-test-btn"
+      <a-button
+        type="primary"
+        class="ops-button-ghost ad-test-btn"
+        ghost
         @click="showCheckModal"
       >
         {{ $t('cmdb.ciType.checkTestBtn') }}
-      </div>
+      </a-button>
       <div class="ad-test-btn-info">{{ $t('cmdb.ciType.checkTestTip2') }}</div>
       <!-- <div
         class="ad-test-btn"
@@ -140,15 +142,6 @@ export default {
 
   .ad-test-btn {
     margin-top: 30px;
-    padding: 5px 12px;
-    background-color: #F4F9FF;
-    border: solid 1px @primary-color_8;
-    display: inline-block;
-    cursor: pointer;
-
-    color: @link-color;
-    font-size: 12px;
-    font-weight: 400;
   }
 
   .ad-test-btn-info {

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

@@ -47,8 +47,8 @@
             <a-descriptions layout="horizontal" bordered size="small" :column="2">
               <a-descriptions-item v-for="item in propertyList" :key="item.property" :label="item.label">
                 <ops-icon
-                  :style="{ color: property[item.property] ? '#7f97fa' : '', fontSize: '10px' }"
                   :type="`ops-${item.property}-disabled`"
+                  :class="['attribute-card-footer-icon', property[item.property] ? 'attribute-card-footer-icon-mark' : '']"
                 />
               </a-descriptions-item>
               <a-descriptions-item label></a-descriptions-item>
@@ -58,7 +58,7 @@
             <ops-icon
               v-for="item in propertyList.filter((p) => property[p.property])"
               :key="item.property"
-              :style="{ color: '#7f97fa', fontSize: '10px' }"
+              class="attribute-card-footer-icon attribute-card-footer-icon-mark"
               :type="`ops-${item.property}-disabled`"
             />
           </a-space>
@@ -247,13 +247,13 @@ export default {
 .attribute-card {
   width: 172px;
   height: 75px;
-  background: @primary-color_6;
+  background-color: @primary-color_6;
   border-radius: 2px;
   position: relative;
   margin-bottom: 16px;
   transition: all 0.3s;
   &:hover {
-    box-shadow: 0 4px 12px #4e5ea066;
+    box-shadow: 0 4px 12px @primary-color_8;
     .attribute-card-operation {
       visibility: visible !important;
     }
@@ -342,6 +342,15 @@ export default {
     padding: 2px 0 2px 5px;
   }
 }
+
+.attribute-card-footer-icon {
+  font-size: 10px;
+
+  &-mark {
+    color: @primary-color_2;
+  }
+}
+
 .attribute-card-inherited {
   background: @primary-color_7;
   .attribute-card-footer {
@@ -356,10 +365,10 @@ export default {
   justify-content: center;
   cursor: pointer;
   position: relative;
-  background-color: inherit;
+  background-color: inherit !important;
   &:hover {
-    box-shadow: none;
-    background-color: @primary-color_6;
+    box-shadow: none !important;
+    background-color: @primary-color_6 !important;
   }
   &:after {
     content: '';

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

@@ -659,7 +659,7 @@ export default {
             } else {
               this.$nextTick(() => {
                 this.form.setFieldsValue({
-                  default_value: _record.default && _record.default.default ? _record.default.default : null,
+                  default_value: _record?.default?.default ?? null,
                 })
               })
             }

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

@@ -140,7 +140,7 @@
                           :type="ci.icon.split('$$')[0]"
                         />
                       </template>
-                      <span :style="{ color: '#2f54eb' }" v-else>{{ ci.name[0].toUpperCase() }}</span>
+                      <span class="primary-color" v-else>{{ ci.name[0].toUpperCase() }}</span>
                     </span>
                   </div>
                   <span class="ci-types-left-detail-title">{{ ci.alias || ci.name }}</span>
@@ -1194,7 +1194,7 @@ export default {
     .selected {
       background-color: @primary-color_3;
       .ci-types-left-detail-title {
-        font-weight: 700;
+        color: @primary-color;
       }
     }
   }

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

@@ -35,7 +35,7 @@
                   :title="$t('cmdb.ciType.choiceWebhookTips')"
                 >
                   <a-icon
-                    style="position:absolute;top:3px;left:-17px;color:#2f54eb;"
+                    class="tab-webhook-filter-icon"
                     type="question-circle"
                     theme="filled"
                   />
@@ -61,13 +61,11 @@
               :disable-branch-nodes="true"
               :class="{
                 'custom-treeselect': true,
-                'custom-treeselect-bgcAndBorder': true,
+                'custom-treeselect-white': true,
               }"
               :style="{
                 '--custom-height': '32px',
                 lineHeight: '32px',
-                '--custom-bg-color': '#fff',
-                '--custom-border': '1px solid #d9d9d9',
                 '--custom-multiple-lineHeight': '14px',
               }"
               v-model="choice_other.type_ids"
@@ -555,7 +553,7 @@ export default {
 
   &-tag {
     background-color: #E1EFFF;
-    color: #2F54EB;
+    color: @primary-color;
     font-size: 10px;
     font-weight: 400;
     padding: 0 3px;
@@ -577,6 +575,13 @@ export default {
   }
 }
 
+.tab-webhook-filter-icon {
+  position: absolute;
+  top: 3px;
+  left: -17px;
+  color: @primary-color;
+}
+
 .script-tip {
   font-size: 12px;
   line-height: 22px;

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

@@ -363,7 +363,7 @@ export default {
         width: 12px;
         height: 12px;
         background-color: @primary-color;
-        border: solid 3px #E2E7FC;
+        border: solid 3px @primary-color_4;
         border-radius: 50%
       }
 

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

@@ -31,7 +31,7 @@
       <vxe-column field="source_ci_type_name" :title="$t('cmdb.ciType.sourceCIType')"></vxe-column>
       <vxe-column field="relation_type" :title="$t('cmdb.ciType.relationType')">
         <template #default="{row}">
-          <span style="color:#2f54eb" v-if="row.isParent">{{ $t('cmdb.ciType.isParent') }}</span>
+          <span class="primary-color" v-if="row.isParent">{{ $t('cmdb.ciType.isParent') }}</span>
           {{ row.relation_type }}
         </template>
       </vxe-column>
@@ -700,7 +700,7 @@ export default {
   }
 
   /deep/ .relation-table-parent {
-    background-color: #f5f8ff !important;
+    background-color: @primary-color_5 !important;
   }
 }
 </style>

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

@@ -198,13 +198,11 @@
                 :disable-branch-nodes="true"
                 :class="{
                   'custom-treeselect': true,
-                  'custom-treeselect-bgcAndBorder': true,
+                  'custom-treeselect-white': true,
                 }"
                 :style="{
                   '--custom-height': '32px',
                   lineHeight: '32px',
-                  '--custom-bg-color': '#fff',
-                  '--custom-border': '1px solid #d9d9d9',
                   '--custom-multiple-lineHeight': '14px',
                 }"
                 v-model="selectedBot"

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

@@ -24,7 +24,7 @@
       <vxe-column field="attr_ids" :title="$t('cmdb.ciType.attributes')" :edit-render="{}">
         <template #default="{ row }">
           <template v-for="(attr, index) in row.attr_ids">
-            <span :key="attr" :style="{ color: '#2f54eb' }">{{ getDisplayName(attr) }}</span>
+            <span :key="attr" class="primary-color">{{ getDisplayName(attr) }}</span>
             <span :key="`_${attr}`" v-if="index !== row.attr_ids.length - 1"> + </span>
           </template>
         </template>

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

@@ -19,7 +19,7 @@
             :type="ciType.icon.split('$$')[0]"
           />
         </template>
-        <span :style="{ color: '#2f54eb' }" v-else>{{ ciType.name[0].toUpperCase() }}</span>
+        <span class="primary-color" v-else>{{ ciType.name[0].toUpperCase() }}</span>
       </div>
       <span :style="{ ...options.fontConfig }">{{ toThousands(data) }}</span>
     </div>

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

@@ -148,7 +148,7 @@
                       :type="ciType.icon.split('$$')[0]"
                     />
                   </template>
-                  <span :style="{ color: '#2f54eb' }" v-else>{{ ciType.name[0].toUpperCase() }}</span>
+                  <span class="primary-color" v-else>{{ ciType.name[0].toUpperCase() }}</span>
                 </template>
                 <span :style="{ color: '#000' }"> {{ form.name }}</span>
               </div>
@@ -195,12 +195,14 @@
             </template>
           </div>
           <a-form-model-item
-            :label="$t('cmdb.custom_dashboard.showIcon')"
             prop="showIcon"
-            :label-col="{ span: 5 }"
-            :wrapper-col="{ span: 18 }"
+            :label-col="{ span: 0 }"
+            :wrapper-col="{ span: 23 }"
           >
-            <a-switch v-model="form.showIcon"></a-switch>
+            <div class="chart-left-show-icon">
+              <span class="chart-left-show-icon-label">{{ $t('cmdb.custom_dashboard.showIcon') }}:</span>
+              <a-switch v-model="form.showIcon"></a-switch>
+            </div>
           </a-form-model-item>
         </a-form-model>
       </div>
@@ -733,6 +735,9 @@ export default {
       width: 92%;
       position: relative;
       padding: 12px;
+      margin-top: 4px;
+      display: inline-block;
+
       .chart-left-preview-operation {
         color: #86909c;
         position: absolute;
@@ -753,12 +758,26 @@ export default {
       background-position-x: center;
       background-position-y: center;
     }
+
+    &-show-icon {
+      display: flex;
+      align-items: center;
+
+      &-label {
+        flex-shrink: 0;
+        margin-right: 8px;
+      }
+    }
   }
   .chart-right {
     width: 50%;
     h4 {
       font-weight: 700;
       color: #000;
+
+      &:not(:first-child) {
+        margin-top: 14px;
+      }
     }
     .chart-right-type {
       display: flex;
@@ -781,7 +800,7 @@ export default {
         }
       }
       .chart-right-type-box-selected {
-        background-color: #e5f1ff;
+        background-color: @primary-color_3;
       }
     }
     .chart-width {
@@ -797,7 +816,7 @@ export default {
 <style lang="less">
 .chart-wrapper {
   .ant-form-item {
-    margin-bottom: 0;
+    margin-bottom: 8px;
   }
 }
 </style>

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

@@ -63,7 +63,7 @@
                   :type="getCiType(item).icon.split('$$')[0]"
                 />
               </template>
-              <span :style="{ color: '#2f54eb' }" v-else>{{ getCiType(item).name[0].toUpperCase() }}</span>
+              <span class="primary-color" v-else>{{ getCiType(item).name[0].toUpperCase() }}</span>
             </template>
             <span :style="{ color: item.options.chartType === 'count' ? item.options.fontColor : '#000' }">{{
               item.options.name

cmdb-ui/src/modules/cmdb/views/dcim/components/dcimMain/rackGrid.vue

@@ -268,18 +268,18 @@ export default {
         margin-right: 2px;
         font-size: 12px;
         font-weight: 400;
-        color: #3F75FF;
+        color: #2F54EB;
       }
 
       &-icon {
         font-size: 12px;
-        color: #3F75FF;
+        color: #2F54EB;
       }
     }
 
     &:hover {
       background-color: #FFFFFF;
-      box-shadow: 0px 22px 33px 0px rgba(41, 65, 126, 0.25);
+      box-shadow: ~'0px 22px 33px 0px @{primary-color}15';
       z-index: 2;
 
       .rack-grid-item-name {

cmdb-ui/src/modules/cmdb/views/dcim/components/dcimTree.vue

@@ -58,15 +58,11 @@
           >
             <ops-icon
               :type="treeNodeData.icon"
-              class="dcim-tree-node-icon"
-              :style="{ color: treeNodeData.iconColor }"
+              :class="['dcim-tree-node-icon', treeNodeData.dcimType === DCIM_TYPE.REGION ? 'primary-color' : '']"
             />
             <a-tooltip :title="treeNodeData.title">
               <span
-                class="dcim-tree-node-title"
-                :style="{
-                  color: treeKey === treeNodeData.key ? '#2F54EB' : ''
-                }"
+                :class="['dcim-tree-node-title', treeKey === treeNodeData.key ? 'primary-color' : '']"
               >
                 {{ treeNodeData.title }}
               </span>
@@ -164,6 +160,7 @@ export default {
         DCIM_TYPE.REGION,
         DCIM_TYPE.IDC
       ],
+      DCIM_TYPE,
 
       viewDetailCITypeId: 0,
       viewDetailAttrObj: {},
@@ -365,6 +362,7 @@ export default {
     &-icon {
       font-size: 12px;
       flex-shrink: 0;
+      color: #A5A9BC;
     }
 
     &-title {

cmdb-ui/src/modules/cmdb/views/dcim/components/rackDetail/rackView/rackUnitView.vue

@@ -117,8 +117,8 @@
               }"
               @click="addDevice(index)"
             >
-              <ops-icon
-                type="monitor-add"
+              <a-icon
+                type="plus-circle"
                 class="rack-container-main-list-gap-icon"
               />
               <span
@@ -492,12 +492,13 @@ export default {
         &-icon {
           font-size: 12px;
           display: none;
+          color: @primary-color;
         }
 
         &-text {
           font-size: 12px;
           font-weight: 400;
-          color: rgba(0, 87, 255, 0.80);
+          color: @primary-color;
           margin-left: 6px;
           display: none;
         }
@@ -508,7 +509,7 @@ export default {
         }
 
         &:hover {
-          background-color: #D5DDEE;
+          background-color: @primary-color_4;
 
           .rack-container-main-list-gap-icon {
             display: inline-block;

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

@@ -165,11 +165,12 @@ export default {
   display: inline-block;
   width: 180px;
   height: 105px;
-  box-shadow: 0px 2px 8px rgba(122, 140, 204, 0.25);
+  box-shadow: 0px 2px 8px @primary-color_3;
   border-radius: 4px;
   position: relative;
   margin-bottom: 40px;
   margin-right: 40px;
+  cursor: pointer;
 
   &-inner {
     position: absolute;
@@ -294,6 +295,12 @@ export default {
     }
   }
 
+  &, &.discovery-card-small {
+    &:hover {
+      box-shadow: 0px 6px 20px 0px @primary-color_3;
+    }
+  }
+
   &-http {
     width: 263px;
     height: 142px;
@@ -305,6 +312,10 @@ export default {
         max-width: 30px !important;
       }
     }
+
+    &:hover {
+      box-shadow: 0px 6px 28px 0px @primary-color_3;
+    }
   }
 }
 .discovery-card-small {
@@ -312,7 +323,7 @@ export default {
   height: 80px;
   cursor: pointer;
 }
-.discovery-card-small:hover,
+
 .discovery-card-small-selected {
   .discovery-top {
     background-color: #f0f1f5;

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

@@ -25,18 +25,24 @@
           :fileList="[]"
           :beforeUpload="beforeUpload"
         >
-          <a class="setting-discovery-header-action-btn">
+          <a-button
+            type="primary"
+            class="ops-button-ghost"
+            ghost
+          >
             <a-icon type="upload" />
             {{ $t('cmdb.ad.upload') }}
-          </a>
+          </a-button>
         </a-upload>
-        <a
+        <a-button
+          type="primary"
+          class="ops-button-ghost"
+          ghost
           @click="download"
-          class="setting-discovery-header-action-btn"
         >
           <a-icon type="download" />
           {{ $t('cmdb.ad.download') }}
-        </a>
+        </a-button>
       </div>
     </div>
     <div
@@ -64,7 +70,7 @@
                 class="setting-discovery-add"
                 @click="handleOpenEditDrawer(null, 'add', DISCOVERY_CATEGORY_TYPE.PLUGIN)"
               >
-                <a-icon type="plus-circle" theme="twoTone" />
+                <a-icon class="setting-discovery-add-icon" type="plus-circle" />
                 <span class="setting-discovery-add-text">
                   {{ $t('cmdb.ad.addPlugin') }}
                 </span>
@@ -374,6 +380,10 @@ export default {
       justify-content: center;
       cursor: pointer;
 
+      &-icon {
+        color: @primary-color_9;
+      }
+
       &-text {
         color: @text-color_3;
         font-size: 12px;

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

@@ -24,7 +24,7 @@
                 :type="ciType.icon.split('$$')[0]"
               />
             </template>
-            <span :style="{ color: '#2f54eb' }" v-else>{{ ciType.name[0].toUpperCase() }}</span>
+            <span class="primary-color" v-else>{{ ciType.name[0].toUpperCase() }}</span>
           </span>
           <span :title="ciType.alias || ciType.name" class="cmdb-adc-side-name">{{ ciType.alias || ciType.name }}</span>
         </div>
@@ -46,10 +46,15 @@
             <span @click="batchDelete">{{ $t('delete') }}</span>
             <span>{{ $t('cmdb.ci.selectRows', { rows: selectedCount }) }}</span>
           </span>
-          <div @click="clickLog" class="discovery-ci-log">
+          <a-button
+            type="primary"
+            ghost
+            class="ops-button-ghost discovery-ci-log"
+            @click="clickLog"
+          >
             <ops-icon type="a-cmdb-log1" />
             <span>{{ $t('cmdb.ad.log') }}</span>
-          </div>
+          </a-button>
         </div>
         <ops-table
           show-overflow
@@ -458,16 +463,7 @@ export default {
   }
 
   .discovery-ci-log {
-    cursor: pointer;
-    background-color: #F4F9FF;
-    border: solid 1px @primary-color_8;
-    color: @primary-color;
-    font-size: 12px;
-    padding: 5px 12px;
     margin-left: auto;
-    display: flex;
-    align-items: center;
-    gap: 6px;
   }
 
   .checkbox-hover-table {

cmdb-ui/src/modules/cmdb/views/ipam/components/ipamTree.vue

@@ -26,10 +26,7 @@
             />
             <a-tooltip :title="treeNodeData.title">
               <span
-                class="ipam-tree-node-title"
-                :style="{
-                  color: treeKey === treeNodeData.key ? '#2F54EB' : ''
-                }"
+                :class="['ipam-tree-node-title', treeKey === treeNodeData.key ? 'primary-color' : '']"
               >
                 {{ treeNodeData.title }}
               </span>

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

@@ -20,7 +20,7 @@
       <vxe-column
         field="relation_type_id"
         :title="$t('cmdb.custom_dashboard.relation')"
-        :filters="[{ data: '' }]"
+        :filters="relationTypeList"
         :filter-multiple="false"
       >
         <template #default="{ row }">
@@ -144,7 +144,7 @@ export default {
     return {
       drawerVisible: false,
       tableData: [],
-      relationTypeList: null,
+      relationTypeList: [],
       type2attributes: {},
       tableAttrList: [],
     }
@@ -201,13 +201,6 @@ export default {
     async getRelationTypes() {
       const res = await getRelationTypes()
       this.relationTypeList = res.map((item) => ({ value: item.id, label: item.name }))
-      const $table = this.$refs.xTable
-      if ($table) {
-        const nameColumn = $table.getColumnByField('relation_type_id')
-        if (nameColumn) {
-          $table.setFilter(nameColumn, this.relationTypeList)
-        }
-      }
     },
     // 转换关联关系
     handleConstraint(constraintId) {
@@ -359,5 +352,9 @@ export default {
   &-action {
     margin-left: 5px;
   }
+
+  /deep/ .ant-select-selection {
+    box-shadow: none;
+  }
 }
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="operation-history">
     <a-card :bordered="false">
       <a-tabs default-active-key="1">
         <a-tab-pane key="1" :tab="$t('cmdb.history.ciChange')">
@@ -40,4 +40,10 @@ export default {
 }
 </script>
 
-<style></style>
+<style lang="less" scoped>
+.operation-history {
+  /deep/ .ant-tabs-tab {
+    padding-top: 0px;
+  }
+}
+</style>

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

@@ -30,7 +30,7 @@
           <span>{{ column.title }}</span>
           <a-popover trigger="click" placement="bottom">
             <a-icon class="filter" type="filter" theme="filled" />
-            <a slot="content">
+            <a class="filter-content" slot="content">
               <a-input
                 :placeholder="$t('cmdb.history.userTips')"
                 size="small"
@@ -453,4 +453,10 @@ export default {
     color: #606266;
   }
 }
+
+.filter-content {
+  display: flex;
+  align-items: center;
+  column-gap: 8px;
+}
 </style>

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

@@ -28,7 +28,7 @@
           <span>{{ column.title }}</span>
           <a-popover trigger="click" placement="bottom">
             <a-icon class="filter" type="filter" theme="filled" />
-            <a slot="content">
+            <a class="filter-content" slot="content">
               <a-input
                 :placeholder="$t('cmdb.history.userTips')"
                 size="small"
@@ -47,7 +47,7 @@
           <span>{{ column.title }}</span>
           <a-popover trigger="click" placement="bottom">
             <a-icon class="filter" type="filter" theme="filled" />
-            <a slot="content">
+            <a class="filter-content" slot="content">
               <a-select
                 v-model="queryParams.operate_type"
                 :placeholder="$t('cmdb.history.filterOperate')"
@@ -445,4 +445,10 @@ export default {
     color: #606266;
   }
 }
+
+.filter-content {
+  display: flex;
+  align-items: center;
+  column-gap: 8px;
+}
 </style>