vue2-client 1.8.171 → 1.8.172

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.171",
+  "version": "1.8.172",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XReport/XReportJsonRender.vue

@@ -16,7 +16,10 @@
           <template v-if="row.type === 'jsonKey'">
             <tr :key="rowIndex">
               <!--      表头        -->
-              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
+              <td
+                :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'"
+                :style="determineCellStyle(receivedFunction[rowIndex].labelFunction(config, item))"
+                colspan="6">
                 <template v-if="receivedFunction[rowIndex].labelFunction(config).type === 'key'">
                   {{ config.data[receivedFunction[rowIndex].labelFunction(config).content] }}
                 </template>
@@ -47,7 +50,10 @@
           <template v-else-if="row.type === 'jsonArray'">
             <tr :key="rowIndex + '' + jsonArrayItemIndex" v-for="(item, jsonArrayItemIndex) in config.data[row.jsonArrayDataIndex]">
               <!--      表头        -->
-              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
+              <td
+                :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'"
+                :style="determineCellStyle(receivedFunction[rowIndex].labelFunction(config, item))"
+                colspan="6">
                 <template v-if="receivedFunction[rowIndex].labelFunction(config, item).type === 'key'">
                   {{ item[receivedFunction[rowIndex].labelFunction(config, item).content] }}
                 </template>
@@ -56,7 +62,9 @@
                 </template>
               </td>
               <!--      内容        -->
-              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
+              <td
+                :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'"
+                colspan="6">
                 <template v-if="receivedFunction[rowIndex].valueFunction(config, item).type === 'key'">
                   {{ item[receivedFunction[rowIndex].valueFunction(config, item).content] }}
                 </template>
