@zgfe/modules-settings 1.2.11 → 1.2.13

package/es/components/settingTabs/index.less

@@ -3,11 +3,14 @@
 .settings-container {
   padding: 24px;
   background: #f0f2f5;
+
   .tab-header {
     font-size: 18px;
+
     .tab-header-title {
       margin-left: 8px;
     }
+
     .app-name {
       font-weight: normal;
       font-size: 14px;

package/es/constants/api.d.ts

@@ -47,7 +47,7 @@ declare let apis: {
         queryRoleDetails: string;
         queryRoleDataConfig: string;
         queryRoleMenuTree: string;
-        queryRoleUser: string;
+        queryCompanyUser: string;
         addRole: string;
         updateRole: string;
         deleteRole: string;
@@ -56,6 +56,7 @@ declare let apis: {
         queryDeptListByUserId: string;
         queryCompanyUserDetailsParam: string;
         addCompanyUser: string;
+        getPasswordRule: string;
         updateCompanyUser: string;
         delCompanyUser: string;
         updateCompanyUserStatus: string;

package/es/constants/api.js

@@ -55,7 +55,7 @@ var apis = {
     queryRoleDetails: '/zg/web/v2/company/setting/queryRoleDetails',
     queryRoleDataConfig: '/zg/web/v2/company/setting/queryRoleDataConfig',
     queryRoleMenuTree: '/zg/web/v2/company/setting/queryRoleMenuTree',
-    queryRoleUser: '/zg/web/v2/company/setting/queryRoleUser',
+    queryCompanyUser: '/zg/web/v2/company/setting/queryCompanyUser',
     addRole: '/zg/web/v2/company/setting/addRole',
     updateRole: '/zg/web/v2/company/setting/updateRole',
     deleteRole: '/zg/web/v2/company/setting/deleteRole',
@@ -65,6 +65,7 @@ var apis = {
     queryDeptListByUserId: '/zg/web/v2/company/setting/queryDeptListByUserId',
     queryCompanyUserDetailsParam: '/zg/web/v2/company/setting/queryCompanyUserDetailsParam',
     addCompanyUser: '/zg/web/v2/company/setting/addCompanyUser',
+    getPasswordRule: '/zg/web/v2/system/getPasswordRule',
     updateCompanyUser: '/zg/web/v2/company/setting/updateCompanyUser',
     delCompanyUser: '/zg/web/v2/company/setting/delCompanyUser',
     updateCompanyUserStatus: '/zg/web/v2/company/setting/updateCompanyUserStatus' // 修改状态

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/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import AppInfo from './appInfo';
-import AppMember from './member';
+// import AppMember from './member';
 import AppSecretKey from './secretKey';
 import AppDataAccessFilter from './dataAccessFilter';
 import { SettingOutlined } from '@ant-design/icons';
@@ -25,11 +25,9 @@ var PersonalSetting = function PersonalSetting(_ref) {
     content: /*#__PURE__*/React.createElement(AppInfo, {
       settingsCallback: settingsCallback
     })
-  }, {
-    key: '2',
-    label: '应用成员',
-    content: /*#__PURE__*/React.createElement(AppMember, null)
-  }, {
+  },
+  // { key: '2', label: '应用成员', content: <AppMember /> },
+  {
     key: '3',
     label: '配置数据源',
     content: /*#__PURE__*/React.createElement(AppVirtualSource, null),
@@ -46,7 +44,8 @@ var PersonalSetting = function PersonalSetting(_ref) {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SettingTabs, {
     typeName: "app",
     title: title,
-    items: items
+    items: items,
+    currentKey: '1'
   }));
 };
 export default PersonalSetting;

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

@@ -4,46 +4,39 @@ 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, useContext } from 'react';
+import React, { useEffect } from 'react';
 import { Table, Popover } from 'antd';
-import { BizGlobalDataContext } from '@zgfe/business-lib';
+// import { BizGlobalDataContext } from '@zgfe/business-lib';
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
 import { useState } from 'react';
 import { EyeOutlined } from '@ant-design/icons';
 import SetingModal from './modal';
 var AppMember = function AppMember() {
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp,
-    getMenuRouterByName = _useContext.getMenuRouterByName;
+  // const { currentApp, getMenuRouterByName } = useContext(BizGlobalDataContext);
   var _useState = useState([]),
     _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([]),
+    _useState8 = _slicedToArray(_useState7, 1),
+    leftMenus = _useState8[0];
+  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 +91,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'
@@ -128,50 +119,52 @@ var AppMember = function AppMember() {
       setCompanyAppList((res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.appList) || []);
     });
     // 请求左侧菜单
-    request(apis.app.queryLeftMenus, {
-      method: 'get',
-      params: {
-        appId: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) || 0
-      }
-    }).then(function (res) {
-      var menus = (res === null || res === void 0 ? void 0 : res.data) || [];
-      var formatMenus = function formatMenus(menus) {
-        menus.forEach(function (item) {
-          item.routeName = getMenuRouterByName(item.name);
-          if (item.childrens) {
-            formatMenus(item.childrens);
-          }
-        });
-      };
-      formatMenus(menus);
-      setLeftMenus(menus);
-    }).catch(function (err) {});
+    // request<void>(apis.app.queryLeftMenus, {
+    //   method: 'get',
+    //   params: {
+    //     appId: currentApp?.appId,
+    //   },
+    // })
+    //   .then((res: ILeftMenusRes<void> | null) => {
+    //     let menus = res?.data || [];
+    //     let formatMenus = (menus: LeftMenusItem[]) => {
+    //       menus.forEach((item: LeftMenusItem) => {
+    //         item.routeName = getMenuRouterByName!(item.name);
+    //         if (item.childrens) {
+    //           formatMenus(item.childrens);
+    //         }
+    //       });
+    //     };
+    //     formatMenus(menus);
+    //     setLeftMenus(menus);
+    //   })
+    //   .catch((err: IResError) => {});
   }, []);
   // 鉴权
-  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/index.less

@@ -3,13 +3,16 @@
     padding: 24px 24px 8px 24px !important;
     font-size: 24px;
   }
+
   .ant-modal-body {
     height: 60vh;
-    padding: 0px 24px !important;
+    padding: 0 8px !important;
   }
+
   .ant-modal-footer {
     display: none;
   }
+
   .ant-modal-close-x {
     margin: 10px 10px 0 0;
     color: #242541;

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

@@ -15,7 +15,7 @@ var SetingModal = function SetingModal(props) {
   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

@@ -31,7 +31,6 @@ var appList = function appList(props) {
   var dataAuth = props.dataAuth,
     isAdmin = props.isAdmin,
     isDemoAccount = props.isDemoAccount,
-    authConfig = props.authConfig,
     id = props.id,
     allGroupInfos = props.allGroupInfos,
     isShowCreateApp = props.isShowCreateApp,
@@ -45,7 +44,8 @@ var appList = function appList(props) {
     closeCreateCallback = props.closeCreateCallback;
   var _useContext = useContext(BizGlobalDataContext),
     system = _useContext.system,
-    currentUser = _useContext.currentUser;
+    currentUser = _useContext.currentUser,
+    authority = _useContext.authority;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     createdAppPanel = _useState2[0],
@@ -120,11 +120,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);
         },
@@ -224,20 +224,21 @@ var appList = function appList(props) {
         app_id: delAppId
       }
     }).then(function (res) {
+      console.log(77777, res);
       if ((res === null || res === void 0 ? void 0 : res.flag) === 101) {
         notification.success({
           message: '删除成功'
         });
-        var cloneAuthConfig = util.clone(authConfig);
-        if (!(cloneAuthConfig.dataAuth.length === 1 && cloneAuthConfig.dataAuth[0].appId === 0)) {
-          var index = cloneAuthConfig.dataAuth.findIndex(function (item) {
-            return item.appId === delAppId;
-          });
-          cloneAuthConfig.dataAuth.splice(index, 1);
-        }
+        // let cloneAuthConfig = util.clone(authConfig);
+        // if (!(cloneAuthConfig.dataAuth.length === 1 && cloneAuthConfig.dataAuth[0].appId === 0)) {
+        //   let index = cloneAuthConfig.dataAuth.findIndex(
+        //     (item: DataAuthItem) => item.appId === delAppId,
+        //   );
+        //   cloneAuthConfig.dataAuth.splice(index, 1);
+        // }
         var formData = {
           userId: id,
-          authConfig: JSON.stringify(cloneAuthConfig),
+          authConfig: '',
           groupIds: findGroups().join(',')
         };
         var hasAuthApplistByDel = companyRealAppList.filter(function (item) {
@@ -292,14 +293,14 @@ var appList = function appList(props) {
     }).then(function (res) {
       if (!res) return;
       setCreatedAppPanel(false);
-      var cloneAuthConfig = util.clone(authConfig);
-      cloneAuthConfig.dataAuth.unshift({
-        appId: res.data.appInfo.id,
-        plats: [0]
-      });
+      // let cloneAuthConfig = util.clone(authConfig);
+      // cloneAuthConfig.dataAuth.unshift({
+      //   appId: res.data!.appInfo.id,
+      //   plats: [0],
+      // });
       var formData = {
         userId: id,
-        authConfig: JSON.stringify(cloneAuthConfig),
+        authConfig: '',
         groupIds: findGroups().join(',')
       };
       // 通知数据刷新
@@ -322,6 +323,7 @@ var appList = function appList(props) {
     className: "applist-head"
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
+    disabled: !authority[10099],
     onClick: function onClick() {
       var _formRef$current3;
       setCreatedAppPanel(true);
@@ -329,8 +331,8 @@ var appList = function appList(props) {
     }
   }, "\u65B0\u5EFA\u5E94\u7528")), /*#__PURE__*/React.createElement(BizDialog, {
     title: "\u65B0\u5EFA\u5E94\u7528",
-    visible: createdAppPanel,
-    className: "app-list-create-app",
+    open: createdAppPanel,
+    className: "app-list-create-app setting-bizDialog",
     closable: true,
     onOk: function onOk() {
       onCreateConfirm();
@@ -377,6 +379,7 @@ var appList = function appList(props) {
     title: "\u5220\u9664\u5E94\u7528",
     open: delPanelState,
     closable: true,
+    className: "setting-bizDialog",
     onOk: function onOk() {
       setDelPanelState(false);
       onDelConfirm();

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

@@ -1,27 +1,34 @@
 @import './../../../constants/icons/iconfont.css';
+
 .app-list {
   height: 100%;
+  margin-top: 8px;
   padding: 0;
   overflow: auto;
+
   .applist-head {
     .c-button {
       margin-right: 20px;
     }
   }
+
   .app-list-content {
     margin-top: 20px;
   }
+
   .platform-icons {
     display: flex;
     align-items: center;
     justify-content: flex-start;
     width: 100%;
+
     span {
       margin-right: 10px;
       color: #cfcfcf;
       font-size: 16px;
     }
   }
+
   .app-list-content {
     .c-grid-cell,
     .c-grid-header-cell {
@@ -29,42 +36,53 @@
       border: none;
       border-bottom: 1px solid #d1d1d1;
     }
+
     .c-grid-cell {
       text-align: left !important;
     }
+
     .c-grid-body .c-grid-row:nth-child(2n) {
       background: #fff !important;
     }
+
     .app-name {
       cursor: pointer;
+
       &:hover {
         color: #00a0ea;
       }
     }
+
     .operating {
       span {
         color: #00a0ea;
         cursor: pointer;
       }
+
       span.icon-delete {
         margin-left: 10px;
         color: #cfcfcf;
+
         &:hover {
           color: #00a0ea;
         }
       }
     }
   }
+
   .dialog-content {
     color: #858585;
+
     .c-input {
       margin-bottom: 20px;
       color: #000;
     }
   }
+
   .app-version .ant-radio-wrapper {
     margin-right: 48px !important;
   }
+
   &-version-warning {
     display: flex;
     gap: 10px;
@@ -75,11 +93,13 @@
     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;
   }
@@ -87,10 +107,12 @@
   &-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/cost/index.less

@@ -1,29 +1,36 @@
 @import './../../../constants/icons/iconfont.css';
+
 .company-setting-cost {
   min-height: 400px;
   max-height: 100%;
+  margin-top: 8px;
   padding: 0;
   overflow: auto;
+
   h5 {
     font-weight: normal;
     font-size: 14px;
   }
+
   table {
     width: 100%;
     margin: 15px 0 40px 0;
     border-collapse: collapse;
+
     thead {
       color: #636363;
       font-weight: bold;
       font-size: 14px;
       background: #fbfbfb;
     }
+
     td,
     th {
       padding: 10px 15px;
       text-align: center;
       border: 1px solid #cecece;
     }
+
     td {
       height: 50px;
     }

package/es/modules/companySetting/demo.js

@@ -6,16 +6,15 @@ 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,
-    showMarketMenu: true,
     action: ''
   })));
 });