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

previous-state-files-not-edted #573

Merged
nikitam747 merged 1 commit into from
Sep 27, 2018
Merged

previous-state-files-not-edted #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions client/src/components/SchemaSubForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@
</Row>
</div>
</div>
<div v-if="schemainstance.data[index][field.name + 'List']" >
<div class="" v-for="(val, i) in schemainstance.data[index][field.name + 'List']">
<Row>
<Col :span="24"> <a :href="val" class="list-group-item" target="_blank" style="color:blue;padding:2px 2px;" >{{val}}</a></Col>
</Row>
</div>
</div>
</Col>
<Col :span="1">&nbsp;&nbsp;{{fileNumber}} / {{fileSize}}</Col>
</div>
Expand All @@ -144,10 +151,17 @@
<div v-if="schemainstance.data[index][field.name]" >
<Progress v-if="stratProgress" v-bind:percent="fileUploadProgress" :success-percent="30" />
<div class="" v-for="(val, i) in schemainstance.data[index][field.name]">
{{schemainstance.data[index][field.name].length}}
<!-- {{schemainstance.data[index][field.name].length}} -->
<Row>
<Col :span="23"> <a :href="val" class="list-group-item" target="_blank" style="color:blue;padding:2px 2px;" >{{val}}</a></Col>
<!-- <Col :span="1"><a href="#" style="color:red;float:right" @click="removeSection(i, schemainstance.data[index][field.name])">&#10005;&nbsp;</a></Col> -->
<Col :span="1"><a href="#" style="color:red;float:right" @click="removeSection(i, schemainstance.data[index][field.name])">&#10005;&nbsp;</a></Col>
</Row>
</div>
</div>
<div v-if="schemainstance.data[index][field.name + 'List']" >
<div class="" v-for="(val, i) in schemainstance.data[index][field.name + 'List']">
<Row>
<Col :span="24"> <a :href="val" class="list-group-item" target="_blank" style="color:blue;padding:2px 2px;" >{{val}}</a></Col>
</Row>
</div>
</div>
Expand Down Expand Up @@ -192,7 +206,7 @@
<FormItem :key="inx" :rules="createRules(field)" style="margin-bottom:10px;">
<Row>
<Col :span="2">
<b>{{field.name}}</b>
<b>{{field.name}}</b>1
</Col>
<Col :span="21" >
<input class="form-control" type="file" v-if="field.type == 'file'" @change="handleFileChange($event, index, field.name)" :multiple="(field.property.isMultiple)? field.property.isMultiple: false"/>
Expand All @@ -201,7 +215,14 @@
<div class="" v-for="(val, i) in schemainstance.data[index][field.name]">
<Row>
<Col :span="23"> <a :href="val" class="list-group-item" target="_blank" style="color:blue;padding:2px 2px;" >{{val}}</a></Col>
<Col :span="1" v-if="i >= oldFiles"><a href="#" style="color:red;float:right" @click="removeSection(i, schemainstance.data[index][field.name])">&#10005;&nbsp;</a></Col>
<Col :span="1" v-if="i >= oldFiles"><a href="#" style="color:red;float:right" @click="removeSection(i, schemainstance.data[index][field.name])">&#10005;&nbsp;1</a></Col>
</Row>
</div>
</div>
<div v-if="schemainstance.data[index][field.name + 'List']" >
<div class="" v-for="(val, i) in schemainstance.data[index][field.name + 'List']">
<Row>
<Col :span="24"> <a :href="val" class="list-group-item" target="_blank" style="color:blue;padding:2px 2px;" >{{val}}</a></Col>
</Row>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion client/src/components/SchemaView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ export default {
}
if (arr) {
let m = [arr]
this.setFileList(m, self.formSchemaInstance)
this.formSchemaInstance.data = m
} else {
this.handleAdd()
Expand Down Expand Up @@ -1201,7 +1202,7 @@ export default {
'_state': this.$route.params.stateid
}, heads)
.then(res => {
console.log('res.data.total', res.data.total)
// console.log('res.data.total', res.data.total)
this.isFlowzLoaded = true
this.dataTotal = res.data.total
if (res.data.data.length > 0) {
Expand Down
2 changes: 1 addition & 1 deletion client/src/masterLayout/SideBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<template v-else>
<Submenu :name="index" v-for="(item, index) in flowzList" :key="index">
<template slot="title">
{{item.name}}&nbsp;&nbsp;
{{item.name}}&nbsp;&nbsp;<span style="display:none">{{item.count}}</span>
<span>
<Badge :count="item.count" class-name="demo-badge-alone"></Badge>
</span>
Expand Down