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

package/{dist/esm → es}/components/pageLoading/index.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
+import './index.less';
 declare const PageLoading: React.FC;
 export default PageLoading;

package/{dist/esm → es}/components/pageLoading/index.js

@@ -1,9 +1,9 @@
 import { Spin } from 'antd';
 import React from 'react';
-import styles from "./index.less";
+import './index.less';
 var PageLoading = function PageLoading() {
   return /*#__PURE__*/React.createElement("div", {
-    className: styles.loading
+    className: "settings-page-loading"
   }, /*#__PURE__*/React.createElement(Spin, {
     size: "large"
   }));

package/es/components/pageLoading/index.less

@@ -0,0 +1,7 @@
+.settings-page-loading {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+}

package/es/components/settingTabs/demo/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const SettingTabsDemo: React.FC;
+export default SettingTabsDemo;

package/es/components/settingTabs/demo/index.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import SettingTabs from '..';
+var SettingTabsDemo = function SettingTabsDemo() {
+  var title = /*#__PURE__*/React.createElement("div", null, "\u6807\u9898");
+  var items = [{
+    key: '1',
+    label: 'tab 1',
+    content: 'tab 1 content'
+  }, {
+    key: '2',
+    label: 'tab 2',
+    content: 'tab 2 content'
+  }];
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SettingTabs, {
+    typeName: "demo",
+    title: title,
+    items: items
+  }));
+};
+export default SettingTabsDemo;

package/{dist/esm → es}/components/settingTabs/index.d.ts

@@ -1,12 +1,11 @@
 import React from 'react';
 import './index.less';
-interface ISettingTabsItem {
-    key: string;
-    label: string;
-    content: JSX.Element;
-}
+import { ISettingTabsItem } from './types';
 declare const SettingTabs: React.FC<{
+    typeName: string;
     items: ISettingTabsItem[];
     title: JSX.Element;
+    currentKey?: string;
+    onClick?: (key: string[]) => void;
 }>;
 export default SettingTabs;

package/{dist/esm → es}/components/settingTabs/index.js

@@ -8,29 +8,79 @@ import React, { useState } from 'react';
 import Sider from 'antd/lib/layout/Sider';
 import Layout, { Content } from 'antd/lib/layout/layout';
 import { Menu } from 'antd';
