diff --git a/jero-web/src/components/jero/JCategorySelect.vue b/jero-web/src/components/jero/JCategorySelect.vue index 24ee6220..14f8ecf7 100644 --- a/jero-web/src/components/jero/JCategorySelect.vue +++ b/jero-web/src/components/jero/JCategorySelect.vue @@ -8,6 +8,8 @@ :placeholder="placeholder" :loadData="asyncLoadTreeData" :value="treeValue" + v-bind="_attrs" + v-on="$listeners" :treeData="treeData" :multiple="multiple" @change="onChange"> @@ -19,11 +21,7 @@ export default { name: 'JCategorySelect', - props: { - value:{ - type: String, - required: false - }, + props:{ placeholder:{ type: String, default: '请选择', @@ -74,7 +72,6 @@ tableName:"", text:"", code:"", - } }, watch: { @@ -91,6 +88,13 @@ this.loadItemByCode() }) }, + computed:{ + _attrs() { + let attrs + attrs = { ...this.$attrs } + return attrs + } + }, methods: { /**加载一级节点 */ loadRoot(){ @@ -141,11 +145,12 @@ } }, backValue(value,label){ + console.log(label) let obj = {} if(this.back){ obj[this.back] = label } - this.$emit('change', value, obj) + // this.$emit('change', value, obj) }, asyncLoadTreeData (treeNode) { return new Promise((resolve) => { @@ -194,7 +199,7 @@ onChange(value){ if(!value){ - this.$emit('change', ''); + // this.$emit('change', ''); this.treeValue = '' } else if (Array.isArray(value)) { let labels = [] diff --git a/jero-web/src/components/jero/JTreeDict.vue b/jero-web/src/components/jero/JTreeDict.vue index 61138ef4..385009b2 100644 --- a/jero-web/src/components/jero/JTreeDict.vue +++ b/jero-web/src/components/jero/JTreeDict.vue @@ -10,7 +10,8 @@ :value="treeValue" :treeData="treeData" @change="onChange" - @search="onSearch"> + v-bind="_attrs" + v-on="$listeners"> @@ -29,10 +30,6 @@ } }, props:{ - value:{ - type: String, - required: false - }, placeholder:{ type: String, default: '请选择', @@ -86,6 +83,13 @@ } } }, + computed:{ + _attrs(){ + let attrs + attrs = { ...this.$attrs } + return attrs + } + }, created(){ this.loadRoot() this.loadViewInfo() @@ -178,17 +182,8 @@ } }, onChange(value){ - console.log(value) - if(!value){ - this.$emit('change', ''); - }else{ - this.$emit('change', value.value); - } this.treeValue = value }, - onSearch(value){ - console.log(value) - }, getCurrTreeData(){ return this.treeData } diff --git a/jero-web/src/components/jero/JTreeSelect.vue b/jero-web/src/components/jero/JTreeSelect.vue index c171b1ac..9ed507df 100644 --- a/jero-web/src/components/jero/JTreeSelect.vue +++ b/jero-web/src/components/jero/JTreeSelect.vue @@ -14,6 +14,8 @@ :treeData="treeData" :multiple="multiple" :show-search="!multiple" + v-bind="_attrs" + v-on="$listeners" @change="onChange"> @@ -49,10 +53,10 @@ required:false, default:true }, - value:{ - type: String, - required: false - }, + // value:{ + // type: String, + // required: false + // }, placeholder:{ type: String, default: '请选择', @@ -119,6 +123,13 @@ this.loadRoot() } }, + computed:{ + _attrs() { + let attrs + attrs = { ...this.$attrs } + return attrs + } + }, created(){ this.validateProp().then(()=>{ this.initDictInfo() @@ -251,15 +262,12 @@ }, onChange(value){ if(!value){ - this.$emit('change', ''); this.treeValue = null } else if (value instanceof Array) { //多选 - this.$emit('change', value.join(',').toString()) //修改第一次选中时,选中为空的情况 this.treeValue = value } else { //单选 - this.$emit('change', value) this.treeValue = value } }, diff --git a/jero-web/src/components/jerobiz/JSelectRole.vue b/jero-web/src/components/jerobiz/JSelectRole.vue index 90b3d11e..4ae67d9c 100644 --- a/jero-web/src/components/jerobiz/JSelectRole.vue +++ b/jero-web/src/components/jerobiz/JSelectRole.vue @@ -31,6 +31,9 @@ { title: '角色编码', dataIndex: 'roleCode', align: 'center', width: 120 } ] } + }, + created(){ + console.log(this.$attrs) } } diff --git a/jero-web/src/views/demo/SelectDemo.vue b/jero-web/src/views/demo/SelectDemo.vue index a1c617f4..a3610c49 100644 --- a/jero-web/src/views/demo/SelectDemo.vue +++ b/jero-web/src/views/demo/SelectDemo.vue @@ -235,7 +235,7 @@ - + 选中的值(v-model):{{ formData.treeDict }} @@ -277,7 +277,7 @@ - + 选中的值(v-model):{{ formData.selectCategory }} @@ -575,6 +575,9 @@ sayHi('hello, world!')` ], } }, + created(){ + console.log(this.formData.jInput) + }, computed: { nameList: function() { @@ -586,6 +589,9 @@ sayHi('hello, world!')` } }, methods: { + changeCate(){ + console.log("ok") + }, getDepartIdValue() { return this.form.getFieldValue('departId') }, diff --git a/jero-web/src/views/system/modules/SysCategoryModal.vue b/jero-web/src/views/system/modules/SysCategoryModal.vue index 6a6fe284..4f719c52 100644 --- a/jero-web/src/views/system/modules/SysCategoryModal.vue +++ b/jero-web/src/views/system/modules/SysCategoryModal.vue @@ -14,7 +14,7 @@