@voplus/morpho-workspace 6.0.37 → 6.0.38
Sign up to get free protection for your applications and to get access to all the features.
- package/es/modules/tasks/components/TaskCheckActiveTab/index.less +3 -0
- package/es/modules/tasks/components/TaskCheckActiveTab/state.js +37 -35
- package/es/modules/tasks/components/TaskCheckActiveTab/state.js.map +1 -1
- package/es/modules/tasks/components/TaskCheckItem/index.less +1 -1
- package/es/modules/tasks/components/TaskCheckList/index.js +9 -4
- package/es/modules/tasks/components/TaskCheckList/index.js.map +1 -1
- package/es/modules/tasks/components/TaskCheckList/index.less +5 -0
- package/es/modules/tasks/components/TaskCheckList/state.d.ts +1 -0
- package/es/modules/tasks/components/TaskCheckList/state.js +2 -0
- package/es/modules/tasks/components/TaskCheckList/state.js.map +1 -1
- package/es/modules/tasks/components/TaskCheckNewForm/index.js +15 -25
- package/es/modules/tasks/components/TaskCheckNewForm/index.js.map +1 -1
- package/es/modules/tasks/components/TaskCheckNewForm/index.less +25 -7
- package/es/modules/tasks/components/TaskCheckNewForm/state.d.ts +3 -1
- package/es/modules/tasks/components/TaskCheckNewForm/state.js +13 -4
- package/es/modules/tasks/components/TaskCheckNewForm/state.js.map +1 -1
- package/package.json +1 -1
|
@@ -44,35 +44,43 @@ export class State {
|
|
|
44
44
|
}
|
|
45
45
|
update(list, type) {
|
|
46
46
|
list.map((i) => {
|
|
47
|
-
if (i.
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
if (
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
if (
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
if (
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
if (
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
47
|
+
if (i.taskStatus !== "Done") {
|
|
48
|
+
if (i.dueDate) {
|
|
49
|
+
const dueDate = dayjs(i.dueDate);
|
|
50
|
+
// 获取当前日期
|
|
51
|
+
const today = dayjs();
|
|
52
|
+
/** 获取明天的日期 */
|
|
53
|
+
const tomorrow = today.add(1, "day");
|
|
54
|
+
if (dueDate.isSame(today, "day")) {
|
|
55
|
+
if (type === "new")
|
|
56
|
+
this.todayList.push(i);
|
|
57
|
+
else
|
|
58
|
+
this.todayList = this.todayList.filter((item) => item.id !== i.id);
|
|
59
|
+
}
|
|
60
|
+
else if (dueDate.isSame(tomorrow, "day")) {
|
|
61
|
+
if (type === "new")
|
|
62
|
+
this.tomorrowList.push(i);
|
|
63
|
+
else
|
|
64
|
+
this.tomorrowList = this.tomorrowList.filter((item) => item.id !== i.id);
|
|
65
|
+
}
|
|
66
|
+
else if (dueDate.isBefore(today)) {
|
|
67
|
+
if (type === "new")
|
|
68
|
+
this.dueList.push(i);
|
|
69
|
+
else
|
|
70
|
+
this.dueList = this.dueList.filter((item) => item.id !== i.id);
|
|
71
|
+
}
|
|
72
|
+
else if (this.isDateInThisWeek(dueDate)) {
|
|
73
|
+
if (type === "new")
|
|
74
|
+
this.thisWeekList.push(i);
|
|
75
|
+
else
|
|
76
|
+
this.thisWeekList = this.thisWeekList.filter((item) => item.id !== i.id);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
if (type === "new")
|
|
80
|
+
this.upcomingList.push(i);
|
|
81
|
+
else
|
|
82
|
+
this.upcomingList = this.upcomingList.filter((item) => item.id !== i.id);
|
|
83
|
+
}
|
|
76
84
|
}
|
|
77
85
|
else {
|
|
78
86
|
if (type === "new")
|
|
@@ -81,12 +89,6 @@ export class State {
|
|
|
81
89
|
this.upcomingList = this.upcomingList.filter((item) => item.id !== i.id);
|
|
82
90
|
}
|
|
83
91
|
}
|
|
84
|
-
else {
|
|
85
|
-
if (type === "new")
|
|
86
|
-
this.upcomingList.push(i);
|
|
87
|
-
else
|
|
88
|
-
this.upcomingList = this.upcomingList.filter((item) => item.id !== i.id);
|
|
89
|
-
}
|
|
90
92
|
});
|
|
91
93
|
}
|
|
92
94
|
/** 检查特定日期是否在本周内 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskCheckActiveTab/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE1D,OAAO,KAAgB,MAAM,OAAO,CAAC;AAErC,MAAM,OAAO,KAAK;IACjB;QAImB;;;;mBAAgB,CAAC;WAAC;QACrC,gDAAgD;QAC7B;;;;mBAAmB,EAAE;WAAC;QACtB;;;;mBAAqB,EAAE;WAAC;QACxB;;;;mBAAwB,EAAE;WAAC;QAC3B;;;;mBAAwB,EAAE;WAAC;QAC3B;;;;mBAAwB,EAAE;WAAC;QAT7C,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAUc,MAAM,CAAC,IAAa,EAAE,IAAoB;QACxD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACd,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskCheckActiveTab/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE1D,OAAO,KAAgB,MAAM,OAAO,CAAC;AAErC,MAAM,OAAO,KAAK;IACjB;QAImB;;;;mBAAgB,CAAC;WAAC;QACrC,gDAAgD;QAC7B;;;;mBAAmB,EAAE;WAAC;QACtB;;;;mBAAqB,EAAE;WAAC;QACxB;;;;mBAAwB,EAAE;WAAC;QAC3B;;;;mBAAwB,EAAE;WAAC;QAC3B;;;;mBAAwB,EAAE;WAAC;QAT7C,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAUc,MAAM,CAAC,IAAa,EAAE,IAAoB;QACxD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACd,IAAI,CAAC,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;gBAC7B,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;oBACf,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;oBACjC,SAAS;oBACT,MAAM,KAAK,GAAG,KAAK,EAAE,CAAC;oBACtB,cAAc;oBACd,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;oBAErC,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;wBAClC,IAAI,IAAI,KAAK,KAAK;4BAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;4BACtC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;oBACzE,CAAC;yBAAM,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC;wBAC5C,IAAI,IAAI,KAAK,KAAK;4BAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;4BACzC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC/E,CAAC;yBAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;wBACpC,IAAI,IAAI,KAAK,KAAK;4BAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;4BACpC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;oBACrE,CAAC;yBAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;wBAC3C,IAAI,IAAI,KAAK,KAAK;4BAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;4BACzC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC/E,CAAC;yBAAM,CAAC;wBACP,IAAI,IAAI,KAAK,KAAK;4BAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;4BACzC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC/E,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,IAAI,IAAI,KAAK,KAAK;wBAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;wBACzC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC/E,CAAC;YACF,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,mBAAmB;IACJ,gBAAgB,CAAC,WAAkB;QACjD,SAAS;QACT,MAAM,GAAG,GAAG,KAAK,EAAE,CAAC;QACpB,OAAO;QACP,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,OAAO,CACN,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC;YACtC,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC;YACpC,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CACrE,CAAC;IACH,CAAC;CACD;AAvDmB;IAAlB,UAAU;oCAA0B;AAElB;IAAlB,UAAU;sCAA8B;AACtB;IAAlB,UAAU;wCAAgC;AACxB;IAAlB,UAAU;2CAAmC;AAC3B;IAAlB,UAAU;2CAAmC;AAC3B;IAAlB,UAAU;2CAAmC;AAE/B;IAAd,MAAM;mCAgCN;AAGc;IAAd,MAAM;6CAWN"}
|
|
@@ -2,12 +2,14 @@ import React, { useState, useMemo } from "react";
|
|
|
2
2
|
import { observe } from "@voplus/morpho-ui";
|
|
3
3
|
import TaskCheckActiveTab from "../TaskCheckActiveTab";
|
|
4
4
|
import TaskCheckDoneTab from "../TaskCheckDoneTab";
|
|
5
|
-
import { Button, Tabs, Badge } from "antd";
|
|
5
|
+
import { Button, Tabs, Badge, Popover } from "antd";
|
|
6
6
|
import { Scrollbars } from "react-custom-scrollbars-2";
|
|
7
7
|
import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
|
|
8
8
|
import { faEllipsis } from "@fortawesome/pro-solid-svg-icons";
|
|
9
|
+
import { faEllipsis as faEllipsisLight } from "@fortawesome/pro-light-svg-icons";
|
|
9
10
|
import TaskCheckNewForm from "../TaskCheckNewForm";
|
|
10
11
|
import { State } from "./state";
|
|
12
|
+
import { PlusOutlined } from "@ant-design/icons";
|
|
11
13
|
import classnames from "classnames";
|
|
12
14
|
import { useTaskListEffect } from "@voplus/morpho-document-core";
|
|
13
15
|
import { ViewContext, ViewContextData, } from "@voplus/morpho-document-core/es/data/context/ViewContext";
|
|
@@ -37,9 +39,12 @@ const TaskCheckList = (props) => {
|
|
|
37
39
|
React.createElement("div", { className: "task-check-header" },
|
|
38
40
|
React.createElement("h3", { className: "text-lg font-medium leading-6 text-gray-900" }, "Tasks"),
|
|
39
41
|
React.createElement("div", null,
|
|
40
|
-
React.createElement(
|
|
41
|
-
React.createElement(
|
|
42
|
-
|
|
42
|
+
React.createElement(Popover, { content: React.createElement(React.Fragment, null, "Show Done Tasts") },
|
|
43
|
+
React.createElement(Button, { type: "primary", onClick: onMore },
|
|
44
|
+
React.createElement(FAIcon, { icon: state.showTabbar ? faEllipsis : faEllipsisLight }))),
|
|
45
|
+
React.createElement(Button, { onClick: onCreate, className: "task-check-add" },
|
|
46
|
+
React.createElement(PlusOutlined, null)))),
|
|
47
|
+
React.createElement(Tabs, { className: classnames("task-check-tabs", { "show-tabbar": state.showTabbar }), activeKey: state.activeKey, onChange: (activeKey) => (state.activeKey = activeKey), items: [
|
|
43
48
|
{
|
|
44
49
|
key: "Active",
|
|
45
50
|
label: (React.createElement(React.Fragment, null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskCheckList/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,OAAO,gBAAgB,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskCheckList/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export class State {
|
|
|
8
8
|
writable: true,
|
|
9
9
|
value: false
|
|
10
10
|
});
|
|
11
|
+
/** 如果 Active / Done 都有内容 應該default 顯示 tabbar */
|
|
11
12
|
Object.defineProperty(this, "showTabbar", {
|
|
12
13
|
enumerable: true,
|
|
13
14
|
configurable: true,
|
|
@@ -39,6 +40,7 @@ export class State {
|
|
|
39
40
|
}
|
|
40
41
|
updateDoneTotals(total) {
|
|
41
42
|
this.doneTotals = total;
|
|
43
|
+
this.showTabbar = true;
|
|
42
44
|
}
|
|
43
45
|
}
|
|
44
46
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskCheckList/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE1D,MAAM,OAAO,KAAK;IACjB;QAImB;;;;mBAAU,KAAK;WAAC;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskCheckList/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE1D,MAAM,OAAO,KAAK;IACjB;QAImB;;;;mBAAU,KAAK;WAAC;QACnC,gDAAgD;QAC7B;;;;mBAAa,KAAK;WAAC;QACnB;;;;mBAAY,QAAQ;WAAC;QACrB;;;;;WAAsB;QACtB;;;;;WAAoB;QARtC,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IASc,kBAAkB,CAAC,KAAa;QAC9C,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC3B,CAAC;IAEc,gBAAgB,CAAC,KAAa;QAC5C,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACxB,CAAC;CACD;AAfmB;IAAlB,UAAU;sCAAwB;AAEhB;IAAlB,UAAU;yCAA2B;AACnB;IAAlB,UAAU;wCAA6B;AACrB;IAAlB,UAAU;2CAA8B;AACtB;IAAlB,UAAU;yCAA4B;AAExB;IAAd,MAAM;+CAEN;AAEc;IAAd,MAAM;6CAGN"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import React, { useState } from "react";
|
|
2
|
-
import { Col, Spin, Form, Input, Row, message } from "antd";
|
|
2
|
+
import { Col, Spin, Form, Input, Row, message, Button } from "antd";
|
|
3
3
|
import { State } from "./state";
|
|
4
4
|
import { observe } from "@voplus/morpho-ui";
|
|
5
5
|
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
|
-
import {
|
|
8
|
+
import { faCalendar } from "@fortawesome/pro-light-svg-icons";
|
|
9
9
|
import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
|
|
10
10
|
import classnames from "classnames";
|
|
11
11
|
import "./index.less";
|
|
@@ -21,34 +21,24 @@ const TaskCheckNewForm = (props) => {
|
|
|
21
21
|
React.createElement(Col, { flex: 1 },
|
|
22
22
|
React.createElement(Input, { autoFocus: true, value: state.params.Name, className: "task-name-input", placeholder: `Enter a title for this task`, onChange: (e) => runInAction(() => (state.params.Name = e.target.value)), onPressEnter: onSubmit, onKeyDown: onKeyDown })),
|
|
23
23
|
React.createElement(Col, null,
|
|
24
|
-
React.createElement("
|
|
25
|
-
React.createElement(
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}
|
|
38
|
-
if (inputlement) {
|
|
39
|
-
inputlement.focus();
|
|
40
|
-
}
|
|
41
|
-
}, style: { width: "100%" } })),
|
|
42
|
-
React.createElement(Col, null,
|
|
43
|
-
React.createElement("span", { className: "dueDate" }, "Due Dtae"))))))))));
|
|
24
|
+
React.createElement("div", { className: "task-due-date-content" },
|
|
25
|
+
state.dueDateString ? (React.createElement("div", { className: "due-val-content", onClick: () => (state.openDate = true) },
|
|
26
|
+
React.createElement("div", { className: "dueDate" }, "Due"),
|
|
27
|
+
React.createElement(React.Fragment, null, state.dueDateString))) : (React.createElement(Button, { type: "primary", className: "task-due-date-bnt", icon: React.createElement(FAIcon, { icon: faCalendar }), onClick: () => (state.openDate = true) })),
|
|
28
|
+
React.createElement(PresetDatePicker, { className: "task-preset-date-picker", open: state.openDate, onChange: (preset, date) => {
|
|
29
|
+
state.params.DueDate = dayjs(date).format("YYYY-MM-DD");
|
|
30
|
+
state.dueDateString = preset ? preset : dayjs(date).format("YYYY-MM-DD");
|
|
31
|
+
state.openDate = false;
|
|
32
|
+
const inputlement = document.querySelector(".task-name-input");
|
|
33
|
+
if (inputlement) {
|
|
34
|
+
inputlement.focus();
|
|
35
|
+
}
|
|
36
|
+
}, style: { width: "100%" } }))))))))));
|
|
44
37
|
function onKeyDown(e) {
|
|
45
38
|
if (e.keyCode !== 27)
|
|
46
39
|
return;
|
|
47
40
|
onCancel();
|
|
48
41
|
}
|
|
49
|
-
function onShowMore() {
|
|
50
|
-
state.showMore = !state.showMore;
|
|
51
|
-
}
|
|
52
42
|
async function onSubmit() {
|
|
53
43
|
var _a;
|
|
54
44
|
if (!state.params.Name)
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskCheckNewForm/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,16 +5,34 @@
|
|
|
5
5
|
padding: 10px 20px 0;
|
|
6
6
|
.ant-form-item {
|
|
7
7
|
margin-bottom: 10px;
|
|
8
|
-
.
|
|
9
|
-
font-size: 20px;
|
|
8
|
+
.task-due-date-content {
|
|
10
9
|
margin-left: 10px;
|
|
10
|
+
position: relative;
|
|
11
|
+
.task-preset-date-picker {
|
|
12
|
+
position: absolute;
|
|
13
|
+
left: 0;
|
|
14
|
+
top: 0;
|
|
15
|
+
z-index: -1;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
.task-due-date-bnt {
|
|
19
|
+
width: 40px;
|
|
20
|
+
font-size: 18px;
|
|
11
21
|
cursor: pointer;
|
|
22
|
+
display: inline-flex;
|
|
23
|
+
align-items: center;
|
|
24
|
+
justify-content: center;
|
|
12
25
|
}
|
|
13
|
-
.
|
|
14
|
-
|
|
15
|
-
line-height:
|
|
16
|
-
color:
|
|
17
|
-
|
|
26
|
+
.due-val-content {
|
|
27
|
+
min-width: 30px;
|
|
28
|
+
line-height: 18px;
|
|
29
|
+
background-color: #fff;
|
|
30
|
+
cursor: pointer;
|
|
31
|
+
.dueDate {
|
|
32
|
+
font-size: 12px;
|
|
33
|
+
line-height: 14px;
|
|
34
|
+
color: @heading-subtitle-color;
|
|
35
|
+
}
|
|
18
36
|
}
|
|
19
37
|
}
|
|
20
38
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Dayjs } from "dayjs";
|
|
1
2
|
export declare class State {
|
|
2
3
|
constructor();
|
|
3
4
|
Params: {
|
|
@@ -10,6 +11,7 @@ export declare class State {
|
|
|
10
11
|
DueDate: string;
|
|
11
12
|
InheritMembers: boolean;
|
|
12
13
|
};
|
|
13
|
-
showMore: boolean;
|
|
14
14
|
loading: boolean;
|
|
15
|
+
openDate: boolean;
|
|
16
|
+
dueDateString?: string | Dayjs;
|
|
15
17
|
}
|
|
@@ -18,18 +18,24 @@ export class State {
|
|
|
18
18
|
writable: true,
|
|
19
19
|
value: this.Params
|
|
20
20
|
});
|
|
21
|
-
Object.defineProperty(this, "
|
|
21
|
+
Object.defineProperty(this, "loading", {
|
|
22
22
|
enumerable: true,
|
|
23
23
|
configurable: true,
|
|
24
24
|
writable: true,
|
|
25
25
|
value: false
|
|
26
26
|
});
|
|
27
|
-
Object.defineProperty(this, "
|
|
27
|
+
Object.defineProperty(this, "openDate", {
|
|
28
28
|
enumerable: true,
|
|
29
29
|
configurable: true,
|
|
30
30
|
writable: true,
|
|
31
31
|
value: false
|
|
32
32
|
});
|
|
33
|
+
Object.defineProperty(this, "dueDateString", {
|
|
34
|
+
enumerable: true,
|
|
35
|
+
configurable: true,
|
|
36
|
+
writable: true,
|
|
37
|
+
value: void 0
|
|
38
|
+
});
|
|
33
39
|
makeObservable(this);
|
|
34
40
|
}
|
|
35
41
|
}
|
|
@@ -38,8 +44,11 @@ __decorate([
|
|
|
38
44
|
], State.prototype, "params", void 0);
|
|
39
45
|
__decorate([
|
|
40
46
|
observable
|
|
41
|
-
], State.prototype, "
|
|
47
|
+
], State.prototype, "loading", void 0);
|
|
42
48
|
__decorate([
|
|
43
49
|
observable
|
|
44
|
-
], State.prototype, "
|
|
50
|
+
], State.prototype, "openDate", void 0);
|
|
51
|
+
__decorate([
|
|
52
|
+
observable
|
|
53
|
+
], State.prototype, "dueDateString", void 0);
|
|
45
54
|
//# sourceMappingURL=state.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskCheckNewForm/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElD,MAAM,OAAO,KAAK;IACjB;QAGO;;;;mBAAS;gBACf,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,KAAK;aACrB;WAAC;QACiB;;;;mBAAS,IAAI,CAAC,MAAM;WAAC;QACrB;;;;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskCheckNewForm/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElD,MAAM,OAAO,KAAK;IACjB;QAGO;;;;mBAAS;gBACf,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,KAAK;aACrB;WAAC;QACiB;;;;mBAAS,IAAI,CAAC,MAAM;WAAC;QACrB;;;;mBAAU,KAAK;WAAC;QAChB;;;;mBAAW,KAAK;WAAC;QACjB;;;;;WAA+B;QAVjD,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;CAUD;AAJmB;IAAlB,UAAU;qCAA6B;AACrB;IAAlB,UAAU;sCAAwB;AAChB;IAAlB,UAAU;uCAAyB;AACjB;IAAlB,UAAU;4CAAuC"}
|