@voplus/morpho-workspace 6.0.39 → 6.0.41
Sign up to get free protection for your applications and to get access to all the features.
- package/es/modules/calendar/pages/CalendarMonth/index.js +51 -21
- package/es/modules/calendar/pages/CalendarMonth/index.js.map +1 -1
- package/es/modules/tasks/components/TaskCheckNewForm/index.js +3 -3
- package/es/modules/tasks/components/TaskCheckNewForm/index.js.map +1 -1
- package/es/modules/tasks/components/TaskCheckNewForm/index.less +8 -8
- package/package.json +4 -2
@@ -1,44 +1,42 @@
|
|
1
|
-
import {
|
2
|
-
import {
|
3
|
-
import {
|
1
|
+
import React, { useCallback, useEffect, useRef, useState } from "react";
|
2
|
+
import { AsideContent, observe, useRenderOnChange, UTCDatePicker as DatePicker, } from "@voplus/morpho-ui";
|
3
|
+
import { useMetaStore } from "@voplus/morpho-document-core";
|
4
4
|
import { FilterOptionsContext, FilterOptionsContextState } from "@voplus/morpho-ui/es/data";
|
5
5
|
import { useCalendarListEffect, useCalendarStore } from "../../../../data/calendar";
|
6
|
-
import React, { useCallback, useEffect, useRef, useState } from "react";
|
7
6
|
import { faAngleLeft, faAngleRight } from "@fortawesome/pro-light-svg-icons";
|
8
7
|
import { useDeepMemo, useTabItem } from "@voplus/morpho-data";
|
8
|
+
import { faCalendar } from "@fortawesome/free-solid-svg-icons";
|
9
|
+
import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
|
10
|
+
import { Scrollbars } from "react-custom-scrollbars-2";
|
11
|
+
import { Button, Select } from "antd";
|
12
|
+
import { runInAction } from "mobx";
|
13
|
+
import { State } from "./state";
|
9
14
|
import CalendarEventContent from "../../components/CalendarEventContent";
|
10
15
|
import EventsFilter from "../../../../controls/filters/EventsFilter";
|
11
|
-
import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
|
12
16
|
import FilterView from "@voplus/morpho-ui/es/controls/FilterView";
|
17
|
+
import interactionPlugin from "@fullcalendar/interaction";
|
18
|
+
import timeGridPlugin from "@fullcalendar/timegrid";
|
13
19
|
import FullCalendar from "@fullcalendar/react";
|
14
|
-
import { Scrollbars } from "react-custom-scrollbars-2";
|
15
|
-
import { State } from "./state";
|
16
20
|
import dayGridPlugin from "@fullcalendar/daygrid";
|
21
|
+
import crypto from "crypto-js";
|
17
22
|
import dayjs from "dayjs";
|
18
|
-
import { faCalendar } from "@fortawesome/free-solid-svg-icons";
|
19
|
-
import interactionPlugin from "@fullcalendar/interaction";
|
20
|
-
import { runInAction } from "mobx";
|
21
23
|
import styles from "./index.less";
|
22
|
-
import timeGridPlugin from "@fullcalendar/timegrid";
|
23
|
-
import { useMetaStore } from "@voplus/morpho-document-core";
|
24
24
|
const CalendarMonth = () => {
|
25
25
|
const tab = useTabItem();
|
26
26
|
const meta = useMetaStore();
|
27
27
|
const filterState = useDeepMemo(() => new FilterOptionsContextState({
|
28
28
|
defaults: {
|
29
|
-
filters: [
|
30
|
-
{ c: "OwnerType", o: "contains", v1: JSON.stringify(["My"]), l: "And" },
|
31
|
-
],
|
29
|
+
filters: [{ c: "OwnerType", o: "contains", v1: JSON.stringify(["My"]), l: "And" }],
|
32
30
|
page: { Page: 1, PageSize: 200 },
|
33
31
|
},
|
34
32
|
}), []);
|
35
|
-
const [asideContext] = useState(AsideContent.createContext());
|
36
|
-
const calendar = useCalendarStore();
|
37
33
|
const Option = Select.Option;
|
38
34
|
const [state] = useState(new State());
|
39
|
-
const
|
35
|
+
const [asideContext] = useState(AsideContent.createContext());
|
40
36
|
const [currentTime, setCurrentTime] = useState();
|
41
37
|
const [calendarApi, setCalendarApi] = useState();
|
38
|
+
const calendarRef = useRef(null);
|
39
|
+
const calendar = useCalendarStore();
|
42
40
|
/** 设置 日历 高度 */
|
43
41
|
const boxRef = useCallback((node) => {
|
44
42
|
if (node !== null) {
|
@@ -56,10 +54,11 @@ const CalendarMonth = () => {
|
|
56
54
|
useRenderOnChange(() => filterState.options);
|
57
55
|
useCalendarListEffect(null, (list) => {
|
58
56
|
runInAction(() => {
|
59
|
-
const colorList = ["#d3adf7", "#ffbb96", "#adc6ff", "#ffd591", "#b7eb8f", "#87e8de"];
|
60
57
|
list.map((item, index) => {
|
61
|
-
|
62
|
-
item.
|
58
|
+
var _a, _b, _c;
|
59
|
+
item.backgroundColor = generateLightColorFromHash((_a = item === null || item === void 0 ? void 0 : item.source) === null || _a === void 0 ? void 0 : _a.type);
|
60
|
+
item.borderColor = generateLightColorFromHash((_b = item === null || item === void 0 ? void 0 : item.source) === null || _b === void 0 ? void 0 : _b.type);
|
61
|
+
console.log("color", generateLightColorFromHash((_c = item === null || item === void 0 ? void 0 : item.source) === null || _c === void 0 ? void 0 : _c.type));
|
63
62
|
});
|
64
63
|
state.listOptions = list;
|
65
64
|
});
|
@@ -108,6 +107,37 @@ const CalendarMonth = () => {
|
|
108
107
|
height: "100%",
|
109
108
|
//events={(dataInfo)=>getDate(dataInfo)}//这个要放在eventSources前,不然eventSources数据会被覆盖
|
110
109
|
eventSources: [state.listOptions], eventDrop: eventDrop, eventContent: eventContent, datesSet: (info) => state.datesRender(info) })))))));
|
110
|
+
function generateLightColorFromHash(type) {
|
111
|
+
// 使用SHA-256哈希算法生成哈希值
|
112
|
+
const hash = crypto.SHA256(type).toString();
|
113
|
+
// 从哈希值中提取一部分用于生成颜色值
|
114
|
+
// 这里我们使用前6个字符来生成RGB值,你可以根据需要调整
|
115
|
+
let hexColor = "#" + hash.slice(0, 6);
|
116
|
+
// 确保颜色足够浅(这里是一个简单的启发式方法,你可以根据需要调整)
|
117
|
+
let r = parseInt(hexColor.slice(1, 3), 16);
|
118
|
+
let g = parseInt(hexColor.slice(3, 5), 16);
|
119
|
+
let b = parseInt(hexColor.slice(5, 7), 16);
|
120
|
+
const brightness = r * 0.299 + g * 0.587 + b * 0.114; // 使用RGB到亮度的简单转换
|
121
|
+
// 如果亮度不够高,则增加亮度值
|
122
|
+
if (brightness < 192) {
|
123
|
+
// 192是一个阈值,你可以根据需要进行调整
|
124
|
+
const adjustment = 255 - brightness;
|
125
|
+
r += Math.round((255 - r) * (adjustment / 255));
|
126
|
+
g += Math.round((255 - g) * (adjustment / 255));
|
127
|
+
b += Math.round((255 - b) * (adjustment / 255));
|
128
|
+
// 确保颜色值不超过255
|
129
|
+
r = Math.min(r, 255);
|
130
|
+
g = Math.min(g, 255);
|
131
|
+
b = Math.min(b, 255);
|
132
|
+
// 转换为16进制字符串
|
133
|
+
hexColor =
|
134
|
+
"#" +
|
135
|
+
r.toString(16).padStart(2, "0") +
|
136
|
+
g.toString(16).padStart(2, "0") +
|
137
|
+
b.toString(16).padStart(2, "0");
|
138
|
+
}
|
139
|
+
return hexColor;
|
140
|
+
}
|
111
141
|
/** 切换month,week,day视图 */
|
112
142
|
function handleChange(value) {
|
113
143
|
runInAction(() => (state.type = value));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/calendar/pages/CalendarMonth/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/calendar/pages/CalendarMonth/index.tsx"],"names":[],"mappings":"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"}
|
@@ -6,7 +6,8 @@ import PresetDatePicker from "@voplus/morpho-ui/es/controls/PresetDatePicker";
|
|
6
6
|
import { runInAction } from "mobx";
|
7
7
|
import { useTaskStore } from "@voplus/morpho-document-core";
|
8
8
|
import { faCalendar } from "@fortawesome/pro-light-svg-icons";
|
9
|
-
import {
|
9
|
+
import { faCalendar as faCalendarSolid } from "@fortawesome/free-solid-svg-icons";
|
10
|
+
import Icon from "@voplus/morpho-ui/es/controls/HoverSwitchIcon";
|
10
11
|
import classnames from "classnames";
|
11
12
|
import "./index.less";
|
12
13
|
import dayjs from "dayjs";
|
@@ -24,8 +25,7 @@ const TaskCheckNewForm = (props) => {
|
|
24
25
|
React.createElement("div", { className: "task-due-date-content" },
|
25
26
|
state.dueDateString ? (React.createElement("div", { className: "due-val-content", onClick: () => (state.openDate = true) },
|
26
27
|
React.createElement("div", { className: "dueDate" }, "Due"),
|
27
|
-
React.createElement(React.Fragment, null, state.dueDateString))) : (React.createElement("
|
28
|
-
React.createElement(FAIcon, { icon: faCalendar, size: "lg" }))),
|
28
|
+
React.createElement(React.Fragment, null, state.dueDateString))) : (React.createElement(Icon, { className: "task-due-date-bnt", icon: faCalendar, hover: faCalendarSolid, onClick: () => (state.openDate = true) })),
|
29
29
|
React.createElement(PresetDatePicker, { className: "task-preset-date-picker", open: state.openDate, onChange: (preset, date) => {
|
30
30
|
state.params.DueDate = dayjs(date).format("YYYY-MM-DD");
|
31
31
|
state.dueDateString = preset ? preset : dayjs(date).format("YYYY-MM-DD");
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskCheckNewForm/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,gDAAgD,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskCheckNewForm/index.tsx"],"names":[],"mappings":"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"}
|
@@ -8,27 +8,27 @@
|
|
8
8
|
.task-due-date-content {
|
9
9
|
margin-left: 10px;
|
10
10
|
position: relative;
|
11
|
+
background-color: #fff;
|
11
12
|
.task-preset-date-picker {
|
12
13
|
position: absolute;
|
13
14
|
left: 0;
|
14
15
|
top: 0;
|
15
16
|
z-index: -1;
|
17
|
+
border: none;
|
18
|
+
.ant-picker-suffix {
|
19
|
+
display: none;
|
20
|
+
}
|
16
21
|
}
|
17
22
|
}
|
18
23
|
.task-due-date-bnt {
|
19
|
-
|
20
|
-
height: 32px;
|
21
|
-
font-size: 20px;
|
24
|
+
font-size: 25px;
|
22
25
|
cursor: pointer;
|
26
|
+
color: lightgray;
|
23
27
|
display: inline-flex;
|
24
|
-
|
25
|
-
justify-content: center;
|
26
|
-
background-color: #fff;
|
28
|
+
padding-top: 2px;
|
27
29
|
}
|
28
30
|
.due-val-content {
|
29
|
-
min-width: 32px;
|
30
31
|
line-height: 18px;
|
31
|
-
background-color: #fff;
|
32
32
|
cursor: pointer;
|
33
33
|
.dueDate {
|
34
34
|
font-size: 12px;
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@voplus/morpho-workspace",
|
3
|
-
"version": "6.0.
|
3
|
+
"version": "6.0.41",
|
4
4
|
"description": "morpho workspace module",
|
5
5
|
"repository": {
|
6
6
|
"type": "git",
|
@@ -39,15 +39,17 @@
|
|
39
39
|
"@fullcalendar/timegrid": "6.x",
|
40
40
|
"@voplus/morpho-collaboration-action": "6.x",
|
41
41
|
"@voplus/morpho-report": "6.x",
|
42
|
+
"crypto-js": "^4.2.0",
|
42
43
|
"react-beautiful-dnd": "^13.1.0",
|
43
44
|
"swiper": "9.x",
|
44
45
|
"tippy.js": "^5.1.4"
|
45
46
|
},
|
46
47
|
"devDependencies": {
|
48
|
+
"@types/crypto-js": "^4.2.2",
|
47
49
|
"@types/mockjs": "^1.0.3",
|
48
50
|
"@types/react-beautiful-dnd": "^13.0.0",
|
49
|
-
"@voplus/morpho-client-test": "6.x",
|
50
51
|
"@voplus/morpho-build": "5.x",
|
52
|
+
"@voplus/morpho-client-test": "6.x",
|
51
53
|
"@voplus/morpho-storybook": "6.x",
|
52
54
|
"@voplus/morpho-test": "2.x",
|
53
55
|
"mockjs": "^1.1.0",
|