Skip to content
This repository has been archived by the owner on Oct 30, 2023. It is now read-only.

Commit

Permalink
Merge pull request #514 from FlowzPlatform/Issue#510#511
Browse files Browse the repository at this point in the history
Issue #510 & #511 resolved
  • Loading branch information
nikitam747 authored Sep 20, 2018
2 parents 9b4703b + d6b7c44 commit a9cdb46
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
26 changes: 16 additions & 10 deletions client/src/components/SchemaView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
</div>
</div>

<div v-if="instanceEntries.length === 0 && itsFirstState === false">
<!-- <div v-if="instanceEntries.length === 0 && itsFirstState === false">
<p align="center">No Data</p>
</div>
</div> -->

<div v-if="itsFirstState === false && instanceEntries.length !== 0">
<div v-if="itsFirstState === false">
<tabs>
<TabPane v-if="this.$store.state.role === 1" :label="dataCount" icon="lock-combination">
<schemalist v-if="this.$store.state.role === 1" :schema="dataSchema" :pageno="pageno" :datashow="'dataA'" v-on:on-paginate="pagination" v-on:on-handlepage="handlepage" :limit="limit" :skip="skip" :dataTotal="dataTotal" :data="dataData" :configuration="configuration" :instanceEntries="instanceEntries" :dynamicData="dynamicData" v-on:setValues="setValues" :flowzData="flowzData" v-on:sort-data="sortData" v-on:search-data="searchData"></schemalist>
Expand Down Expand Up @@ -255,12 +255,12 @@ export default {
'id[$search]': '^' + query.text
}).then(res => {
this.isFlowzLoaded = true
let firstState = this.flowzData.first
if (firstState === this.$route.params.stateid) {
this.itsFirstState = true
} else {
this.itsFirstState = false
}
// let firstState = this.flowzData.first
// if (firstState === this.$route.params.stateid) {
// this.itsFirstState = true
// } else {
// this.itsFirstState = false
// }
this.dataTotal = res.data.total
if (res.data.data.length > 0) {
this.instanceEntries = res.data.data
Expand All @@ -270,7 +270,7 @@ export default {
} else {
this.instanceEntries = []
this.dataData = []
this.itsFirstState = true
// this.itsFirstState = true
this.dataLoading = false
// this.$Spin.hide()
this.$Loading.finish()
Expand Down Expand Up @@ -1212,9 +1212,15 @@ export default {
.clickToCopy{
cursor: pointer;
}
</style>

<style>
.ivu-table-tip table td{
text-align: left;
padding-left: 20px;
}
.ivu-modal-body{
max-height: 550px !important;
overflow-y: auto !important;
Expand Down
6 changes: 6 additions & 0 deletions client/src/pages/user/SchemaList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,12 @@
</style>

<style>
/*.ivu-table td:nth-child(2) div span{
width:200px !important;
white-space: nowrap !important;
overflow: hidden !important;
text-overflow: ellipsis !important;
}*/
.ivu-table-cell div{
white-space: nowrap !important;
overflow: hidden !important;
Expand Down

0 comments on commit a9cdb46

Please sign in to comment.