Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0731
This commit is contained in:
@ -6,12 +6,23 @@
|
||||
:btnActionsFnc="btnActions" />
|
||||
</div>
|
||||
<div ref="gridParent" style="height: calc((100vh - 520px) /2);">
|
||||
<Grid :ref="gridName" :gridName="gridName" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
|
||||
:innerTabGridInfo="innerTabGridInfo" />
|
||||
<Grid
|
||||
:ref="gridName"
|
||||
:is="loadGrid ? 'Grid' : null"
|
||||
:gridName="gridName"
|
||||
:parentPrgmId="parentPrgmId"
|
||||
@getRowsData="getRowData"
|
||||
:innerTabGridInfo="innerTabGridInfo"
|
||||
/>
|
||||
</div>
|
||||
<div class="mt-3" ref="formParent" style="height: calc((100vh - 400px) /2);">
|
||||
<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName"
|
||||
:detailList="detailReadPlcTagList" @gridEditingFinish="gridEditingFinish" />
|
||||
<div ref="formParent" style="height: calc((100vh - 400px) /2);">
|
||||
<component
|
||||
:is="'Form'"
|
||||
:parentPrgmId="parentPrgmId"
|
||||
:bindingData="gridName"
|
||||
:detailList="detailReadPlcTagList"
|
||||
@gridEditingFinish="gridEditingFinish"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@ -99,9 +110,9 @@ export default {
|
||||
// bodyHeight: gridHeight,
|
||||
// minBodyHeight: gridHeight,
|
||||
header: {
|
||||
height: 28,
|
||||
height: 37,
|
||||
},
|
||||
rowHeight: 29,
|
||||
rowHeight: 37,
|
||||
minRowHeight: 29,
|
||||
selectionUnit: 'row',
|
||||
editingEvent: 'click',
|
||||
|
Reference in New Issue
Block a user