Merge pull request 'fix bugs grid on popup' (#86) from dev-dungtv-0821 into dev

Reviewed-on: #86

assets/scss/common/grid.scss

@@ -10,6 +10,14 @@
   &-container {
     width: 100%;
     border-radius: 10px;
+
+    .tui-select-box-input {
+      p {
+        font-size: 14px;
+        font-family: inherit
+      }
+    }
+
   }
 
   &-content-area {
@@ -23,6 +31,7 @@
 
   &-no-scroll-y {
     .tui-grid-rside-area {
+
       .tui-grid-header-area,
       .tui-grid-summary-area {
         margin-right: 0 !important;
@@ -150,6 +159,15 @@
 
   .tui-select-box-input {
     border-radius: 6px;
+
+    .tui-select-box-icon {
+      width: 14px;
+      height: 14px;
+
+      background-repeat: no-repeat;
+      background-size: contain;
+      margin-top: -20px;
+    }
   }
 
   .tui-select-box-dropdown {
@@ -158,7 +176,9 @@
     padding: 4px;
     box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 0px rgba(0, 0, 0, 0.14), 0px 0px 0px 0px rgba(0, 0, 0, 0.12);
 
+
     .tui-select-box-item {
+      font-size: 14px;
       margin-bottom: 4px;
       position: relative;
 
@@ -204,44 +224,6 @@
   @include theme($theme);
 
   .v-application.#{$theme}-mode {
-    .enrg-effc {
-      .tui-grid-rside-area {
-        .tui-grid-table {
-          tr {
-
-            td:nth-child(4),
-            td:nth-child(10) {
-              .tui-grid-cell-content {
-                color: map-deep-get($config,
-                  #{$theme},
-                  "router-tab-item-active-color"
-                );
-              }
-            }
-          }
-
-          .tui-grid {
-
-            &-row-odd,
-            &-row-even {
-              &:hover {
-
-                >td:nth-child(4),
-                td:nth-child(10) {
-                  .tui-grid-cell-content {
-                    color: map-deep-get($config,
-                      #{$theme},
-                      "router-tab-item-active-color"
-                    );
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
     .tui-grid-content-area {
       .tui-grid-header-area {
         height: auto !important;
@@ -715,7 +697,7 @@
       }
 
       &-tree-button-expand {
-        z-index: 9999;
+        z-index: 7;
 
         .tui-grid-btn-tree {
           i {
@@ -735,7 +717,7 @@
       }
 
       &-tree-button-collapse {
-        z-index: 9999;
+        z-index: 7;
 
         .tui-grid-btn-tree {
           i {
@@ -862,6 +844,17 @@
           "tui-grid-cell-color"
         );
 
+        .tui-select-box-icon {
+
+          @if $theme ==dark {
+            background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2217%22%20height%3D%2216%22%20viewBox%3D%220%200%2017%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cpath%20fill%3D%22rgba(255%2C%20255%2C%20255%2C%200.45)%22%20d%3D%22M1.90728%203.65546L8.20371%2012.3358C8.43228%2012.6501%208.90014%2012.6501%209.12692%2012.3358L15.4251%203.65546C15.4406%203.63411%2015.4499%203.60889%2015.452%203.58259C15.454%203.55628%2015.4487%203.52993%2015.4367%203.50644C15.4247%203.48296%2015.4064%203.46326%2015.3839%203.44954C15.3613%203.43581%2015.3354%203.42859%2015.3091%203.42868H13.9698C13.8787%203.42868%2013.793%203.47332%2013.7394%203.54653L8.66621%2010.5394L3.593%203.54653C3.53942%203.47332%203.45371%203.42868%203.36264%203.42868H2.02335C1.90728%203.42868%201.83943%203.56082%201.90728%203.65546Z%22/%3E%3C/svg%3E");
+          }
+
+          @else {
+            background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2217%22%20height%3D%2216%22%20viewBox%3D%220%200%2017%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cpath%20fill%3D%22rgba(0%2C%200%2C%200%2C%200.45)%22%20d%3D%22M1.90728%203.65546L8.20371%2012.3358C8.43228%2012.6501%208.90014%2012.6501%209.12692%2012.3358L15.4251%203.65546C15.4406%203.63411%2015.4499%203.60889%2015.452%203.58259C15.454%203.55628%2015.4487%203.52993%2015.4367%203.50644C15.4247%203.48296%2015.4064%203.46326%2015.3839%203.44954C15.3613%203.43581%2015.3354%203.42859%2015.3091%203.42868H13.9698C13.8787%203.42868%2013.793%203.47332%2013.7394%203.54653L8.66621%2010.5394L3.593%203.54653C3.53942%203.47332%203.45371%203.42868%203.36264%203.42868H2.02335C1.90728%203.42868%201.83943%203.56082%201.90728%203.65546Z%22/%3E%3C/svg%3E");
+          }
+        }
+
       }
 
       .tui-select-box-dropdown {
@@ -886,7 +879,8 @@
 
 
         .tui-select-box-highlight {
-          background:none !important;
+          background: none !important;
+
           &:before {
             background: map-deep-get($config,
               #{$theme},

assets/scss/common/input.scss

@@ -266,6 +266,13 @@ input[type="checkbox"] {
         }
       }
     }
+    .ant-checkbox-wrapper-disabled {
+      .ant-checkbox-inner {
+        &.ant-checkbox-inner::after {
+          border-color: map-deep-get($config, #{$theme}, "ant-checkbox-disabled-color") !important;
+        }
+      }
+    }
 
     .v-input-popup__custom {
       .v-input__slot {

assets/scss/layout.scss

@@ -448,8 +448,8 @@
 
       .router-tab {
         .router-tab__header {
-          background-color: map-deep-get($config, #{$theme}, "router-header");
+          // background-color: map-deep-get($config, #{$theme}, "router-header");
-          border-color: map-deep-get($config, #{$theme}, "router-header");
+          // border-color: map-deep-get($config, #{$theme}, "router-header");
           height: 46px;
           z-index: 7;
           max-width: calc(100vw - 290px);

assets/scss/var.scss

@@ -190,6 +190,7 @@ $config: (
     highlighted-bg-opacity: 0.08,
     ant-checkbox-disabled-bg: #FFFFFF14,
     ant-checkbox-disabled-border: #424242,
+    ant-checkbox-disabled-color: #FFFFFF40,
   ),
   light: (w-g5: $--color-gray_555,
     g5-w: $--color-white,
@@ -343,5 +344,6 @@ $config: (
     highlighted-bg-opacity: 0.04,
     ant-checkbox-disabled-bg: #0000000A,
     ant-checkbox-disabled-border: #D9D9D9,
+    ant-checkbox-disabled-color: #00000040,
   ),
 );

components/common/PastRsltDatePicker.vue

@@ -58,6 +58,11 @@ export default {
 			require: false,
 			default: false,
 		},
+		required: {
+			type: Boolean,
+			require: false,
+			default: false,
+		},
 		labelCols: {
 			type: Number,
 			require: false,

components/common/modal/EqpmSelectPop.vue

@@ -400,7 +400,6 @@ export default {
 				header: {
 					height: 'auto',
 				},
-				// rowHeaders:[{ type: 'checkbox' }],
 				rowHeight: 'auto',
 			};
 			if (this.isMulti) {
@@ -408,8 +407,6 @@ export default {
 				myOptions['rowHeight'] = 'auto';
 			}
 
-
-
 			this.setModalGridOption({
 				modalKey: this.myModalKey,
 				gridKey: this.gridName,
@@ -463,8 +460,6 @@ export default {
 				modalDataKey: this.modalDataKey,
 				value: myColumns,
 			});
-
-
 			// this.getRowGridData();
 		},
 		async getRowGridData() {
@@ -588,6 +583,18 @@ var eqpmSelectPop = {
 		overflow-y: hidden;
 	}
 
+	.tui-grid-lside-area {
+		.tui-grid-table {
+			.tui-grid-cell-header {
+				&.tui-grid-cell  {
+					input[type=checkbox] {
+						margin-top: 0px;
+					}
+				}
+			}
+		}
+	}
+
 }
 
 </style>

components/pages/ems/EccInfo/EccAddInfoTab.vue

@@ -112,10 +112,10 @@ export default {
 				bodyHeight: gridHeight,
 				minBodyHeight: gridHeight,
 				header: {
-					height: 28,
+					height: 37,
 				},
-				rowHeight: 29,
+				rowHeight: 37,
-				minRowHeight: 29,
+				minRowHeight: 37,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};

layouts/default.vue

@@ -104,7 +104,9 @@
                   :items="treevieItems" activatable hoverable color="#3896ff" open-on-click @update:open="openNode">
                   <template slot="label" slot-scope="{ item }">
                     <button :class="{ 'justify-center': miniVariant }" @mouseover="doMouseOver">
-                      
+                      <!-- <span v-if="['MNU0065', 'MNU0027'].includes(item.menuId)" >
+                        {{ item }}
+                      </span> -->
                       <v-icon 
                         v-if="item.lvl === 1 && menuIconKeys.includes(item.menuId)"
                         :class="{ 'mr-2': !miniVariant }" 
@@ -142,8 +144,12 @@
               </v-navigation-drawer>
             </div>
 
-            <v-col>
+            <v-col :class="`${isDarkMode ? 'dark' : 'light'}`">
-              <router-tab ref="routerTab" :tabs="treevieItems" :keep-last-tab="false" :contextmenu="false">
+              <router-tab ref="routerTab" 
+                :tabs="treevieItems" 
+                :keep-last-tab="false" 
+                :contextmenu="false"
+              >
                 <template slot-scope="{ title, closable, to, base }">
                   <span>{{ title }}</span>
                   <v-icon size="20" class="ml-2" v-if="closable" @click.stop="onCloseTab(to)">mdi-close</v-icon>
@@ -700,4 +706,17 @@ export default {
 
 <style lang="scss" scoped>
 @import '@/assets/scss/layout.scss';
+
+</style>
+
+<style lang="scss">
+.light .router-tab .router-tab__header {
+    background-color: #fff;
+    border-color: #fff;
+}
+
+.dark .router-tab .router-tab__header {
+    background-color: #212224;
+    border-color: #212224;
+}
 </style>

pages/comm/auth/RoleMngPage.vue

@@ -505,3 +505,10 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/comm/auth/UserRoleMngPage.vue

@@ -1086,3 +1086,10 @@ function sha512(str) {
 		.digest('hex');
 }
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style> 

pages/comm/base/PrgmMngPage.vue

@@ -522,3 +522,10 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style> 

pages/ems/base/EnrgCostCenterMngPage.vue

@@ -1029,3 +1029,10 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/ems/base/EquipmentMasterMngPage.vue

@@ -1005,3 +1005,10 @@ const dataPathDataExample = getPathDataExample({
 		field2: '2222',
 	});
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/ems/base/ReadResultCloseMngPage.vue

@@ -129,10 +129,20 @@ let myPrgmId;
 export default {
   mixins: [mixinGlobal, resize],
   async asyncData(context) {
-    const myState = context.store.state;
+    // console.log('----DEBUG-----ReadResultCloseMngPage--asyncData:', Utility.setFormatDate(new Date(), "YYYYMMDD"));
-    myPrgmId = context.route.query.prgmId;
+    try{
-    await context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
+      myPrgmId = context.route.query.prgmId;
-    myTitle = await myState.activeMenuInfo.menuNm;
+      const myState = context.store.state;
+      const activeMenuInfo = myState.menuData[myPrgmId];
+      myTitle = activeMenuInfo.menuNm;
+
+      // console.log('-----DEBUG----store.commit----setActiveMenuInfo:', activeMenuInfo);
+      await context.store.commit("setActiveMenuInfo", activeMenuInfo);
+      myTitle = await myState.activeMenuInfo.menuNm;
+      // console.log('-----DEBUG----store.commit----setActiveMenuInfo---Compeleted:', myState.activeMenuInfo);
+    }catch(err){
+      // console.log('-----DEBUG----err', err);
+    }
   },
   meta: {
     title: () => {
@@ -206,18 +216,21 @@ export default {
       this.setPageData({ isFind: true });
     },
   },
-  async beforeCreate() {
+  beforeCreate() { 
+    // console.log('----DEBUG-----ReadResultCloseMngPage--beforeCreate:', Utility.setFormatDate(new Date(), "YYYYMMDD"));
     myPrgmId = this.$route.query.prgmId;
-    await this.$store.dispatch("chkOpenTabList", {
+    const context = {
       key: "create",
       prgmId: myPrgmId,
       defaultData: defaultData,
-    });
+    };
+    this.$store.dispatch("chkOpenTabList", context);
   },
   mounted() {
     this.init();
   },
-  created() {},
+  created() { 
+  },
   methods: {
     ...mapMutations({
       setPageData: "setPageData",
@@ -452,3 +465,10 @@ const myColumns = [
   },
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -72,9 +72,9 @@
 
 						</div>
 						<div class="d-flex align-center justify-center pa-5 pb-0" v-if="loadGrid && totalCount > 0">
-								<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
+							<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
-									@loadData="changeGrid" />
+								@loadData="changeGrid" />
-							</div>
+						</div>
 
 					</div>
 
@@ -589,6 +589,39 @@ export default {
 			});
 
 			const _this = this;
+			class CustomButton {
+				constructor(props) {
+					const { grid, rowKey, columnInfo } = props;
+
+					const gridData = grid.store.data.rawData;
+					const value = gridData[rowKey][columnInfo.name];
+
+					this.disabled = columnInfo.renderer.options.disabled || false;
+					const elDiv = document.createElement('div');
+					if (value != null) {
+						elDiv.innerHTML = `<span>${value}</span>`;
+						$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
+						const el2 = document.createElement('button');
+						$(el2).addClass('edit-btn blue--text');
+						el2.innerText = '보기';
+						elDiv.appendChild(el2);
+					} else {
+						elDiv.innerHTML = `<span></span>`;
+					}
+
+					this.el = elDiv;
+
+				}
+				getElement() {
+					return this.el;
+				}
+				getValue() {
+					// return this.el.value;
+				}
+				mounted() {
+					// this.el.focus();
+				}
+			}
 			const myColumns = [
 				{
 					header: 'FAB',
@@ -633,7 +666,13 @@ export default {
 				{
 					header: '가이드명',
 					name: 'gdIdxNm',
-					width: 200,
+					width: 250,
+					renderer: {
+						type: CustomButton,
+						options: {
+							value: "보기",
+						}
+					},
 				},
 				{
 					header: '주의',
@@ -668,6 +707,12 @@ export default {
 					name: 'ngCnt',
 					align: 'right',
 					width: 80,
+					renderer: {
+						type: CustomButton,
+						options: {
+							value: "보기",
+						}
+					},
 				},
 			];
 

pages/ems/effc/EnrgMapPage.vue

@@ -239,7 +239,7 @@ export default {
 			try{
 				await this.getChartData();
 			}catch(err){
-				this.initTestChart();
+				// this.initTestChart();
 			}
 			this.setPageData({
 				isFind: false,

store/index.js

@@ -513,6 +513,7 @@ export const actions = {
 				//commit("pageInit", {});
 				break;
 			case 'create':
+				// console.log("---------DEBUGmyPrgmId:", myPrgmId);
 				if (!list.some(it => it === myPrgmId)) {
 					// console.log("클릭 한 메뉴가 기존 목록에 없다 => 새로 push"); // & 초기화 세팅
 					localStorage.setItem('pageData', JSON.stringify(state.pageData));