Commit @2487284334378dd34f06544b22c795a54ccdbc37

하석형 04-25

250425 하석형 관리자 메인으로 이동 시 메뉴선택 초기화, 메뉴트리 -> 메뉴배열로 스토어 저장 로직 추가

@2487284334378dd34f06544b22c795a54ccdbc37

2487284

client/resources/js/defaultMenuSatisfactionParams.js (added)

+++ client/resources/js/defaultMenuSatisfactionParams.js

...	...	@@ -0,0 +1,12 @@
	1	+// 관리자 정보 객체
	2	+const defaultMenuDgstfnParams = {
	3	+ menuId: '',
	4	+ rspnsFive: 'N',
	5	+ rspnsFour: 'N',
	6	+ rspnsThree: 'N',
	7	+ rspnsTwo: 'N',
	8	+ rspnsOne: 'N',
	9	+ opnn: '',
	10	+};
	11	+
	12	+export { defaultMenuDgstfnParams };(파일 끝에 줄바꿈 문자 없음)

d14c651

2487284

client/views/layout/AdminHeader.vue

--- client/views/layout/AdminHeader.vue

+++ client/views/layout/AdminHeader.vue


     },
     watch: {
         'pgNm'(newValue,oldValue){
-            console.log(oldValue)
         },
         '$store.state.menu'(newValue) {
-            this.pgNm = newValue.menuNm
+            if(newValue) {
+                this.pgNm = newValue.menuNm
+            }
         },
 
     },

d14c651

2487284

client/views/layout/AdminMenu.vue

--- client/views/layout/AdminMenu.vue

+++ client/views/layout/AdminMenu.vue


             if (menu.linkType === "0") {
                 // 현재창
                 this.$router.push({
-                path: menu.routerUrl,
+                    path: menu.routerUrl,
                 });
             } else if (menu.linkType === "1") {
                 // 새창

                 return formatted;
             });
         },
+
+        // 모든 메뉴 닫기
+        closeAllMenus(menus) {
+            for (const menu of menus) {
+                menu.isOpen = false;
+
+                if (Array.isArray(menu.childList) && menu.childList.length > 0) {
+                    this.closeAllMenus(menu.childList); // 재귀로 하위 메뉴까지 모두 닫기
+                }
+            }
+        }
     },
     watch: {
         // 나중에 네비게이션 가드에서 form 받을 수 있으면 form adm/main으로 갈때 sotre.state값0로 바꿔주기
-        $route(to) {
+        $route(to, from) {
             this.currentPath = to.path;
         },
         "$store.state.mbrNm"(newVal) {

                     this.menuCheck();
                 }
             }
-        }
+        },
+        '$store.state.menu'(newValue) {
+            if(!newValue) {
+                this.closeAllMenus(this.menuList);
+                this.activeMenus = [];
+            }
+        },
     }
 };
 </script>

d14c651

2487284

client/views/layout/menuSatisfaction.vue

--- client/views/layout/menuSatisfaction.vue

+++ client/views/layout/menuSatisfaction.vue


         </div>
     </div>
     <div v-else>
-        <label class="form-title">[만족도 조사 비활성화 상태]</label>
     </div>
 </template>
 
 <script>
 import store from "../pages/AppStore.js";
+import { defaultMenuDgstfnParams } from '../../resources/js/defaultMenuSatisfactionParams.js';
 import { menuFindByMenu } from '../../resources/api/menu.js';
 import { findByMenuId, save } from '../../resources/api/menuDgstfn.js';
 

             dgstfnExmnUseYn: "N", // 메뉴 만족도 사용 여부
             rspnsYn: 'N', // 응답 여부
             checkRspns: '', // '5' ~ '1' 중 하나
-            menuDgstfn: {
-                rspnsFive: 'N',
-                rspnsFour: 'N',
-                rspnsThree: 'N',
-                rspnsTwo: 'N',
-                rspnsOne: 'N',
-                opnn: '', // 의견
-            }, // 메뉴 만족도
+            menuDgstfn: { ...defaultMenuDgstfnParams }, // 메뉴 만족도
         }
     },
     created() {
     },
     methods: {
         // 상세 조회
-        async fnView(menuId) {
+        async fnView() {
             try {
+                this.checkRspns = ''; // 응답 초기화
+                this.menuDgstfn = { ...defaultMenuDgstfnParams }; // 응답 초기화
                 const params = { menuId: this.menuId };
                 const res = await menuFindByMenu(params);
                 if (res.status == 200) {
                     this.dgstfnExmnUseYn = res.data.data.dgstfnExmnUseYn;
-
-                     // 부모에게 전달
-                    this.$emit('menuChecck', res.data.data.dgstfnExmnUseYn);
-
+                    
+                    this.$emit('menuChecck', this.dgstfnExmnUseYn);
                     if(res.data.data.dgstfnExmnUseYn == 'Y') {
                         this.fnViewByMenuId();
-                    } else {
-                        this.dgstfnExmnUseYn = 'N';
                     }
                 }
+                // 부모에게 전달
             } catch (error) {
-                alert(error.response.data.message);
+                alert(error.res.data.message);
             }
         },
 

                     }
                 }
             } catch (error) {
-                alert(error.response.data.message);
+                alert(error.res.data.message);
             }
         },
 

 
     },
     watch: {
-        'pgNm'(newValue, oldValue) {
-        },
         '$store.state.menu'(newValue) {
-            this.pgNm = newValue.menuNm
-            this.menuId = newValue.menuId
-            this.fnView();
+            if(newValue) {
+                this.pgNm = newValue.menuNm;
+                this.menuId = newValue.menuId;
+                this.fnView();
+            } else {
+                this.$emit('menuChecck', 'N');
+            }
         },
     },
     computed: {
-
         pgNm() {
             return store.state.menu && store.state.menu.menuNm ? store.state.menu.menuNm : "홈";
         }
-
     },
     mounted() {
 

d14c651

2487284

client/views/pages/AppStore.js

--- client/views/pages/AppStore.js

+++ client/views/pages/AppStore.js


 
 export default createStore({
   plugins: [createPersistedState({
-    paths: ['loginMode', 'authorization', 'mbrId', 'mbrNm', 'roles', 'contextPath', 'pageAuth', 'menu']
+    paths: ['loginMode', 'authorization', 'mbrId', 'mbrNm', 'roles', 'contextPath', 'pageAuth']
   })],
   state: {
     authorization: null,

     },
     setMenuList(state, menuList) {
       state.menuList = menuList;
+      // 메뉴트리 펼치기
+      const flattenMenus = (menus) => {
+        const result = [];
+
+        for (const menu of menus) {
+          result.push(menu);
+          if (menu.childList?.length) {
+            result.push(...flattenMenus(menu.childList));
+          }
+        }
+
+        return result;
+      }
+      const flattenedMenuList = flattenMenus(menuList);
+      state.flatMenuList = flattenedMenuList;
     },
     setContextPath(state, ctx) {
       state.contextPath = ctx;

Add a comment

Open 0
Closed 0

List

...	...	@@ -107,7 +107,7 @@
107	107	if (menu.linkType === "0") {
108	108	// 현재창
109	109	this.$router.push({
110		- path: menu.routerUrl,
	110	+ path: menu.routerUrl,
111	111	});
112	112	} else if (menu.linkType === "1") {
113	113	// 새창
...	...	@@ -177,10 +177,21 @@
177	177	return formatted;
178	178	});
179	179	},
	180	+
	181	+ // 모든 메뉴 닫기
	182	+ closeAllMenus(menus) {
	183	+ for (const menu of menus) {
	184	+ menu.isOpen = false;
	185	+
	186	+ if (Array.isArray(menu.childList) && menu.childList.length > 0) {
	187	+ this.closeAllMenus(menu.childList); // 재귀로 하위 메뉴까지 모두 닫기
	188	+ }
	189	+ }
	190	+ }
180	191	},
181	192	watch: {
182	193	// 나중에 네비게이션 가드에서 form 받을 수 있으면 form adm/main으로 갈때 sotre.state값0로 바꿔주기
183		- $route(to) {
	194	+ $route(to, from) {
184	195	this.currentPath = to.path;
185	196	},
186	197	"$store.state.mbrNm"(newVal) {
...	...	@@ -193,7 +204,13 @@
193	204	this.menuCheck();
194	205	}
195	206	}
196		- }
	207	+ },
	208	+ '$store.state.menu'(newValue) {
	209	+ if(!newValue) {
	210	+ this.closeAllMenus(this.menuList);
	211	+ this.activeMenus = [];
	212	+ }
	213	+ },
197	214	}
198	215	};
199	216	</script>

...	...	@@ -48,12 +48,12 @@
48	48	</div>
49	49	</div>
50	50	<div v-else>
51		- <label class="form-title">[만족도 조사 비활성화 상태]</label>
52	51	</div>
53	52	</template>
54	53
55	54	<script>
56	55	import store from "../pages/AppStore.js";
	56	+import { defaultMenuDgstfnParams } from '../../resources/js/defaultMenuSatisfactionParams.js';
