This commit is contained in:
parent
1d6e67d6ed
commit
bd2b674dc6
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "ag-element-ui",
|
"name": "ag-element-ui",
|
||||||
"version": "0.1.13",
|
"version": "0.1.17",
|
||||||
"main": "packages/index.js",
|
"main": "packages/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vue-cli-service serve",
|
"dev": "vue-cli-service serve",
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
<agMultifunctionSearch v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-multifunction-search'" size="small" clearable/>
|
<agMultifunctionSearch v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-multifunction-search'" size="small" clearable/>
|
||||||
<agQuery v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-query'" size="small" clearable/>
|
<agQuery v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-query'" size="small" clearable/>
|
||||||
<ag-mution-checkbox :datas="item.datas" v-bind="item" :placeholder="item.placeholder" v-model="formValue[item.enName]" v-if="item.type=='ag-mution-checkbox'" size="small"> </ag-mution-checkbox>
|
<ag-mution-checkbox :datas="item.datas" v-bind="item" :placeholder="item.placeholder" v-model="formValue[item.enName]" v-if="item.type=='ag-mution-checkbox'" size="small"> </ag-mution-checkbox>
|
||||||
<ag-multion-datte-picker v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-multion-datte-picker'" size="small"/>
|
<ag-multion-date-picker v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-multion-datte-picker'" size="small"/>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</ag-col>
|
</ag-col>
|
||||||
|
@ -65,13 +65,13 @@ import agColorPicker from './../../agColorPicker/src/index.vue';
|
||||||
import agNumberRange from './../../agNumberRange/src/index.vue';
|
import agNumberRange from './../../agNumberRange/src/index.vue';
|
||||||
import agMultifunctionSearch from './../../agMultifunctionSearch/src/index.vue';
|
import agMultifunctionSearch from './../../agMultifunctionSearch/src/index.vue';
|
||||||
import agQuery from './../../agQuery/src/index.vue';
|
import agQuery from './../../agQuery/src/index.vue';
|
||||||
import agMultionDattePicker from '../../agMultionDattePicker';
|
import agMultionDatePicker from '../../agMultionDatePicker';
|
||||||
|
|
||||||
|
|
||||||
export default{
|
export default{
|
||||||
name:"agForm",
|
name:"agForm",
|
||||||
components:{
|
components:{
|
||||||
agMultionDattePicker,
|
agMultionDatePicker,
|
||||||
agInput:agInput,
|
agInput:agInput,
|
||||||
agDatePicker,
|
agDatePicker,
|
||||||
agSelect,
|
agSelect,
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
import agMultionDatePicker from './src';
|
||||||
|
|
||||||
|
// 为组件提供 install 安装方法,供按需引入
|
||||||
|
agMultionDatePicker.install = function (Vue) {
|
||||||
|
Vue.component(agMultionDatePicker.name, agMultionDatePicker)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 导出组件
|
||||||
|
export default agMultionDatePicker;
|
|
@ -29,7 +29,7 @@ import agSelect from "../../agSelect/src/index.vue";
|
||||||
import agDatePicker from "../../agDatePicker/src/index.vue";
|
import agDatePicker from "../../agDatePicker/src/index.vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "agMultionDattePicker",
|
name: "agMultionDatePicker",
|
||||||
components: {
|
components: {
|
||||||
agSelect,
|
agSelect,
|
||||||
agDatePicker,
|
agDatePicker,
|
|
@ -1,9 +0,0 @@
|
||||||
import agMultionDattePicker from './src';
|
|
||||||
|
|
||||||
// 为组件提供 install 安装方法,供按需引入
|
|
||||||
agMultionDattePicker.install = function (Vue) {
|
|
||||||
Vue.component(agMultionDattePicker.name, agMultionDattePicker)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 导出组件
|
|
||||||
export default agMultionDattePicker;
|
|
|
@ -11,7 +11,6 @@
|
||||||
{{scope.row[item.prop]}}
|
{{scope.row[item.prop]}}
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<div class="agtablefooter">
|
<div class="agtablefooter">
|
||||||
|
|
|
@ -208,8 +208,10 @@
|
||||||
this.$emit('onRemove',file,this.imageList);
|
this.$emit('onRemove',file,this.imageList);
|
||||||
},
|
},
|
||||||
handlePictureCardPreview(file) {
|
handlePictureCardPreview(file) {
|
||||||
this.dialogImageUrl = file.url;
|
if(file.type.indexOf('image/')>-1){
|
||||||
this.dialogVisible = true;
|
this.dialogImageUrl = file.url;
|
||||||
|
this.dialogVisible = true;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
onUpdate(e){
|
onUpdate(e){
|
||||||
if(this.limit<=this.imageList.length){
|
if(this.limit<=this.imageList.length){
|
||||||
|
|
|
@ -15,7 +15,7 @@ import agMutionCheckbox from './agMutionCheckbox';
|
||||||
import agMultifunctionSearch from './agMultifunctionSearch';
|
import agMultifunctionSearch from './agMultifunctionSearch';
|
||||||
import agDatePicker from "./agDatePicker";
|
import agDatePicker from "./agDatePicker";
|
||||||
import agNumberRange from "./agNumberRange";
|
import agNumberRange from "./agNumberRange";
|
||||||
import agMultionDattePicker from "./agMultionDattePicker";
|
import agMultionDatePicker from "./agMultionDatePicker";
|
||||||
|
|
||||||
|
|
||||||
// 注册组件
|
// 注册组件
|
||||||
|
@ -38,7 +38,7 @@ import agMultionDattePicker from "./agMultionDattePicker";
|
||||||
agMutionCheckbox,
|
agMutionCheckbox,
|
||||||
agMultifunctionSearch,
|
agMultifunctionSearch,
|
||||||
agNumberRange,
|
agNumberRange,
|
||||||
agMultionDattePicker
|
agMultionDatePicker
|
||||||
]
|
]
|
||||||
|
|
||||||
// 定义 install 方法,接收 Vue 作为参数(使用 use 注册插件,那么所有的组件都会被注册)
|
// 定义 install 方法,接收 Vue 作为参数(使用 use 注册插件,那么所有的组件都会被注册)
|
||||||
|
|
|
@ -68,7 +68,7 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
<el-button slot="append" icon="el-icon-search"></el-button>
|
<el-button slot="append" icon="el-icon-search"></el-button>
|
||||||
</el-input> -->
|
</el-input> -->
|
||||||
<ag-multion-datte-picker size="small"
|
<ag-multion-date-picker size="small"
|
||||||
ref="ttt"
|
ref="ttt"
|
||||||
v-model="datevalues"
|
v-model="datevalues"
|
||||||
:showExtra="true"
|
:showExtra="true"
|
||||||
|
|
Loading…
Reference in New Issue