NEZ-835 fix: 新增页面添加标签页关闭提示功能

2021-07-15 11:56:25 +08:00
parent da04ea8875
commit 4191c8113f
30 changed files with 40 additions and 91 deletions
--- a/nezha-fronted/src/components/common/mixin/editRigthBox.js
+++ b/nezha-fronted/src/components/common/mixin/editRigthBox.js
@@ -5,9 +5,9 @@ export default {
    }
  },
  mounted () {
-    if( this.isEdit ) {
+    if (this.isEdit) {
      window.onbeforeunload = () => {
-        return "确认离开当前页面吗？未保存的数据将会丢失"
+        return '确认离开当前页面吗？未保存的数据将会丢失'
      }
    }
  },
--- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
@@ -205,11 +205,13 @@

 <script>
 import editEndpointBoxNew from './editEndpointBoxNew'
+import editRigthBox from '../mixin/editRigthBox'
 export default {
  name: 'addEndpointBox',
  components: {
    'edit-endpoint-box-new': editEndpointBoxNew
  },
+  mixins: [editRigthBox],
  data () {
    return {
      rules: {
@@ -434,7 +436,7 @@ export default {
          disabled: false
        }]
      },
-      showError: false,
+      showError: false
    }
  },
  methods: {
@@ -755,6 +757,7 @@ export default {
    currentModule: {
      immediate: true,
      handler (n, o) {
+        this.isEdit = true
      }
    }
  }
--- a/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue
@@ -151,9 +151,7 @@ export default {
      deep: true,
      immediate: true,
      handler (n) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editAssetType = JSON.parse(JSON.stringify(n))
      }
    }
--- a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
@@ -112,9 +112,7 @@ export default {
      deep: true,
      immediate: true,
      handler (n) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editModel = JSON.parse(JSON.stringify(n))
      }
    }