@@ -114,6 +122,13 @@ export default {
     }
   },
   methods: {
+    determineCellStyle (labelFunctionReturn) {
+      if (labelFunctionReturn.style !== undefined) {
+        return labelFunctionReturn.style
+      } else {
+        return undefined
+      }
+    },
     handleShowImgOk () {
       this.showImgModal = false
       this.showImageSrc = undefined

package/src/base-client/components/common/XReport/XReportTrGroup.vue

@@ -8,7 +8,7 @@
           v-if="!cell.dontShowRow"
           :key="cellIndex"
           :class=" calcTDBorder(cell.noBoarder) "
-          :style="cell.style ? cell.style : undefined"
+          :style="determineCellStyle(cell)"
           :colspan="cell.colSpan ? cell.colSpan : undefined">
           <template v-if="cell.type === 'column'">
             <template v-if="cell.customFunction">
@@ -75,7 +75,7 @@
           :key="cellIndex"
           :class=" calcTDBorder(cell.noBoarder) "
           :colspan="cell.colSpan ? cell.colSpan : undefined"
-          :style="cell.style ? cell.style : undefined"
+          :style="determineCellStyle(cell)"
           :rowspan="cell.rowSpan ? cell.rowSpan : undefined">
           <template v-if="cell.type === 'column'">
             {{ cell.text }}
@@ -128,7 +128,7 @@
         :key="cellIndex"
         :class=" calcTDBorder(cell.noBoarder) "
         :colspan="cell.colSpan ? cell.colSpan : undefined"
-        :style="cell.style ? cell.style : undefined"
+        :style="determineCellStyle(cell)"
         :rowspan="cell.rowSpan ? cell.rowSpan : undefined">
         <template v-if="cell.type === 'column'">
           <template v-if="cell.customFunction">
@@ -271,7 +271,7 @@
         :key="cellIndex"
         :class=" calcTDBorder(cell.noBoarder) "
         :colspan="cell.colSpan ? cell.colSpan : undefined"
-        :style="cell.style ? cell.style : undefined"
+        :style="determineCellStyle(cell)"
         :rowspan="cell.rowSpan ? cell.rowSpan : undefined">
         <template v-if="cell.type === 'column'">
           {{ cell.text }}
@@ -387,6 +387,17 @@ export default {
     }
   },
   methods: {
+    determineCellStyle (cell) {
+      if (cell.style) {
+        return cell.style
+      }
+      if (cell.type === 'column') {
+        if (this.config.labelStyle !== undefined) {
+          return this.config.labelStyle
+        }
+      }
+      return undefined
+    },
     handleInputDeepChange () {
       this.$forceUpdate()
     },

package/src/pages/Example/index.vue

@@ -16,7 +16,7 @@
     <!--            <XReport :config-name="'test_table_config_forEditor'" :dont-format="true"/>-->
     <!--    <XReport config-name="test_tableConfig" :local-config="test_config_json" :config-data="test_config_json_data"/>-->
     <!--    <XReport config-name="test_tableConfig" :local-config="test_yangchun" :config-data="test_yangchun_data" :show-title="false"/>-->
-    <XReport config-name="test_tableConfig" :local-config="test" :config-data="test_data" :dont-format="true"/>
+    <XReport config-name="report_ticket" :local-config="test" :config-data="test.testJsonData" :dont-format="true"/>
     <a-button @click="testExport">导出</a-button>
   </div>
 </template>
@@ -1258,40 +1258,40 @@ export default {
       //   id: 35917,
       //   f_type: '改管维修'
       // },
-      test_upload: {
-        slotsDefine: {},
-        subTitle: [],
-        slotsDeclare: [],
-        data: {
-          images: []
-        },
-        columns: [
-          [
-            {
-              rowSpan: 1,
-              colSpan: 12,
-              text: '测试上传',
-              originalRowIndex: 0,
-              type: 'column',
-              originalCellIndex: 0
-            }
-          ],
-          [
-            {
-              rowSpan: 1,
-              colSpan: 12,
-              dataIndex: 'imgs',
-              originalRowIndex: 1,
-              type: 'images',
-              originalCellIndex: 0
-            }
-          ]
-        ],
-        width: 'auto',
-        style: {},
-        title: '',
-        designMode: 'VisualTable'
-      },
+      // test_upload: {
+      //   slotsDefine: {},
+      //   subTitle: [],
+      //   slotsDeclare: [],
+      //   data: {
+      //     images: []
+      //   },
+      //   columns: [
+      //     [
+      //       {
+      //         rowSpan: 1,
+      //         colSpan: 12,
+      //         text: '测试上传',
+      //         originalRowIndex: 0,
+      //         type: 'column',
+      //         originalCellIndex: 0
+      //       }
+      //     ],
+      //     [
+      //       {
+      //         rowSpan: 1,
+      //         colSpan: 12,
+      //         dataIndex: 'imgs',
+      //         originalRowIndex: 1,
+      //         type: 'images',
+      //         originalCellIndex: 0
+      //       }
+      //     ]
+      //   ],
+      //   width: 'auto',
+      //   style: {},
+      //   title: '',
+      //   designMode: 'VisualTable'
+      // },
       // test_yulin_config: {
       //   slotsDefine: {},
       //   subTitle: [],
@@ -1415,46 +1415,83 @@ export default {
       //     }
       //   ]
       // }
-      test_data: {
-        images: {
-          serviceall: {
-            imgs: []
-          }
-        }
-      },
       test: {
-        slotsDefine: {},
-        subTitle: [],
-        slotsDeclare: [],
-        data: {
-          'serviceall@@@imgs': []
+        title: {
+          type: 'titleKey',
+          value: 'f_type'
         },
-        columns: [
-          [
+        content: [
+          {
+            customFunctionForLabel: "function (config) {\n\treturn { type: 'key', content: 'f_project',\n          style: {\n            \"backgroundColor\": \"rgb(247,247,247)\",\n        \t\t\"fontWeight\": \"bold\"\n          }\n         }\n}",
+            customFunctionForValue: "function (config, item) {\n  if (!item.f_content || item.f_content === null) {\n    return { type: 'value', content: '无' }\n  }else {\n    return { type: 'key', content: 'f_content'}\n  }\n}",
+            jsonArrayDataIndex: 'details',
+            type: 'jsonArray'
+          }
+        ],
+        designMode: 'json',
+        testJsonData: {
+          imgs: [],
+          details: [
             {
-              rowSpan: 1,
-              colSpan: 12,
-              text: '燃气设施全景',
-              originalRowIndex: 0,
-              type: 'column',
-              originalCellIndex: 0
-            }
-          ],
-          [
+              f_project: '旧表表号',
+              f_service_id: 35917,
+              f_is_must: 'false',
+              id: 224392,
+              type: 'string'
+            },
+            {
+              f_project: '新表表号',
+              f_service_id: 35917,
+              f_is_must: 'false',
+              id: 224393,
+              type: 'string'
+            },
+            {
+              f_project: '引入方式',
+              f_service_id: 35917,
+              f_is_must: 'false',
+              id: 224394,
+              type: 'selector'
+            },
+            {
+              f_project: '是否高空作业',
+              f_service_id: 35917,
+              f_is_must: 'false',
+              id: 224395,
+              type: 'selector'
+            },
             {
-              rowSpan: 1,
-              colSpan: 12,
-              dataIndex: 'serviceall@@@imgs',
-              originalRowIndex: 1,
-              type: 'images',
-              originalCellIndex: 0
+              f_project: '处理结果',
+              f_service_id: 35917,
+              f_is_must: 'false',
+              id: 224396,
+              type: 'selector'
+            },
+            {
+              f_project: '位置',
+              f_service_id: 35917,
+              f_is_must: 'false',
+              id: 224397,
+              type: 'selector'
+            },
+            {
+              f_project: '补装管卡',
+              f_service_id: 35917,
+              f_is_must: 'false',
+              id: 224398,
+              type: 'selector'
+            },
+            {
+              f_project: '备注',
+              f_service_id: 35917,
+              f_is_must: 'false',
+              id: 224399,
+              type: 'string'
             }
-          ]
-        ],
-        width: 'auto',
-        style: {},
-        designMode: 'VisualTable',
-        title: ''
+          ],
+          id: 35917,
+          f_type: '改管维修'
+        }
       }
     }
   },