Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_authority

module/api/view/index.html.php

@@ -25,7 +25,7 @@
     if($libTree and common::hasPriv('api', 'struct'))        echo html::a($this->createLink('api', 'struct',        "libID=$libID"), "<i class='icon-treemap muted'> </i>" . $lang->api->struct, '', "class='btn btn-link'");
     if($libTree and common::hasPriv('api', 'releases'))      echo html::a($this->createLink('api', 'releases',      "libID=$libID", 'html', true), "<i class='icon-version muted'> </i>" . $lang->api->releases, '', "class='btn btn-link iframe' data-width='800px'");
     if($libTree and common::hasPriv('api', 'createRelease')) echo html::a($this->createLink('api', 'createRelease', "libID=$libID"), "<i class='icon-publish muted'> </i>" . $lang->api->createRelease, '', "class='btn btn-link iframe' data-width='800px'");
-    if($libTree and common::hasPriv('api', 'export') and $config->edition != 'open') echo html::a($this->createLink('api', 'export', "libID=$libID&version=$version&release=$release", 'html', true), "<i class='icon-export muted'> </i>" . $lang->export, '', "class='btn btn-link export' id='export'");
+    if($libTree and common::hasPriv('api', 'export') and $config->edition != 'open') echo html::a($this->createLink('api', 'export', "libID=$libID&version=$version&release=$release", 'html', true), "<i class='icon-export muted'> </i>" . $lang->export, '', "class='btn btn-link export' data-width='480px' id='export'");
     if(common::hasPriv('api', 'createLib'))           echo html::a($this->createLink('api', 'createLib',     "type=" . ($objectType == 'project' ? 'project' : 'product') . "&objectID=$objectID"), '<i class="icon icon-plus"></i> ' . $lang->api->createLib, '', 'class="btn btn-secondary iframe" data-width="800px"');
     if($libTree and common::hasPriv('api', 'create')) echo html::a($this->createLink('api', 'create',        "libID=$libID&moduleID=$moduleID"), '<i class="icon icon-plus"></i> ' . $lang->api->createApi, '', 'class="btn btn-primary"');
   ?>

module/cron/model.php

@@ -35,6 +35,10 @@ class cronModel extends model
         return $this->dao->select('*')->from(TABLE_CRON)
             ->where('1=1')
             ->beginIF(strpos($params, 'nostop') !== false)->andWhere('status')->ne('stop')->fi()
+            ->beginIF($this->config->edition != 'max')
+            ->andWhere('command')->ne('moduleName=measurement&methodName=initCrontabQueue')
+            ->andWhere('command')->ne('moduleName=measurement&methodName=execCrontabQueue')
+            ->fi()
             ->fetchAll('id');
     }
 

module/dev/css/restapi.css

@@ -162,3 +162,4 @@ form .table-data, #content .table-data {border: 1px solid #e2e2e3;}
 
 .module-content {overflow-y: auto; padding-top: 10px;}
 .module-col {padding: 0 0 0 10px;}
+#modules .active {background: #fff;}

module/dev/view/header.html.php

@@ -3,7 +3,10 @@
 <script>$('#mainMenu #<?php echo $tab;?>').addClass('btn-active-text')</script>
 <?php endif;?>
 <?php if($app->rawMethod == 'api'):?>
-<style>.api-tip-icon.icon-help:before {margin-top: 10px; margin-left: -14px; font-size: 12px;}</style>
+<style>
+.api-tip-icon.icon-help:before {margin-top: 8px; margin-left: -4px;}
+[lang^=zh] .api-tip-icon.icon-help:before {margin-left: -10px;}
+</style>
 <div id='mainMenu' class='clearfix menu-secondary'>
   <div class="btn-toolbar pull-left">
     <?php

module/doc/view/lefttree.html.php

