From 038405e8c6dc94b508313ef585ec9110e5f478e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 11 Jul 2019 23:48:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/common/TextUtil.js | 36 +++++++++ public/react/src/common/educoder.js | 2 + .../PackageIndexNEITaskDetails.js | 76 +++++++++++++++--- .../PackageIndexNEITaskDetails/newsone.png | Bin 0 -> 341 bytes .../PackageIndexNEITaskDetails/newstwo.png | Bin 0 -> 288 bytes .../projectPackages/packageconcnet.css | 66 +++++++++++++++ 6 files changed, 170 insertions(+), 10 deletions(-) create mode 100644 public/react/src/common/TextUtil.js create mode 100755 public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/newsone.png create mode 100755 public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/newstwo.png diff --git a/public/react/src/common/TextUtil.js b/public/react/src/common/TextUtil.js new file mode 100644 index 00000000..f5dca6e5 --- /dev/null +++ b/public/react/src/common/TextUtil.js @@ -0,0 +1,36 @@ +import { bytesToSize } from 'educoder'; +export function isImageExtension(fileName) { + return fileName ? !!(fileName.match(/.(jpg|jpeg|png|gif)$/i)) : false +} + +export function markdownToHTML(oldContent, selector) { + window.$('#md_div').html('') + // markdown to html + var markdwonParser = window.editormd.markdownToHTML("md_div", { + markdown: oldContent, + emoji: true, + htmlDecode: "style,script,iframe", // you can filter tags decode + taskList: true, + tex: true, // 默认不解析 + flowChart: true, // 默认不解析 + sequenceDiagram: true // 默认不解析 + }); + const content = window.$('#md_div').html() + if (selector) { + window.$(selector).html(content) + } + return content +} + +export function appendFileSizeToUploadFile(item) { + return `${item.title}${uploadNameSizeSeperator}${item.filesize}` +} +export function appendFileSizeToUploadFileAll(fileList) { + return fileList.map(item => { + if (item.name.indexOf(uploadNameSizeSeperator) == -1) { + return Object.assign({}, item, {name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}`}) + } + return item + }) +} +export const uploadNameSizeSeperator = '　　' \ No newline at end of file diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js index e25ecb9d..7a5e5bc1 100644 --- a/public/react/src/common/educoder.js +++ b/public/react/src/common/educoder.js @@ -13,6 +13,8 @@ export { updatePageParams as updatePageParams } from './RouterUti export { bytesToSize as bytesToSize } from './UnitUtil'; +export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension } from './TextUtil' + export { handleDateString, getNextHalfHourOfMoment,formatDuring } from './DateUtil' export { isDev as isDev } from './Env' diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 87e00c6e..5d0f9af8 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -2,7 +2,7 @@ import React, {Component} from 'react'; import {Link} from "react-router-dom"; import axios from 'axios'; import { Input ,Icon,Button,Pagination,DatePicker,Breadcrumb} from 'antd'; -import { handleDateString} from 'educoder'; +import { handleDateString,markdownToHTML} from 'educoder'; import locale from 'antd/lib/date-picker/locale/zh_CN'; import MDEditors from '../MDEditors'; import PhoneModel from '../PackageIndexNewandEdit/PhoneModel'; @@ -14,7 +14,8 @@ class PackageIndexNEITaskDetails extends Component { super(props) this.contentMdRef = React.createRef(); this.state = { - modalCancel:false + modalCancel:false, + overtype:false } } @@ -50,20 +51,31 @@ class PackageIndexNEITaskDetails extends Component { }) } + setover=()=>{ + this.setState({ + overtype:true + }) + } + setout=()=>{ + this.setState({ + overtype:false + }) + } render() { - let {modalCancel}=this.state; + let {overtype}=this.state; + console.log(overtype) return (
'}> - Home + admin - Application Center + 任务大厅 - An Application + 详情
@@ -86,14 +98,28 @@ class PackageIndexNEITaskDetails extends Component { {/* 待发布 */} {/*
*/} -
+
-
- + +
+ 张三 +
+ +
+ {overtype===false? 头像联系TA: + 头像联系TA} +
+ +
@@ -137,7 +163,37 @@ class PackageIndexNEITaskDetails extends Component { {/*详情*/}
+
+
+ 需求详情： + 编辑 + 删除 +
+
+ 每天电视上都有好多产品在电视上卖，有美白，减肥，健身腰带，面膜，还有让头发变黑的产品，**产品，这些都是怎样在电视上打广告的，是和电视台分成还是直接付广告 + 费，要是想做电视购物应该做哪些准备 应该找哪些负责任人 一个产品想做电视购物在电视上卖，大概需要投资多少钱，请知道的朋友说详细些越详细越好。 +
+ {/*
*/} +
+
@@ -148,7 +204,7 @@ class PackageIndexNEITaskDetails extends Component {
- + {/*发布人选择状态*/}
diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/newsone.png b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/newsone.png new file mode 100755 index 0000000000000000000000000000000000000000..9aadd57c233cc86548948dd242ea0551816d7bc1 GIT binary patch literal 341 zcmV-b0jmCqP)Z2Ve_W5Uj_@vtYQdn>&XphN}b#OZG1SY-)(he?ztnO~JlI)e#NEj>Wm( zs01R92;=14lSJgAA)0|HV#+2#3WBrOh;k}m6Ikqx46vLyiNuLv?N5uXEhz*mMqYr_ z03ni5!(lC>`M8gfJI3Br;$3`Lp7^(}L!tGerz nv>Q^lY2Bw;KAu+Vr>DLH5AT6C@^UT000000NkvXXu0mjf1bLIw literal 0 HcmV?d00001 diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/newstwo.png b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/newstwo.png new file mode 100755 index 0000000000000000000000000000000000000000..8ac58b2c47ae8debb584b81251fe488a748c6fac GIT binary patch literal 288 zcmV+*0pI?KP)Y~4b<^`+W^>M* z&iv=$94uHI12a8xQ$U7#7?A-o# zipL*Fjsd8W3q1TAWEZzM#5u08hdY$~O>`RNJ(bjC3UY*#22#e~H2F4`20=!#r<7b{ zt)?@!u@TY9%qYkQYRN{8vxr!zqJkV?wF_akfj^;^s~xXpaztEyL%Oxk%&o@Un$CPg mJol5?3sN24upAL}_Kh#k3SewPv+2_S0000