sh-view 2.9.16 → 2.9.17

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": "sh-view",
3
- "version": "2.9.16",
3
+ "version": "2.9.17",
4
4
  "description": "基于vxe-table二次封装,更包含Alert,Badge,Card,CodeEditor,Col,Corner,CountTo,Drawer,Empty,Form,Header,Icon,List,Loading,Modal,Noticebar,Poptip,Progress,PullRefresh,Query,Result,Row,Split,Grid,Table,Tabs,Tag,Toolbar,Tree,Upload,WaterFall,WaterMark等丰富组件库",
5
5
  "main": "packages/index.js",
6
6
  "typings": "types/index.d.ts",
@@ -14,7 +14,7 @@ $uiprefix: sh;
14
14
  }
15
15
  }
16
16
 
17
- @each $prefix, $value in (start, flex-start), (center, center), (end, flex-end), (around, space-around), (between, space-between) {
17
+ @each $prefix, $value in (start, flex-start), (center, center), (end, flex-end), (around, space-around), (between, space-between), (stretch, stretch) {
18
18
  .#{$uiprefix}-row-justify-#{$prefix} {
19
19
  justify-content: $value;
20
20
  }
@@ -39,7 +39,7 @@
39
39
  <vxe-toolbar ref="toolbarRef" v-bind="tableToolbarConfig">
40
40
  <template #buttons>
41
41
  <div v-if="tableGlobalConfig.title" class="sh-table-toolbar-item">
42
- <h3 class="tableName">{{ tableGlobalConfig.tableName }}</h3>
42
+ <h3 class="tableName">{{ tableName }}</h3>
43
43
  </div>
44
44
  <!--ps:全表搜索不支持反转-->
45
45
  <div v-if="tableGlobalConfig.globalFilter" class="sh-table-toolbar-item">
@@ -17,7 +17,6 @@ let omitProps = [
17
17
  'onPrintMethod'
18
18
  ]
19
19
  const globalConfigDefault = {
20
- tableName: '',
21
20
  title: false, // 是否显示 tableName
22
21
  selectType: '', // 是否选择框 空 radio checkbox
23
22
  seq: false, // 是否展示序号列
@@ -137,7 +136,7 @@ export default function (props, context, proxy, isGrid) {
137
136
  const tableExportConfig = computed(() =>
138
137
  Object.assign(
139
138
  {
140
- filename: tableGlobalConfig.value.tableName,
139
+ filename: props.tableName,
141
140
  sheetName: 'sheet1',
142
141
  type: 'xlsx',
143
142
  types: ['xlsx', 'csv', 'pdf', 'html', 'xml', 'txt'],
@@ -150,8 +149,8 @@ export default function (props, context, proxy, isGrid) {
150
149
  const tablePrintConfig = computed(() =>
151
150
  Object.assign(
152
151
  {
153
- filename: tableGlobalConfig.value.tableName,
154
- sheetName: tableGlobalConfig.value.tableName,
152
+ filename: props.tableName,
153
+ sheetName: props.tableName,
155
154
  beforePrintMethod: obj => getExportPrintDataByOption(obj, 'print')
156
155
  },
157
156
  exportAndPrintDefault,
@@ -223,7 +222,7 @@ export default function (props, context, proxy, isGrid) {
223
222
  const globalTool = globalFg.title || globalFg.globalFilter
224
223
  const toolbarTool = toolbarFg.import || toolbarFg.export || toolbarFg.print || toolbarFg.refresh || toolbarFg.custom
225
224
  const slotsTool = slots.toolbar || slots.toolbarLeft || slots.toolbarRight
226
- return globalTool || toolbarTool || slotsTool || toolsFg.length > 0
225
+ return globalTool || toolbarTool || slotsTool || toolsFg.length > 0 || tableMoneyConfig.value.enabled
227
226
  })
228
227
 
229
228
  // 获取选中数据
@@ -14,7 +14,7 @@
14
14
  <vxe-toolbar ref="toolbarRef" v-bind="tableToolbarConfig">
15
15
  <template #buttons>
16
16
  <div v-if="tableGlobalConfig.title" class="sh-table-toolbar-item">
17
- <h3 class="tableName">{{ tableGlobalConfig.tableName }}</h3>
17
+ <h3 class="tableName">{{ tableName }}</h3>
18
18
  </div>
19
19
  <!--ps:全表搜索不支持反转-->
20
20
  <div v-if="tableGlobalConfig.globalFilter" class="sh-table-toolbar-item">