Merge branch 'fixbug_gfl' into 'master'

* Code for bug #33065

See merge request easycorp/zentaopms!7235
This commit is contained in:
王怡栋
2023-03-20 05:35:20 +00:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
.form-item-content > .form-item > .label {flex: 0 0 180px; padding-left: 40px; background: #F8F8F8; display: flex; align-items: center; color: currentColor; font-size: 13px; overflow: hidden;}
.form-item-content > .form-item > .label.lg {flex: 0 0 180px;}
.form-item-content > .form-item > .input-group {margin-left: 20px; width:180px; height:32px;}
.form-item-content > .form-item > .input-group > .input-group-addon {flex: 1 1 30%;}
.form-item-content > .form-item > .input-group > .input-group-addon {flex: 1 1 30%; overflow: hidden;}
.form-item-content > .form-item > .input-control > input {margin-left: 40px;}
.form-item-content > .form-item.active .icon {display: unset;}
.form-item-content > .form-item .icon {display: none; position: absolute; left: -50px; top: 2px; font-size: 25px;}
+1 -1
View File
@@ -79,7 +79,7 @@
<?php $foreachLang = $originalLangChanged ? $customedLang : $defaultValue;?>
<?php foreach($foreachLang as $i => $subLang):?>
<?php if(isset($config->custom->commonLang[$subLang])):?>
<span class='input-group-addon flex-center'><?php echo $config->custom->commonLang[$subLang] . html::hidden("{$itemKey}[]", $subLang);?></span>
<div class='input-group-addon flex-center' title=<?php echo $config->custom->commonLang[$subLang]?> ><?php echo $config->custom->commonLang[$subLang] . html::hidden("{$itemKey}[]", $subLang);?></div>
<?php else:?>
<?php
$placeholder = $originalLangChanged ? '' : "placeholder='{$subLang}'";