@tddc/assign-modal 1.2.1 → 1.2.3

package/lib/AssignModal/AssignApp/index.js

@@ -120,9 +120,7 @@ function _unsupportedIterableToArray(o, minLen) {
 }
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) {
-    arr2[i] = arr[i];
-  }
+  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
   return arr2;
 }
 function _iterableToArrayLimit(arr, i) {
@@ -147,7 +145,7 @@ function _iterableToArrayLimit(arr, i) {
           ;
           !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i);
           _n = !0
-        ) {}
+        );
     } catch (err) {
       (_d = !0), (_e = err);
     } finally {
@@ -167,6 +165,7 @@ var TreeNode = _tree.default.TreeNode;
 var path = []; // 上级机构到当前机构的路径
 
 var AssignModal = function AssignModal(props) {
+  var _orgList$;
   var _props$orgList = props.orgList,
     orgList = _props$orgList === void 0 ? [] : _props$orgList,
     _props$dataItem = props.dataItem,
@@ -176,18 +175,32 @@ var AssignModal = function AssignModal(props) {
     onChange = props.onChange,
     orgTitle = props.orgTitle,
     appTitle = props.appTitle,
+    userTitle = props.userTitle,
     orgCheckboxTitle = props.orgCheckboxTitle,
-    appCheckboxTitle = props.appCheckboxTitle;
+    appCheckboxTitle = props.appCheckboxTitle,
+    userCheckboxTitle = props.userCheckboxTitle,
+    _props$userList = props.userList,
+    userList = _props$userList === void 0 ? [] : _props$userList,
+    showUser = props.showUser;
   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;
+    appCode = dataItem.appCode,
+    _dataItem$accounts = dataItem.accounts,
+    accounts = _dataItem$accounts === void 0 ? [] : _dataItem$accounts,
+    account = dataItem.account;
   var allOrg = (0, _utils.preorder)(orgList[0]);
   var allApp = appList.map(function (item) {
     return item.value;
   });
+  var allUser =
+    (userList === null || userList === void 0
+      ? void 0
+      : userList.map(function (item) {
+          return item.account;
+        })) || [];
   var _useState = (0, _react.useState)([]),
     _useState2 = _slicedToArray(_useState, 2),
     checkedKeys = _useState2[0],
@@ -196,15 +209,23 @@ var AssignModal = function AssignModal(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     appKeys = _useState4[0],
     setAppKeys = _useState4[1];
-  var _useState5 = (0, _react.useState)(false),
+  var _useState5 = (0, _react.useState)(accounts || []),
     _useState6 = _slicedToArray(_useState5, 2),
-    allOrgChecked = _useState6[0],
-    setAllOrgChecked = _useState6[1];
+    userKeys = _useState6[0],
+    setUserKeys = _useState6[1];
   var _useState7 = (0, _react.useState)(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    allAppChecked = _useState8[0],
-    setAllAppChecked = _useState8[1];
-  if (!orgList[0].path) {
+    allOrgChecked = _useState8[0],
+    setAllOrgChecked = _useState8[1];
+  var _useState9 = (0, _react.useState)(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    allAppChecked = _useState10[0],
+    setAllAppChecked = _useState10[1];
+  var _useState11 = (0, _react.useState)(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    allUserChecked = _useState12[0],
+    setAllUserChecked = _useState12[1];
+  if (!((_orgList$ = orgList[0]) === null || _orgList$ === void 0 ? void 0 : _orgList$.path)) {
     (0, _utils.addPath)(orgList[0], []); // 添加 上级机构到子机构的路径
   }
 
@@ -214,6 +235,7 @@ var AssignModal = function AssignModal(props) {
       path = (0, _utils.findSameCodePath)(orgList[0], orgCode);
       var initOrgs = [];
       var initApps = [];
+      var initAccounts = [];
       if (orgCodes.includes('all')) {
         setAllOrgChecked(orgCodes.includes('all'));
         initOrgs = allOrg;
@@ -228,20 +250,31 @@ var AssignModal = function AssignModal(props) {
       } else {
         initApps = Array.from(new Set([].concat(_toConsumableArray(appCodes || []), [appCode])));
       }
+      if (showUser) {
+        if (accounts.includes('all')) {
+          setAllUserChecked(true);
+          initAccounts = allUser;
+        } else {
+          initAccounts = Array.from(
+            new Set([].concat(_toConsumableArray(accounts || []), [account])),
+          );
+        }
+      }
       setCheckedKeys(initOrgs);
       setAppKeys(initApps || []);
-      console.log({
-        initApps: initApps,
-      });
+      setUserKeys(initAccounts || []);
       onChange &&
         onChange({
           appKeys: appCodes.includes('all') ? ['all'] : initApps,
           checkedKeys: orgCodes.includes('all') ? ['all'] : initOrgs,
+          userKeys: accounts.includes('all') ? ['all'] : initAccounts,
           appCheckAll: appCodes.includes('all'),
           orgCheckAll: orgCodes.includes('all'),
+          userCheckAll: accounts.includes('all'),
           checkData: {
             apps: initApps,
             orgs: initOrgs,
+            accounts: initAccounts,
           },
         });
     },
@@ -315,9 +348,12 @@ var AssignModal = function AssignModal(props) {
       checkedKeys: checked,
       appCheckAll: allAppChecked,
       orgCheckAll: allOrgChecked,
+      userKeys: allUserChecked ? ['all'] : userKeys,
+      userCheckAll: allUserChecked,
       checkData: {
         apps: appKeys,
         orgs: checked,
+        accounts: userKeys,
       },
     });
   };
@@ -342,9 +378,42 @@ var AssignModal = function AssignModal(props) {
       checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
       appCheckAll: allAppChecked,
       orgCheckAll: allOrgChecked,
+      userKeys: allUserChecked ? ['all'] : userKeys,
+      userCheckAll: allUserChecked,
       checkData: {
         apps: newAppKeys,
         orgs: checkedKeys,
+        accounts: userKeys,
+      },
+    });
+  };
+  var assignUser = function assignUser(e) {
+    var value = '';
+    var newUserKeys = [];
+    if (e.target.checked) {
+      value = e.target.value;
+      newUserKeys = [].concat(_toConsumableArray(userKeys), [value]);
+    } else {
+      value = e.target.value;
+      newUserKeys = (0, _lodash.cloneDeep)(userKeys);
+      newUserKeys.map(function (item, index) {
+        if (value === item) {
+          newUserKeys.splice(index, 1);
+        }
+      });
+    }
+    setUserKeys(newUserKeys);
+    onChange({
+      appKeys: appKeys,
+      checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
+      appCheckAll: allAppChecked,
+      orgCheckAll: allOrgChecked,
+      userKeys: userKeys,
+      userCheckAll: allUserChecked,
+      checkData: {
+        apps: appKeys,
+        orgs: checkedKeys,
+        accounts: newUserKeys,
       },
     });
   };
@@ -361,9 +430,12 @@ var AssignModal = function AssignModal(props) {
         checkedKeys: ['all'],
         appCheckAll: allAppChecked,
         orgCheckAll: true,
+        userKeys: allUserChecked ? ['all'] : userKeys,
+        userCheckAll: allUserChecked,
         checkData: {
           apps: appKeys,
           orgs: checkedKeys,
+          accounts: accounts,
         },
       });
     } else {
@@ -378,9 +450,12 @@ var AssignModal = function AssignModal(props) {
         checkedKeys: orgChecks,
         appCheckAll: allAppChecked,
         orgCheckAll: false,
+        userKeys: allUserChecked ? ['all'] : userKeys,
+        userCheckAll: allUserChecked,
         checkData: {
           apps: appKeys,
           orgs: orgChecks,
+          accounts: accounts,
         },
       });
     }
@@ -400,9 +475,12 @@ var AssignModal = function AssignModal(props) {
         checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
         appCheckAll: true,
         orgCheckAll: allOrgChecked,
+        userKeys: allUserChecked ? ['all'] : userKeys,
+        userCheckAll: allUserChecked,
         checkData: {
           apps: appChecks,
           orgs: checkedKeys,
+          accounts: accounts,
         },
       });
     } else {
@@ -415,9 +493,55 @@ var AssignModal = function AssignModal(props) {
         checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
         appCheckAll: false,
         orgCheckAll: allOrgChecked,
+        userKeys: allUserChecked ? ['all'] : userKeys,
+        userCheckAll: allUserChecked,
         checkData: {
           apps: appChecks,
           orgs: checkedKeys,
+          accounts: accounts,
+        },
+      });
+    }
+  };
+
+  // account全局授权
+  var checkedAllUser = function checkedAllUser(e) {
+    var userChecks = [];
+    if (e.target.checked) {
+      setAllUserChecked(true);
+      userChecks = userList.map(function (item) {
+        return item.account;
+      });
+      setUserKeys(userChecks);
+      onChange({
+        appKeys: allAppChecked ? ['all'] : appKeys,
+        appCheckAll: allAppChecked,
+        checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
+        orgCheckAll: allOrgChecked,
+        userKeys: ['all'],
+        userCheckAll: true,
+        checkData: {
+          apps: appKeys,
+          orgs: checkedKeys,
+          accounts: userChecks,
+        },
+      });
+    } else {
+      setAllUserChecked(false);
+      var arr = accounts.includes('all') ? allUser : accounts;
+      userChecks = Array.from(new Set([].concat(_toConsumableArray(arr || []), [account])));
+      setUserKeys(userChecks);
+      onChange({
+        appKeys: allAppChecked ? ['all'] : appKeys,
+        appCheckAll: allAppChecked,
+        checkedKeys: allOrgChecked ? ['all'] : checkedKeys,
+        orgCheckAll: allOrgChecked,
+        userKeys: userChecks,
+        userCheckAll: false,
+        checkData: {
+          apps: appKeys,
+          orgs: checkedKeys,
+          accounts: userChecks,
         },
       });
     }
@@ -546,6 +670,76 @@ var AssignModal = function AssignModal(props) {
         }),
       ),
     ),
