From c5b465989c938d9b571dc09f354fb87caec74e5c Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 10 Mar 2023 14:10:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=89=B2=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Issues/Component/addTagsBox.jsx | 8 ++++---- src/forge/Issues/Component/chooseMenu.jsx | 2 +- src/forge/Issues/Component/colorCard.jsx | 18 +++++++++++++----- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/forge/Issues/Component/addTagsBox.jsx b/src/forge/Issues/Component/addTagsBox.jsx index f128c8c5d..c617e2a04 100644 --- a/src/forge/Issues/Component/addTagsBox.jsx +++ b/src/forge/Issues/Component/addTagsBox.jsx @@ -6,7 +6,7 @@ import axios from 'axios'; function AddTagsBox({onSuccess , form ,owner , projectsId,onCancel}){ const { getFieldDecorator , getFieldsValue , validateFields } = form; const [ colors , setColors ] = useState(undefined); - const [ defaultColor , setDefaultColor ]= useState("#F17013"); + // const [ defaultColor , setDefaultColor ]= useState("#F17013"); function saveFunc(){ validateFields((error,values)=>{ @@ -14,7 +14,7 @@ function AddTagsBox({onSuccess , form ,owner , projectsId,onCancel}){ const { desc , name } = getFieldsValue(); const url = `/v1/${owner}/${projectsId}/issue_tags`; axios.post(url,{ - name,description:desc,color:colors || defaultColor + name,description:desc,color:colors }).then(result=>{ result && onSuccess(); }).catch(error=>{}) @@ -42,7 +42,7 @@ function AddTagsBox({onSuccess , form ,owner , projectsId,onCancel}){ })()} - + @@ -51,7 +51,7 @@ function AddTagsBox({onSuccess , form ,owner , projectsId,onCancel}){ })()}
- +
diff --git a/src/forge/Issues/Component/chooseMenu.jsx b/src/forge/Issues/Component/chooseMenu.jsx index 97dd91cde..c620e1070 100644 --- a/src/forge/Issues/Component/chooseMenu.jsx +++ b/src/forge/Issues/Component/chooseMenu.jsx @@ -55,7 +55,7 @@ function ChooseMenu({ if (faComponent && boxComponent) { const isChild = faComponent.contains(target); const isBox = boxComponent.contains(target); - const arr = ["removeicon","iconfont icon-guanbi font-12 color-white","iconfont icon-guanbi font-12 color-blue","icon-a-bianji12","color-blue font-15 tagManage","iconfont icon-xiangzuojiantou font-15 color-grey mr5 cursor","cover"]; + const arr = ["removeicon","iconfont icon-guanbi font-12 color-white","iconfont icon-guanbi font-12 color-blue","icon-a-bianji12","color-blue font-15 tagManage","iconfont icon-xiangzuojiantou font-15 color-grey mr5 cursor","cover","ant-btn cancelTags"]; const pointer = arr.includes(target.className); if(!isChild && !isBox && !pointer){ setVisible(false); diff --git a/src/forge/Issues/Component/colorCard.jsx b/src/forge/Issues/Component/colorCard.jsx index decb545f7..7a2a6b346 100644 --- a/src/forge/Issues/Component/colorCard.jsx +++ b/src/forge/Issues/Component/colorCard.jsx @@ -3,16 +3,24 @@ import { SketchPicker } from 'react-color'; function ColorCard({getColor,defaultColor}){ const [ displayColorPicker , setDisplayColorPicker ] = useState(false); - const [ color , setColor ] = useState({r: '241',g: '112',b: '19',a: '1',}); + // const [ color , setColor ] = useState({r: '241',g: '112',b: '19',a: '1',}); const [ textcolor , setTextColor ] = useState("#F17013"); + useEffect(()=>{ + const c = Math.random().toString(16).substr(-6); + c && setTextColor(`#${c}`); + getColor(`#${c}`); + },[]) useEffect(()=>{ - defaultColor && setTextColor(defaultColor); + if(defaultColor){ + setTextColor(defaultColor); + getColor(defaultColor); + } },[defaultColor]) // 切换色卡 function handleChange(color){ - setColor(color.rgb); + // setColor(color.rgb); setTextColor(color.hex); getColor(color ? color.hex : defaultColor); } @@ -26,7 +34,7 @@ function ColorCard({getColor,defaultColor}){ // 还原色卡 function reduction(){ setTextColor("#F17013"); - setColor({r: '241',g: '112',b: '19',a: '1',}); + // setColor({r: '241',g: '112',b: '19',a: '1',}); } return(
@@ -37,7 +45,7 @@ function ColorCard({getColor,defaultColor}){ {displayColorPicker ? (
{setDisplayColorPicker(false)}} /> - +
) : null}
From 7238b387b4d0e9c1e58b012330849cf8d435adf0 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 10 Mar 2023 14:23:17 +0800 Subject: [PATCH 2/2] the same --- src/forge/Issues/Component/addTagsBox.jsx | 13 +++++++++---- src/forge/Issues/Component/colorCard.jsx | 9 +-------- src/forge/Issues/Pages/sign.jsx | 10 ++++++++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/forge/Issues/Component/addTagsBox.jsx b/src/forge/Issues/Component/addTagsBox.jsx index c617e2a04..5830ef600 100644 --- a/src/forge/Issues/Component/addTagsBox.jsx +++ b/src/forge/Issues/Component/addTagsBox.jsx @@ -1,4 +1,4 @@ -import React , { useState } from 'react'; +import React , { useState , useEffect } from 'react'; import { Form , Input, Button } from 'antd'; import ColorCard from './colorCard'; import axios from 'axios'; @@ -6,7 +6,12 @@ import axios from 'axios'; function AddTagsBox({onSuccess , form ,owner , projectsId,onCancel}){ const { getFieldDecorator , getFieldsValue , validateFields } = form; const [ colors , setColors ] = useState(undefined); - // const [ defaultColor , setDefaultColor ]= useState("#F17013"); + const [ defaultColor , setDefaultColor ]= useState(undefined); + + useEffect(()=>{ + const c = Math.random().toString(16).substr(-6); + c && setDefaultColor(`#${c}`); + },[]) function saveFunc(){ validateFields((error,values)=>{ @@ -14,7 +19,7 @@ function AddTagsBox({onSuccess , form ,owner , projectsId,onCancel}){ const { desc , name } = getFieldsValue(); const url = `/v1/${owner}/${projectsId}/issue_tags`; axios.post(url,{ - name,description:desc,color:colors + name,description:desc,color:colors || defaultColor }).then(result=>{ result && onSuccess(); }).catch(error=>{}) @@ -42,7 +47,7 @@ function AddTagsBox({onSuccess , form ,owner , projectsId,onCancel}){ })()} - +
diff --git a/src/forge/Issues/Component/colorCard.jsx b/src/forge/Issues/Component/colorCard.jsx index 7a2a6b346..d63260035 100644 --- a/src/forge/Issues/Component/colorCard.jsx +++ b/src/forge/Issues/Component/colorCard.jsx @@ -3,24 +3,17 @@ import { SketchPicker } from 'react-color'; function ColorCard({getColor,defaultColor}){ const [ displayColorPicker , setDisplayColorPicker ] = useState(false); - // const [ color , setColor ] = useState({r: '241',g: '112',b: '19',a: '1',}); const [ textcolor , setTextColor ] = useState("#F17013"); - useEffect(()=>{ - const c = Math.random().toString(16).substr(-6); - c && setTextColor(`#${c}`); - getColor(`#${c}`); - },[]) + useEffect(()=>{ if(defaultColor){ setTextColor(defaultColor); - getColor(defaultColor); } },[defaultColor]) // 切换色卡 function handleChange(color){ - // setColor(color.rgb); setTextColor(color.hex); getColor(color ? color.hex : defaultColor); } diff --git a/src/forge/Issues/Pages/sign.jsx b/src/forge/Issues/Pages/sign.jsx index 55187b4ae..be3abaf0e 100644 --- a/src/forge/Issues/Pages/sign.jsx +++ b/src/forge/Issues/Pages/sign.jsx @@ -20,7 +20,7 @@ function Sign(props){ const [ order_name , setOrderName ] = useState(undefined); const [ order_type , setOrderType ] = useState(undefined); const [ nameFlag , setNameFlag ] = useState(undefined); - const [ defaultColor , setDefaultColor ]= useState("#F17013"); + const [ defaultColor , setDefaultColor ]= useState(undefined); const [ arrayName , setArrayName ] = useState("标记"); const [ key , setKey ] = useState("0"); @@ -183,6 +183,12 @@ function Sign(props){ setNameFlag(true); } } + + function createSign(){ + const c = Math.random().toString(16).substr(-6); + c && setDefaultColor(`#${c}`); + setEdit(true); + } return(
疑修 / 项目标记 - setEdit(true)}>创建标记 + 创建标记
{ edit &&