Merge branch 'main' into feature/doctemplate

This commit is contained in:
qixinzhi
2024-11-13 02:45:55 +00:00
137 changed files with 7011 additions and 1801 deletions
+8 -7
View File
@@ -79,14 +79,15 @@ formPanel
set::label($lang->doc->module),
picker(set::name('module'), set::items($optionMenu), set::value($moduleID), set::required(true))
),
$isDraft ? null : formGroup
(
set::label($lang->doc->mailto),
mailto(
set::items($users),
set::value(isset($doc) ? $doc->mailto : null)
(!$isDraft && $objectType !== 'mine')
? formGroup(
set::label($lang->doc->mailto),
mailto(
set::items($users),
set::value(isset($doc) ? $doc->mailto : null)
)
)
),
: null,
$isDraft ? null : formGroup
(
set::label($lang->doclib->control),