moyan-mfw-base 1.0.2 → 1.1.2

package/package.json

@@ -1,81 +1,78 @@
-{
-  "name": "moyan-mfw-base",
-  "version": "1.0.2",
-  "description": "墨焱MFW核心框架",
-  "main": "./src/shared/dist/index.js",
-  "types": "./src/shared/dist/index.d.ts",
-  "exports": {
-    "./backend": {
-      "import": "./src/backend/dist/index.js",
-      "require": "./src/backend/dist/index.js",
-      "types": "./src/backend/dist/index.d.ts"
-    },
-    "./backend/*": {
-      "import": "./src/backend/dist/*.js",
-      "require": "./src/backend/dist/*",
-      "types": "./src/backend/dist/*.d.ts"
-    },
-    "./frontend": {
-      "import": "./src/frontend/dist/index.mjs",
-      "require": "./src/frontend/dist/index.js",
-      "types": "./src/frontend/dist/index.d.ts"
-    },
-    "./frontend/*": {
-      "import": "./src/frontend/dist/*",
-      "require": "./src/frontend/dist/*",
-      "types": "./src/frontend/dist/*.d.ts"
-    },
-    "./shared": {
-      "import": "./src/shared/dist/index.js",
-      "require": "./src/shared/dist/index.js",
-      "types": "./src/shared/dist/index.d.ts"
-    },
-    "./shared/*": {
-      "import": "./src/shared/dist/*",
-      "require": "./src/shared/dist/*",
-      "types": "./src/shared/dist/*.d.ts"
-    }
-  },
-  "typesVersions": {
-    "*": {
-      "*": [
-        "./src/*/dist/*.d.ts",
-        "./src/*/dist/index.d.ts"
-      ]
-    }
-  },
-  "scripts": {
-    "build:shared": "pnpm --filter @internal/base-shared build",
-    "build:backend": "pnpm --filter @internal/base-backend build",
-    "build:frontend": "pnpm --filter @internal/base-frontend build",
-    "build": "pnpm run build:shared && pnpm run build:backend && pnpm run build:frontend",
-    "dev:backend": "pnpm --filter @internal/base-backend dev",
-    "dev:frontend": "pnpm --filter @internal/base-frontend dev",
-    "typecheck:shared": "pnpm --filter @internal/base-shared typecheck",
-    "typecheck:backend": "pnpm --filter @internal/base-backend typecheck",
-    "typecheck:frontend": "pnpm --filter @internal/base-frontend typecheck",
-    "typecheck": "pnpm run typecheck:shared && pnpm run typecheck:backend && pnpm run typecheck:frontend",
-    "release:patch": "npm version patch && pnpm build && npm publish",
-    "release:minor": "npm version minor && pnpm build && npm publish",
-    "release:major": "npm version major && pnpm build && npm publish"
-  },
-  "license": "MIT",
-  "keywords": [
-    "moyan",
-    "mfw",
-    "admin",
-    "framework",
-    "nestjs",
-    "vue3"
-  ],
-  "files": [
-    "src/backend/dist",
-    "src/frontend/dist",
-    "src/shared/dist",
-    "README.md",
-    "LICENSE"
-  ],
-  "engines": {
-    "node": ">=20.0.0"
-  }
-}
+{
+  "name": "moyan-mfw-base",
+  "version": "1.1.2",
+  "description": "墨焱MFW核心框架",
+  "main": "./src/shared/dist/index.js",
+  "types": "./src/shared/dist/index.d.ts",
+  "exports": {
+    "./backend": {
+      "import": "./src/backend/dist/index.js",
+      "require": "./src/backend/dist/index.js",
+      "types": "./src/backend/dist/index.d.ts"
+    },
+    "./backend/*": {
+      "import": "./src/backend/dist/*.js",
+      "require": "./src/backend/dist/*",
+      "types": "./src/backend/dist/*.d.ts"
+    },
+    "./frontend": {
+      "import": "./src/frontend/dist/index.mjs",
+      "require": "./src/frontend/dist/index.js",
+      "types": "./src/frontend/dist/index.d.ts"
+    },
+    "./frontend/*": {
+      "import": "./src/frontend/dist/*",
+      "require": "./src/frontend/dist/*",
+      "types": "./src/frontend/dist/*.d.ts"
+    },
+    "./shared": {
+      "import": "./src/shared/dist/index.js",
+      "require": "./src/shared/dist/index.js",
+      "types": "./src/shared/dist/index.d.ts"
+    },
+    "./shared/*": {
+      "import": "./src/shared/dist/*",
+      "require": "./src/shared/dist/*",
+      "types": "./src/shared/dist/*.d.ts"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "./src/*/dist/*.d.ts",
+        "./src/*/dist/index.d.ts"
+      ]
+    }
+  },
+  "scripts": {
+    "build:shared": "pnpm --filter @internal/base-shared build",
+    "build:backend": "pnpm --filter @internal/base-backend build",
+    "build:frontend": "pnpm --filter @internal/base-frontend build",
+    "build": "pnpm run build:shared && pnpm run build:backend && pnpm run build:frontend",
+    "dev:backend": "pnpm --filter @internal/base-backend dev",
+    "dev:frontend": "pnpm --filter @internal/base-frontend dev",
+    "typecheck:shared": "pnpm --filter @internal/base-shared typecheck",
+    "typecheck:backend": "pnpm --filter @internal/base-backend typecheck",
+    "typecheck:frontend": "pnpm --filter @internal/base-frontend typecheck",
+    "typecheck": "pnpm run typecheck:shared && pnpm run typecheck:backend && pnpm run typecheck:frontend"
+  },
+  "license": "MIT",
+  "keywords": [
+    "moyan",
+    "mfw",
+    "admin",
+    "framework",
+    "nestjs",
+    "vue3"
+  ],
+  "files": [
+    "src/backend/dist",
+    "src/frontend/dist",
+    "src/shared/dist",
+    "README.md",
+    "LICENSE"
+  ],
+  "engines": {
+    "node": ">=20.0.0"
+  }
+}

