@tddc/assign-modal 1.0.4 → 1.0.7

package/lib/AssignModal/AssignApp/index.js

@@ -54,11 +54,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var TreeNode = _tree.default.TreeNode;
 var path = []; // 上级机构到当前机构的路径
 
-var allOrgList = [];
-
 var AssignModal = function AssignModal(props) {
-  var _dataItem$appCodes;
-
   var _props$orgList = props.orgList,
       orgList = _props$orgList === void 0 ? [] : _props$orgList,
       _props$dataItem = props.dataItem,
@@ -66,13 +62,19 @@ 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 _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 = dataItem.appCodes) === null || _dataItem$appCodes === void 0 ? void 0 : _dataItem$appCodes.split(',')) || []),
+  var _useState3 = (0, _react.useState)(appCodes || []),
       _useState4 = _slicedToArray(_useState3, 2),
       appKeys = _useState4[0],
       setAppKeys = _useState4[1];
@@ -92,17 +94,38 @@ var AssignModal = function AssignModal(props) {
   }
 
   (0, _react.useEffect)(function () {
-    var _dataItem$orgCodes, _dataItem$appCodes2;
-
     // 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 = dataItem.orgCodes) === null || _dataItem$orgCodes === void 0 ? void 0 : _dataItem$orgCodes.split(',')) || []), _toConsumableArray(path))));
-    setCheckedKeys(initKeys);
-    setAppKeys((dataItem === null || dataItem === void 0 ? void 0 : (_dataItem$appCodes2 = dataItem.appCodes) === null || _dataItem$appCodes2 === void 0 ? void 0 : _dataItem$appCodes2.split(',')) || []);
+    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')) {
+      initOrgs = allOrg;
+    } else {
+      initOrgs = Array.from(new Set([].concat(_toConsumableArray(orgCodes || []), _toConsumableArray(path))));
+    }
+
+    if (appCodes.includes('all')) {
+      initApps = allApp;
+    } else {
+      initApps = appCodes;
+    }
+
+    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;
@@ -112,10 +135,18 @@ var AssignModal = function AssignModal(props) {
         return allApp.includes(item);
       });
       var org = checkedKeys.filter(function (item) {
-        return allOrgList.includes(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 === allOrgList.length);
+      setAllOrgChecked(org.length === allOrg.length);
     }
   }, [checkedKeys, appKeys, appList]);
 
@@ -217,15 +248,18 @@ 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
+      });
     }
-
-    onChange && onChange({
-      appKeys: appKeys,
-      checkedKeys: orgKeys
-    });
   };
 
   var checkedAllApp = function checkedAllApp(e) {
@@ -236,15 +270,18 @@ var AssignModal = function AssignModal(props) {
         return item.value;
       });
       setAppKeys(appKeys);
+      onChange({
+        appKeys: ['all'],
+        checkedKeys: checkedKeys
+      });
     } else {
-      appKeys = [dataItem === null || dataItem === void 0 ? void 0 : dataItem.appCode];
+      appKeys = [appCode];
       setAppKeys(appKeys);
+      onChange({
+        appKeys: appKeys,
+        checkedKeys: checkedKeys
+      });
     }
-
-    onChange && onChange({
-      appKeys: appKeys,
-      checkedKeys: checkedKeys
-    });
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -259,7 +296,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 +315,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/package.json

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