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

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

@@ -0,0 +1,12 @@
+import React from 'react';
+import './index.less';
+interface ISettingTabsItem {
+    key: string;
+    label: string;
+    content: JSX.Element;
+}
+declare const SettingTabs: React.FC<{
+    items: ISettingTabsItem[];
+    title: JSX.Element;
+}>;
+export default SettingTabs;

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

@@ -0,0 +1,52 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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, { 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";
+var SettingTabs = function SettingTabs(props) {
+  var _items$;
+  var title = props.title,
+    items = props.items;
+  var filterItems = items.filter(function (item) {
+    return !item.hidden;
+  });
+  var _useState = useState([(_items$ = items[0]) === null || _items$ === void 0 ? void 0 : _items$.key]),
+    _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;
+  };
+  // 菜单点击
+  var menuClick = function menuClick(_ref) {
+    var key = _ref.key;
+    setSelectedKeys([key]);
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "settings-container"
+  }, /*#__PURE__*/React.createElement("h3", null, title), /*#__PURE__*/React.createElement(Layout, {
+    className: "settings-layout"
+  }, /*#__PURE__*/React.createElement(Sider, {
+    className: "settings-sider"
+  }, /*#__PURE__*/React.createElement(Menu, {
+    style: {
+      width: 200
+    },
+    selectedKeys: selectedKeys,
+    items: filterItems,
+    onClick: menuClick
+  })), /*#__PURE__*/React.createElement(Content, {
+    className: "settings-content"
+  }, selectedContent())));
+};
+export default SettingTabs;

package/dist/esm/components/settingTabs/index.less

@@ -0,0 +1,31 @@
+.settings-container {
+  padding: 24px;
+  background: #f0f2f5;
+
+  .app-name {
+    font-weight: normal;
+    font-size: 14px;
+  }
+
+  .settings-layout {
+    height: 614px;
+    // overflow: auto;
+    padding: 24px 0px 24px;
+
+    .settings-sider {
+      background: white;
+    }
+
+    .settings-content {
+      max-width: 920px;
+      margin-left: 24px;
+      padding: 40px;
+      overflow: auto;
+      background: white;
+
+      .ant-menu-vertical .ant-menu-item {
+        margin: 0px !important;
+      }
+    }
+  }
+}

package/dist/esm/constants/api.d.ts

