Commit 58236d2a by 乔延琦

Merge branch 'develop-yuancheng' into 'develop'

Develop yuancheng

See merge request GFP/RBC/rbc-frontend!13
parents 22fcc77a f9300f4a
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^6.2.2",
"less": "^4.1.1", "less": "^4.1.1",
"less-loader": "^7.3.0", "less-loader": "^7.3.0",
"node-sass": "^4.12.0",
"sass-loader": "^8.0.2",
"vue-template-compiler": "^2.6.11" "vue-template-compiler": "^2.6.11"
} }
} }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="fileList"> <div class="fileList">
<div class="fileList-title"> <div class="fileList-title">
<span class="fileList-title-side"></span> <span class="fileList-title-side"></span>
资料下载 {{fileTitle}}
<span class="fileList-title-more" @click="handleMore"> <span class="fileList-title-more" @click="handleMore">
<span>更多</span> <span>更多</span>
<Icon type="ios-arrow-forward" class="more-icon"/> <Icon type="ios-arrow-forward" class="more-icon"/>
...@@ -37,14 +37,16 @@ export default { ...@@ -37,14 +37,16 @@ export default {
return { return {
fileList: [], fileList: [],
fileWidth: '100%', fileWidth: '100%',
modalShow: false modalShow: false,
fileTitle: '资料下载'
} }
}, },
created() { created() {
let prop = this.itemSetting.properties let prop = this.itemSetting.properties
if (prop && Array.isArray(prop)) { if (prop) {
let num = prop[0]? prop[0].num: 2 let num = prop.num? prop.num: 2
let str = Math.floor(100 / num) + '%' let str = Math.floor(100 / num) + '%'
this.fileTitle = prop.fileTitle
this.fileWidth = `calc(${str} - 10px)` this.fileWidth = `calc(${str} - 10px)`
} }
}, },
......
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
<FormItem label="每行个数"> <FormItem label="每行个数">
<Input v-model="config.num" type="number"></Input> <Input v-model="config.num" type="number"></Input>
</FormItem> </FormItem>
<FormItem label="标题">
<Input v-model="config.fileTitle" placeholder="资料下载"></Input>
</FormItem>
</Form> </Form>
</div> </div>
</Panel> </Panel>
...@@ -34,14 +37,17 @@ export default { ...@@ -34,14 +37,17 @@ export default {
value1: '1', value1: '1',
config: { config: {
num: 1, num: 1,
fileTitle: '资料下载'
} }
} }
}, },
created() { created() {
let prop = this.itemSetting.properties[0] let prop = this.itemSetting.properties
if (prop) { if (prop) {
this.config = prop this.config = prop
} } else {
this.itemSetting.properties = this.config
}
}, },
} }
</script> </script>
......
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^6.2.2",
"less": "^4.1.1", "less": "^4.1.1",
"less-loader": "^7.3.0", "less-loader": "^7.3.0",
"node-sass": "^4.12.0",
"sass-loader": "^8.0.2",
"vue-template-compiler": "^2.6.11" "vue-template-compiler": "^2.6.11"
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment