@befly-addon/admin 1.8.4 → 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,5 +1,5 @@
 <template>
-    <TDialog v-model:visible="visible" :header="actionType === 'add' ? '添加字典项' : '编辑字典项'" width="600px" @confirm="$Method.handleSubmit" @close="$Method.handleClose">
+    <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>
@@ -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({
@@ -64,39 +65,35 @@ const $Data = $ref({
     }
 });
 
-const $Method = {
-    async handleSubmit() {
-        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 = {
-                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,7 +1,7 @@
 <template>
-    <PagedTableDetailPage class="page-dict page-table" :columns="$Data.columns" :endpoints="$Data.endpoints">
+    <PagedTableDetail class="page-dict page-table" :columns="$Data.columns" :endpoints="$Data.endpoints">
         <template #toolLeft>
-            <TButton theme="primary" @click="$Method.onAdd">
+            <TButton theme="primary" @click="onAdd">
                 <template #icon>
                     <ILucidePlus />
                 </template>
@@ -9,15 +9,15 @@
         </template>
 
         <template #toolRight="scope">
-            <TSelect v-model="$Data.searchTypeCode" placeholder="请选择字典类型" clearable filterable @change="$Method.handleSearch(scope.reload)">
+            <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="$Method.handleSearch(scope.reload)" @clear="$Method.handleSearch(scope.reload)">
+            <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="$Method.handleRefresh(scope.reload)">
+            <TButton shape="circle" @click="handleRefresh(scope.reload)">
                 <template #icon>
                     <ILucideRotateCw />
                 </template>
@@ -25,7 +25,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>
@@ -44,9 +44,9 @@
         </template>
 
         <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="$Method.onDialogSuccess(scope.reload)" />
+            <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>
-    </PagedTableDetailPage>
+    </PagedTableDetail>
 </template>
 
 <script setup lang="ts">
@@ -61,7 +61,7 @@ import ILucideTrash2 from "~icons/lucide/trash-2";
 import ILucideChevronDown from "~icons/lucide/chevron-down";
 import EditDialog from "./components/edit.vue";
 import { $Http } from "@/plugins/http";
-import PagedTableDetailPage from "@/components/PagedTableDetailPage.vue";
+import PagedTableDetail from "@/components/pagedTableDetail.vue";
 import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 const $Data = $ref({
@@ -106,70 +106,71 @@ const $Data = $ref({
     rowData: {}
 });
 
-const $Method = {
-    onAdd() {
-        $Method.onAction("add", {});
-    },
+function onAdd(): void {
+    onAction("add", {});
+}
 
-    onDialogSuccess(reload) {
-        reload({ keepSelection: true });
-    },
+function onDialogSuccess(reload: (options: { keepSelection?: boolean }) => void): void {
+    reload({ keepSelection: true });
+}
 
-    async initData() {
-        await $Method.apiDictTypeAll();
-    },
-    async apiDictTypeAll() {
-        try {
-            const res = await $Http.post(
-                "/addon/admin/dictType/all",
-                {},
-                {
-                    dropValues: [""]
-                }
-            );
-            $Data.typeList = res.data.lists || [];
-        } catch (error) {
-            MessagePlugin.error("加载数据失败");
-        }
-    },
+async function initData(): Promise<void> {
+    await apiDictTypeAll();
+}
 
-    handleSearch(reload) {
-        reload({ keepSelection: false, resetPage: true });
-    },
+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("加载数据失败");
+    }
+}
 
-    handleRefresh(reload) {
-        $Data.searchTypeCode = "";
-        $Data.searchKeyword = "";
-        reload({ keepSelection: false, resetPage: true });
-    },
+function handleSearch(reload: (options: { keepSelection?: boolean; resetPage?: boolean }) => void): void {
+    reload({ keepSelection: false, resetPage: true });
+}
 
-    onAction(type, row) {
-        if (type === "add") {
-            $Data.actionType = "add";
-            $Data.rowData = {};
-            $Data.editVisible = true;
-            return;
-        }
+function handleRefresh(reload: (options: { keepSelection?: boolean; resetPage?: boolean }) => void): void {
+    $Data.searchTypeCode = "";
+    $Data.searchKeyword = "";
+    reload({ keepSelection: false, resetPage: true });
+}
 
-        if (type === "upd") {
-            $Data.actionType = "upd";
-            $Data.rowData = Object.assign({}, row);
-            $Data.editVisible = true;
-        }
-    },
+function onAction(type: string, row: Record<string, unknown>): void {
+    if (type === "add") {
+        $Data.actionType = "add";
+        $Data.rowData = {};
+        $Data.editVisible = true;
+        return;
+    }
 
-    onDropdownAction(data, row, deleteRow) {
-        const cmd = data && data.value ? String(data.value) : "";
-        if (cmd === "del") {
-            deleteRow(row);
-            return;
-        }
-        $Method.onAction(cmd, row);
+    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,5 +1,5 @@
 <template>
-    <TDialog v-model:visible="visible" :header="actionType === 'add' ? '添加字典类型' : '编辑字典类型'" width="600px" @confirm="$Method.handleSubmit" @close="$Method.handleClose">
+    <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'" />
@@ -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({
@@ -56,39 +57,35 @@ const $Data = $ref({
     }
 });
 
-const $Method = {
-    async handleSubmit() {
-        const valid = await $From.form.validate();
-        if (valid !== true) 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) {

package/adminViews/config/dictType/index.vue

@@ -1,7 +1,7 @@
 <template>
-    <PagedTableDetailPage class="page-dict-type page-table" :columns="$Data.columns" :endpoints="$Data.endpoints">
+    <PagedTableDetail class="page-dict-type page-table" :columns="$Data.columns" :endpoints="$Data.endpoints">
         <template #toolLeft>
-            <TButton theme="primary" @click="$Method.onAdd">
+            <TButton theme="primary" @click="onAdd">
                 <template #icon>
                     <ILucidePlus />
                 </template>
@@ -9,12 +9,12 @@
         </template>
 
         <template #toolRight="scope">
-            <TInput v-model="$Data.searchKeyword" placeholder="搜索类型名称" clearable @enter="$Method.handleSearch(scope.reload)" @clear="$Method.handleSearch(scope.reload)">
+            <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="$Method.handleRefresh(scope.reload)">
+            <TButton shape="circle" @click="handleRefresh(scope.reload)">
                 <template #icon>
                     <ILucideRotateCw />
                 </template>
@@ -22,7 +22,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>
@@ -41,9 +41,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";
 
 const $Data = $ref({
@@ -98,48 +98,48 @@ const $Data = $ref({
     rowData: {}
 });
 
-const $Method = {
-    onAdd() {
-        $Method.onAction("add", {});
-    },
+function onAdd(): void {
+    onAction("add", {});
+}
 
-    onDialogSuccess(reload) {
-        reload({ keepSelection: true });
-    },
+function onDialogSuccess(reload: (options: { keepSelection?: boolean }) => void): void {
+    reload({ keepSelection: true });
+}
 
-    handleSearch(reload) {
-        reload({ keepSelection: false, resetPage: true });
-    },
+function handleSearch(reload: (options: { keepSelection?: boolean; resetPage?: boolean }) => void): void {
+    reload({ keepSelection: false, resetPage: true });
+}
 
-    handleRefresh(reload) {
-        $Data.searchKeyword = "";
-        reload({ keepSelection: false, resetPage: true });
-    },
+function handleRefresh(reload: (options: { keepSelection?: boolean; resetPage?: boolean }) => void): void {
+    $Data.searchKeyword = "";
+    reload({ keepSelection: false, resetPage: true });
+}
 
-    onAction(type, row) {
-        if (type === "add") {
-            $Data.actionType = "add";
-            $Data.rowData = {};
-            $Data.editVisible = true;
-            return;
-        }
+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;
-        }
-    },
+    if (type === "upd") {
+        $Data.actionType = "upd";
+        $Data.rowData = Object.assign({}, row);
+        $Data.editVisible = true;
+    }
+}
 
-    onDropdownAction(data, row, deleteRow) {
-        const cmd = data && data.value ? String(data.value) : "";
-        if (cmd === "del") {
-            deleteRow(row);
-            return;
-        }
-        $Method.onAction(cmd, row);
+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);
+}
 </script>
 
 <style scoped lang="scss">