+    !!showUser &&
+      /*#__PURE__*/ _react.default.createElement(
+        'div',
+        {
+          className: 'user',
+        },
+        /*#__PURE__*/ _react.default.createElement(
+          'div',
+          {
+            className: 'menu-header',
+          },
+          userTitle ||
+            (0, _locale.getText)(
+              'authorizesUserList',
+              props === null || props === void 0 ? void 0 : props.lang,
+            ),
+          /*#__PURE__*/ _react.default.createElement(
+            'div',
+            {
+              className: 'menu-all-checked',
+            },
+            /*#__PURE__*/ _react.default.createElement(
+              _checkbox.default,
+              {
+                onChange: checkedAllUser,
+                checked: allUserChecked,
+                disabled: disabled,
+              },
+              userCheckboxTitle ||
+                (0, _locale.getText)(
+                  'allUserAvailable',
+                  props === null || props === void 0 ? void 0 : props.lang,
+                ),
+            ),
+          ),
+        ),
+        /*#__PURE__*/ _react.default.createElement(
+          'div',
+          {
+            className: 'menu-body',
+          },
+          userList.map(function (item, index) {
+            var isCheck =
+              userKeys === null || userKeys === void 0 ? void 0 : userKeys.includes(item.account);
+            var isOwnAccount = account === item.account;
+            return /*#__PURE__*/ _react.default.createElement(
+              _checkbox.default,
+              {
+                checked: isCheck,
+                disabled: disabled || isOwnAccount || allUserChecked,
+                onChange: assignUser,
+                value: item.account,
+                key: index,
+              },
+              /*#__PURE__*/ _react.default.createElement(
+                'span',
+                {
+                  style: {
+                    display: 'inline-block',
+                  },
+                },
+                /*#__PURE__*/ _react.default.createElement(_tntd.Ellipsis, {
+                  widthLimit: 100,
+                  title: item.userName,
+                }),
+              ),
+            );
+          }),
+        ),
+      ),
   );
 };
 var _default = AssignModal;

