@tddc/assign-modal 1.0.7 → 1.0.8

package/lib/AssignModal/AssignApp/index.js

@@ -117,10 +117,6 @@ 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 () {
     // 机构和应用 全选
@@ -138,13 +134,18 @@ var AssignModal = function AssignModal(props) {
         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
-        });
-      }
+      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,
+        appCheckAll: app.length === allApp.length,
+        orgCheckAll: org.length === allOrg.length,
+        checkData: {
+          apps: app.length === allApp.length ? allApp : appKeys,
+          orgs: org.length === allOrg.length ? allOrg : checkedKeys
+        }
+      });
       setAllAppChecked(app.length === appList.length);
       setAllOrgChecked(org.length === allOrg.length);
     }
@@ -211,10 +212,6 @@ var AssignModal = function AssignModal(props) {
     }
 
     setCheckedKeys(checked);
-    onChange && onChange({
-      appKeys: appKeys,
-      checkedKeys: checked
-    });
   };
 
   var assignApp = function assignApp(e) {
@@ -235,11 +232,6 @@ var AssignModal = function AssignModal(props) {
       });
       setAppKeys(newAppKeys);
     }
-
-    onChange && onChange({
-      checkedKeys: checkedKeys,
-      appKeys: newAppKeys
-    });
   };
 
   var checkAllOrg = function checkAllOrg(e) {
@@ -248,17 +240,9 @@ var AssignModal = function AssignModal(props) {
     if (e.target.checked) {
       orgKeys = (0, _utils.preorder)(orgList[0]);
       setCheckedKeys(orgKeys);
-      onChange({
-        appKeys: appKeys,
-        checkedKeys: ['all']
-      });
     } else {
       orgKeys = _toConsumableArray(path);
       setCheckedKeys(orgKeys);
-      onChange({
-        appKeys: appKeys,
-        checkedKeys: orgKeys
-      });
     }
   };
 
@@ -270,17 +254,9 @@ var AssignModal = function AssignModal(props) {
         return item.value;
       });
       setAppKeys(appKeys);
-      onChange({
-        appKeys: ['all'],
-        checkedKeys: checkedKeys
-      });
     } else {
       appKeys = [appCode];
       setAppKeys(appKeys);
-      onChange({
-        appKeys: appKeys,
-        checkedKeys: checkedKeys
-      });
     }
   };
 

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.0.8",
   "description": "Layout",
   "author": "zj <jun.zhang002383@tongdun.net>",
   "license": "ISC",
@@ -18,5 +18,5 @@
   "dependencies": {
     "jsencrypt": "^3.2.1"
   },
-  "gitHead": "0a8dc3240d2f48e01f835300e8af780917797aff"
+  "gitHead": "acab77ece0b40c408f124f815c484de792ee45d0"
 }