wangyingjie há 2 anos atrás
pai
commit
d5904d6873

+ 11 - 1
components/dkbase/dk-tree-form/dk-tree-form.js

@@ -45,9 +45,14 @@ Component({
         // const {treeList}=this.properties; 
         const { treeList } = this.data;
         const { itemListKey } = this.data;
+        const { parentIdKey } = this.data;
         for (let i in treeList) {
             if (treeList[i][itemListKey]) {
-                treeList[i].open = false;
+                if(treeList[i][parentIdKey]){
+                    treeList[i].open = false;
+                   }else{
+                    treeList[i].open = true;
+                   }   
                 tranverse(treeList[i][itemListKey],itemListKey);
             }
             treeList[i].selected = false;
@@ -60,10 +65,15 @@ Component({
     methods: {
         setDataFromPage(data) {
             const { itemListKey } = this.data;
+            const { parentIdKey } = this.data;
             let treeList = data
             for (let i in treeList) {
                 if (treeList[i][itemListKey]) {
+                   if(treeList[i][parentIdKey]){
                     treeList[i].open = false;
+                   }else{
+                    treeList[i].open = true;
+                   }   
                     tranverse(treeList[i][itemListKey],itemListKey);
                 }
                 treeList[i].selected = false;

+ 4 - 4
components/dkbase/dk-tree-form/dk-tree-form.wxml

@@ -5,7 +5,7 @@
 
             <van-image round width="35rpx" height="35rpx" src="/static/img/summarize.png" />
 
-            <view style="margin-left:5vw;" >{{item[nameKey]}}</view>
+            <view style="margin-left:5vw;font-size: 16px;" >{{item[nameKey]}}</view>
         </view>
         <view style=" text-align: right;" data-id="{{item[idKey]}}" data-open="{{item.open}}" bindtap="onchange">
             <van-icon wx:if="{{ item.open }}" color="#bdb7b7" name="arrow-down" />
@@ -18,7 +18,7 @@
     <view class="{{!item[parentIdKey]?'list-below-item':''}}">
         <block>
 
-            <view wx:if="{{item[parentIdKey]}}" style="display:flex;align-items:center;margin-left:{{item.nodes.length !== 0 ? depth*20 : depth*30}}px;font-size:36rpx;margin-top: 5px;">
+            <view wx:if="{{item[parentIdKey]}}" style="display:flex;align-items:center;margin-left:{{item[itemListKey].length !== 0 ? depth*20 : depth*30}}px;font-size:36rpx;margin-top: 5px;">
                 <!--  -->
                 <view wx:if="{{isNameImgFlag}}">
                     <view class="tree_left" wx:if="{{item[itemListKey].length !== 0}}" data-id="{{item[idKey]}}" data-open="{{item.open}}">
@@ -28,7 +28,7 @@
                 <view wx:if="{{ischekboxFlag}}">
                     <checkbox checked="{{item.selected}}" bindchange="handleCheckboxChange" data-id="{{item.id}}"> </checkbox>
                 </view>
-                <view class="{{item[itemListKey].length !== 0 ?'parent':'node'}} " style="margin-left: 5vw;" data-item="{{item}}" data-type="sub"  data-open="{{item.open}}" bindtap="clickName">
+                <view class="{{item[itemListKey].length !== 0 ?'parent':'node'}} " style="margin-left: 5vw;font-size: 14px;" data-item="{{item}}" data-type="sub"  data-open="{{item.open}}" bindtap="clickName">
                     <!-- bindtap="onchange" -->
                     {{item[nameKey]}}
 
@@ -48,7 +48,7 @@
             </view>
             <block wx:if="{{item[itemListKey]}}">
                 <view hidden="{{!item.open}}">
-                    <dk-tree  treeList="{{item[itemListKey]}}" ischekboxFlag="{{ischekboxFlag}}" isNameImgFlag= "{{isNameImgFlag}}" nameKey="{{nameKey}}" idKey="{{idKey}}" parentIdKey="{{parentIdKey}}" itemListKey="{{itemListKey}}" id="treeSelect" bind:onclick="click" depth="{{depth+1}}"></dk-tree>
+                    <dk-tree-form  treeList="{{item[itemListKey]}}" ischekboxFlag="{{ischekboxFlag}}" isNameImgFlag= "{{isNameImgFlag}}" nameKey="{{nameKey}}" idKey="{{idKey}}" parentIdKey="{{parentIdKey}}" itemListKey="{{itemListKey}}" id="treeSelect" bind:onclick="click" depth="{{depth+1}}"></dk-tree-form >
                 </view>
             </block>
         </block>

+ 2 - 1
package-basic-data/pages/org/org.js

@@ -123,8 +123,9 @@ Page({
    * @author : 王英杰
    */
   handleData(data) {
+   
     this.setData({
-      tableData: util.convertToChildren(data, "parentId", "orgId", null),
+      tableData: util.convertToChildren(data, "parentId", "orgId", null) ,
       showPop: false
     })
     const myComponent = this.selectComponent('#treeSelect');