@gingkoo/base-server 0.0.1-alpha.7 → 0.0.1-alpha.9

package/backend/common/mapping.js

@@ -21,19 +21,31 @@ class MappingFactory {
 
   async getMapping(module, dict_ids, extra) {
     let mapping = {};
+    let list = {};
 
-    if (!Array.isArray(dict_ids)) return mapping;
-    if (!dict_ids.length) return mapping;
+    if (!Array.isArray(dict_ids) || !dict_ids?.length) {
+      return {
+        dict: mapping,
+        list: list,
+      };
+    }
 
     let modulesMap = {
       async USER_LIST() {
         let res = await userService.getUsers();
-        return res.reduce((mo, item) => {
+        let arr = [];
+        let dict = res.reduce((mo, item) => {
           if (item.USER_ID) {
+            arr.push({ value: item.USER_ID, label: item.USER_NAME });
             mo[item.USER_ID] = item.USER_NAME;
           }
           return mo;
         }, {});
+
+        return {
+          dict,
+          list: arr,
+        };
       },
     };
 
@@ -68,6 +80,12 @@ class MappingFactory {
               mo[value] = rest;
               return mo;
             }, {});
+            list[key] = value.map((item) => {
+              return {
+                label: item.label,
+                value: item.value,
+              };
+            });
           }
         });
       }
@@ -76,18 +94,30 @@ class MappingFactory {
     if (module_dict.length) {
       await module_dict.myforeach(async (dict_id) => {
         let fn = modulesMap[dict_id];
-
+        let result = {};
         if (isAsync(fn)) {
-          mapping[dict_id] = await fn(extra);
+          result = await fn(extra);
         } else if (typeof fn === 'function') {
-          mapping[dict_id] = fn(extra);
-        } else if (isPlainObject(fn)) {
-          mapping[dict_id] = fn;
+          result = fn(extra);
+        } else {
+          result = fn;
+        }
+
+        if (isPlainObject(result)) {
+          if (result['dict']) {
+            mapping[dict_id] = result['dict'];
+          }
+          if (result['list']) {
+            list[dict_id] = result['list'];
+          }
         }
       });
     }
 
-    return mapping;
+    return {
+      dict: mapping,
+      list: list,
+    };
   }
 }
 

package/backend/common/services/dict.js

@@ -434,6 +434,7 @@ const dictService = {
       MODULE_ID,
       DICT_NAME,
       DICT_ID,
+      ORG_ID: global.orgid,
     });
     let result = await sqlExecutor(sql, params);
     return result;

package/backend/config/index.js

@@ -18,7 +18,6 @@ function gConfig() {
   return _.merge(
     {
       isProd: true, // 纯当前开发用， 通过 npm 包 使用该组件的时候 他应该永远是 true
-      orgid: 'GINGKOO',
       allowedIPs: [], // 不校验登录的 ip
       testUser: '', // 测试用户
       ip: '0.0.0.0', // 服务 host

package/backend/router.js

@@ -17,10 +17,14 @@ var router = express.Router();
 // 后端
 router.get('/(:module/)?mapping', async (req, res) => {
   let { module } = req.params;
-  let { list = '', ...extra } = req.query;
-  res.sendOk({
-    dict: await mapping.getMapping(module, list.split('|'), extra),
-  });
+  let { list = '', type = 'dict', ...extra } = req.query;
+  let data = await mapping.getMapping(module, list.split('|'), extra);
+  if (type === 'dict') {
+    Reflect.deleteProperty(data, 'list');
+  } else if (type === 'list') {
+    Reflect.deleteProperty(data, 'dict');
+  }
+  res.sendOk(data);
 });
 
 router.use('/fss', fss);

package/backend/space_mapping.js

@@ -5,11 +5,18 @@ const deptService = require('./common/services/dept');
 mapping.register('space', {
   async DEPT_LIST() {
     let res = await deptService.getDepts();
-    return res.reduce((mo, item) => {
+    let list = [];
+    let dict = res.reduce((mo, item) => {
       if (item.DEPT_NO) {
         mo[item.DEPT_NO] = item.DEPT_NAME;
+        list.push({ value: item.DEPT_NO, label: item.DEPT_NAME });
       }
       return mo;
     }, {});
+
+    return {
+      dict,
+      list,
+    };
   },
 });