@gingkoo/base-server 0.0.4-alpha.15 → 0.0.4-alpha.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/backend/common/page_engine.js +1 -0
  2. package/backend/common/services/roles.js +12 -7
  3. package/backend/routers/team/services/roles.js +6 -6
  4. package/package.json +2 -3
package/backend/common/page_engine.js CHANGED
@@ -28,6 +28,7 @@ const handleDynamicParams = (layout, data) => {
28
28
  if (Array.isArray(layout)) {
29
29
  return layout.map((it) => handleDynamicParams(it, data));
30
30
  } else if (typeof layout === 'object') {
31
+ if (!layout) return layout;
31
32
  let obj = {};
32
33
  Object.keys(layout).forEach((it) => {
33
34
  obj[it] = handleDynamicParams(layout[it], data);
package/backend/common/services/roles.js CHANGED
@@ -62,10 +62,15 @@ const dictService = {
62
62
  return results;
63
63
  },
64
64
 
65
- async isExistRoleId(id) {
66
- const { sql, params } = await queryBaseSqlBuilder(entity.IDM_ROLES, { ROLE_ID: id }, null, {
67
- isLike: false,
68
- });
65
+ async isExistRoleId(id, ROLE_TYPE = 'MANAGER') {
66
+ const { sql, params } = await queryBaseSqlBuilder(
67
+ entity.IDM_ROLES,
68
+ { ROLE_ID: id, ROLE_TYPE },
69
+ null,
70
+ {
71
+ isLike: false,
72
+ },
73
+ );
69
74
  let data = await sqlExecutor(sql, params);
70
75
  return data;
71
76
  },
@@ -105,8 +110,8 @@ const dictService = {
105
110
  return result;
106
111
  },
107
112
 
108
- async delRoles(id) {
109
- const { sql, params } = await deleteSqlBuilder(entity.IDM_ROLES, { ROLE_ID: id });
113
+ async delRoles(id, ROLE_TYPE = 'MANAGER') {
114
+ const { sql, params } = await deleteSqlBuilder(entity.IDM_ROLES, { ROLE_ID: id, ROLE_TYPE });
110
115
  let data = await sqlExecutor(sql, params);
111
116
  return data;
112
117
  },
@@ -114,12 +119,12 @@ const dictService = {
114
119
  async modifyRoles(param) {
115
120
  let body = {
116
121
  ROLE_NAME: param.ROLE_NAME || '',
117
- ROLE_TYPE: param.ROLE_TYPE || 'MANAGER',
118
122
  DEPT_NOS: param.DEPT_NOS || '',
119
123
  REMARKS: param.REMARKS || '',
120
124
  };
121
125
  const { sql, params } = await updateSqlBuilder(entity.IDM_ROLES, body, {
122
126
  ROLE_ID: param.ROLE_ID,
127
+ ROLE_TYPE: param.ROLE_TYPE || 'MANAGER',
123
128
  });
124
129
  let result = await sqlExecutor(sql, params);
125
130
  return result;
package/backend/routers/team/services/roles.js CHANGED
@@ -27,8 +27,8 @@ const rolesService = {
27
27
  let result = await pageQuery(sql, params, pageSize, pageIndex);
28
28
  return result;
29
29
  },
30
- isExistRoleId: async function (id) {
31
- const { sql, params } = await queryBaseSqlBuilder(entity.IDM_ROLES, { ROLE_ID: id });
30
+ isExistRoleId: async function (id, ROLE_TYPE = 'MANAGER') {
31
+ const { sql, params } = await queryBaseSqlBuilder(entity.IDM_ROLES, { ROLE_ID: id, ROLE_TYPE });
32
32
  let data = await sqlExecutor(sql, params);
33
33
  return data;
34
34
  },
@@ -38,7 +38,7 @@ const rolesService = {
38
38
  ORG_ID: global.orgid,
39
39
  ROLE_ID: param.ROLE_ID || '',
40
40
  ROLE_NAME: param.ROLE_NAME || '',
41
- ROLE_TYPE: 'MANAGER',
41
+ ROLE_TYPE: param.ROLE_TYPE || 'MANAGER',
42
42
  DEPT_NOS: param.DEPT_NOS || '',
43
43
  REMARKS: param.REMARKS || '',
44
44
  };
@@ -47,8 +47,8 @@ const rolesService = {
47
47
  return result;
48
48
  },
49
49
 
50
- async delRoles(id) {
51
- const { sql, params } = await deleteSqlBuilder(entity.IDM_ROLES, { ROLE_ID: id });
50
+ async delRoles(id, ROLE_TYPE = 'MANAGER') {
51
+ const { sql, params } = await deleteSqlBuilder(entity.IDM_ROLES, { ROLE_ID: id, ROLE_TYPE });
52
52
  let data = await sqlExecutor(sql, params);
53
53
  return data;
54
54
  },
@@ -56,12 +56,12 @@ const rolesService = {
56
56
  async modifyRoles(param) {
57
57
  let body = {
58
58
  ROLE_NAME: param.ROLE_NAME || '',
59
- ROLE_TYPE: 'MANAGER',
60
59
  DEPT_NOS: param.DEPT_NOS || '',
61
60
  REMARKS: param.REMARKS || '',
62
61
  };
63
62
  const { sql, params } = await updateSqlBuilder(entity.IDM_ROLES, body, {
64
63
  ROLE_ID: param.ROLE_ID,
64
+ ROLE_TYPE: param.ROLE_TYPE || 'MANAGER',
65
65
  });
66
66
  let result = await sqlExecutor(sql, params);
67
67
  return result;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/base-server",
3
- "version": "0.0.4-alpha.15",
3
+ "version": "0.0.4-alpha.16",
4
4
  "description": "",
5
5
  "main": "app.js",
6
6
  "scripts": {
@@ -8,8 +8,7 @@
8
8
  "build": "npm run clean && vite build --mode production",
9
9
  "serve": "nodemon serve -p 1000",
10
10
  "check": "node scripts/check_publish.js",
11
- "clean": "rimraf dist",
12
- "prepublishOnly": "npm run check && npm run build"
11
+ "clean": "rimraf dist"
13
12
  },
14
13
  "files": [
15
14
  "dist",