@zgfe/modules-settings 1.2.11 → 1.2.13

package/es/modules/companySetting/index.js

@@ -14,7 +14,7 @@ import './index.less';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import request from './../../utils/ajax';
 import api from './../../constants/api';
-import PageLoading from '../../components/pageLoading';
+// import PageLoading from '../../components/pageLoading';
 import { Tabs, notification } from 'antd';
 import Info from './info';
 import User from './user';
@@ -25,17 +25,15 @@ import WechatBinding from './wechatBinding';
 import OperationLog from './operationLog';
 import DepartmentList from './department';
 import RoleList from './role';
+import PageLoading from '../../components/pageLoading';
 var CompanySetting = function CompanySetting(props) {
-  var showWeChatMenu = props.showWeChatMenu,
-    showMarketMenu = props.showMarketMenu,
-    action = props.action,
+  var action = props.action,
     settingCallback = props.settingCallback;
   // #todo 需要修改主应用传入参数和business-lib数据仓库
   var apisOkNum = 0;
   var _useContext = useContext(BizGlobalDataContext),
     envs = _useContext.envs,
-    getMenuRouterByName = _useContext.getMenuRouterByName,
-    currentApp = _useContext.currentApp;
+    authority = _useContext.authority;
   var _ref = envs || {},
     zgText = _ref.zgText,
     showVirtualApp = _ref.showVirtualApp,
@@ -76,9 +74,8 @@ var CompanySetting = function CompanySetting(props) {
     setCompanyId = _useState16[1];
   // groupInfos
   var _useState17 = useState([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    allGroupInfos = _useState18[0],
-    setAllGroupInfos = _useState18[1];
+    _useState18 = _slicedToArray(_useState17, 1),
+    allGroupInfos = _useState18[0];
   var _useState19 = useState({}),
     _useState20 = _slicedToArray(_useState19, 2),
     groupHashList = _useState20[0],
@@ -100,9 +97,8 @@ var CompanySetting = function CompanySetting(props) {
     setCompanyRealAppList = _useState26[1];
   // queryLeftMenus
   var _useState27 = useState([]),
-    _useState28 = _slicedToArray(_useState27, 2),
-    leftMenus = _useState28[0],
-    setLeftMenus = _useState28[1];
+    _useState28 = _slicedToArray(_useState27, 1),
+    leftMenus = _useState28[0];
   var _useState29 = useState(0),
     _useState30 = _slicedToArray(_useState29, 2),
     serviceType = _useState30[0],
@@ -178,24 +174,27 @@ var CompanySetting = function CompanySetting(props) {
         method: 'get'
       }).then(function (res) {
         setCompanyAppList(res && res.data.appList || []);
-        if (settingCurrentUser && authConfig && authConfig.dataAuth) {
-          var appIds = authConfig.dataAuth.map(function (item) {
-            return item.appId;
-          });
-          if (appIds.includes(0) || isAdmin) {
-            setAppList(res && res.data.appList || []);
-          } else {
-            var result = [];
-            res && res.data.appList && res.data.appList.forEach(function (item) {
-              if (appIds.includes(item.id)) {
-                result.push(item);
-              }
-            });
-            setAppList(result);
-          }
-        } else {
-          setAppList(res && res.data.appList || []);
-        }
+        // if (settingCurrentUser && authConfig && authConfig.dataAuth) {
+        //   let appIds = authConfig.dataAuth.map((item) => {
+        //     return item.appId;
+        //   });
+        //   if (appIds.includes(0) || isAdmin) {
+        //     setAppList((res && res.data.appList) || []);
+        //   } else {
+        //     let result: AppListItem[] = [];
+        //     res &&
+        //       res.data.appList &&
+        //       res.data.appList.forEach((item: AppListItem) => {
+        //         if (appIds.includes(item.id)) {
+        //           result.push(item);
+        //         }
+        //       });
+        //     setAppList(result);
+        //   }
+        // } else {
+        //   setAppList((res && res.data.appList) || []);
+        // }
+        setAppList(res && res.data.appList || []);
         apisOkNum += 1;
         setPageReady(apisOkNum);
       }).catch(function () {
@@ -203,77 +202,85 @@ var CompanySetting = function CompanySetting(props) {
           message: '信息获取失败1'
         });
       });
-      request(api.app.queryLeftMenus, {
-        method: 'get',
-        params: {
-          appId: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) || 0
-        }
-      }).then(function (res) {
-        var menus = res && res.data || [];
-        var menusNameMap = {};
-        var formatMenus = function formatMenus(menus) {
-          menus.forEach(function (item) {
-            item.routeName = getMenuRouterByName(item.name);
-            menusNameMap[item.name] = item;
-            if (item.childrens) {
-              formatMenus(item.childrens);
-            }
-          });
-        };
-        formatMenus(menus);
-        setLeftMenus(menus);
-        apisOkNum += 1;
-        setPageReady(apisOkNum);
-      }).catch(function () {
-        notification.error({
-          message: '信息获取失败3'
-        });
-      });
+      // request<void>(api.app.queryLeftMenus, {
+      //   method: 'get',
+      //   params: {
+      //     appId: currentApp?.appId,
+      //   },
+      // })
+      //   .then((res: ApiResult<void> | null) => {
+      //     let menus = (res && res.data) || [];
+      //     let menusNameMap: { [key: string]: LeftMenusItem } = {};
+      //     let formatMenus = (menus: LeftMenusItem[]) => {
+      //       menus.forEach((item) => {
+      //         item.routeName = getMenuRouterByName!(item.name);
+      //         menusNameMap[item.name] = item;
+      //         if (item.childrens) {
+      //           formatMenus(item.childrens);
+      //         }
+      //       });
+      //     };
+      //     formatMenus(menus);
+      //     setLeftMenus(menus);
+      //     apisOkNum += 1;
+      //     setPageReady(apisOkNum);
+      //   })
+      //   .catch(() => {
+      //     notification.error({
+      //       message: '信息获取失败3',
+      //     });
+      //   });
     }).catch(function () {
       notification.error({
         message: '信息获取失败4'
       });
     });
-    request(api.setting.groupInfos, {
-      method: 'get'
-    }).then(function (res) {
-      if (res && res.flag === 101) {
-        setAllGroupInfos((res.infos || []).reverse());
-      }
-      apisOkNum += 1;
-      setPageReady(apisOkNum);
-    }).catch(function () {
-      notification.error({
-        message: '信息获取失败2'
-      });
-    });
-  };
-  var refreshGroupList = function refreshGroupList() {
-    request(api.setting.groupInfos, {
-      method: 'get'
-    }).then(function (res) {
-      if (res && res.flag === 101) {
-        setAllGroupInfos((res.infos || []).reverse());
-      }
-    }).catch(function () {
-      notification.error({
-        message: '信息获取失败'
-      });
-    });
-  };
-  var updateUserAuth = function updateUserAuth(params) {
-    return request(api.setting.updateUserAuth, {
-      method: 'post',
-      params: params
-    }).then(function () {
-      // if (res.flag === 101) {
-      // }
-    }).catch(function () {
-      notification.error({
-        message: '信息获取失败'
-      });
-    });
+    // request<void>(api.setting.groupInfos, {
+    //   method: 'get',
+    // })
+    //   .then((res: ApiResult<void> | null) => {
+    //     if (res && res.flag === 101) {
+    //       setAllGroupInfos((res.infos || []).reverse());
+    //     }
+    //     apisOkNum += 1;
+    //     setPageReady(apisOkNum);
+    //   })
+    //   .catch(() => {
+    //     notification.error({
+    //       message: '信息获取失败2',
+    //     });
+    //   });
   };
