mooho-base-admin-plus 2.4.33 → 2.4.35

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,7 +1,7 @@
1
1
  {
2
2
  "name": "mooho-base-admin-plus",
3
3
  "description": "MOOHO basic framework for admin by Vue3",
4
- "version": "2.4.33",
4
+ "version": "2.4.35",
5
5
  "author": "jinyifan <jinyifan@mooho.com.cn>",
6
6
  "license": "MIT",
7
7
  "private": false,
@@ -3,7 +3,7 @@
3
3
  <Card :bordered="false" :padding="6" class="ivu-mb">
4
4
  <template #title>
5
5
  <div>
6
- <Avatar icon="md-apps" size="small" v-color="'#1890ff'" v-bg-color="'#e6f7ff'" />
6
+ <Avatar icon="md-apps" style="font-size: 10px" size="small" v-color="'#1890ff'" v-bg-color="'#e6f7ff'" />
7
7
  <span class="ivu-pl-8">{{ $t('Front_Label_Notice') }}</span>
8
8
  </div>
9
9
  </template>
@@ -339,10 +339,10 @@ export default {
339
339
  }
340
340
  },
341
341
  showMultiLine(content) {
342
- if (content == null) {
343
- return null;
344
- } else {
342
+ if (typeof content === 'string') {
345
343
  return content.replaceAll(' ', '&nbsp;').replaceAll('\n', '<br/>');
344
+ } else {
345
+ return content;
346
346
  }
347
347
  },
348
348
  // 根据表达式取值
@@ -1,16 +1,12 @@
1
1
  <template>
2
2
  <div>
3
- <Row :gutter="24" class="ivu-mt">
4
- <Col :xxl="8" :xl="12" :lg="12" :md="12" :sm="24" :xs="24" class="ivu-mb">
3
+ <Row :gutter="12" class="ivu-mt">
4
+ <Col :xxl="8" :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
5
5
  <div>
6
- <Row :gutter="24">
6
+ <Row :gutter="12">
7
7
  <Col v-bind="grid" class="ivu-mb">
8
- <Card :bordered="false" :padding="12">
9
- <template #title>
10
- <p>
11
- <span>检测任务</span>
12
- </p>
13
- </template>
8
+ <Card :bordered="false">
9
+ <template #title>检测任务</template>
14
10
  <div class="stat">
15
11
  <div class="icon">
16
12
  <Icon type="md-speedometer" color="rgb(24, 144, 255)" />
@@ -29,12 +25,8 @@
29
25
  </Card>
30
26
  </Col>
31
27
  <Col v-bind="grid" class="ivu-mb">
32
- <Card :bordered="false" :padding="12">
33
- <template #title>
34
- <p>
35
- <span>原始记录</span>
36
- </p>
37
- </template>
28
+ <Card :bordered="false">
29
+ <template #title>原始记录</template>
38
30
  <div class="stat">
39
31
  <div class="icon">
40
32
  <Icon type="md-list-box" color="rgb(250, 173, 20)" />
@@ -53,12 +45,8 @@
53
45
  </Card>
54
46
  </Col>
55
47
  <Col v-bind="grid" class="ivu-mb">
56
- <Card :bordered="false" :padding="12">
57
- <template #title>
58
- <p>
59
- <span>检测报告</span>
60
- </p>
61
- </template>
48
+ <Card :bordered="false">
49
+ <template #title>检测报告</template>
62
50
  <div class="stat">
63
51
  <div class="icon">
64
52
  <Icon type="md-print" color="rgb(19, 194, 194)" />
@@ -77,12 +65,8 @@
77
65
  </Card>
78
66
  </Col>
79
67
  <Col v-bind="grid" class="ivu-mb">
80
- <Card :bordered="false" :padding="12">
81
- <template #title>
82
- <p>
83
- <span>检测样件</span>
84
- </p>
85
- </template>
68
+ <Card :bordered="false">
69
+ <template #title>检测样件</template>
86
70
  <div class="stat">
87
71
  <div class="icon">
88
72
  <Icon type="md-analytics" color="#b37feb" />
@@ -103,10 +87,10 @@
103
87
  </Row>
104
88
  </div>
105
89
  </Col>
106
- <Col :xl="10" :lg="8" :md="8" :sm="12" :xs="24" class="ivu-mb">
90
+ <Col :xl="10" :lg="8" :md="8" :sm="12" :xs="24">
107
91
  <notice-list />
108
92
  </Col>
109
- <Col :xl="6" :lg="8" :md="8" :sm="12" :xs="24" class="ivu-mb">
93
+ <Col :xl="6" :lg="8" :md="8" :sm="12" :xs="24">
110
94
  <shortcut />
111
95
  </Col>
112
96
  </Row>
@@ -301,7 +301,13 @@ export default {
301
301
 
302
302
  let permissions = {};
303
303
  res.permissions.forEach(key => {
304
- permissions[key.split('?')[0]] = true;
304
+ let permissionKey = key.split('?')[0];
305
+
306
+ if (key.split('$').length > 1) {
307
+ permissionKey = permissionKey + '$' + key.split('$')[1];
308
+ }
309
+
310
+ permissions[permissionKey] = true;
305
311
  });
306
312
 
307
313
  state.userPermissions = permissions;
@@ -55,6 +55,14 @@
55
55
  margin-bottom: -80px;
56
56
  }
57
57
 
58
+ .i-layout-content-main {
59
+ margin: 12px;
60
+ }
61
+
62
+ .ivu-mb {
63
+ margin-bottom: 12px !important;
64
+ }
65
+
58
66
  /* 菜单 */
59
67
  .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu.ivu-menu-item-active > .i-layout-menu-side-title > .i-layout-menu-side-title-text > em,
60
68
  .ivu-menu-dark.ivu-menu-vertical .ivu-menu-item.ivu-menu-item-active > .i-layout-menu-side-title > .i-layout-menu-side-title-text > em {