vue2-client 1.8.442 → 1.8.443
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
package/src/layouts/GridView.vue
CHANGED
|
@@ -3,14 +3,16 @@
|
|
|
3
3
|
<a-card :bordered="false">
|
|
4
4
|
<XReport
|
|
5
5
|
ref="main"
|
|
6
|
+
v-if="configName"
|
|
6
7
|
:use-oss-for-img="false"
|
|
7
|
-
config-name="
|
|
8
|
+
:config-name="configName"
|
|
8
9
|
:show-img-in-cell="true"
|
|
9
10
|
:display-only="true"
|
|
10
11
|
:edit-mode="false"
|
|
11
12
|
:show-save-button="false"
|
|
12
13
|
:no-padding="true"
|
|
13
14
|
:dont-format="true"/>
|
|
15
|
+
<a-empty v-else/>
|
|
14
16
|
</a-card>
|
|
15
17
|
</div>
|
|
16
18
|
</template>
|
|
@@ -7,6 +7,8 @@ const view = {
|
|
|
7
7
|
import('@vue2-client/layouts/BlankView'),
|
|
8
8
|
page: () =>
|
|
9
9
|
import('@vue2-client/layouts/PageView'),
|
|
10
|
+
gridView: () =>
|
|
11
|
+
import('@vue2-client/layouts/gridView'),
|
|
10
12
|
login: () =>
|
|
11
13
|
import('@vue2-client/pages/login/Login'),
|
|
12
14
|
loginv3: () =>
|
|
@@ -19,6 +21,8 @@ const routerResource = {}
|
|
|
19
21
|
routerResource.blank = view.blank
|
|
20
22
|
// 单页面视图
|
|
21
23
|
routerResource.singlePage = view.blank
|
|
24
|
+
// 栅格配置视图
|
|
25
|
+
routerResource.gridView = view.gridView
|
|
22
26
|
|
|
23
27
|
// --------------------------------------仪表盘--------------------------------------
|
|
24
28
|
routerResource.dashboard = view.blank
|
package/src/utils/routerUtil.js
CHANGED
|
@@ -71,12 +71,22 @@ function parseRoutes (routesConfig, routerMap) {
|
|
|
71
71
|
item.path = encodeURI(item.name)
|
|
72
72
|
} else {
|
|
73
73
|
router = routerMap[item.router]
|
|
74
|
+
if (!router) {
|
|
75
|
+
router = routerMap.blank
|
|
76
|
+
}
|
|
74
77
|
}
|
|
75
78
|
// 查看是否是单页面
|
|
76
79
|
if (item.meta && item.meta.singlePage) {
|
|
77
80
|
router = routerMap.singlePage
|
|
78
81
|
item.path = encodeURI(item.name)
|
|
79
82
|
}
|
|
83
|
+
// 查看是否是栅格配置页面
|
|
84
|
+
if (item.meta && item.meta.type) {
|
|
85
|
+
if (item.meta.type === 'GridView') {
|
|
86
|
+
router = routerMap.gridView
|
|
87
|
+
item.path = encodeURI(item.name)
|
|
88
|
+
}
|
|
89
|
+
}
|
|
80
90
|
// 当没在动态路由对象中找到时, 不添加到路由
|
|
81
91
|
// if (!router) return
|
|
82
92
|
routeCfg = item
|