+  // const refreshGroupList = () => {
+  //   request<void>(api.setting.groupInfos, {
+  //     method: 'get',
+  //   })
+  //     .then((res: ApiResult<void> | null) => {
+  //       if (res && res.flag === 101) {
+  //         setAllGroupInfos((res.infos || []).reverse());
+  //       }
+  //     })
+  //     .catch(() => {
+  //       notification.error({
+  //         message: '信息获取失败',
+  //       });
+  //     });
+  // };
+  // const updateUserAuth = (params: FormData) => {
+  //   return request<{}>(api.setting.updateUserAuth, {
+  //     method: 'post',
+  //     params,
+  //   })
+  //     .then(() => {
+  //       // if (res.flag === 101) {
+  //       // }
+  //     })
+  //     .catch(() => {
+  //       notification.error({
+  //         message: '信息获取失败',
+  //       });
+  //     });
+  // };
   var changeCompanyNameCallback = function changeCompanyNameCallback() {
     getSettingData();
     settingCallback && settingCallback('settingChangeCompanyNameCallback');
@@ -283,15 +290,13 @@ var CompanySetting = function CompanySetting(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return updateUserAuth(formData);
-          case 2:
+            // await updateUserAuth(formData);
             getSettingData();
             settingCallback && settingCallback('settingDelAppCallback', {
               formData: formData,
               id: id
             });
-          case 4:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -306,15 +311,13 @@ var CompanySetting = function CompanySetting(props) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
-            return updateUserAuth(formData);
-          case 2:
+            // await updateUserAuth(formData);
             getSettingData();
             settingCallback && settingCallback('settingCreateAppCallback', {
               formData: formData,
               id: id
             });
-          case 4:
+          case 2:
           case "end":
             return _context2.stop();
         }
@@ -338,21 +341,24 @@ var CompanySetting = function CompanySetting(props) {
     settingCallback && settingCallback('settingRemoveUserCallback', {
       delIndex: delIndex
     });
-    refreshGroupList();
+    // refreshGroupList();
   };
+
   var changeUserAuthCallback = function changeUserAuthCallback(id) {
     settingCallback && settingCallback('settingChangeUserAuthCallback', {
       id: id
     });
-    refreshGroupList();
+    // refreshGroupList();
   };
+
   var createMembersCallback = function createMembersCallback(res, userConfig) {
     settingCallback && settingCallback('settingCreateMembersCallback', {
       popup: res.popup,
       userConfig: userConfig
     });
-    refreshGroupList();
+    // refreshGroupList();
   };
+
   var changeAdminCallback = function changeAdminCallback(res) {
     settingCallback && settingCallback('settingChangeAdminCallback', res);
   };
@@ -368,15 +374,13 @@ var CompanySetting = function CompanySetting(props) {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context3.next = 2;
-            return updateUserAuth(formData);
-          case 2:
+            // await updateUserAuth(formData);
             getSettingData();
             settingCallback && settingCallback('settingCreateVirtualAppCallback', {
               res: res,
               formData: formData
             });
-          case 4:
+          case 2:
           case "end":
             return _context3.stop();
         }
@@ -391,12 +395,10 @@ var CompanySetting = function CompanySetting(props) {
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context4.next = 2;
-            return updateUserAuth(formData);
-          case 2:
+            // await updateUserAuth(formData);
             getSettingData();
             settingCallback && settingCallback('settingDelVirtualAppCallback', res);
-          case 4:
+          case 2:
           case "end":
             return _context4.stop();
         }
@@ -418,7 +420,6 @@ var CompanySetting = function CompanySetting(props) {
     settingCallback && settingCallback('settingCloseCreateCallback');
   };
   var changeTab = function changeTab(key) {
-    // setCurrentTab(tab);
     setActiveKey(key);
   };
   var items = [{
@@ -430,7 +431,7 @@ var CompanySetting = function CompanySetting(props) {
       companyName: companyName,
       changeCompanyNameCallback: changeCompanyNameCallback
     }),
-    hidden: false
+    hidden: !authority[10078]
   }, {
     key: 'user',
     label: '成员管理',
@@ -439,6 +440,7 @@ var CompanySetting = function CompanySetting(props) {
       settingCurrentUser: settingCurrentUser,
       id: id,
       groupHashList: groupHashList,
+      companyId: companyId,
       companyAppList: companyAppList,
       allGroupInfos: allGroupInfos,
       leftMenus: leftMenus,
@@ -449,26 +451,14 @@ var CompanySetting = function CompanySetting(props) {
       isAdmin: isAdmin,
       serviceType: serviceType
     }),
-    hidden: false
+    hidden: !authority[10079]
   }, {
     key: 'userGroup',
     label: '角色管理',
-    children:
-    /*#__PURE__*/
-    // <UserGroup
-    //   id={id as number}
-    //   companyAppList={companyAppList}
-    //   allGroupInfos={allGroupInfos}
-    //   leftMenus={leftMenus}
-    //   isAdmin={isAdmin}
-    //   delGroupCallback={delGroupCallback}
-    //   updateGroupAuthCallback={updateGroupAuthCallback}
-    //   serviceType={serviceType}
-    // />
-    React.createElement(RoleList, {
+    children: /*#__PURE__*/React.createElement(RoleList, {
       companyId: companyId
     }),
-    hidden: false
+    hidden: !authority[10080]
   }, {
     key: 'department',
     label: '部门管理',
@@ -476,7 +466,7 @@ var CompanySetting = function CompanySetting(props) {
       companyId: companyId,
       closeCreateCallback: closeCreateCallback
     }),
-    hidden: false
+    hidden: !authority[10081]
   }, {
     key: 'appList',
     label: '应用',
@@ -497,7 +487,7 @@ var CompanySetting = function CompanySetting(props) {
       gotoAppPanel: gotoAppPanel,
       closeCreateCallback: closeCreateCallback
     }),
-    hidden: false
+    hidden: !authority[10082]
   }, {
     key: 'virtualApp',
     label: '虚拟应用',
@@ -519,23 +509,31 @@ var CompanySetting = function CompanySetting(props) {
       companyAppList: companyAppList,
       companyId: companyId
     }),
-    hidden: false
+    hidden: !authority[10083]
   }, {
     key: 'weChatBinding',
     label: '微信账号绑定',
     children: /*#__PURE__*/React.createElement(WechatBinding, null),
-    hidden: !(showWeChatMenu && showMarketMenu && showDataDaily && isAdmin)
+    hidden: !(authority[1016] && authority[1019] && showDataDaily && isAdmin)
   }, {
     key: 'operationLog',
     label: '操作日志',
     children: /*#__PURE__*/React.createElement(OperationLog, null),
-    hidden: !isAdmin
+    hidden: !isAdmin && !authority[10084]
   }];
