diff --git a/README.md b/README.md index ee559d5..61e0181 100644 --- a/README.md +++ b/README.md @@ -6,16 +6,18 @@ 1. 层级展示任务 2. 可在操作中四象线展示子任务 -![任务树](tree.png) +![任务树](help/tree.png) ## 四象线 1. 向上重要 2. 向左紧急 -![四象线](four.png) +![四象线](help/four.png) ## 日历 1. 月,周,日展示 2. 只有期望开始时间和期望结束时间都填写的时候才会在日历中展示 -3. +![周](help/week.png) +![天](help/day.png) +![月](help/month.png) ## 项目启动 ### 后端服务启动 1. 后端启动应用需求:docker,redis,mysql8。 diff --git a/docker/Dockerfile-server b/docker/Dockerfile-server index c64961b..c703262 100644 --- a/docker/Dockerfile-server +++ b/docker/Dockerfile-server @@ -2,7 +2,7 @@ FROM openjdk:8 WORKDIR /app COPY task-manager-server.jar /app/task-manager-server.jar EXPOSE 8090 -CMD ["java", "-jar", "task-manager-server.jar"] +CMD ["java", "-jar", "task-manager-server.jar","--spring.profiles.active=docker"] # 指定文件名 当前路径 # docker build -t task-manager-server -f Dockerfile-server . # docker run -d -p 8090:8090 --restart unless-stopped -v ./hosts:/etc/hosts --name task-manager-server task-manager-server diff --git a/docker/task-manager-server.jar b/docker/task-manager-server.jar index f5f5d60..62f9d90 100644 Binary files a/docker/task-manager-server.jar and b/docker/task-manager-server.jar differ diff --git a/help/day.png b/help/day.png new file mode 100644 index 0000000..46687a6 Binary files /dev/null and b/help/day.png differ diff --git a/four.png b/help/four.png similarity index 100% rename from four.png rename to help/four.png diff --git a/help/month.png b/help/month.png new file mode 100644 index 0000000..bf19c6e Binary files /dev/null and b/help/month.png differ diff --git a/tree.png b/help/tree.png similarity index 100% rename from tree.png rename to help/tree.png diff --git a/help/week.png b/help/week.png new file mode 100644 index 0000000..a6a8d88 Binary files /dev/null and b/help/week.png differ diff --git a/src/ui/task/OperationButton.tsx b/src/ui/task/OperationButton.tsx index 93c6ebe..256bf11 100644 --- a/src/ui/task/OperationButton.tsx +++ b/src/ui/task/OperationButton.tsx @@ -132,9 +132,9 @@ class OperationButton extends React.Component {this.state.openModal&& { } return
- {open&&} diff --git a/src/ui/task/project/DetailModelForm.tsx b/src/ui/task/project/DetailModelForm.tsx index 1e1eaef..538fa18 100644 --- a/src/ui/task/project/DetailModelForm.tsx +++ b/src/ui/task/project/DetailModelForm.tsx @@ -40,8 +40,7 @@ export type DetailModelFormProps={ export type PidSelectTree= { label: string; value: number;pid:number; children?: PidSelectTree[] } export const DetailModelForm: React.FC = (props) => { - console.log("DetailModelForm:props:",props,props.itemId!=undefined&&( - props.operationId === OPERATION_BUTTON_TYPE.DETAIL || props.operationId === OPERATION_BUTTON_TYPE.UPDATE)) + console.log("DetailModelForm:props:",props) const [form] = Form.useForm(); const [pid, setPid] = useState(props.pid?props.pid:0); const [editFormDisable, setEditFormDisable] = useState(props.operationId === OPERATION_BUTTON_TYPE.DETAIL) @@ -100,7 +99,7 @@ export const DetailModelForm: React.FC = (props) => { props.reloadData?.(); }, }} - submitter={props.itemId!==undefined&&props.itemId!=-1?{ + submitter={props.itemId!==undefined&&props.itemId!==-1?{ render: (prop, defaultDoms) => { return [ editFormDisable?:undefined, - = (props) => { > - + :undefined , ...defaultDoms ]; @@ -219,7 +218,7 @@ export const DetailModelForm: React.FC = (props) => { }} name="pid" label="父级任务" - fieldProps={{onSelect: (e,node) => {console.log('onSelect',e,node);setPid(node.pid)}}} + fieldProps={{onSelect: (e,node) => {console.log('onSelect',e,node);setPid(e)}}} disabled ={editFormDisable} />