Compare commits

..

9 Commits

4 changed files with 16 additions and 16 deletions

View File

@ -23,7 +23,7 @@
<span class="custom-title-4">{{ option.modalTitle }}</span> <span class="custom-title-4">{{ option.modalTitle }}</span>
<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button> <a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
</v-card-title> </v-card-title>
<div class="pa-6 pt-0"> <div class="pa-6 pt-0 pb-3">
<v-row align="center"> <v-row align="center">
<v-col :cols="5"> <v-col :cols="5">
<component :is="'SelectBox'" ref="SelectBox1" :labelCols="12" :textCols="12" <component :is="'SelectBox'" ref="SelectBox1" :labelCols="12" :textCols="12"
@ -43,7 +43,7 @@
물리량명 물리량명
</label> </label>
</v-col> </v-col>
<v-col :cols="9"> <v-text-field append-icon="" class="v-input__custom" outlined <v-col :cols="10" class="pr-2"> <v-text-field append-icon="" class="v-input__custom" outlined
:hide-details="true" v-model="searchWord" @keyup.enter="search"><template :hide-details="true" v-model="searchWord" @keyup.enter="search"><template
v-slot:append> v-slot:append>
<!-- Custom SVG icon --> <!-- Custom SVG icon -->
@ -51,8 +51,7 @@
</template></v-text-field></v-col> </template></v-text-field></v-col>
<v-spacer></v-spacer> <v-col cols="2" class="text-right">
<v-col cols="3" class="text-right">
<a-button icon="search" type="primary" @click="search()" <a-button icon="search" type="primary" @click="search()"
class="search-button">조회</a-button> class="search-button">조회</a-button>
@ -63,9 +62,9 @@
</div> </div>
<!-- <div :style="'height: calc(50vh)'"> --> <!-- <div :style="'height: calc(50vh)'"> -->
<div :style="'height: 429px;'"> <div :style="{ height: 'calc(100% - 60px)' }">
<!-- <div :style="{ height: 'calc(100% - 213px)' }"> --> <!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
<div ref="modalGridParent" class="h100 px-6 py-4"> <div ref="modalGridParent" class="px-6 py-4">
<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="gridName" <component :is="loadGrid && dialog ? 'Grid' : null" :gridName="gridName"
:dataPath="searchParam.modalDataEqpmBaseInfoPop.eqpmBaseInfoPop" :dataPath="searchParam.modalDataEqpmBaseInfoPop.eqpmBaseInfoPop"
:parentPrgmId="parentPrgmId" @getRowsData="getRowData" @dblClick="setUpdate($event)" /> :parentPrgmId="parentPrgmId" @getRowsData="getRowData" @dblClick="setUpdate($event)" />

View File

@ -107,7 +107,7 @@ export default {
this.detailList[4].class = 'pl-4 mt-2'; this.detailList[4].class = 'pl-4 mt-2';
this.detailList[3].class = 'd-block'; this.detailList[3].class = 'd-block';
this.detailList[2].class = 'd-none'; this.detailList[2].class = 'd-none';
this.detailList[1].class = 'd-block pl-4 mt-1 pb-0'; this.detailList[1].class = 'd-block pl-4 mt-3-new pb-0';
} }
}, },
}, },
@ -503,5 +503,10 @@ const myDetail = [
.tui-grid-layer-state{ .tui-grid-layer-state{
top: 40px !important; top: 40px !important;
} }
.mt-3-new{
margin-top: 3px;
}
} }
</style> </style>

View File

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

View File

@ -329,7 +329,7 @@ export class NewCustomEditor {
} }
divEl.style.position = 'relative'; divEl.style.position = 'relative';
divEl.style.top = rowKey === 0 ? '1px' : '3px'; divEl.style.top = rowKey === 0 ? '1px' : '2px';
el.addEventListener('change', (ev) => { el.addEventListener('change', (ev) => {
// console.log('props: %o', ev); // console.log('props: %o', ev);