doway-coms 2.1.4 → 2.1.6
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
|
@@ -2619,7 +2619,7 @@ export default {
|
|
|
2619
2619
|
//需要不同条件跳转不同页面
|
|
2620
2620
|
for (let i = 0; i < tempRouteName.length; i++) {
|
|
2621
2621
|
if (tempRouteName[i].value === row[tempRouteName[i].field]) {
|
|
2622
|
-
tempRouteQuery = row[tempRouteName[i].query]
|
|
2622
|
+
tempRouteQuery = row[tempRouteName[i].query] || row[column.params.route.field]
|
|
2623
2623
|
tempRouteName = tempRouteName[i].name
|
|
2624
2624
|
break
|
|
2625
2625
|
}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
.d-control-container {
|
|
2
|
+
display: flex;
|
|
3
|
+
}
|
|
4
|
+
.d-control-label {
|
|
5
|
+
font-size: 12px;
|
|
6
|
+
font-weight: bold;
|
|
7
|
+
flex: 0 0 100px;
|
|
8
|
+
}
|
|
9
|
+
.d-control {
|
|
10
|
+
flex: 1;
|
|
11
|
+
width: 100%;
|
|
12
|
+
height: 30px;
|
|
13
|
+
overflow: hidden;
|
|
14
|
+
white-space: nowrap;
|
|
15
|
+
text-overflow: ellipsis;
|
|
16
|
+
}
|
|
17
|
+
.d-control-label-required {
|
|
18
|
+
color: red;
|
|
19
|
+
}
|
|
20
|
+
.d-error-input {
|
|
21
|
+
border-color: #f22435 !important;
|
|
22
|
+
}
|
|
23
|
+
.d-error-input input {
|
|
24
|
+
border-color: #f22435 !important;
|
|
25
|
+
}
|
|
26
|
+
.d-error-input input:hover {
|
|
27
|
+
border-color: #f22435 !important;
|
|
28
|
+
}
|
|
29
|
+
.d-error-input div {
|
|
30
|
+
border-color: #f22435 !important;
|
|
31
|
+
}
|
|
32
|
+
.d-error-msg {
|
|
33
|
+
color: #f22435;
|
|
34
|
+
font-size: 0.75em;
|
|
35
|
+
position: fixed;
|
|
36
|
+
}
|
|
37
|
+
.d-form-items {
|
|
38
|
+
display: flex;
|
|
39
|
+
flex-flow: row wrap;
|
|
40
|
+
justify-content: flex-start;
|
|
41
|
+
padding: 8px 8px 8px 8px;
|
|
42
|
+
overflow-y: auto;
|
|
43
|
+
}
|
|
44
|
+
.d-form-items .d-form-item-ghost {
|
|
45
|
+
visibility: hidden;
|
|
46
|
+
height: 0;
|
|
47
|
+
min-height: 0px !important;
|
|
48
|
+
flex-grow: 1;
|
|
49
|
+
flex-shrink: 1;
|
|
50
|
+
flex-basis: auto;
|
|
51
|
+
border: 1px solid #9ad4dc;
|
|
52
|
+
min-width: 150px;
|
|
53
|
+
width: 280px;
|
|
54
|
+
margin-right: 8px;
|
|
55
|
+
margin-left: 8px;
|
|
56
|
+
border-radius: 6px;
|
|
57
|
+
}
|
|
58
|
+
.d-form-items .d-form-item {
|
|
59
|
+
width: 280px;
|
|
60
|
+
flex-grow: 1;
|
|
61
|
+
flex-shrink: 1;
|
|
62
|
+
flex-basis: auto;
|
|
63
|
+
margin-top: 0px;
|
|
64
|
+
margin-right: 8px;
|
|
65
|
+
margin-bottom: 0px;
|
|
66
|
+
margin-left: 8px;
|
|
67
|
+
padding: 6px 8px 6px 8px;
|
|
68
|
+
min-width: 150px;
|
|
69
|
+
border-radius: 6px;
|
|
70
|
+
}
|
|
71
|
+
.d-form-items .d-form-item .search-view-icon {
|
|
72
|
+
float: left;
|
|
73
|
+
width: 64px;
|
|
74
|
+
height: 64px;
|
|
75
|
+
}
|
|
76
|
+
.vxe-table--render-default .vxe-table--body-wrapper {
|
|
77
|
+
position: inherit !important;
|
|
78
|
+
}
|
package/packages/utils/common.js
CHANGED
|
@@ -245,7 +245,16 @@ export function replaceParamString(
|
|
|
245
245
|
to.meta['aliveCacheKey'] = to.params.aliveCacheKey
|
|
246
246
|
}
|
|
247
247
|
if(!to.meta.aliveCacheKey){
|
|
248
|
-
|
|
248
|
+
// alert('防呆，子应用没有路由缓存键:' + JSON.stringify(to))
|
|
249
|
+
notification.error({
|
|
250
|
+
style: {
|
|
251
|
+
whiteSpace: 'pre-wrap'
|
|
252
|
+
},
|
|
253
|
+
message: '路由错误',
|
|
254
|
+
description: '防呆，子应用没有路由缓存键:' + JSON.stringify(to),
|
|
255
|
+
placement: 'topRight',
|
|
256
|
+
top: '100px'
|
|
257
|
+
})
|
|
249
258
|
}
|
|
250
259
|
if (to.meta.moduleCode && !store.getters.moduleViewInfo[to.meta.moduleCode]) {
|
|
251
260
|
// axios.all([store.dispatch('moduleLoadViewInfo', { moduleCode: to.meta.moduleCode }),
|