@tddc/assign-modal 1.1.1 → 1.1.2

package/lib/AssignModal/AssignApp/index.js

@@ -141,7 +141,7 @@ var AssignModal = function AssignModal(props) {
             node: item
           }),
           item: item,
-          disabled: orgDisabled || disabled
+          disabled: orgDisabled || disabled || allOrgChecked
         }, loopTreeNodes(item.children, level + 1));
       }
 
@@ -235,7 +235,7 @@ var AssignModal = function AssignModal(props) {
       onChange({
         appKeys: allAppChecked ? ['all'] : appKeys,
         checkedKeys: ['all'],
-        appCheckAll: allOrgChecked,
+        appCheckAll: allAppChecked,
         orgCheckAll: true,
         checkData: {
           apps: appKeys,
@@ -244,12 +244,13 @@ var AssignModal = function AssignModal(props) {
       });
     } else {
       setAllOrgChecked(false);
-      orgChecks = Array.from(new Set([].concat(_toConsumableArray(orgCodes || []), _toConsumableArray(path))));
+      var arr = orgCodes.includes('all') ? allApp : orgCodes;
+      orgChecks = Array.from(new Set([].concat(_toConsumableArray(arr || []), _toConsumableArray(path))));
       setCheckedKeys(orgChecks);
       onChange({
         appKeys: allAppChecked ? ['all'] : appKeys,
         checkedKeys: orgChecks,
-        appCheckAll: allOrgChecked,
+        appCheckAll: allAppChecked,
         orgCheckAll: false,
         checkData: {
           apps: appKeys,
@@ -281,7 +282,8 @@ var AssignModal = function AssignModal(props) {
       });
     } else {
       setAllAppChecked(false);
-      appChecks = Array.from(new Set([].concat(_toConsumableArray(appCodes || []), [appCode])));
+      var arr = appCodes.includes('all') ? allApp : appCodes;
+      appChecks = Array.from(new Set([].concat(_toConsumableArray(arr || []), [appCode])));
       setAppKeys(appChecks);
       onChange({
         appKeys: appChecks,
@@ -316,8 +318,8 @@ var AssignModal = function AssignModal(props) {
     checkedKeys: checkedKeys,
     defaultExpandAll: true,
     onCheck: onCheck,
-    disabled: disabled || allOrgChecked
-  }, loopTreeNodes(orgList))), /*#__PURE__*/_react.default.createElement("div", {
+    disabled: true
+  }, loopTreeNodes(orgList, 0))), /*#__PURE__*/_react.default.createElement("div", {
     className: "right"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "menu-header"

package/package.json

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