@gingkoo/base-server 0.0.4-alpha.42 → 0.0.4-alpha.44

package/backend/common/page_engine.js

@@ -59,42 +59,24 @@ function splitStr(str, delimiter = ',') {
 function handleFields(fields) {
   if (!Array.isArray(fields)) return [];
   return fields.map((item) => {
-    let {
-      id,
-      component,
-      clearable,
-      required,
-      multiple,
-      searchable,
-      showValue,
-      block,
-      isFilter,
-      ...rest
-    } = item.attributes();
+    let { id, component, isFilter, ...rest } = item.attributes();
+
+    // 处理 rest boolean 类型
+    let restData = {};
+    Object.keys(rest).forEach((key) => {
+      let val = rest[key];
+      if (val && typeof val === 'string' && ['true', 'false'].includes(val)) {
+        restData[key] = isbool(val);
+      } else {
+        restData[key] = val;
+      }
+    });
 
     let field = {
       type: typeMap[component] || component,
       name: id,
-      ...rest,
+      ...restData,
     };
-    if (clearable) {
-      field.clearable = isbool(clearable);
-    }
-    if (required) {
-      field.required = isbool(required);
-    }
-    if (multiple) {
-      field.multiple = isbool(multiple);
-    }
-    if (searchable) {
-      field.searchable = isbool(searchable);
-    }
-    if (block) {
-      field.block = isbool(block);
-    }
-    if (showValue) {
-      field.showValue = isbool(showValue);
-    }
 
     // 是否支持搜索
     if (isFilter) {

package/backend/common/services/user.js

@@ -125,8 +125,8 @@ const userService = {
    * @param {*} sqlParams
    */
   async getUsersBySql(filters, pageInfo, sql, sqlParams) {
-    let pageSize = pageInfo.pageSize;
-    let pageIndex = pageInfo.pageIndex;
+    let { pageSize, pageIndex, orderBy, orderDir } = pageInfo;
+
     let spSqlOps = {};
     if (filters['USER_NAME']) {
       spSqlOps['USER_NAME'] = 'like';
@@ -138,7 +138,12 @@ const userService = {
       sqlParams = sqlParams.concat(queryParam.params);
     }
 
-    sql = sql + ' order by a.USER_ID DESC';
+    if (orderBy) {
+      sql += ` order by a.${orderBy} ${orderDir.toLocaleUpperCase()}`;
+    } else {
+      sql += ' order by DATA_CRT_TIME DESC';
+    }
+
     let dbResult = await pageQuery(sql, sqlParams, pageSize, pageIndex);
 
     return dbResult;
@@ -154,8 +159,7 @@ const userService = {
   async getUserList(filters, pageInfo) {
     //查询用列表最多20条
     pageInfo.pageSize = 20;
-    let sql =
-      "select USER_ID, USER_NAME, DEPT_NO, AVATAR from IDM_USERS a where a.ORG_ID=? and STATUS='00'";
+    let sql = `select * from ${entity.IDM_USERS} a where a.ORG_ID=? and USER_STATUS='normal'`;
     let dbResult = await this.getUsersBySql(filters, pageInfo, sql, [global.orgid]);
     return dbResult;
   },
@@ -169,7 +173,7 @@ const userService = {
    */
   async getTeamUsers(userid, filters, pageInfo) {
     let sql =
-      "select USER_ID, USER_NAME, USER_TYPE, EN_NAME, NIKE_NAME, GENDER, DEPT_NO, AVATAR, ADDR, POSITION, STATUS, EDUCATION, ADMISSION_DATE, JOINED_DATE from IDM_USERS a where a.ORG_ID=? and STATUS='00' and USER_STATUS='normal'";
+      "select USER_ID, USER_NAME, USER_TYPE, EN_NAME, NIKE_NAME, GENDER, DEPT_NO, AVATAR, ADDR, POSITION, STATUS, EDUCATION, ADMISSION_DATE, JOINED_DATE from IDM_USERS a where a.ORG_ID=? and USER_STATUS='normal'";
     sql =
       sql +
       ' and ((a.DEPT_NO in (select DEPT_NO from IDM_DEPTS y where y.ORG_ID=a.ORG_ID and y.DEPT_LEADER=?))';
@@ -280,13 +284,13 @@ const userService = {
       let params =
         memberType[1] === 'GROUP_ID'
           ? { ORG_ID: global.orgid, GROUP_ID: teamId, USER_ID: userid, STATUS: '00' }
-          : { ORG_ID: global.orgid, DEPT_ID: teamId, USER_ID: userid, STATUS: 'normal' };
+          : { ORG_ID: global.orgid, DEPT_ID: teamId, USER_ID: userid, STATUS: '00' };
       sqlResult = insertSqlBuilder(memberType[0], params);
     } else {
       let params =
         memberType[1] === 'GROUP_ID'
           ? { GROUP_ID: teamId, STATUS: '00' }
-          : { DEPT_ID: teamId, STAUTS: 'normal' };
+          : { DEPT_ID: teamId, STAUTS: '00' };
       sqlResult = updateSqlBuilder(memberType[0], params, {
         ORG_ID: global.orgid,
         USER_ID: userid,
@@ -354,7 +358,7 @@ const userService = {
 
   async getMember(memberType, id, filters, pageInfo) {
     let { orderBy, orderDir, pageSize, pageIndex } = pageInfo;
-    let sql = `select * from ${entity.IDM_USERS} a where USER_ID in (select USER_ID from ${memberType[0]} where ${memberType[1]}=? and STATUS ='00  '`;
+    let sql = `select * from ${entity.IDM_USERS} a where a.USER_ID in (select USER_ID from ${memberType[0]} where ${memberType[1]}=? and STATUS ='00  '`;
     let sqlParams = [id];
     delete filters['cat'];
     let spSqlOps = {};
@@ -435,7 +439,7 @@ const userService = {
 
   async getMemberlist(memberType, id, filters, pageInfo) {
     let { orderBy, orderDir, pageSize, pageIndex } = pageInfo;
-    let sql = `select * from ${entity.IDM_USERS} a where USER_ID in (select USER_ID from ${memberType[0]} where ${memberType[1]}=? and STATUS in ('00', 'normal'))  and USER_STATUS='normal'`;
+    let sql = `select * from ${entity.IDM_USERS} a where a.USER_ID in (select USER_ID from ${memberType[0]} where ${memberType[1]}=?) and USER_STATUS='normal'`;
     let sqlParams = [id];
     delete filters['cat'];
     delete filters['type'];

package/backend/common/wechat/routers/auth.js

@@ -170,7 +170,8 @@ router.get('/oauth/qywx/callback', async function (req, res) {
     USER_ID: userinfo['USER_NAME'],
     USER_NAME: userinfo['STAFF_NAME'],
     DEPT_NO: userinfo['GROUP_ID'],
-    STATUS: 'normal',
+    STATUS: '00',
+    USER_STATUS: 'normal',
   };
   let oauth = {
     USER_ID: userinfo['USER_NAME'],
@@ -203,7 +204,8 @@ router.get('/gettoken', async function (req, res) {
     USER_ID: userinfo['USER_NAME'],
     USER_NAME: userinfo['STAFF_NAME'],
     DEPT_NO: userinfo['GROUP_ID'],
-    STATUS: 'normal',
+    STATUS: '00',
+    USER_STATUS: 'normal',
   };
   let oauth = {
     USER_ID: userinfo['USER_NAME'],

package/backend/routers/idm.js

@@ -101,7 +101,6 @@ function renderGroup(data, idmGroupData) {
         creatable: false,
         removable: true,
         editable: true,
-        icon: 'teams',
       });
     });
   }
@@ -112,6 +111,7 @@ function renderGroup(data, idmGroupData) {
       newData.push({
         ...cur,
         children: renderGroupTree(cur.children, idmGroupData, DEPT_NO),
+        icon: 'Folder2Open',
       });
     } else {
       if (filter.length > 0) {
@@ -122,15 +122,16 @@ function renderGroup(data, idmGroupData) {
             creatable: false,
             removable: true,
             editable: true,
-            icon: 'teams',
+            icon: 'UserTeams',
           };
         });
         newData.push({
           ...cur,
           children: filterChildren,
+          icon: 'Folder2Open',
         });
       } else {
-        newData.push({ ...cur });
+        newData.push({ ...cur, icon: 'Folder2Open' });
       }
     }
   });
@@ -148,7 +149,7 @@ function renderGroupTree(data, idmGroupData, DEPTNO) {
         creatable: false,
         removable: true,
         editable: true,
-        icon: 'teams',
+        icon: 'UserTeams',
       };
     });
     newData = newData.concat(childrenFilter);
@@ -167,7 +168,7 @@ function renderGroupTree(data, idmGroupData, DEPTNO) {
             creatable: false,
             removable: true,
             editable: true,
-            icon: 'teams',
+            icon: 'UserTeams',
           };
         });
         return newData.push({
@@ -200,7 +201,7 @@ router.get('/api/orgs', async function (req, res) {
         creatable: true,
         removable: false,
         editable: false,
-        cannotSelect: true,
+        cannotSelect: false,
         children: Tree(deptData, false),
       },
     ],

package/backend/routers/team/routers/membermanage.js

@@ -9,48 +9,42 @@ const memberService = require('../services/member');
 const router = express.Router();
 
 /**
- * @api {get} /team/member 获取团队成员
- * @apiName GetProject
- * @apiGroup team
- * @apiDescription 获取团队成员
- * @apiVersion  1.0.0
- *
+ * 获取团队成员
+ * @query {
+ *  cat: string;  BR01
+ *  type: string; 部门 DEPT  用户组 GROUP
+ *  parentId: string; /1
+ * }
  */
 router.get('/', async function (req, res) {
   let queryParams = parseQueryParams(req.query, ['ORG_ID', 'RANGE'], true, 50);
   let params = queryParams.params;
   const { cat, type } = req.query;
   if (!cat || !type) return res.sendErr('参数错误');
-  let realType =
-    type === idmLevelType.IDM_LENVEL_TYPE.DEPT
-      ? [entity.IDM_USERS, 'DEPT_NO']
-      : [entity.IDM_GROUP_MEMBERS, 'GROUP_ID'];
-  let team =
-    type === idmLevelType.IDM_LENVEL_TYPE.DEPT
-      ? [entity.IDM_DEPTS, 'DEPT_NO']
-      : [entity.IDM_GROUPS, 'GROUP_ID'];
+  let result = {};
+  if (cat !== 'GINGKOO') {
+    let realType =
+      type === idmLevelType.IDM_LENVEL_TYPE.DEPT
+        ? [entity.IDM_USERS, 'DEPT_NO']
+        : [entity.IDM_GROUP_MEMBERS, 'GROUP_ID'];
+    let team =
+      type === idmLevelType.IDM_LENVEL_TYPE.DEPT
+        ? [entity.IDM_DEPTS, 'DEPT_NO']
+        : [entity.IDM_GROUPS, 'GROUP_ID'];
 
-  let teamInfo = await userService.getTeamInfo(team, cat);
-  let isHasLeader = params.LEADER;
-  delete params.LEADER;
-  let result = await userService.getMemberlist(realType, cat, params, queryParams.pageInfo);
-  if (!teamInfo) return res.sendErr('没有找到数据');
-  let leader = teamInfo['DEPT_LEADER'] || teamInfo['GROUP_LEADER'];
-  result.content = result.content.map((user) => {
-    return { ...user, LEADER: user.USER_ID === leader ? '负责人' : '' };
-  });
-  if (isHasLeader) {
-    let results = [];
-    result.content.map((user) => {
-      if (user.LEADER == '负责人') {
-        result.content.map((user) => {
-          if (user.USER_NAME.indexOf(isHasLeader) > -1) {
-            results.push(user);
-          }
-        });
-      }
+    let teamInfo = await userService.getTeamInfo(team, cat);
+    if (!teamInfo) return res.sendErr('没有找到数据');
+    let leader = teamInfo['DEPT_LEADER'] || teamInfo['GROUP_LEADER'];
+
+    result = await userService.getMemberlist(realType, cat, params, queryParams.pageInfo);
+    result.content = result.content.map((user) => {
+      return { ...user, LEADER: user.USER_ID === leader ? '负责人' : '' };
     });
-    result.content = results;
+  } else {
+    delete params['cat'];
+    delete params['type'];
+    delete params['parentId'];
+    result = await userService.getUserList(params, queryParams.pageInfo);
   }
 
   res.sendOk(result);

package/backend/views/members_manage/index.xml

@@ -3,37 +3,37 @@
   <Fields>
     <element id="USER_ID" component="dropdown" label="成员ID"  source="$dict.USER_LIST"  clearable="true" size="sm" multiple="true" labelTpl="${label}"/>
     <element id="USER_NAME" component="text" label="姓名" disabled="true" />
-    <element id="LEADER" component="text" label="负责人"   />
+    <element id="LEADER" component="text" label="负责人" isFilter="false" />
     <element id="POSITION" component="dropdown" label="职务" source="$dict.IDM_USER_POSITION"  />
     <element id="DEPT_NO" component="dropdown" label="部门" searchable="true" source="$dict.DEPT_LIST" />
     <element id="MOBILE" component="text" label="手机"   />
     <element id="EMAIL" component="text" label="邮箱"   />
     <element id="USER_TYPE" component="dropdown" label="成员类型"  source="$dict.IDM_USER_TYPE" />
     <element id="EN_NAME" component="text" label="英文名称"   />
-    <element id="PASSWD" component="text" label="密码"   />
-    <element id="NIKE_NAME" component="text" label="昵称"   />
+    <element id="PASSWD" component="text" label="密码" isFilter="false" />
+    <element id="NIKE_NAME" component="text" label="昵称" />
     <element id="GENDER" component="dropdown" label="性别" source="$dict.IDM_USER_GENDER"  />
-    <element id="MOBILE" component="text" label="手机号"   />
-    <element id="TEL" component="text" label="电话号"   />
-    <element id="TITLE" component="text" label="头衔"   />
-    <element id="AVATAR" component="input-image" label="头像" accept=".jpg,.png,.jpeg" action='/fss/upload/attachment'  />
-    <element id="ADDR" component="text" label="地址"   />
-    <element id="STAFF_NO" component="text" label="员工编号"   />
+    <element id="MOBILE" component="text" label="手机号" />
+    <element id="TEL" component="text" label="电话号" />
+    <element id="TITLE" component="text" label="头衔" />
+    <element id="AVATAR" component="input-image" label="头像" accept=".jpg,.png,.jpeg" action='/fss/upload/attachment' isFilter="false"/>
+    <element id="ADDR" component="text" label="地址" isFilter="false" />
+    <element id="STAFF_NO" component="text" label="员工编号" />
     <element id="USER_STATUS" component="dropdown" label="状态"  source="$dict.IDM_USER_STATUS"  />
-    <element id="USER_GID" component="text" label="成员全局ID"   />
+    <element id="USER_GID" component="text" label="成员全局ID"  isFilter="false" />
     <element id="EDUCATION" component="dropdown" label="学历" source="$dict.IDM_EDUCATION"  />
-    <element id="SCHOOL" component="text" label="毕业学校"   />
-    <element id="ADMISSION_DATE" component="date" label="毕业日期"   />
-    <element id="JOINED_DATE" component="date" label="入职日期"   />
-    <element id="LEAVE_DATE" component="date" label="离职日期"   />
+    <element id="SCHOOL" component="text" label="毕业学校" />
+    <element id="ADMISSION_DATE" component="date" label="毕业日期" isFilter="false"/>
+    <element id="JOINED_DATE" component="date" label="入职日期" />
+    <element id="LEAVE_DATE" component="date" label="离职日期" />
   </Fields>
 
  <Operations>
     <!-- <element id="BTN_ADD" type="button" label="新增团队成员" level="primary" actionType="add" icon="plus" size="sm" title="新增成员"/> -->
     <!-- <element id="BTN_DEL" type="button" label="删除" level="danger" actionType="del" /> -->
     <element id="BTN_MOD" type="button" label="修改" level="" actionType="edit" title="成员修改" feature="edit" />
-    <element id="BTN_BATCHDEL" type="button" label="批量删除" actionType="batch" size="sm" api="put:/space/team/membermanage/batchdel" feature="del" />
-    <element id="BTN_LEADER" type="button" label="设置负责人" actionType="batch" size="sm" api="post:/space/team/membermanage/api/group/leader" feature="edit" />
+    <element id="BTN_BATCHDEL" type="button" label="批量删除" actionType="batch" size="sm" api="put:/space/team/membermanage/batchdel" feature="del" visibleOn="'${cat}' !== 'GINGKOO'"/>
+    <element id="BTN_LEADER" type="button" label="设置负责人" actionType="batch" size="sm" api="post:/space/team/membermanage/api/group/leader" feature="edit" visibleOn="'${cat}' !== 'GINGKOO'"/>
   </Operations>
 
   <Table rowKey="USER_ID" autoFillHeight="true" 
@@ -56,7 +56,7 @@
     <TableBody>
     <column id="__check" />
       <column id="USER_NAME"  width="90"/>
-      <column id="LEADER"  width="60" sortable="true"  filterable="true"/>
+      <column id="LEADER"  width="60" />
       <column id="DEPT_NO" width="90" sortable="true"  filterable="true"/>
       <column id="MOBILE" width="120"/>
       <column id="EMAIL" width="120"/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/base-server",
-  "version": "0.0.4-alpha.42",
+  "version": "0.0.4-alpha.44",
   "description": "",
   "main": "app.js",
   "scripts": {