@zgfe/modules-settings 1.2.4-log.0 → 1.2.4-log.2

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

@@ -17,6 +17,7 @@ import { DatePicker, Radio, Table } from 'antd';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import moment from 'moment';
 import './index.less';
+import { setColumnsList } from './util';
 var OperationLog = function OperationLog() {
   var classPrefix = 'operation-log-page';
   var _useState = useState({
@@ -44,22 +45,28 @@ var OperationLog = function OperationLog() {
     _useState10 = _slicedToArray(_useState9, 2),
     dateRange = _useState10[0],
     setDateRange = _useState10[1];
-  var _useState11 = useState(0),
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    time = _useState12[0],
-    setTime = _useState12[1];
+    tableData = _useState12[0],
+    setTableData = _useState12[1];
   var _useState13 = useState([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    tableData = _useState14[0],
-    setTableData = _useState14[1];
-  var columns = [{
+    columns = _useState14[0],
+    setColumns = _useState14[1];
+  var columnsList = [{
     title: '应用(应用ID)',
-    dataIndex: 'appId',
-    key: 'appId'
+    key: 'appId',
+    render: function render(_, record) {
+      if (!record.appId) return '-';
+      return /*#__PURE__*/React.createElement(React.Fragment, null, record.appName, "(", record.appId, ")");
+    }
   }, {
     title: '操作人(登录账号)',
     dataIndex: 'operatorName',
-    key: 'operatorName'
+    key: 'operatorName',
+    render: function render(_, record) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, record.operatorName, "(", record.operatorEmail, ")");
+    }
   }, {
     title: '功能模块',
     dataIndex: 'targetType',
@@ -68,10 +75,21 @@ var OperationLog = function OperationLog() {
     title: '操作类型',
     dataIndex: 'operationType',
     key: 'operationType'
+  }, {
+    title: '操作结果',
+    dataIndex: 'operationResult',
+    key: 'operationResult'
   }, {
     title: '操作设备',
     dataIndex: 'userAgent',
-    key: 'userAgent'
+    key: 'userAgent',
+    width: 120,
+    ellipsis: true,
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-columns")
+      }, text);
+    }
   }, {
     title: 'IP地址',
     dataIndex: 'userAccessIp',
@@ -82,17 +100,20 @@ var OperationLog = function OperationLog() {
     key: 'gmtCreate'
   }];
   useEffect(function () {
+    switch (logType) {
+      case '1':
+        setColumns(setColumnsList(columnsList, ['operationResult']));
+        break;
+      case '2':
+        setColumns(columnsList);
+        break;
+      case '3':
+        setColumns(setColumnsList(columnsList, ['appId']));
+        break;
+    }
     queryData();
   }, [logType]);
   useEffect(function () {
-    // if (time) clearTimeout(time);
-    // setTime(
-    //   setTimeout(() => {
-    //     console.log(condition, 'condition');
-    //     queryLog();
-    //   }, 500),
-    // );
-    console.log(condition);
     queryLog();
   }, [condition]);
   function queryData() {
@@ -170,7 +191,7 @@ var OperationLog = function OperationLog() {
     value: "2"
   }, "\u64CD\u4F5C\u65E5\u5FD7"), /*#__PURE__*/React.createElement(Radio.Button, {
     value: "3"
-  }, "\u6743\u9650\u65E5\u5FD7")), condition.year && /*#__PURE__*/React.createElement(DatePicker, {
+  }, "\u6743\u9650\u7BA1\u7406\u65E5\u5FD7")), condition.year && /*#__PURE__*/React.createElement(DatePicker, {
     value: moment("".concat(condition.year, "-").concat(condition.month), 'YYYY-MM'),
     picker: "month",
     disabledDate: disabledDate,

package/es/modules/companySetting/operationLog/index.less

@@ -18,4 +18,10 @@
       border-radius: 0 4px 4px 0;
     }
   }
+  &-columns {
+    width: 120px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
 }

package/es/modules/companySetting/operationLog/util.d.ts

@@ -0,0 +1,7 @@
+interface ColumnsItem {
+    title: string;
+    dataIndex?: string;
+    key: string;
+}
+export declare const setColumnsList: (list: ColumnsItem[], keyList: string[]) => ColumnsItem[];
+export {};

package/es/modules/companySetting/operationLog/util.js

@@ -0,0 +1,9 @@
+export var setColumnsList = function setColumnsList(list, keyList) {
+  var newList = [];
+  list.forEach(function (item) {
+    if (!keyList.includes(item.key)) {
+      newList.push(item);
+    }
+  });
+  return newList;
+};

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

@@ -106,7 +106,7 @@ var SecurityLog = function SecurityLog() {
       data: condition
     }).then(function (res) {
       if (parseInt(res === null || res === void 0 ? void 0 : res.code) == 100000) {
-        setTotal(res.data.total);
+        setTotal(res.data.count);
         setTableData(res.data.logs);
         setTableLoading(false);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.4-log.0",
+  "version": "1.2.4-log.2",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "654a8fad9793509052f832ef2dae04a8fdc7d04e",
+  "gitHead": "2f002b33243fef1dde5d165d93b07c9320d9d1a0",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }