@zgfe/modules-settings 1.2.8-node.0 → 1.2.8-node.10

package/es/constants/api.js

@@ -6,42 +6,42 @@ var apis = {
   },
   app: {
     queryLeftMenus: '/zg/web/v2/index/menuList',
-    deleteApp: apiPrefix + '/common/proxy/user/deleteApp.jsp',
+    deleteApp: '/user/deleteApp.jsp',
     createApp: apiPrefix + '/system/createApp',
     queryAppList: '/zg/web/v2/data/v2ajaxGetDataByApp',
     queryPackageInfo: apiPrefix + '/system/packageInfo',
-    queryVirtualApps: apiPrefix + '/common/proxy/user/sourceApp.jsp',
-    getCompanyAppList: apiPrefix + '/common/proxy/user/getCompanyAppList.jsp',
-    editVirtualApp: apiPrefix + '/common/proxy/user/editDataSource.jsp',
-    queryAccountEvents: apiPrefix + '/common/proxy/contract/v2queryAccountEvent.jsp',
-    editVirtualSourceApp: apiPrefix + '/common/proxy/user/editSourceApp.jsp' // 修改虚拟应用的来源应用配置
+    queryVirtualApps: '/user/sourceApp.jsp',
+    getCompanyAppList: '/user/getCompanyAppList.jsp',
+    editVirtualApp: '/user/editDataSource.jsp',
+    queryAccountEvents: '/contract/v2queryAccountEvent.jsp',
+    editVirtualSourceApp: '/user/editSourceApp.jsp' // 修改虚拟应用的来源应用配置
   },
 
   setting: {
-    updateCompanyName: apiPrefix + '/common/proxy/company/v2updateInfo.jsp',
+    updateCompanyName: '/company/v2updateInfo.jsp',
     updateLicense: apiPrefix + '/system/license',
-    groupInfos: apiPrefix + '/common/proxy/auth/groupInfos.jsp',
-    getGroupMembers: apiPrefix + '/common/proxy/company/getGroupMembers.jsp',
-    removeMember: apiPrefix + '/common/proxy/company/v2deleteUser.jsp',
-    resetpwd: apiPrefix + '/common/proxy/user/resetpwd.jsp',
-    updateUserAuth: apiPrefix + '/common/proxy/auth/updateUserAuth.jsp',
-    delSubscribeUser: apiPrefix + '/common/proxy//wx_subscribe/deleteWxUserRelation.jsp',
+    groupInfos: '/auth/groupInfos.jsp',
+    getGroupMembers: '/company/getGroupMembers.jsp',
+    removeMember: '/company/v2deleteUser.jsp',
+    resetpwd: '/user/resetpwd.jsp',
+    updateUserAuth: '/auth/updateUserAuth.jsp',
+    delSubscribeUser: '//wx_subscribe/deleteWxUserRelation.jsp',
     queryFunConfigList: '/cep-console/api/v1/permission/queryFunConfigList',
     queryAppList: '/cep-console/api/v1/permission/queryAppList',
     queryFunConfigByUserId: '/cep-console/api/v1/permission/queryFunConfigByUserId',
-    inviteUserByPhone: apiPrefix + '/common/proxy/company/v2invitation.jsp',
-    updateCompanyAdmin: apiPrefix + '/common/proxy/company/updateCompanyAdmin.jsp',
+    inviteUserByPhone: '/company/v2invitation.jsp',
+    updateCompanyAdmin: '/company/updateCompanyAdmin.jsp',
     updateUserAuthCEP: '/cep-console/api/v1/permission/updateUserAuth',
-    updateGroupAuth: apiPrefix + '/common/proxy/auth/updateGroupAuth.jsp',
-    deleteGroup: apiPrefix + '/common/proxy/auth/deleteGroup.jsp',
-    wxSubscribeUserList: apiPrefix + '/common/proxy/wx_subscribe/getWxSubscribeUserInfoList.jsp',
+    updateGroupAuth: '/auth/updateGroupAuth.jsp',
+    deleteGroup: '/auth/deleteGroup.jsp',
+    wxSubscribeUserList: '/wx_subscribe/getWxSubscribeUserInfoList.jsp',
     // 个人设置
-    updateUserInfo: apiPrefix + '/common/proxy/user/v2ajaxUpdateUserInfo.jsp',
-    resetPassword: apiPrefix + '/common/proxy/user/v2ajaxmodifypwd.jsp',
+    updateUserInfo: '/user/v2ajaxUpdateUserInfo.jsp',
+    resetPassword: '/user/v2ajaxmodifypwd.jsp',
     // 应用设置
-    updateAppName: apiPrefix + '/common/proxy/user/updateAppName.jsp',
-    createFilter: apiPrefix + '/common/proxy/user/createFilter.jsp',
-    queryFilter: apiPrefix + '/common/proxy/user/queryFilter.jsp',
+    updateAppName: '/user/updateAppName.jsp',
+    createFilter: '/user/createFilter.jsp',
+    queryFilter: '/user/queryFilter.jsp',
     //系统设置
     queryNoticeConfig: apiPrefix + '/systemSettings/queryNoticeSettings',
     editNoticeConfig: apiPrefix + '/systemSettings/setNoticeSettings'

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

@@ -37,37 +37,28 @@ var AppInfo = function AppInfo(_ref) {
     var appName = value.appName,
       appAccount = value.appAccount;
     var data = {
-      app_name: appName,
-      app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      appName: appName,
+      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
     };
     if (showAppAccount) {
-      data.app_account = appAccount;
+      data.appAccount = appAccount;
     }
     urlRequest(apis.setting.updateAppName, {
       method: 'post',
       data: data
     }).then(function (res) {
-      if ((res === null || res === void 0 ? void 0 : res.flag) === 101) {
-        notification.success({
-          message: '更改成功'
-        });
-        // 重置表单
-        setInitialValues({
-          appName: appName,
-          appAccount: appAccount
-        });
-        form.resetFields();
-        // 主应用更新appList
-        settingsCallback('updateAppList');
-      } else if ((res === null || res === void 0 ? void 0 : res.flag) === -102) {
-        notification.error({
-          message: '开发者角色无权限修改'
-        });
-      } else if ((res === null || res === void 0 ? void 0 : res.flag) === 202) {
-        notification.error({
-          message: '应用名称已存在'
-        });
-      }
+      notification.success({
+        message: '更改成功'
+      });
+      // 重置表单
+      setInitialValues({
+        appName: appName,
+        appAccount: appAccount
+      });
+      form.resetFields();
+      if (currentApp) currentApp.appName = appName;
+      // 主应用更新appList
+      settingsCallback('updateAppList');
     }).catch(function () {
       notification.error({
         message: '修改失败，请重试'

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

@@ -46,11 +46,6 @@ var AppDataAccessFilter = function AppDataAccessFilter() {
       }
     }).catch(function (err) {});
   }, []);
-  // 保存按钮禁用逻辑
-  var disableBtn = function disableBtn(form) {
-    var value = form.getFieldsValue();
-    return !form.isFieldTouched('ip') && !form.isFieldTouched('ua') || JSON.stringify(initialValues) === JSON.stringify(value);
-  };
   // 保存
   var onSubmit = function onSubmit(value) {
     var ip = value.ip,

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

@@ -9,10 +9,9 @@ import React, { useContext, useEffect, useRef, useState } from 'react';
 import './index.less';
 import util from './../../../utils/util';
 import { Button, Form, Input, notification } from 'antd';
-import request, { selfRequest } from './../../../utils/ajax';
-// import urlRequest from 'umi-request';
+import request from './../../../utils/ajax';
 import api from './../../../constants/api';
-import { BizTable, BizDialog, BizGlobalDataContext } from '@zgfe/business-lib';
+import { BizTable, BizDialog, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
 var reworkAppName = function reworkAppName(name) {
   return name.length > 15 ? "".concat(name.substring(0, 15), "...") : name;
 };
@@ -280,54 +279,31 @@ var appList = function appList(props) {
     }
     setCreateAppLoading(true);
     var msg = '';
-    selfRequest(api.app.createApp, {
+    ajax(api.app.createApp, {
       method: 'post',
       data: {
-        app_name: appNameVal,
+        appName: appNameVal,
         companyId: companyId
       }
     }).then(function (res) {
-      if (res.flag === 101) {
-        setCreatedAppPanel(false);
-        // window.track('应用-创建应用', {
-        //   是否首次: companyRealAppList.length ? '否' : '是',
-        //   应用名称: 'name'
-        // })
-        var cloneAuthConfig = util.clone(authConfig);
-        cloneAuthConfig.dataAuth.unshift({
-          appId: res.app_info.id,
-          plats: [0]
-        });
-        var formData = {
-          userId: id,
-          authConfig: JSON.stringify(cloneAuthConfig),
-          groupIds: findGroups().join(',')
-        };
-        // 通知数据刷新
-        createAppCallback(formData, res.app_info.id);
-        msg = '创建应用成功';
-        notification.success({
-          message: msg
-        });
-      } else {
-        switch (res.flag) {
-          case 201:
-            msg = '创建失败,应用数量达到限制';
-            break;
-          case 202:
-            msg = '创建失败,该名称已存在';
-            break;
-          case 203:
-            msg = '创建失败,无权限';
-            break;
-          default:
-            msg = '创建应用接口错误,请重试';
-            break;
-        }
-        notification.error({
-          message: msg
-        });
-      }
+      if (!res) return;
+      setCreatedAppPanel(false);
+      var cloneAuthConfig = util.clone(authConfig);
+      cloneAuthConfig.dataAuth.unshift({
+        appId: res.data.appInfo.id,
+        plats: [0]
+      });
+      var formData = {
+        userId: id,
+        authConfig: JSON.stringify(cloneAuthConfig),
+        groupIds: findGroups().join(',')
+      };
+      // 通知数据刷新
+      createAppCallback(formData, res.data.appInfo.id);
+      msg = '创建应用成功';
+      notification.success({
+        message: msg
+      });
     }).catch(function () {
       notification.error({
         message: '创建失败,请重试'
@@ -391,6 +367,7 @@ var appList = function appList(props) {
   }, "\u786E\u8BA4\u5220\u9664\u6B64\u5E94\u7528\u5417\uFF1F\u5220\u9664\u540E\u5E94\u7528\u7684\u6570\u636E\u5C06\u4E0D\u518D\u53EF\u7528"), /*#__PURE__*/React.createElement("div", {
     className: "app-list-content"
   }, /*#__PURE__*/React.createElement(BizTable, {
+    rowKey: "id",
     dataSource: system === 'CEP' ? cepAppList : companyRealAppList,
     columns: columns,
     pagination: false

package/es/modules/companySetting/edit/multiAuthModule.js

@@ -72,10 +72,6 @@ var multiAuthModule = function multiAuthModule(props) {
     setFunctionGroups(dealArr);
     change(checked, false, dealArr);
   };
-  var checkedAll = function checkedAll(checked) {
-    setAll(checked);
-    onAllChange();
-  };
   var change = function change(all, indeterminate, functionGroups) {
     var dealData = _objectSpread(_objectSpread({}, data), {}, {
       checked: all,

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

@@ -10,9 +10,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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 React, { useEffect, useRef, useState } from 'react';
 import './styles/user.less';
-import { BizGlobalDataContext } from '@zgfe/business-lib';
 import { Button, notification, Tabs, Select } from 'antd';
 import request from './../../../utils/ajax';
 import AuthConfig from './authConfig';
@@ -33,10 +32,6 @@ var Info = function Info(props) {
       label: item.groupName
     });
   });
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp,
-    currentUser = _useContext.currentUser,
-    isDemo = _useContext.isDemo;
   // SelectProps<string, { value: number; label: string; }>
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),

package/es/modules/companySetting/index.js

@@ -40,98 +40,88 @@ var CompanySetting = function CompanySetting(props) {
     showVirtualApp = _ref.showVirtualApp,
     showDataDaily = _ref.showDataDaily,
     ENVIRONMENT = _ref.ENVIRONMENT;
-  var _useState = useState('info'),
-    _useState2 = _slicedToArray(_useState, 2),
-    currentTab = _useState2[0],
-    setCurrentTab = _useState2[1];
   // getCurrentUser
-  var _useState3 = useState(),
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    settingCurrentUser = _useState2[0],
+    setSettingCurrentUser = _useState2[1];
+  var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    settingCurrentUser = _useState4[0],
-    setSettingCurrentUser = _useState4[1];
-  var _useState5 = useState([]),
+    dataAuth = _useState4[0],
+    setDataAuth = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    dataAuth = _useState6[0],
-    setDataAuth = _useState6[1];
+    isAdmin = _useState6[0],
+    setIsAdmin = _useState6[1];
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    isAdmin = _useState8[0],
-    setIsAdmin = _useState8[1];
-  var _useState9 = useState(false),
+    isDemoAccount = _useState8[0],
+    setIsDemoAccount = _useState8[1];
+  var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    isDemoAccount = _useState10[0],
-    setIsDemoAccount = _useState10[1];
+    authConfig = _useState10[0],
+    setAuthConfig = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    authConfig = _useState12[0],
-    setAuthConfig = _useState12[1];
-  var _useState13 = useState(),
+    id = _useState12[0],
+    setId = _useState12[1];
+  var _useState13 = useState(''),
     _useState14 = _slicedToArray(_useState13, 2),
-    id = _useState14[0],
-    setId = _useState14[1];
-  var _useState15 = useState(''),
+    companyName = _useState14[0],
+    setCompanyName = _useState14[1];
+  var _useState15 = useState(),
     _useState16 = _slicedToArray(_useState15, 2),
-    companyName = _useState16[0],
-    setCompanyName = _useState16[1];
-  var _useState17 = useState(),
-    _useState18 = _slicedToArray(_useState17, 2),
-    companyId = _useState18[0],
-    setCompanyId = _useState18[1];
+    companyId = _useState16[0],
+    setCompanyId = _useState16[1];
   // groupInfos
-  var _useState19 = useState([]),
+  var _useState17 = useState([]),
+    _useState18 = _slicedToArray(_useState17, 2),
+    allGroupInfos = _useState18[0],
+    setAllGroupInfos = _useState18[1];
+  var _useState19 = useState({}),
     _useState20 = _slicedToArray(_useState19, 2),
-    allGroupInfos = _useState20[0],
-    setAllGroupInfos = _useState20[1];
-  var _useState21 = useState({}),
-    _useState22 = _slicedToArray(_useState21, 2),
-    groupHashList = _useState22[0],
-    setGroupHashList = _useState22[1];
+    groupHashList = _useState20[0],
+    setGroupHashList = _useState20[1];
   // queryAppList
   // companyAppList：公司内所有应用，包括无权限的应用（普通应用、虚拟应用）
   // appList: 当前用户有权限的应用（普通应用、虚拟应用）
+  var _useState21 = useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    companyAppList = _useState22[0],
+    setCompanyAppList = _useState22[1];
   var _useState23 = useState([]),
     _useState24 = _slicedToArray(_useState23, 2),
-    companyAppList = _useState24[0],
-    setCompanyAppList = _useState24[1];
+    appList = _useState24[0],
+    setAppList = _useState24[1];
   var _useState25 = useState([]),
     _useState26 = _slicedToArray(_useState25, 2),
-    appList = _useState26[0],
-    setAppList = _useState26[1];
+    companyRealAppList = _useState26[0],
+    setCompanyRealAppList = _useState26[1];
+  // queryLeftMenus
   var _useState27 = useState([]),
     _useState28 = _slicedToArray(_useState27, 2),
-    companyRealAppList = _useState28[0],
-    setCompanyRealAppList = _useState28[1];
-  // queryLeftMenus
-  var _useState29 = useState([]),
+    leftMenus = _useState28[0],
+    setLeftMenus = _useState28[1];
+  var _useState29 = useState(0),
     _useState30 = _slicedToArray(_useState29, 2),
-    leftMenus = _useState30[0],
-    setLeftMenus = _useState30[1];
-  var _useState31 = useState({}),
+    serviceType = _useState30[0],
+    setServiceType = _useState30[1];
+  var _useState31 = useState(0),
     _useState32 = _slicedToArray(_useState31, 2),
-    menusNameMap = _useState32[0],
-    setMenusNameMap = _useState32[1];
-  var _useState33 = useState(0),
+    pageReady = _useState32[0],
+    setPageReady = _useState32[1];
+  var _useState33 = useState(false),
     _useState34 = _slicedToArray(_useState33, 2),
-    serviceType = _useState34[0],
-    setServiceType = _useState34[1];
-  var _useState35 = useState(0),
-    _useState36 = _slicedToArray(_useState35, 2),
-    pageReady = _useState36[0],
-    setPageReady = _useState36[1];
-  var _useState37 = useState(false),
-    _useState38 = _slicedToArray(_useState37, 2),
-    isShowCreateApp = _useState38[0],
-    setIsShowCreateApp = _useState38[1];
+    isShowCreateApp = _useState34[0],
+    setIsShowCreateApp = _useState34[1];
   useEffect(function () {
     getSettingData();
     apisOkNum = 0;
   }, []);
   useEffect(function () {
     if (action == 'createApp') {
-      setCurrentTab('appList');
       setIsShowCreateApp(true);
     } else {
-      setCurrentTab('info');
       setIsShowCreateApp(false);
     }
   }, [props.action]);
@@ -202,7 +192,7 @@ var CompanySetting = function CompanySetting(props) {
         }
         apisOkNum += 1;
         setPageReady(apisOkNum);
-      }).catch(function (err) {
+      }).catch(function () {
         notification.error({
           message: '信息获取失败'
         });
@@ -226,15 +216,14 @@ var CompanySetting = function CompanySetting(props) {
         };
         formatMenus(menus);
         setLeftMenus(menus);
-        setMenusNameMap(menusNameMap);
         apisOkNum += 1;
         setPageReady(apisOkNum);
-      }).catch(function (err) {
+      }).catch(function () {
         notification.error({
           message: '信息获取失败'
         });
       });
-    }).catch(function (err) {
+    }).catch(function () {
       notification.error({
         message: '信息获取失败'
       });
@@ -247,7 +236,7 @@ var CompanySetting = function CompanySetting(props) {
       }
       apisOkNum += 1;
       setPageReady(apisOkNum);
-    }).catch(function (err) {
+    }).catch(function () {
       notification.error({
         message: '信息获取失败'
       });
@@ -260,7 +249,7 @@ var CompanySetting = function CompanySetting(props) {
       if (res && res.flag === 101) {
         setAllGroupInfos((res.infos || []).reverse());
       }
-    }).catch(function (err) {
+    }).catch(function () {
       notification.error({
         message: '信息获取失败'
       });
@@ -270,10 +259,10 @@ var CompanySetting = function CompanySetting(props) {
     return request(api.setting.updateUserAuth, {
       method: 'post',
       params: params
-    }).then(function (res) {
+    }).then(function () {
       // if (res.flag === 101) {
       // }
-    }).catch(function (err) {
+    }).catch(function () {
       notification.error({
         message: '信息获取失败'
       });
@@ -620,7 +609,7 @@ var CompanySetting = function CompanySetting(props) {
     // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
     settingCallback && settingCallback('settingCloseCreateCallback');
   };
-  var changeTab = function changeTab(tab) {
+  var changeTab = function changeTab() {
     // setCurrentTab(tab);
     setIsShowCreateApp(false);
   };

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

@@ -26,15 +26,14 @@ var Info = function Info(props) {
   var updateLicense = function updateLicense(license) {
     request(api.setting.updateLicense, {
       method: 'post',
-      params: {
+      data: {
         license: license
       }
     }).then(function (res) {
-      if (res && res.flag === 101) {
-        notification.success({
-          message: '授权码更新成功！'
-        });
-      }
+      if (!res) return;
+      notification.success({
+        message: '授权码更新成功！'
+      });
     }).catch(function (err) {
       console.log(err);
       notification.error({
@@ -48,7 +47,7 @@ var Info = function Info(props) {
     if (companyNameVal !== companyName) {
       changeCompanyName(companyNameVal);
     }
-    if (license.length > 0) {
+    if ((license === null || license === void 0 ? void 0 : license.length) > 0) {
       updateLicense(license);
     }
   };

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

@@ -14,8 +14,6 @@ import AuthConfigDetail from './../userGroup/authConfigDetail';
 import CompanySettingUser from './../edit/user';
 import Invite from './invite';
 import { BizTable, BizDialog, BizSelect } from '@zgfe/business-lib';
-var TextArea = Input.TextArea,
-  Search = Input.Search;
 var splitString = function splitString(str) {
   var len = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
   return str.length > len ? "".concat(str.substring(0, len), "...") : str;

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

@@ -16,7 +16,6 @@ import constants from './../../../utils/constants';
 import { Button, Input, notification, Select } from 'antd';
 import request from './../../../utils/ajax';
 import apis from './../../../constants/api';
-var TextArea = Input.TextArea;
 var UserGroup = function UserGroup(props) {
   var ENVIRONMENT = props.ENVIRONMENT,
     allGroupInfos = props.allGroupInfos,

package/es/modules/companySetting/userGroup/groupItem.js

@@ -7,14 +7,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from 'react';
 import './index.less';
 import { BizDialog } from '@zgfe/business-lib';
-import { Button, Input, notification, Popover } from 'antd';
+import { Button, notification, Popover } from 'antd';
 import request from './../../../utils/ajax';
 import apis from './../../../constants/api';
 import AuthConfigDetail from './authConfigDetail';
 import util from '../../../utils/util';
 // import companySettingUserGroup from '../edit/userGroup'
 // import groupItem from './groupItem.vue'
-var TextArea = Input.TextArea;
 var GroupItem = function GroupItem(props) {
   var groupData = props.groupData,
     companyAppList = props.companyAppList,

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

@@ -4,14 +4,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, { useContext, useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import './index.less';
-import { BizGlobalDataContext } from '@zgfe/business-lib';
 import { Input } from 'antd';
 import PageLoading from '../../../components/pageLoading';
 import GroupItem from './groupItem';
 import CompanySettingUserGroup from '../edit/userGroup';
-var TextArea = Input.TextArea;
 var UserGroup = function UserGroup(props) {
   var id = props.id,
     allGroupInfos = props.allGroupInfos,
@@ -21,10 +19,6 @@ var UserGroup = function UserGroup(props) {
     serviceType = props.serviceType,
     delGroupCallback = props.delGroupCallback,
     updateGroupAuthCallback = props.updateGroupAuthCallback;
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp,
-    currentUser = _useContext.currentUser,
-    isDemo = _useContext.isDemo;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     showGroups = _useState2[0],
@@ -128,7 +122,7 @@ var UserGroup = function UserGroup(props) {
     className: "create-model"
   }, /*#__PURE__*/React.createElement("span", {
     className: "icon-add-thin"
-  }, "\u521B\u5EFA\u7528\u6237\u7EC4")), showGroups.map(function (item, index) {
+  }, "\u521B\u5EFA\u7528\u6237\u7EC4")), showGroups.map(function (item) {
     return /*#__PURE__*/React.createElement(GroupItem, {
       key: item.id,
       groupData: item,

package/es/modules/companySetting/virtualApp/config.js

@@ -8,7 +8,7 @@ import React, { useEffect, useState } from 'react';
 import './styles/config.less';
 import './styles/table.less';
 import { Button, notification } from 'antd';
-import { selfRequest } from './../../../utils/ajax';
+import request from './../../../utils/ajax';
 import api from './../../../constants/api';
 import SourceItem from './panels/sourceItem';
 import util from '../../../utils/util';
@@ -72,21 +72,15 @@ var Config = function Config(props) {
         return item;
       })))
     };
-    selfRequest(api.app.editVirtualApp, {
+    request(api.app.editVirtualApp, {
       method: 'post',
       data: params
-    }).then(function (res) {
-      if (res.code === 10001) {
-        notification.success({
-          message: '修改成功！'
-        });
-        editVirtualAppCallback && editVirtualAppCallback(virtualAppsIdMap[selectApp.app_id].app_id);
-        onCancel();
-      } else {
-        notification.error({
-          message: '修改失败，请重试！'
-        });
-      }
+    }).then(function () {
+      notification.success({
+        message: '修改成功！'
+      });
+      editVirtualAppCallback && editVirtualAppCallback(virtualAppsIdMap[selectApp.app_id].app_id);
+      onCancel();
     }).catch(function (error) {
       notification.error({
         message: '修改失败，请重试！'

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

@@ -8,7 +8,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import React, { useEffect, useState } from 'react';
 import './styles/index.less';
 import { Form, Input, Button, notification } from 'antd';
-import request, { selfRequest } from './../../../utils/ajax';
+import request from './../../../utils/ajax';
 import api from './../../../constants/api';
 import PageLoading from '../../../components/pageLoading';
 import VirtualAppList from './panels/list';
@@ -104,53 +104,33 @@ var VirtualApp = function VirtualApp(props) {
     });
   };
   var onSubmit = function onSubmit(e) {
-    selfRequest(api.app.createApp, {
+    request(api.app.createApp, {
       method: 'post',
       data: {
-        app_name: e.appNameVal,
-        app_type: 'virtual',
+        appName: e.appNameVal,
+        appType: 'virtual',
         companyId: companyId
       }
     }).then(function (res) {
-      if (res.flag === 101) {
-        notification.success({
-          message: '创建成功'
-        });
-        setStatus('list');
-        var dealAuthConfig = util.clone(authConfig);
-        if (!(dealAuthConfig.dataAuth.length === 1 && dealAuthConfig.dataAuth[0].appId === 0)) {
-          dealAuthConfig.dataAuth.unshift({
-            appId: res.app_info.id,
-            plats: [0]
-          });
-        }
-        var formData = {
-          userId: id,
-          authConfig: JSON.stringify(dealAuthConfig),
-          groupIds: userOfGroups.join(',')
-        };
-        createVirtualAppCallback && createVirtualAppCallback(res, formData);
-        queryVirtualApps();
-      } else {
-        var msg = '创建失败，请重试';
-        switch (res.flag) {
-          case 201:
-            msg = '创建失败,应用数量达到限制';
-            break;
-          case 202:
-            msg = '该名称已存在';
-            break;
-          case 203:
-            msg = '无权限';
-            break;
-          default:
-            msg = '创建失败，请重试';
-            break;
-        }
-        notification.error({
-          message: msg
+      if (!res) return;
+      notification.success({
+        message: '创建成功'
+      });
+      setStatus('list');
+      var dealAuthConfig = util.clone(authConfig);
+      if (!(dealAuthConfig.dataAuth.length === 1 && dealAuthConfig.dataAuth[0].appId === 0)) {
+        dealAuthConfig.dataAuth.unshift({
+          appId: res.data.appInfo.id,
+          plats: [0]
         });
       }
+      var formData = {
+        userId: id,
+        authConfig: JSON.stringify(dealAuthConfig),
+        groupIds: userOfGroups.join(',')
+      };
+      createVirtualAppCallback && createVirtualAppCallback(res, formData);
+      queryVirtualApps();
     }).catch(function (error) {
       notification.error({
         message: '创建失败,请重试'

package/es/modules/companySetting/virtualApp/panels/sourceItem.js

@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
 import './../styles/sourceItem.less';
 import { Transfer, Checkbox } from 'antd';
-import { selfRequest } from './../../../../utils/ajax';
+import request from './../../../../utils/ajax';
 import api from './../../../../constants/api';
 import util from '../../../../utils/util';
 var VirtualApp = function VirtualApp(props) {
@@ -48,13 +48,14 @@ var VirtualApp = function VirtualApp(props) {
   useEffect(function () {
     if (showTransfer) {
       // 第一次展开时：查询当前源应用的事件列表
-      selfRequest(api.eventMeta.queryEventMeta, {
+      request(api.eventMeta.queryEventMeta, {
         method: 'post',
         data: {
           appId: sourceAppId,
           plat: 0
         }
       }).then(function (res) {
+        if (!res) return;
         var eventList = [];
         var groups = res.data;
         groups.forEach(function (group) {

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

@@ -55,6 +55,8 @@ var PersonalInfo = function PersonalInfo(_ref) {
           emailNote: emailNote
         });
         form.resetFields();
+        currentUser.username = username;
+        currentUser.emailNote = emailNote;
         // 主应用更新currentUser,同公司设置-更新应用名称回调
         settingsCallback('settingChangeCompanyNameCallback');
       } else {

package/es/modules/personalSetting/securityLog/index.js

@@ -48,10 +48,6 @@ var SecurityLog = function SecurityLog() {
     _useState12 = _slicedToArray(_useState11, 2),
     tableData = _useState12[0],
     setTableData = _useState12[1];
-  var _useState13 = useState(0),
-    _useState14 = _slicedToArray(_useState13, 2),
-    time = _useState14[0],
-    setTime = _useState14[1];
   var columns = [{
     title: '详情',
     dataIndex: 'operationType',

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

@@ -17,9 +17,8 @@ var ItemEdit = function ItemEdit(props) {
     editCancel = props.editCancel,
     onSubmit = props.onSubmit;
   var _useState = useState(editSetting.config),
-    _useState2 = _slicedToArray(_useState, 2),
-    initialValues = _useState2[0],
-    setInitialValues = _useState2[1];
+    _useState2 = _slicedToArray(_useState, 1),
+    initialValues = _useState2[0];
   var settingsOptionsMap = new Map().set('email', {
     config: [{
       name: 'host',

package/es/types/app.d.ts

@@ -11,9 +11,9 @@ export interface IAppInfoForm {
     appAccount: string;
 }
 export interface IAppInfoParams {
-    app_name: string;
-    app_id: number;
-    app_account: string;
+    appName: string;
+    appId: number;
+    appAccount: string;
     wdwdwd: boolean;
 }
 export interface IAppInfoRes<T> extends InterfaceApiResult<T> {

package/es/utils/ajax.d.ts

@@ -1,5 +1,4 @@
 import { ajaxConfig } from '@zgfe/business-lib/es/utils/type';
 declare function request<T>(url: string, options: ajaxConfig<T>): Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<T> | null>;
 export declare function urlRequest<T>(url: string, options: ajaxConfig<T>): Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<T> | null>;
-export declare function selfRequest<T>(url: string, options: ajaxConfig<T>): Promise<any>;
 export default request;

package/es/utils/ajax.js

@@ -1,5 +1,4 @@
 import { ajax } from '@zgfe/business-lib';
-import Request from 'umi-request';
 function request(url, options) {
   return ajax(url, options);
 }
@@ -21,22 +20,4 @@ export function urlRequest(url, options) {
   data ? options.data = transformRequest(data) : options.data = data;
   return ajax(url, options);
 }
-export function selfRequest(url, options) {
-  var data = options.data,
-    headers = options.headers;
-  headers ? options.headers = Object.assign(options.headers, {
-    'Content-Type': 'application/x-www-form-urlencoded'
-  }) : options.headers = {
-    'Content-Type': 'application/x-www-form-urlencoded'
-  };
-  var transformRequest = function transformRequest(params) {
-    var arr = [];
-    for (var key in params) {
-      arr.push("".concat(key, "=").concat(encodeURIComponent(params[key])));
-    }
-    return arr.join('&');
-  };
-  data ? options.data = transformRequest(data) : options.data = data;
-  return Request(url, options);
-}
 export default request;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.8-node.0",
+  "version": "1.2.8-node.10",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "c3754a60ba4183812cde788e7a2626e2fb90d786",
+  "gitHead": "9c50dce567d7261891ca8bc3971f5e0fdf251129",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }