feat: 顶部菜单栏添加功能（除asset外）

nezha-fronted/src/components/common/header.vue

@@ -136,11 +136,13 @@ export default {
         },
         {
           label: this.$t('asset.createAsset'),
-          url: 'asset'
+          url: 'asset',
+          type: 4
         },
         {
           label: this.$t('alert.config.createAlertConfig'),
-          url: 'alertConfig'
+          url: 'alertConfig',
+          type: 5
         }
       ]
     }
@@ -155,7 +157,28 @@ export default {
       });
     },
     createBox(item) {
-
+      this.jumpTo(item.url);
+      setTimeout(() =>{
+        if (item.type == 1) {
+          if (this.projectData.length > 0) {
+            this.$store.commit('setProject', this.projectData[0]);
+          }
+          this.$store.commit('toCreateProject', true);
+          this.$store.commit('projectRightBoxShow', true);
+        } else if (item.type == 2) {
+          if (this.projectData.length > 0) {
+            this.$store.commit('setProject', this.projectData[0]);
+          }
+          this.$store.commit('toCreateModule', true);
+        } else if (item.type == 3) {
+          if (this.projectData.length > 0) {
+            this.$store.commit('setProject', this.projectData[0]);
+          }
+          this.$store.commit('toCreateEndpoint', true);
+        } else if (item.type == 5) {
+          this.$store.commit('toCreateAlertConfig', true);
+        }
+      }, 120);
     },
     jumpToAsset(data, id) {
       this.$store.state.assetData.moduleData = data;
@@ -185,9 +208,12 @@ export default {
       })
     },
     toEditProject(p) {
-      this.$store.commit('setProject', p);
-      this.$store.commit('projectRightBoxShow', true);
       this.jumpTo('project');
+      setTimeout(() =>{
+        this.$store.commit('setProject', p);
+        this.$store.commit('projectRightBoxShow', true);
+      }, 50);
+
     }
   },
   mounted() {

nezha-fronted/src/components/page/alert/config.vue

@@ -579,6 +579,16 @@ export default {
   mounted() {
     this.getTableData();
     this.initReceiverData();
+  },
+  computed: {
+    sProject() {
+      return this.$store.state.createAlertConfig;
+    }
+  },
+  watch: {
+    sProject(n, o) {
+      this.toAdd();
+    }
   }
 }
 </script>

nezha-fronted/src/components/page/project/project.vue

@@ -558,27 +558,16 @@
           <div class="right-box-form-row">
             <div class="right-box-form-label">{{$t("project.project.projectName")}}</div>
             <div class="right-box-form-content">
-              <el-input
+              <el-input v-if="!projectRightBox.isCreate" placeholder="" maxlength="64" show-word-limit v-model="project.name" size="small"></el-input>
-                placeholder=""
+              <el-input v-if="projectRightBox.isCreate" placeholder="" maxlength="64" show-word-limit v-model="newProject.name" size="small"></el-input>
-                maxlength="64"
-                show-word-limit
-                v-model="project.name"
-                size="small"
-              ></el-input>
             </div>
           </div>
           <!--description-->
           <div class="right-box-form-row">
             <div class="right-box-form-label">{{$t("project.project.description")}}</div>
             <div class="right-box-form-content">
-              <el-input
+              <el-input v-if="!projectRightBox.isCreate" type="textarea" placeholder="" maxlength="1024" show-word-limit v-model="project.remark" size="small"></el-input>
-                type="textarea"
+              <el-input v-if="projectRightBox.isCreate" type="textarea" placeholder="" maxlength="1024" show-word-limit v-model="newProject.remark" size="small"></el-input>
-                placeholder=""
-                maxlength="1024"
-                show-word-limit
-                v-model="project.remark"
-                size="small"
-              ></el-input>
             </div>
           </div>
         </div>
@@ -609,7 +598,7 @@
             </div>
             <span>{{$t('overall.save')}}</span>
           </div>
-          <div class="right-box-top-btn" v-if="currentModule.id != ''" @click="moduleDel">
+          <div class="right-box-top-btn" v-if="currentModule.id != '' && !moduleRightBox.isCreate" @click="moduleDel">
             <div class="right-box-btn-icon">
               <i class="el-icon-delete"></i>
             </div>
@@ -628,36 +617,28 @@
           <div class="right-box-form-row">
             <div class="right-box-form-label">{{$t("project.project.project")}}</div>
             <div class="right-box-form-content">
-              <el-select value-key="id" popper-class="config-dropdown" v-model="currentModule.project" placeholder="" size="small">
+              <el-select v-if="!moduleRightBox.isCreate" value-key="id" popper-class="config-dropdown" v-model="currentModule.project" placeholder="" size="small">
                 <el-option v-for="item in projectData" :key="item.id" :label="item.name" :value="item"></el-option>
               </el-select>
+              <el-select v-if="moduleRightBox.isCreate" popper-class="config-dropdown" v-model="newModule.projectId" placeholder="" size="small">
+                <el-option v-for="item in projectData" :key="item.id" :label="item.name" :value="item.id"></el-option>
+              </el-select>
             </div>
           </div>
           <!--name-->
           <div class="right-box-form-row">
             <div class="right-box-form-label">{{$t("project.module.moduleName")}}</div>
             <div class="right-box-form-content">
-              <el-input
+              <el-input v-if="!moduleRightBox.isCreate" placeholder="" maxlength="64" show-word-limit v-model="currentModule.name" size="small"></el-input>
-                placeholder=""
+              <el-input v-if="moduleRightBox.isCreate" placeholder="" maxlength="64" show-word-limit v-model="newModule.name" size="small"></el-input>
-                maxlength="64"
-                show-word-limit
-                v-model="currentModule.name"
-                size="small"
-              ></el-input>
             </div>
           </div>
           <!--description-->
           <div class="right-box-form-row">
             <div class="right-box-form-label">{{$t("project.module.description")}}</div>
             <div class="right-box-form-content">
-              <el-input
+              <el-input v-if="!moduleRightBox.isCreate" type="textarea" placeholder="" maxlength="1024" show-word-limit v-model="currentModule.remark" size="small"></el-input>
-                type="textarea"
+              <el-input v-if="moduleRightBox.isCreate" type="textarea" placeholder="" maxlength="1024" show-word-limit v-model="newModule.remark" size="small"></el-input>
-                placeholder=""
-                maxlength="1024"
-                show-word-limit
-                v-model="currentModule.remark"
-                size="small"
-              ></el-input>
             </div>
           </div>
           <!--tip-->
@@ -674,22 +655,16 @@
           <div class="right-box-form-row">
             <div class="right-box-form-label">{{$t("project.endpoint.port")}}</div>
             <div class="right-box-form-content">
-              <el-input
+              <el-input v-if="!moduleRightBox.isCreate" placeholder="" v-model="currentModule.port" size="small"></el-input>
-                placeholder=""
+              <el-input v-if="moduleRightBox.isCreate" placeholder="" v-model="newModule.port" size="small"></el-input>
-                v-model="currentModule.port"
-                size="small"
-              ></el-input>
             </div>
           </div>
           <!--path-->
           <div class="right-box-form-row">
             <div class="right-box-form-label">{{$t("project.endpoint.path")}}</div>
             <div class="right-box-form-content">
-              <el-input
+              <el-input v-if="!moduleRightBox.isCreate" placeholder="" v-model="currentModule.path" size="small"></el-input>
-                placeholder=""
+              <el-input v-if="moduleRightBox.isCreate" placeholder="" v-model="newModule.path" size="small"></el-input>
-                v-model="currentModule.path"
-                size="small"
-              ></el-input>
             </div>
           </div>
           <!--param-->
@@ -714,7 +689,7 @@
 
         <!-- begin--底部按钮-->
         <div class="right-box-bottom-btns">
-          <div @click="esc(3)" class="right-box-bottom-btn right-box-bottom-btn-cancel right-box-bottom-btn-50">{{$t('overall.cancel')}}</div><div @click="moduleSave" class="right-box-bottom-btn right-box-bottom-btn-50">{{currentModule.id == '' ? $t('overall.create') : $t('overall.save')}}</div>
+          <div @click="esc(3)" class="right-box-bottom-btn right-box-bottom-btn-cancel right-box-bottom-btn-50">{{$t('overall.cancel')}}</div><div @click="moduleSave" class="right-box-bottom-btn right-box-bottom-btn-50">{{currentModule.id == '' && moduleRightBox.isCreate ? $t('overall.create') : $t('overall.save')}}</div>
         </div>
         <!-- end--底部按钮-->
       </div>
@@ -731,9 +706,12 @@ export default {
       tableShow: 1, // 1.endpoint; 2.metrics
       projectRightBox: {
         show: false,
-        title: ''
+        title: '',
+        isCreate: false
       },
       project: {id: '', name: '', remark: ''},
+      newProject: {id: '', name: '', remark: ''},
+      newModule: {id: '', name: '', project: {}, port: '', path: '', param: '', paramObj: []},
       rightBox: { //弹出框相关
         show: false,
         isEdit: false, //false查看，true编辑
@@ -779,19 +757,20 @@ export default {
       },
       moduleRightBox: {
         show: false,
-        title: ''
+        title: '',
+        isCreate: false
       },
       currentModule: { //左侧列表当前选中的module
         id: '',
         name: '',
         projectId: ''
       },
-      selectedModule: { //侧滑框中选中的module
+      selectedModule: { //endpoint侧滑框中选中的module
         id: '',
         name: '',
         projectId: ''
       },
-      selectedAsset: { //侧滑框中选中的asset
+      selectedAsset: { //endpoint侧滑框中选中的asset
         id: '',
         host: '',
         sn: ''
@@ -890,13 +869,21 @@ export default {
       });
     },
     // 获取module、endpoint弹框中project下拉框数据
-    getProjectData: function() {
+    getProjectData: function(name) {
       this.$get('project').then(response => {
         if (response.code === 200) {
           this.projectData = response.data.list;
-          console.info(this.project);
+          if (name) {
-          this.project = this.projectData[0];
+            for (let i = 0; i < this.projectData.length; i++) {
-          console.info(this.project);
+              if (this.projectData[i].name == name) {
+                this.project = this.projectData[i];
+                this.$store.commit('setProject', this.project);
+                break;
+              }
+            }
+          } else {
+            this.project = this.projectData[0];
+          }
         }
       });
     },
@@ -937,7 +924,7 @@ export default {
       this.$get('module', {projectId: this.$store.state.projectData.id}).then(response => {
         if (response.code === 200) {
           this.moduleData = response.data.list;
-          for (var i = 0; i < response.data.list.length; i++) {
+          for (let i = 0; i < response.data.list.length; i++) {
             try {
               var tempObj = JSON.parse(response.data.list[i].param);
             } catch (err) {
@@ -956,7 +943,6 @@ export default {
             this.endPointTableData = [];
             this.pageObj.total = 0;
           }
-
         }
       });
     },
@@ -1082,7 +1068,10 @@ export default {
             this.$message({duration: 3000, type: 'success', message: this.$t("tip.deleteSuccess")});
             this.$store.commit('projectRightBoxShow', false);
             this.getProjectData();
-            this.getModuleData();
+            setTimeout(() => {
+              this.getModuleData();
+            }, 50);
+
             if (this.projectData.length > 0) {
               this.$store.commit('setProject', this.projectData[0]);
             }
@@ -1105,6 +1094,9 @@ export default {
       this.rightBox.isEdit = true;
       this.rightBox.title = this.$t("project.endpoint.createEndpoint");
       this.rightBox.show = true;
+    },
+    toAddProject: function() {
+
     },
     // 打开endpoint详情页
     detail: function(u) {
@@ -1127,24 +1119,48 @@ export default {
     },
     // 保存project
     projectSave: function() {
-      this.$put('project', this.project).then(response => {
+      if (!this.projectRightBox.isCreate) {
-        if (response.code === 200) {
+        this.$put('project', this.project).then(response => {
-          this.$store.commit('setProject', this.project);
+          if (response.code === 200) {
-          this.$store.commit('projectListReloadChange', true);
+            this.$store.commit('setProject', this.project);
-          this.$store.commit('projectRightBoxShow', false);
+            this.$store.commit('projectListReloadChange', true);
-        }
+            this.$store.commit('projectRightBoxShow', false);
-      });
+          }
+        });
+      } else {
+        this.$post('project', this.newProject).then(response => {
+          if (response.code === 200) {
+            this.projectRightBox.isCreate = false;
+            this.getProjectData(this.newProject.name);
+            this.$store.commit('projectListReloadChange', true);
+            this.$store.commit('projectRightBoxShow', false);
+            this.getModuleData();
+            this.newProject = {id:'', name:'', remark:''};
+          }
+        });
+      }
     },
     // 保存module
     moduleSave: function() {
-      this.currentModule.param = this.paramToJson();
+      if (!this.moduleRightBox.isCreate) {
-      this.currentModule.projectId = this.currentModule.project.id;
+        this.currentModule.param = this.paramToJson();
-      this.$put('module', this.currentModule).then(response => {
+        this.currentModule.projectId = this.currentModule.project.id;
-        if (response.code === 200) {
+        this.$put('module', this.currentModule).then(response => {
-          this.esc(3);
+          if (response.code === 200) {
-          this.getModuleData();
+            this.esc(3);
-        }
+            this.getModuleData();
-      });
+          }
+        });
+      } else {
+        this.newModule.param = this.paramToJson();
+        this.$post('module', this.newModule).then(response => {
+          if (response.code === 200) {
+            this.esc(3);
+            this.getModuleData();
+            this.moduleRightBox.isCreate = false;
+          }
+        });
+      }
     },
     // 保存endpoint
     save: function() {
@@ -1246,7 +1262,16 @@ export default {
     },
     projectBoxShow() {
       return this.$store.state.projectBoxShow;
-    }
+    },
+    toCreateProject() {
+      return this.$store.state.createProject;
+    },
+    toCreateModule() {
+      return this.$store.state.createModule;
+    },
+    toCreateEndpoint() {
+      return this.$store.state.createEndpoint;
+    },
   },
   watch: {
     sProject(n, o) {
@@ -1258,6 +1283,32 @@ export default {
     },
     projectBoxShow(n, o) {
       this.projectRightBox.show = n;
+    },
+    toCreateProject(n ,o) {
+      if (n) {
+        this.$store.commit('toCreateProject', false);
+        this.projectRightBox.isCreate = true;
+        this.projectRightBox.title = this.$t('project.project.createProject');
+      }
+    },
+    toCreateModule(n ,o) {
+      if (n) {
+        this.$store.commit('toCreateModule', false);
+        this.moduleRightBox.show = true;
+        this.moduleRightBox.isCreate = true;
+        this.moduleRightBox.title = this.$t('project.module.createModule');
+        this.newModule = {id: '', name: '', projectId: this.project.id, project: this.project, port: '', path: '', param: '', paramObj: []};
+        this.paramObj = [];
+      }
+    },
+    toCreateEndpoint(n, o) {
+      if (n) {
+        this.$store.commit('toCreateEndpoint', false);
+        this.cleanEndpoint();
+        this.rightBox.show = true;
+        this.rightBox.isEdit = true;
+        this.rightBox.title = this.$t('project.endpoint.createEndpoint');
+      }
     }
   }
 }

nezha-fronted/src/store/index.js

@@ -13,7 +13,11 @@ const store = new Vuex.Store({
       name: ''
     },
     projectBoxShow: false,
-    projectListReload: false
+    projectListReload: false,
+    createProject: false,
+    createModule: false,
+    createEndpoint: false,
+    createAlertConfig: false,
   },
   getters: {
   },
@@ -27,7 +31,19 @@ const store = new Vuex.Store({
     },
     projectListReloadChange(state, reload) {
       state.projectListReload = reload;
-    }
+    },
+    toCreateProject(state, status) {
+      state.createProject = status;
+    },
+    toCreateModule(state, status) {
+      state.createModule = status;
+    },
+    toCreateEndpoint(state, status) {
+      state.createEndpoint = status;
+    },
+    toCreateAlertConfig(state, status) {
+      state.createAlertConfig = status;
+    },
   },
   actions: {
   }