joywok-business-components - npm Package Compare versions

Comparing version 0.0.162 to 0.0.163

components/share/ShareObj.js

@@ -774,2 +774,5 @@ import React, { Component } from 'react';
         }
+        if(data.user_filtering){
+          url += '&check_admin_auth=1';
+        }
         request(url, {
@@ -793,2 +796,3 @@ method: 'GET'
               nav: nav,
+              user_filtering: data.user_filtering ? data.user_filtering : false,
               // nowNav: nowData
@@ -816,2 +820,5 @@ })
           let url = '/api/suggestion/objs?type=' + (data['type']=='jw_n_user_category' ? 'category' : (data['type']=='user'||data['type']=='dept' ? 'dept' :data['type'].replace('jw_n_',''))) + '&pageno='+(Number(datas['pageno'])+1 )+'&pagesize=' + datas['pagesize'] + (data.type=="user"||data.type=="dept" ? '&flag=' + showType : '')  +'&show_entry='+data['show_entry']+'&filter_id='+data['dictId']+(data['id']=='dictParent' ? '' :'&parent_id='+data['id'])
+          if(data.user_filtering){
+            url += '&check_admin_auth=1';
+          }
           request(url, {
@@ -827,2 +834,3 @@ method: 'GET'
               page: resp["data"]["JMObjs"]["page"],
+              user_filtering: data.user_filtering ? data.user_filtering : false,
               // nowNav: [data],
@@ -839,2 +847,5 @@ hideSub: data['id']=='dictParent' ? false : true,
         let url = '/api/suggestion/objs?type=' + (data['type']=='jw_n_user_category' ? 'category' : (data['type']=='user'||data['type']=='dept' ? 'dept' :data['type'].replace('jw_n_',''))) + '&pageno=0&pagesize=' + datas['pagesize'] + (data.type=="user"||data.type=="dept" ? '&flag=' + showType : '')  +'&show_entry='+data['show_entry']+'&filter_id='+data['dictId']+(data['id']=='dictParent' ? '' :'&parent_id='+data['id'])
+        if(data.user_filtering){
+          url += '&check_admin_auth=1';
+        }
         request(url, {
@@ -850,2 +861,3 @@ method: 'GET'
             page: resp["data"]["JMObjs"]["page"],
+            user_filtering: data.user_filtering ? data.user_filtering : false,
             nowNav: [data]
@@ -870,2 +882,3 @@ })
             nowNav: [data],
+            user_filtering: data.user_filtering ? data.user_filtering : false,
             firstLevel:true
@@ -883,2 +896,5 @@ })
           }
