-
[[${bundle.L('记录转换')}]][[${name ?: bundle.L('未命名')}]]
+
+ [[${bundle.L('记录转换')}]]
+ [[${name ?: bundle.L('未命名')}]]
+ [[${bundle.L('未启用')}]]
+
diff --git a/src/main/resources/web/assets/css/rb-page.css b/src/main/resources/web/assets/css/rb-page.css
index 89faf1cf5..2fd332966 100644
--- a/src/main/resources/web/assets/css/rb-page.css
+++ b/src/main/resources/web/assets/css/rb-page.css
@@ -89,7 +89,7 @@ code {
}
.dropdown-menu.auto-scroller {
- max-height: 487px;
+ max-height: 488px;
overflow-x: auto;
}
@@ -181,7 +181,6 @@ code {
.text-disabled {
color: #aaa !important;
- font-style: italic;
cursor: default;
}
@@ -2266,11 +2265,6 @@ th.column-fixed {
color: #444;
}
-.aside-tree li > a.text-disabled {
- color: #aaa;
- cursor: default;
-}
-
.aside-tree > ul > li > a {
margin-left: 0;
}
@@ -3342,6 +3336,21 @@ form {
padding-bottom: 7px;
}
+@media (max-width: 575.98px) {
+ .rb-icons-nav > li.dropdown.global-create2 .dropdown-menu {
+ position: fixed;
+ top: 60px;
+ width: 100%;
+ max-width: 100%;
+ margin: 0;
+ border-radius: 0;
+ border-bottom: 1px solid #ebebeb;
+ }
+ .rb-icons-nav > li.dropdown.global-create2 > a:after {
+ bottom: 0;
+ }
+}
+
.rb-icons-nav > li.dropdown.global-create2 > a .icon {
font-size: 2rem;
}
diff --git a/src/main/resources/web/assets/js/bizuser/user-view.js b/src/main/resources/web/assets/js/bizuser/user-view.js
index a931d4dac..c7b398cb2 100644
--- a/src/main/resources/web/assets/js/bizuser/user-view.js
+++ b/src/main/resources/web/assets/js/bizuser/user-view.js
@@ -91,8 +91,16 @@ $(document).ready(function () {
}
if (res.data.system === true) {
- $('.view-action').remove()
- $('.J_tips').removeClass('hide').find('.message p').text($L('系统内置超级管理员,不允许修改。此用户拥有最高级系统权限,请谨慎使用'))
+ // v35
+ if (userId === '001-0000000000000000') {
+ $('.view-action').remove()
+ } else {
+ $('.J_mores .dropdown-menu>*').each(function () {
+ if (!$(this).hasClass('J_resetpwd')) $(this).remove()
+ })
+ }
+
+ $('.J_tips').removeClass('hide').find('.message p').text($L('系统内置超级管理员。此用户拥有最高级系统权限,请谨慎使用'))
return
}
diff --git a/src/main/resources/web/assets/js/login.js b/src/main/resources/web/assets/js/login.js
index 7b32e010d..b5cb038cd 100644
--- a/src/main/resources/web/assets/js/login.js
+++ b/src/main/resources/web/assets/js/login.js
@@ -20,7 +20,7 @@ $(document).ready(() => {
}, 200)
}
- $('.h5-mobile img').attr('src', `${rb.baseUrl}/commons/barcode/render-qr?w=150&t=${$encode($('.h5-mobile a').attr('href'))}`)
+ $('.h5-mobile img').attr('src', `${rb.baseUrl}/commons/barcode/render-qr?w=296&t=${$encode($('.h5-mobile a').attr('href'))}`)
$.get('/user/live-wallpaper', (res) => {
if (res.error_code !== 0 || !res.data) return
diff --git a/src/main/resources/web/assets/js/metadata/classification-list.js b/src/main/resources/web/assets/js/metadata/classification-list.js
index 724a212c3..4da8d343b 100644
--- a/src/main/resources/web/assets/js/metadata/classification-list.js
+++ b/src/main/resources/web/assets/js/metadata/classification-list.js
@@ -85,6 +85,7 @@ class DlgEdit extends RbFormHandler {
}
render() {
+ // v35 取消禁用设置
return (
(this._dlg = c)} disposeOnHide={true}>
@@ -94,7 +95,7 @@ class DlgEdit extends RbFormHandler {
- {this.props.id && (
+ {this.props.id && this.state.isDisabled === true && (