@zgfe/modules-settings 2.1.0-zhongyuan.25 → 2.1.0-zhongyuan.27

package/es/constants/api.d.ts

@@ -109,6 +109,7 @@ declare let apis: {
         operationLog: string;
         securityLog: string;
         getLogTime: string;
+        exportLog: string;
     };
     getPassword: {
         validateCode: string;

package/es/constants/api.js

@@ -134,7 +134,9 @@ var apis = {
     // 安全日志
     securityLog: '/zg/web/v2/system/securityLog',
     // 时间范围查询
-    getLogTime: '/zg/web/v2/system/getLogTime'
+    getLogTime: '/zg/web/v2/system/getLogTime',
+    // 导出日志
+    exportLog: 'zg/web/v2/system/exportOperationLog'
   },
   getPassword: {
     validateCode: '/zg/web/v2/system/validateCode',

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

@@ -13,9 +13,10 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useEffect, useState, useContext } from 'react';
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
-import { DatePicker, Radio, Table } from 'antd';
+import { DatePicker, Radio, Table, Button, Space } from 'antd';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
+import { DownloadOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import './index.less';
 import { setColumnsList } from './util';
@@ -24,7 +25,8 @@ var OperationLog = function OperationLog() {
   var classPrefix = 'operation-log-page';
   var _useContext = useContext(BizGlobalDataContext),
     authority = _useContext.authority,
-    basicConfig = _useContext.basicConfig;
+    basicConfig = _useContext.basicConfig,
+    showProdDownload = _useContext.showProdDownload;
   var _useState = useState({
       page: 1,
       size: 10,
@@ -152,6 +154,16 @@ var OperationLog = function OperationLog() {
       }
     });
   }
+  function exportData() {
+    request(apis.log.exportLog, {
+      method: 'get',
+      params: _objectSpread({
+        type: logType
+      }, condition),
+      responseType: 'blob',
+      fileName: "\u65E5\u5FD7\u4E0B\u8F7D_".concat(moment().format('YYYYMMDD'))
+    }).then(function (res) {});
+  }
   function queryLog() {
     setLoading(true);
     if (!condition.year || !condition.month) return;
@@ -209,7 +221,7 @@ var OperationLog = function OperationLog() {
   }, "\u64CD\u4F5C\u65E5\u5FD7"), /*#__PURE__*/React.createElement(Radio.Button, {
     value: "3",
     disabled: !authority[10104]
-  }, "\u6743\u9650\u7BA1\u7406\u65E5\u5FD7")), condition.year && (/*#__PURE__*/React.createElement(DatePicker, {
+  }, "\u6743\u9650\u7BA1\u7406\u65E5\u5FD7")), /*#__PURE__*/React.createElement(Space, null, condition.year && (/*#__PURE__*/React.createElement(DatePicker, {
     value: moment("".concat(condition.year, "-").concat(condition.month), 'YYYY-MM'),
     picker: "month",
     disabledDate: disabledDate,
@@ -217,7 +229,12 @@ var OperationLog = function OperationLog() {
     onChange: onChangeTime,
     inputReadOnly: true,
     allowClear: false
-  }))), /*#__PURE__*/React.createElement("div", {
+  })), showProdDownload && (/*#__PURE__*/React.createElement(Button, {
+    shape: "circle",
+    icon: /*#__PURE__*/React.createElement(DownloadOutlined, null),
+    size: "middle",
+    onClick: exportData
+  })))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-table")
   }, /*#__PURE__*/React.createElement(Table, {
     columns: columns,

package/es/modules/pointMap/pageInfo.js

@@ -250,6 +250,12 @@ var PageInfo = function PageInfo(props) {
       });
       return;
     }
+    if (!imgUrl) {
+      notification.warning({
+        message: '请选择页面图示'
+      });
+      return;
+    }
     if (eventAttrList.filter(function (item) {
       return !item.eventId;
     }).length) {
@@ -1006,7 +1012,11 @@ var PageInfo = function PageInfo(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-title")
-  }, "\u9875\u9762\u56FE\u793A"), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: '#FB5547'
+    }
+  }, "*"), "\u9875\u9762\u56FE\u793A"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-input")
   }, !imgPath ? (/*#__PURE__*/React.createElement(Upload, _objectSpread({}, uploadProps), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-upload")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.1.0-zhongyuan.25",
+  "version": "2.1.0-zhongyuan.27",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9bbe18ea9f27c0a392e59cea858f430bea25292",
+  "gitHead": "3e2d9de580341a65655b6f932c6fe5f2684c2a26",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }