diff --git a/src/forge/Issues/Component/addTagsBox.jsx b/src/forge/Issues/Component/addTagsBox.jsx
index f128c8c5..5830ef60 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)=>{
@@ -51,7 +56,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 97dd91cd..c620e107 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 decb545f..d6326003 100644
--- a/src/forge/Issues/Component/colorCard.jsx
+++ b/src/forge/Issues/Component/colorCard.jsx
@@ -3,16 +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(()=>{
- defaultColor && setTextColor(defaultColor);
+ if(defaultColor){
+ setTextColor(defaultColor);
+ }
},[defaultColor])
// 切换色卡
function handleChange(color){
- setColor(color.rgb);
setTextColor(color.hex);
getColor(color ? color.hex : defaultColor);
}
@@ -26,7 +27,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 +38,7 @@ function ColorCard({getColor,defaultColor}){
{displayColorPicker ? (
{setDisplayColorPicker(false)}} />
-
+
) : null}
diff --git a/src/forge/Issues/Pages/sign.jsx b/src/forge/Issues/Pages/sign.jsx
index 55187b4a..be3abaf0 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(