@befly-addon/admin 1.8.2 → 1.8.4

package/adminViews/log/operate/index.vue

@@ -1,85 +1,75 @@
 <template>
-    <div class="page-operate-log page-table">
-        <div class="main-tool">
-            <div class="left">
-                <TSelect v-model="$Data.filter.module" placeholder="操作模块" clearable style="width: 150px" @change="$Method.handleFilter">
-                    <TOption v-for="item in $Data.moduleOptions" :key="item.value" :label="item.label" :value="item.value" />
-                </TSelect>
-                <TSelect v-model="$Data.filter.action" placeholder="操作类型" clearable style="width: 150px" @change="$Method.handleFilter">
-                    <TOption v-for="item in $Data.actionOptions" :key="item.value" :label="item.label" :value="item.value" />
-                </TSelect>
-                <TSelect v-model="$Data.filter.result" placeholder="操作结果" clearable style="width: 120px" @change="$Method.handleFilter">
-                    <TOption label="成功" :value="1" />
-                    <TOption label="失败" :value="0" />
-                </TSelect>
-            </div>
-            <div class="right">
-                <TButton shape="circle" @click="$Method.handleRefresh">
-                    <template #icon>
-                        <ILucideRotateCw />
-                    </template>
-                </TButton>
-            </div>
-        </div>
-
-        <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="100%" active-row-type="single" @active-change="$Method.onActiveChange">
-                    <template #result="{ row }">
-                        <TTag v-if="row.result === 1" shape="round" theme="success" variant="light-outline">成功</TTag>
-                        <TTag v-else shape="round" theme="danger" variant="light-outline">失败</TTag>
-                    </template>
-                    <template #operateTime="{ row }">
-                        {{ $Method.formatTime(row.operateTime) }}
-                    </template>
-                    <template #duration="{ row }">
-                        <TTag shape="round" :theme="row.duration > 1000 ? 'warning' : 'default'" variant="light-outline">{{ row.duration }}ms</TTag>
-                    </template>
-                    <template #action="{ row }">
-                        <TTag shape="round" variant="light-outline">{{ row.action }}</TTag>
-                    </template>
-                </TTable>
-            </div>
-
-            <div class="main-detail">
-                <DetailPanel :data="$Data.currentRow" :fields="$Data.detailFields">
-                    <template #result="{ value }">
-                        <TTag v-if="value === 1" shape="round" theme="success" variant="light-outline">成功</TTag>
-                        <TTag v-else shape="round" theme="danger" variant="light-outline">失败</TTag>
-                    </template>
-                    <template #operateTime="{ value }">
-                        {{ $Method.formatTime(value) }}
-                    </template>
-                    <template #duration="{ value }">
-                        <TTag shape="round" :theme="value > 1000 ? 'warning' : 'default'" variant="light-outline">{{ value }}ms</TTag>
-                    </template>
-                    <template #params="{ value }">
-                        <pre class="json-content">{{ $Method.formatJson(value) }}</pre>
-                    </template>
-                    <template #response="{ value }">
-                        <pre class="json-content">{{ $Method.formatJson(value) }}</pre>
-                    </template>
-                </DetailPanel>
-            </div>
-        </div>
-
-        <div class="main-page">
-            <TPagination :current-page="$Data.pagerConfig.currentPage" :page-size="$Data.pagerConfig.limit" :total="$Data.pagerConfig.total" @current-change="$Method.onPageChange" @page-size-change="$Method.handleSizeChange" />
-        </div>
-    </div>
+    <PagedTableDetailPage class="page-operate-log page-table" :columns="$Data.columns" :endpoints="$Data.endpoints" :table-slot-names="['result', 'operateTime', 'duration', 'action']">
+        <template #toolLeft="scope">
+            <TSelect v-model="$Data.filter.module" placeholder="操作模块" clearable style="width: 150px" @change="$Method.handleFilter(scope.reload)">
+                <TOption v-for="item in $Data.moduleOptions" :key="item.value" :label="item.label" :value="item.value" />
+            </TSelect>
+            <TSelect v-model="$Data.filter.action" placeholder="操作类型" clearable style="width: 150px" @change="$Method.handleFilter(scope.reload)">
+                <TOption v-for="item in $Data.actionOptions" :key="item.value" :label="item.label" :value="item.value" />
+            </TSelect>
+            <TSelect v-model="$Data.filter.result" placeholder="操作结果" clearable style="width: 120px" @change="$Method.handleFilter(scope.reload)">
+                <TOption label="成功" :value="1" />
+                <TOption label="失败" :value="0" />
+            </TSelect>
+        </template>
+
+        <template #toolRight="scope">
+            <TButton shape="circle" @click="$Method.onReload(scope.reload)">
+                <template #icon>
+                    <ILucideRotateCw />
+                </template>
+            </TButton>
+        </template>
+
+        <template #result="{ row }">
+            <TTag v-if="row.result === 1" shape="round" theme="success" variant="light-outline">成功</TTag>
+            <TTag v-else shape="round" theme="danger" variant="light-outline">失败</TTag>
+        </template>
+
+        <template #operateTime="{ row }">
+            {{ $Method.formatTime(row.operateTime) }}
+        </template>
+
+        <template #duration="{ row }">
+            <TTag shape="round" :theme="row.duration > 1000 ? 'warning' : 'default'" variant="light-outline">{{ row.duration }}ms</TTag>
+        </template>
+
+        <template #action="{ row }">
+            <TTag shape="round" variant="light-outline">{{ row.action }}</TTag>
+        </template>
+
+        <template #detail="scope">
+            <DetailPanel :data="scope.currentRow" :fields="$Data.detailFields">
+                <template #result="slotScope">
+                    <TTag v-if="slotScope.value === 1" shape="round" theme="success" variant="light-outline">成功</TTag>
+                    <TTag v-else shape="round" theme="danger" variant="light-outline">失败</TTag>
+                </template>
+                <template #operateTime="slotScope">
+                    {{ $Method.formatTime(slotScope.value) }}
+                </template>
+                <template #duration="slotScope">
+                    <TTag shape="round" :theme="slotScope.value > 1000 ? 'warning' : 'default'" variant="light-outline">{{ slotScope.value }}ms</TTag>
+                </template>
+                <template #params="slotScope">
+                    <pre class="json-content">{{ $Method.formatJson(slotScope.value) }}</pre>
+                </template>
+                <template #response="slotScope">
+                    <pre class="json-content">{{ $Method.formatJson(slotScope.value) }}</pre>
+                </template>
+            </DetailPanel>
+        </template>
+    </PagedTableDetailPage>
 </template>
 
 <script setup lang="ts">