--- a/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
@@ -81,9 +81,7 @@ export default {
      deep: true,
      immediate: true,
      handler (n) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editRole = JSON.parse(JSON.stringify(n))
        if (this.editRole.roles && this.editRole.roles.length > 0) {
          this.editRole.roleIds = this.editRole.roles.map(t => t.id)
--- a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
@@ -159,9 +159,7 @@ export default {
      deep: true,
      immediate: true,
      handler (n) {
-        if (n.id) {
-          this.isEdit =true
-        }
+        this.isEdit = true
        this.editUser = JSON.parse(JSON.stringify(n))
        // if (this.editUser.roles && this.editUser.roles.length > 0) {
        //   this.editUser.roleIds = this.editUser.roles.map(t => t.id)
--- a/nezha-fronted/src/components/common/rightBox/agentBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/agentBox.vue
@@ -190,9 +190,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editPromServer = JSON.parse(JSON.stringify(n))
      }
    },
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -320,9 +320,7 @@ export default {
      deep: true,
      immediate: true,
      handler (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editAlertRule = JSON.parse(JSON.stringify(n))
        if (this.editAlertRule.id) {
          this.expressions = [this.editAlertRule.expr]
--- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
@@ -140,9 +140,7 @@ export default {
      deep: true,
      immediate: true,
      handler (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        const obj = JSON.parse(JSON.stringify(n))
        if (obj.ruleId == -1) {
          obj.ruleId = null
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
@@ -469,9 +469,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n) {
-        if (n.id) {
        this.isEdit = true
-        }
        if (n !== assetConstants.editTypeData.account) {
          this.editData.authProtocol = 0
        } else {
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -351,9 +351,7 @@ export default {
      deep: true,
      immediate: true,
      handler (n) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editAsset = JSON.parse(JSON.stringify(n))
        this.editAsset.brandAndModel = [this.editAsset.brand.id, this.editAsset.model.id]
        this.editAsset.stateId = n.state ? n.state.id : ''
--- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
@@ -235,9 +235,7 @@ export default {
      deep: true,
      immediate: true,
      handler (n) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editAssetMeta = {
          ...n,
          groupId: n.groupId ? Number(n.groupId) : '',
--- a/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue
@@ -65,9 +65,7 @@ export default {
    metaGroup: {
      immediate: true,
      handler (n) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editMetaGroup = { ...n }
      }
    }
--- a/nezha-fronted/src/components/common/rightBox/assetStateBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetStateBox.vue
@@ -140,9 +140,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n) {
-        if (n.id) {
        this.isEdit = true
-        }
        if (n) {
          this.editAssetState = JSON.parse(JSON.stringify(n))
        }
--- a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue
@@ -158,9 +158,7 @@ export default {
      deep: true,
      immediate: true,
      handler: function (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        if (n) {
          this.editCabinet = JSON.parse(JSON.stringify(n))
        }
--- a/nezha-fronted/src/components/common/rightBox/chartTempBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chartTempBox.vue
@@ -179,9 +179,7 @@ export default {
      deep: true,
      immediate: true,
      handler (n) {
-        if (n.id) {
-          this.isEdit = false
-        }
+        this.isEdit = true
        this.editChartTemp = JSON.parse(JSON.stringify(n))
      }
    }
--- a/nezha-fronted/src/components/common/rightBox/dcBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue
@@ -204,9 +204,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editDc = JSON.parse(JSON.stringify(n))
        this.$nextTick(() => {
          this.$refs.latlngPicker.setLnglat(this.editDc.latitude, this.editDc.longitude)
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
@@ -684,9 +684,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editEndpoint = JSON.parse(JSON.stringify(n))
        this.activeName = 'Basic'
        this.changeProject()
--- a/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
@@ -88,9 +88,7 @@ export default {
      deep: true,
      immediate: true,
      handler (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        const obj = { ...n }
        obj.expression = [obj.expression]
        this.editExprTemp = Object.assign(this.editExprTemp, obj)
--- a/nezha-fronted/src/components/common/rightBox/locationCascader.vue
+++ b/nezha-fronted/src/components/common/rightBox/locationCascader.vue
@@ -389,9 +389,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.$emit('change', n)
      }
    },
--- a/nezha-fronted/src/components/common/rightBox/menuBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/menuBox.vue
@@ -240,9 +240,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editMenu = JSON.parse(JSON.stringify(n))
        if (this.editMenu.perms && this.editMenu.perms != '') {
          this.$set(this.editMenu, 'permissions', this.editMenu.perms.split(',').map(t => { return { value: t } }))
--- a/nezha-fronted/src/components/common/rightBox/mibBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/mibBox.vue
@@ -231,9 +231,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editMib = JSON.parse(JSON.stringify(n))
        if (this.editMib.models) {
          this.selectedModels = this.editMib.models.split(',')
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -679,9 +679,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editModule = JSON.parse(JSON.stringify(n))
        this.activeName = 'Basic'

--- a/nezha-fronted/src/components/common/rightBox/panelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue
@@ -124,9 +124,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editPanel = JSON.parse(JSON.stringify(n))
      }
    }
--- a/nezha-fronted/src/components/common/rightBox/projectBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/projectBox.vue
@@ -121,9 +121,7 @@ export default {
    project: {
      immediate: true,
      handler (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editProject = JSON.parse(JSON.stringify(n))
      }
    }
--- a/nezha-fronted/src/components/common/rightBox/setting/cabinetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/setting/cabinetBox.vue
@@ -126,9 +126,7 @@ export default {
      deep: true,
      immediate: true,
      handler: function (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        if (n) {
          this.editCabinet = JSON.parse(JSON.stringify(n))
        }
--- a/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue
@@ -220,9 +220,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n, o) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.editCredential = JSON.parse(JSON.stringify(n))
        if (this.editCredential.config && typeof this.editCredential.config === 'string') {
          this.editCredential.config = JSON.parse(this.editCredential.config)
--- a/nezha-fronted/src/components/common/rightBox/trafficSetting/subBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/subBox.vue
@@ -21,10 +21,8 @@
 </template>

 <script>
-import editRigthBox from '../../mixin/editRigthBox'
 export default {
  name: 'subBox',
-  mixins: [editRigthBox],
  data () {
    return {
      editTagsBox: { show: false, top: 0, left: 0 },
--- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue
@@ -319,9 +319,7 @@ export default {
      immediate: true,
      deep: true,
      handler (n) {
-        if (n.id) {
        this.isEdit = true
-        }
        this.queryAssetList()
      }
    }
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -1762,10 +1762,10 @@ export default {
      deep: true,
      immediate: true,
      handler (n) {
+        this.isEdit = true
        if (n.id) {
-          this.isEdit = true;
          if (!n.param.state && n.param.state != Number) {
-            n.param.state = "1"
+            n.param.state = '1'
          }
          if (n.param.severity && n.param.severity != Number) {
            n.param.severity = 1