@zgfe/modules-settings 1.2.2-node.0 → 1.2.3-log.0

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

@@ -6,7 +6,6 @@ declare const authConfigDetail: React.FC<{
     authConfig: Config;
     companyAppList: AppListItem[];
     leftMenus: LeftMenusItem[];
-    isMarsUi: boolean;
     id?: number;
     groupId?: number;
     type: number;

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

@@ -24,7 +24,6 @@ var authConfigDetail = function authConfigDetail(props) {
     authConfig = props.authConfig,
     companyAppList = props.companyAppList,
     leftMenus = props.leftMenus,
-    isMarsUi = props.isMarsUi,
     id = props.id,
     groupId = props.groupId,
     type = props.type,
@@ -141,7 +140,7 @@ var authConfigDetail = function authConfigDetail(props) {
   };
   var loopFormatTopMenu = function loopFormatTopMenu(topMenu) {
     // 菜单不在权限配置中
-    if (!functionalPermissions[isMarsUi ? 'mars' : 'standard'][topMenu.name]) {
+    if (!functionalPermissions['standard'][topMenu.name]) {
       return null;
     }
     var childrenArr = [];
@@ -174,7 +173,7 @@ var authConfigDetail = function authConfigDetail(props) {
     var formatMenu = {
       name: {
         describe: topMenu.nametext,
-        key: functionalPermissions[isMarsUi ? 'mars' : 'standard'][topMenu.name].key
+        key: functionalPermissions['standard'][topMenu.name].key
       },
       show: false,
       children: childrenArr
@@ -184,21 +183,21 @@ var authConfigDetail = function authConfigDetail(props) {
   var checkFunPermission = function checkFunPermission(key) {
     // 检查功能模块权限配置，true为有权限，false无权限
     if (!key) return false;
-    if (key === functionalPermissions[isMarsUi ? 'mars' : 'standard'].default.key) return true;
+    if (key === functionalPermissions['standard'].default.key) return true;
     var funAuthConfig = authConfig.funAuth;
     var funAuthKeyArr = funAuthConfig ? funAuthConfig.map(function (item) {
       return item.resource;
     }) : [];
     // 智能触达：管理员、运营人员
     if (['mkt_admin', 'mkt_ops'].includes(key)) {
-      var mktKey = functionalPermissions[isMarsUi ? 'mars' : 'standard'].market.key;
+      var mktKey = functionalPermissions['standard'].market.key;
       var mktConfig = funAuthConfig && funAuthConfig.find(function (item) {
         return item.resource === mktKey;
       });
       if (!mktConfig) return false;
       return mktConfig.opts[0] === key;
     }
-    if (funAuthKeyArr.includes(functionalPermissions[isMarsUi ? 'mars' : 'standard'].all.key)) {
+    if (funAuthKeyArr.includes(functionalPermissions['standard'].all.key)) {
       // 功能权限：全选
       return true;
     }
@@ -235,14 +234,14 @@ var authConfigDetail = function authConfigDetail(props) {
     });
     // 设置菜单
     var setting = {
-      name: functionalPermissions[isMarsUi ? 'mars' : 'standard'].setting.default,
+      name: functionalPermissions['standard'].setting.default,
       show: false,
       children: [{
-        name: functionalPermissions[isMarsUi ? 'mars' : 'standard'].setting.company,
+        name: functionalPermissions['standard'].setting.company,
         show: false,
         children: []
       }, {
-        name: functionalPermissions[isMarsUi ? 'mars' : 'standard'].setting.app,
+        name: functionalPermissions['standard'].setting.app,
         show: false,
         children: []
       }]

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

@@ -5,7 +5,6 @@ declare const GroupItem: React.FC<{
     groupData: AllGroupInfosItem;
     companyAppList: AppListItem[];
     leftMenus: LeftMenusItem[];
-    isMarsUi: boolean;
     serviceType: number;
     showGroupEditAuthEvent: (data: AllGroupInfosItem) => void;
     delGroupCallback: (id: number) => void;

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

@@ -19,7 +19,6 @@ var GroupItem = function GroupItem(props) {
   var groupData = props.groupData,
     companyAppList = props.companyAppList,
     leftMenus = props.leftMenus,
-    isMarsUi = props.isMarsUi,
     serviceType = props.serviceType,
     showGroupEditAuthEvent = props.showGroupEditAuthEvent,
     delGroupCallback = props.delGroupCallback;
@@ -93,7 +92,6 @@ var GroupItem = function GroupItem(props) {
         authConfig: groupData.authConfig || {},
         companyAppList: companyAppList,
         leftMenus: leftMenus,
-        isMarsUi: isMarsUi,
         groupId: groupData.id,
         type: 2,
         serviceType: serviceType

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

@@ -6,7 +6,6 @@ declare const UserGroup: React.FC<{
     allGroupInfos: AllGroupInfosItem[];
     companyAppList: AppListItem[];
     leftMenus: LeftMenusItem[];
-    isMarsUi: boolean;
     isAdmin: boolean;
     serviceType: number;
     delGroupCallback: (id: number) => void;

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

@@ -17,7 +17,6 @@ var UserGroup = function UserGroup(props) {
     allGroupInfos = props.allGroupInfos,
     companyAppList = props.companyAppList,
     leftMenus = props.leftMenus,
-    isMarsUi = props.isMarsUi,
     isAdmin = props.isAdmin,
     serviceType = props.serviceType,
     delGroupCallback = props.delGroupCallback,
@@ -100,7 +99,6 @@ var UserGroup = function UserGroup(props) {
     leftMenus: leftMenus,
     isAdmin: isAdmin,
     id: id,
-    isMarsUi: isMarsUi,
     onCancel: function onCancel() {
       return setGroupEditAuthState(false);
     },
@@ -137,7 +135,6 @@ var UserGroup = function UserGroup(props) {
       showGroupEditAuthEvent: showGroupEditAuthEvent,
       companyAppList: companyAppList,
       leftMenus: leftMenus,
-      isMarsUi: isMarsUi,
       delGroupCallback: delGroupCallback,
       serviceType: serviceType
     });

package/es/modules/personalSetting/index.js

@@ -13,6 +13,7 @@ import PersonalUnbinding from './unbinding';
 import { useContext } from 'react';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import util from '../../utils/util';
+import SecurityLog from './securityLog';
 var PersonalSetting = function PersonalSetting(_ref) {
   var settingsCallback = _ref.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
@@ -49,6 +50,10 @@ var PersonalSetting = function PersonalSetting(_ref) {
     label: '解绑虚拟MFA',
     hidden: !(currentUser === null || currentUser === void 0 ? void 0 : currentUser.secret) || isDemo,
     content: /*#__PURE__*/React.createElement(PersonalUnbinding, null)
+  }, {
+    key: '4',
+    label: '安全日志',
+    content: /*#__PURE__*/React.createElement(SecurityLog, null)
   }];
   return /*#__PURE__*/React.createElement(SettingTabs, {
     typeName: "personal",

package/es/modules/personalSetting/securityLog/index.d.ts

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

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

@@ -0,0 +1,156 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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); }
+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 { BizTable } from '@zgfe/business-lib';
+import { DatePicker, Spin } from 'antd';
+import locale from 'antd/es/date-picker/locale/zh_CN';
+import moment from 'moment';
+import React, { useEffect, useState } from 'react';
+import request from '../../../utils/ajax';
+import apis from '../../../constants/api';
+import './index.less';
+var SecurityLog = function SecurityLog() {
+  var classPrefix = 'security-log-page';
+  var _useState = useState({
+      page: 1,
+      size: 10,
+      year: '',
+      month: ''
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    condition = _useState2[0],
+    setCondition = _useState2[1];
+  var _useState3 = useState(0),
+    _useState4 = _slicedToArray(_useState3, 2),
+    total = _useState4[0],
+    setTotal = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    dateRange = _useState6[0],
+    setDateRange = _useState6[1];
+  var _useState7 = useState(true),
+    _useState8 = _slicedToArray(_useState7, 2),
+    dateLoading = _useState8[0],
+    setDateLoading = _useState8[1];
+  var _useState9 = useState(true),
+    _useState10 = _slicedToArray(_useState9, 2),
+    tableLoading = _useState10[0],
+    setTableLoading = _useState10[1];
+  var _useState11 = useState([]),
+    _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',
+    key: 'operationType'
+  }, {
+    title: 'IP',
+    dataIndex: 'userAccessIp',
+    key: 'userAccessIp'
+  }, {
+    title: '时间',
+    dataIndex: 'gmtCreate',
+    key: 'gmtCreate'
+  }];
+  useEffect(function () {
+    queryData();
+  }, []);
+  useEffect(function () {
+    if (time) clearTimeout(time);
+    setTime(setTimeout(function () {
+      queryLog();
+    }, 500));
+  }, [condition]);
+  function queryData() {
+    setDateLoading(true);
+    request(apis.log.getLogTime, {
+      method: 'get',
+      params: {
+        type: 4
+      }
+    }).then(function (res) {
+      if (parseInt(res === null || res === void 0 ? void 0 : res.code) == 100000) {
+        setDateLoading(false);
+        var maxDate = res.data[res.data.length - 1] || '';
+        setDateRange(res.data);
+        setCondition(function (v) {
+          return _objectSpread(_objectSpread({}, v), {}, {
+            year: moment(maxDate).format('YYYY'),
+            month: moment(maxDate).format('MM')
+          });
+        });
+      }
+    });
+  }
+  function queryLog() {
+    if (!condition.year || !condition.month) return;
+    setTableLoading(true);
+    request(apis.log.securityLog, {
+      method: 'post',
+      data: condition
+    }).then(function (res) {
+      if (parseInt(res === null || res === void 0 ? void 0 : res.code) == 100000) {
+        setTotal(res.data.count);
+        setTableData(res.data.logs);
+        setTableLoading(false);
+      }
+    });
+  }
+  function disabledDate(current) {
+    var date = moment(current._d).format('YYYYMM');
+    return !dateRange.includes(date);
+  }
+  function onChangeTime(current) {
+    setCondition(function (v) {
+      return _objectSpread(_objectSpread({}, v), {}, {
+        year: moment(current._d).format('YYYY'),
+        month: moment(current._d).format('MM')
+      });
+    });
+  }
+  function onChangeTable(data) {
+    setCondition(function (v) {
+      return _objectSpread(_objectSpread({}, v), {}, {
+        page: data.current,
+        size: data.pageSize
+      });
+    });
+  }
+  return /*#__PURE__*/React.createElement("div", {
+    className: classPrefix
+  }, dateLoading ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-spin")
+  }, /*#__PURE__*/React.createElement(Spin, null)) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-header")
+  }, /*#__PURE__*/React.createElement(DatePicker, {
+    value: moment("".concat(condition.year, "-").concat(condition.month), 'YYYY-MM'),
+    picker: "month",
+    disabledDate: disabledDate,
+    locale: locale,
+    onChange: onChangeTime,
+    inputReadOnly: true,
+    allowClear: false
+  })), /*#__PURE__*/React.createElement(BizTable, {
+    columns: columns,
+    dataSource: tableData,
+    total: total,
+    loading: tableLoading,
+    onChange: onChangeTable,
+    rowKey: "id"
+  })));
+};
+export default SecurityLog;

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

@@ -0,0 +1,10 @@
+.security-log-page {
+  &-spin {
+    padding-top: 200px;
+    text-align: center;
+  }
+  &-header {
+    margin-bottom: 30px;
+    text-align: right;
+  }
+}

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

@@ -13,10 +13,9 @@ import React from 'react';
 import { useState } from 'react';
 import { useEffect } from 'react';
 import apis from '../../../constants/api';
-import request from '../../../utils/ajax';
+import request, { urlRequest } from '../../../utils/ajax';
 import ConfigItem from './configItem';
 import ItemEdit from './edit';
-import { ajax } from '@zgfe/business-lib';
 var Notice = function Notice() {
   var typeMap = new Map([[1, 'email']]);
   var _useState = useState(new Map().set('email', {
@@ -65,26 +64,27 @@ var Notice = function Notice() {
     var formData = new FormData();
     formData.set('type', editSetting.type);
     formData.set('config', JSON.stringify(values));
-    ajax(apis.setting.editNoticeConfig, {
+    urlRequest(apis.setting.editNoticeConfig, {
       method: 'post',
+      // data: formData,
       data: {
         type: editSetting.type === 'email' ? 1 : null,
         config: JSON.stringify(values)
       }
     }).then(function (res) {
-      if (!res) return;
-      notification.success({
-        message: '配置成功'
-      });
-      settingMap.get(editSetting.type).config = values;
-      var newSettingMap = new Map(_toConsumableArray(settingMap));
-      setSettingMap(newSettingMap);
-      setIsEdit(false);
-    }).catch(function (err) {
-      console.error('配置失败', err);
-      notification.error({
-        message: '配置失败'
-      });
+      if ((res === null || res === void 0 ? void 0 : 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, {

package/es/utils/functionalPermissions.d.ts

@@ -1,5 +1,4 @@
 declare const _default: {
-    mars: any;
     standard: any;
 };
 export default _default;

package/es/utils/functionalPermissions.js

@@ -149,22 +149,19 @@ var standard = _objectSpread({
     key: '/diypage'
   },
   user: {
-    key: '/user'
+    key: '/analysis/user'
   },
-  // cep: {
-  //   key: '/cep',
-  // },
   userList: {
-    key: '/user/userList'
+    key: '/analysis/user/userList'
   },
   userGroup: {
-    key: '/user/userGroup'
+    key: '/analysis/user/userGroup'
   },
   userPortrait: {
-    key: '/user/userPortrait'
+    key: '/analysis/user/userPortrait'
   },
   userTags: {
-    key: '/user/userTags'
+    key: '/analysis/user/userTags'
   },
   // market: {
   //   key: '/market',
@@ -222,205 +219,6 @@ var standard = _objectSpread({
     key: '/cxp/userJourney'
   }
 } : {});
-var mars = {
-  default: {
-    key: 'default' // 默认权限
-  },
-
-  all: {
-    key: '/' // 功能权限
-  },
-
-  panel: {
-    key: '/panel'
-  },
-  dataPanel: {
-    key: '/panel/dataPanel'
-  },
-  dataview: {
-    key: '/panel/dataview'
-  },
-  analysis: {
-    key: '/analysis'
-  },
-  dataV: {
-    key: '/panel/dataV'
-  },
-  crossScreen: {
-    key: '/panel/crossScreen'
-  },
-  scene: {
-    key: '/scene'
-  },
-  customScene: {
-    key: '/scene/customScene'
-  },
-  userGrowth: {
-    key: '/scene/userGrowth'
-  },
-  basic: {
-    key: '/analysis/basic'
-  },
-  wholeAnalysis: {
-    key: '/analysis/basic/wholeAnalysis'
-  },
-  retention: {
-    key: '/analysis/basic/retention'
-  },
-  source: {
-    key: '/analysis/source'
-  },
-  channel: {
-    key: '/analysis/source/channel'
-  },
-  behavior: {
-    key: '/analysis/behavior'
-  },
-  eventAnalysis: {
-    key: '/analysis/behavior/eventAnalysis'
-  },
-  page: {
-    key: '/analysis/behavior/page'
-  },
-  zgSee: {
-    key: '/analysis/behavior/zgSee'
-  },
-  conversion: {
-    key: '/analysis/conversion'
-  },
-  funnel: {
-    key: '/analysis/conversion/funnel'
-  },
-  pathAnalysis: {
-    key: '/analysis/conversion/pathAnalysis'
-  },
-  revenue: {
-    key: '/analysis/conversion/revenue'
-  },
-  stickiness: {
-    key: '/analysis/conversion/stickiness'
-  },
-  user: {
-    key: '/analysis/user'
-  },
-  cep: {
-    key: '/analysis/cep'
-  },
-  userList: {
-    key: '/analysis/user/userList'
-  },
-  userGroup: {
-    key: '/analysis/user/userGroup'
-  },
-  userPortrait: {
-    key: '/analysis/user/userPortrait'
-  },
-  custom: {
-    key: '/analysis/custom'
-  },
-  diy: {
-    key: '/analysis/custom/diy'
-  },
-  sqlQuery: {
-    key: '/analysis/custom/sqlQuery'
-  },
-  advertisement: {
-    key: '/advertisement'
-  },
-  sem: {
-    key: '/advertisement/sem'
-  },
-  digital: {
-    key: '/advertisement/digital'
-  },
-  landing: {
-    key: '/advertisement/landing'
-  },
-  wechat: {
-    key: '/wechat'
-  },
-  wxWhole: {
-    key: '/wechat/wxWhole'
-  },
-  wxMini: {
-    key: '/wechat/wxMini'
-  },
-  wxMarketing: {
-    key: '/wechat/wxMarketing'
-  },
-  wxFlow: {
-    key: '/wechat/wxFlow'
-  },
-  market: {
-    key: '/market'
-  },
-  manage: {
-    key: '/manage'
-  },
-  dataAccess: {
-    key: '/manage/dataAccess'
-  },
-  guide: {
-    key: '/manage/dataAccess/guide'
-  },
-  adChannel: {
-    key: '/manage/dataAccess/adChannel'
-  },
-  eventTracking: {
-    key: '/manage/eventTracking'
-  },
-  iteration: {
-    key: '/manage/iteration'
-  },
-  debug: {
-    key: '/manage/iteration/debug'
-  },
-  crash: {
-    key: '/manage/iteration/crash'
-  },
-  version: {
-    key: '/manage/iteration/version'
-  },
-  // 开始：zhuge 模块
-  warning: {
-    key: '/manage/warning'
-  },
-  diypage: {
-    key: '/diypage'
-  },
-  // crossScreen: {
-  //   key: '/panel/crossScreen'
-  // },
-  // scene: {
-  //   key: '/scene'
-  // },
-  // userGrowth: {
-  //   key: '/scene/userGrowth'
-  // },
-  // 结束 ：zhuge 模块
-  config: {
-    key: '/manage/config'
-  },
-  setting: {
-    default: {
-      describe: '设置',
-      key: '/setting'
-    },
-    company: {
-      describe: '公司设置',
-      key: '/setting/company'
-    },
-    app: {
-      describe: '应用设置',
-      key: '/setting/app'
-    },
-    system: {
-      describe: '系统设置',
-      key: '/setting/system'
-    }
-  }
-};
 export default {
-  mars: mars,
   standard: standard
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.2-node.0",
+  "version": "1.2.3-log.0",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "791b7dce1b31a2c683d3225e84e0c51106b64b74",
+  "gitHead": "8795f2c712d13f07c98254839670a04fff325fac",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }