diff --git a/cmdb-api/Pipfile b/cmdb-api/Pipfile
index 3402e75..b6c98dd 100644
--- a/cmdb-api/Pipfile
+++ b/cmdb-api/Pipfile
@@ -39,7 +39,7 @@ kombu = "==4.4.0"
# common setting
Flask-APScheduler = "==1.12.4"
timeout-decorator = "==0.5.0"
-numpy = "==1.18.5"
+numpy = "==1.21.5"
pandas = "==1.3.2"
WTForms = "==3.0.0"
email-validator = "==1.3.1"
diff --git a/cmdb-api/requirements.txt b/cmdb-api/requirements.txt
index 39b32cb..31b6886 100644
--- a/cmdb-api/requirements.txt
+++ b/cmdb-api/requirements.txt
@@ -47,7 +47,7 @@ meld3==2.0.1
mistune==3.0.1
more-itertools==5.0.0
msgpack-python==0.5.6
-numpy==1.18.5
+numpy==1.21.5
pandas==1.3.2
Pillow==8.3.2
pkgutil_resolve_name==1.3.10
@@ -77,4 +77,4 @@ urllib3==1.26.16
vine==1.3.0
Werkzeug==0.15.5
WTForms==3.0.0
-zipp==3.16.0
\ No newline at end of file
+zipp==3.16.0
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
index b6d940c..1b3a5c0 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
@@ -33,22 +33,24 @@
/>
-
-
+
-
-
- {{ value }}
-
-
+
+ {{ value }}
+
+
- {{ `索引` }}
+ {{ `索引` }}
- {{ `显示` }}
+ {{ `显示` }}
- {{ `多值` }}
+ {{ `多值` }}
- {{ `计算属性` }}
+ {{ `计算属性` }}
diff --git a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/typeTable.vue b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/typeTable.vue
index be1b32b..6bc8e13 100644
--- a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/typeTable.vue
+++ b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/typeTable.vue
@@ -60,7 +60,7 @@
- {{ row.operate_type === '删除模型' ? row.change.alias : row.type_id}}
+ {{ row.operate_type === '删除模型' ? row.change.alias : row.type_id }}
diff --git a/cmdb-ui/src/views/setting/companyStructure/EmployeeModal.vue b/cmdb-ui/src/views/setting/companyStructure/EmployeeModal.vue
index 1c65ac3..b25fc0b 100644
--- a/cmdb-ui/src/views/setting/companyStructure/EmployeeModal.vue
+++ b/cmdb-ui/src/views/setting/companyStructure/EmployeeModal.vue
@@ -382,9 +382,9 @@
:style="{ display: 'inline-block', width: '98%', margin: '0 7px 24px' }"
v-if="
attributes.findIndex((v) => v == 'bank_card_number') !== -1 ||
- attributes.findIndex((v) => v == 'bank_card_name') !== -1 ||
- attributes.findIndex((v) => v == 'opening_bank') !== -1 ||
- attributes.findIndex((v) => v == 'account_opening_location') !== -1
+ attributes.findIndex((v) => v == 'bank_card_name') !== -1 ||
+ attributes.findIndex((v) => v == 'opening_bank') !== -1 ||
+ attributes.findIndex((v) => v == 'account_opening_location') !== -1
"
>
diff --git a/cmdb-ui/src/views/setting/components/employeeTable.vue b/cmdb-ui/src/views/setting/components/employeeTable.vue
index 979b25d..cc1a82c 100644
--- a/cmdb-ui/src/views/setting/components/employeeTable.vue
+++ b/cmdb-ui/src/views/setting/components/employeeTable.vue
@@ -179,7 +179,7 @@
sortable
v-if="
checkedCols.findIndex((v) => v == 'department_name') !== -1 &&
- attributes.findIndex((v) => v == 'department_name') !== -1
+ attributes.findIndex((v) => v == 'department_name') !== -1
"
key="department_name"
>
@@ -217,7 +217,7 @@
sortable
v-if="
checkedCols.findIndex((v) => v == 'position_name') !== -1 &&
- attributes.findIndex((v) => v == 'position_name') !== -1
+ attributes.findIndex((v) => v == 'position_name') !== -1
"
key="position_name"
>
@@ -251,7 +251,7 @@
sortable
v-if="
checkedCols.findIndex((v) => v == 'direct_supervisor_id') !== -1 &&
- attributes.findIndex((v) => v == 'direct_supervisor_id') !== -1
+ attributes.findIndex((v) => v == 'direct_supervisor_id') !== -1
"
key="direct_supervisor_id"
>
@@ -290,8 +290,8 @@
min-width="80"
v-if="
checkedCols.findIndex((v) => v == 'annual_leave') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'annual_leave') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'annual_leave') !== -1
"
key="annual_leave"
>
@@ -325,8 +325,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'virtual_annual_leave') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'virtual_annual_leave') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'virtual_annual_leave') !== -1
"
key="virtual_annual_leave"
>
@@ -360,8 +360,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'parenting_leave') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'parenting_leave') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'parenting_leave') !== -1
"
key="parenting_leave"
>
@@ -395,8 +395,8 @@
min-width="150"
v-if="
checkedCols.findIndex((v) => v == 'entry_date') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'entry_date') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'entry_date') !== -1
"
key="entry_date"
>
@@ -431,8 +431,8 @@
v-bind="tableType === 'structure' ? { filters: internOptions, 'filter-multiple': false } : {}"
v-if="
checkedCols.findIndex((v) => v == 'is_internship') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'is_internship') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'is_internship') !== -1
"
key="is_internship"
>
@@ -469,8 +469,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'leave_date') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'leave_date') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'leave_date') !== -1
"
key="leave_date"
>
@@ -504,8 +504,8 @@
min-width="120"
v-if="
checkedCols.findIndex((v) => v == 'id_card') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'id_card') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'id_card') !== -1
"
key="id_card"
>
@@ -539,8 +539,8 @@
min-width="80"
v-if="
checkedCols.findIndex((v) => v == 'nation') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'nation') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'nation') !== -1
"
key="nation"
>
@@ -574,8 +574,8 @@
min-width="120"
v-if="
checkedCols.findIndex((v) => v == 'id_place') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'id_place') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'id_place') !== -1
"
key="id_place"
>
@@ -609,8 +609,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'party') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'party') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'party') !== -1
"
key="party"
>
@@ -644,8 +644,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'household_registration_type') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'household_registration_type') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'household_registration_type') !== -1
"
key="household_registration_type"
>
@@ -679,8 +679,8 @@
min-width="120"
v-if="
checkedCols.findIndex((v) => v == 'hometown') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'hometown') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'hometown') !== -1
"
key="hometown"
>
@@ -714,8 +714,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'marry') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'marry') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'marry') !== -1
"
key="marry"
>
@@ -749,8 +749,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'max_degree') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'max_degree') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'max_degree') !== -1
"
key="max_degree"
>
@@ -784,8 +784,8 @@
min-width="110"
v-if="
checkedCols.findIndex((v) => v == 'emergency_person') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'emergency_person') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'emergency_person') !== -1
"
key="emergency_person"
>
@@ -819,8 +819,8 @@
min-width="120"
v-if="
checkedCols.findIndex((v) => v == 'emergency_phone') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'emergency_phone') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'emergency_phone') !== -1
"
key="emergency_phone"
>
@@ -854,8 +854,8 @@
min-width="120"
v-if="
checkedCols.findIndex((v) => v == 'bank_card_number') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'bank_card_number') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'bank_card_number') !== -1
"
key="bank_card_number"
>
@@ -889,8 +889,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'bank_card_name') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'bank_card_name') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'bank_card_name') !== -1
"
key="bank_card_name"
>
@@ -924,8 +924,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'opening_bank') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'opening_bank') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'opening_bank') !== -1
"
key="opening_bank"
>
@@ -959,8 +959,8 @@
min-width="120"
v-if="
checkedCols.findIndex((v) => v == 'account_opening_location') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'account_opening_location') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'account_opening_location') !== -1
"
key="account_opening_location"
>
@@ -993,8 +993,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'school') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'school') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'school') !== -1
"
key="school"
>
@@ -1027,8 +1027,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'major') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'major') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'major') !== -1
"
key="major"
>
@@ -1061,8 +1061,8 @@
min-width="80"
v-if="
checkedCols.findIndex((v) => v == 'education') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'education') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'education') !== -1
"
key="education"
>
@@ -1095,8 +1095,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'graduation_year') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'graduation_year') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'graduation_year') !== -1
"
key="graduation_year"
>
@@ -1129,8 +1129,8 @@
min-width="80"
v-if="
checkedCols.findIndex((v) => v == 'name') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'name') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'name') !== -1
"
key="name"
>
@@ -1163,8 +1163,8 @@
min-width="80"
v-if="
checkedCols.findIndex((v) => v == 'gender') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'gender') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'gender') !== -1
"
key="gender"
>
@@ -1197,8 +1197,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'birthday') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'birthday') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'birthday') !== -1
"
key="birthday"
>
@@ -1231,8 +1231,8 @@
min-width="100"
v-if="
checkedCols.findIndex((v) => v == 'parental_leave_left') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'parental_leave_left') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'parental_leave_left') !== -1
"
key="parental_leave_left"
>
@@ -1267,8 +1267,8 @@
:formatter="formatDate"
v-if="
checkedCols.findIndex((v) => v == 'last_login') !== -1 &&
- tableType == 'structure' &&
- attributes.findIndex((v) => v == 'last_login') !== -1
+ tableType == 'structure' &&
+ attributes.findIndex((v) => v == 'last_login') !== -1
"
key="last_login"
>