optimize

Author: LazuliKao

src/lang/en/acl.json

@@ -28,6 +28,6 @@
   "login": {
     "sso_login": "Login with Single Sign-On"
   },
-  "is_regex": "Match Path as Regular Expression",
+  "is_regex": "Match role using regular expressions",
   "exclude_subfolder": "Exclude subfolders (do not match /* automatically)"
 }

src/lang/zh-CN/acl.json

@@ -28,6 +28,6 @@
     "login": {
         "sso_login": "统一身份认证"
     },
-    "is_regex": "使用正则表达式匹配路径",
-    "exclude_subfolder": "不包含子文件夹（不自动匹配/*）"
+    "is_regex": "使用正则表达式匹配角色",
+    "exclude_subfolder": "不包含子文件夹（不自动匹配.../*）"
 }

src/pages/manage/acl/AddOrEdit.tsx

@@ -84,6 +84,12 @@ const AddOrEditACL = () => {
           placeholder="e.g., admin, editor, viewer"
           onChange={(value) => setRule("role", value)}
         />
+        <Checkbox
+          checked={!!rule.is_regex}
+          onChange={() => setRule("is_regex", (v) => !v)}
+        >
+          {t(`acl.is_regex`)}
+        </Checkbox>
         <Item
           name="path"
           type={ACLItemType.String}
@@ -92,27 +98,21 @@ const AddOrEditACL = () => {
           placeholder="e.g., / or /folder/subfolder"
           onChange={(value) => setRule("path", value)}
         />
-        <Item
-          name="priority"
-          type={ACLItemType.Number}
-          value={rule.priority}
-          min={0}
-          onChange={(value) => setRule("priority", value)}
-        />
-        <Checkbox
-          checked={!!rule.is_regex}
-          onChange={() => setRule("is_regex", (v) => !v)}
-        >
-          {t(`acl.is_regex`)}
-        </Checkbox>
         <Checkbox
           checked={!!rule.exclude_subfolder}
           onChange={() => setRule("exclude_subfolder", (v) => !v)}
         >
           {t("acl.exclude_subfolder", {
-            default: "不包含子文件夹（不自动匹配/*）",
+            default: "不包含子文件夹（不自动匹配../*）",
           })}
         </Checkbox>
+        <Item
+          name="priority"
+          type={ACLItemType.Number}
+          value={rule.priority}
+          min={0}
+          onChange={(value) => setRule("priority", value)}
+        />
       </ResponsiveGrid>
 
       <Container mt="$4" w="$full">