@zgfe/modules-settings 1.2.10-role1 → 1.2.10-role3

package/es/modules/appSettings/demo/index.d.ts

@@ -1 +1,3 @@
-
+import React from 'react';
+declare const _default: () => React.JSX.Element;
+export default _default;

package/es/modules/appSettings/demo/index.js

@@ -1,12 +1,16 @@
-"use strict";
-
-// import React from 'react';
-// import { AppSettings } from '@zgfe/modules-settings';
-// import DemoWrapper from '../../../components/demo';
-// export default () => {
-//   return (
-//     <DemoWrapper>
-//       <AppSettings />
-//     </DemoWrapper>
-//   );
-// };
+import React from 'react';
+// import { AppSettings } from '../../modules-settings';
+import { BizGlobalDataContext, DemoWrapper } from '@zgfe/business-lib';
+import funPermissions from '../../../utils/functionalPermissions';
+import { AppSettings } from '../../..';
+export default (function () {
+  return /*#__PURE__*/React.createElement(DemoWrapper, null, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
+    value: {
+      funPermissions: funPermissions
+    }
+  }, /*#__PURE__*/React.createElement(AppSettings, {
+    settingsCallback: function settingsCallback(type) {
+      throw new Error('Function not implemented.');
+    }
+  })));
+});

package/es/modules/appSettings/member/index.js

