befly-admin-ui 1.10.8 → 1.10.10

package/components/detailPanel.vue

@@ -31,8 +31,9 @@
 </template>
 
 <script setup>
-import { computed, reactive } from "vue";
 import { Tag as TTag } from "tdesign-vue-next";
+import { computed, reactive } from "vue";
+
 import { formatFieldValue } from "../utils/formatFieldValue.js";
 
 const $Prop = defineProps({
@@ -68,7 +69,7 @@ const $Prop = defineProps({
 });
 
 const $Method = {
-    buildNormalizedFields() {
+    buildNormalizedFields: function () {
         const row = $Prop.data && typeof $Prop.data === "object" ? $Prop.data : null;
         const dataId = row && Object.hasOwn(row, "id") ? row.id : undefined;
 

package/components/pageDialog.vue

@@ -28,9 +28,8 @@
 </template>
 
 <script setup>
-import { onBeforeUnmount, onMounted, reactive, watch } from "vue";
-
 import { Button as TButton, Dialog as TDialog } from "tdesign-vue-next";
+import { onBeforeUnmount, onMounted, reactive, watch } from "vue";
 
 defineOptions({
     inheritAttrs: false
@@ -80,16 +79,16 @@ const $Data = reactive({
 });
 
 const $Method = {
-    clearTimer(timer) {
+    clearTimer: function (timer) {
         if (timer) {
             clearTimeout(timer);
         }
         return null;
     },
-    open() {
+    open: function () {
         $Emit("update:modelValue", true);
     },
-    close() {
+    close: function () {
         $From.openDelayTimer = $Method.clearTimer($From.openDelayTimer);
         $From.closeDelayTimer = $Method.clearTimer($From.closeDelayTimer);
 
@@ -100,14 +99,14 @@ const $Method = {
             $From.closeDelayTimer = null;
         }, $Const.closeDelay);
     },
-    toggle() {
+    toggle: function () {
         if ($Data.innerVisible) {
             $Method.close();
             return;
         }
         $Method.open();
     },
-    createEventContext(trigger) {
+    createEventContext: function (trigger) {
         return {
             trigger: trigger,
             visible: $Data.innerVisible,
@@ -117,7 +116,7 @@ const $Method = {
             getVisible: () => $Data.innerVisible
         };
     },
-    applyModelValue(value) {
+    applyModelValue: function (value) {
         if (value) {
             // 关键点：先渲染为 false，再延迟 true，保证 v-if + 初次 visible=true 时也能触发进入动画
             $From.openDelayTimer = $Method.clearTimer($From.openDelayTimer);
@@ -132,7 +131,7 @@ const $Method = {
         $From.openDelayTimer = $Method.clearTimer($From.openDelayTimer);
         $Data.innerVisible = false;
     },
-    closeByTrigger(trigger) {
+    closeByTrigger: function (trigger) {
         // 固定交互：confirm 不自动关闭（等待异步提交成功后由调用侧 context.close() 决定关闭）
         if (trigger === "confirm") {
             return;
@@ -140,32 +139,32 @@ const $Method = {
         // cancel/close 自动关闭
         $Method.close();
     },
-    onDialogClose() {
+    onDialogClose: function () {
         const context = $Method.createEventContext("close");
         $Method.closeByTrigger("close");
         $Emit("close", context);
     },
-    onDialogConfirm() {
+    onDialogConfirm: function () {
         const context = $Method.createEventContext("confirm");
         $Emit("confirm", context);
         $Method.closeByTrigger("confirm");
     },
-    onDialogCancel() {
+    onDialogCancel: function () {
         const context = $Method.createEventContext("cancel");
         $Emit("cancel", context);
         $Method.closeByTrigger("cancel");
     },
-    onFooterConfirm() {
+    onFooterConfirm: function () {
         const context = $Method.createEventContext("confirm");
         $Emit("confirm", context);
         $Method.closeByTrigger("confirm");
     },
-    onFooterClose() {
+    onFooterClose: function () {
         const context = $Method.createEventContext("cancel");
         $Emit("cancel", context);
         $Method.closeByTrigger("cancel");
     },
-    getVisible() {
+    getVisible: function () {
         return $Data.innerVisible;
     }
 };

package/components/pageTableDetail.vue

@@ -41,11 +41,13 @@
 </template>
 
 <script setup>
-import { computed, onMounted, reactive, useSlots } from "vue";
 import { DialogPlugin, MessagePlugin, Pagination as TPagination, Table as TTable } from "tdesign-vue-next";
-import DetailPanel from "./detailPanel.vue";
+import { computed, onMounted, reactive, useSlots } from "vue";
+
 import { $Http } from "@/plugins/http.js";
+
 import { formatFieldValue } from "../utils/formatFieldValue.js";
+import DetailPanel from "./detailPanel.vue";
 
 const $Prop = defineProps({
     columns: {
@@ -110,14 +112,14 @@ const $Data = reactive({
 });
 
 const $Method = {
-    getColKey(col) {
+    getColKey: function (col) {
         const record = col;
         const rawColKey = record["colKey"];
         if (typeof rawColKey === "string") return rawColKey;
         if (typeof rawColKey === "number") return String(rawColKey);
         return "";
     },
-    filterValidColumns(input) {
+    filterValidColumns: function (input) {
         if (!Array.isArray(input)) {
             return [];
         }
@@ -137,7 +139,7 @@ const $Method = {
 
         return out;
     },
-    mergeDetailColumns(mainColumns, extraColumns) {
+    mergeDetailColumns: function (mainColumns, extraColumns) {
         const out = [];
         const set = new Set();
 
@@ -162,17 +164,17 @@ const $Method = {
 
         return out;
     },
-    formatTableCell(row, colKey) {
+    formatTableCell: function (row, colKey) {
         const record = row && typeof row === "object" ? row : {};
         const value = record[colKey];
         const field = $Computed.columnsMeta.tableColumnMap[colKey] || {};
         return formatFieldValue(value, field);
     },
-    setCurrentRow(row) {
+    setCurrentRow: function (row) {
         $Data.currentRow = row;
         $Emit("row-change", { row: row });
     },
-    getRowKeyValue(row) {
+    getRowKeyValue: function (row) {
         const key = $Prop.rowKey;
         if (!key) return null;
 
@@ -182,7 +184,7 @@ const $Method = {
         if (typeof raw === "number") return raw;
         return null;
     },
-    applyAutoSelection(list, preferKey) {
+    applyAutoSelection: function (list, preferKey) {
         if (!Array.isArray(list) || list.length === 0) {
             $Method.setCurrentRow(null);
             $Data.activeRowKeys = [];
@@ -211,14 +213,14 @@ const $Method = {
 
         $Data.activeRowKeys = [firstKey];
     },
-    getLastPage(total, limit) {
+    getLastPage: function (total, limit) {
         if (total <= 0) return 1;
         if (limit <= 0) return 1;
         const pages = Math.ceil(total / limit);
         if (!Number.isFinite(pages) || pages <= 0) return 1;
         return pages;
     },
-    async loadList(options) {
+    loadList: async function (options) {
         const listEndpoint = $Prop.endpoints?.list;
         if (!listEndpoint) {
             return;
@@ -288,7 +290,7 @@ const $Method = {
             }
         }
     },
-    async reload(options) {
+    reload: async function (options) {
         if (options?.resetPage) {
             $Data.pager.currentPage = 1;
         }
@@ -297,16 +299,16 @@ const $Method = {
             allowPageFallback: true
         });
     },
-    onPageChange(info) {
+    onPageChange: function (info) {
         $Data.pager.currentPage = info.currentPage;
         $Method.reload({ keepSelection: true });
     },
-    onPageSizeChange(info) {
+    onPageSizeChange: function (info) {
         $Data.pager.limit = info.pageSize;
         $Data.pager.currentPage = 1;
         $Method.reload({ keepSelection: false });
     },
-    onActiveChange(value, context) {
+    onActiveChange: function (value, context) {
         if (value.length === 0) {
             if ($Data.activeRowKeys.length > 0) {
                 return;
@@ -335,7 +337,7 @@ const $Method = {
             }
         }
     },
-    getDeleteConfirmContent(ep, row) {
+    getDeleteConfirmContent: function (ep, row) {
         const confirm = ep.confirm;
         if (!confirm) {
             return {
@@ -351,7 +353,7 @@ const $Method = {
 
         return confirm;
     },
-    async deleteRow(row) {
+    deleteRow: async function (row) {
         const ep = $Prop.endpoints?.delete;
         if (!ep) {
             MessagePlugin.error("未配置删除接口");
@@ -423,7 +425,7 @@ const $Method = {
             }
         });
     },
-    buildOperationSlotProps(scope) {
+    buildOperationSlotProps: function (scope) {
         const out = {};
 
         for (const key of Object.keys(scope)) {

package/layouts/default.vue

@@ -98,23 +98,23 @@
 </template>
 
 <script setup>
-import { arrayToTree } from "befly-admin-ui/utils/arrayToTree";
 import PageDialog from "befly-admin-ui/components/pageDialog.vue";
+import { arrayToTree } from "befly-admin-ui/utils/arrayToTree";
 import { hashPassword } from "befly-admin-ui/utils/hashPassword";
-import { DialogPlugin, Dropdown as TDropdown, DropdownItem as TDropdownItem, DropdownMenu as TDropdownMenu, Form as TForm, FormItem as TFormItem, Input as TInput, Menu as TMenu, MenuItem as TMenuItem, MessagePlugin, Submenu as TSubmenu } from "tdesign-vue-next";
 import { AppIcon, ChevronDownIcon, CloseCircleIcon, ControlPlatformIcon, HomeIcon, LockOnIcon, UserIcon } from "tdesign-icons-vue-next";
-
+import { DialogPlugin, Dropdown as TDropdown, DropdownItem as TDropdownItem, DropdownMenu as TDropdownMenu, Form as TForm, FormItem as TFormItem, Input as TInput, Menu as TMenu, MenuItem as TMenuItem, MessagePlugin, Submenu as TSubmenu } from "tdesign-vue-next";
 import { reactive, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
-import { $Http } from "@/plugins/http.js";
+
 import { $Config } from "@/plugins/config.js";
+import { $Http } from "@/plugins/http.js";
 import { $Store } from "@/plugins/store.js";
 
 const router = useRouter();
 const route = useRoute();
 
 const $Const = {
-    createPasswordForm() {
+    createPasswordForm: function () {
         return {
             password: "",
             confirmPassword: ""
@@ -152,10 +152,10 @@ const $Data = reactive({
 });
 
 const $Method = {
-    isString(value) {
+    isString: function (value) {
         return typeof value === "string";
     },
-    normalizePath(path) {
+    normalizePath: function (path) {
         if (!$Method.isString(path)) {
             return path;
         }
@@ -163,7 +163,7 @@ const $Method = {
         const normalized = path.replace(/\/+$/, "");
         return normalized.length === 0 ? "/" : normalized;
     },
-    normalizeParentPath(parentPath) {
+    normalizeParentPath: function (parentPath) {
         if (!$Method.isString(parentPath)) {
             return "";
         }
@@ -175,14 +175,14 @@ const $Method = {
 
         return normalized;
     },
-    normalizeAvatarUrl(value) {
+    normalizeAvatarUrl: function (value) {
         if (!$Method.isString(value) || value.length === 0) {
             return "";
         }
 
         return value;
     },
-    async fetchUserInfo() {
+    fetchUserInfo: async function () {
         try {
             const res = await $Http("/core/admin/detail", {}, [""]);
             const userInfo = res?.data && typeof res.data === "object" ? res.data : {};
@@ -196,7 +196,7 @@ const $Method = {
             MessagePlugin.error(error.msg || error.message || "获取管理员信息失败");
         }
     },
-    async fetchUserMenus() {
+    fetchUserMenus: async function () {
         try {
             const { data } = await $Http("/core/menu/all");
             const lists = Array.isArray(data?.lists) ? data.lists : [];
@@ -216,7 +216,7 @@ const $Method = {
             MessagePlugin.error(error.msg || error.message || "获取用户菜单失败");
         }
     },
-    setActiveMenu() {
+    setActiveMenu: function () {
         const currentPath = route.path;
         const normalizedCurrentPath = $Method.normalizePath(currentPath);
 
@@ -251,12 +251,12 @@ const $Method = {
         $Data.expandedKeys = expandedKeys;
         $Data.currentMenuKey = currentPath;
     },
-    onMenuClick(path) {
+    onMenuClick: function (path) {
         if ($Method.isString(path) && path.startsWith("/")) {
             router.push(path);
         }
     },
-    async handleLogout() {
+    handleLogout: async function () {
         let dialog = null;
         let destroyed = false;
 
@@ -296,11 +296,11 @@ const $Method = {
             }
         });
     },
-    openPasswordDialog() {
+    openPasswordDialog: function () {
         $Data.passwordForm = $Const.createPasswordForm();
         $Data.passwordDialogVisible = true;
     },
-    onUserDropdownAction(data) {
+    onUserDropdownAction: function (data) {
         const record = data;
         const rawValue = record && record["value"] ? record["value"] : "";
         const cmd = rawValue ? String(rawValue) : "";
@@ -314,7 +314,7 @@ const $Method = {
             $Method.handleLogout();
         }
     },
-    async onPasswordSubmit(context) {
+    onPasswordSubmit: async function (context) {
         const form = $From.passwordFormRef;
         if (form === null) {
             MessagePlugin.warning("表单未就绪");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly-admin-ui",
-    "version": "1.10.8",
+    "version": "1.10.10",
     "gitHead": "071d17be177355cdd61f30659c6e4c5873f87d39",
     "private": false,
     "description": "Befly - 管理后台功能组件",
@@ -42,8 +42,8 @@
         "registry": "https://registry.npmjs.org"
     },
     "scripts": {
-        "dev": "vite",
         "build": "vite build",
+        "dev": "vite",
         "preview": "vite preview"
     },
     "dependencies": {

package/utils/arrayToTree.js

@@ -6,6 +6,16 @@
  * - 内部会 clone 一份节点对象，并写入 children: []
  * - 默认自带递归排序：按 sort 升序；sort 缺省/非法或 < 1 视为 999999；sort 相同按 id 自然序
  */
+function normalizeTreeKey(value) {
+    if (typeof value === "string") {
+        return value;
+    }
+    if (typeof value === "number" && Number.isFinite(value)) {
+        return String(value);
+    }
+    return "";
+}
+
 export function arrayToTree(items, id = "id", pid = "pid", children = "children", sort = "sort") {
     const idKey = typeof id === "string" && id.length > 0 ? id : "id";
     const pidKey = typeof pid === "string" && pid.length > 0 ? pid : "pid";
@@ -14,21 +24,12 @@ export function arrayToTree(items, id = "id", pid = "pid", children = "children"
     const map = new Map();
     const flat = [];
     const safeItems = Array.isArray(items) ? items : [];
-    const normalizeKey = (value) => {
-        if (typeof value === "string") {
-            return value;
-        }
-        if (typeof value === "number" && Number.isFinite(value)) {
-            return String(value);
-        }
-        return "";
-    };
     for (const item of safeItems) {
         const itemObj = typeof item === "object" && item !== null ? item : null;
         const rawId = itemObj ? itemObj[idKey] : undefined;
         const rawPid = itemObj ? itemObj[pidKey] : undefined;
-        const normalizedId = normalizeKey(rawId);
-        const normalizedPid = normalizeKey(rawPid);
+        const normalizedId = normalizeTreeKey(rawId);
+        const normalizedPid = normalizeTreeKey(rawPid);
         const nextNode = Object.assign({}, item);
         const nextNodeObj = nextNode;
         nextNodeObj[idKey] = normalizedId;
@@ -42,8 +43,8 @@ export function arrayToTree(items, id = "id", pid = "pid", children = "children"
     const tree = [];
     for (const node of flat) {
         const nodeObj = node;
-        const selfId = normalizeKey(nodeObj[idKey]);
-        const parentId = normalizeKey(nodeObj[pidKey]);
+        const selfId = normalizeTreeKey(nodeObj[idKey]);
+        const parentId = normalizeTreeKey(nodeObj[pidKey]);
         if (parentId.length > 0 && parentId !== selfId) {
             const parent = map.get(parentId);
             if (parent) {

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

@@ -32,10 +32,10 @@
 </template>
 
 <script setup>
+import PageDialog from "befly-admin-ui/components/pageDialog.vue";
+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 { computed, reactive } from "vue";
 
-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 "befly-admin-ui/components/pageDialog.vue";
 import { $Http } from "@/plugins/http.js";
 
 const $Prop = defineProps({
@@ -48,7 +48,7 @@ const $Prop = defineProps({
 const $Emit = defineEmits(["update:modelValue", "success"]);
 
 const $Const = {
-    createDefaultFormData() {
+    createDefaultFormData: function () {
         return {
             typeCode: "",
             key: "",
@@ -81,10 +81,10 @@ const $Computed = reactive({
 });
 
 const $Method = {
-    resetFormData() {
+    resetFormData: function () {
         Object.assign($Data.formData, $Const.createDefaultFormData());
     },
-    initData() {
+    initData: function () {
         if ($Prop.actionType === "upd" && $Prop.rowData) {
             $Data.formData.typeCode = $Prop.rowData.typeCode || "";
             $Data.formData.key = $Prop.rowData.key || "";
@@ -96,7 +96,7 @@ const $Method = {
 
         $Method.resetFormData();
     },
-    async handleSubmit() {
+    handleSubmit: async function () {
         try {
             const form = $From.formRef;
             if (!form) {

package/views/config/dict/index.vue

@@ -45,14 +45,15 @@
 </template>
 
 <script setup>
+import PageTableDetail from "befly-admin-ui/components/pageTableDetail.vue";
+import { withDefaultColumns } from "befly-admin-ui/utils/withDefaultColumns";
+import { AddIcon, ChevronDownIcon, DeleteIcon, EditIcon, SearchIcon } from "tdesign-icons-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 { onMounted, reactive } from "vue";
 
-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 { AddIcon, ChevronDownIcon, DeleteIcon, EditIcon, SearchIcon } from "tdesign-icons-vue-next";
-import EditDialog from "./components/edit.vue";
 import { $Http } from "@/plugins/http.js";
-import PageTableDetail from "befly-admin-ui/components/pageTableDetail.vue";
-import { withDefaultColumns } from "befly-admin-ui/utils/withDefaultColumns";
+
+import EditDialog from "./components/edit.vue";
 
 const $Data = reactive({
     typeList: [],
@@ -97,16 +98,16 @@ const $Data = reactive({
 });
 
 const $Method = {
-    onAdd() {
+    onAdd: function () {
         $Method.onAction("add", {});
     },
-    onDialogSuccess(reload) {
+    onDialogSuccess: function (reload) {
         reload({ keepSelection: true });
     },
-    async initData() {
+    initData: async function () {
         await $Method.apiDictTypeAll();
     },
-    async apiDictTypeAll() {
+    apiDictTypeAll: async function () {
         try {
             const res = await $Http("/core/dictType/all", {}, [""]);
             $Data.typeList = res.data.lists || [];
@@ -114,10 +115,10 @@ const $Method = {
             MessagePlugin.error(error.msg || error.message || "加载数据失败");
         }
     },
-    handleSearch(reload) {
+    handleSearch: function (reload) {
         reload({ keepSelection: false, resetPage: true });
     },
-    onAction(type, row) {
+    onAction: function (type, row) {
         if (type === "add") {
             $Data.actionType = "add";
             $Data.rowData = {};
@@ -131,7 +132,7 @@ const $Method = {
             $Data.editVisible = true;
         }
     },
-    onDropdownAction(data, row, deleteRow) {
+    onDropdownAction: function (data, row, deleteRow) {
         const record = data;
         const rawValue = record && record["value"] ? record["value"] : "";
         const cmd = rawValue ? String(rawValue) : "";

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

@@ -27,10 +27,10 @@
 </template>
 
 <script setup>
+import PageDialog from "befly-admin-ui/components/pageDialog.vue";
+import { Form as TForm, FormItem as TFormItem, Input as TInput, Textarea as TTextarea, InputNumber as TInputNumber, MessagePlugin } from "tdesign-vue-next";
 import { computed, reactive } from "vue";
 
-import { Form as TForm, FormItem as TFormItem, Input as TInput, Textarea as TTextarea, InputNumber as TInputNumber, MessagePlugin } from "tdesign-vue-next";
-import PageDialog from "befly-admin-ui/components/pageDialog.vue";
 import { $Http } from "@/plugins/http.js";
 
 const $Prop = defineProps({
@@ -42,7 +42,7 @@ const $Prop = defineProps({
 const $Emit = defineEmits(["update:modelValue", "success"]);
 
 const $Const = {
-    createDefaultFormData() {
+    createDefaultFormData: function () {
         return {
             code: "",
             name: "",
@@ -73,10 +73,10 @@ const $Computed = reactive({
 });
 
 const $Method = {
-    resetFormData() {
+    resetFormData: function () {
         Object.assign($Data.formData, $Const.createDefaultFormData());
     },
-    initData() {
+    initData: function () {
         if ($Prop.actionType === "upd" && $Prop.rowData) {
             $Data.formData.code = $Prop.rowData.code || "";
             $Data.formData.name = $Prop.rowData.name || "";
@@ -87,7 +87,7 @@ const $Method = {
 
         $Method.resetFormData();
     },
-    async handleSubmit() {
+    handleSubmit: async function () {
         const form = $From.formRef;
         if (!form) {
             MessagePlugin.warning("表单未就绪");

package/views/config/dictType/index.vue

@@ -42,12 +42,13 @@
 </template>
 
 <script setup>
-import { reactive } from "vue";
-import { Button as TButton, Dropdown as TDropdown, DropdownItem as TDropdownItem, DropdownMenu as TDropdownMenu, Input as TInput } from "tdesign-vue-next";
-import { AddIcon, ChevronDownIcon, DeleteIcon, EditIcon, SearchIcon } from "tdesign-icons-vue-next";
-import EditDialog from "./components/edit.vue";
 import PageTableDetail from "befly-admin-ui/components/pageTableDetail.vue";
 import { withDefaultColumns } from "befly-admin-ui/utils/withDefaultColumns";
+import { AddIcon, ChevronDownIcon, DeleteIcon, EditIcon, SearchIcon } from "tdesign-icons-vue-next";
+import { Button as TButton, Dropdown as TDropdown, DropdownItem as TDropdownItem, DropdownMenu as TDropdownMenu, Input as TInput } from "tdesign-vue-next";
+import { reactive } from "vue";
+
+import EditDialog from "./components/edit.vue";
 
 const $Data = reactive({
     searchKeyword: "",
@@ -90,16 +91,16 @@ const $Data = reactive({
 });
 
 const $Method = {
-    onAdd() {
+    onAdd: function () {
         $Method.onAction("add", {});
     },
-    onDialogSuccess(reload) {
+    onDialogSuccess: function (reload) {
         reload({ keepSelection: true });
     },
-    handleSearch(reload) {
+    handleSearch: function (reload) {
         reload({ keepSelection: false, resetPage: true });
     },
-    onAction(type, row) {
+    onAction: function (type, row) {
         if (type === "add") {
             $Data.actionType = "add";
             $Data.rowData = {};
@@ -113,7 +114,7 @@ const $Method = {
             $Data.editVisible = true;
         }
     },
-    onDropdownAction(data, row, deleteRow) {
+    onDropdownAction: function (data, row, deleteRow) {
         const record = data;
         const rawValue = record && record["value"] ? record["value"] : "";
         const cmd = rawValue ? String(rawValue) : "";