joywok-business-components - npm Package Compare versions

Comparing version 0.0.161 to 0.0.162

components/share/ShareObj.js

@@ -260,3 +260,4 @@ import React, { Component } from 'react';
           // page: resp["data"]["JMObjs"]["page"],
-          nowNav: [data]
+          nowNav: [data],
+          firstLevel:true
         })
@@ -287,3 +288,3 @@ })
       if (index != self.state.nowNav.length - 1) {
-        html.push(<span className="active share-object-path-sep">></span>)
+        html.push(<span className="active share-object-path-sep">&gt;</span>)
       }
@@ -411,5 +412,6 @@ })
     } else {
-      return <div className={"share-object-i specail " + (data['disabled'] ? 'share-object-i-disabled ' : '') + (data['type']=='app' ? 'share-objec-apps' : '')}>
-        <Checkbox disabled={data['disabled']} checked={checked} onChange={(e) => self.select(e, data)}></Checkbox>
-        <div className="share-objec-i-c" onClick={(e) => self.specailSelect(!checked, data)}>
+    let isUserGroup=nowNav.id=="usergroup"&&this.state.firstLevel;
+      return <div className={"share-object-i specail " + (data['disabled'] ? 'share-object-i-disabled ' : '') + (data['type']=='app' ? 'share-objec-apps' : '')} >
+        {isUserGroup?"":<Checkbox disabled={data['disabled']} checked={checked} onChange={(e) => self.select(e, data)}></Checkbox>}
+        <div className="share-objec-i-c" onClick={isUserGroup ? ()=>self.getGroupSub(data) : (e) => self.specailSelect(!checked, data)}>
           {
@@ -423,4 +425,10 @@ data['type']=='app' ? <img className="share-objec-apps-logo" src={data['logo']} /> : ''
   }
-  handelToNext() {
-
+  getGroupSub(i) {
+    let nowNav=this.state.nowNav;
+    nowNav.push(i)
+    this.setState({
+      data:i.groups,
+      firstLevel:false,
+      nowNav:nowNav
+    })
   }
@@ -559,47 +567,52 @@ specailSelect(checked, data) {
     let filterList;
-    if (this.props.isJssdk) {
-      filterList = _.filter(this.state.data, i => i.default_flag == 0);
-    } else {
-      filterList = this.state.data;
-    }
-    let nowData = this.state.nowNav[0];
-    let newfilterList = [];
+    let nowNav=this.state.nowNav;
+    if(nowNav.length&&nowNav[0].id=="usergroup"&&this.state.firstLevel){
+      return;
+    }else{
+      if (this.props.isJssdk) {
+        filterList = _.filter(this.state.data, i => i.default_flag == 0);
+      } else {
+        filterList = this.state.data;
+      }
+      let nowData = this.state.nowNav[0];
+      let newfilterList = [];
 
-    if (nowData['id'] == 'dept' || nowData['id'] == 'mydept' || (nowData['type']&&nowData['type'].indexOf('dept')!=-1)) {
-      if (nowData['flag']) {
-        if (nowData.flag == 'onlyuser') {
+      if (nowData['id'] == 'dept' || nowData['id'] == 'mydept' || (nowData['type']&&nowData['type'].indexOf('dept')!=-1)) {
+        if (nowData['flag']) {
+          if (nowData.flag == 'onlyuser') {
+            filterList = _.filter(filterList, function (i) {
+              return (i['type'] == 'jw_n_user')
+            })
+          } else if (nowData.flag == 'onydept') {
+            filterList = _.filter(filterList, function (i) {
+              return (i['type'] == 'jw_n_dept' || i['type'] == 'jw_n_group')
+            })
+          }
+        } else {
           filterList = _.filter(filterList, function (i) {
             return (i['type'] == 'jw_n_user')
           })
-        } else if (nowData.flag == 'onydept') {
-          filterList = _.filter(filterList, function (i) {
-            return (i['type'] == 'jw_n_dept' || i['type'] == 'jw_n_group')
-          })
         }
+      }
+      filterList = _.filter(filterList, function (i) {
+        return typeof (i['disabled']) == 'undefined' || !i['disabled']
+      })
+      if (checked) {
+        selectList = selectList.concat(filterList)
       } else {
-        filterList = _.filter(filterList, function (i) {
-          return (i['type'] == 'jw_n_user')
+        let nowList = [];
+        _.each(selectList, function (i) {
+          if (_.find(filterList, { id: i['id'] })) {
+          } else {
+            nowList.push(i)
+          }
         })
+        selectList = nowList;
       }
-    }
-    filterList = _.filter(filterList, function (i) {
-      return typeof (i['disabled']) == 'undefined' || !i['disabled']
-    })
-    if (checked) {
-      selectList = selectList.concat(filterList)
-    } else {
-      let nowList = [];
-      _.each(selectList, function (i) {
-        if (_.find(filterList, { id: i['id'] })) {
-        } else {
-          nowList.push(i)
-        }
+      selectList = Underscore.uniq(selectList, function (i) { return i['id'] })
+      this.setState({
+        select: selectList,
+        selectAllStatus: !this.state.selectAllStatus
       })
-      selectList = nowList;
     }
-    selectList = Underscore.uniq(selectList, function (i) { return i['id'] })
-    this.setState({
-      select: selectList,
-      selectAllStatus: !this.state.selectAllStatus
-    })
   }
@@ -855,3 +868,4 @@ unSelectAll(e) {
             // page: resp["data"]["JMObjs"]["page"],
-            nowNav: [data]
+            nowNav: [data],
+            firstLevel:true
           })
@@ -1049,2 +1063,3 @@ })
   fetchUsergroup(data, nowNavData, isSearch){
+    return
     let self = this;
@@ -1051,0 +1066,0 @@ let nowNav = nowNavData&&nowNavData!='' ? nowNavData : this.state.nowNav;

package.json

 {
   "name": "joywok-business-components",
-  "version": "0.0.161",
+  "version": "0.0.162",
   "description": "",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Improved metrics

Lines of code

18408

increased by0.29%

Worsened metrics

Total package byte prevSize

924159

decreased by-29.13%

Number of package files

123

decreased by-0.81%

No dependency changes