Merge branch 'sudheer1.0'

# Conflicts:
#	assets/js/setting.js

assets/js/list.index.js

             } = JSON.parse(cookie);
             debugger;
             $('#detailIframe').html(
-                `<iframe width="100%" style="min-height:746px"  name="srcframe" id="srcframe" class="srcframe" src="http://localhost:3086/#/${unibaseId}/${tenantId}/${userId}/${recordId}/${installedAppId}/loadDetail"></iframe>`
+                `<iframe width="100%" style="min-height:calc(100vh - ${$('.tp-bar').height()}px)"  name="srcframe" id="srcframe" class="srcframe" src="http://localhost:3088/#/${unibaseId}/${tenantId}/${userId}/${recordId}/${installedAppId}/loadDetail"></iframe>`
             );
     
         }