From 703d81533997e400afaab4b78120b79d010fe7de Mon Sep 17 00:00:00 2001
From: ln1778 <465410291@qq.com>
Date: Mon, 9 Sep 2024 14:47:36 +0800
Subject: [PATCH] 33

---
 packages/agForm/src/index.vue                | 10 ++++++++--
 packages/agInput/src/index.vue               |  2 +-
 packages/agMultifunctionSearch/src/index.vue |  4 ++++
 packages/agUpload/src/index.vue              |  4 ++--
 src/App.vue                                  |  4 ++--
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/agForm/src/index.vue b/packages/agForm/src/index.vue
index d143154..db7696d 100644
--- a/packages/agForm/src/index.vue
+++ b/packages/agForm/src/index.vue
@@ -31,6 +31,8 @@
              <agColorPicker v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-color-picker'" size="small"> 
              </agColorPicker>
              <el-transfer :data="item.data"  v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-transfer'" size="small"></el-transfer>
+             <agNumberRange v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-numberRange'" size="small"/> 
+             <agMultifunctionSearch v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-multifunction-search'" size="small"/> 
              </slot> 
             </el-form-item>  
         </ag-col>  
@@ -55,7 +57,9 @@ import agSelect from './../../agSelect/src/index.vue';
 import agRow from './../../agRow/src/index.vue';
 import agCol from './../../agCol/src/index.vue';
 import agUpload from './../../agUpload/src/index.vue';
-import agColorPicker from './../../agColorPicker/src/index.vue';
+import agColorPicker from './../../agColorPicker/src/index.vue'; 
+import agNumberRange from './../../agNumberRange/src/index.vue';
+import agMultifunctionSearch from './../../agMultifunctionSearch/src/index.vue';
 
 export default{
     name:"agForm",
@@ -66,7 +70,9 @@ export default{
         agRow,
         agCol,
         agUpload:agUpload,
-        agColorPicker
+        agColorPicker,
+        agNumberRange,
+        agMultifunctionSearch
     },
     props:{
         data:{
diff --git a/packages/agInput/src/index.vue b/packages/agInput/src/index.vue
index 741c806..2a6ab1d 100644
--- a/packages/agInput/src/index.vue
+++ b/packages/agInput/src/index.vue
@@ -23,7 +23,7 @@ export default {
       type: Boolean,
       default: false,
     },
-  }, 
+  },  
   mounted(){  
     if(this.$refs.apinputref){
       for(const key in this.$refs.apinputref){ 
diff --git a/packages/agMultifunctionSearch/src/index.vue b/packages/agMultifunctionSearch/src/index.vue
index a6284fa..f50b51d 100644
--- a/packages/agMultifunctionSearch/src/index.vue
+++ b/packages/agMultifunctionSearch/src/index.vue
@@ -123,6 +123,10 @@ export default {
       listeners:{}
     };
   }, 
+  model: {  
+      prop: 'value', // 明确指定 prop 为 'value'  
+      event: 'change' // 自定义事件名，用于更新 value  
+  }, 
   watch: {
     value: {
       handler(newVal) {  
diff --git a/packages/agUpload/src/index.vue b/packages/agUpload/src/index.vue
index 605f819..ab1ede4 100644
--- a/packages/agUpload/src/index.vue
+++ b/packages/agUpload/src/index.vue
@@ -108,8 +108,8 @@
       } 
     },
     model: {  
-    prop: 'fileList', // 明确指定 prop 为 'value'  
-    event: 'onUpload' // 自定义事件名，用于更新 value  
+      prop: 'fileList', // 明确指定 prop 为 'value'  
+      event: 'onUpload' // 自定义事件名，用于更新 value  
   }, 
     mounted() {    
         if(this.fileList.length>0){
diff --git a/src/App.vue b/src/App.vue
index 0ef866f..7ce9241 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -375,14 +375,14 @@ export default {
         {label:"订单编号",span:12,type:"ag-input",enName:'order_sn',value:'656',placeholder:'请输入洗碗机',size:'small',clearable:true,show:true,value:false,required:true,options:[{label:"是",value:'1'},{label:"否",value:'2'}]},
         {label:"IMEI/机器编号",span:12,type:"ag-input-number",enName:'imei',value:'43543',placeholder:'请输入IMEI/机器编号',size:'small',clearable:true,max:10,min:2,step:2,show:true},
         {label:"质检码",span:12,type:"ag-rate",value:'',enName:'ser_sn',placeholder:'请输入质检码',size:'small',clearable:true,show:true,options:[{value:'1',label:'112'},{value:'2',label:'2223'}]},
-        {label:"质检时间",span:12,type:"ag-color-picker",enName:'time',showAlpha:true,size:'small',colorFormat:'hsv',show:true},
+        {label:"质检时间",span:12,type:"ag-multifunction-search",enName:'time',showAlpha:true,size:'small',colorFormat:'hsv',show:true},
         {label:"头像",span:12,type:"ag-upload",enName:'avatar',placeholder:'请输入质检码',size:'small',clearable:true,show:true,limit:4,multiple:true},
       ],
       formvalue:{
         order_sn:"11",
         imei:'',
         ser_sn:2,
-        time:'red',
+        time:['11','2'],
         avatar:["https://git.aiguoai.com/assets/img/logo.svg"],
       }
     }