Merge branch 'master' of github.com:kuaifan/dootask into develop

# Conflicts: # app/Http/Controllers/Api/DialogController.php # electron/package.json # package.json # public/css/app.css # public/js/app.js # public/js/build/146.js # public/js/build/146.js.LICENSE.txt # public/js/build/178.js # public/js/build/178.js.LICENSE.txt # public/js/build/199.js # public/js/build/199.js.LICENSE.txt # public/js/build/309.js # public/js/build/328.js.LICENSE.txt # public/js/build/388.js # public/js/build/43.js # public/js/build/46.js.LICENSE.txt # public/js/build/857.js # public/js/build/857.js.LICENSE.txt # public/js/build/893.js
2022-01-25 16:11:23 +08:00
parent 778f6367f9 7f14a82053
commit 8f0b5dc049
1042 changed files with 7455 additions and 81206 deletions
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -121,6 +121,9 @@
                            padding: 8px;
                            min-width: 32px;
                            border-radius: 6px 6px 6px 0;
+                            .dialog-file {
+                                cursor: pointer;
+                            }
                            > pre {
                                display: block;
                                margin: 0;
@@ -442,10 +445,18 @@
 }

 .dialog-wrapper-paste {
+    margin-top: -4px;
    img {
        max-width: 100%;
        max-height: 1000px;
    }
+    > div,
+    > img {
+        display: flex;
+        flex-direction: column;
+        padding: 0;
+        margin: 4px 0;
+    }
 }

@media (max-width: 768px) {
--- a/resources/assets/sass/pages/components/file-content.scss
+++ b/resources/assets/sass/pages/components/file-content.scss
@@ -183,10 +183,6 @@
                }
            }
        }
-
-        .luckysheet {
-            border: 0;
-        }
    }

    .content-load {
@@ -249,10 +245,6 @@
    }
 }

-.luckysheet-input-box {
-    z-index: 99999 !important;
-}
-
@media (max-width: 1200px) {
    .file-content {
        overflow: auto;
--- a/resources/assets/sass/pages/components/task-detail.scss
+++ b/resources/assets/sass/pages/components/task-detail.scss
@@ -251,6 +251,7 @@
                                overflow: hidden;
                                text-overflow: ellipsis;
                                white-space: nowrap;
+                                cursor: pointer;
                                &:hover {
                                    color: $primary-color;
                                }
--- a/resources/assets/sass/pages/page-file.scss
+++ b/resources/assets/sass/pages/page-file.scss
@@ -509,6 +509,7 @@
 }

 .page-file-dropdown-menu {
+    max-height: none !important;
    .ivu-dropdown {
        width: 100%;
        .arrow-forward-item {