-import "./index.less";
+import { useEffect } from 'react';
+import './index.less';
+var LOCAL_TAB_INFO = 'modules-setting-component-settingTabs-tabInfo';
 var SettingTabs = function SettingTabs(props) {
-  var _items$;
   var title = props.title,
-    items = props.items;
+    items = props.items,
+    _props$typeName = props.typeName,
+    typeName = _props$typeName === void 0 ? '' : _props$typeName,
+    _props$currentKey = props.currentKey,
+    currentKey = _props$currentKey === void 0 ? '' : _props$currentKey,
+    onClick = props.onClick;
   var filterItems = items.filter(function (item) {
     return !item.hidden;
   });
-  var _useState = useState([(_items$ = items[0]) === null || _items$ === void 0 ? void 0 : _items$.key]),
+  var _useState = useState([currentKey]),
     _useState2 = _slicedToArray(_useState, 2),
     selectedKeys = _useState2[0],
     setSelectedKeys = _useState2[1];
   var selectedContent = function selectedContent() {
-    // withRouter
-    var index = items.findIndex(function (item) {
-      return item.key === selectedKeys[0];
-    });
-    return items[index].content;
+    if (selectedKeys[0]) {
+      var index = items.findIndex(function (item) {
+        return item.key === selectedKeys[0];
+      });
+      if (index > 0) {
+        return items[index].content;
+      } else {
+        return items[0].content;
+      }
+    }
   };
   // 菜单点击
   var menuClick = function menuClick(_ref) {
     var key = _ref.key;
     setSelectedKeys([key]);
+    onClick && onClick([key]);
+  };
+  // 缓存中typeName与传入typeName不一致时清空缓存
+  useEffect(function () {
+    var localTypeName = getLocalTabInfoParams('typeName');
+    if (localTypeName !== typeName) {
+      localStorage.removeItem(LOCAL_TAB_INFO);
+    }
+  }, []);
+  useEffect(function () {
+    setSelectedKeys([props.currentKey || '']);
+  }, [props.currentKey]);
+  // 强刷时记住当前tab选项
+  useEffect(function () {
+    var currentKey = getLocalTabInfoParams('key');
+    var selectedKey = selectedKeys[0];
+    if (currentKey && !selectedKey) {
+      setSelectedKeys([currentKey]);
+    } else if (!currentKey && !selectedKey) {
+      setSelectedKeys([filterItems[0].key]);
+    } else {
+      setLocalTabInfo(selectedKey);
+    }
+  }, [selectedKeys]);
+  // 从localStorage中获取tabInfo的参数
+  var getLocalTabInfoParams = function getLocalTabInfoParams(name) {
+    var tabInfo = localStorage.getItem(LOCAL_TAB_INFO);
+    if (tabInfo) {
+      return JSON.parse(tabInfo)[name];
+    } else {
+      return null;
+    }
+  };
+  // 将tabInfo存到localStorage中
+  var setLocalTabInfo = function setLocalTabInfo(key) {
+    localStorage.setItem(LOCAL_TAB_INFO, JSON.stringify({
+      key: key,
+      typeName: typeName
+    }));
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "settings-container"
@@ -40,7 +90,8 @@ var SettingTabs = function SettingTabs(props) {
     className: "settings-sider"
   }, /*#__PURE__*/React.createElement(Menu, {
     style: {
-      width: 200
+      width: 200,
+      padding: '4px 0px'
     },
     selectedKeys: selectedKeys,
     items: filterItems,

package/{dist/esm → es}/components/settingTabs/index.less

@@ -1,23 +1,32 @@
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
 .settings-container {
   padding: 24px;
   background: #f0f2f5;
-
-  .app-name {
-    font-weight: normal;
-    font-size: 14px;
+  .tab-header {
+    font-size: 18px;
+    .tab-header-title {
+      margin-left: 8px;
+    }
+    .app-name {
+      font-weight: normal;
+      font-size: 14px;
+    }
   }
 
   .settings-layout {
-    height: 614px;
-    // overflow: auto;
+    display: flex;
+    height: calc(100vh - 130px);
     padding: 24px 0px 24px;
 
     .settings-sider {
+      display: contents;
       background: white;
     }
 
     .settings-content {
-      max-width: 920px;
+      flex: auto;
+      max-width: 912px;
       margin-left: 24px;
       padding: 40px;
       overflow: auto;

package/es/components/settingTabs/types.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+export interface ISettingTabsItem {
+    key: string;
+    label: string;
+    content: JSX.Element;
+    hidden?: boolean;
+}

package/es/components/settingTabs/types.js

@@ -0,0 +1 @@
+export {};

package/{dist/esm → es}/constants/api.d.ts

@@ -43,5 +43,8 @@ declare let apis: {
     eventMeta: {
         queryEventMeta: string;
     };
+    mfa: {
+        resetMfa: string;
+    };
 };
 export default apis;

package/{dist/esm → es}/constants/api.js

@@ -11,11 +11,8 @@ var apis = {
     queryAppList: apiPrefix + '/common/proxy/data/v2ajaxGetDataByApp.jsp',
     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' // 修改虚拟应用的来源应用配置
   },
@@ -51,6 +48,10 @@ var apis = {
   },
   eventMeta: {
     queryEventMeta: apiPrefix + '/common/proxy/data/queryEventMetasOfGroup.jsp'
+  },
+  // 多因子认证
+  mfa: {
+    resetMfa: '/user/v2resetMfa.jsp'
   }
 };
 export default apis;

package/es/index.js

@@ -0,0 +1,4 @@
+export { default as CompanySetting } from './modules/companySetting';
+export { default as PersonalSetting } from './modules/personalSetting';
+export { default as AppSettings } from './modules/appSettings';
+export { default as SystemSetting } from './modules/systemSetting';

package/{dist/esm → es}/modules/appSettings/appInfo/index.js

@@ -4,21 +4,22 @@ 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; }
-// 缺少环境配置：SHOW_APP_ACCOUNT（备注）
-// 缺少isVirtualApp
 import React, { useContext } from 'react';
 import { Button, Form, Input, notification } from 'antd';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
-import { urlRequest } from "../../../utils/ajax";
-import apis from "../../../constants/api";
+import { urlRequest } from '../../../utils/ajax';
+import apis from '../../../constants/api';
 import { useState } from 'react';
-import constants from "../../../utils/constants";
-var AppInfo = function AppInfo(props) {
-  var settingsCallback = props.settingsCallback;
+import constants from '../../../utils/constants';
+var AppInfo = function AppInfo(_ref) {
+  var settingsCallback = _ref.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    envs = _useContext.envs;
+  var showAppAccount = envs === null || envs === void 0 ? void 0 : envs.showAppAccount;
   var _useState = useState({
-      appName: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appName
+      appName: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appName,
+      appAccount: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appAccount
     }),
     _useState2 = _slicedToArray(_useState, 2),
     initialValues = _useState2[0],
@@ -30,39 +31,44 @@ var AppInfo = function AppInfo(props) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-
   // 保存
   var onSubmit = function onSubmit(value) {
     setLoading(true);
-    var appName = value.appName;
+    var appName = value.appName,
+      appAccount = value.appAccount;
+    var data = {
+      app_name: appName,
+      app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+    };
+    if (showAppAccount) {
+      data.app_account = appAccount;
+    }
     urlRequest(apis.setting.updateAppName, {
       method: 'post',
-      data: {
-        app_name: appName,
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
-      }
+      data: data
     }).then(function (res) {
-      if (res.flag === 101) {
+      if ((res === null || res === void 0 ? void 0 : res.flag) === 101) {
         notification.success({
           message: '更改成功'
         });
         // 重置表单
         setInitialValues({
-          appName: appName
+          appName: appName,
+          appAccount: appAccount
         });
         form.resetFields();
         // 主应用更新appList
         settingsCallback('updateAppList');
-      } else if (res.flag === -102) {
+      } else if ((res === null || res === void 0 ? void 0 : res.flag) === -102) {
         notification.error({
           message: '开发者角色无权限修改'
         });
-      } else if (res.flag === 202) {
+      } else if ((res === null || res === void 0 ? void 0 : res.flag) === 202) {
         notification.error({
           message: '应用名称已存在'
         });
       }
-    }).catch(function (err) {
+    }).catch(function () {
       notification.error({
         message: '修改失败，请重试'
       });
@@ -90,15 +96,27 @@ var AppInfo = function AppInfo(props) {
     }]
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u59D3\u540D"
-  })), /*#__PURE__*/React.createElement(Form.Item, {
+  })), showAppAccount ? /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u5907\u6CE8",
+    name: "appAccount",
+    rules: [{
+      required: true,
+      message: '请输入应用名称'
+    }, {
+      pattern: constants.regExp.teamAndAppName,
+      message: '请输入1～20位字符'
+    }]
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8BF7\u586B\u5199\u5907\u6CE8"
+  })) : '', /*#__PURE__*/React.createElement(Form.Item, {
     shouldUpdate: true
   }, function () {
     return /*#__PURE__*/React.createElement(Button, {
       type: "primary",
       htmlType: "submit",
       loading: loading,
-      disabled: !form.isFieldTouched('appName') || !!form.getFieldsError().filter(function (_ref) {
-        var errors = _ref.errors;
+      disabled: !form.isFieldTouched('appName') || !!form.getFieldsError().filter(function (_ref2) {
+        var errors = _ref2.errors;
         return errors.length;
       }).length || JSON.stringify(initialValues) === JSON.stringify(form.getFieldsValue())
     }, "\u4FDD\u5B58");

package/{dist/esm → es}/modules/appSettings/dataAccessFilter/index.js

@@ -7,11 +7,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
 import { Button, Form, Input, notification } from 'antd';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
-import { urlRequest } from "../../../utils/ajax";
-import apis from "../../../constants/api";
+import { urlRequest } from '../../../utils/ajax';
+import apis from '../../../constants/api';
 import { useContext } from 'react';
 var TextArea = Input.TextArea;
-import "./index.less";
+import './index.less';
 var AppDataAccessFilter = function AppDataAccessFilter() {
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
@@ -34,9 +34,10 @@ var AppDataAccessFilter = function AppDataAccessFilter() {
         app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
-      if (res.code === 10001) {
-        var ip = (res.data_access_filter.ip || []).join('\n');
-        var ua = (res.data_access_filter.ua || []).join('\n');
+      if (parseInt(res === null || res === void 0 ? void 0 : res.code) === 10001) {
+        var _res$data_access_filt, _res$data_access_filt2;
+        var ip = ((res === null || res === void 0 ? void 0 : (_res$data_access_filt = res.data_access_filter) === null || _res$data_access_filt === void 0 ? void 0 : _res$data_access_filt.ip) || []).join('\n');
+        var ua = ((res === null || res === void 0 ? void 0 : (_res$data_access_filt2 = res.data_access_filter) === null || _res$data_access_filt2 === void 0 ? void 0 : _res$data_access_filt2.ua) || []).join('\n');
         setInitialValues({
           ip: ip,
           ua: ua
@@ -45,13 +46,11 @@ 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,
@@ -64,7 +63,7 @@ var AppDataAccessFilter = function AppDataAccessFilter() {
         ua: JSON.stringify(ua === null || ua === void 0 ? void 0 : ua.split('\n'))
       }
     }).then(function (res) {
-      if (res.code === 10001) {
+      if (parseInt(res === null || res === void 0 ? void 0 : res.code) === 10001) {
         notification.success({
           message: '设置成功'
         });

package/{dist/esm/modules/personalSetting → es/modules/appSettings}/index.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import './index.less';
 declare const PersonalSetting: React.FC<{
     settingsCallback: (type: string) => void;
 }>;

package/es/modules/appSettings/index.js

@@ -0,0 +1,52 @@
+import React from 'react';
+import AppInfo from './appInfo';
+import AppMember from './member';
+import AppSecretKey from './secretKey';
+import AppDataAccessFilter from './dataAccessFilter';
+import { SettingOutlined } from '@ant-design/icons';
+import { useContext } from 'react';
+import { BizGlobalDataContext } from '@zgfe/business-lib';
+import SettingTabs from '../../components/settingTabs';
+import AppVirtualSource from './virtualSource';
+var PersonalSetting = function PersonalSetting(_ref) {
+  var settingsCallback = _ref.settingsCallback;
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
+  var title = /*#__PURE__*/React.createElement("div", {
+    className: "tab-header"
+  }, /*#__PURE__*/React.createElement(SettingOutlined, null), /*#__PURE__*/React.createElement("span", {
+    className: "tab-header-title"
+  }, "\u5E94\u7528\u8BBE\u7F6E"), /*#__PURE__*/React.createElement("span", {
+    className: "app-name"
+  }, "(", currentApp === null || currentApp === void 0 ? void 0 : currentApp.appName, ")"));
+  var items = [{
+    key: '1',
+    label: '应用信息',
+    content: /*#__PURE__*/React.createElement(AppInfo, {
+      settingsCallback: settingsCallback
+    })
+  }, {
+    key: '2',
+    label: '应用成员',
+    content: /*#__PURE__*/React.createElement(AppMember, null)
+  }, {
+    key: '3',
+    label: '配置数据源',
+    content: /*#__PURE__*/React.createElement(AppVirtualSource, null),
+    hidden: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appType) !== 'virtual'
+  }, {
+    key: '4',
+    label: 'Secret Key',
+    content: /*#__PURE__*/React.createElement(AppSecretKey, null)
+  }, {
+    key: '5',
+    label: '数据采集屏蔽',
+    content: /*#__PURE__*/React.createElement(AppDataAccessFilter, null)
+  }];
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SettingTabs, {
+    typeName: "app",
+    title: title,
+    items: items
+  }));
+};
+export default PersonalSetting;