Merge remote-tracking branch 'origin/dev' into dev

src/assets/css/components/views/setting/knowledgeBase.scss

@@ -415,7 +415,8 @@
               font-size: 12px;
               color: #999999;
               font-weight: 400;
-              margin-bottom:6px;
+              margin-bottom:16px;
+              line-height: 12px;
             }
             .card-desc {
               //font-family: NotoSansSChineseRegular;

src/components/common/Error.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="showDefault" class="error-component" :style="style" :class="class">
+  <div v-if="showDefault" class="error-component" :style="style" :class="myClass">
     <div class="error-block" :style="{'max-width': localMaxWidth, 'width': localWidth}">
       <svg class="icon error-icon-default" aria-hidden="true">
         <use xlink:href="#cn-icon-baocuo"></use>
@@ -115,7 +115,8 @@ export default {
       showSmall: false, // 显示错误的类型，true为图表模块内显示报错，false为标题后显示报错
       localWidth: '',
       localMaxWidth: '',
-      localPopoverWidth: ''
+      localPopoverWidth: '',
+      myClass: this.class
     }
   },
   mounted () {

src/components/common/Pagination.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="pagination">
+  <div class="pagination" >
     <el-pagination
         ref="page"
         @size-change="size"
@@ -60,7 +60,6 @@ export default {
     const { query } = useRoute()
     const pageSize = ref(defaultPageSize)
     const currentPageNo = ref(props.storePageNoOnUrl ? (query.pageNo || (props.pageObj.pageNo || 1)) : (props.pageObj.pageNo || 1))
-
     return {
       pageSize,
       currentPageNo

src/components/common/TimeRange/DateTimeRange.vue

@@ -1,6 +1,6 @@
 <template>
-  <div v-ele-click-outside="changeDropdown" style="position: relative;z-index: 4" class="date-range-box">
-    <div @click="showDropdown" class="date-range-text" :class="class" :style="style">
+  <div v-ele-click-outside="changeDropdown" style="position: relative;" class="date-range-box">
+    <div @click="showDropdown" class="date-range-text" :class="myClass" :style="style">
       <div class="calendar-popover-text"><i class="cn-icon cn-icon-Data"></i></div>
       <div class="calendar-popover-text" style="display: flex" v-if="isCustom">
         <div class="calendar-popover-text">{{ dateFormatByAppearance(getMillisecond(startTime)) }}</div>
@@ -14,7 +14,7 @@
         <i class="cn-icon cn-icon-dropdown" :class="dropdownFlag ? 'cn-icon-up' : ''"></i>
       </div>
     </div>
-    <transition name="el-zoom-in-top">
+    <transition name="el-zoom-in-top" style="z-index: 4;">
       <div v-if="dropdownFlag" class="date-range-panel">
         <el-row class="date-range-panel-top" style="position: relative">
           <el-col :span="16" class="date-range-panel-content date-range-panel-content-left">
@@ -109,6 +109,7 @@ export default {
     const store = useStore()
     const myStartTime = ref(props.startTime)
     const myEndTime = ref(props.endTime)
+    const myClass = ref(props.class)
     // 时间选择器绑定的值
     const newDateValue = ref([
       new Date(...timestampToList(myStartTime.value)),
@@ -282,6 +283,7 @@ export default {
     return {
       myStartTime,
       myEndTime,
+      myClass,
       dropdownFlag,
       utcStr,
       rangeEchartsData,

src/components/table/setting/KnowledgeBaseTable.vue

@@ -129,10 +129,12 @@ export default {
       this.$emit('delete', data)
     },
     edit (id) {
+      const pageNo = this.$router.currentRoute.value.query.pageNo
       this.$router.push({
         path: '/knowledgeBase/edit',
         query: {
           t: +new Date(),
+          pageNoForTable: pageNo || 1,
           id: id
         }
       })

src/mixins/data-list.js

@@ -20,7 +20,7 @@ export default {
       pageObj: { // 分页对象
         pageNo: 1,
         pageSize: defaultPageSize,
-        total: 0
+        total: null//total为0时，elment分页组件pagination,修改当前页无效。修改为null即可解决此问题
       },
       /* 工具参数 */
       tools: {

src/utils/constants.js

@@ -58,9 +58,9 @@ export const panelTypeAndRouteMapping = {
   networkOverviewDrillDown: 13,
   networkAppPerformance: 2,
   dnsServiceInsights: 3,
-/*  ipEntityDetail: 4,
+  /*  ipEntityDetail: 4,
   domainEntityDetail: 5,
-  appEntityDetail: 6,*/
+  appEntityDetail: 6, */
   ipEntityDetail: 21,
   domainEntityDetail: 22,
   appEntityDetail: 23,

src/views/setting/KnowledgeBaseForm.vue

@@ -411,7 +411,8 @@ export default {
       timer: null,
       isShowUploadTips: false,
       isPreviewChange: false,
-      isClick: false
+      isClick: false,
+      pageNoForTable: 1
     }
   },
   methods: {
@@ -602,6 +603,7 @@ export default {
       this.isPreviewChange = true
     },
     cancel () {
+      const self = this
       if (this.isPreviewChange) {
         this.$confirm(this.$t('tip.leavePage'), {
           confirmButtonText: this.$t('tip.confirm'),
@@ -614,13 +616,19 @@ export default {
         }).then(() => {
           this.$router.push({
             path: '/knowledgeBase',
-            t: +new Date()
+            query: {
+              pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
+              t: +new Date()
+            }
           })
         }).catch(() => {})
       } else {
         this.$router.push({
           path: '/knowledgeBase',
-          t: +new Date()
+          query: {
+            pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
+            t: +new Date()
+          }
         })
       }
     },
@@ -680,6 +688,7 @@ export default {
                       d.itemList = Array.from(d.itemList)
                     })
                     postData.remark = this.editObject.remark
+                    const self = this
                     if (!this.editObject.id) {
                       axios.post(this.url, postData).then(response => {
                         if (response.data.code === 200) {
@@ -690,7 +699,10 @@ export default {
                           })
                           this.$router.push({
                             path: '/knowledgeBase',
-                            t: +new Date()
+                            query: {
+                              pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
+                              t: +new Date()
+                            }
                           })
                         } else {
                           this.errorMsgHandler(response)
@@ -712,7 +724,10 @@ export default {
                           })
                           this.$router.push({
                             path: '/knowledgeBase',
-                            t: +new Date()
+                            query: {
+                              pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
+                              t: +new Date()
+                            }
                           })
                         } else {
                           this.errorMsgHandler(response)
@@ -852,6 +867,8 @@ export default {
     }
   },
   mounted () {
+    const pageNo = this.$router.currentRoute.value.query.pageNoForTable
+    this.pageNoForTable = pageNo || 1
     const div = document.getElementsByClassName('el-upload-dragger')[0]
     const self = this
     div.addEventListener('click', function (event) {
@@ -886,7 +903,10 @@ export default {
         this.$message.error(this.errorMsgHandler(e))
         this.$router.push({
           path: '/knowledgeBase',
-          t: +new Date()
+          query: {
+            pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
+            t: +new Date()
+          }
         })
       })
     }