Merge remote-tracking branch 'origin/master'

src/store/index.js

@@ -30,6 +30,30 @@ export default new Vuex.Store({
       gridSpacing: 10,
       gridSpacing: 10,
     },
     },
     grid: [
     grid: [
+      // {
+      //   label: "7×8",
+      //   value: 4,
+      //   row: 7,
+      //   col: 8,
+      //   h: 0,
+      //   w: 0,
+      // },
+      // {
+      //   label: "10×12",
+      //   row: 10,
+      //   value: 3,
+      //   col: 12,
+      //   h: 0,
+      //   w: 0,
+      // },
+      // {
+      //   label: "14×16",
+      //   row: 14,
+      //   value: 2,
+      //   col: 16,
+      //   h: 0,
+      //   w: 0,
+      // },
       {
       {
         label: "16×18",
         label: "16×18",
         value: 1,
         value: 1,
@@ -38,14 +62,14 @@ export default new Vuex.Store({
         h: 0,
         h: 0,
         w: 0,
         w: 0,
       },
       },
-      {
-        label: "18×22",
-        value: 1,
-        row: 18,
-        col: 22,
-        h: 0,
-        w: 0,
-      },
+      // {
+      //   label: "16×21",
+      //   value: 0,
+      //   row: 16,
+      //   col: 21,
+      //   h: 0,
+      //   w: 0,
+      // },
     ],
     ],
   },
   },
   mutations: {
   mutations: {
@@ -83,12 +107,21 @@ export default new Vuex.Store({
       // state.grid[0].h = h;
       // state.grid[0].h = h;
       // state.grid[0].w = w;
       // state.grid[0].w = w;
       state.grid.forEach((el) => {
       state.grid.forEach((el) => {
-        if (el.value == 1) {
+        if (el.value == 0) {
+          el.h = 630 * (state.WHproportion - 0.3);
+          el.w = 480 * (state.WHproportion - 0.3);
+        } else if (el.value == 1) {
           el.h = 540 * state.WHproportion;
           el.h = 540 * state.WHproportion;
           el.w = 480 * state.WHproportion;
           el.w = 480 * state.WHproportion;
-        } else {
-          el.h = 660 * state.WHproportion;
-          el.w = 540 * state.WHproportion;
+        } else if (el.value == 2) {
+          el.h = 480 * state.WHproportion;
+          el.w = 420 * state.WHproportion;
+        } else if (el.value == 3) {
+          el.h = 360 * (state.WHproportion + 1);
+          el.w = 300 * (state.WHproportion + 1);
+        } else if (el.value == 4) {
+          el.h = 240 * (state.WHproportion + 1.8);
+          el.w = 210 * (state.WHproportion + 1.8);
         }
         }
       });
       });
     },
     },

src/views/design/data.js

 export const grid = [
 export const grid = [
-  // {
-  //   label: '7×8',
-  //   value: 4,
-  //   col: 7,
-  //   row: 8
-  // },
-  // {
-  //   label: '10×12',
-  //   col: 10,
-  //   value: 3,
-  //   row: 12
-  // },
-  // {
-  //   label: '14×16',
-  //   col: 14,
-  //   value: 2,
-  //   row: 16
-  // },
+  {
+    label: "7×8",
+    value: 4,
+    col: 7,
+    row: 8,
+    h: 0,
+    w: 0,
+  },
+  {
+    label: "10×12",
+    col: 10,
+    value: 3,
+    row: 12,
+    h: 0,
+    w: 0,
+  },
+  {
+    label: "14×16",
+    col: 14,
+    value: 2,
+    row: 16,
+    h: 0,
+    w: 0,
+  },
   {
   {
     label: "16×18",
     label: "16×18",
     value: 1,
     value: 1,
@@ -27,10 +33,12 @@ export const grid = [
     h: 0,
     h: 0,
     w: 0,
     w: 0,
   },
   },
-  // {
-  //   label: '16×21',#77797a
-  //   value: 0,
-  //   col: 16,
-  //   row: 21
-  // }
+  {
+    label: "16×21",
+    value: 0,
+    col: 16,
+    row: 21,
+    h: 0,
+    w: 0,
+  },
 ];
 ];