@zgfe/modules-settings 1.0.1-a.9 → 1.1.0

package/{dist/esm → es}/modules/companySetting/edit/user.js

@@ -11,14 +11,13 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React, { useContext, useEffect, useRef, useState } from 'react';
-import "./styles/user.less";
+import './styles/user.less';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
-import { Button, Input, notification, Tabs, Select } from 'antd';
-import request from "./../../../utils/ajax";
-import AuthConfig from "./authConfig";
-import AuthConfigCEP from "./authConfigCEP";
-import apis from "./../../../constants/api";
-var TextArea = Input.TextArea;
+import { Button, notification, Tabs, Select } from 'antd';
+import request from './../../../utils/ajax';
+import AuthConfig from './authConfig';
+import AuthConfigCEP from './authConfigCEP';
+import apis from './../../../constants/api';
 var Info = function Info(props) {
   var ENVIRONMENT = props.ENVIRONMENT,
     data = props.data,
@@ -31,7 +30,7 @@ var Info = function Info(props) {
     changeUserAuthCallback = props.changeUserAuthCallback;
   var dealAllGroupInfos = allGroupInfos.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
-      value: item.id,
+      value: item.id + '',
       label: item.groupName
     });
   });
@@ -39,11 +38,12 @@ var Info = function Info(props) {
     currentApp = _useContext.currentApp,
     currentUser = _useContext.currentUser,
     isDemo = _useContext.isDemo;
+  // SelectProps<string, { value: number; label: string; }>
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     groups = _useState2[0],
     setGroups = _useState2[1];
-  var _useState3 = useState([]),
+  var _useState3 = useState([[], [], {}]),
     _useState4 = _slicedToArray(_useState3, 2),
     CEPData = _useState4[0],
     setCEPData = _useState4[1];
@@ -58,41 +58,45 @@ var Info = function Info(props) {
   var refAuthConfig = useRef();
   var refAuthCEPConfig = useRef();
   useEffect(function () {
-    Promise.all([request(apis.setting.queryFunConfigList, {
-      method: 'post'
-    }).then(function (res) {
-      if (res && res.code === 200) {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    }), request(apis.setting.queryAppList, {
-      method: 'post'
-    }).then(function (res) {
-      if (res && res.code === 200) {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    }), request(apis.setting.queryFunConfigByUserId, {
-      method: 'post',
-      data: {
-        userId: data.id,
-        type: 1
-      }
-    }).then(function (res) {
-      if (res && res.code === 200) {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    })]).then(function (posts) {
-      setCEPData(posts || []);
-    }).catch(function () {
-      notification.error({
-        message: '接口返回错误'
+    if (serviceType !== 1) {
+      Promise.all([request(apis.setting.queryFunConfigList, {
+        method: 'post'
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      }), request(apis.setting.queryAppList, {
+        method: 'post'
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      }), request(apis.setting.queryFunConfigByUserId, {
+        method: 'post',
+        data: {
+          userId: data.id,
+          type: 1
+        }
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      })]).then(function (posts) {
+        setCEPData([posts[0] || [], posts[1] || [], posts[2] || {}]);
+      }).catch(function () {
+        notification.error({
+          message: '接口返回错误'
+        });
       });
-    });
+    }
   }, []);
   useEffect(function () {
-    var authConfig = data.authConfig || {};
+    var authConfig = data.authConfig || {
+      groupIds: []
+    };
     var groupIds = authConfig.groupIds || [];
     setGroups(dealAllGroupInfos.filter(function (item) {
       return groupIds.includes(item.id);
@@ -157,17 +161,23 @@ var Info = function Info(props) {
       method: 'post',
       params: formData
     }).then(function (res) {
-      changeUserAuthCallback && changeUserAuthCallback(data && data.id);
-      if (ENVIRONMENT == 'saas' && res.flag == -10003) {
+      if (ENVIRONMENT == 'saas' && (res === null || res === void 0 ? void 0 : res.flag) == -10003) {
         notification.error({
           message: '该用户未接受邀请，暂时无法操作'
         });
       }
-      notification.success({
-        message: '保存成功'
-      });
+      if ((res === null || res === void 0 ? void 0 : res.flag) == 101) {
+        changeUserAuthCallback && changeUserAuthCallback(data.id);
+        notification.success({
+          message: '保存成功'
+        });
+        onCancel();
+      } else {
+        notification.error({
+          message: '权限修改失败'
+        });
+      }
       setBtnLoading(false);
-      onCancel();
     }).catch(function (error) {
       console.log(error);
       setBtnLoading(false);
@@ -195,7 +205,7 @@ var Info = function Info(props) {
         method: 'post',
         data: _formData
       }).then(function () {
-        changeUserAuthCallback && changeUserAuthCallback(data && data.id);
+        changeUserAuthCallback && changeUserAuthCallback(data.id);
         notification.success({
           message: '保存成功'
         });
@@ -265,7 +275,7 @@ var Info = function Info(props) {
     key: "io"
   }, /*#__PURE__*/React.createElement(AuthConfig, {
     ref: refAuthConfig,
-    config: data.authConfig.defaultAuth,
+    config: data.authConfig ? data.authConfig.defaultAuth : {},
     appList: companyAppList,
     isMarsUi: isMarsUi,
     leftMenus: leftMenus
@@ -275,10 +285,7 @@ var Info = function Info(props) {
   }, /*#__PURE__*/React.createElement(AuthConfigCEP, {
     ref: refAuthCEPConfig,
     CEPData: CEPData,
-    config: data.authConfig.defaultAuth,
-    appList: companyAppList,
-    isMarsUi: isMarsUi,
-    leftMenus: leftMenus
+    isMarsUi: isMarsUi
   })) : null), /*#__PURE__*/React.createElement("div", {
     className: "company-setting-footer"
   }, /*#__PURE__*/React.createElement(Button, {

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

@@ -0,0 +1,16 @@
+import React from 'react';
+import './styles/userGroup.less';
+import { AllGroupInfosItem, AppListItem, LeftMenusItem } from '../../../types';
+declare const CompanySettingUserGroup: React.FC<{
+    id: number;
+    data: AllGroupInfosItem | undefined;
+    allGroupInfos: Array<AllGroupInfosItem>;
+    companyAppList: AppListItem[];
+    isMarsUi: boolean;
+    leftMenus: LeftMenusItem[];
+    isAdmin: boolean;
+    serviceType: number;
+    onCancel: () => void;
+    updateGroupAuthCallback: (isUser: boolean) => void;
+}>;
+export default CompanySettingUserGroup;

package/{dist/esm → es}/modules/companySetting/edit/userGroup.js

@@ -10,16 +10,15 @@ 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, { useContext, useEffect, useRef, useState } from 'react';
-import "./styles/userGroup.less";
-import { BizGlobalDataContext } from '@zgfe/business-lib';
-import constants from "./../../../utils/constants";
+import React, { useEffect, useRef, useState } from 'react';
+import './styles/userGroup.less';
+import constants from './../../../utils/constants';
 import { Button, Input, notification, Tabs, Radio, Select } from 'antd';
-import request from "./../../../utils/ajax";
-import AuthConfig from "./authConfig";
-import AuthConfigCEP from "./authConfigCEP";
-import apis from "./../../../constants/api";
-var TextArea = Input.TextArea;
+import request from './../../../utils/ajax';
+import AuthConfig from './authConfig';
+import AuthConfigCEP from './authConfigCEP';
+import apis from './../../../constants/api';
+// interface UserItem {id: number; value: number; label: string}
 var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
   var id = props.id,
     data = props.data,
@@ -31,10 +30,6 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     serviceType = props.serviceType,
     onCancel = props.onCancel,
     updateGroupAuthCallback = props.updateGroupAuthCallback;
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp,
-    currentUser = _useContext.currentUser,
-    isDemo = _useContext.isDemo;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     name = _useState2[0],
@@ -55,7 +50,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     allMembers = _useState10[0],
     setAllMembers = _useState10[1];
-  var _useState11 = useState([]),
+  var _useState11 = useState([[], [], {}]),
     _useState12 = _slicedToArray(_useState11, 2),
     CEPData = _useState12[0],
     setCEPData = _useState12[1];
@@ -70,66 +65,68 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
   var refAuthConfig = useRef();
   var refAuthCEPConfig = useRef();
   useEffect(function () {
-    Promise.all([request(apis.setting.queryFunConfigList, {
-      method: 'post'
-    }).then(function (res) {
-      if (res && res.code === 200) {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    }), request(apis.setting.queryAppList, {
-      method: 'post'
-    }).then(function (res) {
-      if (res && res.code === 200) {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    }), data.id && request(apis.setting.queryFunConfigByUserId, {
-      method: 'post',
-      data: {
-        groupId: data.id,
-        type: 2
-      }
-    }).then(function (res) {
-      if (res && res.code === 200) {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    })]).then(function (posts) {
-      setCEPData(posts || []);
-    }).catch(function () {
-      notification.error({
-        message: '接口返回错误'
+    if (serviceType !== 1) {
+      Promise.all([request(apis.setting.queryFunConfigList, {
+        method: 'post'
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      }), request(apis.setting.queryAppList, {
+        method: 'post'
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      }), data && data.id && request(apis.setting.queryFunConfigByUserId, {
+        method: 'post',
+        data: {
+          groupId: data.id,
+          type: 2
+        }
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      })]).then(function (posts) {
+        setCEPData([posts[0] || [], posts[1] || [], posts[2] || {}]);
+      }).catch(function () {
+        notification.error({
+          message: '接口返回错误'
+        });
       });
-    });
+    }
   }, []);
   useEffect(function () {
-    setName(data.groupName || '');
+    setName(data && data.groupName || '');
     var result = [];
     if (data && data.members) {
       data.members.forEach(function (item) {
         result.push({
           id: item.userId,
-          value: item.userId,
+          value: item.userId + '',
           label: item.username || item.email
         });
       });
     }
     setUser(result);
     setOldUser(result);
-    setIsEncryption(data.isEncryption || 0);
+    setIsEncryption(data && data.isEncryption || 0);
   }, [props.data]);
   useEffect(function () {
-    setName(data.groupName || '');
+    setName(data && data.groupName || '');
   }, [props.allGroupInfos]);
   useEffect(function () {
     request(apis.setting.getGroupMembers, {
       method: 'get'
     }).then(function (res) {
-      if (res.flag === 101) {
-        setAllMembers(res.company_members.map(function (item) {
+      if ((res === null || res === void 0 ? void 0 : res.flag) === 101) {
+        setAllMembers(((res === null || res === void 0 ? void 0 : res.company_members) || []).map(function (item) {
           return _objectSpread(_objectSpread({}, item), {}, {
-            value: item.id,
+            value: item.id + '',
             label: item.username || item.email
           });
         }));
@@ -150,7 +147,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     var groupNameArr = allGroupInfos.map(function (item) {
       return item.groupName;
     });
-    if (!data.id && groupNameArr.includes(name)) {
+    if (!data && groupNameArr.includes(name)) {
       // 如果props data没有传值 就是新建组 新建的时候不检查组名重复
       notification.error({
         message: '用户组名称重复'
@@ -198,7 +195,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
       authConfig.funAuth = funAuth;
     }
     var formData = {
-      groupId: data.id || 0,
+      groupId: data && data.id || 0,
       groupName: name,
       authConfig: JSON.stringify(authConfig),
       userIds: userIdArr.join(','),
@@ -207,17 +204,23 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     request(apis.setting.updateGroupAuth, {
       method: 'post',
       params: formData
-    }).then(function () {
+    }).then(function (res) {
       // let arr = []
-      var hasCurrentUser = user.concat(oldUser).map(function (item) {
-        return item.id;
-      }).includes(id);
-      updateGroupAuthCallback && updateGroupAuthCallback(hasCurrentUser);
-      notification.success({
-        message: '保存成功'
-      });
+      if ((res === null || res === void 0 ? void 0 : res.flag) == 101) {
+        var hasCurrentUser = user.concat(oldUser).map(function (item) {
+          return item.id;
+        }).includes(id);
+        updateGroupAuthCallback && updateGroupAuthCallback(hasCurrentUser);
+        notification.success({
+          message: '保存成功'
+        });
+        onCancel();
+      } else {
+        notification.error({
+          message: '权限修改失败'
+        });
+      }
       setBtnLoading(false);
-      onCancel();
     }).catch(function (error) {
       console.log(error);
       setBtnLoading(false);
@@ -232,7 +235,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
       //   return item.id;
       // });
       var _formData = {
-        groupId: data.id,
+        groupId: data && data.id,
         appIds: _authConfig.dataAuth.map(function (item) {
           return item.appId;
         }),
@@ -245,7 +248,10 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
         method: 'post',
         data: _formData
       }).then(function () {
-        updateGroupAuthCallback && updateGroupAuthCallback(data && data.id);
+        var hasCurrentUser = user.concat(oldUser).map(function (item) {
+          return item.id;
+        }).includes(id);
+        updateGroupAuthCallback && updateGroupAuthCallback(hasCurrentUser);
         notification.success({
           message: '保存成功'
         });
@@ -264,7 +270,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     className: "company-setting-user-group"
   }, /*#__PURE__*/React.createElement("div", {
     className: "company-setting-group-title"
-  }, data.id ? /*#__PURE__*/React.createElement("span", null, "\u7F16\u8F91\u7528\u6237\u7EC4") : /*#__PURE__*/React.createElement("span", null, "\u521B\u5EFA\u7528\u6237\u7EC4")), /*#__PURE__*/React.createElement("div", {
+  }, data && data.id ? /*#__PURE__*/React.createElement("span", null, "\u7F16\u8F91\u7528\u6237\u7EC4") : /*#__PURE__*/React.createElement("span", null, "\u521B\u5EFA\u7528\u6237\u7EC4")), /*#__PURE__*/React.createElement("div", {
     className: "company-setting-user-name"
   }, /*#__PURE__*/React.createElement("span", null, "\u540D\u79F0\uFF1A"), /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u7528\u6237\u7EC4\u540D\u79F0",
@@ -345,7 +351,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     key: "io"
   }, /*#__PURE__*/React.createElement(AuthConfig, {
     ref: refAuthConfig,
-    config: data.authConfig,
+    config: data && data.authConfig || {},
     appList: companyAppList,
     isMarsUi: isMarsUi,
     leftMenus: leftMenus
@@ -355,10 +361,9 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
   }, /*#__PURE__*/React.createElement(AuthConfigCEP, {
     ref: refAuthCEPConfig,
     CEPData: CEPData,
-    config: data.authConfig,
-    appList: companyAppList,
-    isMarsUi: isMarsUi,
-    leftMenus: leftMenus
+    // config={data.authConfig}
+    // appList={companyAppList}
+    isMarsUi: isMarsUi
   })) : null), /*#__PURE__*/React.createElement("div", {
     className: "company-setting-footer"
   }, /*#__PURE__*/React.createElement(Button, {

package/es/modules/companySetting/index.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+import './index.less';
+declare const CompanySetting: React.FC<{
+    showWeChatMenu: boolean;
+    showMarketMenu: boolean;
+    action: string;
+    settingCallback?: (type: string, obj?: {
+        [key: string]: any;
+    }) => void;
+}>;
+export default CompanySetting;