From 8a69021d9b0ef1a07363b769def3bb071c7d190d Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 13 Apr 2023 16:00:40 +0800
Subject: [PATCH]  * code for issue #776.

---
 module/doc/css/selectlibtype.css        | 1 +
 module/doc/js/common.js                 | 2 +-
 module/doc/lang/zh-cn.php               | 2 +-
 module/doc/view/createtexttype.html.php | 3 +--
 module/doc/view/edittexttype.html.php   | 1 -
 module/doc/view/selectlibtype.html.php  | 4 ++--
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/module/doc/css/selectlibtype.css b/module/doc/css/selectlibtype.css
index 61649d1aea..7b4cf2292b 100644
--- a/module/doc/css/selectlibtype.css
+++ b/module/doc/css/selectlibtype.css
@@ -1,3 +1,4 @@
 #lib_chosen.chosen-container .chosen-results {max-height: 100px;}
 .radio-inline+.radio-inline { margin-top: 0; margin-left: 0px;}
 .radio-inline {margin-right: 10px;}
+#mainContent{height:310px;}
diff --git a/module/doc/js/common.js b/module/doc/js/common.js
index e452ecb301..8ad498664e 100644
--- a/module/doc/js/common.js
+++ b/module/doc/js/common.js
@@ -32,7 +32,7 @@ function loadExecutions(projectID)
     $('#executionBox').load(link, function()
     {
         var $extension = $('#executionBox').find('select');
-        $extension.attr('data-placeholder', holders.execution).attr('onchange', "loadObjectModules('execution', this.value)").picker();
+        $extension.attr('onchange', "loadObjectModules('execution', this.value)").picker();
         if($extension.hasClass('disabled')) $('#executionBox').find('.picker').addClass('disabled');
     });
     loadObjectModules('project', projectID);
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index b4d576f400..f7e12c729e 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -341,7 +341,7 @@ $lang->doc->noticeAcl['doc']['private'] = '只有创建者自己可以访问。'
 
 $lang->doc->placeholder = new stdclass();
 $lang->doc->placeholder->url       = '相应的链接地址';
-$lang->doc->placeholder->execution = '执行为空时，创建文件在项目库下';
+$lang->doc->placeholder->execution = '执行为空时，创建文档在项目库下';
 
 $lang->doc->summary = "本页共 <strong>%s</strong> 个附件，共计 <strong>%s</strong>，其中<strong>%s</strong>。";
 $lang->doc->ge      = '个';
diff --git a/module/doc/view/createtexttype.html.php b/module/doc/view/createtexttype.html.php
index 5e74100e8d..730b6f140e 100644
--- a/module/doc/view/createtexttype.html.php
+++ b/module/doc/view/createtexttype.html.php
@@ -71,7 +71,7 @@
                   <td class='required'><?php echo html::select('project', $objects, isset($execution) ? $execution->project : $objectID, "class='form-control picker-select' onchange=loadExecutions(this.value)");?></td>
                   <?php if($this->app->tab == 'doc' and $config->vision == 'rnd'):?>
                   <th><?php echo $lang->doc->execution?></th>
-                  <td id='executionBox'><?php echo html::select('execution', $executions, isset($execution) ? $objectID : '', "class='form-control chosen' data-placeholder='{$lang->doc->placeholder->execution}' onchange='loadObjectModules(\"execution\", this.value)'")?></td>
+                  <td id='executionBox'><?php echo html::select('execution', $executions, isset($execution) ? $objectID : '', "class='form-control chosen' onchange='loadObjectModules(\"execution\", this.value)'")?></td>
                   <td class='pl-0px'><i class='icon icon-help' title='<?php echo $lang->doc->placeholder->execution;?>'></i></td>
                   <?php endif;?>
                 </tr>
@@ -150,7 +150,6 @@
 <?php js::set('textType', $config->doc->textTypes);?>
 <?php js::set('docType', $docType);?>
 <?php js::set('objectType', $objectType);?>
-<?php js::set('holders', $lang->doc->placeholder);?>
 <?php js::set('type', 'doc');?>
 <?php js::set('requiredFields', ',' . $config->doc->create->requiredFields . ',');?>
 <?php js::set('libNotEmpty', sprintf($lang->error->notempty, $lang->doc->lib));?>
diff --git a/module/doc/view/edittexttype.html.php b/module/doc/view/edittexttype.html.php
index e1f73ed137..89cba4226b 100644
--- a/module/doc/view/edittexttype.html.php
+++ b/module/doc/view/edittexttype.html.php
@@ -148,7 +148,6 @@ $(function()
 <?php js::set('confirmUpdateContent', $lang->doc->confirmUpdateContent);?>
 <?php js::set('docID', $doc->id);?>
 <?php js::set('draft', $doc->draft);?>
-<?php js::set('holders', $lang->doc->placeholder);?>
 <?php js::set('type', 'doc');?>
 <?php js::set('defaultSave', $lang->doc->defaultSave);?>
 <?php js::set('titleNotEmpty', sprintf($lang->error->notempty, $lang->doc->title));?>
diff --git a/module/doc/view/selectlibtype.html.php b/module/doc/view/selectlibtype.html.php
index 93a3554b6d..8ec16d6261 100644
--- a/module/doc/view/selectlibtype.html.php
+++ b/module/doc/view/selectlibtype.html.php
@@ -36,7 +36,7 @@
         <th><?php echo $lang->doc->project;?></th>
         <td class='required'><?php echo html::select('project', $projects, key($projects), "class='form-control picker-select'");?></td>
         <th class='executionTH'><?php echo $lang->doc->execution?></th>
-        <td id='executionBox'><?php echo html::select('execution', array(), '', "class='form-control picker-select' data-placeholder='{$lang->doc->placeholder->execution}' onchange='loadObjectModules(\"execution\", this.value)'")?></td>
+        <td id='executionBox'><?php echo html::select('execution', array(), '', "class='form-control picker-select' onchange='loadObjectModules(\"execution\", this.value)'")?></td>
         <td class='executionHelp pl-0px'><i class='icon icon-help' title='<?php echo $lang->doc->placeholder->execution;?>'></i></td>
       </tr>
       <tr class='productTR hidden'>
@@ -53,7 +53,6 @@
     </table>
   </form>
 </div>
-<?php js::set('holders', $lang->doc->placeholder);?>
 <script>
 $(function(){changeSpace()});
 
@@ -73,6 +72,7 @@ function changeSpace()
     $('#typeapi').toggleClass('hidden', space == 'mine' || space == 'custom');
     $('#typedoc').closest('.radio-inline').toggleClass('hidden', space == 'api');
     $('#typeapi').closest('.radio-inline').toggleClass('hidden', space == 'mine' || space == 'custom');
+    $('#docType').toggleClass('hidden', $('#docType [name=type]:not(.hidden)').length == 1);
 
     var docType = $('[name=type]:not(.hidden):checked').val();
     if(space == 'project' && docType) $('#project').change();