@befly-addon/admin 1.8.2 → 1.8.5

package/adminViews/403_1/index.vue

@@ -5,8 +5,8 @@
             <h1 class="error-title">无权限访问</h1>
             <p class="error-description">抱歉，您没有访问该页面的权限</p>
             <div class="error-actions">
-                <TButton theme="primary" @click="$Method.goHome">返回首页</TButton>
-                <TButton @click="$Method.goBack">返回上一页</TButton>
+                <TButton theme="primary" @click="goHome">返回首页</TButton>
+                <TButton @click="goBack">返回上一页</TButton>
             </div>
         </div>
     </div>
@@ -18,14 +18,13 @@ import { Button as TButton } from "tdesign-vue-next";
 
 const router = useRouter();
 
-const $Method = {
-    goHome() {
-        router.push("/");
-    },
-    goBack() {
-        router.back();
-    }
-};
+function goHome(): void {
+    router.push("/");
+}
+
+function goBack(): void {
+    router.back();
+}
 </script>
 
 <style scoped lang="scss">

package/adminViews/config/dict/components/edit.vue

@@ -1,6 +1,6 @@
 <template>
-    <TDialog v-model:visible="visible" :header="actionType === 'add' ? '添加字典项' : '编辑字典项'" width="600px" @confirm="$Method.handleSubmit" @close="$Method.handleClose">
-        <TForm ref="formRef" :data="$Data.formData" :rules="$Data.rules" label-width="100px">
+    <PageDialog v-model="visible" :title="actionType === 'add' ? '添加字典项' : '编辑字典项'" @confirm="handleSubmit">
+        <TForm :data="$Data.formData" :rules="$Data.rules" label-width="100px" :ref="(el) => ($From.form = el)">
             <TFormItem label="字典类型" name="typeCode">
                 <TSelect v-model="$Data.formData.typeCode" placeholder="请选择字典类型" filterable>
                     <TOption v-for="item in typeList" :key="item.code" :value="item.code" :label="item.name" />
@@ -19,13 +19,14 @@
                 <TTextarea v-model="$Data.formData.remark" placeholder="请输入备注信息" :autosize="{ minRows: 3, maxRows: 6 }" />
             </TFormItem>
         </TForm>
