7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

conflect

This commit is contained in:
wang-liang0615 2023-07-19 18:04:35 +08:00
parent e5addab3af 2dbe81960a
commit 173358c17c
10 changed files with 470 additions and 728 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -18,14 +18,14 @@ env:
deps: deps:
pipenv install --dev && \ pipenv install --dev && \
pipenv run flask db-setup && \ pipenv run flask db-setup && \
pipenv run flask init-cache && \ pipenv run flask cmdb-init-cache && \
cd cmdb-ui && yarn install && cd .. cd cmdb-ui && yarn install && cd ..
api: api:
cd cmdb-api && pipenv run flask run -h 0.0.0.0 cd cmdb-api && pipenv run flask run -h 0.0.0.0
worker: worker:
cd cmdb-api && pipenv run celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1 cd cmdb-api && pipenv run celery worker -A celery_worker.celery -E -Q one_cmdb_async --concurrency=1 -D && pipenv run celery worker -A celery_worker.celery -E -Q acl_async --concurrency=1 -D
ui: ui:
cd cmdb-ui && yarn run serve cd cmdb-ui && yarn run serve

2
README.md
View File

@ -59,7 +59,7 @@
### 更多功能 ### 更多功能
> 也欢迎移步[维易科技官网](https://www.veops.cn)，发现更多免费运维系统。 > 也欢迎移步[维易科技官网](https://veops.cn)，发现更多免费运维系统。
## 接入公司 ## 接入公司

2
cmdb-api/Pipfile
View File

@ -39,7 +39,7 @@ kombu = "==4.4.0"
# common setting # common setting
Flask-APScheduler = "==1.12.4" Flask-APScheduler = "==1.12.4"
timeout-decorator = "==0.5.0" timeout-decorator = "==0.5.0"
numpy = "==1.18.5" numpy = "==1.21.5"
pandas = "==1.3.2" pandas = "==1.3.2"
WTForms = "==3.0.0" WTForms = "==3.0.0"
email-validator = "==1.3.1" email-validator = "==1.3.1"

4
cmdb-api/api/lib/cmdb/ci_type.py
View File

@ -235,7 +235,7 @@ class CITypeGroupManager(object):
for t in sorted(CITypeGroupItem.get_by(group_id=group['id']), key=lambda x: x['order'] or 0): for t in sorted(CITypeGroupItem.get_by(group_id=group['id']), key=lambda x: x['order'] or 0):
ci_type = CITypeCache.get(t['type_id']).to_dict() ci_type = CITypeCache.get(t['type_id']).to_dict()
if resources is None or (ci_type and ci_type['name'] in resources): if resources is None or (ci_type and ci_type['name'] in resources):
ci_type['permissions'] = resources[ci_type['name']] ci_type['permissions'] = resources[ci_type['name']] if resources is not None else None
group.setdefault("ci_types", []).append(ci_type) group.setdefault("ci_types", []).append(ci_type)
group_types.add(t["type_id"]) group_types.add(t["type_id"])
@ -244,7 +244,7 @@ class CITypeGroupManager(object):
other_types = dict(ci_types=[]) other_types = dict(ci_types=[])
for ci_type in ci_types: for ci_type in ci_types:
if ci_type["id"] not in group_types and (resources is None or ci_type['name'] in resources): if ci_type["id"] not in group_types and (resources is None or ci_type['name'] in resources):
ci_type['permissions'] = resources.get(ci_type['name']) ci_type['permissions'] = resources.get(ci_type['name']) if resources is not None else None
other_types['ci_types'].append(ci_type) other_types['ci_types'].append(ci_type)
groups.append(other_types) groups.append(other_types)

2
cmdb-api/requirements.txt
View File

@ -47,7 +47,7 @@ meld3==2.0.1
mistune==3.0.1 mistune==3.0.1
more-itertools==5.0.0 more-itertools==5.0.0
msgpack-python==0.5.6 msgpack-python==0.5.6
numpy==1.18.5 numpy==1.21.5
pandas==1.3.2 pandas==1.3.2
Pillow==8.3.2 Pillow==8.3.2
pkgutil_resolve_name==1.3.10 pkgutil_resolve_name==1.3.10

8
cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
View File

@ -172,7 +172,7 @@
> >
<template slot="label"> <template slot="label">
<span <span
style="position:relative;white-space:pre;" style="position: relative; white-space: pre"
>{{ `索引` }} >{{ `索引` }}
<a-tooltip title="字段可被用于检索，加速查询"> <a-tooltip title="字段可被用于检索，加速查询">
<a-icon <a-icon
@ -204,7 +204,7 @@
> >
<template slot="label"> <template slot="label">
<span <span
style="position:relative;white-space:pre;" style="position: relative; white-space: pre"
>{{ `显示` }} >{{ `显示` }}
<a-tooltip title="CI实例表格默认展示该字段"> <a-tooltip title="CI实例表格默认展示该字段">
<a-icon <a-icon
@ -250,7 +250,7 @@
> >
<template slot="label"> <template slot="label">
<span <span
style="position:relative;white-space:pre;" style="position: relative; white-space: pre"
>{{ `多值` }} >{{ `多值` }}
<a-tooltip title="字段的值是1个或者多个，接口返回的值的类型是list"> <a-tooltip title="字段的值是1个或者多个，接口返回的值的类型是list">
<a-icon <a-icon
@ -316,7 +316,7 @@
<a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }"> <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
<template slot="label"> <template slot="label">
<span <span
style="position:relative;white-space:pre;" style="position: relative; white-space: pre"
>{{ `计算属性` }} >{{ `计算属性` }}
<a-tooltip <a-tooltip
:title=" :title="

2
cmdb-ui/src/modules/cmdb/views/operation_history/modules/typeTable.vue
View File

@ -60,7 +60,7 @@
</vxe-column> </vxe-column>
<vxe-column field="type_id" title="模型" width="150px"> <vxe-column field="type_id" title="模型" width="150px">
<template #default="{ row }"> <template #default="{ row }">
{{ row.operate_type === '删除模型' ? row.change.alias : row.type_id}} {{ row.operate_type === '删除模型' ? row.change.alias : row.type_id }}
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="changeDescription" title="描述"> <vxe-column field="changeDescription" title="描述">

1022
docs/cmdb_api.md
View File

File diff suppressed because it is too large Load Diff