@tddc/assign-modal 1.0.6 → 1.0.9

package/lib/AssignModal/AssignApp/index.js

@@ -54,8 +54,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var TreeNode = _tree.default.TreeNode;
 var path = []; // 上级机构到当前机构的路径
 
-var allOrgList = [];
-
 var AssignModal = function AssignModal(props) {
   var _props$orgList = props.orgList,
       orgList = _props$orgList === void 0 ? [] : _props$orgList,
@@ -64,13 +62,23 @@ var AssignModal = function AssignModal(props) {
       disabled = props.disabled,
       appList = props.appList,
       onChange = props.onChange;
+  var _dataItem$appCodes = dataItem.appCodes,
+      appCodes = _dataItem$appCodes === void 0 ? [] : _dataItem$appCodes,
+      _dataItem$orgCodes = dataItem.orgCodes,
+      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),
       checkedKeys = _useState2[0],
       setCheckedKeys = _useState2[1];
 
-  var _useState3 = (0, _react.useState)((dataItem === null || dataItem === void 0 ? void 0 : dataItem.appCodes) || []),
+  var _useState3 = (0, _react.useState)(appCodes || []),
       _useState4 = _slicedToArray(_useState3, 2),
       appKeys = _useState4[0],
       setAppKeys = _useState4[1];
@@ -91,33 +99,27 @@ var AssignModal = function AssignModal(props) {
 
   (0, _react.useEffect)(function () {
     // path 和 allOrgList 赋值
-    path = (0, _utils.findSameCodePath)(orgList[0], dataItem.orgCode);
-    allOrgList = (0, _utils.preorder)(orgList[0]);
-    var initKeys = Array.from(new Set([].concat(_toConsumableArray((dataItem === null || dataItem === void 0 ? void 0 : dataItem.orgCodes) || []), _toConsumableArray(path))));
-    setCheckedKeys(initKeys);
-    setAppKeys((dataItem === null || dataItem === void 0 ? void 0 : dataItem.appCodes) || []);
-    onChange && onChange({
-      appKeys: (dataItem === null || dataItem === void 0 ? void 0 : dataItem.appCodes) || [],
-      checkedKeys: (dataItem === null || dataItem === void 0 ? void 0 : dataItem.orgCodes) || []
-    });
-  }, [dataItem]);
-  (0, _react.useEffect)(function () {
-    // 机构和应用 全选
-    if (appList.length > 0) {
-      var allApp = appList.map(function (item) {
-        return item.value;
-      }); // 判断当前用户是否具有 该机构或应用 权限
+    path = (0, _utils.findSameCodePath)(orgList[0], orgCode);
+    var initOrgs = [];
+    var initApps = [];
 
-      var app = appKeys.filter(function (item) {
-        return allApp.includes(item);
-      });
-      var org = checkedKeys.filter(function (item) {
-        return allOrgList.includes(item);
-      });
-      setAllAppChecked(app.length === appList.length);
-      setAllOrgChecked(org.length === allOrgList.length);
+    if (orgCodes.includes('all')) {
+      setAllOrgChecked(orgCodes.includes('all'));
+      initOrgs = allOrg;
+    } else {
+      initOrgs = Array.from(new Set([].concat(_toConsumableArray(orgCodes || []), _toConsumableArray(path))));
     }
-  }, [checkedKeys, appKeys, appList]);
+
+    if (appCodes.includes('all')) {
+      setAllAppChecked(appCodes.includes('all'));
+      initApps = allApp;
+    } else {
+      initApps = appCodes;
+    }
+
+    setCheckedKeys(initOrgs);
+    setAppKeys(initApps || []);
+  }, [dataItem]);
 
   var loopTreeNodes = function loopTreeNodes(data) {
     var level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
@@ -180,9 +182,15 @@ var AssignModal = function AssignModal(props) {
     }
 
     setCheckedKeys(checked);
-    onChange && onChange({
+    onChange({
       appKeys: appKeys,
-      checkedKeys: checked
+      checkedKeys: checked,
+      appCheckAll: appKeys.length === allApp.length,
+      orgCheckAll: checked.length === allOrg.length,
+      checkData: {
+        apps: appKeys,
+        orgs: checked
+      }
     });
   };
 
@@ -193,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);
@@ -202,49 +209,89 @@ var AssignModal = function AssignModal(props) {
           newAppKeys.splice(index, 1);
         }
       });