-    </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, Option as TOption, Textarea as TTextarea, InputNumber as TInputNumber, MessagePlugin } from "tdesign-vue-next";
+import { Form as TForm, FormItem as TFormItem, Input as TInput, Select as TSelect, Option as TOption, Textarea as TTextarea, InputNumber as TInputNumber, MessagePlugin } from "tdesign-vue-next";
+import PageDialog from "@/components/pageDialog.vue";
 import { $Http } from "@/plugins/http";
 
 const props = defineProps({
@@ -35,14 +36,19 @@ const props = defineProps({
     typeList: Array
 });
 
-const emit = defineEmits(["update:modelValue", "success"]);
+const $Emit = defineEmits<{
+    (e: "update:modelValue", value: boolean): void;
+    (e: "success"): void;
+}>();
 
 const visible = computed({
     get: () => props.modelValue,
-    set: (val) => emit("update:modelValue", val)
+    set: (val) => $Emit("update:modelValue", val)
 });
 
-const formRef = $ref(null);
+const $From = $shallowRef({
+    form: null
+});
 
 const $Data = $ref({
     formData: {
@@ -59,38 +65,35 @@ const $Data = $ref({
     }
 });
 
-const $Method = {
-    async handleSubmit() {
-        try {
-            const valid = await formRef.validate();
-            const apiUrl = props.actionType === "add" ? "/addon/admin/dict/ins" : "/addon/admin/dict/upd";
-            const params = {
-                typeCode: $Data.formData.typeCode,
-                key: $Data.formData.key,
-                label: $Data.formData.label,
-                sort: $Data.formData.sort,
-                remark: $Data.formData.remark
-            };
-            if (props.actionType === "upd") {
-                params.id = props.rowData.id;
-            }
+async function handleSubmit(): Promise<void> {
+    try {
+        const valid = await $From.form.validate();
+        if (valid !== true) return;
+        const apiUrl = props.actionType === "add" ? "/addon/admin/dict/ins" : "/addon/admin/dict/upd";
+        const params: Record<string, unknown> = {
+            typeCode: $Data.formData.typeCode,
+            key: $Data.formData.key,
+            label: $Data.formData.label,
+            sort: $Data.formData.sort,
+            remark: $Data.formData.remark
+        };
+        if (props.actionType === "upd" && props.rowData) {
+            const row = props.rowData as Record<string, unknown>;
+            params["id"] = row["id"];
+        }
 
-            const res = await $Http.post(apiUrl, params);
-            if (res.code === 0) {
-                MessagePlugin.success(props.actionType === "add" ? "添加成功" : "更新成功");
-                visible.value = false;
-                emit("success");
-            } else {
-                MessagePlugin.error(res.msg || "操作失败");
-            }
-        } catch (error) {
-            MessagePlugin.error("操作失败");
+        const res = await $Http.post(apiUrl, params);
+        if (res.code === 0) {
+            MessagePlugin.success(props.actionType === "add" ? "添加成功" : "更新成功");
+            visible.value = false;
+            $Emit("success");
+        } else {
+            MessagePlugin.error(res.msg || "操作失败");
         }
-    },
-    handleClose() {
-        visible.value = false;
+    } catch (error) {
+        MessagePlugin.error("操作失败");
     }
-};
+}
 
 // 该组件由父组件 v-if 控制挂载/卸载，因此无需 watch：创建时初始化一次即可
 if (props.actionType === "upd" && props.rowData) {

package/adminViews/config/dict/index.vue

@@ -1,79 +1,58 @@
 <template>
-    <div class="page-dict page-table">
-        <div class="main-tool">
-            <div class="left">
-                <TButton theme="primary" @click="$Method.onAction('add', {})">
-                    <template #icon>
-                        <ILucidePlus />
-                    </template>
-                </TButton>
-            </div>
-            <div class="right">
-                <TSelect v-model="$Data.searchTypeCode" placeholder="请选择字典类型" clearable filterable @change="$Method.handleSearch">
-                    <TOption v-for="item in $Data.typeList" :key="item.code" :value="item.code" :label="item.name" />
-                </TSelect>
-                <TInput v-model="$Data.searchKeyword" placeholder="搜索键/标签" clearable @enter="$Method.handleSearch" @clear="$Method.handleSearch">
-                    <template #suffix-icon>
-                        <ILucideSearch />
-                    </template>
-                </TInput>
-                <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 #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 style="width: 14px; height: 14px; margin-right: 6px" />
-                                    删除
-                                </TDropdownItem>
-                            </TDropdownMenu>
-                        </TDropdown>
-                    </template>
-                </TTable>
-            </div>
+    <PagedTableDetail class="page-dict page-table" :columns="$Data.columns" :endpoints="$Data.endpoints">
+        <template #toolLeft>
+            <TButton theme="primary" @click="onAdd">
+                <template #icon>
+                    <ILucidePlus />
+                </template>
+            </TButton>
+        </template>
 
-            <div class="main-detail">
-                <DetailPanel :data="$Data.currentRow" :fields="$Data.columns" />
-            </div>
-        </div>
+        <template #toolRight="scope">
+            <TSelect v-model="$Data.searchTypeCode" placeholder="请选择字典类型" clearable filterable @change="handleSearch(scope.reload)">
+                <TOption v-for="item in $Data.typeList" :key="item.code" :value="item.code" :label="item.name" />
+            </TSelect>
+            <TInput v-model="$Data.searchKeyword" placeholder="搜索键/标签" clearable @enter="handleSearch(scope.reload)" @clear="handleSearch(scope.reload)">
+                <template #suffix-icon>
+                    <ILucideSearch />
+                </template>
+            </TInput>
+            <TButton shape="circle" @click="handleRefresh(scope.reload)">
+                <template #icon>
+                    <ILucideRotateCw />
+                </template>
+            </TButton>
+        </template>
 
-        <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>
+        <template #operation="{ row, deleteRow }">
+            <TDropdown trigger="click" placement="bottom-right" @click="onDropdownAction($event, row, deleteRow)">
+                <TButton theme="primary" size="small">
+                    操作
+                    <template #suffix> <ILucideChevronDown /></template>
+                </TButton>
+                <TDropdownMenu slot="dropdown">
+                    <TDropdownItem value="upd">
+                        <ILucidePencil />
+                        编辑
+                    </TDropdownItem>
+                    <TDropdownItem value="del" :divider="true">
+                        <ILucideTrash2 style="width: 14px; height: 14px; margin-right: 6px" />
+                        删除
+                    </TDropdownItem>
+                </TDropdownMenu>
+            </TDropdown>
+        </template>
 
-        <EditDialog v-if="$Data.editVisible" v-model="$Data.editVisible" :action-type="$Data.actionType" :row-data="$Data.rowData" :type-list="$Data.typeList" @success="$Method.apiDictList" />
-    </div>
+        <template #dialogs="scope">
+            <EditDialog v-if="$Data.editVisible" v-model="$Data.editVisible" :action-type="$Data.actionType" :row-data="$Data.rowData" :type-list="$Data.typeList" @success="onDialogSuccess(scope.reload)" />
+        </template>
+    </PagedTableDetail>
 </template>
 
 <script setup lang="ts">
 import { onMounted } from "vue";
 
-import { Button as TButton, Table as TTable, Input as TInput, Select as TSelect, Option as TOption, 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, Input as TInput, Option as TOption, Select as TSelect, MessagePlugin } from "tdesign-vue-next";
 import ILucidePlus from "~icons/lucide/plus";
 import ILucideRotateCw from "~icons/lucide/rotate-cw";
 import ILucideSearch from "~icons/lucide/search";
@@ -81,16 +60,12 @@ 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 PagedTableDetail from "@/components/pagedTableDetail.vue";
 import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 const $Data = $ref({
-    tableData: [],
     typeList: [],
-    loading: false,
-    activeRowKeys: [],
-    currentRow: null,
     searchTypeCode: "",
     searchKeyword: "",
     columns: withDefaultColumns([
@@ -102,154 +77,100 @@ const $Data = $ref({
         { colKey: "remark", title: "备注" },
         { colKey: "operation", title: "操作" }
     ]),
-    pagerConfig: {
-        currentPage: 1,
-        limit: 30,
-        total: 0,
-        align: "right",
-        layout: "total, prev, pager, next, jumper"
+    endpoints: {
+        list: {
+            path: "/addon/admin/dict/list",
+            dropValues: [""],
+            buildData: () => {
+                return {
+                    typeCode: $Data.searchTypeCode,
+                    keyword: $Data.searchKeyword
+                };
+            }
+        },
+        delete: {
+            path: "/addon/admin/dict/del",
+            idKey: "id",
+            confirm: (row) => {
+                return {
+                    header: "确认删除",
+                    body: `确认删除字典项“${row.label}”吗？`,
+                    confirmBtn: "删除",
+                    status: "warning"
+                };
+            }
+        }
     },
     editVisible: false,
     actionType: "add",
     rowData: {}
 });
 
-const $Method = {
-    async initData() {
-        await $Method.apiDictTypeAll();
-        await $Method.apiDictList();
-    },
-    async apiDictTypeAll() {
-        try {
-            const res = await $Http.post(
-                "/addon/admin/dictType/all",
-                {},
-                {
-                    dropValues: [""]
-                }
-            );
-            $Data.typeList = res.data.lists || [];
-        } catch (error) {
-            MessagePlugin.error("加载数据失败");
-        }
-    },
-    async apiDictList() {
-        $Data.loading = true;
-        try {
-            const res = await $Http.post(
-                "/addon/admin/dict/list",
-                {
-                    page: $Data.pagerConfig.currentPage,
-                    limit: $Data.pagerConfig.limit,
-                    typeCode: $Data.searchTypeCode,
-                    keyword: $Data.searchKeyword
-                },
-                {
-                    dropValues: [""]
-                }
-            );
-            $Data.tableData = res.data.lists || [];
-            $Data.pagerConfig.total = res.data.total || 0;
+function onAdd(): void {
+    onAction("add", {});
+}
 
-            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;
-        }
-    },
-    async apiDictDel(row) {
-        let dialog = null;
-        let destroyed = false;
+function onDialogSuccess(reload: (options: { keepSelection?: boolean }) => void): void {
+    reload({ keepSelection: true });
+}
+
+async function initData(): Promise<void> {
+    await apiDictTypeAll();
+}
 
-        const destroy = () => {
-            if (destroyed) return;
-            destroyed = true;
-            if (dialog && typeof dialog.destroy === "function") {
-                dialog.destroy();
+async function apiDictTypeAll(): Promise<void> {
+    try {
+        const res = await $Http.post(
+            "/addon/admin/dictType/all",
+            {},
+            {
+                dropValues: [""]
             }
-        };
+        );
+        $Data.typeList = res.data.lists || [];
+    } catch (error) {
+        MessagePlugin.error("加载数据失败");
+    }
+}
 
-        dialog = DialogPlugin.confirm({
-            header: "确认删除",
-            body: `确认删除字典项“${row.label}”吗？`,
-            status: "warning",
-            confirmBtn: "删除",
-            cancelBtn: "取消",
-            onConfirm: async () => {
-                if (dialog && typeof dialog.setConfirmLoading === "function") {
-                    dialog.setConfirmLoading(true);
-                }
+function handleSearch(reload: (options: { keepSelection?: boolean; resetPage?: boolean }) => void): void {
+    reload({ keepSelection: false, resetPage: true });
+}
 
-                try {
-                    await $Http.post("/addon/admin/dict/del", {
-                        id: row.id
-                    });
-                    MessagePlugin.success("删除成功");
-                    destroy();
-                    await $Method.apiDictList();
-                } catch (error) {
-                    MessagePlugin.error("删除失败");
-                } finally {
-                    if (dialog && typeof dialog.setConfirmLoading === "function") {
-                        dialog.setConfirmLoading(false);
-                    }
-                }
-            },
-            onClose: () => {
-                destroy();
-            }
-        });
-    },
-    handleSearch() {
-        $Data.pagerConfig.currentPage = 1;
-        $Method.apiDictList();
-    },
-    handleRefresh() {
-        $Data.searchTypeCode = "";
-        $Data.searchKeyword = "";
-        $Data.pagerConfig.currentPage = 1;
-        $Method.apiDictList();
-    },
-    onPageChange({ currentPage }) {
-        $Data.pagerConfig.currentPage = currentPage;
-        $Method.apiDictList();
-    },
-    handleSizeChange({ pageSize }) {
-        $Data.pagerConfig.limit = pageSize;
-        $Data.pagerConfig.currentPage = 1;
-        $Method.apiDictList();
-    },
-    onActiveChange(value, context) {
-        if (value.length === 0 && $Data.activeRowKeys.length > 0) {
-            return;
-        }
-        $Data.activeRowKeys = value;
-        $Data.currentRow = context.currentRowData;
-    },
-    onAction(type, row) {
-        if (type === "add") {
-            $Data.actionType = "add";
-            $Data.rowData = {};
-            $Data.editVisible = true;
-        } else if (type === "upd") {
-            $Data.actionType = "upd";
-            $Data.rowData = { ...row };
-            $Data.editVisible = true;
-        } else if (type === "del") {
-            $Method.apiDictDel(row);
-        }
+function handleRefresh(reload: (options: { keepSelection?: boolean; resetPage?: boolean }) => void): void {
+    $Data.searchTypeCode = "";
+    $Data.searchKeyword = "";
+    reload({ keepSelection: false, resetPage: true });
+}
+
+function onAction(type: string, row: Record<string, unknown>): void {
+    if (type === "add") {
+        $Data.actionType = "add";
+        $Data.rowData = {};
+        $Data.editVisible = true;
+        return;
+    }
+
+    if (type === "upd") {
+        $Data.actionType = "upd";
+        $Data.rowData = Object.assign({}, row);
+        $Data.editVisible = true;
     }
-};
+}
+
+function onDropdownAction(data: unknown, row: Record<string, unknown>, deleteRow: (r: 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(row);
+        return;
+    }
+    onAction(cmd, row);
+}
 
 onMounted(() => {
-    $Method.initData();
+    initData();
 });
 </script>
 

package/adminViews/config/dictType/components/edit.vue

@@ -1,6 +1,6 @@
 <template>
-    <TDialog v-model:visible="visible" :header="actionType === 'add' ? '添加字典类型' : '编辑字典类型'" width="600px" @confirm="$Method.handleSubmit" @close="$Method.handleClose">
-        <TForm ref="formRef" :data="$Data.formData" :rules="$Data.rules" label-width="100px">
+    <PageDialog v-model="visible" :title="actionType === 'add' ? '添加字典类型' : '编辑字典类型'" @confirm="handleSubmit">
+        <TForm :data="$Data.formData" :rules="$Data.rules" label-width="100px" :ref="(el) => ($From.form = el)">
             <TFormItem label="类型代码" name="code">
                 <TInput v-model="$Data.formData.code" placeholder="请输入类型代码（英文/数字/下划线）" :disabled="actionType === 'upd'" />
             </TFormItem>
@@ -14,13 +14,14 @@
                 <TInputNumber v-model="$Data.formData.sort" :min="0" placeholder="请输入排序值" />
             </TFormItem>
         </TForm>
-    </TDialog>
+    </PageDialog>
 </template>
 
 <script setup lang="ts">
 import { computed } from "vue";
 
-import { Dialog as TDialog, Form as TForm, FormItem as TFormItem, Input as TInput, Textarea as TTextarea, InputNumber as TInputNumber, MessagePlugin } from "tdesign-vue-next";
+import { Form as TForm, FormItem as TFormItem, Input as TInput, Textarea as TTextarea, InputNumber as TInputNumber, MessagePlugin } from "tdesign-vue-next";
+import PageDialog from "@/components/pageDialog.vue";
 import { $Http } from "@/plugins/http";
 
 const props = defineProps({
@@ -29,14 +30,19 @@ const props = defineProps({
     rowData: Object
 });
 
-const emit = defineEmits(["update:modelValue", "success"]);
+const $Emit = defineEmits<{
+    (e: "update:modelValue", value: boolean): void;
+    (e: "success"): void;
+}>();
 
 const visible = computed({
     get: () => props.modelValue,
-    set: (val) => emit("update:modelValue", val)
+    set: (val) => $Emit("update:modelValue", val)
 });
 
-const formRef = $ref(null);
+const $From = $shallowRef({
+    form: null
+});
 
 const $Data = $ref({
     formData: {
@@ -51,39 +57,35 @@ const $Data = $ref({
     }
 });
 
-const $Method = {
-    async handleSubmit() {
-        const valid = await formRef.validate();
-        if (!valid) return;
+async function handleSubmit(): Promise<void> {
+    const valid = await $From.form.validate();
+    if (valid !== true) return;
 
-        try {
-            const apiUrl = props.actionType === "add" ? "/addon/admin/dictType/ins" : "/addon/admin/dictType/upd";
-            const params = {
-                code: $Data.formData.code,
-                name: $Data.formData.name,
-                description: $Data.formData.description,
-                sort: $Data.formData.sort
-            };
-            if (props.actionType === "upd") {
-                params.id = props.rowData.id;
-            }
+    try {
+        const apiUrl = props.actionType === "add" ? "/addon/admin/dictType/ins" : "/addon/admin/dictType/upd";
+        const params: Record<string, unknown> = {
+            code: $Data.formData.code,
+            name: $Data.formData.name,
+            description: $Data.formData.description,
+            sort: $Data.formData.sort
+        };
+        if (props.actionType === "upd" && props.rowData) {
+            const row = props.rowData as Record<string, unknown>;
+            params["id"] = row["id"];
+        }
 
-            const res = await $Http.post(apiUrl, params);
-            if (res.code === 0) {
-                MessagePlugin.success(props.actionType === "add" ? "添加成功" : "更新成功");
-                visible.value = false;
-                emit("success");
-            } else {
-                MessagePlugin.error(res.msg || "操作失败");
-            }
-        } catch (error) {
-            MessagePlugin.error("操作失败");
+        const res = await $Http.post(apiUrl, params);
+        if (res.code === 0) {
+            MessagePlugin.success(props.actionType === "add" ? "添加成功" : "更新成功");
+            visible.value = false;
+            $Emit("success");
+        } else {
+            MessagePlugin.error(res.msg || "操作失败");
         }
-    },
-    handleClose() {
-        visible.value = false;
+    } catch (error) {
+        MessagePlugin.error("操作失败");
     }
-};
+}
 
 // 该组件由父组件 v-if 控制挂载/卸载，因此无需 watch：创建时初始化一次即可
 if (props.actionType === "upd" && props.rowData) {