@zgfe/modules-settings 1.0.1-a.10 → 1.0.1-a.12

package/dist/esm/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/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/dist/esm/components/pageLoading/index.less

@@ -1,11 +1,7 @@
-.loading {
-  // position: relative;
+.settings-page-loading {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 100%;
   height: 100%;
-  :global(.ant-spin) {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-  }
 }

package/dist/esm/components/settingTabs/demo/index.d.ts

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

package/dist/esm/components/settingTabs/demo/index.js

@@ -0,0 +1,19 @@
+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, {
+    title: title,
+    items: items
+  }));
+};
+export default SettingTabsDemo;

package/dist/esm/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/components/settingTabs/index.js

@@ -8,29 +8,78 @@ 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 { useEffect } from 'react';
 import "./index.less";
-var SettingTabs = function SettingTabs(props) {
-  var _items$;
-  var title = props.title,
-    items = props.items;
+var LOCAL_TAB_INFO = 'modules-setting-component-settingTabs-tabInfo';
+var SettingTabs = function SettingTabs(_ref) {
+  var title = _ref.title,
+    items = _ref.items,
+    _ref$typeName = _ref.typeName,
+    typeName = _ref$typeName === void 0 ? '' : _ref$typeName,
+    _ref$currentKey = _ref.currentKey,
+    currentKey = _ref$currentKey === void 0 ? '' : _ref$currentKey,
+    onClick = _ref.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;
+  var menuClick = function menuClick(_ref2) {
+    var key = _ref2.key;
     setSelectedKeys([key]);
+    onClick && onClick([key]);
+  };
+  // 缓存中typeName与传入typeName不一致时清空缓存
+  useEffect(function () {
+    var localTypeName = getLocalTabInfoParams('typeName');
+    if (localTypeName !== typeName) {
+      localStorage.removeItem(LOCAL_TAB_INFO);
+    }
+  }, []);
+
+  // 强刷时记住当前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 +89,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/components/settingTabs/index.less

@@ -1,15 +1,22 @@
+@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 {
+    display: flex;
     height: calc(100vh - 130px);
-    // overflow: auto;
     padding: 24px 0px 24px;
 
     .settings-sider {
@@ -18,6 +25,7 @@
     }
 
     .settings-content {
+      flex: auto;
       max-width: 920px;
       margin-left: 24px;
       padding: 40px;

package/dist/esm/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/dist/esm/components/settingTabs/types.js

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

package/dist/esm/modules/appSettings/appInfo/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 declare const AppInfo: React.FC<{
     settingsCallback: (type: string) => void;
+    showAppAccount: boolean;
 }>;
 export default AppInfo;

package/dist/esm/modules/appSettings/appInfo/index.js

@@ -4,8 +4,6 @@ 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';
@@ -13,12 +11,14 @@ 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;
+var AppInfo = function AppInfo(_ref) {
+  var settingsCallback = _ref.settingsCallback,
+    showAppAccount = _ref.showAppAccount;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   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],
@@ -34,13 +34,18 @@ var AppInfo = function AppInfo(props) {
   // 保存
   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) {
         notification.success({
@@ -48,7 +53,8 @@ var AppInfo = function AppInfo(props) {
         });
         // 重置表单
         setInitialValues({
-          appName: appName
+          appName: appName,
+          appAccount: appAccount
         });
         form.resetFields();
         // 主应用更新appList
@@ -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/modules/appSettings/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 declare const PersonalSetting: React.FC<{
     settingsCallback: (type: string) => void;
+    showAppAccount: boolean;
 }>;
 export default PersonalSetting;

package/dist/esm/modules/appSettings/index.js

@@ -8,19 +8,24 @@ import { useContext } from 'react';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import SettingTabs from "../../components/settingTabs";
 import AppVirtualSource from "./virtualSource";
-var PersonalSetting = function PersonalSetting(props) {
-  var settingsCallback = props.settingsCallback;
-  // const [currentTab, setCurrentTab] = useState('1');
+var PersonalSetting = function PersonalSetting(_ref) {
+  var settingsCallback = _ref.settingsCallback,
+    showAppAccount = _ref.showAppAccount;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
-  var title = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SettingOutlined, null), "\u5E94\u7528\u8BBE\u7F6E", /*#__PURE__*/React.createElement("span", {
+  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
+      settingsCallback: settingsCallback,
+      showAppAccount: showAppAccount
     })
   }, {
     key: '2',
@@ -40,48 +45,10 @@ var PersonalSetting = function PersonalSetting(props) {
     label: '数据采集屏蔽',
     content: /*#__PURE__*/React.createElement(AppDataAccessFilter, null)
   }];
-  // const renderComponent = () => {
-  //   if (currentTab === '1') {
-  //     return <AppInfo settingsCallback={settingsCallback}></AppInfo>;
-  //   } else if (currentTab === '2') {
-  //     return <AppMember></AppMember>;
-  //   } else if (currentTab === '3') {
-  //     return <AppSecretKey></AppSecretKey>;
-  //   } else if (currentTab === '4') {
-  //     return <AppDataAccessFilter></AppDataAccessFilter>;
-  //   }
-  // };
-
-  // const menuClick = ({ key }: MenuItemType) => {
-  //   setCurrentTab(key as string);
-  // };
-
-  return (
-    /*#__PURE__*/
-    // <div className="settings-container">
-    //   <h3>
-    //     <SettingOutlined />
-    //     应用设置
-    //     <span className="app-name">({currentApp?.appName})</span>
-    //   </h3>
-    //   <Layout className="settings-layout">
-    //     <Sider className="settings-sider">
-    //       <Menu
-    //         style={{ width: 200 }}
-    //         defaultSelectedKeys={['1']}
-    //         items={items}
-    //         onClick={menuClick}
-    //       />
-    //     </Sider>
-    //     <Content className="settings-content" style={{ marginLeft: 24 }}>
-    //       {renderComponent()}
-    //     </Content>
-    //   </Layout>
-    // {/* </div> */}
-    React.createElement("div", null, /*#__PURE__*/React.createElement(SettingTabs, {
-      title: title,
-      items: items
-    }))
-  );
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SettingTabs, {
+    typeName: "app",
+    title: title,
+    items: items
+  }));
 };
 export default PersonalSetting;

package/dist/esm/modules/appSettings/member/index.js

@@ -4,7 +4,6 @@ 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 { Table, Popover, Tabs } from 'antd';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
@@ -13,13 +12,14 @@ import apis from "../../../constants/api";
 import { useState } from 'react';
 import AuthConfigDetail from "../../companySetting/userGroup/authConfigDetail";
 import util from "../../../utils/util";
+import { EyeOutlined } from '@ant-design/icons';
 var AppMember = function AppMember() {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     memberList = _useState2[0],
-    setMemberList = _useState2[1];
+    setMemberList = _useState2[1]; // 成员列表
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
     groupInfoList = _useState4[0],
@@ -93,21 +93,16 @@ var AppMember = function AppMember() {
           }, /*#__PURE__*/React.createElement("div", {
             className: "group-auth-list"
           }, dealArr.length ? /*#__PURE__*/React.createElement("div", null, dealArr.map(function (item) {
-            return (
-              /*#__PURE__*/
-              // .map((item) => (
-              React.createElement(AuthConfigDetail, {
-                key: item.id,
-                authConfig: item.authConfig,
-                leftMenus: leftMenus,
-                isMarsUi: isMarsUi,
-                companyAppList: companyAppList,
-                name: item === null || item === void 0 ? void 0 : item.groupName,
-                groupId: item.id,
-                type: 2
-              })
-              // )
-            );
+            return /*#__PURE__*/React.createElement(AuthConfigDetail, {
+              key: item.id,
+              authConfig: item.authConfig,
+              leftMenus: leftMenus,
+              isMarsUi: isMarsUi,
+              companyAppList: companyAppList,
+              name: item === null || item === void 0 ? void 0 : item.groupName,
+              groupId: item.id,
+              type: 2
+            });
           })) : /*#__PURE__*/React.createElement(AuthConfigDetail, {
             authConfig: {
               dataAuth: [],
@@ -124,9 +119,11 @@ var AppMember = function AppMember() {
           width: 255
         },
         trigger: "click"
-      }, /*#__PURE__*/React.createElement("span", {
-        className: "icon-eye"
-      }, "\u67E5\u770B")));
+      }, /*#__PURE__*/React.createElement(EyeOutlined, {
+        style: {
+          color: 'rgba(0, 0, 0, 0.85)'
+        }
+      }), " ", /*#__PURE__*/React.createElement("span", null, "\u67E5\u770B")));
     }
   }];
   useEffect(function () {
@@ -169,15 +166,13 @@ var AppMember = function AppMember() {
     request(apis.app.queryLeftMenus, {
       method: 'post',
       data: {
-        app_id: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) || 99677
+        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
       var menus = res.leftMenus || [];
-      var menusNameMap = {};
       var formatMenus = function formatMenus(menus) {
         menus.forEach(function (item) {
           item.routeName = util.getMenuRouterByName(item.name);
-          // menusNameMap[item.name] = item;
           if (item.childrens) {
             formatMenus(item.childrens);
           }
@@ -185,17 +180,12 @@ var AppMember = function AppMember() {
       };
       formatMenus(menus);
       setLeftMenus(menus);
-      // setMenusNameMap(menusNameMap);
-    }).catch(function (err) {
-      // todo ????
-    });
-    // };
+    }).catch(function (err) {});
   }, []);
 
   // 鉴权
   var checkAuth = function checkAuth(member) {
     var authConfig = member.authConfig || {};
-    // let id = this.appId
     var defaultAuth = authConfig.defaultAuth || {};
     var groupIds = authConfig.groupIds || [];
     if (member.is_admin) return true;
@@ -204,17 +194,16 @@ var AppMember = function AppMember() {
         return item.appId;
       });
       if (arr[0] === 0) return true;
-      if (arr.includes(currentApp.appId)) return true;
+      if (arr.includes(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId)) return true;
     }
-    // let i = 0
     for (var i = 0; i < groupInfoList.length - 1; i++) {
       if (groupIds.includes(groupInfoList[i].id)) {
-        var dataAuth = groupInfoList[i].authConfig.dataAuth;
+        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.appId)) return true;
+        if (_arr2.includes(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId)) return true;
       }
     }
     return false;
@@ -228,11 +217,11 @@ var AppMember = function AppMember() {
       return (_groupInfoMap$get = groupInfoMap.get(groupId)) === null || _groupInfoMap$get === void 0 ? void 0 : _groupInfoMap$get.groupName;
     }).join(',');
   };
-  var groupAuthConfig = function groupAuthConfig(ids) {
-    return groupInfoList.filter(function (item) {
-      return ids.includes(item.id);
-    });
-  };
+
+  // const groupAuthConfig = (ids: number[]) => {
+  //   return groupInfoList.filter((item: IGroupInfo) => ids.includes(item.id));
+  // };
+
   return /*#__PURE__*/React.createElement(Table, {
     size: "middle",
     columns: columns,