@tddc/assign-modal 1.0.7 → 1.1.0

package/lib/AssignModal/AssignApp/index.js

@@ -68,6 +68,10 @@ var AssignModal = function AssignModal(props) {
       orgCodes = _dataItem$orgCodes === void 0 ? [] : _dataItem$orgCodes,
       orgCode = dataItem.orgCode,
       appCode = dataItem.appCode;
+  var allOrg = (0, _utils.preorder)(orgList[0]);
+  var allApp = appList.map(function (item) {
+    return item.value;
+  });
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -96,20 +100,18 @@ var AssignModal = function AssignModal(props) {
   (0, _react.useEffect)(function () {
     // path 和 allOrgList 赋值
     path = (0, _utils.findSameCodePath)(orgList[0], orgCode);
-    var allOrg = (0, _utils.preorder)(orgList[0]);
-    var allApp = appList.map(function (item) {
-      return item.name;
-    }) || [];
     var initOrgs = [];
     var initApps = [];
 
     if (orgCodes.includes('all')) {
+      setAllOrgChecked(orgCodes.includes('all'));
       initOrgs = allOrg;
     } else {
       initOrgs = Array.from(new Set([].concat(_toConsumableArray(orgCodes || []), _toConsumableArray(path))));
     }
 
     if (appCodes.includes('all')) {
+      setAllAppChecked(appCodes.includes('all'));
       initApps = allApp;
     } else {
       initApps = appCodes;
@@ -117,38 +119,7 @@ var AssignModal = function AssignModal(props) {
 
     setCheckedKeys(initOrgs);
     setAppKeys(initApps || []);
-    onChange && onChange({
-      appKeys: appCodes.includes('all') ? 'all' : appCodes || [],
-      checkedKeys: appCodes.includes('all') ? 'all' : orgCodes || []
-    });
   }, [dataItem]);
-  (0, _react.useEffect)(function () {
-    // 机构和应用 全选
-    var allOrg = (0, _utils.preorder)(orgList[0]);
-
-    if (appList.length > 0) {
-      var allApp = appList.map(function (item) {
-        return item.value;
-      }); // 判断当前用户是否具有 该机构或应用 权限
-
-      var app = appKeys.filter(function (item) {
-        return allApp.includes(item);
-      });
-      var org = checkedKeys.filter(function (item) {
-        return allOrg.includes(item);
-      });
-
-      if (app.length === appList.length || org.length === allOrg.length) {
-        onChange && onChange({
-          appKeys: app.length === appList.length ? ['all'] : appKeys,
-          checkedKeys: org.length === allOrg.length ? ['all'] : checkedKeys
-        });
-      }
-
-      setAllAppChecked(app.length === appList.length);
-      setAllOrgChecked(org.length === allOrg.length);
-    }
-  }, [checkedKeys, appKeys, appList]);
 
   var loopTreeNodes = function loopTreeNodes(data) {
     var level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
@@ -211,9 +182,15 @@ var AssignModal = function AssignModal(props) {
     }
 
     setCheckedKeys(checked);
-    onChange && onChange({
-      appKeys: appKeys,
-      checkedKeys: checked
+    onChange({
+      appKeys: allAppChecked ? ['all'] : appKeys,
+      checkedKeys: checked,
+      appCheckAll: allAppChecked,
+      orgCheckAll: allOrgChecked,
+      checkData: {
+        apps: appKeys,
+        orgs: checked
+      }
     });
   };
 
@@ -224,7 +201,6 @@ var AssignModal = function AssignModal(props) {
     if (e.target.checked) {
       value = e.target.value;
       newAppKeys = [].concat(_toConsumableArray(appKeys), [value]);
-      setAppKeys(newAppKeys);
     } else {
       value = e.target.value;
       newAppKeys = (0, _lodash.cloneDeep)(appKeys);
@@ -233,53 +209,89 @@ var AssignModal = function AssignModal(props) {
           newAppKeys.splice(index, 1);
         }
       });
-      setAppKeys(newAppKeys);
     }
 
-    onChange && onChange({
-      checkedKeys: checkedKeys,
-      appKeys: newAppKeys
+    setAppKeys(newAppKeys);
+    onChange({
+      appKeys: newAppKeys,
+      checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
+      appCheckAll: allAppChecked,
+      orgCheckAll: allOrgChecked,
+      checkData: {
+        apps: newAppKeys,
+        orgs: checkedKeys
+      }
     });
-  };
+  }; // org全局授权
+
 
   var checkAllOrg = function checkAllOrg(e) {
-    var orgKeys = [];
+    var orgChecks = [];
 
     if (e.target.checked) {
-      orgKeys = (0, _utils.preorder)(orgList[0]);
-      setCheckedKeys(orgKeys);
+      setAllOrgChecked(true);
+      orgChecks = (0, _utils.preorder)(orgList[0]);
+      setCheckedKeys(orgChecks);
       onChange({
-        appKeys: appKeys,
-        checkedKeys: ['all']
+        appKeys: allAppChecked ? ['all'] : appKeys,
+        checkedKeys: ['all'],
+        appCheckAll: allOrgChecked,
+        orgCheckAll: true,
+        checkData: {
+          apps: appKeys,
+          orgs: checkedKeys
+        }
       });
     } else {
-      orgKeys = _toConsumableArray(path);
-      setCheckedKeys(orgKeys);
+      setAllOrgChecked(false);
+      orgChecks = Array.from(new Set([].concat(_toConsumableArray(orgCodes || []), _toConsumableArray(path))));
+      setCheckedKeys(orgChecks);
       onChange({
-        appKeys: appKeys,
-        checkedKeys: orgKeys
+        appKeys: allAppChecked ? ['all'] : appKeys,
+        checkedKeys: orgChecks,
+        appCheckAll: allOrgChecked,
+        orgCheckAll: false,
+        checkData: {
+          apps: appKeys,
+          orgs: orgChecks
+        }
       });
     }
-  };
+  }; // app全局授权
+
 
   var checkedAllApp = function checkedAllApp(e) {
-    var appKeys = [];
+    var appChecks = [];
 
     if (e.target.checked) {
-      appKeys = appList.map(function (item) {
+      setAllAppChecked(true);
+      appChecks = appList.map(function (item) {
         return item.value;
       });
-      setAppKeys(appKeys);
+      setAppKeys(appChecks);
       onChange({
         appKeys: ['all'],
-        checkedKeys: checkedKeys
+        checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
+        appCheckAll: true,
+        orgCheckAll: allOrgChecked,
+        checkData: {
+          apps: appChecks,
+          orgs: checkedKeys
+        }
       });
     } else {
-      appKeys = [appCode];
-      setAppKeys(appKeys);
+      setAllAppChecked(false);
+      appChecks = Array.from(new Set([].concat(_toConsumableArray(appCodes || []), [appCode])));
+      setAppKeys(appChecks);
       onChange({
-        appKeys: appKeys,
-        checkedKeys: checkedKeys
+        appKeys: appChecks,
+        checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
+        appCheckAll: false,
+        orgCheckAll: allOrgChecked,
+        checkData: {
+          apps: appChecks,
+          orgs: checkedKeys
+        }
       });
     }
   };
@@ -304,7 +316,7 @@ var AssignModal = function AssignModal(props) {
     checkedKeys: checkedKeys,
     defaultExpandAll: true,
     onCheck: onCheck,
-    disabled: disabled
+    disabled: disabled || allOrgChecked
   }, loopTreeNodes(orgList))), /*#__PURE__*/_react.default.createElement("div", {
     className: "right"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -322,7 +334,7 @@ var AssignModal = function AssignModal(props) {
     var isOwnAppCode = appCode === item.value;
     return /*#__PURE__*/_react.default.createElement(_checkbox.default, {
       checked: isCheck,
-      disabled: disabled || isOwnAppCode,
+      disabled: disabled || isOwnAppCode || allAppChecked,
       onChange: assignApp,
       value: item.value,
       key: index

package/lib/AssignModal/index.js

@@ -59,6 +59,7 @@ var AssignModal = function AssignModal(props) {
       setAssignData = _useState2[1];
 
   var submit = function submit() {
+    console.log(assignData);
     onSubmit(assignData);
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tddc/assign-modal",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "Layout",
   "author": "zj <jun.zhang002383@tongdun.net>",
   "license": "ISC",
@@ -18,5 +18,5 @@
   "dependencies": {
     "jsencrypt": "^3.2.1"
   },
-  "gitHead": "0a8dc3240d2f48e01f835300e8af780917797aff"
+  "gitHead": "12ef2b028bcaddf22a2db41f05e99b6399688ca4"
 }