Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
fdd17ce8
Commit
fdd17ce8
authored
Feb 01, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: update memo content key
parent
7cd3fcbc
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
17 deletions
+30
-17
EmbeddedMemo.tsx
...c/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx
+2
-2
OrderedList.tsx
web/src/components/MemoContent/OrderedList.tsx
+5
-3
TaskList.tsx
web/src/components/MemoContent/TaskList.tsx
+8
-5
UnorderedList.tsx
web/src/components/MemoContent/UnorderedList.tsx
+5
-3
MemoView.tsx
web/src/components/MemoView.tsx
+7
-1
Archived.tsx
web/src/pages/Archived.tsx
+1
-1
Home.tsx
web/src/pages/Home.tsx
+1
-1
MemoDetail.tsx
web/src/pages/MemoDetail.tsx
+1
-1
No files found.
web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx
View file @
fdd17ce8
...
@@ -42,7 +42,7 @@ const EmbeddedMemo = ({ resourceId, params: paramsStr }: Props) => {
...
@@ -42,7 +42,7 @@ const EmbeddedMemo = ({ resourceId, params: paramsStr }: Props) => {
if
(
inlineMode
)
{
if
(
inlineMode
)
{
return
(
return
(
<
div
className=
"w-full"
>
<
div
className=
"w-full"
>
<
MemoContent
memoId=
{
memo
.
id
}
content=
{
memo
.
content
}
embeddedMemos=
{
context
.
embeddedMemos
}
/>
<
MemoContent
key=
{
`${memo.id}-${memo.updateTime}`
}
memoId=
{
memo
.
id
}
content=
{
memo
.
content
}
embeddedMemos=
{
context
.
embeddedMemos
}
/>
<
MemoResourceListView
resources=
{
memo
.
resources
}
/>
<
MemoResourceListView
resources=
{
memo
.
resources
}
/>
</
div
>
</
div
>
);
);
...
@@ -56,7 +56,7 @@ const EmbeddedMemo = ({ resourceId, params: paramsStr }: Props) => {
...
@@ -56,7 +56,7 @@ const EmbeddedMemo = ({ resourceId, params: paramsStr }: Props) => {
<
Icon
.
ArrowUpRight
className=
"w-5 h-auto opacity-80 text-gray-400"
/>
<
Icon
.
ArrowUpRight
className=
"w-5 h-auto opacity-80 text-gray-400"
/>
</
Link
>
</
Link
>
</
div
>
</
div
>
<
MemoContent
memoId=
{
memo
.
id
}
content=
{
memo
.
content
}
embeddedMemos=
{
context
.
embeddedMemos
}
/>
<
MemoContent
key=
{
`${memo.id}-${memo.updateTime}`
}
memoId=
{
memo
.
id
}
content=
{
memo
.
content
}
embeddedMemos=
{
context
.
embeddedMemos
}
/>
<
MemoResourceListView
resources=
{
memo
.
resources
}
/>
<
MemoResourceListView
resources=
{
memo
.
resources
}
/>
</
div
>
</
div
>
);
);
...
...
web/src/components/MemoContent/OrderedList.tsx
View file @
fdd17ce8
...
@@ -13,9 +13,11 @@ const OrderedList: React.FC<Props> = ({ number, indent, children }: Props) => {
...
@@ -13,9 +13,11 @@ const OrderedList: React.FC<Props> = ({ number, indent, children }: Props) => {
return
(
return
(
<
ol
>
<
ol
>
<
li
className=
"w-full flex flex-row"
>
<
li
className=
"w-full flex flex-row"
>
{
indent
>
0
&&
(
<
div
className=
"block font-mono shrink-0"
>
<
div
className=
"block font-mono shrink-0"
>
<
span
>
{
repeat
(
" "
,
indent
)
}
</
span
>
<
span
>
{
repeat
(
" "
,
indent
)
}
</
span
>
</
div
>
</
div
>
)
}
<
div
className=
"w-auto grid grid-cols-[24px_1fr] gap-1"
>
<
div
className=
"w-auto grid grid-cols-[24px_1fr] gap-1"
>
<
div
className=
"w-7 h-6 flex justify-center items-center"
>
<
div
className=
"w-7 h-6 flex justify-center items-center"
>
<
span
className=
"opacity-80"
>
{
number
}
.
</
span
>
<
span
className=
"opacity-80"
>
{
number
}
.
</
span
>
...
...
web/src/components/MemoContent/TaskList.tsx
View file @
fdd17ce8
import
{
Checkbox
}
from
"@mui/joy"
;
import
{
Checkbox
}
from
"@mui/joy"
;
import
classNames
from
"classnames"
;
import
classNames
from
"classnames"
;
import
{
repeat
}
from
"lodash-es"
;
import
{
repeat
}
from
"lodash-es"
;
import
{
useContext
}
from
"react"
;
import
{
useContext
,
useState
}
from
"react"
;
import
{
useMemoStore
}
from
"@/store/v1"
;
import
{
useMemoStore
}
from
"@/store/v1"
;
import
{
Node
,
NodeType
}
from
"@/types/node"
;
import
{
Node
,
NodeType
}
from
"@/types/node"
;
import
Renderer
from
"./Renderer"
;
import
Renderer
from
"./Renderer"
;
...
@@ -18,6 +18,7 @@ interface Props {
...
@@ -18,6 +18,7 @@ interface Props {
const
TaskList
:
React
.
FC
<
Props
>
=
({
index
,
indent
,
complete
,
children
}:
Props
)
=>
{
const
TaskList
:
React
.
FC
<
Props
>
=
({
index
,
indent
,
complete
,
children
}:
Props
)
=>
{
const
context
=
useContext
(
RendererContext
);
const
context
=
useContext
(
RendererContext
);
const
memoStore
=
useMemoStore
();
const
memoStore
=
useMemoStore
();
const
[
checked
]
=
useState
(
complete
);
const
handleCheckboxChange
=
async
(
on
:
boolean
)
=>
{
const
handleCheckboxChange
=
async
(
on
:
boolean
)
=>
{
if
(
context
.
readonly
||
!
context
.
memoId
)
{
if
(
context
.
readonly
||
!
context
.
memoId
)
{
...
@@ -48,12 +49,14 @@ const TaskList: React.FC<Props> = ({ index, indent, complete, children }: Props)
...
@@ -48,12 +49,14 @@ const TaskList: React.FC<Props> = ({ index, indent, complete, children }: Props)
return
(
return
(
<
ul
>
<
ul
>
<
li
className=
"w-full flex flex-row"
>
<
li
className=
"w-full flex flex-row"
>
{
indent
>
0
&&
(
<
div
className=
"block font-mono shrink-0"
>
<
div
className=
"block font-mono shrink-0"
>
<
span
>
{
repeat
(
" "
,
indent
)
}
</
span
>
<
span
>
{
repeat
(
" "
,
indent
)
}
</
span
>
</
div
>
</
div
>
)
}
<
div
className=
"w-auto grid grid-cols-[24px_1fr] gap-1"
>
<
div
className=
"w-auto grid grid-cols-[24px_1fr] gap-1"
>
<
div
className=
"w-7 h-6 flex justify-center items-center"
>
<
div
className=
"w-7 h-6 flex justify-center items-center"
>
<
Checkbox
size=
"sm"
checked=
{
c
omplete
}
disabled=
{
context
.
readonly
}
onChange=
{
(
e
)
=>
handleCheckboxChange
(
e
.
target
.
checked
)
}
/>
<
Checkbox
size=
"sm"
checked=
{
c
hecked
}
disabled=
{
context
.
readonly
}
onChange=
{
(
e
)
=>
handleCheckboxChange
(
e
.
target
.
checked
)
}
/>
</
div
>
</
div
>
<
div
className=
{
classNames
(
complete
&&
"line-through opacity-80"
)
}
>
<
div
className=
{
classNames
(
complete
&&
"line-through opacity-80"
)
}
>
{
children
.
map
((
child
,
index
)
=>
(
{
children
.
map
((
child
,
index
)
=>
(
...
...
web/src/components/MemoContent/UnorderedList.tsx
View file @
fdd17ce8
...
@@ -12,9 +12,11 @@ const UnorderedList: React.FC<Props> = ({ indent, children }: Props) => {
...
@@ -12,9 +12,11 @@ const UnorderedList: React.FC<Props> = ({ indent, children }: Props) => {
return
(
return
(
<
ul
>
<
ul
>
<
li
className=
"w-full flex flex-row"
>
<
li
className=
"w-full flex flex-row"
>
{
indent
>
0
&&
(
<
div
className=
"block font-mono shrink-0"
>
<
div
className=
"block font-mono shrink-0"
>
<
span
>
{
repeat
(
" "
,
indent
)
}
</
span
>
<
span
>
{
repeat
(
" "
,
indent
)
}
</
span
>
</
div
>
</
div
>
)
}
<
div
className=
"w-auto grid grid-cols-[24px_1fr] gap-1"
>
<
div
className=
"w-auto grid grid-cols-[24px_1fr] gap-1"
>
<
div
className=
"w-7 h-6 flex justify-center items-center"
>
<
div
className=
"w-7 h-6 flex justify-center items-center"
>
<
span
className=
"opacity-80"
>
•
</
span
>
<
span
className=
"opacity-80"
>
•
</
span
>
...
...
web/src/components/MemoView.tsx
View file @
fdd17ce8
...
@@ -257,7 +257,13 @@ const MemoView: React.FC<Props> = (props: Props) => {
...
@@ -257,7 +257,13 @@ const MemoView: React.FC<Props> = (props: Props) => {
)
}
)
}
</
div
>
</
div
>
</
div
>
</
div
>
<
MemoContent
memoId=
{
memo
.
id
}
content=
{
memo
.
content
}
readonly=
{
readonly
}
onClick=
{
handleMemoContentClick
}
/>
<
MemoContent
key=
{
`${memo.id}-${memo.updateTime}`
}
memoId=
{
memo
.
id
}
content=
{
memo
.
content
}
readonly=
{
readonly
}
onClick=
{
handleMemoContentClick
}
/>
<
MemoResourceListView
resources=
{
memo
.
resources
}
/>
<
MemoResourceListView
resources=
{
memo
.
resources
}
/>
<
MemoRelationListView
memo=
{
memo
}
relationList=
{
referenceRelations
}
/>
<
MemoRelationListView
memo=
{
memo
}
relationList=
{
referenceRelations
}
/>
</
div
>
</
div
>
...
...
web/src/pages/Archived.tsx
View file @
fdd17ce8
...
@@ -125,7 +125,7 @@ const Archived = () => {
...
@@ -125,7 +125,7 @@ const Archived = () => {
</
Tooltip
>
</
Tooltip
>
</
div
>
</
div
>
</
div
>
</
div
>
<
MemoContent
memoId=
{
memo
.
id
}
content=
{
memo
.
content
}
readonly=
{
true
}
/>
<
MemoContent
key=
{
`${memo.id}-${memo.updateTime}`
}
memoId=
{
memo
.
id
}
content=
{
memo
.
content
}
readonly=
{
true
}
/>
</
div
>
</
div
>
))
))
)
}
)
}
...
...
web/src/pages/Home.tsx
View file @
fdd17ce8
...
@@ -73,7 +73,7 @@ const Home = () => {
...
@@ -73,7 +73,7 @@ const Home = () => {
<
div
className=
"flex flex-col justify-start items-start w-full max-w-full pb-28"
>
<
div
className=
"flex flex-col justify-start items-start w-full max-w-full pb-28"
>
<
MemoFilter
className=
"px-2 pb-2"
/>
<
MemoFilter
className=
"px-2 pb-2"
/>
{
sortedMemos
.
map
((
memo
)
=>
(
{
sortedMemos
.
map
((
memo
)
=>
(
<
MemoView
key=
{
`${memo.id}-${memo.
display
Time}`
}
memo=
{
memo
}
showVisibility
showPinned
/>
<
MemoView
key=
{
`${memo.id}-${memo.
update
Time}`
}
memo=
{
memo
}
showVisibility
showPinned
/>
))
}
))
}
{
isRequesting
?
(
{
isRequesting
?
(
<
div
className=
"flex flex-row justify-center items-center w-full my-4 text-gray-400"
>
<
div
className=
"flex flex-row justify-center items-center w-full my-4 text-gray-400"
>
...
...
web/src/pages/MemoDetail.tsx
View file @
fdd17ce8
...
@@ -137,7 +137,7 @@ const MemoDetail = () => {
...
@@ -137,7 +137,7 @@ const MemoDetail = () => {
</
Link
>
</
Link
>
</
div
>
</
div
>
)
}
)
}
<
MemoContent
memoId=
{
memo
.
id
}
content=
{
memo
.
content
}
readonly=
{
readonly
}
/>
<
MemoContent
key=
{
`${memo.id}-${memo.updateTime}`
}
memoId=
{
memo
.
id
}
content=
{
memo
.
content
}
readonly=
{
readonly
}
/>
<
MemoResourceListView
resources=
{
memo
.
resources
}
/>
<
MemoResourceListView
resources=
{
memo
.
resources
}
/>
<
MemoRelationListView
memo=
{
memo
}
relationList=
{
referenceRelations
}
/>
<
MemoRelationListView
memo=
{
memo
}
relationList=
{
referenceRelations
}
/>
<
div
className=
"w-full mt-3 flex flex-row justify-between items-center gap-2"
>
<
div
className=
"w-full mt-3 flex flex-row justify-between items-center gap-2"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment