mooho-base-admin-plus 0.4.31 → 0.4.32

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": "0.4.31",
4
+ "version": "0.4.32",
5
5
  "author": "jinyifan <jinyifan@mooho.com.cn>",
6
6
  "dotnetVersion": "1.4.0",
7
7
  "license": "MIT",
@@ -13,7 +13,9 @@
13
13
  <Col :key="index" v-if="column.isShow || column.controlType === 'Table' || column.controlType === 'List'" v-show="column.isShow" v-bind="getGrid(column.columnWidth)">
14
14
  <div :key="column.code" v-if="column.controlType === 'Placeholder'" style="margin-bottom: 0px"></div>
15
15
  <div :key="column.code" v-if="column.controlType === 'Title'">
16
- <div class="form-title" :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }">{{ column.name }} {{ showData(data, column) }}</div>
16
+ <div class="form-title" :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }">
17
+ {{ getNameI18n(column) }} {{ showData(data, column) }}
18
+ </div>
17
19
  </div>
18
20
  <div v-if="column.controlType === 'Table'">
19
21
  <Divider :plain="true" dashed orientation="left" size="small">
@@ -894,7 +894,7 @@
894
894
  title: ' ',
895
895
  slot: 'command',
896
896
  align: 'center',
897
- width: this.embedded && !this.tableView.commandWidth ? 60 : this.tableView.commandWidth == null ? 90 : (this.tableView.commandWidth + 1) * 30,
897
+ width: this.embedded && !this.tableView.commandWidth ? 60 : this.tableView.commandWidth == null ? 90 : (this.tableView.commandWidth + 1) * 28,
898
898
  fixed: 'right'
899
899
  };
900
900
 
@@ -15,7 +15,8 @@
15
15
  v-if="!hideTitle"
16
16
  >
17
17
  {{ this.layout.showI18n ? this.$t('Permission_' + menu.code) : menu.title }}
18
- <em v-if="!!(menu.subtitle || '').trim()">{{ this.layout.showI18n ? this.$t('Permission_' + menu.code + '_SubName') : menu.subTitle }}</em>
18
+ <em v-if="this.layout.showI18n && !!(this.$t('Permission_' + menu.code + '_SubName') || '').trim()">{{ this.$t('Permission_' + menu.code + '_SubName') }}</em>
19
+ <em v-if="!this.layout.showI18n && !!(menu.subtitle || '').trim()">{{ menu.subTitle }}</em>
19
20
  </span>
20
21
  </span>
21
22
  </template>