@@ -12,6 +12,7 @@ declare let apis: {
         getCompanyAppList: string;
         editVirtualApp: string;
         queryAccountEvents: string;
+        editVirtualSourceApp: string;
     };
     setting: {
         updateCompanyName: string;
@@ -36,6 +37,8 @@ declare let apis: {
         updateAppName: string;
         createFilter: string;
         queryFilter: string;
+        queryNoticeConfig: string;
+        editNoticeConfig: string;
     };
     eventMeta: {
         queryEventMeta: string;

package/dist/esm/constants/api.js

@@ -16,8 +16,10 @@ var apis = {
     // 查询公司下所有应用列表
     editVirtualApp: apiPrefix + '/common/proxy/user/editDataSource.jsp',
     // 修改虚拟应用
-    queryAccountEvents: apiPrefix + '/common/proxy/contract/v2queryAccountEvent.jsp'
+    queryAccountEvents: apiPrefix + '/common/proxy/contract/v2queryAccountEvent.jsp',
+    editVirtualSourceApp: apiPrefix + '/common/proxy/user/editSourceApp.jsp' // 修改虚拟应用的来源应用配置
   },
+
   setting: {
     updateCompanyName: apiPrefix + '/common/proxy/company/v2updateInfo.jsp',
     updateLicense: apiPrefix + '/system/license',
@@ -42,7 +44,10 @@ var apis = {
     // 应用设置
     updateAppName: apiPrefix + '/common/proxy/user/updateAppName.jsp',
     createFilter: apiPrefix + '/common/proxy/user/createFilter.jsp',
-    queryFilter: apiPrefix + '/common/proxy/user/queryFilter.jsp'
+    queryFilter: apiPrefix + '/common/proxy/user/queryFilter.jsp',
+    //系统设置
+    queryNoticeConfig: apiPrefix + '/systemSettings/queryNoticeSettings',
+    editNoticeConfig: apiPrefix + '/systemSettings/setNoticeSettings'
   },
   eventMeta: {
     queryEventMeta: apiPrefix + '/common/proxy/data/queryEventMetasOfGroup.jsp'

package/dist/esm/constants/icons/iconfont.css

@@ -1465,3 +1465,10 @@
   content: "\e6b7";
 }
 
+.qingchu:before {
+  /* content: "\e759"; */
+
+  content: "\e674";
+  
+}
+

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

@@ -18,7 +18,7 @@ var AppInfo = function AppInfo(props) {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   var _useState = useState({
-      appName: currentApp.appName
+      appName: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appName
     }),
     _useState2 = _slicedToArray(_useState, 2),
     initialValues = _useState2[0],

package/dist/esm/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/dist/esm/modules/appSettings/index.js

@@ -1,79 +1,87 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-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, { useState } from 'react';
-import { Menu } from 'antd';
+import React from 'react';
 import AppInfo from "./appInfo";
 import AppMember from "./member";
 import AppSecretKey from "./secretKey";
 import AppDataAccessFilter from "./dataAccessFilter";
-import Layout, { Content } from 'antd/lib/layout/layout';
-import Sider from 'antd/lib/layout/Sider';
-import "./index.less";
 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(props) {
   var settingsCallback = props.settingsCallback;
-  var _useState = useState('1'),
-    _useState2 = _slicedToArray(_useState, 2),
-    currentTab = _useState2[0],
-    setCurrentTab = _useState2[1];
+  // const [currentTab, setCurrentTab] = useState('1');
   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", {
+    className: "app-name"
+  }, "(", currentApp === null || currentApp === void 0 ? void 0 : currentApp.appName, ")"));
   var items = [{
     key: '1',
-    label: '应用信息'
+    label: '应用信息',
+    content: /*#__PURE__*/React.createElement(AppInfo, {
+      settingsCallback: settingsCallback
+    })
   }, {
     key: '2',
-    label: '应用成员'
+    label: '应用成员',
+    content: /*#__PURE__*/React.createElement(AppMember, null)
   }, {
     key: '3',
-    label: 'Secret Key'
+    label: '配置数据源',
+    content: /*#__PURE__*/React.createElement(AppVirtualSource, null),
+    hidden: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appType) !== 'virtual'
   }, {
     key: '4',
-    label: '数据采集屏蔽'
+    label: 'Secret Key',
+    content: /*#__PURE__*/React.createElement(AppSecretKey, null)
+  }, {
+    key: '5',
+    label: '数据采集屏蔽',
+    content: /*#__PURE__*/React.createElement(AppDataAccessFilter, null)
   }];
-  var renderComponent = function renderComponent() {
-    if (currentTab === '1') {
-      return /*#__PURE__*/React.createElement(AppInfo, {
-        settingsCallback: settingsCallback
-      });
-    } else if (currentTab === '2') {
-      return /*#__PURE__*/React.createElement(AppMember, null);
-    } else if (currentTab === '3') {
-      return /*#__PURE__*/React.createElement(AppSecretKey, null);
-    } else if (currentTab === '4') {
-      return /*#__PURE__*/React.createElement(AppDataAccessFilter, null);
-    }
-  };
-  var menuClick = function menuClick(_ref) {
-    var key = _ref.key;
-    setCurrentTab(key);
-  };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "settings-container"
-  }, /*#__PURE__*/React.createElement("h3", null, /*#__PURE__*/React.createElement(SettingOutlined, null), "\u5E94\u7528\u8BBE\u7F6E", /*#__PURE__*/React.createElement("span", {
-    className: "app-name"
-  }, "(", currentApp === null || currentApp === void 0 ? void 0 : currentApp.appName, ")")), /*#__PURE__*/React.createElement(Layout, {
-    className: "settings-layout"
-  }, /*#__PURE__*/React.createElement(Sider, {
-    className: "settings-sider"
-  }, /*#__PURE__*/React.createElement(Menu, {
-    style: {
-      width: 200
-    },
-    defaultSelectedKeys: ['1'],
-    items: items,
-    onClick: menuClick
-  })), /*#__PURE__*/React.createElement(Content, {
-    className: "settings-content",
-    style: {
-      marginLeft: 24
-    }
-  }, renderComponent())));
+  // 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
+    }))
+  );
 };
 export default PersonalSetting;

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

