Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

2021-04-15 09:42:54 +08:00
parent f2b30be51a 8d5ac5bbc5
commit d5abe7f975
14 changed files with 40 additions and 51 deletions
@@ -453,7 +453,7 @@ $lang->action->label->testtask    = '测试单|testtask|view|caseID=%s';
 $lang->action->label->testsuite   = '测试套件|testsuite|view|suiteID=%s';
 $lang->action->label->caselib     = '用例库|caselib|view|libID=%s';
 $lang->action->label->todo        = '待办|todo|view|todoID=%s';
-$lang->action->label->doclib      = '文档库|doc|doclibbrowse|libID=%s';
+$lang->action->label->doclib      = '文档库|doc|objectLibs|type=&objectID=&libID=%s';
 $lang->action->label->doc         = '文档|doc|view|docID=%s';
 $lang->action->label->user        = '用户|user|view|account=%s';
 $lang->action->label->testreport  = '报告|testreport|view|report=%s';
@@ -154,6 +154,7 @@ $lang->extension->common  = 'Extension';
 $lang->company->common    = 'Company';
 $lang->dept->common       = 'Dept';
 $lang->program->list      = 'Program List';
+$lang->execution->list    = "{$lang->executionCommon} List";

 $lang->personnel->common     = 'Member';
 $lang->personnel->invest     = 'Investment';
@@ -226,7 +226,7 @@ $lang->scrum->menu->settings['subMenu']->group       = array('link' => "{$lang->
 /* Execution menu. */
 $lang->execution->homeMenu = new stdclass();
 if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|";
-$lang->execution->homeMenu->list  = array('link' => "{$lang->executionCommon}列表|execution|all|", 'alias' => 'create,batchedit');
+$lang->execution->homeMenu->list  = array('link' => "{$lang->execution->list}|execution|all|", 'alias' => 'create,batchedit');

 $lang->execution->menu = new stdclass();
 $lang->execution->menu->task     = array('link' => "{$lang->task->common}|execution|task|executionID=%s", 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
@@ -154,6 +154,7 @@ $lang->extension->common  = '插件';
 $lang->company->common    = '公司';
 $lang->dept->common       = '部门';
 $lang->program->list      = '项目集列表';
+$lang->execution->list    = "{$lang->executionCommon}列表";

 $lang->personnel->common     = '人员';
 $lang->personnel->invest     = '投入人员';
@@ -32,11 +32,4 @@
    <?php endif;?>
  </div>
 </div>
-<script>
-$(function()
-{
-    $('#mainHeader #navbar li[data-id=model]').removeClass('active');
-})
-</script>
-
 <?php include '../../common/view/footer.html.php';?>
@@ -780,31 +780,6 @@ class doc extends control
        die(js::locate('back'));
    }

-    /**
-     * Doc lib browse.
-     *
-     * @param  int    $libID
-     * @access public
-     * @return void
-     */
-    public function doclibBrowse($libID = 0)
-    {
-        $doclib = $this->doc->getLibById($libID);
-
-        $objecitID = 0;
-        if($doclib->type == 'product')
-        {
-            $objectID = $doclib->product;
-        }
-        elseif($doclib->type == 'project' or $doclib->type == 'execution')
-        {
-            $doclib->type = 'project';
-            $objectID = $doclib->project;
-        }
-
-        die(js::locate($this->createLink('doc', 'objectLibs', "type={$doclib->type}&objectID=$objectID&libID=$libID")));
-    }
-
    /**
     * Show libs for product or project.
     *
@@ -818,6 +793,13 @@ class doc extends control
     */
    public function objectLibs($type, $objectID = 0, $libID = 0, $docID = 0, $version = 0)
    {
+        if(empty($type))
+        {
+            $doclib   = $this->doc->getLibById($libID);
+            $type     = $doclib->type == 'execution' ? 'project' : $doclib->type;
+            $objectID = $type == 'custom' ? 0 : $doclib->$type;
+        }
+
        $this->session->set('docList', $this->app->getURI(true), $this->app->openApp);

        $objects = $this->doc->getOrderedObjects($type);
@@ -180,7 +180,7 @@ $lang->doc->noArticle            = 'No articles.';
 $lang->doc->noLib                = 'No libraries. ';
 $lang->doc->noBook               = 'The WIKI library has not created a manual, please create a new one :)';
 $lang->doc->cannotCreateOffice   = 'Sorry, %s can only be created in ZenTao Enterprise. Contact us at renee@easysoft.ltd to try ZenTao Enterprise.';
-$lang->doc->notSetOffice         = "<p>To create a %s document, you need to configure <a href='%s' target='_parent'>office convert</a>.<p>";
+$lang->doc->notSetOffice         = "<p>To create a %s document, you need to configure <a href='%s'>office convert</a>.<p>";
 $lang->doc->noSearchedDoc        = 'No documents found.';
 $lang->doc->noEditedDoc          = 'You have not edited any documents.';
 $lang->doc->noOpenedDoc          = 'You have not created any documents.';
@@ -180,7 +180,7 @@ $lang->doc->noArticle            = '暂时没有文章。';
 $lang->doc->noLib                = '暂时没有文档库。';
 $lang->doc->noBook               = 'WIKI库还未创建手册，请新建 ：）';
 $lang->doc->cannotCreateOffice   = '<p>对不起，企业版才能创建%s文档。<p><p>试用企业版，请联系我们：4006-8899-23 &nbsp; 0532-86893032。</p>';
-$lang->doc->notSetOffice         = "<p>创建%s文档，需要配置<a href='%s' target='_parent'>Office转换设置</a>。<p>";
+$lang->doc->notSetOffice         = "<p>创建%s文档，需要配置<a href='%s'>Office转换设置</a>。<p>";
 $lang->doc->noSearchedDoc        = '没有搜索到任何文档。';
 $lang->doc->noEditedDoc          = '您还没有编辑任何文档。';
 $lang->doc->noOpenedDoc          = '您还没有创建任何文档。';
@@ -1813,7 +1813,8 @@ EOF;
            $output .= "<div class='table-col'><div class='list-group'>";
            foreach($objects as $key => $object)
            {
-                $output .= html::a(inlink('objectLibs', "type=$type&objectID=$key"), $object, '', "data-app='{$this->app->openApp}'");
+                $selected = $key == $objectID ? 'selected' : '';
+                $output  .= html::a(inlink('objectLibs', "type=$type&objectID=$key"), $object, '', "class='$selected' data-app='{$this->app->openApp}'");
            }
            $output .= "</div></div></div></div></div>";
        }
@@ -1825,7 +1826,8 @@ EOF;
            $output .= "<div class='table-col'><div class='list-group'>";
            foreach($libs as $key => $lib)
            {
-                $output .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$key"), $lib->name, '', "data-app='{$this->app->openApp}'");
+                $selected = $key == $libID ? 'selected' : '';
+                $output  .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$key"), $lib->name, '', "class='$selected' data-app='{$this->app->openApp}'");
            }
            $output .= "</div></div></div></div></div>";
        }