package/lib/AssignModal/AssignApp/index.less

@@ -15,7 +15,7 @@
 
   .left {
     position: relative;
-    z-index: 1;
+    z-index: 3;
     width: 430px;
     background: #ffffff;
     box-shadow: 0px 0px 6px 0px rgba(58, 48, 48, 0.12);
@@ -66,6 +66,7 @@
   }
 
   .right {
+    z-index: 2;
     flex: 1;
     overflow: scroll;
     background: #fcfcfc;
@@ -77,4 +78,19 @@
       }
     }
   }
+
+  .user {
+    position: relative;
+    z-index: 1;
+    width: 320px;
+    overflow: auto;
+    background: #ffffff;
+    box-shadow: 0px 0px 6px 0px rgba(58, 48, 48, 0.12);
+    .menu-body {
+      margin: 20px;
+      .ant-checkbox-wrapper {
+        margin: 0 4px !important;
+      }
+    }
+  }
 }

package/lib/AssignModal/AssignApp/utils.js

@@ -38,9 +38,7 @@ function _arrayWithoutHoles(arr) {
 }
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) {
-    arr2[i] = arr[i];
-  }
+  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
   return arr2;
 }
 // 遍历机构树 添加 path属性 （上级机构到子机构的路径）

package/lib/AssignModal/index.js

