eoss-ui 0.7.57 → 0.7.59

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eoss-ui",
3
- "version": "0.7.57",
3
+ "version": "0.7.59",
4
4
  "description": "eoss内部业务组件",
5
5
  "main": "lib/eoss-ui.common.js",
6
6
  "files": [
@@ -16,6 +16,7 @@
16
16
  :nextUser="infoList.nextCurrentOrgObj"
17
17
  :multiple="newMultiple"
18
18
  mix
19
+ :showTooltip="showTooltip"
19
20
  @change="changeSelectUser($event, 'nextCurrentOrgObj')"
20
21
  :types="['employee', 'persongroup']"
21
22
  :params="params"
@@ -24,6 +25,7 @@
24
25
  <el-form-item prop="nextOtherOrgObj" label="外单位">
25
26
  <SelectUser
26
27
  :nextUser="infoList.nextOtherOrgObj"
28
+ :showTooltip="showTooltip"
27
29
  :multiple="newMultiple"
28
30
  :where="{ filid: 'other',roleid :selectorParams.roleid }"
29
31
  @change="changeSelectUser($event, 'nextOtherOrgObj')"
@@ -105,6 +107,7 @@ export default {
105
107
  },
106
108
  props: {
107
109
  pendingId: { type: String, default: '' },
110
+ showTooltip: { type: Boolean, default: true },
108
111
  processDefinitionId: { type: String, default: '' },
109
112
  businessId: { type: String, default: '' },
110
113
  type: { type: String, default: '' },
@@ -87,7 +87,9 @@
87
87
  :close-on-click-modal="false"
88
88
  title="添加常用意见"
89
89
  :visible.sync="addVisible"
90
+ :showScale="false"
90
91
  v-if="addVisible"
92
+ width="600"
91
93
  height="auto"
92
94
  >
93
95
  <ideas :data="FormData" @subMit="submit" />
@@ -22,6 +22,7 @@
22
22
  <SelectUser
23
23
  ref="selectUser"
24
24
  :showUser="true"
25
+ :showTooltip="showTooltip"
25
26
  :nextUser="item.nextUser"
26
27
  :radioList="item.radioList"
27
28
  :multiple="item.multiple"
@@ -64,6 +65,7 @@ export default {
64
65
  type: String,
65
66
  default: ''
66
67
  },
68
+ showTooltip: { type: Boolean, default: true },
67
69
  customPresetHintMessage: {
68
70
  type: String,
69
71
  default: ''
@@ -12,6 +12,7 @@
12
12
  :nextUser="nextCurrentOrgObjSelect"
13
13
  multiple
14
14
  mix
15
+ :showTooltip="showTooltip"
15
16
  :disableds="currentOrgDisabledObjId"
16
17
  @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
17
18
  :types="currentOrgSelectorTabs"
@@ -23,6 +24,7 @@
23
24
  :nextUser="nextOtherOrgObjSelect"
24
25
  multiple
25
26
  mix
27
+ :showTooltip="showTooltip"
26
28
  :disableds="otherOrgDisabledObjId"
27
29
  :where="{ filid: 'other',roleid :selectorParams.roleid }"
28
30
 
@@ -53,6 +55,7 @@ export default {
53
55
  type: String,
54
56
  default: 'left'
55
57
  },
58
+ showTooltip: { type: Boolean, default: true },
56
59
  selectorParams: { type: Object, default: () => {return {}} },
57
60
  params: {
58
61
  type: Object,
@@ -19,6 +19,7 @@
19
19
  <SelectUser
20
20
  ref="selectUser"
21
21
  :showUser="true"
22
+ :showTooltip="showTooltip"
22
23
  :nextUser="item.nextUser"
23
24
  :radioList="item.radioList"
24
25
  :multiple="item.multiple"
@@ -90,6 +91,7 @@ export default {
90
91
  deep: true,
91
92
  immediate: true
92
93
  },
94
+ showTooltip: { type: Boolean, default: true },
93
95
  parserActive: {
94
96
  handler(val) {
95
97
  if (val === '1') {
@@ -35,6 +35,7 @@
35
35
  "
36
36
  :multiple="newMultiple"
37
37
  :selectorTags="4"
38
+ :showTooltip="showTooltip"
38
39
  :mix="currentMix"
39
40
  :isUnionSeal="type == 'unionSeal'"
40
41
  :selectUserList="unionSealData || []"
@@ -69,6 +70,7 @@
69
70
  <SelectUser
70
71
  :nextUser="infoList.nextOtherOrgObj"
71
72
  :where="{ filid: 'other', roleid: selectorParams.roleid }"
73
+ :showTooltip="showTooltip"
72
74
  :multiple="newMultiple"
73
75
  @change="changeSelectUser($event, 'nextOtherOrgObj')"
74
76
  :mix="otherMix"
@@ -199,6 +201,7 @@ export default {
199
201
  },
200
202
  props: {
201
203
  pendingId: { type: String, default: '' },
204
+ showTooltip: { type: Boolean, default: true },
202
205
  type: { type: String, default: '' },
203
206
  defaultOpinion: { type: String, default: '' },
204
207
  oldOption: { type: String, default: '' },
@@ -24,6 +24,8 @@
24
24
  >
25
25
  <el-input
26
26
  v-model="newData.content"
27
+ type="textarea"
28
+ :rows="3"
27
29
  :placeholder="`请输入内容`"
28
30
  ></el-input>
29
31
  </el-form-item>
@@ -122,6 +122,7 @@
122
122
  <SelectUser
123
123
  :nextUser="nextNode.addSignUserId"
124
124
  :multiple="true"
125
+ :showTooltip="showTooltip"
125
126
  title="增加办理人"
126
127
  @change="changeSelectUser($event, 'addSignUserId', true)"
127
128
  />
@@ -259,6 +260,7 @@
259
260
  "
260
261
  :radioList="radioList"
261
262
  :multiple="multiple"
263
+ :showTooltip="showTooltip"
262
264
  :isCustomUser="!isShowNextUser ? 1 : isCustomUser"
263
265
  :isCurrentNodeForbiddenChangeCandidate="
264
266
  isCurrentNodeForbiddenChangeCandidate
@@ -288,6 +290,7 @@
288
290
  :nextUser="nextCurrentOrgObjSelect"
289
291
  multiple
290
292
  mix
293
+ :showTooltip="showTooltip"
291
294
  :disableds="currentOrgDisabledObjId"
292
295
  @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
293
296
  :types="['department', 'employee']"
@@ -304,6 +307,7 @@
304
307
  multiple
305
308
  mix
306
309
  :where="{ filid: 'other',roleid:selectorParams.roleid }"
310
+ :showTooltip="showTooltip"
307
311
  :disableds="otherOrgDisabledObjId"
308
312
  @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
309
313
  :types="['enterprise']"
@@ -344,6 +348,7 @@
344
348
  :nextUser="nextNode.nextReadUserId"
345
349
  :multiple="true"
346
350
  :selectUserList="selectReadUserList"
351
+ :showTooltip="showTooltip"
347
352
  :options="userOptions"
348
353
  title="分阅用户"
349
354
  :mix="true"
@@ -364,6 +369,7 @@
364
369
  :multiple="true"
365
370
  :selectUserList="selectPresetUserList"
366
371
  :options="presetOptions"
372
+ :showTooltip="showTooltip"
367
373
  :radioList="presetReadUserId"
368
374
  :presetEdit="1"
369
375
  title="分阅用户"
@@ -799,6 +805,7 @@ export default {
799
805
  },
800
806
  props: {
801
807
  isStartFlow: { type: Boolean, default: false },
808
+ showTooltip: { type: Boolean, default: true },
802
809
  startFlowBusinessId: { type: String, default: '' },
803
810
  pendingId: { type: String, default: '' },
804
811
  useScene: { type: String, default: '' },
@@ -84,6 +84,7 @@
84
84
  style="margin-top: 10px"
85
85
  :businessId="businessIds"
86
86
  :label-position="formLabelPosition"
87
+ :showTooltip="showTooltip"
87
88
  ref="circulate"
88
89
  :selectorParams="selectorParams"
89
90
  :pending-id="pendingId"
@@ -111,6 +112,7 @@
111
112
  v-else-if="typeCode == 'read'"
112
113
  :pending-id="pendingId"
113
114
  :opinion="value"
115
+ :showTooltip="showTooltip"
114
116
  type="create"
115
117
  :simpleTips="simpleTips"
116
118
  :key="StartTaskReadKey"
@@ -129,6 +131,7 @@
129
131
  :appId="resetAppId"
130
132
  :params="param"
131
133
  :showOther="showOther"
134
+ :showTooltip="showTooltip"
132
135
  :selectorParams="selectorParams"
133
136
  :formLabelPosition="formLabelPosition"
134
137
  :simpleTips="simpleTips"
@@ -136,6 +139,7 @@
136
139
  <Supervise
137
140
  :businessId="businessId"
138
141
  :appId="resetAppId"
142
+ :showTooltip="showTooltip"
139
143
  :simpleTips="simpleTips"
140
144
  @cancel="closeProcess($event)"
141
145
  v-else-if="typeCode == 'supervise'"
@@ -211,6 +215,7 @@
211
215
  :nextUser="nextCurrentOrgObjSelect"
212
216
  multiple
213
217
  mix
218
+ :showTooltip="showTooltip"
214
219
  :disableds="currentOrgDisabledObjId"
215
220
  @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
216
221
  :types="currentOrgSelectorTabs"
@@ -224,6 +229,7 @@
224
229
  <SelectUser
225
230
  :nextUser="nextOtherOrgObjSelect"
226
231
  multiple
232
+ :showTooltip="showTooltip"
227
233
  mix
228
234
  :disableds="otherOrgDisabledObjId"
229
235
  :where="{ filid: 'other' }"
@@ -321,6 +327,7 @@
321
327
  :nextUser="nextNode.addSignUserId"
322
328
  :multiple="true"
323
329
  title="增加办理人"
330
+ :showTooltip="showTooltip"
324
331
  @change="changeSelectUser($event, 'addSignUserId', true)"
325
332
  />
326
333
  </el-form-item>
@@ -467,6 +474,7 @@
467
474
  :radioList="radioList"
468
475
  :multiple="multiple"
469
476
  :isCustomUser="!isShowNextUser ? 1 : isCustomUser"
477
+ :showTooltip="showTooltip"
470
478
  :isCurrentNodeForbiddenChangeCandidate="
471
479
  isCurrentNodeForbiddenChangeCandidate
472
480
  "
@@ -498,6 +506,7 @@
498
506
  mix
499
507
  :disableds="currentOrgDisabledObjId"
500
508
  @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
509
+ :showTooltip="showTooltip"
501
510
  :types="currentOrgSelectorTabs"
502
511
  :params="currentOrgSelectorParams"
503
512
  />
@@ -510,6 +519,7 @@
510
519
  <SelectUser
511
520
  :nextUser="nextOtherOrgObjSelect"
512
521
  multiple
522
+ :showTooltip="showTooltip"
513
523
  mix
514
524
  :where="{ filid: 'other' }"
515
525
  :disableds="otherOrgDisabledObjId"
@@ -552,6 +562,7 @@
552
562
  :multiple="true"
553
563
  :selectUserList="selectReadUserList"
554
564
  :options="userOptions"
565
+ :showTooltip="showTooltip"
555
566
  title="分阅用户"
556
567
  :mix="true"
557
568
  :types="types"
@@ -570,6 +581,7 @@
570
581
  :nextUser="nextNode.presetReadUserId"
571
582
  :multiple="true"
572
583
  :selectUserList="selectPresetUserList"
584
+ :showTooltip="showTooltip"
573
585
  :options="presetOptions"
574
586
  :radioList="presetReadUserId"
575
587
  :presetEdit="1"
@@ -663,6 +675,7 @@
663
675
  "
664
676
  @changeActiveNames="(val) => (activeNames = val)"
665
677
  @loadingEnd="customLoading('end')"
678
+ :showTooltip="showTooltip"
666
679
  @loadingStart="customLoading('start')"
667
680
  :nextNode="nextNode.nextNodeId"
668
681
  :customPresetHintMessage="customPresetHintMessage"
@@ -679,6 +692,7 @@
679
692
  @loadingEnd="customLoading('end')"
680
693
  @loadingStart="customLoading('start')"
681
694
  :nodeId="nextNode.nextNodeId"
695
+ :showTooltip="showTooltip"
682
696
  :businessId="businessIds"
683
697
  :customPresetHintMessage="customPresetHintMessage"
684
698
  :processDefinitionId="nodeInfo.nextNode"
@@ -696,6 +710,7 @@
696
710
  ref="processFormIndex"
697
711
  :id="freeStartFlowParams.startFlowBusinessId || businessIds"
698
712
  :simpleTips="simpleTips"
713
+ :showTooltip="showTooltip"
699
714
  :is-free-start-flow="
700
715
  freeStartFlowParams.useScene === 'multiInsMidwayWithSubmitScene'
701
716
  "
@@ -722,6 +737,7 @@
722
737
  directCreateCircularReadWhenFlowStarted
723
738
  "
724
739
  ref="flowCirculate"
740
+ :showTooltip="showTooltip"
725
741
  :label-position="formLabelPosition"
726
742
  :businessId="businessId"
727
743
  :startFlowPageEmbeddedIntoStartFlowIndex="
@@ -973,6 +989,7 @@
973
989
  <circulate
974
990
  :businessId="businessId"
975
991
  :processDefinitionId="nodeInfo.nextNode"
992
+ :showTooltip="showTooltip"
976
993
  :simpleTips="simpleTips"
977
994
  :selectorParams="selectorParams"
978
995
  :oldOption="value"
@@ -993,6 +1010,7 @@
993
1010
  <ProcessForm
994
1011
  :id="freeStartFlowParams.startFlowBusinessId || businessIds"
995
1012
  :pending-id="pendingId"
1013
+ :showTooltip="showTooltip"
996
1014
  :simpleTips="simpleTips"
997
1015
  :is-free-start-flow="
998
1016
  freeStartFlowParams.useScene === 'multiInsMidwayWithSubmitScene'
@@ -1035,6 +1053,7 @@
1035
1053
  <ProcessReject
1036
1054
  :pending-id="pendingId"
1037
1055
  :option="value"
1056
+ :showTooltip="showTooltip"
1038
1057
  :simpleTips="simpleTips"
1039
1058
  :show-reject="showReject"
1040
1059
  :news-info="nextNode.notificationMsg"
@@ -1055,6 +1074,7 @@
1055
1074
  :pending-id="pendingId"
1056
1075
  :opinion="value"
1057
1076
  :type="taskReadType"
1077
+ :showTooltip="showTooltip"
1058
1078
  :selectorConfig="selectorConfig"
1059
1079
  :simpleTips="simpleTips"
1060
1080
  :subParams="subParams"
@@ -1091,6 +1111,7 @@
1091
1111
  @cancel="closeProcess($event, 'showSendMsg')"
1092
1112
  :simpleTips="simpleTips"
1093
1113
  :pendingId="pendingId"
1114
+ :showTooltip="showTooltip"
1094
1115
  :newsList="newsList"
1095
1116
  />
1096
1117
  </es-dialog>
@@ -1107,6 +1128,7 @@
1107
1128
  <TaskUnionExamine
1108
1129
  @cancel="closeProcess($event, 'showTaskUnionExamine')"
1109
1130
  :simpleTips="simpleTips"
1131
+ :showTooltip="showTooltip"
1110
1132
  :pendingId="pendingId"
1111
1133
  :defaultOpinion="nodeDefaultSubmitOpinion"
1112
1134
  :oldOption="value"
@@ -1205,6 +1227,7 @@ export default {
1205
1227
  },
1206
1228
  props: {
1207
1229
  showShrink: { type: Boolean, default: true },
1230
+ showTooltip: { type: Boolean, default: true },
1208
1231
  isStartFlow: { type: Boolean, default: false },
1209
1232
  businessId: { type: String, default: '' },
1210
1233
  pendingId: { type: String, default: '' },
@@ -3054,10 +3077,13 @@ export default {
3054
3077
  filid:
3055
3078
  foreignOrgparams[i] == 'my'
3056
3079
  ? choiceOrgId
3057
- : foreignOrgparams[i],
3058
- nofilid: foreignOrgparams[i] == 'other' ? 1 : 0,
3059
- roleid:this.circularReadParamsMap.circularReadOrgRoleCode || this.foreignOrgSelectorParams.roleid
3080
+ : foreignOrgparams[i] == 'nofilidorg' || foreignOrgparams[i] == 'nofiliddept' ? '' : foreignOrgparams[i],
3081
+ nofilid:foreignOrgparams[i] == 'nofilidorg'? sessionStorage.getItem('orgId') :foreignOrgparams[i] == 'nofiliddept'? sessionStorage.getItem('depId') : foreignOrgparams[i] == 'other' ? 1 : 0,
3082
+ roleid:this.circularReadParamsMap.circularReadOrgRoleCode || this.foreignOrgSelectorParams.roleid,
3060
3083
  };
3084
+ if(( foreignOrgparams[i] == 'nofilidorg' || foreignOrgparams[i] == 'nofiliddept') && x != "filgroup"){
3085
+ this.foreignOrgSelectorParams[x].id= `${foreignOrgparams[i] != 'nofilidorg' ? sessionStorage.getItem('orgId')+'-org-0' : sessionStorage.getItem('depId')+'-dep-0'}`
3086
+ }
3061
3087
  });
3062
3088
  }
3063
3089
  this.circularReadParamsMap = circularReadParamsMap || {};
@@ -125,6 +125,7 @@
125
125
  :nextUser="nextNode.nextUser"
126
126
  :radioList="radioList"
127
127
  :multiple="multiple"
128
+ :showTooltip="showTooltip"
128
129
  :isCustomUser="isCustomUser"
129
130
  :options="options"
130
131
  :presetEdit="presetEdit"
@@ -144,6 +145,7 @@
144
145
  :radioList="radioList"
145
146
  :multiple="multiple"
146
147
  :isCustomUser="!isShowNextUser ? 1 : isCustomUser"
148
+ :showTooltip="showTooltip"
147
149
  :isCurrentNodeForbiddenChangeCandidate="isCurrentNodeForbiddenChangeCandidate"
148
150
  :options="options"
149
151
  :presetEdit="presetEdit"
@@ -178,6 +180,7 @@
178
180
  :nextUser="nextNode.nextReadUserId"
179
181
  :multiple="true"
180
182
  :selectUserList="selectReadUserList"
183
+ :showTooltip="showTooltip"
181
184
  :options="userOptions"
182
185
  title="分阅用户"
183
186
  :mix="true"
@@ -197,6 +200,7 @@
197
200
  :nextUser="nextNode.presetReadUserId"
198
201
  :multiple="true"
199
202
  :selectUserList="selectPresetUserList"
203
+ :showTooltip="showTooltip"
200
204
  :options="presetOptions"
201
205
  title="分阅用户"
202
206
  :radioList="presetReadUserId"
@@ -413,6 +417,7 @@ export default {
413
417
  type: String,
414
418
  default: ''
415
419
  },
420
+ showTooltip: { type: Boolean, default: true },
416
421
  copyHistory: {
417
422
  type: String,
418
423
  default: ''
@@ -69,6 +69,7 @@
69
69
  :nextUser="nextNode.nextRoleId"
70
70
  :radioList="radioList"
71
71
  :multiple="multiple"
72
+ :showTooltip="showTooltip"
72
73
  :isCustomUser="isCustomUser"
73
74
  :options="options"
74
75
  :presetEdit="presetEdit"
@@ -93,6 +94,7 @@
93
94
  :nextUser="isShowNextUser ? nextNode.nextUser : nextNode.nextOrgId"
94
95
  :radioList="radioList"
95
96
  :multiple="multiple"
97
+ :showTooltip="showTooltip"
96
98
  :isCustomUser="!isShowNextUser ? 1 : isCustomUser"
97
99
  :options="options"
98
100
  :presetEdit="presetEdit"
@@ -127,6 +129,7 @@
127
129
  :nextUser="nextNode.nextReadUserId"
128
130
  :multiple="true"
129
131
  :selectUserList="selectReadUserList"
132
+ :showTooltip="showTooltip"
130
133
  :options="userOptions"
131
134
  title="分阅用户"
132
135
  :mix="true"
@@ -147,6 +150,7 @@
147
150
  :multiple="true"
148
151
  :selectUserList="selectPresetUserList"
149
152
  :options="presetOptions"
153
+ :showTooltip="showTooltip"
150
154
  title="分阅用户"
151
155
  :radioList="presetReadUserId"
152
156
  :presetEdit="1"
@@ -262,6 +266,7 @@ export default {
262
266
  type: Object,
263
267
  default: () => {}
264
268
  },
269
+ showTooltip: { type: Boolean, default: true },
265
270
  subParams: {
266
271
  type: Object,
267
272
  default: () => {}
@@ -83,6 +83,7 @@
83
83
  :where="{ ...newWhere, info: classify ? '' : 'no' }"
84
84
  :multiple="newMultiple"
85
85
  @cancel="cancelSelectUser"
86
+ :showTooltip="showTooltip"
86
87
  @change="getSelectUser"
87
88
  :param="{ ...newParams, info: classify ? '' : 'no' }"
88
89
  :disableds="disableds"
@@ -109,6 +110,10 @@ export default {
109
110
  tabs: {
110
111
  type: Object
111
112
  },
113
+ showTooltip:{
114
+ type: Boolean,
115
+ default: true
116
+ },
112
117
  isUnionSeal: {
113
118
  type: Boolean,
114
119
  default: false
@@ -51,6 +51,7 @@
51
51
  :multiple="type != 'transfer' ? multiple : false"
52
52
  :mix="type != 'transfer'"
53
53
  :selectUserList="selectUserList"
54
+ :showTooltip="showTooltip"
54
55
  :disableds="readDisableds"
55
56
  :types="
56
57
  selectorTabs
@@ -190,6 +191,7 @@ export default {
190
191
  props: {
191
192
  pendingId: { type: String, default: '' },
192
193
  simpleTips: { type: Boolean, default: true },
194
+ showTooltip: { type: Boolean, default: true },
193
195
  newsInfo: { type: String, default: '' },
194
196
  type: { type: String, default: '' },
195
197
  option: { type: String, default: '' },
@@ -465,6 +465,7 @@ export default {
465
465
  default: '0'
466
466
  },
467
467
  contents: Array,
468
+ closeWindow: Boolean,
468
469
  closeDialog: {
469
470
  type: Boolean,
470
471
  default: true
@@ -682,7 +683,14 @@ export default {
682
683
  this.$emit('endMessageChange', val);
683
684
  },
684
685
  handleSuccess() {
685
- if (this.closeDialog && this.esDialog) {
686
+ let windowOpenConfig = sessionStorage.getItem('windowOpenConfig');
687
+ if (this.closeWindow && windowOpenConfig) {
688
+ util.busEmit(this, {
689
+ method: 'windowClose',
690
+ ...JSON.parse(windowOpenConfig)
691
+ });
692
+ util.win.top.windowClose(JSON.parse(windowOpenConfig));
693
+ } else if (this.closeDialog && this.esDialog) {
686
694
  this.esDialog.handleClose();
687
695
  } else if (util.win.top.COOS_SDK) {
688
696
  util.win.top.COOS_SDK.closePopup && util.win.top.COOS_SDK.closePopup();
@@ -695,7 +703,14 @@ export default {
695
703
  this.$emit('success');
696
704
  },
697
705
  handleSave(id, event) {
698
- if (this.closeDialog && this.esDialog) {
706
+ let windowOpenConfig = sessionStorage.getItem('windowOpenConfig');
707
+ if (this.closeWindow && windowOpenConfig) {
708
+ util.busEmit(this, {
709
+ method: 'windowClose',
710
+ ...JSON.parse(windowOpenConfig)
711
+ });
712
+ util.win.top.windowClose(JSON.parse(windowOpenConfig));
713
+ } else if (this.closeDialog && this.esDialog) {
699
714
  this.esDialog.handleClose();
700
715
  } else if (util.win.top.COOS_SDK) {
701
716
  util.win.top.COOS_SDK.closePopup && util.win.top.COOS_SDK.closePopup();
@@ -175,8 +175,8 @@ export default {
175
175
  WujieVue.bus.$on('reLogin', this.handleReLogin);
176
176
  WujieVue.bus.$on('refresh', this.$refs.main.handleRefresh);
177
177
  WujieVue.bus.$on('jumpMenu', this.$refs.main.jumpMenu);
178
- WujieVue.bus.$on('windowOpen', this.$refs.main.winOpen);
179
- WujieVue.bus.$on('windowClose', this.$refs.main.winClose);
178
+ WujieVue.bus.$on('windowOpen', this.winOpen);
179
+ WujieVue.bus.$on('windowClose', this.winClose);
180
180
  WujieVue.bus.$on('emit', (method, args) => {
181
181
  // 主应用发送事件
182
182
  WujieVue.bus.$emit(method, args);
@@ -1447,46 +1447,44 @@ export default {
1447
1447
  * @date 2024年9月7日
1448
1448
  **/
1449
1449
  setTips(obj) {
1450
+ if (!this.menuTips || !Object.keys(this.menuTips).length) {
1451
+ return false;
1452
+ }
1450
1453
  if (Array.isArray(obj)) {
1454
+ let num = 0;
1451
1455
  obj.forEach((item) => {
1452
- this.setTips(item);
1456
+ let n = this.setTips(item);
1457
+ num += n ? parseInt(n) : 0;
1458
+ this.$set(obj, 'tips', num);
1459
+ this.setDot(this.userApps, item.appCode, num);
1460
+ this.setDot(this.applications, item.appCode, num);
1461
+ this.setDot(this.business, item.appCode, num);
1462
+ this.setDot(this.systems, item.appCode, num);
1453
1463
  });
1454
1464
  } else {
1455
1465
  if (
1456
- obj &&
1457
- Object.prototype.hasOwnProperty.call(obj, 'tips') &&
1458
- obj.tips
1466
+ (obj.children && obj.children.length) ||
1467
+ (obj.fourthTabs && obj.fourthTabs.length)
1459
1468
  ) {
1460
- this.$set(obj, 'tips', false);
1461
- delete obj.tips;
1462
- }
1463
- let flag = 0;
1464
- if (obj.children && obj.children.length) {
1465
- obj.children.forEach((item) => {
1466
- let n = this.setTips(item);
1467
- flag += n ? parseInt(n) : 0;
1468
- });
1469
- if (flag) {
1470
- this.$set(obj, 'tips', flag);
1471
- this.setDot(this.userApps, obj.appCode);
1472
- this.setDot(this.applications, obj.appCode);
1473
- this.setDot(this.business, obj.appCode);
1474
- this.setDot(this.systems, obj.appCode);
1475
- return flag;
1469
+ let num = 0;
1470
+ if (obj.children && obj.children.length) {
1471
+ obj.children.forEach((item) => {
1472
+ let n = this.setTips(item);
1473
+ num += n ? parseInt(n) : 0;
1474
+ });
1476
1475
  }
1477
- } else if (obj.fourthTabs && obj.fourthTabs.length) {
1478
- obj.fourthTabs.forEach((item) => {
1479
- let n = this.setTips(item);
1480
- flag += n ? parseInt(n) : 0;
1481
- });
1482
- if (flag) {
1483
- this.$set(obj, 'tips', flag);
1484
- this.setDot(this.userApps, obj.appCode);
1485
- this.setDot(this.applications, obj.appCode);
1486
- this.setDot(this.business, obj.appCode);
1487
- this.setDot(this.systems, obj.appCode);
1488
- return flag;
1476
+ if (obj.fourthTabs && obj.fourthTabs.length) {
1477
+ obj.fourthTabs.forEach((item) => {
1478
+ let n = this.setTips(item);
1479
+ num += n ? parseInt(n) : 0;
1480
+ });
1489
1481
  }
1482
+ this.$set(obj, 'tips', num);
1483
+ this.setDot(this.userApps, obj.appCode, num);
1484
+ this.setDot(this.applications, obj.appCode, num);
1485
+ this.setDot(this.business, obj.appCode, num);
1486
+ this.setDot(this.systems, obj.appCode, num);
1487
+ return num;
1490
1488
  } else {
1491
1489
  let num =
1492
1490
  this.menuTips[obj.id] ||
@@ -1500,13 +1498,14 @@ export default {
1500
1498
  }
1501
1499
  return false;
1502
1500
  },
1503
- setDot(obj, code) {
1501
+ setDot(obj, code, flag = true) {
1502
+ flag = flag ? true : false;
1504
1503
  if (Array.isArray(obj)) {
1505
1504
  obj.forEach((item) => {
1506
- this.setDot(item, code);
1505
+ this.setDot(item, code, flag);
1507
1506
  });
1508
1507
  } else if (obj.code === code) {
1509
- this.$set(obj, 'tips', true);
1508
+ this.$set(obj, 'tips', flag);
1510
1509
  }
1511
1510
  },
1512
1511
  /**
@@ -81,6 +81,7 @@
81
81
  :label-key="labelKey"
82
82
  :multiple="mix ? mix : multiple"
83
83
  :max="max"
84
+ :showTooltip="showTooltip"
84
85
  :showDisabled="showDisabled"
85
86
  :disableds="disableds"
86
87
  ></selection>
@@ -90,6 +91,7 @@
90
91
  :data="Array.isArray(checkeds) ? checkeds : [checkeds]"
91
92
  :value-key="valueKey"
92
93
  :label-key="labelKey"
94
+ :showTooltip="showTooltip"
93
95
  :multiple="multiple"
94
96
  :max="max"
95
97
  :mix="mix"
@@ -162,6 +164,10 @@ export default {
162
164
  type: Boolean,
163
165
  default: false
164
166
  },
167
+ showTooltip: {
168
+ type: Boolean,
169
+ default: true
170
+ },
165
171
  //页签
166
172
  tabs: Object,
167
173
  filtrate: {