system-clients 3.2.60-test → 3.2.60-test1

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 (2) hide show
  1. package/package.json +1 -1
  2. package/src/plugins/GetLoginInfoService.js +5 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "system-clients",
3
- "version": "3.2.60-test",
3
+ "version": "3.2.60-test1",
4
4
  "description": "系统基础框架",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/plugins/GetLoginInfoService.js CHANGED
@@ -18,13 +18,13 @@ let loginGen = async function (name, password, cue) {
18
18
  rejectMsg: null
19
19
  })
20
20
  // 兼容旧版ldao
21
- if ((resource.data.startsWith("{") || resource.data.startsWith("[")) && resource.data.code && resource.data.msg && resource.data.code !== 200) {
21
+ if ((JSON.stringify(resource.data).startsWith("{") || JSON.stringify(resource.data).startsWith("[")) && resource.data.code && resource.data.msg && resource.data.code !== 200) {
22
22
  throw {status: 555, data: resource.data.msg}
23
23
  }
24
24
  console.log('登陆获取Util', JSON.stringify(resource.data))
25
25
 
26
26
  // 兼容旧版ldao，旧版不返回code
27
- if ((resource.data.startsWith("{") || resource.data.startsWith("[")) && resource.data.code && resource.data.msg) {
27
+ if ((JSON.stringify(resource.data).startsWith("{") || JSON.stringify(resource.data).startsWith("[")) && resource.data.code && resource.data.msg) {
28
28
  Vue.$login.f = resource.data.data
29
29
  } else {
30
30
  Vue.$login.f = resource.data
@@ -34,9 +34,9 @@ let loginGen = async function (name, password, cue) {
34
34
  try {
35
35
  //获取有权限的功能树
36
36
  let hasRight = await Vue.resetpost(`/rs/search`, {
37
- source: "tool.getFullTree(this.getRights().where(row.getType() == $function$))",
38
- userid: Vue.$login.f.id
39
- }, { resolveMsg: null, rejectMsg: null })
37
+ source: "tool.getFullTree(this.getRights().where(row.getType() == $function$))",
38
+ userid: Vue.$login.f.id
39
+ }, { resolveMsg: null, rejectMsg: null })
40
40
  console.log('有权限功能返回数据', JSON.stringify(hasRight.data))
41
41
  //准备替换功能树
42
42
  var fun = []