vue2-client 1.8.164 → 1.8.165

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/base-client/components/common/XReport/XReport.vue +1 -0
  3. package/src/base-client/components/common/XReport/XReportDesign.vue +4 -1
  4. package/src/base-client/components/common/XReport/XReportJsonRender.vue +30 -7
  5. package/src/pages/Example/index.vue +9 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vue2-client",
3
- "version": "1.8.164",
3
+ "version": "1.8.165",
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/XReport.vue CHANGED
@@ -644,6 +644,7 @@ export default {
644
644
  }
645
645
  if (this.localConfig) {
646
646
  if (this.localConfig.designMode === 'json') {
647
+ this.config = this.localConfig
647
648
  if (this.configData !== undefined) {
648
649
  this.config.data = this.configData
649
650
  }
package/src/base-client/components/common/XReport/XReportDesign.vue CHANGED
@@ -1,7 +1,10 @@
1
1
  <template>
2
2
  <div>
3
3
  <template v-if="this.activatedConfig.designMode === 'json'">
4
- <XReportJsonRender :config="activatedConfig"/>
4
+ <XReportJsonRender
5
+ :no-padding="noPadding"
6
+ :no-top-border="noTopBorder"
7
+ :config="activatedConfig"/>
5
8
  </template>
6
9
  <template v-else>
7
10
  <div :class=" noPadding ? 'reportMainNoPadding' : 'reportMain'" :style="activatedConfig.width > 0 ? ('width:' + activatedConfig.width + 'px') : undefined">
package/src/base-client/components/common/XReport/XReportJsonRender.vue CHANGED
@@ -1,22 +1,22 @@
1
1
  <template>
2
- <div class="reportMain">
2
+ <div :class="noPadding ? 'reportMainNoPadding' : 'reportMain'">
3
3
  <table class="reportTable">
4
4
  <tbody class="reportTable">
5
5
  <tr v-if="config.title.type && config.title.type !== ''">
6
- <th class="tdWithBorder" colspan="12">
6
+ <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="12">
7
7
  <template v-if="config.title.type === 'titleKey'">
8
8
  {{ config.data[config.title.value] }}
9
9
  </template>
10
10
  <template v-else-if="config.title.type === 'titleValue'">
11
11
  {{ config.title.value }}
12
12
  </template>
13
- </th>
13
+ </td>
14
14
  </tr>
15
15
  <template v-for="(row, rowIndex) in config.content">
16
16
  <template v-if="row.type === 'jsonKey'">
17
17
  <tr :key="rowIndex">
18
18
  <!-- 表头 -->
19
- <td class="tdWithBorder" colspan="6">
19
+ <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
20
20
  <template v-if="receivedFunction[rowIndex].labelFunction(config).type === 'key'">
21
21
  {{ config.data[receivedFunction[rowIndex].labelFunction(config).content] }}
22
22
  </template>
@@ -25,7 +25,7 @@
25
25
  </template>
26
26
  </td>
27
27
  <!-- 内容 -->
28
- <td class="tdWithBorder" colspan="6">
28
+ <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
29
29
  <template v-if="receivedFunction[rowIndex].valueFunction(config).type === 'key'">
30
30
  {{ config.data[receivedFunction[rowIndex].valueFunction(config).content] }}
31
31
  </template>
@@ -47,7 +47,7 @@
47
47
  <template v-else-if="row.type === 'jsonArray'">
48
48
  <tr :key="rowIndex + '' + jsonArrayItemIndex" v-for="(item, jsonArrayItemIndex) in config.data[row.jsonArrayDataIndex]">
49
49
  <!-- 表头 -->
50
- <td class="tdWithBorder" colspan="6">
50
+ <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
51
51
  <template v-if="receivedFunction[rowIndex].labelFunction(config, item).type === 'key'">
52
52
  {{ item[receivedFunction[rowIndex].labelFunction(config, item).content] }}
53
53
  </template>
@@ -56,7 +56,7 @@
56
56
  </template>
57
57
  </td>
58
58
  <!-- 内容 -->
59
- <td class="tdWithBorder" colspan="6">
59
+ <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
60
60
  <template v-if="receivedFunction[rowIndex].valueFunction(config, item).type === 'key'">
61
61
  {{ item[receivedFunction[rowIndex].valueFunction(config, item).content] }}
62
62
  </template>
@@ -92,6 +92,14 @@ export default {
92
92
  config: {
93
93
  type: Object,
94
94
  required: true
95
+ },
96
+ noPadding: {
97
+ type: Boolean,
98
+ default: false
99
+ },
100
+ noTopBorder: {
101
+ type: Boolean,
102
+ default: false
95
103
  }
96
104
  },
97
105
  data () {
@@ -141,6 +149,14 @@ export default {
141
149
  padding: 15px;
142
150
  border-radius: 8px;
143
151
  }
152
+ .reportMainNoPadding {
153
+ text-align: center;
154
+ margin: 0 auto;
155
+ font-size: 16px;
156
+ color: #000;
157
+ background-color: #fff;
158
+ border-radius: 8px;
159
+ }
144
160
  .reportTitle {
145
161
  font-weight: bold;
146
162
  }
@@ -158,4 +174,11 @@ export default {
158
174
  color: rgb( 24,144,255);
159
175
  cursor: pointer;
160
176
  }
177
+ .tdWithNoTopBorder {
178
+ border-top-style: none;
179
+ border-left: 1px solid #000;
180
+ border-right: 1px solid #000;
181
+ border-bottom: 1px solid #000;
182
+ padding: 8px;
183
+ }
161
184
  </style>
package/src/pages/Example/index.vue CHANGED
@@ -3,10 +3,18 @@
3
3
  <!-- <XReport :config-name="'test_tableConfig'" :activated-slot-name="'test_tableConfig_slot'"/>-->
4
4
  <!-- <XReport :config-name="'test_tableConfig'" :local-config="test_config_withoutSlot" :config-data="test_config_data"/>-->
5
5
  <!-- <XReport :config-name="'test_tableConfig'" :local-config="test_yangchun_json" :config-data="test_yangchun_data" :dont-format="true"/>-->
6
- <!-- <XReport :config-name="'test_tableConfig'" :local-config="test_yangchun_json" :config-data="test_yangchun_jsonData" :dont-format="true"/>-->
6
+ <!-- <XReport :config-name="'test_tableConfig'" :local-config="test_yangchun_json" :config-data="test_yangchun_jsonData" :dont-format="true"/>-->
7
7
  <XReport :config-name="'test_tableConfig'" :local-config="test_upload" :dont-format="true" :no-padding="true"/>
8
+ <XReport
9
+ :config-name="'test_tableConfig'"
10
+ :local-config="test_yangchun_json"
11
+ :config-data="test_yangchun_jsonData"
12
+ :dont-format="true"
13
+ :no-padding="true"
14
+ :no-top-border="true"/>
8
15
  <XReport :config-name="'test_tableConfig'" :local-config="test_upload" :dont-format="true" :no-padding="true" :no-top-border="true"/>
9
16
  <!-- <XReport :config-name="'test_table_config_forEditor'" :dont-format="true"/>-->
17
+ <!-- <XReport :config-name="'test_table_config_forEditor'" :dont-format="true"/>-->
10
18
  <!-- <XReport config-name="test_tableConfig" :local-config="test_config_json" :config-data="test_config_json_data"/>-->
11
19
  <a-button @click="testExport">导出</a-button>
12
20
  </div>