n20-common-lib 2.2.22 → 2.2.24

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 (6) hide show
  1. package/package.json +1 -1
  2. package/src/components/ApprovalCard/index.vue +11 -3
  3. package/src/components/ApprovalRecord/approvalImg.vue +12 -4
  4. package/src/components/ApprovalRecord/flowDialog.vue +10 -1
  5. package/src/components/Layout/HeaderWrap/index.vue +5 -1
  6. package/src/components/Layout/HeaderWrap/indexN.vue +5 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "2.2.22",
3
+ "version": "2.2.24",
4
4
  "private": false,
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/ApprovalCard/index.vue CHANGED
@@ -121,6 +121,10 @@ export default {
121
121
  procInstId: {
122
122
  type: String,
123
123
  default: undefined
124
+ },
125
+ hideLoading: {
126
+ type: Boolean,
127
+ default: false
124
128
  }
125
129
  },
126
130
  data() {
@@ -132,9 +136,13 @@ export default {
132
136
  created() {
133
137
  if (this.procInstId) {
134
138
  axios
135
- .get(`/bems/activiti/sample/Q003?r=${Math.random()}`, {
136
- procInstId: this.procInstId
137
- })
139
+ .get(
140
+ `/bems/activiti/sample/Q003?r=${Math.random()}`,
141
+ {
142
+ procInstId: this.procInstId
143
+ },
144
+ { loading: !this.hideLoading }
145
+ )
138
146
  .then(({ data = [] }) => {
139
147
  let approvalData = []
140
148
  data.forEach((item) => {
package/src/components/ApprovalRecord/approvalImg.vue CHANGED
@@ -20,6 +20,10 @@ export default {
20
20
  procInstId: {
21
21
  type: String,
22
22
  default: ''
23
+ },
24
+ hideLoading: {
25
+ type: Boolean,
26
+ default: false
23
27
  }
24
28
  },
25
29
  data() {
@@ -34,9 +38,13 @@ export default {
34
38
  methods: {
35
39
  getSvg() {
36
40
  axios
37
- .get('/bems/activiti/sample/Q004', {
38
- procInstId: this.procInstId || this.$route.query.processInstanceId
39
- })
41
+ .get(
42
+ '/bems/activiti/sample/Q004',
43
+ {
44
+ procInstId: this.procInstId || this.$route.query.processInstanceId
45
+ },
46
+ { loading: !this.hideLoading }
47
+ )
40
48
  .then(({ data }) => {
41
49
  if (data) {
42
50
  let file = new File([data], '流程图.svg', {
@@ -53,7 +61,7 @@ export default {
53
61
  {
54
62
  procInstId: this.procInstId || this.$route.query.processInstanceId
55
63
  },
56
- { noMsg: true }
64
+ { noMsg: true, loading: !this.hideLoading }
57
65
  )
58
66
  .then((res) => {
59
67
  this.dataPro = res.data
package/src/components/ApprovalRecord/flowDialog.vue CHANGED
@@ -2,7 +2,12 @@
2
2
  <div>
3
3
  <el-button plain size="mini" :disabled="false" @click="imgV = true">{{ '流程图查看' | $lc }}</el-button>
4
4
  <el-dialog :title="'查看流程' | $lc" :visible.sync="imgV" width="65%" class="p-a-0" append-to-body top="10vh">
5
- <approvalImg :proc-inst-id="procInstId" class="text-c p-a" style="height: 70vh; overflow: auto" />
5
+ <approvalImg
6
+ :proc-inst-id="procInstId"
7
+ :hide-loading="hideLoading"
8
+ class="text-c p-a"
9
+ style="height: 70vh; overflow: auto"
10
+ />
6
11
  </el-dialog>
7
12
  </div>
8
13
  </template>
@@ -18,6 +23,10 @@ export default {
18
23
  procInstId: {
19
24
  type: String,
20
25
  default: ''
26
+ },
27
+ hideLoading: {
28
+ type: Boolean,
29
+ default: false
21
30
  }
22
31
  },
23
32
  data() {
package/src/components/Layout/HeaderWrap/index.vue CHANGED
@@ -368,7 +368,11 @@ export default {
368
368
  window.localStorage.setItem('pageLang', this.langVal)
369
369
  Cookies.set('language', ['zh-cn', 'zh-hk'].includes(this.langVal) ? 'zh' : this.langVal, { expires: 365 })
370
370
  auth.setReqLang()
371
- axios.get('/bems/1.0/menuTree/tree').then(({ data }) => {
371
+ let form = {
372
+ resType: '1',
373
+ systemNo: localStorage.getItem('pageInSystemNo') || undefined
374
+ }
375
+ axios.get('/bems/1.0/menuTree/tree', form).then(({ data }) => {
372
376
  data || (data = [])
373
377
  let layoutMenus = siteTree2menus(data)
374
378
  sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
package/src/components/Layout/HeaderWrap/indexN.vue CHANGED
@@ -464,7 +464,11 @@ export default {
464
464
  window.localStorage.setItem('pageLang', this.langVal)
465
465
  Cookies.set('language', ['zh-cn', 'zh-hk'].includes(this.langVal) ? 'zh' : this.langVal, { expires: 365 })
466
466
  auth.setReqLang()
467
- axios.get('/bems/1.0/menuTree/tree').then(({ data }) => {
467
+ let form = {
468
+ resType: '1',
469
+ systemNo: localStorage.getItem('pageInSystemNo') || undefined
470
+ }
471
+ axios.get('/bems/1.0/menuTree/tree', form).then(({ data }) => {
468
472
  data || (data = [])
469
473
  let layoutMenus = siteTree2menus(data)
470
474
  sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))