com-angel-authorization 1.0.30 → 1.0.32

package/dist/vue/index.d.cts

@@ -640,6 +640,7 @@ type SystemUserApi = {
     create: (values: SystemUserFormValues, signal?: AbortSignal) => Promise<unknown>;
     update: (userId: string, values: SystemUserFormValues, signal?: AbortSignal) => Promise<unknown>;
     remove: (userId: string, signal?: AbortSignal) => Promise<unknown>;
+    resetPassword: (userId: string, password: string, signal?: AbortSignal) => Promise<unknown>;
     listGroups: (params?: FetchSystemGroupsParams, signal?: AbortSignal) => Promise<SystemGroupOption[]>;
     listRoleOptions: (params?: FetchSystemRoleOptionsParams, signal?: AbortSignal) => Promise<SystemRoleOption[]>;
 };
@@ -647,7 +648,7 @@ declare function mapSystemUser(item: unknown): SystemUser | null;
 declare function mapSystemGroupOption(item: unknown): SystemGroupOption | null;
 declare function mapSystemRoleOption(item: unknown): SystemRoleOption | null;
 /**
- * 账号校验：不少于 6 位，且同时包含字母与数字。
+ * 账号校验：长度大于 1；须含英文字母，可搭配数字；不支持中文或特殊符号。
  * 通过返回 null，失败返回错误文案。
  */
 declare function validateUsername(username: string): string | null;

package/dist/vue/index.d.ts

@@ -640,6 +640,7 @@ type SystemUserApi = {
     create: (values: SystemUserFormValues, signal?: AbortSignal) => Promise<unknown>;
     update: (userId: string, values: SystemUserFormValues, signal?: AbortSignal) => Promise<unknown>;
     remove: (userId: string, signal?: AbortSignal) => Promise<unknown>;
+    resetPassword: (userId: string, password: string, signal?: AbortSignal) => Promise<unknown>;
     listGroups: (params?: FetchSystemGroupsParams, signal?: AbortSignal) => Promise<SystemGroupOption[]>;
     listRoleOptions: (params?: FetchSystemRoleOptionsParams, signal?: AbortSignal) => Promise<SystemRoleOption[]>;
 };
@@ -647,7 +648,7 @@ declare function mapSystemUser(item: unknown): SystemUser | null;
 declare function mapSystemGroupOption(item: unknown): SystemGroupOption | null;
 declare function mapSystemRoleOption(item: unknown): SystemRoleOption | null;
 /**
- * 账号校验：不少于 6 位，且同时包含字母与数字。
+ * 账号校验：长度大于 1；须含英文字母，可搭配数字；不支持中文或特殊符号。
  * 通过返回 null，失败返回错误文案。
  */
 declare function validateUsername(username: string): string | null;

package/dist/vue/index.js

@@ -3554,9 +3554,9 @@ function mapSystemRoleOption(item) {
 }
 function validateUsername(username) {
   const value = username.trim();
-  if (value.length < 6) return "\u8D26\u53F7\u957F\u5EA6\u4E0D\u5C11\u4E8E 6 \u4E2A\u5B57\u7B26";
-  if (!/[A-Za-z]/.test(value) || !/[0-9]/.test(value)) {
-    return "\u8D26\u53F7\u9700\u540C\u65F6\u5305\u542B\u5B57\u6BCD\u548C\u6570\u5B57";
+  if (value.length <= 1) return "\u8D26\u53F7\u957F\u5EA6\u9700\u5927\u4E8E 1";
+  if (!/^(?=.*[A-Za-z])[A-Za-z0-9]+$/.test(value)) {
+    return "\u8D26\u53F7\u9700\u5305\u542B\u82F1\u6587\u5B57\u6BCD\uFF0C\u53EF\u642D\u914D\u6570\u5B57\uFF0C\u4E0D\u652F\u6301\u4E2D\u6587\u6216\u7279\u6B8A\u7B26\u53F7\u3002";
   }
   return null;
 }
@@ -3636,6 +3636,14 @@ function createSystemUserApi(request) {
         signal
       });
     },
