Merge commit '8383b88a448501cfdb32b79b6e2ccafedadf5e97' into pro

app/Models/ProjectTask.php

@@ -329,13 +329,7 @@ class ProjectTask extends AbstractModel
         $query->where(function ($q1) use ($start, $end, $type) {
             switch ($type) {
                 case 'createdTime':
-                    $q1->where(function ($q2) use ($start) {
+                    $q1->where('project_tasks.created_at', '>=', $start)->where('project_tasks.created_at', '<=', $end);
-                        $q2->where('project_tasks.created_at', '>=', $start);
-                    })->orWhere(function ($q2) use ($end) {
-                        $q2->where('project_tasks.created_at', '<=', $end);
-                    })->orWhere(function ($q2) use ($start, $end) {
-                        $q2->where('project_tasks.created_at', '>', $start)->where('project_tasks.created_at', '<', $end);
-                    });
                     break;
 
                 default:

docker-compose.yml

@@ -179,7 +179,7 @@ services:
 
   okr:
     container_name: "dootask-okr-${APP_ID}"
-    image: "kuaifan/doookr:0.0.37"
+    image: "kuaifan/doookr:0.0.38"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       DOO_TASK_URL: "http://${APP_IPPR}.3"

public/site/en/download.html

@@ -342,8 +342,8 @@
     </footer>
   </div>
 </body>
-<script src="//cdn.bootcdn.net/ajax/libs/axios/1.3.6/axios.js"></script>
 <script src="../js/common.js"></script>
+<script src="//cdn.bootcdn.net/ajax/libs/axios/1.3.6/axios.js"></script>
 <script>
 const isMobile = 'ontouchstart' in window
 const androidDOM = document.getElementById("Android")

public/site/en/help.html

@@ -365,6 +365,13 @@
                         <a class="txt-4001620 txt" href="#section-19"
                         >Access Permissions</a
                         >
+                    </li>             <li
+                        class="l-ul-item"
+                        onclick="closeHelpDraweHandle()"
+                    >
+                        <a class="txt-4001620 txt" href="#section-20"
+                        >Document Display</a
+                        >
                     </li>
                 </ol>
             </li>
@@ -735,6 +742,13 @@
                                             <a class="txt-4001620 txt help-a"
                                             >Access Permissions</a
                                             >
+                                        </li>                           <li
+                                            class="l-ul-item"
+                                            data-id="section-20"
+                                        >
+                                            <a class="txt-4001620 txt help-a"
+                                            >Document Display</a
+                                            >
                                         </li>
                                     </ol>
                                 </li>
@@ -2180,7 +2194,9 @@
                                         alt="Access Authority"
                                     />
                                 </li>
-                                <li class="r-ul-item mb-36">
+                                <li class="r-ul-item mb-36"
+                                    id="section-20"
+                                >
                                     <h4
                                         class="txt-5002430 help-h4 mb-24"
                                     >
@@ -2454,6 +2470,10 @@
                 }
                 return;
             }
+            if(arrOffsetTop.length - 1 == i){
+                let elementsWithDataId = document.querySelectorAll("[data-id='" + `section-${i + 1}` + "']");
+                elementsWithDataId[0]?.classList?.add("active");
+            }
         }
     }
 </script>

public/site/en/log.html

@@ -291,9 +291,9 @@
     </footer>
   </div>
 </body>
+<script src="../js/common.js"></script>
 <script src="//cdn.jsdelivr.net/npm/markdown-it/dist/markdown-it.min.js"></script>
 <script src="//cdn.bootcdn.net/ajax/libs/axios/1.3.6/axios.js"></script>
-<script src="../js/common.js"></script>
 <script>
 const getItem = (key)=> {
   var record = JSON.parse(localStorage.getItem(key));
@@ -520,8 +520,8 @@ function scrollHandler(){
                 if (liHight > scrollHeight + ulHeight) {
                     ulElement.scrollTop += (pHihtt + pHihtt);
                 }
-                if (liHight < scrollHeight) {
+                if ((liHight - scrollHeight) <= 40) {
-                    ulElement.scrollTop -= (pHihtt + pHihtt);
+                    ulElement.scrollTop -= (pHihtt );
                 }
             return;
         }

public/site/zh/download.html

@@ -340,8 +340,8 @@
     </footer>
   </div>
 </body>
-<script src="//cdn.bootcdn.net/ajax/libs/axios/1.3.6/axios.js"></script>
 <script src="../js/common.js"></script>
+<script src="//cdn.bootcdn.net/ajax/libs/axios/1.3.6/axios.js"></script>
 <script>
 const isMobile = 'ontouchstart' in window
 const androidDOM = document.getElementById("Android")

public/site/zh/help.html

@@ -177,11 +177,14 @@
               <a class="txt-4001620 txt" href="#section-17">文件类型</a>
             </li>
             <li class="l-ul-item" onclick="closeHelpDraweHandle()">
-              <a class="txt-4001620 txt" href="#section-18">共享的文件</a>
+              <a class="txt-4001620 txt" href="#section-18">文件共享</a>
             </li>
             <li class="l-ul-item" onclick="closeHelpDraweHandle()">
               <a class="txt-4001620 txt" href="#section-19">访问权限</a>
             </li>
+            <li class="l-ul-item" onclick="closeHelpDraweHandle()">
+              <a class="txt-4001620 txt" href="#section-20">文件显示</a>
+            </li>
           </ol>
         </li>
       </ul>
@@ -359,11 +362,15 @@
                         <a class="txt-4001620 txt help-a">文件类型</a>
                       </li>
                       <li class="l-ul-item" data-id="section-18">
-                        <a class="txt-4001620 txt help-a">共享的文件</a>
+                        <a class="txt-4001620 txt help-a">文件共享</a>
                       </li>
                       <li class="l-ul-item" data-id="section-19">
                         <a class="txt-4001620 txt help-a">访问权限</a>
                       </li>
+                        <li class="l-ul-item" data-id="section-20">
+                            <a class="txt-4001620 txt help-a">文件显示</a>
+                        </li>
+
                     </ol>
                   </li>
                 </ul>
@@ -650,7 +657,7 @@
                     <h6 class="txt-4001624 help-h6">(2) 根据需求选择所有人/指定成员可见，共享文件读写/只读，点击【共享】即可完成操作。</h6>
                     <img class="r-ul-item-pic1" id="help_pic_file4" src="../img/light/help_pic_file4.png" alt="访问权限">
                   </li>
-                  <li class="r-ul-item mb-36">
+                  <li class="r-ul-item mb-36" id="section-20">
                     <h4 class="txt-5002430 help-h4 mb-24">文件显示</h4>
                     <h6 class="txt-4001624 help-h6">在DooTask页面左侧点击【文件】，勾选页面右上角【仅显示我的】图标，即可分类查看个人关联文件。</h6>
                     <img class="r-ul-item-pic1" id="help_pic_file5" src="../img/light/help_pic_file5.png" alt="文件显示">
@@ -830,6 +837,10 @@ function scrollHandler(){
                 }
             return;
         }
+        if(arrOffsetTop.length - 1 == i){
+            let elementsWithDataId = document.querySelectorAll("[data-id='" + `section-${i + 1}` + "']");
+            elementsWithDataId[0]?.classList?.add("active");
+        }
     }
 }
 </script>

public/site/zh/log.html

@@ -291,9 +291,9 @@
     </footer>
   </div>
 </body>
+<script src="../js/common.js"></script>
 <script src="//cdn.jsdelivr.net/npm/markdown-it/dist/markdown-it.min.js"></script>
 <script src="//cdn.bootcdn.net/ajax/libs/axios/1.3.6/axios.js"></script>
-<script src="../js/common.js"></script>
 <script>
 const getItem = (key)=> {
   var record = JSON.parse(localStorage.getItem(key));
@@ -510,7 +510,7 @@ function scrollHandler(){
             let elementsWithDataId = document.querySelectorAll("[data-id='" + `section-${i}` + "']");
                 elementsWithDataId[1]?.classList?.add("active");
                 //滚动设置
-                const liHight = elementsWithDataId[1]?.offsetTop;
+                const liHight = elementsWithDataId[1]?.offsetTop - 20;
                 const pHihtt = elementsWithDataId[1]?.offsetHeight;
                 const ulElement = document.getElementById('help-l-ul'); // 替换为你的 <div> 元素的 id
                 const scrollHeight = ulElement.scrollTop;
@@ -518,8 +518,8 @@ function scrollHandler(){
                 if (liHight > scrollHeight + ulHeight) {
                     ulElement.scrollTop += (pHihtt + pHihtt);
                 }
-                if (liHight < scrollHeight) {
+                if ((liHight - scrollHeight) <= 40) {
-                    ulElement.scrollTop -= (pHihtt + pHihtt);
+                    ulElement.scrollTop -= (pHihtt );
                 }
             return;
         }