@@ -30,7 +30,10 @@
 .tree li.has-input {overflow: hidden;}
 .tree-text {margin-left: 5px; overflow: hidden;}
 i.btn-info, i.btn-info:hover {border: none; background: #fff; box-shadow: unset;}
-.tree-version-trigger {padding: 0 10px; width: 54px; border-radius: 5px; background: #F9F9F9;}
+.tree-version-trigger {padding: 0 10px; width: 54px; border-radius: 5px; background: #F9F9F9; display: flex;}
+.tree-version-trigger > .text {overflow: hidden; flex: 0 0 30px;}
+.file-tree > .bd-b:after {content: ''; position: absolute; inset: 0 -5px 0 -10px; border-bottom: 1px solid #EDEEF2;}
+.file-tree > .tree-child {padding: 5px 0; position: relative;}
 
 /* css for sidebar */
 .sidebar-toggle {flex: 0 0 16px;}
@@ -66,15 +69,15 @@ js::set('isFirstLoad', isset($isFirstLoad) ? $isFirstLoad: '');
 
 <div id="fileTree" class="file-tree">
 <?php if(isset($type) and $type == 'project'):?>
-<div class="project-tree">
+<div class="project-tree bd-b tree-child">
     <div class="title"><i class="icon icon-project btn-info"> </i><?php echo $lang->projectCommon?></div>
     <div id="projectTree" data-id="project"></div>
 </div>
-<div class="execution-tree">
+<div class="execution-tree bd-b tree-child">
     <div class="title"><i class="icon icon-run btn-info"> </i><?php echo $lang->execution->common?></div>
     <div id="executionTree" data-id="execution"></div>
 </div>
-<div class="annex-tree">
+<div class="annex-tree tree-child">
     <div class="title"><i class="icon icon-paper-clip btn-info"> </i><?php echo $lang->files?></div>
     <div id="annexTree" data-id="annex"></div>
 </div>
@@ -226,7 +229,7 @@ $(function()
                 var $item    = '<a href="' + link + '" style="position: relative" data-has-children="' + hasChild + '" title="' + item.name + '" data-id="' + item.id + '" class="' + libClass + '" data-type="' + item.type + '" data-action="' + item.hasAction + '">';
 
                 $item += '<div class="text h-full w-full flex-start overflow-hidden">';
-                if(libClass == 'lib' && (item.type == 'execution' && item.hasAction)) $item += '<div class="img-lib" style="background-image:url(static/svg/' + imgObj[item.type || 'lib'] + '.svg)"></div>';
+                if((libClass == 'lib' && item.type != 'execution') || (item.type == 'execution' && item.hasAction)) $item += '<div class="img-lib" style="background-image:url(static/svg/' + imgObj[item.type || 'lib'] + '.svg)"></div>';
                 $item += '<div class="tree-text">';
                 $item += item.name;
                 $item += '</div>';
@@ -238,7 +241,7 @@ $(function()
                     {
                         if(item.versions[i].id == release) versionName = item.versions[i].version;
                     }
-                    $item += '<div class="tree-version-trigger" data-id="' +  item.id + '">' + (versionName || versionLang) + '<span class="caret"></span></div>';
+                    $item += '<div class="tree-version-trigger" data-id="' +  item.id + '"><div class="text">' + (versionName || versionLang) + '</div><div class="caret"></div></div>';
                 }
                 if((libClass != 'lib' && hasModulePriv) || (libClass == 'lib' && hasLibPriv)) $item += '<i class="icon icon-drop icon-ellipsis-v hidden tree-icon" data-isCatalogue="' + (libClass ? false : true) + '"></i>';
                 $item += '</div>';
@@ -252,7 +255,7 @@ $(function()
         });
         if(isFirstLoad !== 'false') ele.data('zui.tree').collapse();
         var $leaf = ele.find('li.active');
-        if($leaf.length) $leaf[$leaf.length - 1].scrollIntoView(true);
+        if($leaf.length) $leaf[$leaf.length - 1].scrollIntoView(false);
 
         ele.on('click', '.icon-drop', function(e)
         {

module/screen/model.php

@@ -40,7 +40,7 @@ class screenModel extends model
      */
     public function getList($dimensionID)
     {
-        return $this->dao->select('*')->from(TABLE_SCREEN)->where('dimension')->eq($dimensionID)->andWhere('deleted')->eq('0')->fetchAll();
+        return $this->dao->select('*')->from(TABLE_SCREEN)->where('dimension')->eq($dimensionID)->andWhere('deleted')->eq('0')->fetchAll('id');
     }
 
     /**

www/static/svg/arrow-step1-darkblue.svg

@@ -0,0 +1,10 @@
+<svg width="129" height="32" viewBox="0 0 129 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2663_1822)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M116.821 0H2C0.89543 0 0 0.895431 0 2V16V30C0 31.1046 0.89543 32 2 32H116.821L129.056 16L116.821 0Z" fill="#2E7FFF"/>
+</g>
+<defs>
+<clipPath id="clip0_2663_1822">
+<rect width="129" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

www/static/svg/arrow-step1-grey.svg

@@ -0,0 +1,10 @@
+<svg width="129" height="32" viewBox="0 0 129 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2667_3468)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M116.821 0H2C0.89543 0 0 0.895431 0 2V16V30C0 31.1046 0.89543 32 2 32H116.821L129.056 16L116.821 0Z" fill="#EDEEF2"/>
+</g>
+<defs>
+<clipPath id="clip0_2667_3468">
+<rect width="129" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

www/static/svg/arrow-step1-lightblue.svg

@@ -0,0 +1,10 @@
+<svg width="129" height="32" viewBox="0 0 129 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2663_1824)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M116.821 0H2C0.89543 0 0 0.895431 0 2V16V30C0 31.1046 0.89543 32 2 32H116.821L129.056 16L116.821 0Z" fill="#37B2FE"/>
+</g>
+<defs>
+<clipPath id="clip0_2663_1824">
+<rect width="129" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

www/static/svg/arrow-step1-white.svg

@@ -0,0 +1,10 @@
+<svg width="129" height="32" viewBox="0 0 129 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2663_1798)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M116.821 0H2C0.89543 0 0 0.895431 0 2V16V30C0 31.1046 0.89543 32 2 32H116.821L129.056 16L116.821 0Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2663_1798">
+<rect width="129" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

www/static/svg/arrow-step2-darkblue.svg

@@ -0,0 +1,10 @@
+<svg width="141" height="32" viewBox="0 0 141 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2663_1859)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M128.112 0H0L11.8869 15.5444C12.0925 15.8133 12.0925 16.1867 11.8869 16.4556L0 32H128.112L140.347 16L128.112 0Z" fill="#2E7FFF"/>
+</g>
+<defs>
+<clipPath id="clip0_2663_1859">
+<rect width="140.35" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

www/static/svg/arrow-step2-grey.svg

@@ -0,0 +1,10 @@
+<svg width="141" height="32" viewBox="0 0 141 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2667_3470)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M128.112 0H0L11.8869 15.5444C12.0925 15.8133 12.0925 16.1867 11.8869 16.4556L0 32H128.112L140.347 16L128.112 0Z" fill="#EDEEF2"/>
+</g>
+<defs>
+<clipPath id="clip0_2667_3470">
+<rect width="140.35" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

www/static/svg/arrow-step2-lightblue.svg

@@ -0,0 +1,10 @@
+<svg width="141" height="32" viewBox="0 0 141 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2663_1833)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M128.112 0H0L11.8869 15.5444C12.0925 15.8133 12.0925 16.1867 11.8869 16.4556L0 32H128.112L140.347 16L128.112 0Z" fill="#37B2FE"/>
+</g>
+<defs>
+<clipPath id="clip0_2663_1833">
+<rect width="140.35" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

www/static/svg/arrow-step2-white.svg

@@ -0,0 +1,10 @@
+<svg width="141" height="32" viewBox="0 0 141 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2663_1861)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M128.112 0H0L11.8869 15.5444C12.0925 15.8133 12.0925 16.1867 11.8869 16.4556L0 32H128.112L140.347 16L128.112 0Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2663_1861">
+<rect width="140.35" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

www/static/svg/arrow-step3-darkblue.svg

@@ -0,0 +1,10 @@
+<svg width="133" height="32" viewBox="0 0 133 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2663_1848)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0L12.2353 16L0 32H131C132.105 32 133 31.1046 133 30V16V2C133 0.895431 132.105 0 131 0H0Z" fill="#2E7FFF"/>
+</g>
+<defs>
+<clipPath id="clip0_2663_1848">
+<rect width="133" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

www/static/svg/arrow-step3-grey.svg

@@ -0,0 +1,10 @@
+<svg width="133" height="32" viewBox="0 0 133 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2667_3466)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0L12.2353 16L0 32H131C132.105 32 133 31.1046 133 30V16V2C133 0.895431 132.105 0 131 0H0Z" fill="#EDEEF2"/>
+</g>
+<defs>
+<clipPath id="clip0_2667_3466">
+<rect width="133" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

www/static/svg/arrow-step3-lightblue.svg

@@ -0,0 +1,10 @@
+<svg width="133" height="32" viewBox="0 0 133 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2663_1850)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0L12.2353 16L0 32H131C132.105 32 133 31.1046 133 30V16V2C133 0.895431 132.105 0 131 0H0Z" fill="#37B2FE"/>
+</g>
+<defs>
+<clipPath id="clip0_2663_1850">
+<rect width="133" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

www/static/svg/arrow-step3-white.svg

@@ -0,0 +1,10 @@
+<svg width="133" height="32" viewBox="0 0 133 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2663_1841)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0L12.2353 16L0 32H131C132.105 32 133 31.1046 133 30V16V2C133 0.895431 132.105 0 131 0H0Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2663_1841">
+<rect width="133" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>