vue2-client 1.8.173 → 1.8.174

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/base-client/components/common/XReport/XReportTrGroup.vue +3 -3
  3. package/src/pages/Example/index.vue +255 -1191
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vue2-client",
3
- "version": "1.8.173",
3
+ "version": "1.8.174",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
package/src/base-client/components/common/XReport/XReportTrGroup.vue CHANGED
@@ -426,12 +426,12 @@ export default {
426
426
  if (cell.type === 'column') {
427
427
  if (this.config.labelStyle !== undefined) {
428
428
  if (cell.noBorder) {
429
- result = { ...noBorder }
429
+ result = { ...noBorder, ...this.config.labelStyle }
430
430
  } else {
431
431
  if (this.noTopBorder) {
432
- result = { ...NoTopBorder }
432
+ result = { ...NoTopBorder, ...this.config.labelStyle }
433
433
  } else {
434
- result = { ...withBorder }
434
+ result = { ...withBorder, ...this.config.labelStyle }
435
435
  }
436
436
  }
437
437
  return result