bc: 放开部分超管操作

getrebuild · Jan 23, 2025 · b6c82af · b6c82af
1 parent 057f37d
commit b6c82af
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 49 deletions.
diff --git a/@rbv b/@rbv
diff --git a/src/main/java/com/rebuild/core/metadata/impl/CopyEntity.java b/src/main/java/com/rebuild/core/metadata/impl/CopyEntity.java
@@ -16,7 +16,6 @@
 import com.rebuild.core.rbstore.MetaschemaImporter;
 import com.rebuild.core.support.task.TaskExecutors;
 import com.rebuild.utils.CommonsUtils;
-import com.rebuild.utils.RbAssert;
 import org.apache.commons.lang.StringUtils;
 
 /**
@@ -42,7 +41,6 @@ public CopyEntity(Entity sourceEntity) {
      */
     public String copy(String entityName, String detailName) {
         final ID user = getUser();
-        RbAssert.isSuperAdmin(user);
 
         // 导出
 

diff --git a/src/main/java/com/rebuild/core/metadata/impl/ExcelEntity.java b/src/main/java/com/rebuild/core/metadata/impl/ExcelEntity.java
@@ -8,7 +8,6 @@
 import com.rebuild.core.metadata.easymeta.DisplayType;
 import com.rebuild.core.support.i18n.Language;
 import com.rebuild.utils.JSONUtils;
-import com.rebuild.utils.RbAssert;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.Assert;
 
@@ -28,9 +27,6 @@ public class ExcelEntity extends Entity2Schema {
      * @return
      */
     public String imports(String entityName, JSONArray fields) {
-        final ID user = getUser();
-        RbAssert.isSuperAdmin(user);
-
         // 1.实体
         String uniqueEntityName = createEntity(null, entityName, null, null, false, false);
         Entity entityNew = MetadataHelper.getEntity(uniqueEntityName);

diff --git a/src/main/java/com/rebuild/core/metadata/impl/Field2Schema.java b/src/main/java/com/rebuild/core/metadata/impl/Field2Schema.java
@@ -34,7 +34,6 @@
 import com.rebuild.core.support.setup.Installer;
 import com.rebuild.utils.BlockList;
 import com.rebuild.utils.CommonsUtils;
-import com.rebuild.utils.RbAssert;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.CharSet;
 import org.apache.commons.lang.StringUtils;
@@ -77,13 +76,6 @@ public Field2Schema(ID user) {
         super.setUser(user);
     }
 
-    @Override
-    public ID getUser() {
-        ID user = super.getUser();
-        RbAssert.isSuperAdmin(user);
-        return user;
-    }
-
     /**
      * @param entity
      * @param fieldLabel

diff --git a/src/main/resources/web/admin/metadata/entities.html b/src/main/resources/web/admin/metadata/entities.html
@@ -172,20 +172,16 @@
             .find('a.card')
             .attr('href', 'javascript:;')
             .on('click', function () {
-              if (window.__PageConfig.isSuperAdmin) {
-                if (_EntityNew2) {
-                  _EntityNew2.show()
-                } else {
-                  renderRbcomp18(
-                    <EntityNew2
-                      ref={function (o) {
-                        _EntityNew2 = o
-                      }}
-                    />
-                  )
-                }
+              if (_EntityNew2) {
+                _EntityNew2.show()
               } else {
-                RbHighbar.error('仅超级管理员可添加实体')
+                renderRbcomp18(
+                  <EntityNew2
+                    ref={function (o) {
+                      _EntityNew2 = o
+                    }}
+                  />
+                )
               }
             })
             .find('.more-action')

diff --git a/src/main/resources/web/assets/js/metadata/entity-advanced.js b/src/main/resources/web/assets/js/metadata/entity-advanced.js
@@ -28,11 +28,6 @@ $(document).ready(() => {
 
   $('.J_drop-confirm').on('click', () => {
     if (!$('.J_drop-check').prop('checked')) return
-    if (!window.__PageConfig.isSuperAdmin) {
-      RbHighbar.error($L('仅超级管理员可删除实体'))
-      return
-    }
-
     RbAlert.create($L('实体删除后将无法恢复，请务必谨慎操作。确认删除吗？'), $L('删除实体'), {
       type: 'danger',
       confirmText: $L('删除'),
@@ -54,11 +49,6 @@ $(document).ready(() => {
   })
   $('.J_truncate-confirm').on('click', () => {
     if (!$('.J_drop-check').prop('checked')) return
-    if (!window.__PageConfig.isSuperAdmin) {
-      RbHighbar.error($L('仅超级管理员可清空数据'))
-      return
-    }
-
     RbAlert.create($L('此操作将直接清空数据，不会保留在回收站及触发相关业务规则。'), $L('清空数据'), {
       type: 'danger',
       confirmText: $L('清空'),

diff --git a/src/main/resources/web/assets/js/metadata/field-edit.js b/src/main/resources/web/assets/js/metadata/field-edit.js
@@ -282,11 +282,6 @@ $(document).ready(function () {
   // delete extConfig['stateClass']
 
   $('.J_del').on('click', function () {
-    if (!wpc.isSuperAdmin) {
-      RbHighbar.error($L('仅超级管理员可删除字段'))
-      return
-    }
-
     RbAlert.create($L('字段删除后将无法恢复，请务必谨慎操作。确认删除吗？'), $L('删除字段'), {
       type: 'danger',
       confirmText: $L('删除'),

diff --git a/src/main/resources/web/assets/js/metadata/fields.js b/src/main/resources/web/assets/js/metadata/fields.js
@@ -16,13 +16,11 @@ $(document).ready(() => {
   })
   $('.J_new-field').on('click', () => {
     // eslint-disable-next-line react/jsx-no-undef
-    if (wpc.isSuperAdmin) renderRbcomp18(<FieldNew2 entity={wpc.entityName} />)
-    else RbHighbar.error($L('仅超级管理员可添加字段'))
+    renderRbcomp18(<FieldNew2 entity={wpc.entityName} />)
   })
 
   $('.J_new9-field').on('click', () => {
-    if (wpc.isSuperAdmin) RbModal.create(`/p/admin/metadata/field-new9?entity=${wpc.entityName}`, $L('批量添加字段'), { width: 1064 })
-    else RbHighbar.error($L('仅超级管理员可添加字段'))
+    RbModal.create(`/p/admin/metadata/field-new9?entity=${wpc.entityName}`, $L('批量添加字段'), { width: 1064 })
   })
 
   $('.J_export-fields').on('click', exportFields)

diff --git a/src/main/resources/web/assets/js/metadata/form-design.js b/src/main/resources/web/assets/js/metadata/form-design.js
@@ -426,8 +426,7 @@ const render_type = function (fieldType) {
   const $item = $(`<li class="dd-item"><div class="dd-handle"><i class="icon mdi ${fieldType.icon || 'mdi-form-textbox'}"></i> ${$L(fieldType.label)}</div></li>`).appendTo('.type-list')
   $item.on('click', function () {
     // eslint-disable-next-line react/jsx-no-undef
-    if (wpc.isSuperAdmin) renderRbcomp(<FieldNew2 entity={wpc.entityName} fieldType={fieldType.name} />)
-    else RbHighbar.error($L('仅超级管理员可添加字段'))
+    renderRbcomp(<FieldNew2 entity={wpc.entityName} fieldType={fieldType.name} />)
   })
   return $item
 }