-      setAppKeys(newAppKeys);
     }
 
-    onChange && onChange({
+    setAppKeys(newAppKeys);
+    onChange({
+      appKeys: newAppKeys,
       checkedKeys: checkedKeys,
-      appKeys: newAppKeys
+      appCheckAll: newAppKeys.length === allApp.length,
+      orgCheckAll: checkedKeys.length === allOrg.length,
+      checkData: {
+        apps: appKeys,
+        orgs: newAppKeys
+      }
     });
-  };
+  }; // 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'],
+        appCheckAll: appKeys.length === allApp.length,
+        orgCheckAll: true,
+        checkData: {
+          apps: appKeys,
+          orgs: orgChecks
+        }
+      });
     } else {
-      orgKeys = _toConsumableArray(path);
-      setCheckedKeys(orgKeys);
+      setAllOrgChecked(false);
+      orgChecks = _toConsumableArray(path);
+      setCheckedKeys(orgChecks);
+      onChange({
+        appKeys: appKeys,
+        checkedKeys: orgChecks,
+        appCheckAll: checkedKeys.length === allOrg.length,
+        orgCheckAll: false,
+        checkData: {
+          apps: appKeys,
+          orgs: orgChecks
+        }
+      });
     }
+  }; // app全局授权
 
-    onChange && onChange({
-      appKeys: appKeys,
-      checkedKeys: orgKeys
-    });
-  };
 
   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,
+        appCheckAll: true,
+        orgCheckAll: checkedKeys.length === allOrg.length,
+        checkData: {
+          apps: appChecks,
+          orgs: checkedKeys
+        }
+      });
     } else {
-      appKeys = [dataItem === null || dataItem === void 0 ? void 0 : dataItem.appCode];
-      setAppKeys(appKeys);
+      setAllAppChecked(false);
+      onChange({
+        appKeys: appChecks,
+        checkedKeys: checkedKeys,
+        appCheckAll: false,
+        orgCheckAll: checkedKeys.length === allOrg.length,
+        checkData: {
+          apps: appChecks,
+          orgs: checkedKeys
+        }
+      });
     }
-
-    onChange && onChange({
-      appKeys: appKeys,
-      checkedKeys: checkedKeys
-    });
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -259,7 +306,7 @@ var AssignModal = function AssignModal(props) {
     onChange: checkAllOrg,
     checked: allOrgChecked,
     disabled: disabled
-  }, "\u5168\u9009"))), /*#__PURE__*/_react.default.createElement(_tree.default, {
+  }, "\u5168\u5C40"))), /*#__PURE__*/_react.default.createElement(_tree.default, {
     blockNode: true,
     className: "tree-list",
     checkable: true,
@@ -278,11 +325,11 @@ var AssignModal = function AssignModal(props) {
     onChange: checkedAllApp,
     checked: allAppChecked,
     disabled: disabled
-  }, "\u5168\u9009"))), /*#__PURE__*/_react.default.createElement("div", {
+  }, "\u5168\u5C40"))), /*#__PURE__*/_react.default.createElement("div", {
     className: "menu-body"
   }, appList.map(function (item, index) {
     var isCheck = appKeys === null || appKeys === void 0 ? void 0 : appKeys.includes(item.value);
-    var isOwnAppCode = (dataItem === null || dataItem === void 0 ? void 0 : dataItem.appCode) === item.value;
+    var isOwnAppCode = appCode === item.value;
     return /*#__PURE__*/_react.default.createElement(_checkbox.default, {
       checked: isCheck,
       disabled: disabled || isOwnAppCode,

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.6",
+  "version": "1.0.9",
   "description": "Layout",
   "author": "zj <jun.zhang002383@tongdun.net>",
   "license": "ISC",
@@ -18,5 +18,5 @@
   "dependencies": {
     "jsencrypt": "^3.2.1"
   },
-  "gitHead": "7c965cc92686f73308e5c9bb182db622624192d9"
+  "gitHead": "330d083d35237ef27b2187046c167e7e29ee25a4"
 }