diff --git a/cmdb-ui/src/api/auth.js b/cmdb-ui/src/api/auth.js index 4ac0a24..31aab7e 100644 --- a/cmdb-ui/src/api/auth.js +++ b/cmdb-ui/src/api/auth.js @@ -30,9 +30,9 @@ export function getAuthDataEnable() { }) } -export function testLDAP(test_type, data) { +export function testLDAP(data) { return axios({ - url: `/common-setting/v1/auth_config/LDAP/test?test_type=${test_type}`, + url: `/common-setting/v1/auth_config/LDAP/test`, method: 'post', data, }) diff --git a/cmdb-ui/src/assets/data_empty.png b/cmdb-ui/src/assets/data_empty.png index a6529f8..562d85b 100644 Binary files a/cmdb-ui/src/assets/data_empty.png and b/cmdb-ui/src/assets/data_empty.png differ diff --git a/cmdb-ui/src/components/CMDBFilterComp/expression.vue b/cmdb-ui/src/components/CMDBFilterComp/expression.vue index 2b0fbef..5b43f41 100644 --- a/cmdb-ui/src/components/CMDBFilterComp/expression.vue +++ b/cmdb-ui/src/components/CMDBFilterComp/expression.vue @@ -178,7 +178,7 @@
diff --git a/cmdb-ui/src/modules/cmdb/views/batch/modules/UploadFileForm.vue b/cmdb-ui/src/modules/cmdb/views/batch/modules/UploadFileForm.vue index d18a048..600b52f 100644 --- a/cmdb-ui/src/modules/cmdb/views/batch/modules/UploadFileForm.vue +++ b/cmdb-ui/src/modules/cmdb/views/batch/modules/UploadFileForm.vue @@ -9,13 +9,21 @@ :fileList="fileList" :disabled="!ciType || isUploading" > - -

{{ $t('cmdb.batch.drawTips') }}

+

{{ $t('cmdb.batch.supportFileTypes') }}

+

+

+
+ {{ item.name }} + +
-
- {{ item.name }} - +
+

{{ $t('cmdb.batch.tips1') }}

+
{{ $t('cmdb.batch.tips2') }}
+
{{ $t('cmdb.batch.tips3') }}
+
{{ $t('cmdb.batch.tips4') }}
+
{{ $t('cmdb.batch.tips5') }}
@@ -46,15 +54,13 @@ export default { }, watch: { ciType: { - handler(newValue) { - if (!newValue) { - this.ciItemNum = 0 - this.fileList = [] - this.dataList = [] - this.progressStatus = 'active' - this.percent = 0 - this.$emit('uploadDone', this.dataList) - } + handler() { + this.ciItemNum = 0 + this.fileList = [] + this.dataList = [] + this.progressStatus = 'active' + this.percent = 0 + this.$emit('uploadDone', this.dataList) }, }, }, @@ -77,12 +83,28 @@ export default { diff --git a/cmdb-ui/src/modules/cmdb/views/batch/modules/UploadResult.vue b/cmdb-ui/src/modules/cmdb/views/batch/modules/UploadResult.vue index 1ccab2c..f6028a2 100644 --- a/cmdb-ui/src/modules/cmdb/views/batch/modules/UploadResult.vue +++ b/cmdb-ui/src/modules/cmdb/views/batch/modules/UploadResult.vue @@ -1,10 +1,11 @@ - + -
- -
+ +
+ +
+
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue index ea79501..03a6563 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue @@ -1,5 +1,5 @@