+  useEffect(function () {
+    if (action !== 'createApp') {
+      var _items$filter$;
+      changeTab(items === null || items === void 0 ? void 0 : (_items$filter$ = items.filter(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.hidden) !== true;
+      })[0]) === null || _items$filter$ === void 0 ? void 0 : _items$filter$.key);
+    }
+  }, [pageReady]);
   return /*#__PURE__*/React.createElement("div", {
     className: "setting setting-content company-setting"
   }, /*#__PURE__*/React.createElement("div", {
     className: "company-setting-title"
-  }, "\u516C\u53F8\u8BBE\u7F6E"), pageReady >= 3 ? /*#__PURE__*/React.createElement(Tabs, {
+  }, "\u516C\u53F8\u8BBE\u7F6E"), pageReady >= 1 ? /*#__PURE__*/React.createElement(Tabs, {
     className: "company-setting-tabs",
     destroyInactiveTabPane: true,
     activeKey: activeKey,

package/es/modules/companySetting/index.less

@@ -7,7 +7,6 @@
 
 .company-setting {
   border: 1px solid var(--unnamed, #ecedf0);
-  border-radius: 8px;
 
   .company-setting-title {
     display: flex;
@@ -16,25 +15,31 @@
     align-items: center;
     width: 100%;
     height: 48px;
-    padding: 0px 24px;
+    padding: 0 24px;
     background: #fff;
   }
 
   .company-setting-tabs {
-    margin: 16px 24px 24px;
+    min-height: 800px;
+    margin: 16px;
     background: #fff !important;
+    border-radius: 8px;
   }
 
   .hidden-tab {
     display: none;
   }
 
+  .ant-tabs-nav {
+    margin-bottom: 16px;
+  }
+
   .ant-tabs-nav-wrap {
     margin: 0 24px;
   }
 
   .ant-tabs-content {
-    padding: 8px 24px 24px 24px;
+    padding: 0 24px 24px;
   }
 
   .setting-tab {
@@ -61,3 +66,24 @@
     font-weight: bold;
   }
 }
+
+.setting-bizDialog {
+  .ant-modal-header {
+    padding-bottom: 24px;
+  }
+
+  .ant-modal-close-x {
+    width: 24px;
+    height: 24px;
+    margin-right: 22px;
+  }
+
+  .ant-modal-close .qingchu {
+    font-weight: normal;
+  }
+
+  .ant-modal-body {
+    padding: 0 24px;
+    padding-bottom: 24px;
+  }
+}

package/es/modules/companySetting/info/index.js

@@ -4,9 +4,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState } from 'react';
+import React, { useState, useContext } from 'react';
 import './index.less';
 import { Button, Form, Input, notification } from 'antd';
+import { BizGlobalDataContext } from '@zgfe/business-lib';
 import request from './../../../utils/ajax';
 import api from './../../../constants/api';
 var TextArea = Input.TextArea;
@@ -23,6 +24,8 @@ var Info = function Info(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     isChange = _useState4[0],
     setIsChange = _useState4[1];
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
   var updateLicense = function updateLicense(license) {
     request(api.setting.updateLicense, {
       method: 'post',
@@ -103,6 +106,7 @@ var Info = function Info(props) {
   }, /*#__PURE__*/React.createElement(Input, {
     type: 'text',
     placeholder: '请填写公司名称',
+    disabled: !authority[10086],
     onChange: function onChange(e) {
       setIsChange(e.target.value === companyName);
     }
@@ -112,6 +116,7 @@ var Info = function Info(props) {
   }, /*#__PURE__*/React.createElement(TextArea, {
     rows: 5,
     placeholder: '请输入您的授权码',
+    disabled: !authority[10087],
     onChange: function onChange(e) {
       setIsChange(!e.target.value);
     }

package/es/modules/companySetting/info/index.less

@@ -1,24 +1,31 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 @import './../style/common.less';
+
 .company-setting-info {
+  margin-top: 8px;
   padding: 0;
+
   > p {
     margin-bottom: 13px;
     color: #565656;
   }
+
   li {
     margin-bottom: 30px;
     color: #333333;
   }
+
   .c-button {
     width: 90px;
     height: 40px;
   }
+
   .c-input.c-size-big {
     height: 40px;
     color: initial;
     line-height: 40px;
   }
+
   .el-textarea {
     width: 350px;
   }

package/es/modules/companySetting/operationLog/index.js

@@ -10,16 +10,19 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useContext } from 'react';
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
 import { DatePicker, Radio, Table } from 'antd';
 import locale from 'antd/es/date-picker/locale/zh_CN';
+import { BizGlobalDataContext } from '@zgfe/business-lib';
 import moment from 'moment';
 import './index.less';
 import { setColumnsList } from './util';
 var OperationLog = function OperationLog() {
   var classPrefix = 'operation-log-page';
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
   var _useState = useState({
       page: 1,
       size: 10,
@@ -187,11 +190,14 @@ var OperationLog = function OperationLog() {
     onChange: onChangeType,
     value: logType
   }, /*#__PURE__*/React.createElement(Radio.Button, {
-    value: "1"
+    value: "1",
+    disabled: !authority[10102]
   }, "\u67E5\u8BE2\u65E5\u5FD7"), /*#__PURE__*/React.createElement(Radio.Button, {
-    value: "2"
+    value: "2",
+    disabled: !authority[10103]
   }, "\u64CD\u4F5C\u65E5\u5FD7"), /*#__PURE__*/React.createElement(Radio.Button, {
-    value: "3"
+    value: "3",
+    disabled: !authority[10104]
   }, "\u6743\u9650\u7BA1\u7406\u65E5\u5FD7")), condition.year && /*#__PURE__*/React.createElement(DatePicker, {
     value: moment("".concat(condition.year, "-").concat(condition.month), 'YYYY-MM'),
     picker: "month",

package/es/modules/companySetting/operationLog/index.less

@@ -1,23 +1,29 @@
 .operation-log-page {
   display: flex;
   flex-direction: column;
+  margin-top: 8px;
+
   &-header {
     display: flex;
     justify-content: space-between;
     margin-bottom: 30px;
   }
+
   &-table {
     flex: 1;
     overflow-y: auto;
   }
+
   .ant-radio-group {
     .ant-radio-button-wrapper:first-child {
       border-radius: 4px 0 0 4px;
     }
+
     .ant-radio-button-wrapper:last-child {
       border-radius: 0 4px 4px 0;
     }
   }
+
   &-columns {
     width: 120px;
     overflow: hidden;