From 5bbc3cace150ad63dea79c950cae75fe5f7849fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Wed, 9 Mar 2022 11:17:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=8D=8F=E8=AE=AE=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8Dissue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Index.js | 9 +- src/forge/Main/SpecialModal.jsx | 7 +- src/forge/SecuritySetting/Index.jsx | 10 +- src/military/components/ExportWord.js | 87 ++++++++ .../expert/components/exportExcel/index.js | 200 ------------------ src/military/task/agreementContent/index.js | 82 ++++--- src/military/task/agreementContent/index.scss | 5 + src/military/task/api.js | 10 +- .../task/components/agreementModal/index.jsx | 24 ++- .../task/components/complainModal/index.scss | 0 src/military/task/taskManage/index.js | 2 +- 11 files changed, 179 insertions(+), 257 deletions(-) create mode 100644 src/military/components/ExportWord.js delete mode 100644 src/military/expert/components/exportExcel/index.js create mode 100644 src/military/task/agreementContent/index.scss delete mode 100644 src/military/task/components/complainModal/index.scss diff --git a/src/forge/Index.js b/src/forge/Index.js index 062a03dd..82b53c2e 100644 --- a/src/forge/Index.js +++ b/src/forge/Index.js @@ -62,18 +62,11 @@ class Index extends Component { )} > ( )} > - - ( - - )} - > ); diff --git a/src/forge/Main/SpecialModal.jsx b/src/forge/Main/SpecialModal.jsx index 2c9a21f8..d234843f 100644 --- a/src/forge/Main/SpecialModal.jsx +++ b/src/forge/Main/SpecialModal.jsx @@ -16,8 +16,11 @@ function SpecialModal({ visible , hideModal , sureModal , showNotification , use function sure(){ if(!user_apply_signatures || (user_apply_signatures && user_apply_signatures.status !== "waiting")){ if(!id || (id && id.length === 0)){ - // showNotification("请先提交文件进行审核！"); - getUrl(`/api/apply_signatures/template_file`) + window.open(getUrl(`/api/apply_signatures/template_file`)); + const a = document.createElement('a'); + a.href = getUrl(`/api/apply_signatures/template_file`); + a.click(); // 下载 + showNotification("请先提交文件进行审核！"); return; } const url = `/apply_signatures.json`; diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx index c010befe..79c9f78a 100644 --- a/src/forge/SecuritySetting/Index.jsx +++ b/src/forge/SecuritySetting/Index.jsx @@ -96,15 +96,15 @@ function Index(props){
  • 消息通知
  • -1 && pathname.indexOf("/settings/notice/config") == -1) || pathname.indexOf("/settings/notice/privateLetter")>-1 ?"active":""}>我的通知
  • -1 ?"active":""}>通知管理
    • - } - */} + } */} + diff --git a/src/military/components/ExportWord.js b/src/military/components/ExportWord.js new file mode 100644 index 00000000..130b7bc8 --- /dev/null +++ b/src/military/components/ExportWord.js @@ -0,0 +1,87 @@ +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; + +// todo 支持图表，例如echart +const propTypes = { + wordId: PropTypes.string, // wordID + fileName: PropTypes.string, // 导出文件的名字 + title: PropTypes.element, // 名称标题 + styles: PropTypes.string, // word中的样式 +}; + +const defaultProps = { + wordId: '', + className:'', + fileName: 'filename', + title: '导出Word', + styles: 'table{width:100%} ', + success:()=>{}, +}; + +class ExportWord extends Component { + + exportWord = () => { + const { wordId, fileName } = this.props; + this.getBlob(wordId, fileName); + }; + + + getBlob = (wordId, fileName) => { + // IE10 以下 + if (typeof window === 'undefined' || (typeof navigator !== 'undefined' && /MSIE [1-9]\./.test(navigator.userAgent))) { + return; + } + + const mHtml = { + top: `Mime-Version: 1.0\nContent-Base: ${location.href}\nContent-Type: Multipart/related; boundary="NEXT.ITEM-BOUNDARY";type="text/html"\n\n--NEXT.ITEM-BOUNDARY\nContent-Type: text/html; charset="utf-8"\nContent-Location: ${location.href}\n\n\n\n_html_`, + head: '\n\n\n\n', + body: '_body_', + }; + + const activeDoc = document.getElementById(wordId) // 获取 dom 节点 + .cloneNode(true); + + const { wordStyles: styles } = this.props; // 文件样式 + // 默认样式 + const defaultStyle = '.text-div{ text-decoration: underline; margin-right: 15px; } .textarea-div{ text-decoration: underline; }'; + const mHtmlBottom = '\n--NEXT.ITEM-BOUNDARY--';// 文件尾信息 + + // 替换模板里的内容 + const fileContent = mHtml.top.replace('_html_', mHtml.head.replace('_styles_', defaultStyle + styles) + mHtml.body.replace('_body_', activeDoc.innerHTML)) + mHtmlBottom; + // 创建包含文件内容的blob + const blob = new Blob([fileContent], { type: 'application/msword;charset=utf-8' }); + // 下载word文件 + this.saveAs(blob, `${fileName}.doc`); + // 下载成功后执行回调方法 + this.props.success(); + }; + + + saveAs = (blob, name) => { // 实现下载操作 + // IE 10+ (native saveAs) + if (typeof navigator !== 'undefined' && navigator.msSaveOrOpenBlob) { + return navigator.msSaveOrOpenBlob(blob, name); + } + const urlObj = window.URL || window.webkitURL || window; + const objectUrl = urlObj.createObjectURL(blob); + const a = document.createElement('a'); + a.href = objectUrl; + // 模拟点击事件 + a.download = name; + a.click(); // 下载 + }; + + + render() { + const { title,className } = this.props; + return ( + + {title} + + ); + } +} + +ExportWord.propTypes = propTypes; +ExportWord.defaultProps = defaultProps; +export default ExportWord; diff --git a/src/military/expert/components/exportExcel/index.js b/src/military/expert/components/exportExcel/index.js deleted file mode 100644 index 38e57814..00000000 --- a/src/military/expert/components/exportExcel/index.js +++ /dev/null @@ -1,200 +0,0 @@ -import React, {Component} from 'react'; -import {Button} from 'antd'; -import PropTypes from "prop-types"; - -const propTypes = { - tableClass: PropTypes.string, // tableClass - fileName: PropTypes.string, // 导出文件的名字 - worksheet: PropTypes.string, //导出工作簿名字 - // colors: PropTypes.string, // button 样式 - // size: PropTypes.string, //按钮大小(lg xg sm md) - // style: PropTypes.string, // 按钮样式 - // exportIcon: PropTypes.element, // 自定义导出图标 - title: PropTypes.element, //名称标题 - filterElement: PropTypes.array, //过滤元素 -}; - -const defaultProps = { - tableClass: '', - fileName: "filename", - worksheet: 'worksheet', - // colors: "primary", - // size: 'sm', - // style: '', - exportIcon: null, - title: '导出', - filterElement: ['button'] -}; - -class ExportExcel extends Component { - exportExcel = () => { - const {tableClass, fileName, worksheet} = this.props; - if (this.getExplorer() === 'ie') { - //创建AX对象excel - const curTbl = document.querySelector(tableClass).cloneNode(true); - // eslint-disable-next-line no-undef - let oXL = new ActiveXObject("Excel.Application"); - let oWB = oXL.Workbooks.Add(); //获取workbook对象 - let xlSheet = oWB.Worksheets(1); //激活当前sheet - let sel = document.body.createTextRange(); //把表格中的内容移到TextRange中 - sel.moveToElementText(curTbl); - sel.select;//全选TextRange中内容 - sel.execCommand("Copy");//复制TextRange中内容 - xlSheet.Paste(); //粘贴到活动的EXCEL中 - oXL.Visible = true; //设置excel可见属性 - let fName = null; - try { - fName = oXL.Application.GetSaveAsFilename("Excel.xls", "Excel Spreadsheets (*.xls), *.xls"); - } catch (e) { - } finally { - oWB.SaveAs(fName); - // oWB.Close(savechanges = false); - oXL.Quit(); - oXL = null; - // 下面代码用于解决IE call Excel的一个BUG, MSDN中提供的方法: - // setTimeout(CollectGarbage, 1); - // 由于不能清除(或同步)网页的受信任状态, 所以将导致SaveAs()等方法在 - // 下次调用时无效. - window.location.reload(); - } - - } else { - this.tableToExcel(tableClass, fileName, worksheet) - } - } - - - traverseNodes = (node, newTd) => { - if (node.hasChildNodes) { - const sonNodes = node.childNodes; - const {filterElement} = this.props; - for (let sonNode of sonNodes) { - if (!filterElement.includes(sonNode.nodeName.toLowerCase())) { // 对不必要对element过滤 - this.traverseNodes(sonNode, newTd); - } - - } - } - return this.display(node, newTd); - } - - display = (node, newTd) => { - const {nodeName, nodeValue} = node; - let newSpan = document.createElement("span"); - newSpan.innerText = nodeValue; - if (nodeName === 'INPUT' || nodeName === 'TEXTAREA') { // 对 input 处理 - const {type, checked, value} = node; - newSpan.innerText = value; - if (type === 'radio' || type === 'checkbox') { - console.log("type", type) - newSpan.innerText = type === 'radio' ? (checked ? "●" : "○") : (checked ? "■" : "□"); - newSpan.style.fontSize = '16px'; - newSpan.style.paddingLeft = '15px'; - } - } - if (node.nodeName === 'IMG') { - const {width, height} = node; - newTd.appendChild(node); - newTd.style.height = height + "px"; - newTd.style.width = width + "px"; - } - if (newSpan.innerText.trim()) { - newTd.appendChild(newSpan); - } - - return newTd - } - - - tableToExcel = (table, fileName, worksheet) => { - const uri = 'data:application/vnd.ms-excel;base64,'; - // 定义文档的类型 - const template = '{table}
    '; - const base64 = function (s) { - return window.btoa(unescape(encodeURIComponent(s))) - }; - // 将template中的变量替换为页面内容ctx获取到的值 - const format = function (s, c) { - return s.replace(/{(\w+)}/g, function (m, p) { - return c[p]; - }) - } - if (!table.nodeType) { - table = document.querySelector(table).cloneNode(true); - } - - let newTable = document.createElement("table"); - const trArray = table.getElementsByTagName('tr'); - for (let trItem of trArray) { - let newTr = document.createElement("tr"); - const thArray = trItem.getElementsByTagName('th'); - const tdArray = trItem.getElementsByTagName('td'); - for (let thItem of thArray) { - let newTh = document.createElement("th"); - const {rowSpan = 1, colSpan = 1, style} = thItem; - this.traverseNodes(thItem, newTh); - newTh.rowSpan = rowSpan; //跨行 - newTh.colSpan = colSpan; //跨列 - newTh.style = style; // 样式 - newTr.appendChild(newTh); - } - for (let tdItem of tdArray) { - let newTd = document.createElement("td"); - const {rowSpan = 1, colSpan = 1, style} = tdItem; - this.traverseNodes(tdItem, newTd); - newTd.rowSpan = rowSpan; //跨行 - newTd.colSpan = colSpan; //跨列 - newTd.style = style; // 样式 - newTr.appendChild(newTd); - } - if (newTr.childNodes.length > 1) { - newTable.appendChild(newTr); - } - } - const ctx = {worksheet, table: newTable.innerHTML}; // 获取表单的名字和表单查询的内容 - const a = document.createElement("a"); // 虚拟一个a 标签 - // format()函数：通过格式操作使任意类型的数据转换成一个字符串 - // base64()：进行编码 - a.href = uri + base64(format(template, ctx)); - a.download = fileName + ".xls";//设置文件的名字 - a.click();// 下载 - } - - // 获取当前浏览器 - getExplorer = () => { - const explorer = window.navigator.userAgent; - if (explorer.indexOf("MSIE") >= 0) { //ie - return 'ie'; - } - else if (explorer.indexOf("Firefox") >= 0) { //firefox - return 'Firefox'; - } - else if (explorer.indexOf("Chrome") >= 0) { //Chrome - return 'Chrome'; - } - else if (explorer.indexOf("Opera") >= 0) { //Opera - return 'Opera'; - } - else if (explorer.indexOf("Safari") >= 0) { //Safari - return 'Safari'; - } - } - - render() { - const {colors, exportIcon, size, title} = this.props; - return ( - - ) - } -} - -ExportExcel.propTypes = propTypes; -ExportExcel.defaultProps = defaultProps; -export default ExportExcel; diff --git a/src/military/task/agreementContent/index.js b/src/military/task/agreementContent/index.js index 94c51c38..01a7a153 100644 --- a/src/military/task/agreementContent/index.js +++ b/src/military/task/agreementContent/index.js @@ -1,39 +1,58 @@ import React, { useCallback, useEffect, useState } from "react"; import { Input, Button, Form, Select } from "antd"; import MDEditor from "../../../modules/tpm/challengesnew/tpm-md-editor"; -import {getAgreement, agreementEdit } from "../api"; +import {getAgreement, agreementAdd,agreementEdit } from "../api"; import "../index.scss"; +import "./index.scss"; -export default Form.create()(({ form, showNotification, match, history }) => { +export default Form.create()(({ form,current_user, showNotification, match, history }) => { const { getFieldDecorator, validateFields, setFieldsValue } = form; + const [id,setId]=useState(0); + const [content,setContent]=useState(null); + useEffect(()=>{ - getAgreement().then(res=>{ - console.log(res); + getAgreement({title:'协议模板'}).then(res=>{ + if(res.data){ + setContent(res.data.content); + setId(res.data.id); + } }) },[]) - // 保存wiki文件，包括新增和修改 + // 保存,包括新增和修改 function saveFile() { validateFields((err, values) => { if (!err) { - let regEn = /[\[\]`\/:*?''<>|%-+_]/g; - if (regEn.test(values.name)) { - message.error("文件名不能有特殊字符"); - return; - } - agreementEdit({ - owner, - repo: projectsId, - projectId: project.id, - pagename: wikiName, + id?agreementEdit({ ...values, - commit_message: "", - }).then((res) => dealRes(res)); + userId:current_user.user_id, + id, + }).then((res) => dealRes(res)): + agreementAdd({ + ...values, + userId:current_user.user_id, + id:0, + }).then((res) => dealRes(res)) } - }); + }) } + function dealRes(res) { + if (res && res.message === "success") { + showNotification("操作成功"); + } else { + message.error(res&&res.message||'操作失败'); + } + } + + function onContentChange(value) { + setContent(value); + setFieldsValue({ + content: value + }); + }; + const helper = useCallback( (label, name, rules, widget, initialValue, rightComponent) => ( @@ -42,28 +61,23 @@ export default Form.create()(({ form, showNotification, match, history }) => { )} {rightComponent} - ), - [] - ); + ),[]); return ( -
    - {/* {helper( +
    + {helper( "协议名称", - "name", - [ - { required: true, message: "请输入协议名称" }, - // { pattern: /[^`\[\]\/:*?''<>|%-+_]/g, message: '不允许部分特殊字符' } - ], - "协议模板", + "title", + [{ required: true, message: "请输入协议名称" }], - )} */} + disabled + />, + "协议模板" + )} - {/* + { rules: [{ required: true, message: "请输入协议内容" }], validateFirst: true, })()} - */} + - + {/* */}