@tddc/assign-modal 1.0.9 → 1.1.0

package/lib/AssignModal/AssignApp/index.js

@@ -183,10 +183,10 @@ var AssignModal = function AssignModal(props) {
 
     setCheckedKeys(checked);
     onChange({
-      appKeys: appKeys,
+      appKeys: allAppChecked ? ['all'] : appKeys,
       checkedKeys: checked,
-      appCheckAll: appKeys.length === allApp.length,
-      orgCheckAll: checked.length === allOrg.length,
+      appCheckAll: allAppChecked,
+      orgCheckAll: allOrgChecked,
       checkData: {
         apps: appKeys,
         orgs: checked
@@ -214,12 +214,12 @@ var AssignModal = function AssignModal(props) {
     setAppKeys(newAppKeys);
     onChange({
       appKeys: newAppKeys,
-      checkedKeys: checkedKeys,
-      appCheckAll: newAppKeys.length === allApp.length,
-      orgCheckAll: checkedKeys.length === allOrg.length,
+      checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
+      appCheckAll: allAppChecked,
+      orgCheckAll: allOrgChecked,
       checkData: {
-        apps: appKeys,
-        orgs: newAppKeys
+        apps: newAppKeys,
+        orgs: checkedKeys
       }
     });
   }; // org全局授权
@@ -233,23 +233,23 @@ var AssignModal = function AssignModal(props) {
       orgChecks = (0, _utils.preorder)(orgList[0]);
       setCheckedKeys(orgChecks);
       onChange({
-        appKeys: appKeys,
+        appKeys: allAppChecked ? ['all'] : appKeys,
         checkedKeys: ['all'],
-        appCheckAll: appKeys.length === allApp.length,
+        appCheckAll: allOrgChecked,
         orgCheckAll: true,
         checkData: {
           apps: appKeys,
-          orgs: orgChecks
+          orgs: checkedKeys
         }
       });
     } else {
       setAllOrgChecked(false);
-      orgChecks = _toConsumableArray(path);
+      orgChecks = Array.from(new Set([].concat(_toConsumableArray(orgCodes || []), _toConsumableArray(path))));
       setCheckedKeys(orgChecks);
       onChange({
-        appKeys: appKeys,
+        appKeys: allAppChecked ? ['all'] : appKeys,
         checkedKeys: orgChecks,
-        appCheckAll: checkedKeys.length === allOrg.length,
+        appCheckAll: allOrgChecked,
         orgCheckAll: false,
         checkData: {
           apps: appKeys,
@@ -271,9 +271,9 @@ var AssignModal = function AssignModal(props) {
       setAppKeys(appChecks);
       onChange({
         appKeys: ['all'],
-        checkedKeys: checkedKeys,
+        checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
         appCheckAll: true,
-        orgCheckAll: checkedKeys.length === allOrg.length,
+        orgCheckAll: allOrgChecked,
         checkData: {
           apps: appChecks,
           orgs: checkedKeys
@@ -281,11 +281,13 @@ var AssignModal = function AssignModal(props) {
       });
     } else {
       setAllAppChecked(false);
+      appChecks = Array.from(new Set([].concat(_toConsumableArray(appCodes || []), [appCode])));
+      setAppKeys(appChecks);
       onChange({
         appKeys: appChecks,
-        checkedKeys: checkedKeys,
+        checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
         appCheckAll: false,
-        orgCheckAll: checkedKeys.length === allOrg.length,
+        orgCheckAll: allOrgChecked,
         checkData: {
           apps: appChecks,
           orgs: checkedKeys
@@ -314,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", {
@@ -332,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/package.json

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