@@ -1,21 +1,21 @@
-.settings-container {
-  padding: 24px;
-  background: #f0f2f5;
-  .app-name {
-    font-weight: normal;
-    font-size: 14px;
-  }
-  .settings-layout {
-    height: 614px;
-    padding: 24px 0px 24px;
-    .settings-sider {
-      background: white;
-    }
-    .settings-content {
-      max-width: 920px;
-      margin-left: 24px;
-      padding: 40px;
-      background: white;
-    }
-  }
-}
+// .settings-container {
+//   padding: 24px;
+//   background: #f0f2f5;
+//   .app-name {
+//     font-weight: normal;
+//     font-size: 14px;
+//   }
+//   .settings-layout {
+//     height: 614px;
+//     padding: 24px 0px 24px;
+//     .settings-sider {
+//       background: white;
+//     }
+//     .settings-content {
+//       max-width: 920px;
+//       margin-left: 24px;
+//       padding: 40px;
+//       background: white;
+//     }
+//   }
+// }

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

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

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

@@ -0,0 +1,160 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 { BizGlobalDataContext } from '@zgfe/business-lib';
+import { notification } from 'antd';
+import React, { useEffect } from 'react';
+import { useContext } from 'react';
+import { useState } from 'react';
+import api from "../../../constants/api";
+import request, { urlRequest } from "../../../utils/ajax";
+import util from "../../../utils/util";
+import SourceItem from "../../companySetting/virtualApp/panels/sourceItem";
+import "./styles/index.less";
+var AppVirtualSource = function AppVirtualSource(props) {
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
+  // const { currentApp } = { currentApp: { appId: 99775 } };
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    sourceApps = _useState2[0],
+    setSourceApps = _useState2[1];
+  var _useState3 = useState({}),
+    _useState4 = _slicedToArray(_useState3, 2),
+    virtualAppsIdMap = _useState4[0],
+    setVirtualAppsIdMap = _useState4[1];
+  var _useState5 = useState(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    selectApp = _useState6[0],
+    setSelectApp = _useState6[1];
+  var _useState7 = useState({}),
+    _useState8 = _slicedToArray(_useState7, 2),
+    sourceAppIdMap = _useState8[0],
+    setSourceAppIdMap = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    configData = _useState10[0],
+    setConfigData = _useState10[1];
+  useEffect(function () {
+    Promise.all([queryVirtualApps(), getCompanyAppList()]).then(function (res) {});
+  }, []);
+  // 普通应用列表
+  var getCompanyAppList = function getCompanyAppList() {
+    return new Promise(function (resolve, reject) {
+      request(api.app.getCompanyAppList, {}).then(function (res) {
+        var resSourceApps = res && res.applist || [];
+        setSourceApps(resSourceApps);
+        var result = [];
+        resSourceApps.map(function (realApp) {
+          if (sourceAppIdMap[realApp.id]) {
+            result.push({
+              app_id: realApp.id,
+              event_id: getSourceAppEventIdArr(realApp.id)
+            });
+          } else {
+            result.push(null);
+          }
+        });
+        setConfigData(result);
+        resolve(resSourceApps);
+      }).catch(function (err) {
+        reject(err);
+        notification.error({
+          message: '查询虚拟应用失败'
+        });
+      });
+    });
+  };
+  // 虚拟应用列表
+  var queryVirtualApps = function queryVirtualApps() {
+    return new Promise(function (resolve, reject) {
+      request(api.app.queryVirtualApps, {}).then(function (res) {
+        if (res.code !== 10001) {
+          throw new Error('查询虚拟应用失败');
+        }
+        var list = res.app_list;
+        var idMap = {};
+        list.forEach(function (item) {
+          idMap[item.app_id] = item;
+        });
+        // setVirtualAppList(list);
+        setVirtualAppsIdMap(idMap);
+        setSelectApp(idMap[currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+        var sources = idMap[currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId].data_source || [];
+        var idMaps = {};
+        sources.forEach(function (item) {
+          idMaps[item.source_app_id] = item;
+        });
+        setSourceAppIdMap(idMaps);
+        resolve(idMaps);
+      }).catch(function (err) {
+        reject(err);
+        notification.error({
+          message: '查询虚拟应用失败'
+        });
+      });
+    });
+  };
+  var getSourceAppEventIdArr = function getSourceAppEventIdArr(sourceAppId) {
+    var sourceData = sourceAppIdMap[sourceAppId] || {};
+    return sourceData.source_event_id || [];
+  };
+  var changeData = function changeData(event_id, app_id, checked, index) {
+    var _dealData$index, _dealData$index2;
+    var dealData = util.clone(configData);
+    dealData[index] = checked ? {
+      app_id: app_id,
+      event_id: event_id
+    } : null;
+    // 保存单条数据
+    urlRequest(api.app.editVirtualSourceApp, {
+      method: 'post',
+      data: {
+        virtual_app_id: selectApp.app_id,
+        source_app_id: (_dealData$index = dealData[index]) === null || _dealData$index === void 0 ? void 0 : _dealData$index.app_id,
+        source_event_list: decodeURIComponent(JSON.stringify((_dealData$index2 = dealData[index]) === null || _dealData$index2 === void 0 ? void 0 : _dealData$index2.event_id))
+      }
+    }).then(function (res) {
+      if (res.code === 10001) {
+        notification.success({
+          message: '修改成功'
+        });
+      } else {
+        throw new Error('请求失败');
+      }
+    }).catch(function (err) {
+      notification.error({
+        message: '修改失败，请重试！'
+      });
+    });
+    setConfigData(dealData);
+  };
+  return /*#__PURE__*/React.createElement("div", null, selectApp ? /*#__PURE__*/React.createElement("div", {
+    className: "app-setting-virtual-source"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "source-app-list virtual-app-table-box"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "table-title"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "source-app-name"
+  }, "\u6E90\u5E94\u7528"), /*#__PURE__*/React.createElement("span", {
+    className: "source-app-events-num"
+  }, "\u5E94\u7528\u4E8B\u4EF6")), /*#__PURE__*/React.createElement("div", {
+    className: "table-body"
+  }, sourceApps === null || sourceApps === void 0 ? void 0 : sourceApps.map(function (realApp, index) {
+    return /*#__PURE__*/React.createElement(SourceItem, {
+      key: realApp.id,
+      sourceAppId: realApp.id,
+      checked: sourceAppIdMap[realApp.id],
+      sourceAppName: realApp.appName,
+      sourceEventsId: getSourceAppEventIdArr(realApp.id),
+      onChange: function onChange(event_id, app_id, checked) {
+        changeData(event_id, app_id, checked, index);
+      }
+    });
+  })))) : /*#__PURE__*/React.createElement("div", null, "\u6682\u65E0\u6570\u636E"));
+};
+export default AppVirtualSource;