package/src/backend/dist/create-base-backend-app.js

@@ -261,16 +261,16 @@ function setupCors(app, options, configService) {
  * 打印启动消息
  */
 function printStartupMessage(port, globalPrefix, configService) {
-    console.log(`
-  ╔═══════════════════════════════════════════════════════════╗
-  ║                                                           ║
-  ║   🚀 Moyan MFW Backend is running!                        ║
-  ║                                                           ║
-  ║   ➜  Local:    http://localhost:${port}${globalPrefix}           ║
-  ║   ➜  Swagger:  http://localhost:${port}/api-docs/sys            ║
-  ║   ➜  Environment: ${configService.get('env', 'development')}                    ║
-  ║                                                           ║
-  ╚═══════════════════════════════════════════════════════════╝
+    console.log(`
+  ╔═══════════════════════════════════════════════════════════╗
+  ║                                                           ║
+  ║   🚀 Moyan MFW Backend is running!                        ║
+  ║                                                           ║
+  ║   ➜  Local:    http://localhost:${port}${globalPrefix}           ║
+  ║   ➜  Swagger:  http://localhost:${port}/api-docs/sys            ║
+  ║   ➜  Environment: ${configService.get('env', 'development')}                    ║
+  ║                                                           ║
+  ╚═══════════════════════════════════════════════════════════╝
   `);
 }
 //# sourceMappingURL=create-base-backend-app.js.map

package/src/backend/dist/database/clean-pc-permissions.js

@@ -19,11 +19,11 @@ async function clean() {
     });
     await dataSource.initialize();
     // 删除所有 isAutoSync=0 的 PC 权限（排除 pc_root）
-    const result = await dataSource.query(`
-    DELETE FROM sys_permissions
-    WHERE permission_type = 'PC'
-    AND is_auto_sync = 0
-    AND perm_code != 'pc_root'
+    const result = await dataSource.query(`
+    DELETE FROM sys_permissions
+    WHERE permission_type = 'PC'
+    AND is_auto_sync = 0
+    AND perm_code != 'pc_root'
   `);
     process.stdout.write(`已删除 ${result.affectedRows} 条脏数据\n`);
     await dataSource.destroy();

package/src/backend/dist/database/run-migration-add-userrole-appid.js

@@ -23,7 +23,7 @@ for (const p of envPaths) {
     }
 }
 async function columnExists(conn, table, column) {
-    const [rows] = await conn.execute(`SELECT COUNT(*) as cnt FROM information_schema.COLUMNS
+    const [rows] = await conn.execute(`SELECT COUNT(*) as cnt FROM information_schema.COLUMNS
      WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND COLUMN_NAME = ?`, [process.env.DB_NAME || 'moyan_mfw', table, column]);
     return rows[0].cnt > 0;
 }
@@ -49,13 +49,13 @@ async function main() {
         }
         // ---- Step 2: 填充已有记录的 appId ----
         process.stdout.write('Step 2: 填充已有记录的 appId...\n');
-        const [updateResult] = await connection.execute(`
-      UPDATE sys_user_roles ur
-      JOIN sys_app_members am ON am.userId = ur.userId
-      JOIN sys_roles r ON r.id = ur.roleId
-      SET ur.appId = am.appId
-      WHERE ur.appId IS NULL
-        AND (r.appId = am.appId OR r.appTypeId = (SELECT appTypeId FROM sys_apps WHERE id = am.appId))
+        const [updateResult] = await connection.execute(`
+      UPDATE sys_user_roles ur
+      JOIN sys_app_members am ON am.userId = ur.userId
+      JOIN sys_roles r ON r.id = ur.roleId
+      SET ur.appId = am.appId
+      WHERE ur.appId IS NULL
+        AND (r.appId = am.appId OR r.appTypeId = (SELECT appTypeId FROM sys_apps WHERE id = am.appId))
     `);
         process.stdout.write(`  ✓ 已更新 ${updateResult.changedRows || 0} 条记录\n`);
         // ---- Step 3: 删除无归属的歧义记录 ----
@@ -64,7 +64,7 @@ async function main() {
         process.stdout.write(`  ✓ 已删除 ${deleteResult.affectedRows || 0} 条记录\n`);
         // ---- Step 4: appId 设为 NOT NULL（幂等） ----
         process.stdout.write('Step 4: 设置 appId 为 NOT NULL...\n');
-        const [colInfo] = await connection.execute(`SELECT IS_NULLABLE FROM information_schema.COLUMNS
+        const [colInfo] = await connection.execute(`SELECT IS_NULLABLE FROM information_schema.COLUMNS
        WHERE TABLE_SCHEMA = ? AND TABLE_NAME = 'sys_user_roles' AND COLUMN_NAME = 'appId'`, [process.env.DB_NAME || 'moyan_mfw']);
         if (colInfo[0]?.IS_NULLABLE === 'NO') {
             process.stdout.write('  ✓ appId 已是 NOT NULL，跳过\n');

package/src/backend/dist/database/seeds/dict.seeder.js

@@ -6,14 +6,14 @@ const shared_1 = require("moyan-mfw-base/shared");
 async function seedDicts(dataSource) {
     const dicts = (0, shared_1.getAllDicts)();
     for (const dict of dicts) {
-        await dataSource.query(`INSERT INTO sys_dict_types (id, dict_key, dict_name, module, created_at)
-       VALUES (UUID(), ?, ?, ?, NOW())
+        await dataSource.query(`INSERT INTO sys_dict_types (id, dict_key, dict_name, module, created_at)
+       VALUES (UUID(), ?, ?, ?, NOW())
        ON DUPLICATE KEY UPDATE dict_name = VALUES(dict_name), module = VALUES(module)`, [dict.key, dict.label, dict.module ?? null]);
         const [row] = await dataSource.query(`SELECT id FROM sys_dict_types WHERE dict_key = ?`, [dict.key]);
         for (let i = 0; i < dict.items.length; i++) {
             const item = dict.items[i];
-            await dataSource.query(`INSERT INTO sys_dict_items (id, dict_type_id, item_value, item_label, sort_order, created_at)
-         VALUES (UUID(), ?, ?, ?, ?, NOW())
+            await dataSource.query(`INSERT INTO sys_dict_items (id, dict_type_id, item_value, item_label, sort_order, created_at)
+         VALUES (UUID(), ?, ?, ?, ?, NOW())
          ON DUPLICATE KEY UPDATE item_label = VALUES(item_label), sort_order = VALUES(sort_order)`, [row.id, String(item.value), item.label, i]);
         }
     }

package/src/backend/dist/modules/sys/app/service/app-member.service.js

@@ -65,8 +65,8 @@ let AppMemberService = class AppMemberService {
             where: { id: app.appTypeId },
         });
         if (appType && appType.multiAppEnabled === 0) {
-            const sameTypeMembers = await this.dataSource.query(`SELECT sa.appName FROM sys_app_members sam
-         INNER JOIN sys_apps sa ON sa.id = sam.appId AND sa.deleteAt IS NULL
+            const sameTypeMembers = await this.dataSource.query(`SELECT sa.appName FROM sys_app_members sam
+         INNER JOIN sys_apps sa ON sa.id = sam.appId AND sa.deleteAt IS NULL
          WHERE sam.userId = ? AND sa.appTypeId = ? AND sam.appId != ?`, [userId, app.appTypeId, appId]);
             if (sameTypeMembers && sameTypeMembers.length > 0) {
                 throw new common_1.BadRequestException(`应用类型 "${appType.typeName}" 不支持多应用，该用户已是实例 "${sameTypeMembers[0].appName}" 的成员`);
@@ -110,52 +110,52 @@ let AppMemberService = class AppMemberService {
             .sql(({ select, wheres, orderBy, limit }) => {
             const whereClause = wheres?.main || '';
             const roleScopeClause = wheres?.roleScope || '';
-            return `
-        WITH rj AS(
-          SELECT 
-            ur.userId,
-            JSON_ARRAYAGG(
-              JSON_OBJECT(
-                'roleId', r.id,
-                'roleCode', r.roleCode,
-                'roleName', r.roleName,
-                'isBuiltin', r.isBuiltin
-              )
-            ) AS roles
-          FROM sys_user_roles ur
-          INNER JOIN sys_roles r ON ur.roleId = r.id
-          WHERE ur.appId = '${appId}' ${roleScopeClause.replace('WHERE', 'AND')}
-          GROUP BY ur.userId
-        )
-        SELECT
-          ${select}
-        FROM sys_app_members am
-        INNER JOIN sys_apps a ON a.id = am.appId   
-        INNER JOIN sys_users u ON u.id = am.userId 
-        LEFT JOIN  rj ON rj.userId = am.userId
-          ${whereClause}
-          ${orderBy}
-          ${limit}
+            return `
+        WITH rj AS(
+          SELECT 
+            ur.userId,
+            JSON_ARRAYAGG(
+              JSON_OBJECT(
+                'roleId', r.id,
+                'roleCode', r.roleCode,
+                'roleName', r.roleName,
+                'isBuiltin', r.isBuiltin
+              )
+            ) AS roles
+          FROM sys_user_roles ur
+          INNER JOIN sys_roles r ON ur.roleId = r.id
+          WHERE ur.appId = '${appId}' ${roleScopeClause.replace('WHERE', 'AND')}
+          GROUP BY ur.userId
+        )
+        SELECT
+          ${select}
+        FROM sys_app_members am
+        INNER JOIN sys_apps a ON a.id = am.appId   
+        INNER JOIN sys_users u ON u.id = am.userId 
+        LEFT JOIN  rj ON rj.userId = am.userId
+          ${whereClause}
+          ${orderBy}
+          ${limit}
         `;
         })
-            .select(`
-          am.id,
-          am.userId,
-          am.appId,
-          am.createdAt,
-          u.nickname,
-          u.avatar,
-          u.email,
-          u.phone,
-          u.username,
-          a.appCode,
-          a.appName,
-          a.logo as appLogo,
-          a.ownerId,
-          a.sortOrder,
-          a.appTypeId,
-          COALESCE(rj.roles, JSON_ARRAY()) AS roles,
-          IF(a.ownerId = am.userId,1,0) isOwner
+            .select(`
+          am.id,
+          am.userId,
+          am.appId,
+          am.createdAt,
+          u.nickname,
+          u.avatar,
+          u.email,
+          u.phone,
+          u.username,
+          a.appCode,
+          a.appName,
+          a.logo as appLogo,
+          a.ownerId,
+          a.sortOrder,
+          a.appTypeId,
+          COALESCE(rj.roles, JSON_ARRAY()) AS roles,
+          IF(a.ownerId = am.userId,1,0) isOwner
         `)
             .defaultOrderBy('createdAt DESC')
             .getData();

package/src/backend/dist/modules/sys/app/service/app.service.js

@@ -56,13 +56,13 @@ let AppService = class AppService {
      * @returns 应用实例信息
      */
     async findById(id) {
-        const result = await this.dataSource.query(`SELECT 
-        app.*,
-        JSON_OBJECT('id', t.id, 'typeName', t.typeName, 'typeCode', t.typeCode) as appType,
-        JSON_OBJECT('id', u.id, 'username', u.username, 'nickname', u.nickname, 'avatar', u.avatar) as owner
-      FROM sys_apps app
-      LEFT JOIN sys_app_types t ON app.appTypeId = t.id
-      LEFT JOIN sys_users u ON app.ownerId = u.id AND u.deleteAt IS NULL
+        const result = await this.dataSource.query(`SELECT 
+        app.*,
+        JSON_OBJECT('id', t.id, 'typeName', t.typeName, 'typeCode', t.typeCode) as appType,
+        JSON_OBJECT('id', u.id, 'username', u.username, 'nickname', u.nickname, 'avatar', u.avatar) as owner
+      FROM sys_apps app
+      LEFT JOIN sys_app_types t ON app.appTypeId = t.id
+      LEFT JOIN sys_users u ON app.ownerId = u.id AND u.deleteAt IS NULL
       WHERE app.id = ? AND app.deleteAt IS NULL`, [id]);
         if (!result || result.length === 0) {
             throw new not_found_exception_1.NotFoundError('应用实例');
@@ -95,8 +95,8 @@ let AppService = class AppService {
             const whereClause = wheres?.main || '';
             return `SELECT ${select} FROM sys_apps app LEFT JOIN sys_app_types t ON app.appTypeId = t.id LEFT JOIN sys_users u ON app.ownerId = u.id ${whereClause} ${orderBy} ${limit}`;
         })
-            .select(`app.*, 
-        JSON_OBJECT('id', t.id, 'typeName', t.typeName, 'typeCode', t.typeCode) as appType,
+            .select(`app.*, 
+        JSON_OBJECT('id', t.id, 'typeName', t.typeName, 'typeCode', t.typeCode) as appType,
         JSON_OBJECT('id', u.id, 'username', u.username, 'nickname', u.nickname, 'avatar', u.avatar) as owner`)
             .defaultOrderBy('app.sortOrder ASC, app.createdAt DESC')
             .getData();
@@ -186,7 +186,7 @@ let AppService = class AppService {
             }
             app.ownerId = ownerId;
             await manager.save(app);
-            await manager.query(`INSERT IGNORE INTO sys_app_members (id, appId, userId, createdAt, updateAt)
+            await manager.query(`INSERT IGNORE INTO sys_app_members (id, appId, userId, createdAt, updateAt)
          VALUES (UUID(), ?, ?, NOW(), NOW())`, [app.id, ownerId]);
             if (ownerRoles.length > 0) {
                 const insertValues = ownerRoles.map((r) => [

package/src/backend/dist/modules/sys/app-type/app-type.service.js

@@ -195,29 +195,29 @@ let AppTypeService = class AppTypeService {
         if (!appType) {
             throw new not_found_exception_1.NotFoundError('应用类型');
         }
-        const rows = await this.dataSource.query(`SELECT
-        p.id,
-        p.permName,
-        p.permCode,
-        p.permDesc,
-        p.permissionType,
-        p.nodeType,
-        p.parentId,
-        p.routePath,
-        p.externalUrl,
-        p.iconName,
-        p.sortOrder,
-        p.isVisible,
-        p.isCache,
-        p.showMode,
-        p.permStatus,
-        p.isAutoSync,
-        p.permissionValue AS parentPermissionValue,
-        atp.permissionValue,
-        IF(atp.permissionId IS NULL, 0, 1) checked
-      FROM sys_permissions p
-      LEFT JOIN sys_app_type_permissions atp ON atp.permissionId = p.id AND atp.appTypeId = ?
-      WHERE p.deleteAt IS NULL
+        const rows = await this.dataSource.query(`SELECT
+        p.id,
+        p.permName,
+        p.permCode,
+        p.permDesc,
+        p.permissionType,
+        p.nodeType,
+        p.parentId,
+        p.routePath,
+        p.externalUrl,
+        p.iconName,
+        p.sortOrder,
+        p.isVisible,
+        p.isCache,
+        p.showMode,
+        p.permStatus,
+        p.isAutoSync,
+        p.permissionValue AS parentPermissionValue,
+        atp.permissionValue,
+        IF(atp.permissionId IS NULL, 0, 1) checked
+      FROM sys_permissions p
+      LEFT JOIN sys_app_type_permissions atp ON atp.permissionId = p.id AND atp.appTypeId = ?
+      WHERE p.deleteAt IS NULL
       ORDER BY p.sortOrder ASC`, [appTypeId]);
         const pcRows = rows.filter((r) => r.permissionType === permission_entity_1.PermissionType.PC);
         const normalRows = rows.filter((r) => r.permissionType === permission_entity_1.PermissionType.NORMAL);

package/src/backend/dist/modules/sys/auth/auth.service.js

@@ -204,20 +204,20 @@ let AuthService = class AuthService {
      * @returns 用户可访问的应用实例列表
      */
     async getUserApps(userId) {
-        const sql = `
-      SELECT
-        sam.appId,
-        sa.appName,
-        sa.appCode,
-        sa.appTypeId,
-        sat.typeCode AS appTypeCode,
-        sat.typeName AS appTypeName,
-        IF(sa.ownerId = sam.userId, 'owner', 'member') AS role,
-        sa.logo
-      FROM sys_app_members sam
-      INNER JOIN sys_apps sa ON sa.id = sam.appId
-      INNER JOIN sys_app_types sat ON sat.id = sa.appTypeId
-      WHERE sam.userId = :userId AND sa.appStatus = 1
+        const sql = `
+      SELECT
+        sam.appId,
+        sa.appName,
+        sa.appCode,
+        sa.appTypeId,
+        sat.typeCode AS appTypeCode,
+        sat.typeName AS appTypeName,
+        IF(sa.ownerId = sam.userId, 'owner', 'member') AS role,
+        sa.logo
+      FROM sys_app_members sam
+      INNER JOIN sys_apps sa ON sa.id = sam.appId
+      INNER JOIN sys_app_types sat ON sat.id = sa.appTypeId
+      WHERE sam.userId = :userId AND sa.appStatus = 1
     `;
         return (0, sql_util_1.executeRawSql)(this.entityManager, sql, { userId });
     }
@@ -228,33 +228,33 @@ let AuthService = class AuthService {
      * @returns 用户权限菜单树
      */
     async getUserPermissions(userId, appId) {
-        const sql = `
-    SELECT sa.appTypeId appTypeId FROM sys_apps sa WHERE sa.id = :appId ;
-    SELECT 
-      sp.id,
-      sp.permCode,
-      sp.permName,
-      sp.permissionType,
-      sp.nodeType,
-      sp.parentId,
-      sp.routePath,
-      sp.externalUrl,
-      sp.iconName,
-      sp.sortOrder,
-      sp.isVisible,
-      sp.isCache,
-      sp.showMode,
-      BIT_OR(sp.permissionValue) permissionValue
-    FROM sys_user_roles sur
-    INNER JOIN sys_roles sr ON sur.roleId = sr.id
-    INNER JOIN sys_role_permissions srp ON srp.roleId = sr.id
-    INNER JOIN sys_permissions sp ON sp.id = srp.permissionId
-    WHERE 
-      sur.userId = :userId AND 
-      sur.appId = :appId AND
-      sp.isVisible = 1
-    GROUP BY sp.permCode
-    ORDER BY sp.sortOrder ASC;
+        const sql = `
+    SELECT sa.appTypeId appTypeId FROM sys_apps sa WHERE sa.id = :appId ;
+    SELECT 
+      sp.id,
+      sp.permCode,
+      sp.permName,
+      sp.permissionType,
+      sp.nodeType,
+      sp.parentId,
+      sp.routePath,
+      sp.externalUrl,
+      sp.iconName,
+      sp.sortOrder,
+      sp.isVisible,
+      sp.isCache,
+      sp.showMode,
+      BIT_OR(sp.permissionValue) permissionValue
+    FROM sys_user_roles sur
+    INNER JOIN sys_roles sr ON sur.roleId = sr.id
+    INNER JOIN sys_role_permissions srp ON srp.roleId = sr.id
+    INNER JOIN sys_permissions sp ON sp.id = srp.permissionId
+    WHERE 
+      sur.userId = :userId AND 
+      sur.appId = :appId AND
+      sp.isVisible = 1
+    GROUP BY sp.permCode
+    ORDER BY sp.sortOrder ASC;
     `;
         const [appTypeIdResult, result] = await (0, sql_util_1.executeRawSql)(this.entityManager, sql, { userId, appId }, true);
         const permissions = result.map((item) => item.permCode);

package/src/backend/dist/modules/sys/role/role.service.js

@@ -101,13 +101,13 @@ let RoleService = class RoleService {
         })
             .sql(({ select, wheres, orderBy, limit }) => {
             const whereClause = wheres?.main || '';
-            return `
-          SELECT ${select} FROM sys_roles role
-          LEFT JOIN sys_apps sa ON sa.appTypeId = role.appTypeId
-          WHERE role.appTypeId = IFNULL(@appTypeId,'${appTypeId}')
-          ${whereClause.replace('WHERE', 'AND')}
-          ${orderBy}
-          ${limit}
+            return `
+          SELECT ${select} FROM sys_roles role
+          LEFT JOIN sys_apps sa ON sa.appTypeId = role.appTypeId
+          WHERE role.appTypeId = IFNULL(@appTypeId,'${appTypeId}')
+          ${whereClause.replace('WHERE', 'AND')}
+          ${orderBy}
+          ${limit}
         `;
         })
             .select('role.*')
@@ -214,33 +214,33 @@ let RoleService = class RoleService {
         if (!role) {
             throw new not_found_exception_1.NotFoundError('角色');
         }
-        const rows = await this.entityManager.query(`WITH 
-      pond AS(
-        SELECT 
-          p.id,
-          p.permName,
-          p.permCode,
-          p.permissionType,
-          p.nodeType,
-          p.parentId,
-          p.routePath,
-          p.externalUrl,
-          p.iconName,
-          p.sortOrder,
-          p.isCache,
-          p.showMode,
-          atp.permissionValue AS parentPermissionValue,
-          atp.appTypeId
-        FROM sys_app_type_permissions atp
-        INNER JOIN sys_permissions p ON atp.permissionId = p.id
-        LEFT JOIN sys_roles r ON r.appTypeId = atp.appTypeId
-        WHERE r.id = ?
-      )
-      SELECT 
-        pond.*,
-        IFNULL(rp.permissionValue,0) permissionValue,
-        IF(rp.permissionId IS NULL,false,true) checked
-      FROM pond
+        const rows = await this.entityManager.query(`WITH 
+      pond AS(
+        SELECT 
+          p.id,
+          p.permName,
+          p.permCode,
+          p.permissionType,
+          p.nodeType,
+          p.parentId,
+          p.routePath,
+          p.externalUrl,
+          p.iconName,
+          p.sortOrder,
+          p.isCache,
+          p.showMode,
+          atp.permissionValue AS parentPermissionValue,
+          atp.appTypeId
+        FROM sys_app_type_permissions atp
+        INNER JOIN sys_permissions p ON atp.permissionId = p.id
+        LEFT JOIN sys_roles r ON r.appTypeId = atp.appTypeId
+        WHERE r.id = ?
+      )
+      SELECT 
+        pond.*,
+        IFNULL(rp.permissionValue,0) permissionValue,
+        IF(rp.permissionId IS NULL,false,true) checked
+      FROM pond
       LEFT JOIN sys_role_permissions rp ON rp.permissionId = pond.id AND rp.roleId = ?`, [roleId, roleId]);
         const pcRows = rows.filter((r) => r.permissionType === permission_entity_1.PermissionType.PC);
         const normalRows = rows.filter((r) => r.permissionType === permission_entity_1.PermissionType.NORMAL);