free-be-account 0.0.28 → 0.0.30

package/index.js

@@ -27,16 +27,15 @@ try {
 let __app_service_list_saved = false;
 let __saved_service_list;
 
-const __getServiceList = async (res, filter = { Enabled: true }, scopeFilter) => {
+const __getServiceList = async (res, filter, scopeFilter) => {
     // add app.serviceList into db if not yet
     if (!__app_service_list_saved) {
         await res.app.modules.account.utils.saveServiceList(res.app);
-        __app_service_list_saved = true;
-    } else if (!filter){
+    } else if (!filter) {
         return __saved_service_list;
     }
 
-    const allPerms = await res.app.models.permission.find(filter).lean();
+    const allPerms = await res.app.models.permission.find(filter ? { ...filter, Enabled: true } : { Enabled: true }).lean();
 
     const permList = {};
     if (allPerms && allPerms.length > 0) {
@@ -60,7 +59,7 @@ const __getServiceList = async (res, filter = { Enabled: true }, scopeFilter) =>
                     },
                     ((doc.Scope || []).length <= 0) ? {} : {
                         Scope: doc.Scope.map(sc => {
-                            const dso = app.getContainerContent('DataScope').find(ds => ds.Name === sc.Name);
+                            const dso = res.app.getContainerContent('DataScope').find(ds => ds.Name === sc.Name);
 
                             if (!dso) {
                                 return {};
@@ -97,8 +96,9 @@ const __getServiceList = async (res, filter = { Enabled: true }, scopeFilter) =>
         })
     }
 
-    if (!filter) {
+    if (!filter && !__app_service_list_saved) {
         __saved_service_list = permList;
+        __app_service_list_saved = true;
     }
 
     return permList;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-be-account",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "main": "index.js",
   "license": "UNLICENSED",
   "repository": {

package/routers/mgmt/route.js

@@ -4,26 +4,34 @@ const router = express.Router();
 const { AccountAuditStatus } = require('../../enum');
 const { clearPermission, encryptPwd, crypto } = require('../../utils');
 
+// 2024-7-4，曾经添加id过滤器，并删除所有label and placeholder，但为什么？
 const accountFilters = [
-    {
-        Name: 'id',
-        Type: 'String',
-        Info: {
-            Separate: true,
-        },
-    },
+    // {
+    //     Name: 'id',
+    //     Type: 'String',
+    //     Info: {
+    //         Separate: true,
+    //     },
+    //     Label: '账号ID',
+    // },
     {
         Name: 'LastUpdateDate',
         Type: 'DateRange',
+        Label: '更新日期',
+        Placeholder: '请选择',
     },
     {
         Name: 'Enabled',
         Type: 'Select',
+        Label: '激活状态',
+        Placeholder: '请选择',
         Options: [
             {
+                Label: '已激活',
                 Value: true,
             },
             {
+                Label: '未激活',
                 Value: false,
             },
         ],
@@ -31,18 +39,22 @@ const accountFilters = [
     {
         Name: 'Profile.Name',
         Type: 'String',
+        Label: '姓名',
     },
     {
         Name: 'Profile.Title',
         Type: 'String',
+        Label: '职务',
     },
     {
         Name: 'PhoneNumber',
         Type: 'String',
+        Label: '手机号',
     },
     {
         Name: 'UserName',
         Type: 'String',
+        Label: '用户名',
     },
 ];
 

package/utils.js

@@ -210,6 +210,38 @@ async function saveServiceList (app, clean=false) {
     await checkService(serviceList, undefined, '');
 }
 
+/**
+ * 给指定的静态资源文件添加权限控制记录
+ * 
+ * @param {String or Array} assets asset file(s)
+ * @param {String or Object} user The current user
+ * @param {String} users Users
+ * @param {String} perms Permissions
+ * @param {String} refs Referers
+ * @returns
+ */
+async function addPermControlToAssetFiles(afile, user, users, perms, refs) {
+    if (!afile) return;
+
+    if (!Array.isArray(afile)) {
+        afile = [afile];
+    }
+
+    for (let i = 0; i < afile.length; i += 1) {
+        const af = afile[i];
+
+        const assetsFilePath = af.split(/[\\|/]/g).slice(-2).join('/');
+        await app.models.staticResourcePermissionControl.create({
+            User: user?.id || user,
+            ResourcePath: assetsFilePath,
+
+            Users: users || '',
+            Permissions: perms || '',
+            Referers: refs || '',
+        });
+    }
+}
+
 module.exports = {
     clearPermission,
     getPermissionPathList,
@@ -218,4 +250,5 @@ module.exports = {
     getClearPwd,
     crypto,
     saveServiceList,
+    addPermControlToAssetFiles,
 }