package/dist/esm/modules/appSettings/virtualSource/styles/index.less

@@ -0,0 +1,28 @@
+@import url(./table.less);
+
+.app-setting-virtual-source {
+  height: 100%;
+  min-height: 120px;
+  padding: 20px;
+  overflow: auto;
+
+  .source-app-list {
+    width: 100%;
+    height: auto;
+
+    .source-app-name {
+      display: inline-block;
+      width: 354px;
+      margin-left: 10px;
+
+      .source-app-events-num {
+        display: inline-block;
+        // margin-left: 10px;
+
+        .empty-data {
+          line-height: 47px;
+        }
+      }
+    }
+  }
+}

package/dist/esm/modules/appSettings/virtualSource/styles/table.less

@@ -0,0 +1,51 @@
+.virtual-app-table-box {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  font-size: 14px;
+  border: 1px solid #dadada;
+
+  .table-title {
+    display: flex;
+    flex-shrink: 0;
+    // padding: 0 20px;
+    box-sizing: border-box;
+    height: 32px;
+    color: #565656;
+    font-size: 0;
+    line-height: 32px;
+    background: #e6e6e6;
+
+    > div,
+    > span {
+      display: inline-block;
+      //   margin-left: 10px;
+      font-size: 14px;
+
+      .table-body {
+        min-height: 47px;
+        padding: 0 20px;
+
+        .empty-data {
+          text-align: center;
+
+          > div,
+          > span {
+            border-bottom: 1px solid #eeeeee;
+
+            > div,
+            > span {
+              display: inline-block;
+              margin-left: 10px;
+              font-size: 14px;
+
+              &:last-child {
+                border: none;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/dist/esm/modules/companySetting/edit/user.js

@@ -47,7 +47,7 @@ var Info = function Info(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     CEPData = _useState4[0],
     setCEPData = _useState4[1];
-  var _useState5 = useState('io'),
+  var _useState5 = useState(serviceType === 2 ? 'cep' : 'io'),
     _useState6 = _slicedToArray(_useState5, 2),
     currentTab = _useState6[0],
     setCurrentTab = _useState6[1];
@@ -107,7 +107,7 @@ var Info = function Info(props) {
   var onSaveCallback = function onSaveCallback() {
     // if (currentTab === 'io'){
     // "funAuth":[{"resource":"/user/userList","opts":["all"]},{"resource":"/user/userGroup","opts":["all"]},{"resource":"/user/userTags","opts":["all"]},{"resource":"/setting/company","opts":["all"]}]
-    var authConfig = refAuthConfig.current.getFormData();
+    var authConfig = serviceType !== 2 ? refAuthConfig.current.getFormData() : {};
     var groupIdArr = groups.map(function (item) {
       return item.id;
     });

package/dist/esm/modules/companySetting/edit/userGroup.js

@@ -59,7 +59,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     CEPData = _useState12[0],
     setCEPData = _useState12[1];
-  var _useState13 = useState('io'),
+  var _useState13 = useState(serviceType === 2 ? 'cep' : 'io'),
     _useState14 = _slicedToArray(_useState13, 2),
     currentTab = _useState14[0],
     setCurrentTab = _useState14[1];
@@ -158,7 +158,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
       return;
     }
     setBtnLoading(true);
-    var authConfig = refAuthConfig.current.getFormData();
+    var authConfig = serviceType !== 2 ? refAuthConfig.current.getFormData() : {};
     var userIdArr = user.map(function (item) {
       return item.id;
     });

package/dist/esm/modules/companySetting/virtualApp/panels/sourceItem.js

@@ -136,7 +136,8 @@ var VirtualApp = function VirtualApp(props) {
   })))), showTransfer ? /*#__PURE__*/React.createElement("div", {
     className: "source-transfer-item"
   }, /*#__PURE__*/React.createElement("span", {
-    className: "source-app-transfer"
+    className: "source-app-transfer",
+    id: "selfTransfer"
   }, /*#__PURE__*/React.createElement(Transfer, {
     dataSource: dataSource,
     showSearch: true,

package/dist/esm/modules/companySetting/virtualApp/styles/sourceItem.less

@@ -25,3 +25,9 @@
     height: 310px;
   }
 }
+
+#selfTransfer {
+  .ant-transfer-list-body-with-search {
+    padding-top: 0px;
+  }
+}

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

@@ -1,31 +1,18 @@
 import React from 'react';
-import { Menu } from 'antd';
-import Layout, { Content } from 'antd/lib/layout/layout';
-import Sider from 'antd/lib/layout/Sider';
 import "./index.less";
 import { DesktopOutlined } from '@ant-design/icons';
+import Notice from "./notice";
+import SettingTabs from "../../components/settingTabs";
 var SystemSetting = function SystemSetting() {
+  var title = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(DesktopOutlined, null), "\u7CFB\u7EDF\u8BBE\u7F6E");
   var items = [{
     key: '1',
-    label: '应用信息'
+    label: '通知配置',
+    content: /*#__PURE__*/React.createElement(Notice, null)
   }];
-  return /*#__PURE__*/React.createElement("div", {
-    className: "settings-container"
-  }, /*#__PURE__*/React.createElement("h3", null, /*#__PURE__*/React.createElement(DesktopOutlined, null), "\u7CFB\u7EDF\u8BBE\u7F6E"), /*#__PURE__*/React.createElement(Layout, {
-    className: "settings-layout"
-  }, /*#__PURE__*/React.createElement(Sider, {
-    className: "settings-sider"
-  }, /*#__PURE__*/React.createElement(Menu, {
-    style: {
-      width: 200
-    },
-    defaultSelectedKeys: ['1'],
-    items: items
-  })), /*#__PURE__*/React.createElement(Content, {
-    className: "settings-content",
-    style: {
-      marginLeft: 24
-    }
-  }, "\u901A\u77E5\u914D\u7F6E")));
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SettingTabs, {
+    items: items,
+    title: title
+  }));
 };
 export default SystemSetting;

package/dist/esm/modules/systemSetting/notice/configItem/index.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import './index.less';
+declare const ConfigItem: React.FC<{
+    item: any;
+    onEdit: (item: any) => any;
+}>;
+export default ConfigItem;

package/dist/esm/modules/systemSetting/notice/configItem/index.js

@@ -0,0 +1,48 @@
+import { Button, Col, Descriptions, Row } from 'antd';
+import { EditOutlined } from '@ant-design/icons';
+import React from 'react';
+import "./index.less";
+var ConfigItem = function ConfigItem(props) {
+  var _configFieldMap$get;
+  var onEdit = props.onEdit,
+    item = props.item;
+  var configFieldMap = new Map().set('email', [{
+    name: 'host',
+    value: 'URL'
+  }, {
+    name: 'user',
+    value: '邮箱账号'
+  }, {
+    name: 'port',
+    value: '端口号'
+  }, {
+    name: 'fromName',
+    value: '发件人昵称'
+  }]);
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Row, {
+    className: "item-title"
+  }, /*#__PURE__*/React.createElement(Col, {
+    span: 12,
+    className: "title-left"
+  }, /*#__PURE__*/React.createElement("span", null, item.name)), /*#__PURE__*/React.createElement(Col, {
+    span: 12,
+    className: "title-right"
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    onClick: function onClick() {
+      return onEdit(item);
+    }
+  }, /*#__PURE__*/React.createElement(EditOutlined, {
+    style: {
+      color: 'white'
+    }
+  }), "\u7F16\u8F91"))), /*#__PURE__*/React.createElement(Descriptions, {
+    column: 1
+  }, (_configFieldMap$get = configFieldMap.get(item.type)) === null || _configFieldMap$get === void 0 ? void 0 : _configFieldMap$get.map(function (field) {
+    return /*#__PURE__*/React.createElement(Descriptions.Item, {
+      key: field.value,
+      label: field.value
+    }, item.config[field.name]);
+  })));
+};
+export default ConfigItem;

package/dist/esm/modules/systemSetting/notice/configItem/index.less

@@ -0,0 +1,15 @@
+.item-title {
+  height: 48px;
+  margin: 0px -40px 24px -40px;
+  padding: 0px 40px;
+  line-height: 48px;
+  background-color: #f7f8f9;
+
+  .title-left {
+    font-size: 16px;
+  }
+
+  .title-right {
+    text-align: right;
+  }
+}

package/dist/esm/modules/systemSetting/notice/edit/index.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import './index.less';
+export interface ISystemSettingItem {
+    host: string;
+    user: string;
+    pass: string;
+    port: string;
+    fromName: string;
+}
+declare const ItemEdit: React.FC<{
+    editSetting: any;
+    editCancel: () => void;
+    onSubmit: (values: ISystemSettingItem) => void;
+}>;
+export default ItemEdit;

package/dist/esm/modules/systemSetting/notice/edit/index.js

@@ -0,0 +1,125 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 { Form, Input, Button, Col, Row } from 'antd';
+import React, { useState } from 'react';
+import constants from "../../../../utils/constants";
+import "./index.less";
+var ItemEdit = function ItemEdit(props) {
+  var _settingsOptionsMap$g, _settingsOptionsMap$g2;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var editSetting = props.editSetting,
+    editCancel = props.editCancel,
+    onSubmit = props.onSubmit;
+  var _useState = useState(editSetting.config),
+    _useState2 = _slicedToArray(_useState, 2),
+    initialValues = _useState2[0],
+    setInitialValues = _useState2[1];
+  var settingsOptionsMap = new Map().set('email', {
+    config: [{
+      name: 'host',
+      field: 'URL',
+      rules: [{
+        required: true,
+        message: '邮箱服务器URL未填写'
+      }],
+      placeholder: '输入您的邮件URL'
+    }, {
+      name: 'user',
+      field: '邮箱账号',
+      rules: [{
+        required: true,
+        message: '请输入您的邮箱账号'
+      }, {
+        pattern: constants.regExp.email,
+        message: '请输入正确格式的邮箱'
+      }],
+      placeholder: '输入您的邮件账号'
+    }, {
+      name: 'pass',
+      field: '授权码',
+      rules: [{
+        required: true,
+        message: '授权码未填写'
+      }],
+      type: 'password',
+      placeholder: '输入您的授权码'
+    }, {
+      name: 'port',
+      field: '端口号',
+      rules: [{
+        required: true,
+        message: '请输入端口号'
+      }, {
+        pattern: /^\d{1,10}$/,
+        message: '端口请输入长度小于10的数字'
+      }],
+      placeholder: '请输入端口号'
+    }, {
+      name: 'fromName',
+      field: '发件人昵称',
+      rules: [{
+        max: 10,
+        message: '昵称长度不可大于10'
+      }],
+      required: false
+    }]
+  });
+
+  // 确认
+  var onFinish = function onFinish() {
+    onSubmit(form.getFieldsValue());
+  };
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    className: "item-edit-title"
+  }, editSetting.name, "\u914D\u7F6E"), /*#__PURE__*/React.createElement("div", {
+    className: "subtitle"
+  }, "\u53C2\u6570\u914D\u7F6E"), /*#__PURE__*/React.createElement(Form, {
+    form: form,
+    layout: "vertical",
+    labelCol: {
+      span: 8
+    },
+    wrapperCol: {
+      span: 16
+    },
+    initialValues: initialValues,
+    onFinish: onFinish
+  }, /*#__PURE__*/React.createElement(Row, null, (_settingsOptionsMap$g = settingsOptionsMap.get(editSetting.type)) === null || _settingsOptionsMap$g === void 0 ? void 0 : (_settingsOptionsMap$g2 = _settingsOptionsMap$g.config) === null || _settingsOptionsMap$g2 === void 0 ? void 0 : _settingsOptionsMap$g2.map(function (config, index) {
+    return /*#__PURE__*/React.createElement(Col, {
+      span: 12,
+      key: index
+    }, /*#__PURE__*/React.createElement(Form.Item, {
+      label: config.field,
+      name: config.name,
+      rules: config.rules
+    }, /*#__PURE__*/React.createElement(Input, {
+      placeholder: config.placeholder,
+      type: config.type === 'password' ? 'password' : 'text'
+    })));
+  }), /*#__PURE__*/React.createElement(Col, {
+    span: 24,
+    className: "operation-container"
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    shouldUpdate: true
+  }, function () {
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      htmlType: "submit",
+      disabled: !!form.getFieldsError().filter(function (_ref) {
+        var errors = _ref.errors;
+        return errors.length;
+      }).length || JSON.stringify(initialValues) === JSON.stringify(form.getFieldsValue())
+    }, "\u786E\u8BA4"), /*#__PURE__*/React.createElement(Button, {
+      onClick: function onClick() {
+        return editCancel();
+      }
+    }, "\u53D6\u6D88"));
+  })))));
+};
+export default ItemEdit;