@@ -20,13 +20,7 @@
    </div>
    <?php if(isset($this->config->bizVersion)):?>
    <div class='alert alert-warning strong'>
-      <?php
-      $isonlybody = isonlybody();
-      unset($_GET['onlybody']);
-
-      printf($lang->doc->notSetOffice, zget($lang->doc->typeList, $docType), common::hasPriv('custom', 'libreoffice') ? $this->createLink('custom', 'libreoffice') : '###');
-      if($isonlybody) $_GET['onlybody'] = 'yes';
-      ?>
+      <?php printf($lang->doc->notSetOffice, zget($lang->doc->typeList, $docType), common::hasPriv('custom', 'libreoffice') ? $this->createLink('custom', 'libreoffice') : '###');?>
    </div>
    <?php else:?>
    <div class='alert alert-warning strong'><?php printf($lang->doc->cannotCreateOffice, zget($lang->doc->typeList, $docType));?></div>
@@ -38,4 +38,16 @@
  <?php endif;?>
 </div>
 <?php js::set('type', 'doc');?>
+<script>
+$('#pageNav .btn-group.angle-btn').click(function()
+{
+    if($(this).hasClass('opened')) return;
+    $(this).addClass('opened');
+
+    setTimeout(function()
+    {
+        scrollToSelected();
+    }, 100);
+})
+</script>
 <?php include '../../common/view/footer.html.php';?>
@@ -194,7 +194,6 @@ $lang->execution->copy              = "Copy {$lang->executionCommon}";
 $lang->execution->delete            = "Delete {$lang->executionCommon}";
 $lang->execution->deleteAB          = "Delete Execution";
 $lang->execution->browse            = "{$lang->executionCommon} List";
-$lang->execution->list              = "{$lang->executionCommon} List";
 $lang->execution->edit              = "Edit {$lang->executionCommon}";
 $lang->execution->editAction        = "Edit Execution";
 $lang->execution->batchEdit         = "Edit";
@@ -194,7 +194,6 @@ $lang->execution->copy              = "复制{$lang->executionCommon}";
 $lang->execution->delete            = "删除{$lang->executionCommon}";
 $lang->execution->deleteAB          = "删除{$lang->execution->common}";
 $lang->execution->browse            = "浏览{$lang->execution->common}";
-$lang->execution->list              = "{$lang->executionCommon}列表";
 $lang->execution->edit              = "编辑{$lang->executionCommon}";
 $lang->execution->editAction        = "编辑{$lang->execution->common}";
 $lang->execution->batchEdit         = "编辑";
@@ -835,16 +835,22 @@ function adjustMenuWidth()
 /**
 * Scroll to selected item in drop menu.
 *
+ * @param  string $id
 * @access public
 * @return void
 */
-function scrollToSelected()
+function scrollToSelected(id)
 {
-    $('#dropMenu .table-row .list-group').mouseout(function(){$(this).find('.active').removeClass('active')});
-    if($('#dropMenu .table-row .col-left .list-group .selected').length > 0)
+    if(typeof(id) == 'undefined') id = '#dropMenu .table-col .list-group'
+
+    $id = $(id);
+    $selected = $id.find('.selected');
+
+    $id.mouseout(function(){$(this).find('.active').removeClass('active')});
+    if($selected.length > 0)
    {
        var offsetHeight = 75;
-        $('#dropMenu .table-row .col-left .list-group').scrollTop($('#dropMenu .table-row .col-left .list-group .selected').position().top - offsetHeight);
+        $id.scrollTop($selected.position().top - offsetHeight);
    }
 }