greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

enhance(mobile): tweat diff window

pull/4028/head
leizhe 2022-01-20 23:27:14 +08:00 committed by Andelf
parent 0eed799ccf
commit 30996118b0
4 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/frontend/components/diff.cljs
View File

@ -241,9 +241,9 @@
(when (nil? @disk-value) (when (nil? @disk-value)
(reset! disk-value disk-content) (reset! disk-value disk-content)
(reset! db-value db-content)) (reset! db-value db-content))
[:div.cp__diff-file {:style {:width 980}} [:div.cp__diff-file
[:div.cp__diff-file-header [:div.cp__diff-file-header
[:span.cp__diff-file-header-content.pl-1.font-medium {:style {:word-break "break-word"}} [:span.cp__diff-file-header-content.pl-1.font-medium
(str "File " path " has been modified on the disk.")]] (str "File " path " has been modified on the disk.")]]
[:div.p-4 [:div.p-4
(when (not= (string/trim disk-content) (string/trim db-content)) (when (not= (string/trim disk-content) (string/trim db-content))
@ -265,14 +265,13 @@
[:hr] [:hr]
[:div.flex.flex-row.mt-4 [:div.flex.flex-col.mt-4.sm:flex-row
[:div.flex-1 [:div.flex-1
[:div.mb-2 "On disk:"] [:div.mb-2 "On disk:"]
[:textarea.overflow-auto [:textarea.overflow-auto
{:value (rum/react disk-value) {:value (rum/react disk-value)
:on-change (fn [e] :on-change (fn [e]
(reset! disk-value (util/evalue e))) (reset! disk-value (util/evalue e)))}
:style {:min-height "50vh"}}
disk-content] disk-content]
(ui/button "Select this" (ui/button "Select this"
:on-click :on-click
@ -283,14 +282,13 @@
:skip-compare? true})) :skip-compare? true}))
(state/close-modal!)))] (state/close-modal!)))]
[:div.ml-4.flex-1 [:div.flex-1.mt-8.sm:ml-4.sm:mt-0
[:div.mb-2 "In Logseq:"] [:div.mb-2 "In Logseq:"]
[:textarea.overflow-auto [:textarea.overflow-auto
{:value (rum/react db-value) {:value (rum/react db-value)
:on-change (fn [e] :on-change (fn [e]
(prn "new-value: " (util/evalue e)) (prn "new-value: " (util/evalue e))
(reset! db-value (util/evalue e))) (reset! db-value (util/evalue e)))}
:style {:min-height "50vh"}}
db-content] db-content]
(ui/button "Select this" (ui/button "Select this"
:on-click :on-click

12
src/main/frontend/components/diff.css
View File

@ -6,6 +6,14 @@
.cp__diff-file { .cp__diff-file {
@apply mb-3; @apply mb-3;
textarea {
min-height: 20vh;
@screen sm {
min-height: 50vh;
}
}
} }
.cp__diff-file-header { .cp__diff-file-header {
@ -16,8 +24,8 @@
} }
.cp__diff-file-header-content { .cp__diff-file-header-content {
@apply truncate @apply truncate;
overflow-wrap: break-word;
} }
.cp__diff-file-header-type { .cp__diff-file-header-type {

3
src/main/frontend/handler/events.cljs
View File

@ -176,7 +176,8 @@
(when-let [repo (state/get-current-repo)] (when-let [repo (state/get-current-repo)]
(when (and disk-content db-content (when (and disk-content db-content
(not= (util/trim-safe disk-content) (util/trim-safe db-content))) (not= (util/trim-safe disk-content) (util/trim-safe db-content)))
(state/set-modal! #(diff/local-file repo path disk-content db-content))))) (state/set-modal! #(diff/local-file repo path disk-content db-content)
{:label "diff__cp"}))))
(defmethod handle :modal/display-file-version [[_ path content hash]] (defmethod handle :modal/display-file-version [[_ path content hash]]
(p/let [content (when content (encrypt/decrypt content))] (p/let [content (when content (encrypt/decrypt content))]

10
src/main/frontend/ui.css
View File

@ -136,6 +136,16 @@
transform: translateY(-60%); transform: translateY(-60%);
} }
} }
&[label="diff__cp"] {
.panel-content {
padding: 2rem 1rem;
@screen sm {
padding: 2rem;
}
}
}
} }
html.is-native-andorid, html.is-native-andorid,