完成vuex转换

 <template>
 <template>
   <div id="app">
   <div id="app">
     <setting/>
     <setting/>
-    <!-- <layout/> -->
+    <layout/>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
 import setting from "./components/setting";
 import setting from "./components/setting";
-// import layout from "./components/layout";
+import layout from "./components/layout";
 
 
 export default {
 export default {
   name: "app",
   name: "app",
   components: {
   components: {
     setting,
     setting,
-    // layout
+    layout
   },
   },
   mounted() {
   mounted() {
     this.$inventory
     this.$inventory
@@ -27,7 +27,7 @@ export default {
               "dashboard!name!home": {}
               "dashboard!name!home": {}
             })
             })
             .then(detail => {
             .then(detail => {
-              this.$store.commit("setDashboardId", detail.id);
+              this.$store.commit("layout/setDashboardId", detail.id);
             });
             });
         } else {
         } else {
           this.$store.commit(
           this.$store.commit(
@@ -36,16 +36,6 @@ export default {
           );
           );
         }
         }
       });
       });
-  },
-  methods: {
-    // isLock: function(val) {
-      // this.$store.commit("setLock", detail.id);
-    // this.isDraggable = val.isDraggable;
-    // this.isResizable = val.isResizable;
-    // this.$message.success(
-    //   val.isResizable && val.isDraggable ? "编辑已解锁" : "编辑已锁定"
-    // );
-    // }
   }
   }
 };
 };
 </script>
 </script>

@@ -5,15 +5,10 @@
         size="small"
         size="small"
         shape="circle"
         shape="circle"
         icon="close"
         icon="close"
-        @click="close"
-        v-show="this.$store.state.layout.isDraggable&&this.$store.state.layout.isResizable"
-      ></a-button>
-      <a-button
-        size="small"
-        shape="circle"
-        icon="setting"
-        v-show="this.$store.state.layout.isDraggable&&this.$store.state.layout.isResizable"
+        @click="close(index)"
+        v-show="this.$store.state.layout.isLock"
       ></a-button>
       ></a-button>
+      <a-button size="small" shape="circle" icon="setting" v-show="this.$store.state.layout.isLock"></a-button>
     </div>
     </div>
     <component :is="layout.name" :isConfig="isConfig"></component>
     <component :is="layout.name" :isConfig="isConfig"></component>
   </div>
   </div>
@@ -30,12 +25,12 @@
 </style>
 </style>
 
 
 <script>
 <script>
+import { mapMutations } from "vuex";
+
 export default {
 export default {
   props: {
   props: {
     layout: Object,
     layout: Object,
-    index: Number,
-    // isDraggable: Boolean,
-    // isResizable: Boolean
+    index: Number
   },
   },
   data() {
   data() {
     return {
     return {
@@ -43,9 +38,9 @@ export default {
     };
     };
   },
   },
   methods: {
   methods: {
-    close: function() {
-      this.$emit("close", this.index);
-    }
+    ...mapMutations({
+      close: "layout/delLayout"
+    })
   }
   }
 };
 };
 </script>
 </script>

@@ -3,8 +3,8 @@
     :layout.sync="this.$store.state.layout.layout"
     :layout.sync="this.$store.state.layout.layout"
     :col-num="100"
     :col-num="100"
     :row-height="30"
     :row-height="30"
-    :is-draggable="this.$store.state.layout.isDraggable"
-    :is-resizable="this.$store.state.layout.isResizable"
+    :is-draggable="this.$store.state.layout.isLock"
+    :is-resizable="this.$store.state.layout.isLock"
     :is-mirrored="false"
     :is-mirrored="false"
     :vertical-compact="true"
     :vertical-compact="true"
     :margin="[0, 0]"
     :margin="[0, 0]"
@@ -23,7 +23,7 @@
       :maxH="item.maxH"
       :maxH="item.maxH"
       :key="item.i"
       :key="item.i"
     >
     >
-      <gridComponent :layout="item" :index="index" @close="close"/>
+      <gridComponent :layout="item" :index="index"/>
     </grid-item>
     </grid-item>
   </grid-layout>
   </grid-layout>
 </template>
 </template>
@@ -36,11 +36,6 @@ export default {
     GridLayout: VueGridLayout.GridLayout,
     GridLayout: VueGridLayout.GridLayout,
     GridItem: VueGridLayout.GridItem,
     GridItem: VueGridLayout.GridItem,
     gridComponent
     gridComponent
-  },
-  methods:{
-    close:function(val){
-      // this.layout.splice(val,1)
-    }
   }
   }
 };
 };
 </script>
 </script>