@@ -20,30 +20,26 @@ var AppMember = function AppMember() {
     _useState2 = _slicedToArray(_useState, 2),
     memberList = _useState2[0],
     setMemberList = _useState2[1]; // 成员列表
-  var _useState3 = useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    groupInfoList = _useState4[0],
-    setGroupInfoList = _useState4[1];
-  var _useState5 = useState(new Map()),
+  // const [groupInfoList, setGroupInfoList] = useState<IGroupInfo[]>([]);
+  var _useState3 = useState(new Map()),
+    _useState4 = _slicedToArray(_useState3, 1),
+    groupInfoMap = _useState4[0];
+  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    groupInfoMap = _useState6[0],
-    setGroupInfoMap = _useState6[1];
+    companyAppList = _useState6[0],
+    setCompanyAppList = _useState6[1];
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    companyAppList = _useState8[0],
-    setCompanyAppList = _useState8[1];
-  var _useState9 = useState([]),
+    leftMenus = _useState8[0],
+    setLeftMenus = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    leftMenus = _useState10[0],
-    setLeftMenus = _useState10[1];
-  var _useState11 = useState(false),
+    isModalOpen = _useState10[0],
+    setIsModalOpen = _useState10[1];
+  var _useState11 = useState({}),
     _useState12 = _slicedToArray(_useState11, 2),
-    isModalOpen = _useState12[0],
-    setIsModalOpen = _useState12[1];
-  var _useState13 = useState({}),
-    _useState14 = _slicedToArray(_useState13, 2),
-    modalData = _useState14[0],
-    setModalData = _useState14[1];
+    modalData = _useState12[0],
+    setModalData = _useState12[1];
   var setingModalhandle = function setingModalhandle(data, dealArr) {
     setModalData({
       data: data,
@@ -98,28 +94,26 @@ var AppMember = function AppMember() {
         var _memberList = ((res === null || res === void 0 ? void 0 : res.company_members) || []).map(function (item) {
           item.key = item.id;
           return item;
-        }).filter(function (item) {
-          return checkAuth(item);
         });
+        // .filter((item) => checkAuth(item));
         setMemberList(_memberList);
       }
     }).catch(function (err) {
       console.log(err);
     });
     // 请求用户组
-    request(apis.setting.groupInfos, {
-      method: 'get'
-    }).then(function (res) {
-      if ((res === null || res === void 0 ? void 0 : res.flag) === 101) {
-        var _res$infos;
-        setGroupInfoList((res === null || res === void 0 ? void 0 : res.infos) || []);
-        var _groupInfoMap = new Map();
-        res === null || res === void 0 ? void 0 : (_res$infos = res.infos) === null || _res$infos === void 0 ? void 0 : _res$infos.forEach(function (item) {
-          _groupInfoMap.set(item.id, item);
-        });
-        setGroupInfoMap(_groupInfoMap);
-      }
-    });
+    // request<void>(apis.setting.groupInfos, {
+    //   method: 'get',
+    // }).then((res: IGroupInfosRes<void> | null) => {
+    //   if (res?.flag === 101) {
+    //     setGroupInfoList(res?.infos || []);
+    //     const groupInfoMap = new Map();
+    //     res?.infos?.forEach((item: IGroupInfo) => {
+    //       groupInfoMap.set(item.id, item);
+    //     });
+    //     setGroupInfoMap(groupInfoMap);
+    //   }
+    // });
     // 请求应用列表
     request(apis.app.queryAppList, {
       method: 'get'
@@ -148,30 +142,30 @@ var AppMember = function AppMember() {
     }).catch(function (err) {});
   }, []);
   // 鉴权
-  var checkAuth = function checkAuth(member) {
-    var authConfig = member.authConfig || {};
-    var defaultAuth = authConfig.defaultAuth || {};
-    var groupIds = authConfig.groupIds || [];
-    if (member.is_admin) return true;
-    if (defaultAuth.dataAuth) {
-      var arr = defaultAuth.dataAuth.map(function (item) {
-        return item.appId;
-      });
-      if (arr[0] === 0) return true;
-      if (arr.includes(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId)) return true;
-    }
-    for (var i = 0; i < groupInfoList.length - 1; i++) {
-      if (groupIds.includes(groupInfoList[i].id)) {
-        var dataAuth = groupInfoList[i].authConfig.dataAuth || [];
-        var _arr2 = dataAuth.map(function (item) {
-          return item.appId;
-        });
-        if (_arr2[0] === 0) return true;
-        if (_arr2.includes(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId)) return true;
-      }
-    }
-    return false;
-  };
+  // const checkAuth = (member: ICompanyMember) => {
+  //   let authConfig = member.authConfig || {};
+  //   let defaultAuth = authConfig.defaultAuth || {};
+  //   let groupIds = authConfig.groupIds || [];
+  //   if (member.is_admin) return true;
+  //   if (defaultAuth.dataAuth) {
+  //     let arr = defaultAuth.dataAuth.map((item) => {
+  //       return item.appId;
+  //     });
+  //     if (arr[0] === 0) return true;
+  //     if (arr.includes(currentApp?.appId as number)) return true;
+  //   }
+  //   for (let i = 0; i < groupInfoList.length - 1; i++) {
+  //     if (groupIds.includes(groupInfoList[i].id)) {
+  //       let dataAuth = groupInfoList[i].authConfig.dataAuth || [];
+  //       let arr = dataAuth.map((item) => {
+  //         return item.appId;
+  //       });
+  //       if (arr[0] === 0) return true;
+  //       if (arr.includes(currentApp?.appId as number)) return true;
+  //     }
+  //   }
+  //   return false;
+  // };
   // 组装用户组数据
   var getGroupName = function getGroupName(_ref) {
     var groupIds = _ref.groupIds;

package/es/modules/appSettings/member/modal.js

@@ -12,10 +12,11 @@ var SetingModal = function SetingModal(props) {
     companyAppList = props.companyAppList,
     leftMenus = props.leftMenus,
     dealArr = props.dealArr;
+  console.log(6666, data);
   return /*#__PURE__*/React.createElement(Modal, {
     className: "seting-modal-box",
     title: "\u6743\u9650\u4FE1\u606F",
-    visible: isModalOpen,
+    open: isModalOpen,
     onCancel: function onCancel() {
       return setIsModalOpen(false);
     }

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

@@ -8,10 +8,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import './index.less';
 import util from './../../../utils/util';
-import { Button, Form, Input, notification } from 'antd';
+import { Button, Form, Input, Radio, notification } from 'antd';
 import request from './../../../utils/ajax';
 import api from './../../../constants/api';
-import { BizTable, BizDialog, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
+import { BizTable, BizDialog, BizGlobalDataContext, ajax, IconFont } from '@zgfe/business-lib';
+import { AppVersion } from '../../../types';
 var reworkAppName = function reworkAppName(name) {
   return name.length > 15 ? "".concat(name.substring(0, 15), "...") : name;
 };
@@ -43,7 +44,9 @@ var appList = function appList(props) {
     createAppCallback = props.createAppCallback,
     closeCreateCallback = props.closeCreateCallback;
   var _useContext = useContext(BizGlobalDataContext),
-    system = _useContext.system;
+    system = _useContext.system,
+    currentUser = _useContext.currentUser,
+    authority = _useContext.authority;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     createdAppPanel = _useState2[0],
@@ -118,11 +121,11 @@ var appList = function appList(props) {
       // const data = res[1];
       return /*#__PURE__*/React.createElement("div", {
         className: "operating"
-      }, /*#__PURE__*/React.createElement("span", {
+      }, authority[10100] && /*#__PURE__*/React.createElement("span", {
         onClick: function onClick() {
           return toAppSetting(data);
         }
-      }, "\u5E94\u7528\u8BBE\u7F6E"), /*#__PURE__*/React.createElement("span", {
+      }, "\u5E94\u7528\u8BBE\u7F6E"), authority[10101] && /*#__PURE__*/React.createElement("span", {
         onClick: function onClick() {
           return showDelPanel(data);
         },
@@ -262,6 +265,7 @@ var appList = function appList(props) {
     });
   };
   var onCreateConfirm = function onCreateConfirm() {
+    var _formRef$current2;
     if (inDemoMode()) {
       return;
     }
@@ -283,7 +287,8 @@ var appList = function appList(props) {
       method: 'post',
       data: {
         appName: appNameVal,
-        companyId: companyId
+        companyId: companyId,
+        appVersion: (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFieldValue('appVersion')
       }
     }).then(function (res) {
       if (!res) return;
@@ -318,14 +323,16 @@ var appList = function appList(props) {
     className: "applist-head"
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
+    disabled: !authority[10099],
     onClick: function onClick() {
-      var _formRef$current2;
+      var _formRef$current3;
       setCreatedAppPanel(true);
-      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('appNameVal', '');
+      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('appNameVal', '');
     }
   }, "\u65B0\u5EFA\u5E94\u7528")), /*#__PURE__*/React.createElement(BizDialog, {
     title: "\u65B0\u5EFA\u5E94\u7528",
     open: createdAppPanel,
+    className: "app-list-create-app",
     closable: true,
     onOk: function onOk() {
       onCreateConfirm();
@@ -339,21 +346,36 @@ var appList = function appList(props) {
     className: "dialog-content"
   }, /*#__PURE__*/React.createElement(Form, {
     initialValues: {
-      appNameVal: ''
+      appNameVal: '',
+      appVersion: (currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion) === 0 ? AppVersion.common : currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion
     },
     ref: formRef,
     onValuesChange: function onValuesChange() {
-      var _formRef$current3;
-      setAppNameVal((_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldValue('appNameVal'));
+      var _formRef$current4;
+      setAppNameVal((_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.getFieldValue('appNameVal'));
     }
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: 'appNameVal'
+  }, (currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion) === 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement("div", {
+    className: "app-list-version-warning"
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "tishi1"
+  }), "\u7248\u672C\u9009\u62E9\u540E\u65E0\u6CD5\u66F4\u6539\uFF0C\u8BF7\u8C28\u614E\u9009\u62E9")), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "appVersion"
+  }, /*#__PURE__*/React.createElement(Radio.Group, {
+    className: "app-version"
+  }, /*#__PURE__*/React.createElement(Radio, {
+    value: AppVersion.common
+  }, "\u901A\u7528\u7248\u672C"), /*#__PURE__*/React.createElement(Radio, {
+    value: AppVersion.bank
+  }, "\u57CE\u5546\u884C\u573A\u666F\u7248\u672C")))), /*#__PURE__*/React.createElement(Form.Item, {
+    name: 'appNameVal',
+    className: "app-list-form-item"
   }, /*#__PURE__*/React.createElement(Input, {
     type: 'text',
     placeholder: '请输入应用名',
-    width: "100%",
-    size: "large"
-  }))), /*#__PURE__*/React.createElement("p", null, "\u65E0\u9700\u4E3A\u4E00\u4E2A\u4EA7\u54C1\u7684\u4E0D\u540C\u5E73\u53F0\u521B\u5EFA\u591A\u4E2A\u5E94\u7528\uFF0C\u63A8\u8350\u60A8\u4F7F\u7528\u4EA7\u54C1\u540D\u79F0"), /*#__PURE__*/React.createElement("p", null, "\u547D\u540D\u5E94\u7528\u540D, \u5982\u3010", zgText, "\u3011\u800C\u975E\u3010", zgText, " IOS\u7248\u3011"))), /*#__PURE__*/React.createElement(BizDialog, {
+    width: "100%"
+  }))), /*#__PURE__*/React.createElement("ul", {
+    className: "app-list-desc"
+  }, /*#__PURE__*/React.createElement("li", null, "\u65E0\u9700\u4E3A\u4E00\u4E2A\u4EA7\u54C1\u7684\u4E0D\u540C\u5E73\u53F0\u521B\u5EFA\u591A\u4E2A\u5E94\u7528"), /*#__PURE__*/React.createElement("li", null, "\u63A8\u8350\u60A8\u4F7F\u7528\u4EA7\u54C1\u540D\u79F0\u547D\u540D\u5E94\u7528\u540D, \u5982\u3010", zgText, "\u3011\u800C\u975E\u3010", zgText, " IOS\u7248\u3011")))), /*#__PURE__*/React.createElement(BizDialog, {
     title: "\u5220\u9664\u5E94\u7528",
     open: delPanelState,
     closable: true,

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

@@ -62,4 +62,39 @@
       color: #000;
     }
   }
+  .app-version .ant-radio-wrapper {
+    margin-right: 48px !important;
+  }
+  &-version-warning {
+    display: flex;
+    gap: 10px;
+    align-items: center;
+    height: 32px;
+    padding: 0 16px;
+    color: #021429;
+    background-color: #e6f7ff;
+    border: 1px solid #91d5ff;
+    border-radius: 2px;
+    .bsicon {
+      color: #1890ff;
+      font-size: 14px;
+    }
+  }
+  &-create-app .ant-modal-header {
+    padding-bottom: 0 !important;
+  }
+
+  &-form-item.ant-form-item {
+    margin-bottom: 16px !important;
+  }
+  &-desc {
+    li {
+      padding-left: 4px;
+      color: #9aa1a9;
+      &::before {
+        margin-right: 8px;
+        content: '•';
+      }
+    }
+  }
 }

package/es/modules/companySetting/demo.js

@@ -6,12 +6,13 @@ import util from '../../utils/util';
 import { CompanySetting } from '../..';
 export default (function () {
   return /*#__PURE__*/React.createElement(DemoWrapper, {
-    needMeta: true
+    defaultApp: 348
   }, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: {
       funPermissions: funPermissions,
       menusName: constants.menusName,
-      getMenuRouterByName: util.getMenuRouterByName
+      getMenuRouterByName: util.getMenuRouterByName,
+      authority: sessionStorage.getItem('authorityList') ? JSON.parse(sessionStorage.getItem('authorityList')) : {}
     }
   }, /*#__PURE__*/React.createElement(CompanySetting, {
     showWeChatMenu: true,

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

@@ -10,12 +10,12 @@ 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 './index.less';
 import util from './../../../utils/util';
 import { Button, Form, Input, Spin, TreeSelect, notification } from 'antd';
 import moment from 'moment';
-import { BizTable, BizDialog, BizSelect, IconFont } from '@zgfe/business-lib';
+import { BizTable, BizDialog, BizSelect, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
 import { addDept, deleteDept, getGroupMembers, queryDeptList, updateDept } from '../../../requests/department';
 var DepartmentList = function DepartmentList(props) {
   var _departmentList$, _departmentList$2;
@@ -37,6 +37,8 @@ var DepartmentList = function DepartmentList(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     loading = _useState8[0],
     setLoading = _useState8[1];
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
   // 初始数据
   var _useState9 = useState(''),
     _useState10 = _slicedToArray(_useState9, 2),
@@ -127,11 +129,11 @@ var DepartmentList = function DepartmentList(props) {
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", {
         className: "operating"
-      }, data.parentId !== 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
+      }, data.parentId !== 0 && /*#__PURE__*/React.createElement(React.Fragment, null, authority[10097] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return toAppSetting(data);
         }
-      }, "\u7F16\u8F91"), /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91"), authority[10098] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return showDelPanel(data);
         }
@@ -229,6 +231,7 @@ var DepartmentList = function DepartmentList(props) {
     className: "app-list-head"
   }, /*#__PURE__*/React.createElement("div", null, "\u90E8\u95E8\u5217\u8868", name), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
+    disabled: !authority[10096],
     onClick: function onClick() {
       setCreatedAppPanel(true);
       setFormParams({

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';
@@ -34,7 +34,9 @@ var CompanySetting = function CompanySetting(props) {
   var apisOkNum = 0;
   var _useContext = useContext(BizGlobalDataContext),
     envs = _useContext.envs,
-    getMenuRouterByName = _useContext.getMenuRouterByName;
+    getMenuRouterByName = _useContext.getMenuRouterByName,
+    currentApp = _useContext.currentApp,
+    authority = _useContext.authority;
   var _ref = envs || {},
     zgText = _ref.zgText,
     showVirtualApp = _ref.showVirtualApp,
@@ -75,9 +77,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],
@@ -108,7 +109,6 @@ var CompanySetting = function CompanySetting(props) {
     setServiceType = _useState30[1];
   var _useState31 = useState(0),
     _useState32 = _slicedToArray(_useState31, 2),
-    pageReady = _useState32[0],
     setPageReady = _useState32[1];
   var _useState33 = useState(false),
     _useState34 = _slicedToArray(_useState33, 2),
@@ -177,24 +177,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 () {
@@ -205,7 +208,7 @@ var CompanySetting = function CompanySetting(props) {
       request(api.app.queryLeftMenus, {
         method: 'get',
         params: {
-          appId: data.id
+          appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
         }
       }).then(function (res) {
         var menus = res && res.data || [];
@@ -233,46 +236,52 @@ var CompanySetting = function CompanySetting(props) {
         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');
@@ -282,15 +291,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();
         }
@@ -305,15 +312,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();
         }
@@ -337,21 +342,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);
   };
@@ -367,15 +375,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();
         }
@@ -390,12 +396,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();
         }
@@ -429,7 +433,7 @@ var CompanySetting = function CompanySetting(props) {
       companyName: companyName,
       changeCompanyNameCallback: changeCompanyNameCallback
     }),
-    hidden: false
+    hidden: !authority[10078]
   }, {
     key: 'user',
     label: '成员管理',
@@ -448,7 +452,7 @@ var CompanySetting = function CompanySetting(props) {
       isAdmin: isAdmin,
       serviceType: serviceType
     }),
-    hidden: false
+    hidden: !authority[10079]
   }, {
     key: 'userGroup',
     label: '角色管理',
@@ -467,7 +471,7 @@ var CompanySetting = function CompanySetting(props) {
     React.createElement(RoleList, {
       companyId: companyId
     }),
-    hidden: false
+    hidden: !authority[10080]
   }, {
     key: 'department',
     label: '部门管理',
@@ -475,7 +479,7 @@ var CompanySetting = function CompanySetting(props) {
       companyId: companyId,
       closeCreateCallback: closeCreateCallback
     }),
-    hidden: false
+    hidden: !authority[10081]
   }, {
     key: 'appList',
     label: '应用',
@@ -496,7 +500,7 @@ var CompanySetting = function CompanySetting(props) {
       gotoAppPanel: gotoAppPanel,
       closeCreateCallback: closeCreateCallback
     }),
-    hidden: false
+    hidden: !authority[10082]
   }, {
     key: 'virtualApp',
     label: '虚拟应用',
@@ -518,7 +522,7 @@ var CompanySetting = function CompanySetting(props) {
       companyAppList: companyAppList,
       companyId: companyId
     }),
-    hidden: false
+    hidden: !authority[10083]
   }, {
     key: 'weChatBinding',
     label: '微信账号绑定',
@@ -528,19 +532,20 @@ var CompanySetting = function CompanySetting(props) {
     key: 'operationLog',
     label: '操作日志',
     children: /*#__PURE__*/React.createElement(OperationLog, null),
-    hidden: !isAdmin
+    hidden: !isAdmin && !authority[10084]
   }];
   return /*#__PURE__*/React.createElement("div", {
     className: "setting setting-content company-setting"
-  }, pageReady >= 3 ? /*#__PURE__*/React.createElement(Tabs, {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "company-setting-title"
+  }, "\u516C\u53F8\u8BBE\u7F6E"), /*#__PURE__*/React.createElement(Tabs, {
+    className: "company-setting-tabs",
     destroyInactiveTabPane: true,
     activeKey: activeKey,
     onChange: changeTab,
     items: items.filter(function (item) {
       return item.hidden !== true;
     })
-  }) : /*#__PURE__*/React.createElement(PageLoading, {
-    "v-else": true
   }));
 };
 export default CompanySetting;

package/es/modules/companySetting/index.less

@@ -2,17 +2,33 @@
 @import './style/common.less';
 
 .ant-card-body {
-  padding: 16px;
-  background-color: #fafafb;
+  padding: 0;
 }
 
 .company-setting {
-  background: #fff;
   border: 1px solid var(--unnamed, #ecedf0);
   border-radius: 8px;
+
+  .company-setting-title {
+    display: flex;
+    flex-shrink: 0;
+    gap: 10px;
+    align-items: center;
+    width: 100%;
+    height: 48px;
+    padding: 0px 24px;
+    background: #fff;
+  }
+
+  .company-setting-tabs {
+    margin: 16px 24px 24px;
+    background: #fff !important;
+  }
+
   .hidden-tab {
     display: none;
   }
+
   .ant-tabs-nav-wrap {
     margin: 0 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/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/role/index.js

@@ -10,12 +10,12 @@ 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 './index.less';
 import util from './../../../utils/util';
 import { Button, Drawer, Form, Input, Radio, Spin, Table, Tooltip, Tree, notification } from 'antd';
 import moment from 'moment';
-import { BizDialog, BizSelect, IconFont } from '@zgfe/business-lib';
+import { BizDialog, BizSelect, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
 import { addRole, queryRoleDataConfig, queryRoleDetails, queryRoleMenuTree, queryRolePage, queryRoleUser, updateRole, deleteRole } from '../../../requests/role';
 var RoleList = function RoleList(props) {
   // 弹窗
@@ -46,6 +46,8 @@ var RoleList = function RoleList(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     pageData = _useState12[0],
     setPageData = _useState12[1];
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
   // 初始数据
   var _useState13 = useState(''),
     _useState14 = _slicedToArray(_useState13, 2),
@@ -145,7 +147,7 @@ var RoleList = function RoleList(props) {
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", {
         className: "operating"
-      }, data.parentId !== 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
+      }, data.parentId !== 0 && /*#__PURE__*/React.createElement(React.Fragment, null, authority[10094] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           setRoleId(data === null || data === void 0 ? void 0 : data.roleId);
           queryRoleDetailsList({
@@ -154,7 +156,7 @@ var RoleList = function RoleList(props) {
           queryRoleUserList(data === null || data === void 0 ? void 0 : data.roleId);
           queryRoleDataConfigList(data === null || data === void 0 ? void 0 : data.roleId);
         }
-      }, "\u7F16\u8F91"), /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91"), authority[10095] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           setRoleId(data === null || data === void 0 ? void 0 : data.roleId);
           setDelPanelState(true);
@@ -360,6 +362,7 @@ var RoleList = function RoleList(props) {
     className: "app-list-head"
   }, /*#__PURE__*/React.createElement("div", null, "\u89D2\u8272\u5217\u8868"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
+    disabled: !authority[10093],
     onClick: function onClick() {
       setCreatedAppPanel(true);
       setRoleId(null);

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

@@ -10,13 +10,13 @@ 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 './index.less';
 import { Button, notification, Switch, Tooltip } from 'antd';
 import request from './../../../utils/ajax';
 import api from './../../../constants/api';
 import Invite from './invite';
-import { BizTable, BizDialog, BizSelect } from '@zgfe/business-lib';
+import { BizTable, BizDialog, BizSelect, BizGlobalDataContext } from '@zgfe/business-lib';
 import moment from 'moment';
 import apis from './../../../constants/api';
 var splitString = function splitString(str) {
@@ -26,6 +26,7 @@ var splitString = function splitString(str) {
 var User = function User(props) {
   var id = props.id,
     allGroupInfos = props.allGroupInfos,
+    isAdmin = props.isAdmin,
     removeUserCallback = props.removeUserCallback,
     _createMembersCallback = props.createMembersCallback,
     changeAdminCallback = props.changeAdminCallback;
@@ -33,12 +34,15 @@ var User = function User(props) {
     _useState2 = _slicedToArray(_useState, 1),
     allMembers = _useState2[0];
   var _useState3 = useState([]),
-    _useState4 = _slicedToArray(_useState3, 1),
-    adminOptionList = _useState4[0];
+    _useState4 = _slicedToArray(_useState3, 2),
+    adminOptionList = _useState4[0],
+    setAdminOptionList = _useState4[1];
   var _useState5 = useState({}),
     _useState6 = _slicedToArray(_useState5, 2),
     adminOptionValue = _useState6[0],
     setAdminOptionValue = _useState6[1];
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
   var _useState7 = useState(''),
     _useState8 = _slicedToArray(_useState7, 1),
     filter = _useState8[0];
@@ -84,12 +88,6 @@ var User = function User(props) {
     _useState28 = _slicedToArray(_useState27, 2),
     showMembers = _useState28[0],
     setShowMembers = _useState28[1];
-  // useEffect(() => {
-  // let groupHashList = {}
-  // for (let item of allGroupInfos) {
-  //   groupHashList[item.id] = { groupName: item.groupName }
-  // }
-  // }, [allGroupInfos]);
   useEffect(function () {
     getMenbers();
   }, []);
@@ -101,11 +99,14 @@ var User = function User(props) {
         pageSize: 10
       })
     }).then(function (res) {
+      var _res$data2;
       if (res && res.code === '101000' && res.data) {
         var _res$data;
         setShowMembers(res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list);
       }
-      //  ????
+      setAdminOptionList(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list.filter(function (item) {
+        return item.id !== id;
+      }));
     }).catch(function (err) {
       console.log(err);
     });
@@ -292,7 +293,7 @@ var User = function User(props) {
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
         title: data.username || data.email
-      }, splitString(data.username || data.email || ''), data.id === id ? /*#__PURE__*/React.createElement("span", null, "\uFF08\u6211\uFF09") : null, data.is_admin ? /*#__PURE__*/React.createElement("span", {
+      }, splitString(data.username || data.email || ''), data.id === id ? /*#__PURE__*/React.createElement("span", null, "\uFF08\u6211\uFF09") : null), /*#__PURE__*/React.createElement("div", null, data.isAdmin ? /*#__PURE__*/React.createElement("span", {
         className: "super-admin"
       }, "\u8D85\u7EA7\u7BA1\u7406\u5458") : null));
     }
@@ -347,6 +348,7 @@ var User = function User(props) {
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Switch, {
         size: "default",
+        disabled: !authority[10089],
         checked: data.accountStatus === 1 ? true : false,
         onChange: function onChange(checked) {
           return onSwitchChange(checked, data);
@@ -364,21 +366,21 @@ var User = function User(props) {
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", {
         className: "operate"
-      }, /*#__PURE__*/React.createElement("a", {
+      }, authority[10090] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return showUserEditAuthEvent(data);
         }
-      }, "\u7F16\u8F91"), /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91"), authority[10091] && /*#__PURE__*/React.createElement("a", {
         title: "\u79FB\u51FA\u516C\u53F8",
         style: {
-          visibility: data.id !== id && !data.is_admin ? 'visible' : 'hidden'
+          visibility: data.id !== id && !data.isAdmin ? 'visible' : 'hidden'
         },
         onClick: function onClick() {
           return removeUser(data);
         }
-      }, "\u5220\u9664"), /*#__PURE__*/React.createElement("a", {
+      }, "\u5220\u9664"), authority[10092] && /*#__PURE__*/React.createElement("a", {
         style: {
-          visibility: data.id !== id && !data.is_admin ? 'visible' : 'hidden'
+          visibility: data.id !== id && !data.isAdmin ? 'visible' : 'hidden'
         },
         onClick: function onClick() {
           return resetpwd(data);
@@ -407,7 +409,7 @@ var User = function User(props) {
       x: 1000,
       y: 550
     }
-  }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", null, isAdmin ? /*#__PURE__*/React.createElement("div", {
     style: {
       top: !showMembers.length ? 6 : -34
     },
@@ -419,7 +421,7 @@ var User = function User(props) {
     labelField: "email",
     keyField: "id",
     onChange: changeAdmin
-  })))), /*#__PURE__*/React.createElement(BizDialog, {
+  })) : null)), /*#__PURE__*/React.createElement(BizDialog, {
     title: dialogTitle,
     open: showDialog,
     closable: true,

package/es/modules/companySetting/user/invite.js

@@ -10,12 +10,12 @@ 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 './index.less';
 import { Button, Form, Input, notification, Radio, Select, TreeSelect } from 'antd';
 import request from './../../../utils/ajax';
 import apis from './../../../constants/api';
-import { BizDialog, BizSelect } from '@zgfe/business-lib';
+import { BizDialog, BizSelect, BizGlobalDataContext } from '@zgfe/business-lib';
 // import companySettingUserGroup from '../edit/userGroup'
 // import groupItem from './groupItem.vue'
 var UserGroup = function UserGroup(props) {
@@ -24,6 +24,8 @@ var UserGroup = function UserGroup(props) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     queryParams = _useState2[0],
@@ -192,6 +194,7 @@ var UserGroup = function UserGroup(props) {
       setCreatedAppPanel(true);
       form.resetFields();
     },
+    disabled: !authority[10088],
     type: "primary",
     size: "middle"
   }, "\u6DFB\u52A0\u6210\u5458")), /*#__PURE__*/React.createElement(BizDialog, {
@@ -284,7 +287,7 @@ var UserGroup = function UserGroup(props) {
       required: true,
       message: '请输入密码'
     }]
-  }, /*#__PURE__*/React.createElement(Input, {
+  }, /*#__PURE__*/React.createElement(Input.Password, {
     maxLength: 50,
     placeholder: '请输入密码'
   }))))));

package/es/modules/companySetting/userGroup/authConfigDetail.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import './style/authConfigDetail.less';
 import { AppListItem, Config, LeftMenusItem } from '../../../types';
+import { UserInfo } from '@zgfe/business-lib/es/context';
 declare const authConfigDetail: React.FC<{
     name?: string;
     authConfig: Config;
@@ -9,6 +10,6 @@ declare const authConfigDetail: React.FC<{
     id?: number;
     groupId?: number;
     type: number;
-    serviceType?: number;
+    serviceType: UserInfo['serviceType'];
 }>;
 export default authConfigDetail;

package/es/modules/systemSetting/demo.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: () => React.JSX.Element;
+export default _default;

package/es/modules/systemSetting/demo.js

@@ -0,0 +1,10 @@
+import { DemoWrapper } from '@zgfe/business-lib';
+import React from 'react';
+import { SystemSetting } from '../..';
+export default (function () {
+  return /*#__PURE__*/React.createElement(DemoWrapper, {
+    defaultApp: 348
+  }, /*#__PURE__*/React.createElement(SystemSetting, {
+    appList: []
+  }));
+});

package/es/modules/systemSetting/notice/configItem/index.js

@@ -1,7 +1,8 @@
 import { Button, Col, Descriptions, Row } from 'antd';
 import { EditOutlined } from '@ant-design/icons';
-import React from 'react';
+import React, { useContext } from 'react';
 import './index.less';
+import { BizGlobalDataContext } from '@zgfe/business-lib';
 var ConfigItem = function ConfigItem(_ref) {
   var _configFieldMap$get;
   var onEdit = _ref.onEdit,
@@ -19,6 +20,8 @@ var ConfigItem = function ConfigItem(_ref) {
     name: 'fromName',
     value: '发件人昵称'
   }]);
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Row, {
     className: "item-title"
   }, /*#__PURE__*/React.createElement(Col, {
@@ -29,6 +32,7 @@ var ConfigItem = function ConfigItem(_ref) {
     className: "title-right"
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
+    disabled: !authority[10085],
     onClick: function onClick() {
       return onEdit(item);
     }

package/es/types/app.d.ts

@@ -121,3 +121,13 @@ export interface IConfigData {
 export interface IEditVirtualSourceRes<T> extends InterfaceApiResult<T> {
     code: string;
 }
+export declare enum AppVersion {
+    /**
+     * 通用版本: 1
+     */
+    common = 1,
+    /**
+     * 城商行版本: 2
+     */
+    bank = 2
+}

package/es/types/app.js

@@ -1 +1,11 @@
-export {};
+export var AppVersion;
+(function (AppVersion) {
+  /**
+   * 通用版本: 1
+   */
+  AppVersion[AppVersion["common"] = 1] = "common";
+  /**
+   * 城商行版本: 2
+   */
+  AppVersion[AppVersion["bank"] = 2] = "bank";
+})(AppVersion || (AppVersion = {}));

package/es/types/companySetting.d.ts

@@ -155,7 +155,7 @@ export interface AllMembersItem {
     accountStatus?: number;
     label?: string;
     inv_status?: number;
-    is_admin?: boolean;
+    isAdmin?: boolean;
     authConfig?: AuthConfig;
     groupName?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.10-role1",
+  "version": "1.2.10-role3",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -38,7 +38,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "^1.1.79",
+    "@zgfe/business-lib": "1.1.87-auth.11",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
@@ -51,8 +51,8 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "d127061e8cc66a75df36c0027302e8c839c6ea7d",
+  "gitHead": "2e06635975cd56d952aba66b69cfc1e060d5a988",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }
-}
+}