gitadmin/sk_fems_ui
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request 'update code' (#75) from dev-luannv24-fixbug-17 into dev

Browse Source 
Reviewed-on: #75
This commit is contained in:
dev
2025-08-19 12:45:53 +09:00
parent 08637f6321 a5c35809fa
commit a074e0e6e9
5 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
assets/scss/common.scss
View File

@ -231,12 +231,17 @@ a {
.v-application.#{$theme}-mode {
min-width: 1000px;
.ant-checkbox-wrapper.ant-checkbox-wrapper-disabled,
.ant-checkbox-wrapper.ant-checkbox-wraBapper-disabled,
.ant-checkbox-disabled .ant-checkbox-input
{
cursor: default !important;
}
.ant-checkbox-disabled .ant-checkbox-inner
{
background-color: #f5f5f5 !important;
}
.v-list-item__title {
font-family: var(--desktop-normal-font-family, "Inter-Regular", sans-serif) !important;
}

27
components/common/Grid.vue
View File

@ -160,7 +160,6 @@ export default {
},
created() { },
async mounted() {
// console.log(this.dataPath);
if (this.gridName) {
this.gridInstance = this.$refs['tuigrid' + this.gridName];
@ -272,12 +271,9 @@ export default {
});
},
focusChangeEvt(e) {
// console.log('focusChangeEvt1...')
if (this.preventFocusChangeEvent(e)) {
// console.log('prevent focusChangeEvt')
return;
}
// console.log('focusChangeEvt2...')
// cell 선택시 row 선택 method
if (e.rowKey > -1) {
this.$emit(
@ -292,7 +288,6 @@ export default {
this.sendSelectedRowData(e.rowKey);
},
startEditing(e) {
// console.log('startEditing1...')
if (this.preventFocusChangeEvent(e)) {
return;
}
@ -302,7 +297,6 @@ export default {
return;
}
// console.log('startEditing2...')
if (this.editorGrid && e.rowKey >= 0) {
this.editorStartKey = e.rowKey;
this.gridInstance.invoke('startEditing', e.rowKey, e.columnName, 'row-modify');
@ -316,7 +310,6 @@ export default {
}
},
async editingFinish(e) {
// console.log("Editing END E::", e);
// editor 간 이동시 수정되는 문제 수정
// e.rowEditingFg: grid의 한 row를 한번에 수정할 시 각각의 cell 마다 click 이벤트가 발생하지 않아 this.editorStartKey값이 제대로 입력 되지 않는 경우를 대비하여 만든 Fg
if (this.editorGrid) {
@ -339,7 +332,6 @@ export default {
rowKey: rowIdxKey,
};
const isBaseRow = this.isBaseDataRow(rowIdxKey);
// console.log("END E::", rowIdxKey, e);
const rowStat = this.gridInstance.invoke('getRow', rowIdxKey).rowStat;
if (rowStat == 'D') {
this.gridInstance.invoke(
@ -520,10 +512,7 @@ export default {
return item.rowKey == data.rowKey;
});
let count = 0;
// console.log("dataKeyArr", dataKeyArr);
// console.log("selectedRowData", selectedRowData);
for (let i = 0; i < dataKeyArr.length; i++) {
// console.log(dataKeyArr[i], selectedRowData[dataKeyArr[i]], rowData[dataKeyArr[i]]);
if (selectedRowData[dataKeyArr[i]] == rowData[dataKeyArr[i]]) {
count++;
}
@ -593,7 +582,6 @@ export default {
delete item.rowKey;
return item;
});
// console.log("dataArr::", dataArr, saveTargetRows);
return dataArr;
},
getData() {
@ -606,7 +594,6 @@ export default {
return this.gridInstance.invoke('getCheckedRowKeys');
},
setCheck(list) {
// console.log("setCheck:: ", list);
list.map(item => this.gridInstance.invoke('check', item));
},
refreshLayout() {
@ -616,14 +603,11 @@ export default {
// this.gridInstance.invoke('refreshLayout');
},
refreshGrid() {
// console.log("refreshLayout",this.$refs['tuigrid' + this.gridName])
var store = this.$refs['tuigrid' + this.gridName].gridInstance.store;
var containerEl = this.$refs['tuigrid' + this.gridName].$el;
// var containerEl = document.querySelector('.tui-grid-container')
var parentEl = containerEl.parentElement;
// console.log("---------DEBUG---containerEl: ",containerEl);
// console.log('---------DEBUG---parentEl: ', parentEl)
// function refreshLayout(store, containerEl, parentEl) {
var dimension = store.dimension;
var autoWidth = dimension.autoWidth, fitToParentHeight = dimension.fitToParentHeight;
@ -636,11 +620,6 @@ export default {
this.setWidth(store, clientWidth, autoWidth);
// store.dimension.autoWidth = autoWidth;
// store.dimension.width = clientWidth;
// console.log("###",getComputedStyle(parentEl));
// console.log("fitToParentHeight : ",fitToParentHeight);
// console.log("parentEl : ",parentEl)
// console.log("parentEl.clientHeight" , parentEl.clientHeight)
// console.log("clientHeight : ",clientHeight);
if (parentEl && parentEl.clientHeight !== clientHeight) {
var _b = getComputedStyle(parentEl), paddingTop = _b.paddingTop, paddingBottom = _b.paddingBottom;
this.setHeight(store, parentEl.clientHeight - (parseFloat(paddingTop) + parseFloat(paddingBottom)));
@ -648,25 +627,20 @@ export default {
// }
},
setOffsetTop(store, offsetTop) {
// console.log("---------DEBUG---setOffsetTop: ");
store.dimension.offsetTop = offsetTop;
},
setWidth(_a, width, autoWidth) {
// console.log("---------DEBUG---setWidth: ");
var dimension = _a.dimension;
dimension.autoWidth = autoWidth;
dimension.width = width;
},
setHeaderHeight(store, height) {
// console.log("---------DEBUG---setHeaderHeight: ");
store.dimension.headerHeight = height;
},
setOffsetLeft(store, offsetLeft) {
// console.log("---------DEBUG---setOffsetLeft: ");
store.dimension.offsetLeft = offsetLeft;
},
setHeight(_a, height) {
// console.log("---------DEBUG---setHeight: ");
var dimension = _a.dimension;
var headerHeight = dimension.headerHeight, summaryHeight = dimension.summaryHeight, tableBorderWidth = dimension.tableBorderWidth;
dimension.bodyHeight = height - headerHeight - summaryHeight - tableBorderWidth;
@ -695,7 +669,6 @@ export default {
});
},
// resetData() {
// // console.log("resetData = ", this.tuigridProps.data);
// this.$refs.tuigrid.invoke("resetData", this.tuigridProps.data);
// },
},

4
components/common/ThemeSwitch.vue
View File

@ -13,6 +13,7 @@ export default {
data() {
return {
mode: null,
// isLoading: false
};
},
computed: {
@ -28,11 +29,10 @@ export default {
setThemeChange: 'setThemeChange',
}),
themeChange() {
// this.isLoading = true;
this.mode = !this.mode;
this.$vuetify.theme.isDark = this.mode;
this.setThemeChange(this.mode);
// console.log(this.mode)
// console.log(this.$vuetify.theme.isDark)
},
},
};

22
components/common/modal/EvtObjPop.vue
View File

@ -8,12 +8,22 @@
</label>
</v-col>
<v-col :cols="option.textCols" class="py-0">
<v-text-field readonly append-icon="" :class="['v-select__custom', customClass]" outlined :hide-details="true"
v-model="selectValue" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)" style="padding: 0;"
:required="item.required || false"><template v-slot:append>
<!-- Custom SVG icon -->
<v-icon>$icoSearch</v-icon>
</template></v-text-field>
<v-text-field
readonly
v-model="selectValue"
append-icon="mdi-magnify"
class="v-input__custom"
@click="dialogOpenCloseEvent(dialog)"
outlined
:hide-details="true"
:required="item.required || false"
:disabled="item.disabled || false"
>
<template v-slot:append>
<!-- Custom SVG icon -->
<v-icon>$icoSearch</v-icon>
</template>
</v-text-field>
</v-col>
<v-dialog v-model="dialog" scrollable width="1000px">

9
components/pages/ems/EccInfo/EccIaoTab.vue
View File

@ -270,12 +270,14 @@ export default {
async getRowData(data, gridName) {
if (data.rowStat === 'I') {
this.detailList[0].disabled = false;
this.detailList[1].disabled = false;
this.detailList[2].disabled = false;
this.detailList[3].disabled = false;
this.detailList[4].disabled = false;
this.detailList[5].disabled = false;
} else {
this.detailList[0].disabled = true;
this.detailList[1].disabled = true;
this.detailList[2].disabled = true;
this.detailList[3].disabled = true;
this.detailList[4].disabled = true;
@ -294,6 +296,7 @@ export default {
case 'add':
this.$refs[this.gridName].addRow();
this.detailList[0].disabled = false;
this.detailList[1].disabled = false;
this.detailList[2].disabled = false;
this.detailList[3].disabled = false;
this.detailList[4].disabled = false;
@ -376,7 +379,6 @@ const myDetail = [
{
type: 'SelectBox',
label: '대상 유형',
disabled: false,
cols: 6,
class: 'pr-4 py-2 mt-1',
list: 'emMapDivList',
@ -392,6 +394,7 @@ const myDetail = [
{
type: 'ReadPlcPop',
label: '대상 항목',
modalTitle:'대상 항목',
valueNm: 'objId',
disabled: true,
cols: 6,
@ -400,8 +403,7 @@ const myDetail = [
bindNm: 'objNm',
labelCols: 12,
textCols: 12,
iconShow: true,
noText: true,
disableContent: true,
iconShow: true,
},
{
@ -480,6 +482,7 @@ const myDetail = [
disabledFg: 'objKind',
labelCols: 12,
textCols: 12,
iconShow: true,
},
{
type: 'InputText',