57	57	import { menuFindByMenu } from '../../resources/api/menu.js';
58	58	import { findByMenuId, save } from '../../resources/api/menuDgstfn.js';
59	59
...	...	@@ -67,38 +67,30 @@
67	67	dgstfnExmnUseYn: "N", // 메뉴 만족도 사용 여부
68	68	rspnsYn: 'N', // 응답 여부
69	69	checkRspns: '', // '5' ~ '1' 중 하나
70		- menuDgstfn: {
71		- rspnsFive: 'N',
72		- rspnsFour: 'N',
73		- rspnsThree: 'N',
74		- rspnsTwo: 'N',
75		- rspnsOne: 'N',
76		- opnn: '', // 의견
77		- }, // 메뉴 만족도
	70	+ menuDgstfn: { ...defaultMenuDgstfnParams }, // 메뉴 만족도
78	71	}
79	72	},
80	73	created() {
81	74	},
82	75	methods: {
83	76	// 상세 조회
84		- async fnView(menuId) {
	77	+ async fnView() {
85	78	try {
	79	+ this.checkRspns = ''; // 응답 초기화
	80	+ this.menuDgstfn = { ...defaultMenuDgstfnParams }; // 응답 초기화
86	81	const params = { menuId: this.menuId };
87	82	const res = await menuFindByMenu(params);
88	83	if (res.status == 200) {
89	84	this.dgstfnExmnUseYn = res.data.data.dgstfnExmnUseYn;
90		-
91		- // 부모에게 전달
92		- this.$emit('menuChecck', res.data.data.dgstfnExmnUseYn);
93		-
	85	+
	86	+ this.$emit('menuChecck', this.dgstfnExmnUseYn);
94	87	if(res.data.data.dgstfnExmnUseYn == 'Y') {
95	88	this.fnViewByMenuId();
96		- } else {
97		- this.dgstfnExmnUseYn = 'N';
98	89	}
99	90	}
	91	+ // 부모에게 전달
100	92	} catch (error) {
101		- alert(error.response.data.message);
	93	+ alert(error.res.data.message);
102	94	}
103	95	},
104	96
...	...	@@ -115,7 +107,7 @@
115	107	}
116	108	}
117	109	} catch (error) {
118		- alert(error.response.data.message);
	110	+ alert(error.res.data.message);
119	111	}
120	112	},
121	113
...	...	@@ -146,20 +138,20 @@
146	138
147	139	},
148	140	watch: {
149		- 'pgNm'(newValue, oldValue) {
150		- },
151	141	'$store.state.menu'(newValue) {
152		- this.pgNm = newValue.menuNm
153		- this.menuId = newValue.menuId
154		- this.fnView();
	142	+ if(newValue) {
	143	+ this.pgNm = newValue.menuNm;
	144	+ this.menuId = newValue.menuId;
	145	+ this.fnView();
	146	+ } else {
	147	+ this.$emit('menuChecck', 'N');
	148	+ }
155	149	},
156	150	},
157	151	computed: {
158		-
159	152	pgNm() {
160	153	return store.state.menu && store.state.menu.menuNm ? store.state.menu.menuNm : "홈";
161	154	}
162		-
163	155	},
164	156	mounted() {
165	157

...	...	@@ -64,10 +64,11 @@
64	64	},
65	65	watch: {
66	66	'pgNm'(newValue,oldValue){
67		- console.log(oldValue)
68	67	},
69	68	'$store.state.menu'(newValue) {
70		- this.pgNm = newValue.menuNm
	69	+ if(newValue) {
	70	+ this.pgNm = newValue.menuNm
	71	+ }
71	72	},
72	73
73	74	},

...	...	@@ -4,7 +4,7 @@
4	4
5	5	export default createStore({
6	6	plugins: [createPersistedState({
7		- paths: ['loginMode', 'authorization', 'mbrId', 'mbrNm', 'roles', 'contextPath', 'pageAuth', 'menu']
	7	+ paths: ['loginMode', 'authorization', 'mbrId', 'mbrNm', 'roles', 'contextPath', 'pageAuth']
8	8	})],
9	9	state: {
10	10	authorization: null,
...	...	@@ -65,6 +65,21 @@
65	65	},
66	66	setMenuList(state, menuList) {
67	67	state.menuList = menuList;
	68	+ // 메뉴트리 펼치기
	69	+ const flattenMenus = (menus) => {
	70	+ const result = [];
	71	+
	72	+ for (const menu of menus) {
	73	+ result.push(menu);
	74	+ if (menu.childList?.length) {
	75	+ result.push(...flattenMenus(menu.childList));
	76	+ }
	77	+ }
	78	+
	79	+ return result;
	80	+ }
	81	+ const flattenedMenuList = flattenMenus(menuList);
	82	+ state.flatMenuList = flattenedMenuList;
68	83	},
69	84	setContextPath(state, ctx) {
70	85	state.contextPath = ctx;

Delete comment