-import { Button as TButton, Table as TTable, Tag as TTag, Pagination as TPagination, Select as TSelect, Option as TOption, MessagePlugin } from "tdesign-vue-next";
+import { Button as TButton, Option as TOption, Select as TSelect, Tag as TTag } from "tdesign-vue-next";
 import ILucideRotateCw from "~icons/lucide/rotate-cw";
 import DetailPanel from "@/components/DetailPanel.vue";
-import { $Http } from "@/plugins/http";
+import PagedTableDetailPage from "@/components/PagedTableDetailPage.vue";
 import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 // 响应式数据
 const $Data = $ref({
-    tableData: [],
-    loading: false,
     columns: withDefaultColumns([
         { colKey: "username", title: "操作人", fixed: "left", width: 100 },
         { colKey: "module", title: "模块", width: 100 },
@@ -105,13 +95,23 @@ const $Data = $ref({
         { colKey: "result", title: "操作结果" },
         { colKey: "remark", title: "备注" }
     ],
-    pagerConfig: {
-        currentPage: 1,
-        limit: 30,
-        total: 0
+    endpoints: {
+        list: {
+            path: "/addon/admin/operateLog/list",
+            dropValues: [""],
+            dropKeyValue: {
+                module: [""],
+                action: [""]
+            },
+            buildData: () => {
+                return {
+                    module: $Data.filter.module,
+                    action: $Data.filter.action,
+                    result: $Data.filter.result
+                };
+            }
+        }
     },
-    currentRow: null,
-    activeRowKeys: [],
     filter: {
         module: "",
         action: "",
@@ -134,81 +134,12 @@ const $Data = $ref({
 
 // 方法
 const $Method = {
-    async initData() {
-        await $Method.apiOperateLogList();
-    },
-
-    // 加载操作日志列表
-    async apiOperateLogList() {
-        $Data.loading = true;
-        try {
-            const res = await $Http.post(
-                "/addon/admin/operateLog/list",
-                {
-                    page: $Data.pagerConfig.currentPage,
-                    limit: $Data.pagerConfig.limit,
-                    module: $Data.filter.module,
-                    action: $Data.filter.action,
-                    result: $Data.filter.result
-                },
-                {
-                    dropValues: [""],
-                    dropKeyValue: {
-                        module: [""],
-                        action: [""]
-                    }
-                }
-            );
-            $Data.tableData = res.data.lists || [];
-            $Data.pagerConfig.total = res.data.total || 0;
-
-            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;
-        }
-    },
-
-    // 筛选
-    handleFilter() {
-        $Data.pagerConfig.currentPage = 1;
-        $Method.apiOperateLogList();
-    },
-
-    // 刷新
-    handleRefresh() {
-        $Method.apiOperateLogList();
+    handleFilter(reload) {
+        reload({ keepSelection: false, resetPage: true });
     },
 
-    // 分页改变
-    onPageChange(currentPage) {
-        $Data.pagerConfig.currentPage = currentPage;
-        $Method.apiOperateLogList();
-    },
-
-    // 每页条数改变
-    handleSizeChange(pageSize) {
-        $Data.pagerConfig.limit = pageSize;
-        $Data.pagerConfig.currentPage = 1;
-        $Method.apiOperateLogList();
-    },
-
-    // 高亮行变化
-    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;
-        }
+    onReload(reload) {
+        reload({ keepSelection: true });
     },
 
     // 格式化时间
@@ -235,8 +166,6 @@ const $Method = {
         }
     }
 };
-
-$Method.initData();
 </script>
 
 <style scoped lang="scss">

package/adminViews/login_1/index.vue

@@ -21,7 +21,7 @@
                     <p class="login-subtitle">请登录您的账户</p>
                 </div>
 
-                <TForm :model="$Data.formData" :rules="$Data2.formRules" :ref="(el) => ($From.form = el)" class="login-form" :show-message="false" label-width="0">
+                <TForm :model="$Data.formData" :rules="$Data.formRules" :ref="(el) => ($From.form = el)" class="login-form" :show-message="false" label-width="0">
                     <TFormItem prop="account">
                         <TInputAdornment>
                             <template #prepend>
@@ -83,6 +83,10 @@ const $From = $shallowRef({
 const $Data = $ref({
     loading: false,
     rememberMe: false,
+    formRules: {
+        account: [{ required: true, message: "请输入账号", trigger: "blur" }],
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }]
+    },
     formData: {
         loginType: "username",
         account: "",
@@ -90,18 +94,11 @@ const $Data = $ref({
     }
 });
 
-const $Data2 = $shallowRef({
-    formRules: {
-        account: [{ required: true, message: "请输入账号", trigger: "blur" }],
-        password: [{ required: true, message: "请输入密码", trigger: "blur" }]
-    }
-});
-
 // 方法定义
 const $Method = {
     async apiLogin() {
         try {
-            const valid = await $From.form.validate();
+            await $From.form.validate();
 
             $Data.loading = true;
 

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

@@ -65,7 +65,10 @@ const $Prop = defineProps({
     }
 });
 
-const $Emit = defineEmits(["update:modelValue", "success"]);
+const $Emit = defineEmits<{
+    (e: "update:modelValue", value: boolean): void;
+    (e: "success"): void;
+}>();
 
 // 表单引用
 const $From = $shallowRef({
@@ -108,7 +111,7 @@ const $Method = {
         $Method.onShow();
         await $Method.apiRoleLists();
         if ($Prop.actionType === "upd" && $Prop.rowData.id) {
-            $Data.formData = { ...$Prop.rowData };
+            $Data.formData = Object.assign({}, $Prop.rowData);
         }
     },
 

package/adminViews/people/admin/index.vue

@@ -1,90 +1,65 @@
 <template>
-    <div class="page-admin page-table">
-        <div class="main-tool">
-            <div class="left">
-                <TButton theme="primary" @click="$Method.onAction('add', {})">
-                    <template #icon>
-                        <ILucidePlus />
-                    </template>
+    <PagedTableDetailPage class="page-admin" :columns="$Data.columns" :endpoints="$Data.endpoints">
+        <template #toolLeft>
+            <TButton theme="primary" @click="$Method.onAdd">
+                <template #icon>
+                    <ILucidePlus />
+                </template>
+            </TButton>
+        </template>
+
+        <template #toolRight="scope">
+            <TButton shape="circle" @click="$Method.onReload(scope.reload)">
+                <template #icon>
+                    <ILucideRotateCw />
+                </template>
+            </TButton>
+        </template>
+
+        <template #state="{ row }">
+            <TTag v-if="row.state === 1" shape="round" theme="success" variant="light-outline">正常</TTag>
+            <TTag v-else-if="row.state === 2" shape="round" theme="warning" variant="light-outline">禁用</TTag>
+            <TTag v-else-if="row.state === 0" shape="round" theme="danger" variant="light-outline">删除</TTag>
+        </template>
+
+        <template #operation="{ row, deleteRow }">
+            <TDropdown trigger="click" placement="bottom-right" @click="$Method.onDropdownAction($event, row, deleteRow)">
+                <TButton theme="primary" size="small">
+                    操作
+                    <template #suffix> <ILucideChevronDown /></template>
                 </TButton>
-            </div>
-            <div class="right">
-                <TButton shape="circle" @click="$Method.handleRefresh">
-                    <template #icon>
-                        <ILucideRotateCw />
-                    </template>
-                </TButton>
-            </div>
-        </div>
-
-        <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(--pagination-height) - var(--layout-gap) * 4)"
-                    active-row-type="single"
-                    @active-change="$Method.onActiveChange"
-                >
-                    <template #state="{ row }">
-                        <TTag v-if="row.state === 1" shape="round" theme="success" variant="light-outline">正常</TTag>
-                        <TTag v-else-if="row.state === 2" shape="round" theme="warning" variant="light-outline">禁用</TTag>
-                        <TTag v-else-if="row.state === 0" shape="round" theme="danger" variant="light-outline">删除</TTag>
-                    </template>
-                    <template #operation="{ row }">
-                        <TDropdown trigger="click" placement="bottom-right" @click="(data) => $Method.onAction(data.value, row)">
-                            <TButton theme="primary" size="small">
-                                操作
-                                <template #suffix> <ILucideChevronDown /></template>
-                            </TButton>
-                            <TDropdownMenu slot="dropdown">
-                                <TDropdownItem value="upd">
-                                    <ILucidePencil />
-                                    编辑
-                                </TDropdownItem>
-                                <TDropdownItem value="del" :divider="true">
-                                    <ILucideTrash2 />
-                                    删除
-                                </TDropdownItem>
-                            </TDropdownMenu>
-                        </TDropdown>
-                    </template>
-                </TTable>
-            </div>
-
-            <div class="main-detail">
-                <DetailPanel :data="$Data.currentRow" :fields="$Data.columns" />
-            </div>
-        </div>
-
-        <div class="main-page">
-            <TPagination :current-page="$Data.pagerConfig.currentPage" :page-size="$Data.pagerConfig.limit" :total="$Data.pagerConfig.total" @current-change="$Method.onPageChange" @page-size-change="$Method.handleSizeChange" />
-        </div>
-
-        <!-- 编辑对话框组件 -->
-        <EditDialog v-if="$Data.editVisible" v-model="$Data.editVisible" :action-type="$Data.actionType" :row-data="$Data.rowData" @success="$Method.apiAdminList" />
-    </div>
+                <TDropdownMenu slot="dropdown">
+                    <TDropdownItem value="upd">
+                        <ILucidePencil />
+                        编辑
+                    </TDropdownItem>
+                    <TDropdownItem value="del" :divider="true">
+                        <ILucideTrash2 />
+                        删除
+                    </TDropdownItem>
+                </TDropdownMenu>
+            </TDropdown>
+        </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)" />
+        </template>
+    </PagedTableDetailPage>
 </template>
 
 <script setup lang="ts">
-import { Button as TButton, Table as TTable, Tag as TTag, Dropdown as TDropdown, DropdownMenu as TDropdownMenu, DropdownItem as TDropdownItem, Pagination as TPagination, MessagePlugin, DialogPlugin } from "tdesign-vue-next";
+import { Button as TButton, Dropdown as TDropdown, DropdownItem as TDropdownItem, DropdownMenu as TDropdownMenu, Tag as TTag } from "tdesign-vue-next";
 import ILucidePlus from "~icons/lucide/plus";
 import ILucideRotateCw from "~icons/lucide/rotate-cw";
 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 DetailPanel from "@/components/DetailPanel.vue";
-import { $Http } from "@/plugins/http";
+import PagedTableDetailPage from "@/components/PagedTableDetailPage.vue";
 import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 // 响应式数据
 const $Data = $ref({
-    tableData: [],
-    loading: false,
     columns: withDefaultColumns([
         { colKey: "username", title: "用户名", fixed: "left" },
         { colKey: "nickname", title: "昵称" },
@@ -92,147 +67,57 @@ const $Data = $ref({
         { colKey: "state", title: "状态" },
         { colKey: "operation", title: "操作" }
     ]),
-    pagerConfig: {
-        currentPage: 1,
-        limit: 30,
-        total: 0,
-        align: "right",
-        layout: "total, prev, pager, next, jumper"
+    endpoints: {
+        list: {
+            path: "/addon/admin/admin/list",
+            dropValues: [""]
+        },
+        delete: {
+            path: "/addon/admin/admin/del",
+            idKey: "id",
+            confirm: (row) => ({
+                header: "确认删除",
+                body: `确认删除“${row.username}”吗？`,
+                confirmBtn: "删除"
+            })
+        }
     },
     editVisible: false,
     actionType: "add",
-    rowData: {},
-    currentRow: null,
-    activeRowKeys: []
+    rowData: {}
 });
 
 // 方法
 const $Method = {
-    async initData() {
-        await $Method.apiAdminList();
-    },
-
-    // 加载管理员列表
-    async apiAdminList() {
-        $Data.loading = true;
-        try {
-            const res = await $Http.post(
-                "/addon/admin/admin/list",
-                {
-                    page: $Data.pagerConfig.currentPage,
-                    limit: $Data.pagerConfig.limit
-                },
-                {
-                    dropValues: [""]
-                }
-            );
-            $Data.tableData = res.data.lists || [];
-            $Data.pagerConfig.total = res.data.total || 0;
-
-            // 自动高亮第一行
-            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;
-        }
+    onAdd() {
+        $Method.onAction("add", {});
     },
 
-    // 删除管理员
-    async apiAdminDel(row) {
-        let dialog = null;
-        let destroyed = false;
-
-        const destroy = () => {
-            if (destroyed) return;
-            destroyed = true;
-            if (dialog && typeof dialog.destroy === "function") {
-                dialog.destroy();
-            }
-        };
-
-        dialog = DialogPlugin.confirm({
-            header: "确认删除",
-            body: `确认删除管理员“${row.username}”吗？`,
-            status: "warning",
-            confirmBtn: "删除",
-            cancelBtn: "取消",
-            onConfirm: async () => {
-                if (dialog && typeof dialog.setConfirmLoading === "function") {
-                    dialog.setConfirmLoading(true);
-                }
-
-                try {
-                    await $Http.post("/addon/admin/admin/del", {
-                        id: row.id
-                    });
-                    MessagePlugin.success("删除成功");
-                    destroy();
-                    await $Method.apiAdminList();
-                } catch (error) {
-                    MessagePlugin.error("删除失败");
-                } finally {
-                    if (dialog && typeof dialog.setConfirmLoading === "function") {
-                        dialog.setConfirmLoading(false);
-                    }
-                }
-            },
-            onClose: () => {
-                destroy();
-            }
-        });
+    onReload(reload) {
+        reload({ keepSelection: true });
     },
 
-    // 刷新
-    handleRefresh() {
-        $Method.apiAdminList();
+    onDialogSuccess(reload) {
+        reload({ keepSelection: true });
     },
 
-    // 分页改变
-    onPageChange({ currentPage }) {
-        $Data.pagerConfig.currentPage = currentPage;
-        $Method.apiAdminList();
-    },
-
-    // 每页条数改变
-    handleSizeChange({ pageSize }) {
-        $Data.pagerConfig.limit = pageSize;
-        $Data.pagerConfig.currentPage = 1;
-        $Method.apiAdminList();
-    },
-
-    // 高亮行变化
-    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;
-        }
-    },
-
-    // 操作菜单点击
     onAction(command, rowData) {
         $Data.actionType = command;
         $Data.rowData = rowData;
         if (command === "add" || command === "upd") {
             $Data.editVisible = true;
-        } else if (command === "del") {
-            $Method.apiAdminDel(rowData);
         }
+    },
+
+    onDropdownAction(data, rowData, deleteRow) {
+        const cmd = data && data.value ? String(data.value) : "";
+        if (cmd === "del") {
+            deleteRow(rowData);
+            return;
+        }
+        $Method.onAction(cmd, rowData);
     }
 };
-
-$Method.initData();
 </script>
 
 <style scoped lang="scss">