Merge branch 'main' into feature/doctemplate

2025-03-10 10:50:32 +08:00
parent ff4768d0a2 84041dbe22
commit 2ec3be68e8
63 changed files with 4428 additions and 1265 deletions
@@ -104,7 +104,7 @@ formPanel
    $module->type != 'line' ? formGroup
    (
        set::className('moduleBox ', $hidden ? 'hidden' : ''),
-        set::label($parentLabel),
+        set::label(($type == 'doc' || $type == 'api') ? $lang->tree->parentCate : $lang->tree->parent),
        picker
        (
            set::disabled($isBuiltinTemplateModule),
@@ -133,7 +133,7 @@ formPanel
            set::items($users)
        )
    ) : null,
-    $type != 'docTemplate' ? formGroup
+    ($type !== 'doc' && $type !== 'api' && $type != 'docTemplate') ? formGroup
    (
        set::label($lang->tree->short),
        inputControl