@@ -5,19 +5,20 @@
       shape="circle"
       shape="circle"
       icon="plus"
       icon="plus"
       @click="() => visible = true"
       @click="() => visible = true"
-      v-show="this.$store.state.layout.isDraggable&&this.$store.state.layout.isResizable"
+      v-show="this.$store.state.layout.isLock"
     ></a-button>
     ></a-button>
     <a-button
     <a-button
       size="small"
       size="small"
       shape="circle"
       shape="circle"
       icon="lock"
       icon="lock"
-      @click="isLock(!this.$store.state.layout.isDraggable)"
+      @click="isLock"
     ></a-button>
     ></a-button>
     <a-modal
     <a-modal
       title="添加小部件"
       title="添加小部件"
       centered
       centered
       v-model="visible"
       v-model="visible"
       @ok="add"
       @ok="add"
+      @cancel="cancel"
       :destroyOnClose="true"
       :destroyOnClose="true"
       :maskClosable="false"
       :maskClosable="false"
       :okButtonProps="{ props: {disabled: selectItem===null?true:false} }"
       :okButtonProps="{ props: {disabled: selectItem===null?true:false} }"
@@ -48,7 +49,6 @@
 
 
 
 
 <script>
 <script>
-import { mapMutations } from "vuex";
 export default {
 export default {
   data() {
   data() {
     return {
     return {
@@ -59,9 +59,6 @@ export default {
     };
     };
   },
   },
   methods: {
   methods: {
-    ...mapMutations({
-      isLock: "setLock"
-    }),
     filterOption(input, option) {
     filterOption(input, option) {
       return (
       return (
         option.componentOptions.children[0].text
         option.componentOptions.children[0].text
@@ -78,8 +75,20 @@ export default {
       }
       }
     },
     },
     add: function() {
     add: function() {
-      this.$store.commit("setLatout", this.selectItem);
+      this.$store.commit("layout/addLayout", this.selectItem);
       this.visible = false;
       this.visible = false;
+      this.selectItem = null;
+      this.configSelect = null;
+    },
+    cancel: function() {
+      this.selectItem = null;
+      this.configSelect = null;
+    },
+    isLock: function() {
+      this.$store.commit("layout/setLock", !this.$store.state.layout.isLock);
+      this.$message.success(
+        this.$store.state.layout.isLock ? "编辑已解锁" : "编辑已锁定"
+      );
     }
     }
   }
   }
 };
 };

 const state = {
 const state = {
   layout: [],
   layout: [],
-  isDraggable: true,
-  isResizable: true,
-  dashboardId: null,
+  isLock: true,
+  dashboardId: null
 };
 };
 
 
 const mutations = {
 const mutations = {
@@ -10,23 +9,25 @@ const mutations = {
     state.dashboardId = id;
     state.dashboardId = id;
   },
   },
   setLock(state, value) {
   setLock(state, value) {
-    state.isDraggable = value;
-    state.isResizable = value;
+    state.isLock = value;
   },
   },
-  setLatout(state, name) {
+  addLayout(state, name) {
     state.layout.push({
     state.layout.push({
-        x: 0,
-        y: 0,
-        w: 10,
-        h: 2,
-        i: state.layout.length + 1,
-        name
+      x: 0,
+      y: 0,
+      w: 10,
+      h: 2,
+      i: state.layout.length + 1,
+      name
     });
     });
   },
   },
+  delLayout(state, index) {
+    state.layout.splice(index, 1);
+  }
 };
 };
 
 
 export default {
 export default {
   namespaced: true,
   namespaced: true,
   state,
   state,
-  mutations,
+  mutations
 };
 };

@@ -11,11 +11,7 @@
 </style>
 </style>
 
 
 <script>
 <script>
-import config from "./config";
 export default {
 export default {
   name: "index1",
   name: "index1",
-  components: {
-    config
-  }
 };
 };
 </script>
 </script>