+    async resetPassword(userId, password, signal) {
+      return request({
+        method: "POST",
+        url: `/system/users/${encodeURIComponent(userId)}/reset-password`,
+        body: { password },
+        signal
+      });
+    },
     async listGroups(params, signal) {
       const json = await request({
         method: "GET",
@@ -3987,6 +3995,10 @@ var UserManager = defineComponent5({
     const saving = ref4(false);
     const deletingRow = ref4(null);
     const deleting = ref4(false);
+    const resetRow = ref4(null);
+    const resetPassword = ref4("");
+    const resetError = ref4("");
+    const resetting = ref4(false);
     const groups = ref4([]);
     const roles = ref4([]);
     const rolesLoading = ref4(false);
@@ -4147,6 +4159,38 @@ var UserManager = defineComponent5({
         deleting.value = false;
       }
     }
+    function openResetPassword(row) {
+      resetRow.value = row;
+      resetPassword.value = "";
+      resetError.value = "";
+    }
+    function closeResetDialog() {
+      if (!resetting.value) {
+        resetRow.value = null;
+        resetPassword.value = "";
+        resetError.value = "";
+      }
+    }
+    async function confirmResetPassword(event) {
+      event.preventDefault();
+      if (!resetRow.value) return;
+      if (!resetPassword.value.trim()) {
+        resetError.value = "\u8BF7\u586B\u5199\u65B0\u5BC6\u7801";
+        return;
+      }
+      resetting.value = true;
+      resetError.value = "";
+      error.value = "";
+      try {
+        await props.api.resetPassword(resetRow.value.userId, resetPassword.value);
+        resetRow.value = null;
+        resetPassword.value = "";
+      } catch (err) {
+        resetError.value = err instanceof Error ? err.message : "\u91CD\u7F6E\u5BC6\u7801\u5931\u8D25";
+      } finally {
+        resetting.value = false;
+      }
+    }
     function groupLabel(row) {
       if (row.groupNames?.length) return row.groupNames.join("\u3001");
       if (!row.groupIds.length) return "\u2014";
@@ -4257,7 +4301,7 @@ var UserManager = defineComponent5({
               h4("th", { style: s4.th }, "\u5F52\u5C5E\u90E8\u95E8"),
               h4("th", { style: s4.th }, "\u7528\u6237\u89D2\u8272"),
               h4("th", { style: { ...s4.th, width: "90px" } }, "\u72B6\u6001"),
-              h4("th", { style: { ...s4.th, width: "140px" } }, "\u64CD\u4F5C")
+              h4("th", { style: { ...s4.th, width: "220px" } }, "\u64CD\u4F5C")
             ])
           ]),
           h4(
@@ -4298,6 +4342,15 @@ var UserManager = defineComponent5({
                     },
                     "\u7F16\u8F91"
                   ),
+                  h4(
+                    "button",
+                    {
+                      type: "button",
+                      style: s4.linkBtn,
+                      onClick: () => openResetPassword(row)
+                    },
+                    "\u91CD\u7F6E\u5BC6\u7801"
+                  ),
                   h4(
                     "button",
                     {
@@ -4389,11 +4442,14 @@ var UserManager = defineComponent5({
               [
                 formError.value ? h4("div", { style: s4.error }, formError.value) : null,
                 h4("label", { style: s4.field }, [
-                  h4("span", { style: s4.label }, "\u8D26\u53F7"),
+                  h4("span", { style: s4.label }, [
+                    "\u8D26\u53F7 ",
+                    h4("span", { style: s4.required }, "*")
+                  ]),
                   h4("input", {
                     style: s4.input,
                     value: form.username,
-                    placeholder: "\u81F3\u5C116\u4F4D\uFF0C\u9700\u542B\u5B57\u6BCD\u548C\u6570\u5B57",
+                    placeholder: "\u8D26\u53F7\u9700\u5305\u542B\u82F1\u6587\u5B57\u6BCD\uFF0C\u53EF\u642D\u914D\u6570\u5B57\uFF0C\u4E0D\u652F\u6301\u4E2D\u6587\u6216\u7279\u6B8A\u7B26\u53F7\u3002",
                     required: true,
                     onInput: (e) => {
                       form.username = e.target.value;
@@ -4401,7 +4457,10 @@ var UserManager = defineComponent5({
                   })
                 ]),
                 h4("label", { style: s4.field }, [
-                  h4("span", { style: s4.label }, "\u7528\u6237\u540D"),
+                  h4("span", { style: s4.label }, [
+                    "\u7528\u6237\u540D ",
+                    h4("span", { style: s4.required }, "*")
+                  ]),
                   h4("input", {
                     style: s4.input,
                     value: form.name,
@@ -4412,24 +4471,23 @@ var UserManager = defineComponent5({
                     }
                   })
                 ]),
-                h4("label", { style: s4.field }, [
-                  h4(
-                    "span",
-                    { style: s4.label },
-                    editing.value ? "\u5BC6\u7801\uFF08\u7559\u7A7A\u5219\u4E0D\u4FEE\u6539\uFF09" : "\u521D\u59CB\u5BC6\u7801"
-                  ),
+                !editing.value ? h4("label", { style: s4.field }, [
+                  h4("span", { style: s4.label }, [
+                    "\u521D\u59CB\u5BC6\u7801 ",
+                    h4("span", { style: s4.required }, "*")
+                  ]),
                   h4("input", {
                     style: s4.input,
                     type: "password",
                     value: form.password,
-                    placeholder: editing.value ? "\u7559\u7A7A\u8868\u793A\u4E0D\u4FEE\u6539\u5BC6\u7801" : "\u8BF7\u8F93\u5165\u521D\u59CB\u5BC6\u7801",
-                    required: !editing.value,
+                    placeholder: "\u8BF7\u8F93\u5165\u521D\u59CB\u5BC6\u7801",
+                    required: true,
                     autocomplete: "new-password",
                     onInput: (e) => {
                       form.password = e.target.value;
                     }
                   })
-                ]),
+                ]) : null,
                 h4("fieldset", { style: s4.fieldset }, [
                   h4("legend", { style: s4.label }, [
                     "\u5F52\u5C5E\u90E8\u95E8 ",
@@ -4612,6 +4670,84 @@ var UserManager = defineComponent5({
             ])
           ]
         )
+      ]) : null,
+      resetRow.value ? h4("div", { style: s4.mask, onClick: closeResetDialog }, [
+        h4(
+          "div",
+          {
+            style: { ...s4.dialog, maxWidth: "420px" },
+            role: "dialog",
+            "aria-modal": "true",
+            onClick: (e) => e.stopPropagation()
+          },
+          [
+            h4("div", { style: s4.dialogHeader }, [
+              h4("h3", { style: s4.dialogTitle }, "\u91CD\u7F6E\u5BC6\u7801"),
+              h4(
+                "button",
+                {
+                  type: "button",
+                  style: s4.iconBtn,
+                  "aria-label": "\u5173\u95ED",
+                  onClick: closeResetDialog
+                },
+                "\xD7"
+              )
+            ]),
+            h4(
+              "form",
+              {
+                style: s4.form,
+                onSubmit: (e) => void confirmResetPassword(e)
+              },
+              [
+                resetError.value ? h4("div", { style: s4.error }, resetError.value) : null,
+                h4("p", { style: s4.confirmText }, [
+                  "\u4E3A\u7528\u6237\u300C",
+                  h4("strong", resetRow.value.name),
+                  "\u300D\uFF08",
+                  resetRow.value.username,
+                  "\uFF09\u8BBE\u7F6E\u65B0\u5BC6\u7801"
+                ]),
+                h4("label", { style: s4.field }, [
+                  h4("span", { style: s4.label }, "\u65B0\u5BC6\u7801"),
+                  h4("input", {
+                    style: s4.input,
+                    type: "password",
+                    value: resetPassword.value,
+                    placeholder: "\u8BF7\u8F93\u5165\u65B0\u5BC6\u7801",
+                    required: true,
+                    autocomplete: "new-password",
+                    onInput: (e) => {
+                      resetPassword.value = e.target.value;
+                    }
+                  })
+                ]),
+                h4("div", { style: s4.dialogFooter }, [
+                  h4(
+                    "button",
+                    {
+                      type: "button",
+                      style: s4.secondaryBtn,
+                      disabled: resetting.value,
+                      onClick: closeResetDialog
+                    },
+                    "\u53D6\u6D88"
+                  ),
+                  h4(
+                    "button",
+                    {
+                      type: "submit",
+                      style: s4.primaryBtn,
+                      disabled: resetting.value
+                    },
+                    resetting.value ? "\u63D0\u4EA4\u4E2D\u2026" : "\u786E\u8BA4\u91CD\u7F6E"
+                  )
+                ])
+              ]
+            )
+          ]
+        )
       ]) : null
     ]);
   }