This commit is contained in:
tianshujie
2022-04-13 13:35:02 +08:00
parent ebab24c97b
commit 90a1fea2d8
5 changed files with 12 additions and 0 deletions

View File

@@ -15,3 +15,5 @@
#productsBox a {border-radius: 2px !important;}
#productsBox .addProduct {padding-left: 0px !important;}
#productsBox > .required:after{right: -6px !important;}
#productsBox .productTip {width: 80px; position: absolute; left: 350px; bottom: 6px;}
#productsBox .required > .productTip {left: 360px;}

View File

@@ -177,12 +177,15 @@ function loadBranches(product, branchID)
var length = $('#productsBox .row .input-group').size();
var $html = $('#productsBox .row .col-sm-4:last').html();
$('#productsBox .row .col-sm-4:last').find('.input-group-addon').remove();
$('#productsBox .row .productTip').remove();
$('#productsBox .row').append('<div class="col-sm-4">' + $html + '</div>');
if($('#productsBox .row .input-group:last select').size() >= 2) $('#productsBox .row .input-group:last select:last').remove();
$('#productsBox .row .input-group:last .chosen-container').remove();
$('#productsBox .row .input-group:last select:first').attr('name', 'products[' + length + ']').attr('id', 'products' + length);
$('#productsBox .row .input-group:last .chosen').chosen();
$('[data-toggle="popover"]').popover();
adjustProductBoxMargin();
}

View File

@@ -186,6 +186,7 @@ $lang->project->linkStoryByPlanTips = "This action will associate all {$lang-
$lang->project->createExecution = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
$lang->project->unlinkExecutionMember = "The user participated in %s executions such as %s%s. Do you want to remove the user from those executions as well? (The data related to this user will not be deleted.)";
$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this project. Do you want to remove them from the execution team too?";
$lang->project->productTip = 'After clicking New Product, the project will not be linked to the selected product.';
$lang->project->tenThousand = '';

View File

@@ -186,6 +186,7 @@ $lang->project->linkStoryByPlanTips = "此操作会将所选计划下面的{$
$lang->project->createExecution = "该项目下没有{$lang->executionCommon},请先创建{$lang->executionCommon}";
$lang->project->unlinkExecutionMember = "该用户参与了%s%s%s个{$lang->execution->common},是否同时将其移除?(该用户所产生的数据不会受影响。)";
$lang->project->unlinkExecutionMembers = "移除的团队成员还参与了项目下的执行,是否同步从执行团队中移除?";
$lang->project->productTip = '点击新建产品后,项目将不会关联已选中的产品。';
$lang->project->tenThousand = '万';
$lang->project->hundredMillion = '亿';

View File

@@ -126,6 +126,11 @@
<span class='input-group-addon'><?php echo html::checkBox('newProduct', $lang->project->addProduct, '', "onchange=addNewProduct(this);");?></span>
<?php endif;?>
</div>
<?php if(common::hasPriv('product', 'create')):?>
<div class='productTip'>
<icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='top' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->project->productTip;?>"></icon>
</div>
<?php endif;?>
</div>
</div>
<div class="col-sm-4 addProduct hidden <?php if($programID) echo 'required';?>">