From b84d5d717ea4f423f2198c476d9bacd731915a0b Mon Sep 17 00:00:00 2001
From: wang-liang0615 <53748875+wang-liang0615@users.noreply.github.com>
Date: Tue, 12 Dec 2023 14:53:12 +0800
Subject: [PATCH] pref(cmdb-ui):batch upload for date type (#301)

---
 cmdb-ui/src/modules/cmdb/views/batch/index.vue   | 16 +++++++++++++++-
 .../cmdb/views/batch/modules/CiUploadTable.vue   |  1 +
 .../modules/cmdb/views/ci_types/triggerForm.vue  |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/cmdb-ui/src/modules/cmdb/views/batch/index.vue b/cmdb-ui/src/modules/cmdb/views/batch/index.vue
index 1a4010f..5ac90b5 100644
--- a/cmdb-ui/src/modules/cmdb/views/batch/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/batch/index.vue
@@ -29,6 +29,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 import { mapState } from 'vuex'
 import CiTypeChoice from './modules/CiTypeChoice'
 import CiUploadTable from './modules/CiUploadTable'
@@ -73,7 +74,20 @@ export default {
           const _ele = {}
           item.forEach((ele, j) => {
             if (ele !== undefined && ele !== null) {
-              _ele[dataList[0][j]] = ele
+              const _find = this.ciTypeAttrs.attributes.find(
+                (attr) => attr.alias === dataList[0][j] || attr.name === dataList[0][j]
+              )
+              if (_find?.value_type === '4') {
+                _ele[dataList[0][j]] = moment(Math.round((ele - 25569) * 86400 * 1000 - 28800000)).format('YYYY-MM-DD')
+              } else if (_find?.value_type === '3') {
+                _ele[dataList[0][j]] = moment(Math.round((ele - 25569) * 86400 * 1000 - 28800000)).format(
+                  'YYYY-MM-DD HH:mm:ss'
+                )
+              } else if (_find?.value_type === '5') {
+                _ele[dataList[0][j]] = moment(Math.round(ele * 86400 * 1000 - 28800000)).format('HH:mm:ss')
+              } else {
+                _ele[dataList[0][j]] = ele
+              }
             }
           })
           return _ele
diff --git a/cmdb-ui/src/modules/cmdb/views/batch/modules/CiUploadTable.vue b/cmdb-ui/src/modules/cmdb/views/batch/modules/CiUploadTable.vue
index 4a97bb1..53eeea7 100644
--- a/cmdb-ui/src/modules/cmdb/views/batch/modules/CiUploadTable.vue
+++ b/cmdb-ui/src/modules/cmdb/views/batch/modules/CiUploadTable.vue
@@ -8,6 +8,7 @@
       class="ops-stripe-table"
       :max-height="200"
       :data="dataSource"
+      resizable
     >
       <vxe-column type="seq" width="40" />
       <vxe-column
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
index 78c468d..03f2ff5 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
@@ -372,7 +372,7 @@ export default {
     },
     async open(property, attrList) {
       this.visible = true
-      this.getNoticeConfigAppBot()
+      await this.getNoticeConfigAppBot()
       this.attrList = attrList
       if (property.has_trigger) {
         this.triggerId = property.trigger.id