diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/trigger-event.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/trigger-event.vue
index 1395953e4ce..6b0f59b6a7e 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDetail/trigger-event.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDetail/trigger-event.vue
@@ -11,7 +11,9 @@
                 }"
                 :shortcuts="shortcuts"
                 :key="repoId"
+                @clear="handleClearDaterange"
                 @change="handleChangeDaterange"
+                @pick-success="handlePickSuccess"
             >
             </bk-date-picker>
             <search-select
@@ -56,6 +58,7 @@
         </section>
         <EmptyTableStatus
             v-else
+            v-bkloading="{ isLoading: pageLoading }"
             :type="isSearch ? 'search-empty' : 'empty'"
             @clear="resetFilter"
         />
@@ -113,6 +116,7 @@
                 eventList: [],
                 timelineMap: {},
                 searchValue: [],
+                daterangeCache: [],
                 daterange: setDefaultDaterange(),
                 page: 1,
                 pageSize: 20,
@@ -352,23 +356,32 @@
                 this.getListData()
             },
 
+            handleClearDaterange () {
+                this.daterange = ['', '']
+            },
+            
             handleChangeDaterange (date, type) {
-                const startTime = new Date(`${date[0]} 00:00:00`).getTime() || ''
-                const endTime = new Date(`${date[1]} 23:59:59`).getTime() || ''
-                this.daterange = [startTime, endTime]
+                const startTime = new Date(date[0]).getTime() || ''
+                const endTime = new Date(date[1]).getTime() || ''
+                this.daterangeCache = [startTime, endTime]
+            },
+            
+            handlePickSuccess () {
+                this.daterange = this.daterangeCache
             },
 
             async handleRefresh () {
+                this.page = 1
                 this.pageLoading = true
                 this.hasLoadEnd = false
-                this.daterange = this.setDefaultDaterange()
-                // await this.getListData()
+                await this.getListData()
             },
 
             replayEvent () {
                 this.pageLoading = true
+                this.hasLoadEnd = false
                 setTimeout(() => {
-                    this.handleRefresh()
+                    this.daterange = this.setDefaultDaterange()
                 }, 1000)
             }
         }
@@ -394,8 +407,8 @@
             cursor: pointer;
         }
         .date-picker {
-            max-width: 300px;
-            min-width: 200px;
+            max-width: 400px;
+            min-width: 340px;
         }
         .search-select {
             width: 100%;
diff --git a/src/frontend/devops-codelib/src/views/Index.vue b/src/frontend/devops-codelib/src/views/Index.vue
index af2ae6c96c2..9b922ed20ce 100755
--- a/src/frontend/devops-codelib/src/views/Index.vue
+++ b/src/frontend/devops-codelib/src/views/Index.vue
@@ -281,13 +281,6 @@
                 sortType = this.sortType
             ) {
                 if (!this.userId) this.isLoading = true
-                this.$router.push({
-                    query: {
-                        ...this.$route.query,
-                        sortBy,
-                        sortType
-                    }
-                })
                 await this.requestList({
                     projectId,
                     aliasName,
@@ -352,13 +345,10 @@
                 this.sortBy = sortBy
                 this.sortType = sortType
                 this.refreshCodelibList()
-                if (sortBy && sortType) {
-                    localStorage.setItem('codelibSortType', sortType)
-                    localStorage.setItem('codelibSortBy', sortBy)
-                } else {
-                    localStorage.removeItem('codelibSortType')
-                    localStorage.removeItem('codelibSortBy')
-                }
+                localStorage.setItem('codelibSortType', sortType)
+                localStorage.setItem('codelibSortBy', sortBy)
+                const queryKeys = Object.keys(this.$route?.query || {})
+                if (!queryKeys.length) return
                 this.$router.push({
                     query: {
                         ...this.$route.query,