package/dist/esm/modules/systemSetting/notice/edit/index.less

@@ -0,0 +1,26 @@
+.item-edit-title {
+  height: 48px;
+  margin: -40px -40px 24px;
+  padding-left: 40px;
+  font-size: 16px;
+  line-height: 48px;
+  background-color: #f7f8f9;
+}
+
+.operation-container {
+  margin-top: 24px;
+
+  button {
+    margin-right: 12px;
+  }
+}
+
+.subtitle {
+  width: 700px;
+  margin-bottom: 24px;
+  color: #999;
+  font-weight: 400;
+  font-size: 16px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  line-height: 14px;
+}

package/dist/esm/modules/systemSetting/notice/index.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { ISystemSettingItem } from './edit';
+export interface IConfigItem {
+    name: string;
+    type: string;
+    config: ISystemSettingItem;
+}
+declare const Notice: React.FC;
+export default Notice;

package/dist/esm/modules/systemSetting/notice/index.js

@@ -0,0 +1,101 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 { notification } from 'antd';
+import React from 'react';
+import { useState } from 'react';
+import { useEffect } from 'react';
+import apis from "../../../constants/api";
+import request, { urlRequest } from "../../../utils/ajax";
+import ConfigItem from "./configItem";
+import ItemEdit from "./edit";
+var Notice = function Notice() {
+  var typeMap = new Map([[1, 'email']]);
+  var _useState = useState(new Map().set('email', {
+      type: 'email',
+      name: '邮件',
+      config: {}
+    })),
+    _useState2 = _slicedToArray(_useState, 2),
+    settingMap = _useState2[0],
+    setSettingMap = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isEdit = _useState4[0],
+    setIsEdit = _useState4[1];
+  var _useState5 = useState({}),
+    _useState6 = _slicedToArray(_useState5, 2),
+    editSetting = _useState6[0],
+    setEditSetting = _useState6[1];
+  useEffect(function () {
+    // 获取配置
+    request(apis.setting.queryNoticeConfig, {
+      method: 'post'
+    }).then(function (res) {
+      res.data.forEach(function (item) {
+        settingMap.get(typeMap.get(item.type)).config = JSON.parse(item.config);
+        var newSettingMap = new Map(_toConsumableArray(settingMap));
+        setSettingMap(newSettingMap);
+      });
+    });
+  }, []);
+
+  // 点击编辑按钮
+  var onEdit = function onEdit(item) {
+    setIsEdit(true);
+    setEditSetting(item);
+  };
+
+  // 编辑-取消
+  var onEditCancel = function onEditCancel() {
+    setIsEdit(false);
+  };
+
+  // 编辑-确认
+  var onEditSubmit = function onEditSubmit(values) {
+    var formData = new FormData();
+    formData.set('type', editSetting.type);
+    formData.set('config', JSON.stringify(values));
+    urlRequest(apis.setting.editNoticeConfig, {
+      method: 'post',
+      // data: formData,
+      data: {
+        type: editSetting.type === 'email' ? 1 : null,
+        config: JSON.stringify(values)
+      }
+    }).then(function (res) {
+      if (res.status === 200) {
+        notification.success({
+          message: '配置成功'
+        });
+        settingMap.get(editSetting.type).config = values;
+        var newSettingMap = new Map(_toConsumableArray(settingMap));
+        setSettingMap(newSettingMap);
+        setIsEdit(false);
+      } else {
+        notification.error({
+          message: '配置失败'
+        });
+      }
+    });
+  };
+  return /*#__PURE__*/React.createElement("div", null, isEdit ? /*#__PURE__*/React.createElement(ItemEdit, {
+    editSetting: editSetting,
+    editCancel: onEditCancel,
+    onSubmit: onEditSubmit
+  }) : /*#__PURE__*/React.createElement("div", null, (_toConsumableArray(settingMap) || []).map(function (item) {
+    return /*#__PURE__*/React.createElement(ConfigItem, {
+      key: item[0],
+      item: item[1],
+      onEdit: onEdit
+    });
+  })));
+};
+export default Notice;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.0.1-a.7",
+  "version": "1.0.1-a.9",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -50,7 +50,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "595394564889d158714137705b73dcca1bad3504",
+  "gitHead": "46b6d784fa0b2a7e6789f520cc8ce1763e568218",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }