vue2-client 1.8.172 → 1.8.174

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.172",
+  "version": "1.8.174",
   "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

@@ -1,7 +1,7 @@
 <template>
   <div :class="noPadding ? 'reportMainNoPadding' : 'reportMain'">
-    <table class="reportTable">
-      <tbody class="reportTable">
+    <table class="reportTable" :style="config.style ? config.style : undefined">
+      <tbody class="'reportTable'">
         <tr v-if="showTitle && config.title.type && config.title.type !== ''">
           <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="12">
             <template v-if="config.title.type === 'titleKey'">
@@ -28,7 +28,10 @@
                 </template>
               </td>
               <!--      内容        -->
-              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
+              <td
+                :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'"
+                :style="determineCellStyle(receivedFunction[rowIndex].valueFunction(config))"
+                colspan="6">
                 <template v-if="receivedFunction[rowIndex].valueFunction(config).type === 'key'">
                   {{ config.data[receivedFunction[rowIndex].valueFunction(config).content] }}
                 </template>
@@ -64,6 +67,7 @@
               <!--      内容        -->
               <td
                 :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'"
+                :style="determineCellStyle(receivedFunction[rowIndex].valueFunction(config, item))"
                 colspan="6">
                 <template v-if="receivedFunction[rowIndex].valueFunction(config, item).type === 'key'">
                   {{ item[receivedFunction[rowIndex].valueFunction(config, item).content] }}
@@ -122,12 +126,39 @@ export default {
     }
   },
   methods: {
-    determineCellStyle (labelFunctionReturn) {
+    determineCellStyle (labelFunctionReturn, color = '#000', borderWidth = '1px') {
+      if (labelFunctionReturn.style.borderColor) {
+        color = labelFunctionReturn.style.borderColor
+      }
+      if (labelFunctionReturn.style.borderWidth) {
+        borderWidth = labelFunctionReturn.style.borderWidth
+      }
+      const withBorder = {
+        border: borderWidth + ' solid ' + color,
+        padding: '8px'
+      }
+      const NoTopBorder = {
+        borderTopStyle: 'none',
+        borderLeft: borderWidth + ' solid ' + color,
+        borderRight: borderWidth + ' solid ' + color,
+        borderBottom: borderWidth + ' solid ' + color,
+        padding: '8px'
+      }
+      let result = {}
       if (labelFunctionReturn.style !== undefined) {
-        return labelFunctionReturn.style
+        if (this.noTopBorder) {
+          result = { ...NoTopBorder, ...labelFunctionReturn.style }
+        } else {
+          result = { ...withBorder, ...labelFunctionReturn.style }
+        }
       } else {
-        return undefined
+        if (this.noTopBorder) {
+          result = { ...NoTopBorder }
+        } else {
+          result = { ...withBorder }
+        }
       }
+      return result
     },
     handleShowImgOk () {
       this.showImgModal = false

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

@@ -387,16 +387,66 @@ export default {
     }
   },
   methods: {
-    determineCellStyle (cell) {
+    determineCellStyle (cell, color = '#000', borderWidth = '1px') {
+      if (this.config.style.borderColor) {
+        color = this.config.style.borderColor
+      }
+      if (this.config.style.borderWidth) {
+        borderWidth = this.config.style.borderWidth
+      }
+      const withBorder = {
+        border: borderWidth + ' solid ' + color,
+        padding: '8px'
+      }
+      const noBorder = {
+        borderLeft: borderWidth + ' solid ' + color,
+        borderRight: borderWidth + ' solid ' + color,
+        padding: '8px'
+      }
+      const NoTopBorder = {
+        borderTopStyle: 'none',
+        borderLeft: borderWidth + ' solid ' + color,
+        borderRight: borderWidth + ' solid ' + color,
+        borderBottom: borderWidth + ' solid ' + color,
+        padding: '8px'
+      }
+      let result = {}
       if (cell.style) {
-        return cell.style
+        if (cell.noBorder) {
+          result = { ...noBorder, ...cell.style }
+        } else {
+          if (this.noTopBorder) {
+            result = { ...NoTopBorder, ...cell.style }
+          } else {
+            result = { ...withBorder, ...cell.style }
+          }
+        }
+        return result
       }
       if (cell.type === 'column') {
         if (this.config.labelStyle !== undefined) {
-          return this.config.labelStyle
+          if (cell.noBorder) {
+            result = { ...noBorder, ...this.config.labelStyle }
+          } else {
+            if (this.noTopBorder) {
+              result = { ...NoTopBorder, ...this.config.labelStyle }
+            } else {
+              result = { ...withBorder, ...this.config.labelStyle }
+            }
+          }
+          return result
+        }
+      }
+      if (cell.noBorder) {
+        result = { ...noBorder }
+      } else {
+        if (this.noTopBorder) {
+          result = { ...NoTopBorder }
+        } else {
+          result = { ...withBorder }
         }
       }
-      return undefined
+      return result
     },
     handleInputDeepChange () {
       this.$forceUpdate()