From ee37befd23cdab2b5825292336e448326a61cb6e Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 4 Jan 2024 10:51:29 +0800 Subject: [PATCH] * Adjust lib to libAndModule. the bug #41678. --- module/doc/css/edit.ui.css | 4 ++-- module/doc/ui/create.html.php | 2 +- module/doc/ui/edit.html.php | 16 ++-------------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/module/doc/css/edit.ui.css b/module/doc/css/edit.ui.css index 975ad4eef5..832dd0123c 100644 --- a/module/doc/css/edit.ui.css +++ b/module/doc/css/edit.ui.css @@ -1,7 +1,7 @@ #title {border: unset; font-size: 18px; font-weight: bold; color: #3c4353; padding-left: 16px; --tw-ring-shadow: none} #title:focus {box-shadow: none; outline: unset} .titleBox{padding: 7px; background: #fff} -#modalBasicInfo .form-group {margin-top: calc(1rem*(1 - var(--tw-space-y-reverse)));} +#modalBasicInfo .form-group {margin-top: 0.5rem} .form-horz>:not([hidden])~:not([hidden]){margin-top: 0;} #whitelistBox .form-group-wrapper+.form-group-wrapper {margin-top: 10px;} #titleBox:before {position: absolute; --tw-translate-y: .125rem; --tw-scale-x: 1.25; --tw-scale-y: 1.25; --tw-text-opacity: 1; color: rgba(var(--color-danger-500-rgb),var(--tw-text-opacity)); content: "*"; display: inline-block; margin-left: 0.25rem; transform: translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); } @@ -14,4 +14,4 @@ .m-doc-edit #main {min-height: 0;} .m-doc-edit #main > .container {max-width: initial!important; padding: 0!important} -.m-doc-edit .form {height: calc(100vh - 48px)} +.m-doc-edit #mainContent > .form {height: calc(100vh - 48px)} diff --git a/module/doc/ui/create.html.php b/module/doc/ui/create.html.php index d6fb323e55..64f06b00f8 100644 --- a/module/doc/ui/create.html.php +++ b/module/doc/ui/create.html.php @@ -170,7 +170,7 @@ else formGroup ( set::width('1/2'), - set::label($lang->doc->lib), + set::label($lang->doc->libAndModule), set::required(true), picker ( diff --git a/module/doc/ui/edit.html.php b/module/doc/ui/edit.html.php index 75222660b3..20a9bead11 100644 --- a/module/doc/ui/edit.html.php +++ b/module/doc/ui/edit.html.php @@ -88,19 +88,7 @@ form ( modal ( - div - ( - setClass('flex items-center'), - div($lang->doc->edit), - entityLabel - ( - set::entityID($doc->id), - set::level(1), - set::text($doc->title), - set::reverse(true), - setClass('pl-2') - ) - ), + modalHeader(), set::id('modalBasicInfo'), on::change('#product', "loadObjectModules"), on::change('#project', "loadObjectModules"), @@ -123,7 +111,7 @@ form ( set::width('1/2'), set::required(true), - set::label($lang->doc->lib), + set::label($lang->doc->libAndModule), picker ( set::name('module'),