@@ -44,6 +44,8 @@ var _excluded = [
   'title',
   'onSubmit',
   'appList',
+  'userList',
+  'showUser',
 ];
 function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== 'function') return null;
@@ -125,9 +127,7 @@ function _unsupportedIterableToArray(o, minLen) {
 }
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) {
-    arr2[i] = arr[i];
-  }
+  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
   return arr2;
 }
 function _iterableToArrayLimit(arr, i) {
@@ -152,7 +152,7 @@ function _iterableToArrayLimit(arr, i) {
           ;
           !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i);
           _n = !0
-        ) {}
+        );
     } catch (err) {
       (_d = !0), (_e = err);
     } finally {
@@ -207,6 +207,8 @@ var AssignModal = function AssignModal(props) {
     title = _props$title === void 0 ? '' : _props$title,
     onSubmit = props.onSubmit,
     appList = props.appList,
+    userList = props.userList,
+    showUser = props.showUser,
     restProps = _objectWithoutProperties(props, _excluded);
   var _useState = (0, _react.useState)({}),
     _useState2 = _slicedToArray(_useState, 2),
@@ -224,7 +226,7 @@ var AssignModal = function AssignModal(props) {
       className: 'modelTool-assign',
       title: title,
       visible: visible,
-      width: '65%',
+      width: showUser ? '80%' : '65%',
       onCancel: close,
       onOk: submit,
       maskClosable: false,
@@ -240,6 +242,7 @@ var AssignModal = function AssignModal(props) {
           dataItem: dataItem,
           orgList: orgList,
           appList: appList,
+          userList: userList,
           onChange: function onChange(data) {
             setAssignData(data);
           },
@@ -248,6 +251,7 @@ var AssignModal = function AssignModal(props) {
             (props === null || props === void 0 ? void 0 : props.lang) ||
             cookies.get('lang') ||
             'cn',
+          showUser: showUser,
         },
         restProps,
       ),

package/lib/locale.js

@@ -14,13 +14,17 @@ var zh_CN = {
   allOrgAvailable: '全部机构可用',
   authorizesAppList: '授权可用渠道列表',
   allAppAvailable: '全部渠道可用',
+  authorizesUserList: '全部可用用户列表',
+  allUserAvailable: '全部用户可用',
 };
 exports.zh_CN = zh_CN;
 var en_US = {
   authorizesOrgList: 'Authorizes the list of organization available',
-  allOrgAvailable: 'All organization are available',
+  allOrgAvailable: 'All organizations are available',
   authorizesAppList: 'Authorizes the list of application available',
-  allAppAvailable: 'All application are available',
+  allAppAvailable: 'All applications are available',
+  authorizesUserList: 'Authorizes the list of account available',
+  allUserAvailable: 'All accounts are available',
 };
 exports.en_US = en_US;
 var getText = function getText(key, language) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tddc/assign-modal",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Layout",
   "author": "zj <jun.zhang002383@tongdun.net>",
   "license": "ISC",