From 0bee153304d4e2c05c096e4530236a68fe9c40c1 Mon Sep 17 00:00:00 2001
From: ln1778 <465410291@qq.com>
Date: Tue, 10 Sep 2024 10:47:01 +0800
Subject: [PATCH] 22

---
 packages/agForm/src/index.vue           |  1 +
 packages/agMutionCheckbox/src/index.vue | 18 +++++----
 src/App.vue                             | 53 ++++++-------------------
 3 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/packages/agForm/src/index.vue b/packages/agForm/src/index.vue
index dcdeec3..40ea446 100644
--- a/packages/agForm/src/index.vue
+++ b/packages/agForm/src/index.vue
@@ -34,6 +34,7 @@
              <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"/> 
              <agQuery v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-query'" size="small"/>
+             <ag-mution-checkbox :datas="item.datas" :placeholder="item.placeholder" v-model="formValue[item.enName]" v-if="item.type=='ag-mution-checkbox'" size="small"> </ag-mution-checkbox>
              </slot> 
             </el-form-item>  
         </ag-col>  
diff --git a/packages/agMutionCheckbox/src/index.vue b/packages/agMutionCheckbox/src/index.vue
index 767ea5a..bf4d333 100644
--- a/packages/agMutionCheckbox/src/index.vue
+++ b/packages/agMutionCheckbox/src/index.vue
@@ -10,7 +10,7 @@
     >
         <span class="el-dropdown-link">
             <span>
-              <span :class="{ color: checkedList.length }">{{ checkedList.length==0?placeholder:dropdownvalue }}</span
+              <span :class="{ color: checkedList.length }">{{ checkedList.length==0?placeholder||'请选择':dropdownvalue }}</span
               ><span class="list-length" v-if="valuelength >= 1"
                 >+ {{ valuelength }}</span
               ></span
@@ -19,7 +19,7 @@
               class="el-icon-arrow-up el-icon--right"
               :class="{ 'rotate-arrow': down }"
             ></i>
-            <i v-else class="el-icon-close el-icon--right" @click="clear"></i>
+            <i v-else class="el-icon-close el-icon--right" @click.stop.prevent="clear"></i>
           </span>
     <el-dropdown-menu slot="dropdown">  
             <el-input
@@ -70,6 +70,7 @@
 </template>
 
 <script>
+import { nextTick } from 'vue';
  export default {
     props: ["datas", "placeholder", "value"],
     name: "AgMutionCheckbox",
@@ -86,9 +87,7 @@
             ], //渲染数据
             isIndeterminate: false,
             retract: false, 
-            olddatas:[
-                {label:"方法1",value:"1"},
-                {label:"方法2",value:"2"}
+            olddatas:[ 
             ],
             oldvalue:[]
         };
@@ -178,13 +177,16 @@
     methods: {
         clear(){
             this.checkedList = []; 
+            this.valuelength=0;
+            this.dropdownvalue="";
             this.isIndeterminate = false;
             this.checkAll=false;
+            this.nextTick(()=>{
+              this.$refs.multioncheckref.hide();
+            }); 
         },
         checkeddown(val){ 
-           this.oldvalue={list:this.checkedList,checkAll:this.checkAll,isIndeterminate:this.isIndeterminate};
-
-
+           this.oldvalue={list:this.checkedList,checkAll:this.checkAll,isIndeterminate:this.isIndeterminate}; 
         },
         dropdownchange(){
             this.down = !this.down;
diff --git a/src/App.vue b/src/App.vue
index 11b4d88..28951c3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -54,7 +54,7 @@
     </agUpdate>
     <ag-form :data="formdata" label-width="120px" label-position="right" v-model="formvalue"> 
     </ag-form>
-    <ag-mution-checkbox :datas="checklist" @onSearch="onCheckSearch" placeholder="请选择" v-model="checkvalue"> </ag-mution-checkbox>
+    <ag-mution-checkbox :datas="checklist" @onSearch="onCheckSearch" v-model="checkvalue"> </ag-mution-checkbox>
     <!-- <el-input agMultionCheckbox
       size="small"
       placeholder="请输入内容"
@@ -73,14 +73,8 @@
 
 <script>
  import ElementUI from 'element-ui';
- import Vue from 'vue';
-import agDialog from "../packages/agDialog/src/index.vue"; 
-import agInput from "../packages/agInput/src/index.vue";
-import agSelect from "../packages/agSelect/src/index.vue";
-import agNumberRange from "../packages/agNumberRange/src/index.vue";
-import agCascadeOptional from "../packages/agCascadeOptional/src/index.vue"; 
-import agQuery from "../packages/agQuery/src/index.vue";
-import agTable from "../packages/agTable/src/index.vue";
+ import Vue from 'vue'; 
+import agCascadeOptional from "../packages/agCascadeOptional/src/index.vue";  
 import vuedraggable from 'vuedraggable';
 import agElemUI from "../packages/index.js";
 
@@ -141,7 +135,7 @@ export default {
       },
       inputValue:"",
       date_value:null,
-      checkvalue:['2'],
+      checkvalue:[],
       value: "选项1",
       a_value: "59584",
       values: ["4",""], 
@@ -375,53 +369,32 @@ export default {
         {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-multifunction-search",enName:'time',showAlpha:true,size:'small',colorFormat:'hsv',show:true},
-        {label:"头像",span:12,type:"ag-query",enName:'avatar',inputs:[
+        {label:"头像",span:12,type:"ag-mution-checkbox",enName:'avatar',datas:[
         {
-          label:"分类",
-          elem:'el-select',
-          name:"class",
-          options:[
-            {
-              value: "Chengdu",
-              label: "成都",
-            },
-            {
-              value: "Shenzhen",
-              label: "深圳",
-            },
-            {
-              value: "Guangzhou",
-              label: "广州",
-            },
-            {
-              value: "Dalian",
-              label: "大连",
-            },
-          ]
+          label:"分类", 
+          value:"class", 
         },
         {
-          label:"品牌",
-          elem:'el-select',
-          name:"brand",
-          placeholder:"请输入品牌",
-          options:[]
+          label:"品牌", 
+          value:"brand",
+          placeholder:"请输入品牌"
         },
         {
           label:"型号",
           elem:'el-select',
-          name:"model",
+          value:"model",
           options: []
         },
         {
           label:"颜色",
           elem:'el-select',
-          name:"color",
+          value:"color",
           options:[]
         },
         {
           label:"容量",
           elem:'el-select',
-          name:"capacity",
+          value:"capacity",
           options:[]
         }
       ],placeholder:'请输入质检码',size:'small',clearable:true,show:true,limit:4,multiple:true},