ui lint

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"

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

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

@@ -33,11 +33,13 @@
           />
         </a-form-item>
       </a-col>
-      <a-col :span="12"
+      <a-col
+        :span="12"
       ><a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="别名">
         <a-input name="alias" v-decorator="['alias', { rules: [] }]" /> </a-form-item
       ></a-col>
-      <a-col :span="12"
+      <a-col
+        :span="12"
       ><a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="数据类型">
         <a-select
           :disabled="true"
@@ -161,7 +163,8 @@
           :wrapper-col="horizontalFormItemLayout.wrapperCol"
         >
           <template slot="label">
-            <span style="position: relative; white-space: pre"
+            <span
+              style="position: relative; white-space: pre"
             >{{ `索引` }}
               <a-tooltip title="字段可被用于检索，加速查询">
                 <a-icon
@@ -192,7 +195,8 @@
           :wrapper-col="horizontalFormItemLayout.wrapperCol"
         >
           <template slot="label">
-            <span style="position: relative; white-space: pre"
+            <span
+              style="position: relative; white-space: pre"
             >{{ `显示` }}
               <a-tooltip title="CI实例表格默认展示该字段">
                 <a-icon
@@ -237,7 +241,8 @@
           :wrapper-col="horizontalFormItemLayout.wrapperCol"
         >
           <template slot="label">
-            <span style="position: relative; white-space: pre"
+            <span
+              style="position: relative; white-space: pre"
             >{{ `多值` }}
               <a-tooltip title="字段的值是1个或者多个，接口返回的值的类型是list">
                 <a-icon
@@ -302,7 +307,8 @@
         <a-col :span="24" v-if="currentValueType !== '6'">
           <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
             <template slot="label">
-              <span style="position: relative; white-space: pre"
+              <span
+                style="position: relative; white-space: pre"
               >{{ `计算属性` }}
                 <a-tooltip
                   :title="`该属性的值是通过模型的其它属性构建的表达式或者执行一段代码的方式计算而来，属性的引用方法为: {{ 属性名 }}`"

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

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