+          if(data.user_filtering){
+            url += '&check_admin_auth=1';
+          }
           request(url, {
@@ -893,2 +909,3 @@ method: 'GET'
                 data: fetchList,
+                user_filtering: data.user_filtering ? data.user_filtering : false,
                 page: resp["data"]["JMObjs"]["page"],
@@ -975,2 +992,5 @@ nowNav: [data]
     }
+    if(self.state.user_filtering){
+      url += '&check_admin_auth=1';
+    }
     if(self.state.shield){
@@ -1011,2 +1031,6 @@ url = '/api/iam/deptslist?pageno=0&pagesize=' + self.state.page['pagesize'] + '&dept_id=' + self.state.shield + '&oid=' + (data.id === 'dept' ? '' : data.id)
 
+    if(data.user_filtering){
+      url += '&check_admin_auth=1';
+    }
+
     request(url, {
@@ -1051,2 +1075,5 @@ method: 'GET'
     }
+    if(data.user_filtering){
+      url += '&check_admin_auth=1';
+    }
     request(url, {
@@ -1053,0 +1080,0 @@ method: 'GET'

components/sharescope/AddCond.js

@@ -121,3 +121,7 @@ import React , {Component} from 'react';
     this.timer=setTimeout(function(){
-      request('/api/suggestion/objs?type='+self.props.condition.otype.replace('jw_n_','')+(s?"&s="+s: "")+"&pagesize=20&pageno="+self.state.pageno,{
+      let url = '/api/suggestion/objs?type='+self.props.condition.otype.replace('jw_n_','')+(s?"&s="+s: "")+"&pagesize=20&pageno="+self.state.pageno;
+      if(self.props.user_filtering){
+        url += '&check_admin_auth=1';
+      }
+      request(url,{
         method:'GET'
@@ -148,3 +152,7 @@ })
           })
-          request('/api/suggestion/objs?type='+self.props.condition.otype.replace('jw_n_','')+(s?"&s="+s: "")+"&pagesize=20&pageno="+self.state.pageno,{
+          let url = '/api/suggestion/objs?type='+self.props.condition.otype.replace('jw_n_','')+(s?"&s="+s: "")+"&pagesize=20&pageno="+self.state.pageno;
+          if(self.props.user_filtering){
+            url += '&check_admin_auth=1';
+          }
+          request(url,{
             method:'GET'
@@ -200,2 +208,5 @@ })
      // }
+     if(self.props.user_filtering){
+        url += '&check_admin_auth=1';
+      }
     let params =
@@ -215,3 +226,5 @@ {
     }
-
+    if(self.props.user_filtering){
+      params.user_filtering = true;
+    }
     let a = CombineShareModal(params);
@@ -218,0 +231,0 @@ a.events.on('save', function (objs) {

components/sharescope/AddRules.js

@@ -118,2 +118,3 @@ import React , {Component} from 'react';
                         condition = { item }
+                        user_filtering={self.props.user_filtering}
                         lastCondFlag = { rule.length === index + 1 ? true : false }
@@ -120,0 +121,0 @@ dropdownList = { JSON.parse(JSON.stringify(self.state.dropdownList)) }

components/sharescope/CombineShareModal.js

@@ -17,3 +17,10 @@ import React,{ Component }from 'react';
     nav.push({ id: 'domain', name: domainname, flag: 'onlydept' })
-    nav.push({ id: 'dept', name: i18n('label.shareobj.tasktemplate.organizational_structure'), flag: 'onlydept' })
+    let obj = { id: 'dept', name: i18n('label.shareobj.tasktemplate.organizational_structure'), op: 1, flag: 'onlydept' };
+    if(params.user_filtering){
+      obj.user_filtering = params.user_filtering;
+    }
+    if(params.shield){
+      obj.shield = params.shield;
+    }
+    nav.push(obj);
     nav.push({ id: 'mydept', name: i18n('label.shareobj.mydept'), flag: 'onlydept'})
@@ -47,3 +54,5 @@ } else if (objTypes == 'user') {
       flag: params.flag ? params.flag : '',
-      isSelectGroup: params.isSelectGroup
+      isSelectGroup: params.isSelectGroup,
+      shield: params.shield ? params.shield : false,
+      user_filtering: params.user_filtering ? params.user_filtering : false
     })
@@ -53,4 +62,11 @@ } else if (objTypes == 'corporation'){
   } else {
-    nav.push({ id: 'domain', name: domainname, flag: 'all' })
-    nav.push({ id: 'dept', name: i18n('label.shareobj.tasktemplate.organizational_structure'), flag: 'onlydept' })
+    nav.push({ id: 'domain', name: domainname, op: 1, flag: 'all' });
+    let obj = { id: 'dept', name: i18n('label.shareobj.tasktemplate.organizational_structure'), op: 1, flag: 'onlydept' };
+    if(params.user_filtering){
+      obj.user_filtering = params.user_filtering;
+    }
+    if(params.shield){
+      obj.shield = params.shield;
+    }
+    nav.push(obj);
   }
@@ -67,2 +83,4 @@
     nav: nav,
+    shield: params.shield ? params.shield : false,
+    user_filtering: params.user_filtering ? params.user_filtering : false
   }
@@ -69,0 +87,0 @@ if (params.maxSelect) sharedatas.maxSelect = params.maxSelect;

components/sharescope/ShareScope.js

@@ -136,2 +136,3 @@ /**
                          rule={item}
+                         user_filtering={self.props.user_filtering}
                          rulesLength={scope.length}
@@ -138,0 +139,0 @@ loadingData = {self.props.loadingData}

lib/sharescope/AddCond.js

@@ -166,3 +166,7 @@ 'use strict';
       this.timer = setTimeout(function () {
-        (0, _request2.default)('/api/suggestion/objs?type=' + self.props.condition.otype.replace('jw_n_', '') + (s ? "&s=" + s : "") + "&pagesize=20&pageno=" + self.state.pageno, {
+        var url = '/api/suggestion/objs?type=' + self.props.condition.otype.replace('jw_n_', '') + (s ? "&s=" + s : "") + "&pagesize=20&pageno=" + self.state.pageno;
+        if (self.props.user_filtering) {
+          url += '&check_admin_auth=1';
+        }
+        (0, _request2.default)(url, {
           method: 'GET'
@@ -192,3 +196,7 @@ }).then(function (resp) {
             });
-            (0, _request2.default)('/api/suggestion/objs?type=' + self.props.condition.otype.replace('jw_n_', '') + (s ? "&s=" + s : "") + "&pagesize=20&pageno=" + self.state.pageno, {
+            var url = '/api/suggestion/objs?type=' + self.props.condition.otype.replace('jw_n_', '') + (s ? "&s=" + s : "") + "&pagesize=20&pageno=" + self.state.pageno;
+            if (self.props.user_filtering) {
+              url += '&check_admin_auth=1';
+            }
+            (0, _request2.default)(url, {
               method: 'GET'
@@ -255,2 +263,5 @@ }).then(function (resp) {
       // }
+      if (self.props.user_filtering) {
+        url += '&check_admin_auth=1';
+      }
       var params = {
@@ -269,3 +280,5 @@ title: title,
       };
-
+      if (self.props.user_filtering) {
+        params.user_filtering = true;
+      }
       var a = (0, _CombineShareModal.CombineShareModal)(params);
@@ -272,0 +285,0 @@ a.events.on('save', function (objs) {

lib/sharescope/AddRules.js

@@ -178,2 +178,3 @@ 'use strict';
               condition: item,
+              user_filtering: self.props.user_filtering,
               lastCondFlag: rule.length === index + 1 ? true : false,
@@ -180,0 +181,0 @@ dropdownList: JSON.parse(JSON.stringify(self.state.dropdownList)),

lib/sharescope/CombineShareModal.js

@@ -33,3 +33,10 @@ 'use strict';
     nav.push({ id: 'domain', name: domainname, flag: 'onlydept' });
-    nav.push({ id: 'dept', name: i18n('label.shareobj.tasktemplate.organizational_structure'), flag: 'onlydept' });
+    var obj = { id: 'dept', name: i18n('label.shareobj.tasktemplate.organizational_structure'), op: 1, flag: 'onlydept' };
+    if (params.user_filtering) {
+      obj.user_filtering = params.user_filtering;
+    }
+    if (params.shield) {
+      obj.shield = params.shield;
+    }
+    nav.push(obj);
     nav.push({ id: 'mydept', name: i18n('label.shareobj.mydept'), flag: 'onlydept' });
@@ -63,3 +70,5 @@ } else if (objTypes == 'user') {
       flag: params.flag ? params.flag : '',
-      isSelectGroup: params.isSelectGroup
+      isSelectGroup: params.isSelectGroup,
+      shield: params.shield ? params.shield : false,
+      user_filtering: params.user_filtering ? params.user_filtering : false
     });
@@ -69,4 +78,11 @@ } else if (objTypes == 'corporation') {
   } else {
-    nav.push({ id: 'domain', name: domainname, flag: 'all' });
-    nav.push({ id: 'dept', name: i18n('label.shareobj.tasktemplate.organizational_structure'), flag: 'onlydept' });
+    nav.push({ id: 'domain', name: domainname, op: 1, flag: 'all' });
+    var _obj = { id: 'dept', name: i18n('label.shareobj.tasktemplate.organizational_structure'), op: 1, flag: 'onlydept' };
+    if (params.user_filtering) {
+      _obj.user_filtering = params.user_filtering;
+    }
+    if (params.shield) {
+      _obj.shield = params.shield;
+    }
+    nav.push(_obj);
   }
@@ -82,3 +98,5 @@
     searchInput: params.searchInput,
-    nav: nav
+    nav: nav,
+    shield: params.shield ? params.shield : false,
+    user_filtering: params.user_filtering ? params.user_filtering : false
   };
@@ -85,0 +103,0 @@ if (params.maxSelect) sharedatas.maxSelect = params.maxSelect;

lib/sharescope/ShareScope.js

@@ -185,2 +185,3 @@ 'use strict';
             rule: item,
+            user_filtering: self.props.user_filtering,
             rulesLength: scope.length,
@@ -187,0 +188,0 @@ loadingData: self.props.loadingData

package.json

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

No alert changes

Improved metrics

Total package byte prevSize

927678

increased by0.38%

Lines of code

18509

increased by0.55%

No dependency changes