@befly-addon/admin 1.8.4 → 1.8.6

package/adminViews/login_1/index.vue

@@ -31,7 +31,7 @@
                                     <TOption value="phone" label="手机号" />
                                 </TSelect>
                             </template>
-                            <TInput v-model="$Data.formData.account" :placeholder="$Data.formData.loginType === 'username' ? '请输入用户名' : $Data.formData.loginType === 'email' ? '请输入邮箱' : '请输入手机号'" size="large" clearable @enter="$Method.apiLogin">
+                            <TInput v-model="$Data.formData.account" :placeholder="$Data.formData.loginType === 'username' ? '请输入用户名' : $Data.formData.loginType === 'email' ? '请输入邮箱' : '请输入手机号'" size="large" clearable @enter="apiLogin">
                                 <template #prefix-icon>
                                     <ILucideUser />
                                 </template>
@@ -40,7 +40,7 @@
                     </TFormItem>
 
                     <TFormItem prop="password">
-                        <TInput v-model="$Data.formData.password" type="password" placeholder="密码" size="large" clearable @enter="$Method.apiLogin">
+                        <TInput v-model="$Data.formData.password" type="password" placeholder="密码" size="large" clearable @enter="apiLogin">
                             <template #prefix-icon>
                                 <ILucideLock />
                             </template>
@@ -52,7 +52,7 @@
                         <a href="#" class="link-text">忘记密码？</a>
                     </div>
 
-                    <TButton theme="primary" class="login-btn" size="large" block :loading="$Data.loading" @click="$Method.apiLogin"> 登录 </TButton>
+                    <TButton theme="primary" class="login-btn" size="large" block :loading="$Data.loading" @click="apiLogin"> 登录 </TButton>
                 </TForm>
 
                 <div class="login-footer">
@@ -94,42 +94,35 @@ const $Data = $ref({
     }
 });
 
-// 方法定义
-const $Method = {
-    async apiLogin() {
-        try {
-            await $From.form.validate();
+async function apiLogin(): Promise<void> {
+    try {
+        await $From.form.validate();
 
-            $Data.loading = true;
+        $Data.loading = true;
 
-            // 对密码进行 SHA-256 加密
-            const hashedPassword = await hashPassword($Data.formData.password);
+        const hashedPassword = await hashPassword($Data.formData.password);
 
-            const res = await $Http.post("/addon/admin/auth/login", {
-                loginType: $Data.formData.loginType,
-                account: $Data.formData.account,
-                password: hashedPassword
-            });
+        const res = await $Http.post("/addon/admin/auth/login", {
+            loginType: $Data.formData.loginType,
+            account: $Data.formData.account,
+            password: hashedPassword
+        });
 
-            // 先保存 token
-            $Storage.local.set("token", res.data.token);
+        $Storage.local.set("token", res.data.token);
 
-            // 如果返回用户信息,也可以存储
-            if (res.data.userInfo) {
-                $Storage.local.set("userInfo", res.data.userInfo);
-            }
+        if (res.data.userInfo) {
+            $Storage.local.set("userInfo", res.data.userInfo);
+        }
 
-            MessagePlugin.success(res.msg || "登录成功");
+        MessagePlugin.success(res.msg || "登录成功");
 
-            // 跳转到首页，路由守卫会自动加载菜单
-            await router.push("/");
-        } catch (error) {
-            MessagePlugin.error("登录失败");
-        } finally {
-            $Data.loading = false;
-        }
+        await router.push("/");
+    } catch (error) {
+        MessagePlugin.error("登录失败");
+    } finally {
+        $Data.loading = false;
     }
-};
+}
 </script>
 
 <style scoped lang="scss">

package/adminViews/people/admin/components/edit.vue

@@ -1,5 +1,5 @@
 <template>
-    <TDialog v-model:visible="$Data.visible" :header="$Prop.actionType === 'upd' ? '编辑管理员' : '添加管理员'" width="600px" :append-to-body="true" :show-footer="true" :esc-closable="false" top="10vh" @close="$Method.onClose">
+    <PageDialog v-model="dialogVisible" :title="$Prop.actionType === 'upd' ? '编辑管理员' : '添加管理员'" :confirm-loading="$Data.submitting" @confirm="onSubmit">
         <div class="dialog-wrapper">
             <TForm :model="$Data.formData" label-width="80px" label-position="left" label-align="left" :rules="$Data2.formRules" :ref="(el) => ($From.form = el)">
                 <TFormItem label="角色" prop="roleCode">
@@ -22,30 +22,23 @@
                 </TFormItem>
             </TForm>
         </div>
-        <template #footer>
-            <div class="dialog-footer">
-                <t-space>
-                    <TButton theme="default" @click="$Method.onClose">取消</TButton>
-                    <TButton theme="primary" :loading="$Data.submitting" @click="$Method.onSubmit">确定</TButton>
-                </t-space>
-            </div>
-        </template>
-    </TDialog>
+    </PageDialog>
 </template>
 
 <script setup lang="ts">
+import { computed } from "vue";
+
 import {
     //
-    Dialog as TDialog,
     Form as TForm,
     FormItem as TFormItem,
     Input as TInput,
     Select as TSelect,
     RadioGroup as TRadioGroup,
     Radio as TRadio,
-    Button as TButton,
     MessagePlugin
 } from "tdesign-vue-next";
+import PageDialog from "@/components/pageDialog.vue";
 import { $Http } from "@/plugins/http";
 import { fieldClear } from "befly-shared/utils/fieldClear";
 import { hashPassword } from "befly-shared/utils/hashPassword";
@@ -70,13 +63,23 @@ const $Emit = defineEmits<{
     (e: "success"): void;
 }>();
 
+type PageDialogEventContext = {
+    close: () => void;
+};
+
 // 表单引用
 const $From = $shallowRef({
     form: null
 });
 
+const dialogVisible = computed({
+    get: () => $Prop.modelValue,
+    set: (value) => {
+        $Emit("update:modelValue", value);
+    }
+});
+
 const $Data = $ref({
-    visible: false,
     submitting: false,
     allRoleLists: [],
     keys: {
@@ -105,71 +108,56 @@ const $Data2 = $shallowRef({
     }
 });
 
-// 方法集合
-const $Method = {
-    async initData() {
-        $Method.onShow();
-        await $Method.apiRoleLists();
-        if ($Prop.actionType === "upd" && $Prop.rowData.id) {
-            $Data.formData = Object.assign({}, $Prop.rowData);
-        }
-    },
+async function initData(): Promise<void> {
+    await apiRoleLists();
+    if ($Prop.actionType === "upd" && $Prop.rowData.id) {
+        $Data.formData = Object.assign({}, $Prop.rowData);
+    }
+}
+
+async function apiRoleLists(): Promise<void> {
+    try {
+        const result = await $Http.post(
+            "/addon/admin/role/all",
+            {},
+            {
+                dropValues: [""]
+            }
+        );
+        $Data.allRoleLists = result.data || [];
+    } catch (error) {
+        MessagePlugin.error("加载角色列表失败");
+    }
+}
 
-    onShow() {
-        setTimeout(() => {
-            $Data.visible = $Prop.modelValue;
-        }, 100);
-    },
+async function onSubmit(context?: PageDialogEventContext): Promise<void> {
+    try {
+        const valid = await $From.form.validate();
+        if (!valid) return;
 
-    onClose() {
-        $Data.visible = false;
-        setTimeout(() => {
-            $Emit("update:modelValue", false);
-        }, 300);
-    },
+        $Data.submitting = true;
+        const formData = ($Prop.actionType === "add" ? fieldClear($Data.formData, { omitKeys: ["id", "state"] }) : fieldClear($Data.formData, { omitKeys: ["password"] })) as Record<string, unknown>;
 
-    async apiRoleLists() {
-        try {
-            const result = await $Http.post(
-                "/addon/admin/role/all",
-                {},
-                {
-                    dropValues: [""]
-                }
-            );
-            $Data.allRoleLists = result.data || [];
-        } catch (error) {
-            MessagePlugin.error("加载角色列表失败");
+        const password = typeof formData["password"] === "string" ? String(formData["password"]) : "";
+        if ($Prop.actionType === "add" && password) {
+            formData["password"] = await hashPassword(password);
         }
-    },
-
-    async onSubmit() {
-        try {
-            const valid = await $From.form.validate();
-            if (!valid) return;
 
-            $Data.submitting = true;
-            const formData = $Prop.actionType === "add" ? fieldClear($Data.formData, { omitKeys: ["id", "state"] }) : fieldClear($Data.formData, { omitKeys: ["password"] });
+        const result = await $Http.post($Prop.actionType === "upd" ? "/addon/admin/admin/upd" : "/addon/admin/admin/ins", formData);
 
-            // 添加管理员时，对密码进行 SHA-256 加密
-            if ($Prop.actionType === "add" && formData.password) {
-                formData.password = await hashPassword(formData.password);
-            }
-
-            const result = await $Http.post($Prop.actionType === "upd" ? "/addon/admin/admin/upd" : "/addon/admin/admin/ins", formData);
-
-            MessagePlugin.success(result.msg);
-            $Emit("success");
-            $Method.onClose();
-        } catch (error) {
-            MessagePlugin.error(error.msg || "提交失败");
-        } finally {
-            $Data.submitting = false;
+        MessagePlugin.success(result.msg);
+        $Emit("success");
+        if (context && typeof context.close === "function") {
+            context.close();
         }
+    } catch (error) {
+        MessagePlugin.error((error as { msg?: string }).msg || "提交失败");
+    } finally {
+        $Data.submitting = false;
     }
-};
+}
 
-$Method.initData();
+initData();
 </script>
 
 <style scoped lang="scss">

package/adminViews/people/admin/index.vue

@@ -1,7 +1,7 @@
 <template>
-    <PagedTableDetailPage class="page-admin" :columns="$Data.columns" :endpoints="$Data.endpoints">
+    <PagedTableDetail class="page-admin" :columns="$Data.columns" :endpoints="$Data.endpoints">
         <template #toolLeft>
-            <TButton theme="primary" @click="$Method.onAdd">
+            <TButton theme="primary" @click="onAdd">
                 <template #icon>
                     <ILucidePlus />
                 </template>
@@ -9,7 +9,7 @@
         </template>
 
         <template #toolRight="scope">
-            <TButton shape="circle" @click="$Method.onReload(scope.reload)">
+            <TButton shape="circle" @click="onReload(scope.reload)">
                 <template #icon>
                     <ILucideRotateCw />
                 </template>
@@ -23,7 +23,7 @@
         </template>
 
         <template #operation="{ row, deleteRow }">
-            <TDropdown trigger="click" placement="bottom-right" @click="$Method.onDropdownAction($event, row, deleteRow)">
+            <TDropdown trigger="click" placement="bottom-right" @click="onDropdownAction($event, row, deleteRow)">
                 <TButton theme="primary" size="small">
                     操作
                     <template #suffix> <ILucideChevronDown /></template>
@@ -42,9 +42,9 @@
         </template>
 
         <template #dialogs="scope">
-            <EditDialog v-if="$Data.editVisible" v-model="$Data.editVisible" :action-type="$Data.actionType" :row-data="$Data.rowData" @success="$Method.onDialogSuccess(scope.reload)" />
+            <EditDialog v-if="$Data.editVisible" v-model="$Data.editVisible" :action-type="$Data.actionType" :row-data="$Data.rowData" @success="onDialogSuccess(scope.reload)" />
         </template>
-    </PagedTableDetailPage>
+    </PagedTableDetail>
 </template>
 
 <script setup lang="ts">
@@ -55,7 +55,7 @@ import ILucidePencil from "~icons/lucide/pencil";
 import ILucideTrash2 from "~icons/lucide/trash-2";
 import ILucideChevronDown from "~icons/lucide/chevron-down";
 import EditDialog from "./components/edit.vue";
-import PagedTableDetailPage from "@/components/PagedTableDetailPage.vue";
+import PagedTableDetail from "@/components/pagedTableDetail.vue";
 import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 // 响应式数据
@@ -87,37 +87,36 @@ const $Data = $ref({
     rowData: {}
 });
 
-// 方法
-const $Method = {
-    onAdd() {
-        $Method.onAction("add", {});
-    },
+function onAdd(): void {
+    onAction("add", {});
+}
 
-    onReload(reload) {
-        reload({ keepSelection: true });
-    },
+function onReload(reload: (options: { keepSelection?: boolean }) => void): void {
+    reload({ keepSelection: true });
+}
 
-    onDialogSuccess(reload) {
-        reload({ keepSelection: true });
-    },
+function onDialogSuccess(reload: (options: { keepSelection?: boolean }) => void): void {
+    reload({ keepSelection: true });
+}
 
-    onAction(command, rowData) {
-        $Data.actionType = command;
-        $Data.rowData = rowData;
-        if (command === "add" || command === "upd") {
-            $Data.editVisible = true;
-        }
-    },
+function onAction(command: string, rowData: Record<string, unknown>): void {
+    $Data.actionType = command;
+    $Data.rowData = rowData;
+    if (command === "add" || command === "upd") {
+        $Data.editVisible = true;
+    }
+}
 
-    onDropdownAction(data, rowData, deleteRow) {
-        const cmd = data && data.value ? String(data.value) : "";
-        if (cmd === "del") {
-            deleteRow(rowData);
-            return;
-        }
-        $Method.onAction(cmd, rowData);
+function onDropdownAction(data: unknown, rowData: Record<string, unknown>, deleteRow: (row: Record<string, unknown>) => void): void {
+    const record = data as Record<string, unknown>;
+    const rawValue = record && record["value"] ? record["value"] : "";
+    const cmd = rawValue ? String(rawValue) : "";
+    if (cmd === "del") {
+        deleteRow(rowData);
+        return;
     }
-};
+    onAction(cmd, rowData);
+}
 </script>
 
 <style scoped lang="scss">

package/adminViews/permission/api/index.vue

@@ -2,7 +2,7 @@
     <div class="page-api page-table">
         <div class="main-tool">
             <div class="left">
-                <TInput v-model="$Data.searchKeyword" placeholder="搜索接口名称或路径" clearable style="width: 300px" @enter="$Method.handleSearch" @clear="$Method.handleSearch">
+                <TInput v-model="$Data.searchKeyword" placeholder="搜索接口名称或路径" clearable style="width: 300px" @enter="handleSearch" @clear="handleSearch">
                     <template #suffix-icon>
                         <ILucideSearch />
                     </template>
@@ -10,7 +10,7 @@
                 <span style="margin-left: 16px; color: var(--text-secondary); font-size: 13px">共 {{ $Data.allData.length }} 个接口</span>
             </div>
             <div class="right">
-                <TButton shape="circle" @click="$Method.handleRefresh">
+                <TButton shape="circle" @click="handleRefresh">
                     <template #icon>
                         <ILucideRotateCw />
                     </template>
@@ -20,7 +20,7 @@
 
         <div class="main-content">
             <div class="main-table">
-                <TTable :data="$Data.tableData" :columns="$Data.columns" :loading="$Data.loading" :active-row-keys="$Data.activeRowKeys" row-key="id" height="calc(100vh - var(--search-height) - var(--layout-gap) * 2)" active-row-type="single" @active-change="$Method.onActiveChange">
+                <TTable :data="$Data.tableData" :columns="$Data.columns" :loading="$Data.loading" :active-row-keys="$Data.activeRowKeys" row-key="id" height="calc(100vh - var(--search-height) - var(--layout-gap) * 2)" active-row-type="single" @active-change="onActiveChange">
                     <template #method="{ row }">
                         <TTag v-if="row.method === 'GET'" shape="round" theme="success" variant="light-outline">GET</TTag>
                         <TTag v-else-if="row.method === 'POST'" shape="round" theme="primary" variant="light-outline">POST</TTag>
@@ -62,7 +62,7 @@
 import { Button as TButton, Table as TTable, Tag as TTag, Input as TInput, MessagePlugin } from "tdesign-vue-next";
 import ILucideRotateCw from "~icons/lucide/rotate-cw";
 import ILucideSearch from "~icons/lucide/search";
-import DetailPanel from "@/components/DetailPanel.vue";
+import DetailPanel from "@/components/detailPanel.vue";
 import { $Http } from "@/plugins/http";
 import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
@@ -83,72 +83,62 @@ const $Data = $ref({
     activeRowKeys: []
 });
 
-// 方法
-const $Method = {
-    async initData() {
-        await $Method.loadApiAll();
-    },
+async function initData(): Promise<void> {
+    await loadApiAll();
+}
 
-    // 加载全部接口
-    async loadApiAll() {
-        $Data.loading = true;
-        try {
-            const res = await $Http.post(
-                "/addon/admin/api/all",
-                {},
-                {
-                    dropValues: [""]
-                }
-            );
-            const list = res.data?.lists || [];
-            $Data.allData = list;
-            $Data.tableData = list;
-
-            // 自动高亮第一行
-            if ($Data.tableData.length > 0) {
-                $Data.currentRow = $Data.tableData[0];
-                $Data.activeRowKeys = [$Data.tableData[0].id];
-            } else {
-                $Data.currentRow = null;
-                $Data.activeRowKeys = [];
+async function loadApiAll(): Promise<void> {
+    $Data.loading = true;
+    try {
+        const res = await $Http.post(
+            "/addon/admin/api/all",
+            {},
+            {
+                dropValues: [""]
             }
-        } catch (error) {
-            MessagePlugin.error("加载数据失败");
-        } finally {
-            $Data.loading = false;
+        );
+        const list = res.data?.lists || [];
+        $Data.allData = list;
+        $Data.tableData = list;
+
+        if ($Data.tableData.length > 0) {
+            $Data.currentRow = $Data.tableData[0];
+            $Data.activeRowKeys = [$Data.tableData[0].id];
+        } else {
+            $Data.currentRow = null;
+            $Data.activeRowKeys = [];
         }
-    },
+    } catch (error) {
+        MessagePlugin.error("加载数据失败");
+    } finally {
+        $Data.loading = false;
+    }
+}
 
-    // 刷新
-    handleRefresh() {
-        $Method.loadApiAll();
-    },
+function handleRefresh(): void {
+    loadApiAll();
+}
 
-    // 搜索
-    handleSearch() {
-        if (!$Data.searchKeyword) {
-            $Data.tableData = $Data.allData;
-            return;
-        }
-        const keyword = $Data.searchKeyword.toLowerCase();
-        $Data.tableData = $Data.allData.filter((item) => item.name?.toLowerCase().includes(keyword) || item.path?.toLowerCase().includes(keyword));
-    },
+function handleSearch(): void {
+    if (!$Data.searchKeyword) {
+        $Data.tableData = $Data.allData;
+        return;
+    }
+    const keyword = String($Data.searchKeyword).toLowerCase();
+    $Data.tableData = $Data.allData.filter((item) => item.name?.toLowerCase().includes(keyword) || item.path?.toLowerCase().includes(keyword));
+}
 
-    // 高亮行变化
-    onActiveChange(value, context) {
-        // 禁止取消高亮：如果新值为空，保持当前选中
-        if (value.length === 0 && $Data.activeRowKeys.length > 0) {
-            return;
-        }
-        $Data.activeRowKeys = value;
-        // 更新当前高亮的行数据
-        if (context.activeRowList && context.activeRowList.length > 0) {
-            $Data.currentRow = context.activeRowList[0].row;
-        }
+function onActiveChange(value: unknown[], context: { activeRowList?: Array<{ row: unknown }> }): void {
+    if (value.length === 0 && $Data.activeRowKeys.length > 0) {
+        return;
+    }
+    $Data.activeRowKeys = value;
+    if (context.activeRowList && context.activeRowList.length > 0) {
+        $Data.currentRow = context.activeRowList[0].row as never;
     }
-};
+}
 
-$Method.initData();
+initData();
 </script>
 
 <style scoped lang="scss">