Merge branch 'master' of git.mes123.com:zhouyx/mes-ui into product-rjt

components/page/treeGrid/EditGrid.vue

@@ -69,11 +69,11 @@
                 <!-- 多选 -->
                 <label
                   v-if="column.type === 'selection'"
-                  @click="rowChecked(item, index, $event)"
                 >
                   <Checkbox
                     v-model="item._checked"
-                    :indeterminate="item._indeterminate"
+                    @on-change="rowChecked($event,item, index,)"
+                    :indeterminate="indeterminateBoys(item)"
                   ></Checkbox>
                 </label>
 
@@ -210,7 +210,7 @@
         </li>
       </ul>
     </Drawer>
-    <FooterToolbar v-if="batch" v-show="footerToolbar" class="ftball">
+    <FooterToolbar v-if="batch" v-show="footerToolbar&&selectItems.length>0" class="ftball">
       <div class="ib">已选{{ selectItems.length }}项</div>
       <slot name="batch"></slot>
       <Button @click="cancelBatch">取消</Button>
@@ -357,7 +357,7 @@ export default {
     spaceWidth: {
       //树形表格缩进距离
       type: Number,
-      default: 20,
+      default: 35,
     },
     exportTitle: {
       type: String,
@@ -384,6 +384,7 @@ export default {
         isDesc: true,
         conditions: [],
       },
+      level:1,
       searchConditions: this.search,
       pageSizeOpts: [20, 50, 100],
       tableHeight: 0,
@@ -420,6 +421,7 @@ export default {
   },
   watch: {
     items() {
+      this.selectItems=[];
       if (this.items) {
         this.trs = this.treeToList(this.items);
       }
@@ -590,9 +592,8 @@ export default {
       return parents;
     },
     // 点击check勾选框,判断是否有children节点 如果有就一并勾选
-    rowChecked(data, index, event) {
-     this.$set(this.trs, index, data);
-      console.log("rowChecked",data,this.trs[index])
+    rowChecked(event,data, index, ) {
+      this.trs[index]._checked=data._checked;
       var boys = this.getChildrens(data);
       if (boys.length>0) {
               this.trs.forEach((u, i) => {
@@ -600,11 +601,10 @@ export default {
           return b[this.keyname] == u[this.keyname];
         });
         if (items.length == 1) {
-          this.$set(this.trs[i], "_checked", !data._checked);
+          this.$set(this.trs[i], "_checked", data._checked);
         }
       });
       }
-
       this.checkAll =
         this.trs.length >
         this.trs.filter((u) => {
@@ -614,6 +614,14 @@ export default {
         this.selectionChange();
       });
     },
+    indeterminateBoys(item){
+      var boys = this.getChildrens(item);
+      if(boys.length==0){
+        return false;
+      }else{
+        return boys.filter(u=>{return u._checked===item._checked}).length<boys.length;
+      }
+    },
     getChildrens(data) {
       var childrens = [];
       var that = this;