Merge pull request 'change style editor link button match desgin' (#110) from dev-manhph1-figbug into dev

Reviewed-on: #110

assets/scss/common/editor.scss

@@ -83,7 +83,7 @@
 
 .toastui-editor-dark .toastui-editor-popup,
 .toastui-editor-dark .toastui-editor-context-menu {
-  background-color: #121212;
+  background-color: #212224;
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
   border-color: #494c56;
 }
@@ -101,8 +101,16 @@
   color: #eee;
 }
 
+.toastui-editor-popup-body label,
+.toastui-editor-popup-body button,
+.toastui-editor-popup-body .tab-item,
+.toastui-editor-popup-body span,
+.toastui-editor-popup-body input {
+    font-family: var(--desktop-normal-font-family, "Inter-Regular", sans-serif) !important;
+}
+
 .toastui-editor-dark .toastui-editor-popup-body label {
-  color: #9a9da3;
+  color: rgba(255, 255, 255, 0.85098);
 }
 
 .toastui-editor-dark .toastui-editor-popup-body input[type='text'] {
@@ -116,7 +124,7 @@
 }
 
 .toastui-editor-dark .toastui-editor-popup-body input[type='text'].disabled {
-  color: #969aa5;
+  color:  rgba(255, 255, 255, 0.85098);
   border-color: #303238;
   background-color: rgba(48, 50, 56, 0.4);
 }
@@ -135,6 +143,10 @@
   border-bottom-color: #67ccff;
 }
 
+.toastui-editor-dark .toastui-editor-popup-add-image .toastui-editor-file-name.has-file {
+  color:#eee;
+}
+
 .toastui-editor-dark .toastui-editor-popup-body .toastui-editor-file-name {
   border-color: #303238;
   color: #eee;
@@ -150,24 +162,54 @@
   border-color: #494c56;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button {
+.toastui-editor-defaultUI .toastui-editor-button-container button{
-  color: #eee;
+  border-radius: 6px;
-  border-color: #303238;
+  height: 32px;
-  background-color: #232428;
+  font-family: var(--desktop-normal-font-family, "Inter-Regular", sans-serif);
+  font-size: var(--desktop-normal-font-size, 14px);
+  font-weight: 400;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button:hover {
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-close-button{
-  border-color: #494c56;
+  background: #FFFFFF;
+  color: rgba(0, 0, 0, 0.87843);
+  border: 1px solid #D9D9D9;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button {
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-close-button:hover {
-  color: #121212;
+  border-color: #D9D9D9;
-  background-color: #67ccff;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button:hover {
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-close-button {
-  color: #121212;
+  background: #212224;
-  background-color: #32baff;
+  color: rgba(255, 255, 255, 0.85098);
+  border: 1px solid #424242;
+}
+
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-close-button:hover {
+  border-color: #424242;
+}
+
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-ok-button{
+  background: #1677FF;
+  border-color: #1677FF;
+  color: #FFF;
+}
+
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-ok-button:hover{
+  color: #FFF;
+  background-color: #1677FF;
+}
+
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-ok-button {
+  background: #1668DC;
+  border-color: #1668DC;
+  color: #212224;
+}
+
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-ok-button:hover {
+  color: #212224;
+  background-color: #1668DC;
 }
 
 .toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-cell {

assets/scss/datepicker.scss

@@ -70,6 +70,15 @@
       .v-icon {
         color: map-deep-get($config, #{$theme}, "v-icon-chevron-down") !important;
       }
+
+      .v-select .v-input__slot {
+        border-radius: 8px !important;
+        border: solid 1px map-deep-get($config, #{$theme}, "tui-datepicker-border-color") !important;
+      }
+    
+      .v-select fieldset {
+        border: none;
+      } 
     }
 
     .v-input__custom {

components/common/DatepickerTimeSelectBox.vue

@@ -549,5 +549,10 @@ export default {
       color: #000 !important;
     }
   }
+
+	.datepicker-timeselect .v-input__slot {
+		margin: 3px;
+	}
+
 }
 </style>

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -102,7 +102,7 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 37;
 
 			const myOptions = {
 				columnOptions: {
@@ -113,8 +113,8 @@ export default {
 				header: {
 					height: 28,
 				},
-				rowHeight: 38,
+				rowHeight: 37,
-				minRowHeight: 38,
+				minRowHeight: 37,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -441,13 +441,8 @@ export default {
 </script>
 <style lang="scss" scoped >
 ::v-deep {
-	.tui-grid-layer-state {
-		top: 40px !important;
-	}
-	
 	.tui-grid-cell-content-editor {
-		position: relative;
+		height: 37px !important;
-		height: 38px !important;
 	}
 
 }

layouts/default.vue

@@ -177,6 +177,8 @@ import ThemeSwitch from "@/components/common/ThemeSwitch";
 import AdminMenu from "@/components/common/AdminMenu";
 import FadeLoader from "vue-spinner/src/FadeLoader.vue";
 import ChangePswdPop from "~/components/common/modal/ChangePswdPop";
+import { notification } from 'ant-design-vue';
+
 
 export default {
   components: {
@@ -233,6 +235,7 @@ export default {
       drawer: (state) => state.drawer,
       userInfo: (state) => state.userInfo,
       pageData: "pageData",
+      openTabList: (state) => state.openTabList 
     }),
     activeTabs() {
       if (this.routerTabInstance) {
@@ -275,6 +278,11 @@ export default {
 				var _this = this;
 				const nv = newVal[0];
 				const ov = oldVal[0];
+        // Check open tab at menu
+        if (this.openTabList.length > 7 && !this.openTabList.some(tab => tab.to === to.fullPath)) {
+          return;
+        }
+        
 				if (nv !== ov) {
 					if (!nv) {
 						// 중복클릭 시 발생 상황 기존 값을 다시 넣어줌
@@ -395,6 +403,24 @@ export default {
 
     this.$router.beforeEach((to, from, next) => {
       _this.isLoading = true;
+     
+      const tabList = this.openTabList;
+      const targetPrgmId = to.query.prgmId;
+      const currentPrgmId = from.query.prgmId;
+
+      const isTabAlreadyOpen = tabList.includes(targetPrgmId);
+      const isSamePage = to.fullPath === from.fullPath || targetPrgmId === currentPrgmId;
+
+      if (tabList.length >= 7 && !isTabAlreadyOpen && !isSamePage) {  
+        notification.error({
+          message: 'Error',
+          description: '탭을 7개 이상 열 수 없습니다.',
+        });
+        next(false);
+        return;
+      }
+
+
       // console.log('$router.beforeEach...');
       // console.log('state : ', _this.$store.state)
       // console.log('activeActionCnt : ', _this.$store.state.activeActionCnt)

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -561,12 +561,6 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				rowHeaders: [
-					{
-						type: 'rowNum',
-						align: 'right',
-					},
-				],
 				header: {
 					height: 37,
 				},
@@ -623,6 +617,7 @@ export default {
 				}
 			}
 			const myColumns = [
+				{ header: 'No.', name: 'rowSeq', align: 'right', width: 90 },
 				{
 					header: 'FAB',
 					name: 'fabNm',

store/index.js

@@ -136,6 +136,10 @@ export const state = () => Object.assign({}, INIT_STATE);
 export const mutations = {
 	// 활성화 페이지 메뉴정보 set
 	setActiveMenuInfo(state, payload) {
+		const isTabAlreadyOpen = state.openTabList.includes(payload.prgmId);
+		if(state.openTabList.length >= 7 && !isTabAlreadyOpen) {
+			return;
+		} 
 		// console.log("=======================================================");
 		// console.log(
 		//   ">>>>>>>>>> ",